Rename pluginplugin as just plugin

sailfishos · Jul 7, 2015 · 57202a9 · 57202a9
1 parent 3c2afc7
commit 57202a9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 30 deletions.
diff --git a/connectionagentplugin/connectionagentplugin.pro b/connectionagentplugin/connectionagentplugin.pro
@@ -6,11 +6,10 @@ CONFIG += qt plugin
 uri = com.jolla.connection
 
 SOURCES += \
-    connectionagentplugin_plugin.cpp \
+    plugin.cpp \
     declarativeconnectionagent.cpp
 
 HEADERS += \
-    connectionagentplugin_plugin.h \
     declarativeconnectionagent.h
 
 DBUS_INTERFACES = connectiond_interface

diff --git a/connectionagentplugin/connectionagentplugin_plugin.cpp b/connectionagentplugin/connectionagentplugin_plugin.cpp
diff --git a/...gentplugin/connectionagentplugin_plugin.h → connectionagentplugin/plugin.cpp b/...gentplugin/connectionagentplugin_plugin.h → connectionagentplugin/plugin.cpp
@@ -14,15 +14,15 @@
 **
 ****************************************************************************/
 
-#ifndef CONNECTIONAGENTPLUGIN_PLUGIN_H
-#define CONNECTIONAGENTPLUGIN_PLUGIN_H
+#include "declarativeconnectionagent.h"
+
 #include <QtPlugin>
 
 #include <QtQml>
 #include <QQmlEngine>
 #include <QQmlExtensionPlugin>
 
-class ConnectionagentpluginPlugin : public QQmlExtensionPlugin
+class ConnectionagentPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
@@ -32,5 +32,10 @@ class ConnectionagentpluginPlugin : public QQmlExtensionPlugin
 
 };
 
-#endif // CONNECTIONAGENTPLUGIN_PLUGIN_H
+void ConnectionagentPlugin::registerTypes(const char *uri)
+{
+    // @uri com.jolla.connection
+    qmlRegisterType<DeclarativeConnectionAgent>(uri, 1, 0, "ConnectionAgent");
+}
 
+#include "plugin.moc"