From 392c8ec1085d3385c526a35daba7d189733811ee Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Tue, 24 Jun 2014 12:41:58 +0200 Subject: [PATCH] PagePlugin ==> ViewPlugin --- src/calamares/CMakeLists.txt | 2 +- src/calamares/ViewManager.cpp | 2 +- src/calamares/ViewManager.h | 4 ++-- .../viewpages/{PagePlugin.cpp => ViewPlugin.cpp} | 4 ++-- src/calamares/viewpages/{PagePlugin.h => ViewPlugin.h} | 8 ++++---- src/modules/greeting/CMakeLists.txt | 4 ++-- .../{GreetingPagePlugin.cpp => GreetingViewPlugin.cpp} | 6 +++--- .../{GreetingPagePlugin.h => GreetingViewPlugin.h} | 10 +++++----- 8 files changed, 20 insertions(+), 20 deletions(-) rename src/calamares/viewpages/{PagePlugin.cpp => ViewPlugin.cpp} (92%) rename src/calamares/viewpages/{PagePlugin.h => ViewPlugin.h} (84%) rename src/modules/greeting/{GreetingPagePlugin.cpp => GreetingViewPlugin.cpp} (86%) rename src/modules/greeting/{GreetingPagePlugin.h => GreetingViewPlugin.h} (79%) diff --git a/src/calamares/CMakeLists.txt b/src/calamares/CMakeLists.txt index 11292283e..94d1716e6 100644 --- a/src/calamares/CMakeLists.txt +++ b/src/calamares/CMakeLists.txt @@ -16,7 +16,7 @@ set( calamaresSources Settings.cpp YamlUtils.cpp - viewpages/PagePlugin.cpp + viewpages/ViewPlugin.cpp viewpages/AbstractPage.cpp ) diff --git a/src/calamares/ViewManager.cpp b/src/calamares/ViewManager.cpp index 18b87c182..8c0f785c7 100644 --- a/src/calamares/ViewManager.cpp +++ b/src/calamares/ViewManager.cpp @@ -72,7 +72,7 @@ ViewManager::widget() void -ViewManager::addPagePlugin( PagePlugin* plugin ) +ViewManager::addViewPlugin( ViewPlugin* plugin ) { } diff --git a/src/calamares/ViewManager.h b/src/calamares/ViewManager.h index d8757d4f7..6cf1a3722 100644 --- a/src/calamares/ViewManager.h +++ b/src/calamares/ViewManager.h @@ -20,7 +20,7 @@ #define VIEWMANAGER_H #include "DllMacro.h" -#include "viewpages/PagePlugin.h" +#include "viewpages/ViewPlugin.h" #include #include @@ -39,7 +39,7 @@ public: QWidget* widget(); - void addPagePlugin( PagePlugin* plugin ); + void addViewPlugin( ViewPlugin* plugin ); void insertPage( AbstractPage* page ); void setNext( AbstractPage* page ); diff --git a/src/calamares/viewpages/PagePlugin.cpp b/src/calamares/viewpages/ViewPlugin.cpp similarity index 92% rename from src/calamares/viewpages/PagePlugin.cpp rename to src/calamares/viewpages/ViewPlugin.cpp index 95bcef296..fefb2b3f4 100644 --- a/src/calamares/viewpages/PagePlugin.cpp +++ b/src/calamares/viewpages/ViewPlugin.cpp @@ -16,12 +16,12 @@ * along with Calamares. If not, see . */ -#include "PagePlugin.h" +#include "ViewPlugin.h" namespace Calamares { -PagePlugin::PagePlugin( QObject* parent ) +ViewPlugin::ViewPlugin( QObject* parent ) : QObject( parent ) { } diff --git a/src/calamares/viewpages/PagePlugin.h b/src/calamares/viewpages/ViewPlugin.h similarity index 84% rename from src/calamares/viewpages/PagePlugin.h rename to src/calamares/viewpages/ViewPlugin.h index 35155512e..bace088a2 100644 --- a/src/calamares/viewpages/PagePlugin.h +++ b/src/calamares/viewpages/ViewPlugin.h @@ -28,12 +28,12 @@ namespace Calamares class AbstractPage; -class UIDLLEXPORT PagePlugin : public QObject +class UIDLLEXPORT ViewPlugin : public QObject { Q_OBJECT public: - explicit PagePlugin( QObject *parent = 0 ); - virtual ~PagePlugin() {} + explicit ViewPlugin( QObject *parent = 0 ); + virtual ~ViewPlugin() {} signals: void done(); @@ -42,6 +42,6 @@ signals: } -Q_DECLARE_INTERFACE( Calamares::PagePlugin, "calamares.PagePlugin/1.0" ) +Q_DECLARE_INTERFACE( Calamares::ViewPlugin, "calamares.ViewPlugin/1.0" ) #endif // PAGEPLUGIN_H diff --git a/src/modules/greeting/CMakeLists.txt b/src/modules/greeting/CMakeLists.txt index cc73710b2..b466e054d 100644 --- a/src/modules/greeting/CMakeLists.txt +++ b/src/modules/greeting/CMakeLists.txt @@ -1,10 +1,10 @@ include_directories( ${PROJECT_BINARY_DIR}/src/calamares ) calamares_add_plugin( greeting - TYPE pageplugin + TYPE viewmodule EXPORT_MACRO PLUGINDLLEXPORT_PRO CONFIG_FILE module.conf SOURCES - GreetingPagePlugin.cpp + GreetingViewPlugin.cpp GreetingPage.cpp UI LINK_LIBRARIES diff --git a/src/modules/greeting/GreetingPagePlugin.cpp b/src/modules/greeting/GreetingViewPlugin.cpp similarity index 86% rename from src/modules/greeting/GreetingPagePlugin.cpp rename to src/modules/greeting/GreetingViewPlugin.cpp index 5028c84bf..5c64978dd 100644 --- a/src/modules/greeting/GreetingPagePlugin.cpp +++ b/src/modules/greeting/GreetingViewPlugin.cpp @@ -16,9 +16,9 @@ * along with Calamares. If not, see . */ -#include "GreetingPagePlugin.h" +#include "GreetingViewPlugin.h" -GreetingPagePlugin::GreetingPagePlugin( QObject *parent ) - : Calamares::PagePlugin( parent ) +GreetingViewPlugin::GreetingViewPlugin( QObject *parent ) + : Calamares::ViewPlugin( parent ) { } diff --git a/src/modules/greeting/GreetingPagePlugin.h b/src/modules/greeting/GreetingViewPlugin.h similarity index 79% rename from src/modules/greeting/GreetingPagePlugin.h rename to src/modules/greeting/GreetingViewPlugin.h index 61e6d729f..4ba5f7bff 100644 --- a/src/modules/greeting/GreetingPagePlugin.h +++ b/src/modules/greeting/GreetingViewPlugin.h @@ -21,17 +21,17 @@ #include -#include "viewpages/PagePlugin.h" +#include "viewpages/ViewPlugin.h" #include "PluginDllMacro.h" -class PLUGINDLLEXPORT GreetingPagePlugin : public Calamares::PagePlugin +class PLUGINDLLEXPORT GreetingViewPlugin : public Calamares::ViewPlugin { Q_OBJECT - Q_PLUGIN_METADATA( IID "calamares.PagePlugin/1.0" ) + Q_PLUGIN_METADATA( IID "calamares.ViewPlugin/1.0" ) //FILE "module.json" ) - Q_INTERFACES( Calamares::PagePlugin ) + Q_INTERFACES( Calamares::ViewPlugin ) public: - explicit GreetingPagePlugin(QObject *parent = 0); + explicit GreetingViewPlugin(QObject *parent = 0); };