From 57202a9d8b36ad52f754e95bc39d39d3a1da9a95 Mon Sep 17 00:00:00 2001
From: Pekka Vuorela <pekka.vuorela@jollamobile.com>
Date: Tue, 7 Jul 2015 14:16:10 +0300
Subject: [PATCH] Rename pluginplugin as just plugin

---
 .../connectionagentplugin.pro                 |  3 +--
 .../connectionagentplugin_plugin.cpp          | 24 -------------------
 ...nectionagentplugin_plugin.h => plugin.cpp} | 13 ++++++----
 3 files changed, 10 insertions(+), 30 deletions(-)
 delete mode 100644 connectionagentplugin/connectionagentplugin_plugin.cpp
 rename connectionagentplugin/{connectionagentplugin_plugin.h => plugin.cpp} (75%)

diff --git a/connectionagentplugin/connectionagentplugin.pro b/connectionagentplugin/connectionagentplugin.pro
index 385b3f4..638ca90 100644
--- 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
deleted file mode 100644
index 7f265b5..0000000
--- a/connectionagentplugin/connectionagentplugin_plugin.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Jolla Ltd
-** Contact: lorn.potter@gmail.com
-**
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-****************************************************************************/
-
-#include "connectionagentplugin_plugin.h"
-#include "declarativeconnectionagent.h"
-
-void ConnectionagentpluginPlugin::registerTypes(const char *uri)
-{
-    // @uri com.jolla.connection
-    qmlRegisterType<DeclarativeConnectionAgent>(uri, 1, 0, "ConnectionAgent");
-}
diff --git a/connectionagentplugin/connectionagentplugin_plugin.h b/connectionagentplugin/plugin.cpp
similarity index 75%
rename from connectionagentplugin/connectionagentplugin_plugin.h
rename to connectionagentplugin/plugin.cpp
index bfba5c1..6cf85f8 100644
--- a/connectionagentplugin/connectionagentplugin_plugin.h
+++ b/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"