From 5f5153f450737666b1c782f23f9f69c4edd9d400 Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Tue, 27 Sep 2016 13:15:44 +0100 Subject: [PATCH] #5617 Remove the plugin wizard from GUI --- src/gui/gui.pro | 11 +---------- src/gui/src/MainWindow.h | 3 +-- src/gui/src/SetupWizard.cpp | 5 ----- src/gui/src/SetupWizard.h | 2 -- 4 files changed, 2 insertions(+), 19 deletions(-) diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 408d44dd..28eca39e 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -16,8 +16,7 @@ FORMS += res/MainWindowBase.ui \ res/HotkeyDialogBase.ui \ res/SettingsDialogBase.ui \ res/SetupWizardBase.ui \ - res/AddClientDialogBase.ui \ - res/PluginWizardPageBase.ui + res/AddClientDialogBase.ui SOURCES += src/main.cpp \ src/MainWindow.cpp \ src/AboutDialog.cpp \ @@ -54,14 +53,10 @@ SOURCES += src/main.cpp \ src/DataDownloader.cpp \ src/AddClientDialog.cpp \ src/CommandProcess.cpp \ - src/PluginWizardPage.cpp \ - src/PluginManager.cpp \ src/CoreInterface.cpp \ src/Fingerprint.cpp \ src/SslCertificate.cpp \ - src/Plugin.cpp \ src/WebClient.cpp \ - ../lib/common/PluginVersion.cpp \ src/SubscriptionManager.cpp \ src/ActivationNotifier.cpp HEADERS += src/MainWindow.h \ @@ -101,15 +96,11 @@ HEADERS += src/MainWindow.h \ src/AddClientDialog.h \ src/CommandProcess.h \ src/EditionType.h \ - src/PluginWizardPage.h \ src/ProcessorArch.h \ - src/PluginManager.h \ src/CoreInterface.h \ src/Fingerprint.h \ src/SslCertificate.h \ - src/Plugin.h \ src/WebClient.h \ - ../lib/common/PluginVersion.h \ src/SubscriptionManager.h \ src/ActivationNotifier.h \ src/ElevateMode.h diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h index 87380f96..d6d14055 100644 --- a/src/gui/src/MainWindow.h +++ b/src/gui/src/MainWindow.h @@ -63,8 +63,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase friend class QSynergyApplication; friend class SetupWizard; - friend class PluginWizardPage; - + public: enum qSynergyState { diff --git a/src/gui/src/SetupWizard.cpp b/src/gui/src/SetupWizard.cpp index 3d23b017..ed574e04 100644 --- a/src/gui/src/SetupWizard.cpp +++ b/src/gui/src/SetupWizard.cpp @@ -33,8 +33,6 @@ SetupWizard::SetupWizard(MainWindow& mainWindow, bool startMain) : m_LoginAttemps(0) { setupUi(this); - m_pPluginPage = new PluginWizardPage(mainWindow); - addPage(m_pPluginPage); #if defined(Q_OS_MAC) @@ -114,7 +112,6 @@ bool SetupWizard::validateCurrentPage() return false; } else { - m_pPluginPage->setEdition(m_Edition); return true; } } @@ -132,8 +129,6 @@ bool SetupWizard::validateCurrentPage() return false; } - m_pPluginPage->setEdition(m_Edition); - return true; } } diff --git a/src/gui/src/SetupWizard.h b/src/gui/src/SetupWizard.h index 34b301a2..fd6dcd14 100644 --- a/src/gui/src/SetupWizard.h +++ b/src/gui/src/SetupWizard.h @@ -19,7 +19,6 @@ #include "ui_SetupWizardBase.h" #include "SynergyLocale.h" -#include "PluginWizardPage.h" #include #include @@ -50,7 +49,6 @@ private: bool m_StartMain; SynergyLocale m_Locale; int m_Edition; - PluginWizardPage* m_pPluginPage; int m_LoginAttemps; private slots: