PagePlugin ==> ViewPlugin

src/calamares/CMakeLists.txt

@@ -16,7 +16,7 @@ set( calamaresSources
     Settings.cpp
     YamlUtils.cpp
 
-    viewpages/PagePlugin.cpp
+    viewpages/ViewPlugin.cpp
     viewpages/AbstractPage.cpp
 )
 

src/calamares/ViewManager.cpp

@@ -72,7 +72,7 @@ ViewManager::widget()
 
 
 void
-ViewManager::addPagePlugin( PagePlugin* plugin )
+ViewManager::addViewPlugin( ViewPlugin* plugin )
 {
 
 }

src/calamares/ViewManager.h

@@ -20,7 +20,7 @@
 #define VIEWMANAGER_H
 
 #include "DllMacro.h"
-#include "viewpages/PagePlugin.h"
+#include "viewpages/ViewPlugin.h"
 
 #include <QPushButton>
 #include <QStackedWidget>
@@ -39,7 +39,7 @@ public:
 
     QWidget* widget();
 
-    void addPagePlugin( PagePlugin* plugin );
+    void addViewPlugin( ViewPlugin* plugin );
 
     void insertPage( AbstractPage* page );
     void setNext( AbstractPage* page );

src/calamares/viewpages/ViewPlugin.cpp

@@ -16,12 +16,12 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "PagePlugin.h"
+#include "ViewPlugin.h"
 
 namespace Calamares
 {
 
-PagePlugin::PagePlugin( QObject* parent )
+ViewPlugin::ViewPlugin( QObject* parent )
     : QObject( parent )
 {
 }

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 );
+    explicit ViewPlugin( QObject *parent = 0 );
-    virtual ~PagePlugin() {}
+    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

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

src/modules/greeting/GreetingViewPlugin.cpp

@@ -16,9 +16,9 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "GreetingPagePlugin.h"
+#include "GreetingViewPlugin.h"
 
-GreetingPagePlugin::GreetingPagePlugin( QObject *parent )
+GreetingViewPlugin::GreetingViewPlugin( QObject *parent )
-    : Calamares::PagePlugin( parent )
+    : Calamares::ViewPlugin( parent )
 {
 }

src/modules/greeting/GreetingViewPlugin.h

@@ -21,17 +21,17 @@
 
 #include <QObject>
 
-#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);
 
 
 };