diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-03-18 23:25:06 +0200 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2017-03-20 12:14:29 +0000 |
commit | 61d6f84e2531c84781a71757aee840be432842c1 (patch) | |
tree | 6fe4fadce82f54a09591fb5b387f9ec84c80da22 /src/plugins/designer | |
parent | 7694c718dbeaea869a8e5c5d8510cfa307273ee4 (diff) |
Designer: De-slot
Change-Id: I6e4a80187646afe342a03ed31c3404fdc27cccc7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/designer')
-rw-r--r-- | src/plugins/designer/cpp/formclasswizarddialog.h | 4 | ||||
-rw-r--r-- | src/plugins/designer/cpp/formclasswizardpage.h | 8 | ||||
-rw-r--r-- | src/plugins/designer/editorwidget.h | 2 | ||||
-rw-r--r-- | src/plugins/designer/formeditorplugin.h | 4 | ||||
-rw-r--r-- | src/plugins/designer/formeditorstack.h | 4 | ||||
-rw-r--r-- | src/plugins/designer/formtemplatewizardpage.h | 3 | ||||
-rw-r--r-- | src/plugins/designer/formwindowfile.h | 4 | ||||
-rw-r--r-- | src/plugins/designer/qtcreatorintegration.h | 8 | ||||
-rw-r--r-- | src/plugins/designer/resourcehandler.h | 1 |
9 files changed, 12 insertions, 26 deletions
diff --git a/src/plugins/designer/cpp/formclasswizarddialog.h b/src/plugins/designer/cpp/formclasswizarddialog.h index 18c96e0f0f2..9ce0ea0b598 100644 --- a/src/plugins/designer/cpp/formclasswizarddialog.h +++ b/src/plugins/designer/cpp/formclasswizarddialog.h @@ -46,14 +46,12 @@ public: explicit FormClassWizardDialog(const Core::BaseFileWizardFactory *factory, QWidget *parent = 0); QString path() const; + void setPath(const QString &); Designer::FormClassWizardParameters parameters() const; bool validateCurrentPage(); -public slots: - void setPath(const QString &); - protected: void initializePage(int id); diff --git a/src/plugins/designer/cpp/formclasswizardpage.h b/src/plugins/designer/cpp/formclasswizardpage.h index 1f442610a59..a789f414380 100644 --- a/src/plugins/designer/cpp/formclasswizardpage.h +++ b/src/plugins/designer/cpp/formclasswizardpage.h @@ -48,6 +48,8 @@ public: virtual bool isComplete () const; virtual bool validatePage(); + void setClassName(const QString &suggestedClassName); + void setPath(const QString &); QString path() const; // Fill out applicable parameters @@ -58,11 +60,7 @@ public: static bool lowercaseHeaderFiles(); -public slots: - void setClassName(const QString &suggestedClassName); - void setPath(const QString &); - -private slots: +private: void slotValidChanged(); private: diff --git a/src/plugins/designer/editorwidget.h b/src/plugins/designer/editorwidget.h index 76e77665f31..d102eb18519 100644 --- a/src/plugins/designer/editorwidget.h +++ b/src/plugins/designer/editorwidget.h @@ -63,8 +63,6 @@ public: SharedTools::WidgetHost *formWindowEditorForFormWindow(const QDesignerFormWindowInterface *fw) const; EditorData activeEditor() const; - -public slots: void resetToDefaultLayout(); private: diff --git a/src/plugins/designer/formeditorplugin.h b/src/plugins/designer/formeditorplugin.h index 47ecdeda28d..5509c524e63 100644 --- a/src/plugins/designer/formeditorplugin.h +++ b/src/plugins/designer/formeditorplugin.h @@ -47,14 +47,14 @@ public: bool initialize(const QStringList &arguments, QString *errorMessage = 0) override; void extensionsInitialized() override; -private slots: #ifdef WITH_TESTS +private slots: void test_gotoslot(); void test_gotoslot_data(); #endif - void switchSourceForm(); private: + void switchSourceForm(); void initializeTemplates(); QAction *m_actionSwitchSource; diff --git a/src/plugins/designer/formeditorstack.h b/src/plugins/designer/formeditorstack.h index 05258e2aed1..caf8bf5ec6e 100644 --- a/src/plugins/designer/formeditorstack.h +++ b/src/plugins/designer/formeditorstack.h @@ -62,15 +62,13 @@ public: EditorData activeEditor() const; -public slots: void removeFormWindowEditor(QObject *); -private slots: +private: void updateFormWindowSelectionHandles(); void modeAboutToChange(Core::Id mode); void formSizeChanged(int w, int h); -private: inline int indexOfFormWindow(const QDesignerFormWindowInterface *) const; inline int indexOfFormEditor(const QObject *xmlEditor) const; diff --git a/src/plugins/designer/formtemplatewizardpage.h b/src/plugins/designer/formtemplatewizardpage.h index 047ca4667ea..7921148dca3 100644 --- a/src/plugins/designer/formtemplatewizardpage.h +++ b/src/plugins/designer/formtemplatewizardpage.h @@ -68,10 +68,9 @@ public: signals: void templateActivated(); -private slots: +private: void slotCurrentTemplateChanged(bool); -private: QString m_templateContents; QDesignerNewFormWidgetInterface *m_newFormWidget; bool m_templateSelected; diff --git a/src/plugins/designer/formwindowfile.h b/src/plugins/designer/formwindowfile.h index a78d576ad9a..f14a63d780e 100644 --- a/src/plugins/designer/formwindowfile.h +++ b/src/plugins/designer/formwindowfile.h @@ -69,15 +69,13 @@ public: QString formWindowContents() const; ResourceHandler *resourceHandler() const; -public slots: void setFilePath(const Utils::FileName &) override; void setShouldAutoSave(bool sad = true) { m_shouldAutoSave = sad; } void updateIsModified(); -private slots: +private: void slotFormWindowRemoved(QDesignerFormWindowInterface *w); -private: QString m_suggestedName; bool m_shouldAutoSave = false; // Might actually go out of scope before the IEditor due diff --git a/src/plugins/designer/qtcreatorintegration.h b/src/plugins/designer/qtcreatorintegration.h index a00540ba8d0..3b1f25c0f9f 100644 --- a/src/plugins/designer/qtcreatorintegration.h +++ b/src/plugins/designer/qtcreatorintegration.h @@ -44,18 +44,16 @@ public: bool supportsToSlotNavigation() { return true; } + void updateSelection() override; + signals: void creatorHelpRequested(const QUrl &url); -public slots: - void updateSelection() override; - -private slots: +private: void slotNavigateToSlot(const QString &objectName, const QString &signalSignature, const QStringList ¶meterNames); void slotDesignerHelpRequested(const QString &manual, const QString &document); void slotSyncSettingsToDesigner(); -private: bool navigateToSlot(const QString &objectName, const QString &signalSignature, const QStringList ¶meterNames, diff --git a/src/plugins/designer/resourcehandler.h b/src/plugins/designer/resourcehandler.h index 530ccbc9757..bf5462c67c2 100644 --- a/src/plugins/designer/resourcehandler.h +++ b/src/plugins/designer/resourcehandler.h @@ -52,7 +52,6 @@ public: explicit ResourceHandler(QDesignerFormWindowInterface *fw); virtual ~ResourceHandler(); -public slots: void updateResources() { updateResourcesHelper(false); } void updateProjectResources() { updateResourcesHelper(true); } |