fix(libsearch):解决编译问题

libsearch/appdata/app-info-dbus-argument.h

@@ -22,26 +22,25 @@
 #include <QDBusArgument>
 #include "application-property.h"
 
-namespace UkuiSearch {
-
-    QDBusArgument &operator << (QDBusArgument &argument, const ApplicationProperty::Property &property) {
+using namespace UkuiSearch;
+QDBusArgument &operator << (QDBusArgument &argument, const UkuiSearch::ApplicationProperty::Property &property) {
     argument.beginStructure();
     argument << static_cast<int>(property);
     argument.endStructure();
     return argument;
-    }
+}
 
-    const QDBusArgument &operator >> (const QDBusArgument &argument, ApplicationProperty::Property &property) {
+const QDBusArgument &operator >> (const QDBusArgument &argument, UkuiSearch::ApplicationProperty::Property &property) {
     int value;
     argument.beginStructure();
     argument >> value;
     argument.endStructure();
     property = static_cast<ApplicationProperty::Property>(value);
     return argument;
-    }
+}
 
-    QDBusArgument &operator << (QDBusArgument &argument, const ApplicationPropertyMap &appPropertyInfo)
-    {
+QDBusArgument &operator << (QDBusArgument &argument, const ApplicationPropertyMap &appPropertyInfo)
+{
     argument.beginMap(/*qMetaTypeId<ApplicationProperty::Property>()*/QVariant::Int, qMetaTypeId<QDBusVariant>());
     for (auto i = appPropertyInfo.constBegin(); i != appPropertyInfo.constEnd(); ++i) {
         QDBusVariant dbusVariant(i.value());
@@ -51,10 +50,10 @@ namespace UkuiSearch {
     }
     argument.endMap();
     return argument;
-    }
+}
 
-    const QDBusArgument &operator >> (const QDBusArgument &argument, ApplicationPropertyMap &appPropertyInfo)
-    {
+const QDBusArgument &operator >> (const QDBusArgument &argument, ApplicationPropertyMap &appPropertyInfo)
+{
     argument.beginMap();
     while (!argument.atEnd()) {
         int key;
@@ -66,10 +65,10 @@ namespace UkuiSearch {
     }
     argument.endMap();
     return argument;
-    }
+}
 
-    QDBusArgument &operator << (QDBusArgument &argument, const ApplicationInfoMap &appInfo)
-    {
+QDBusArgument &operator << (QDBusArgument &argument, const ApplicationInfoMap &appInfo)
+{
     argument.beginMap(QVariant::String, qMetaTypeId<ApplicationPropertyMap>());
     for (auto i = appInfo.constBegin(); i != appInfo.constEnd(); ++i) {
         argument.beginMapEntry();
@@ -78,10 +77,10 @@ namespace UkuiSearch {
     }
     argument.endMap();
     return argument;
-    }
+}
 
-    const QDBusArgument &operator >> (const QDBusArgument &argument, ApplicationInfoMap &appInfo)
-    {
+const QDBusArgument &operator >> (const QDBusArgument &argument, ApplicationInfoMap &appInfo)
+{
     argument.beginMap();
     while (!argument.atEnd()) {
         QString key;
@@ -93,8 +92,5 @@ namespace UkuiSearch {
     }
     argument.endMap();
     return argument;
-    }
 }
-
-
 #endif // APPINFODBUSARGUMENT_H

libsearch/appdata/app-info-table.cpp

@@ -25,10 +25,11 @@ static AppInfoTable *global_intance = nullptr;
 AppInfoTablePrivate::AppInfoTablePrivate(AppInfoTable *parent) : QObject(parent), q(parent), m_database(new QSqlDatabase())
 {
     //dbus接收数据库信号
-    qRegisterMetaType<ApplicationPropertyMap>("ApplicationPropertyMap");
+    qRegisterMetaType<UkuiSearch::ApplicationProperty::Property>("ApplicationProperty::Property");
+    qRegisterMetaType<UkuiSearch::ApplicationInfoMap>("ApplicationInfoMap");
+    qRegisterMetaType<UkuiSearch::ApplicationPropertyMap>("ApplicationPropertyMap");
+    qDBusRegisterMetaType<UkuiSearch::ApplicationProperty::Property>();
     qDBusRegisterMetaType<ApplicationPropertyMap>();
-
-    qRegisterMetaType<ApplicationInfoMap>("ApplicationInfoMap");
     qDBusRegisterMetaType<ApplicationInfoMap>();
 
     m_signalTransInterface = new QDBusInterface("com.ukui.search.appdb.service",

libsearch/appdata/application-property.h

@@ -24,6 +24,7 @@
 #include <QMap>
 #include <QVector>
 #include <QVariant>
+#include <QDBusArgument>
 namespace UkuiSearch {
 
 namespace ApplicationProperty {
@@ -61,5 +62,7 @@ typedef QMap<ApplicationProperty::Property, QVariant> ApplicationPropertyMap;
 typedef QMap<QString, ApplicationPropertyMap> ApplicationInfoMap; // desktopFile->ApplicationPropertyMap
 }
 Q_DECLARE_METATYPE(UkuiSearch::ApplicationProperty::Property)
+Q_DECLARE_METATYPE(UkuiSearch::ApplicationPropertyMap)
 Q_DECLARE_METATYPE(UkuiSearch::ApplicationInfoMap)
+Q_DECLARE_METATYPE(UkuiSearch::ApplicationProperties)
 #endif // APPLICATIONPROPERTY_H

libsearch/searchinterface/searchtasks/file-content-search-task.h

@@ -35,6 +35,7 @@ namespace UkuiSearch {
 
 class FileContentSearchTask : public SearchTaskPluginIface
 {
+    Q_OBJECT
 public:
     explicit FileContentSearchTask(QObject *parent = nullptr);