Designer: De-slot

Change-Id: I6e4a80187646afe342a03ed31c3404fdc27cccc7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Orgad Shaneh
2017-03-18 23:25:06 +02:00
committed by Orgad Shaneh
parent 7694c718db
commit 61d6f84e25
9 changed files with 12 additions and 26 deletions

View File

@@ -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);

View File

@@ -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:

View File

@@ -63,8 +63,6 @@ public:
SharedTools::WidgetHost *formWindowEditorForFormWindow(const QDesignerFormWindowInterface *fw) const;
EditorData activeEditor() const;
public slots:
void resetToDefaultLayout();
private:

View File

@@ -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;

View File

@@ -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;

View File

@@ -68,10 +68,9 @@ public:
signals:
void templateActivated();
private slots:
private:
void slotCurrentTemplateChanged(bool);
private:
QString m_templateContents;
QDesignerNewFormWidgetInterface *m_newFormWidget;
bool m_templateSelected;

View File

@@ -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

View File

@@ -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 &parameterNames);
void slotDesignerHelpRequested(const QString &manual, const QString &document);
void slotSyncSettingsToDesigner();
private:
bool navigateToSlot(const QString &objectName,
const QString &signalSignature,
const QStringList &parameterNames,

View File

@@ -52,7 +52,6 @@ public:
explicit ResourceHandler(QDesignerFormWindowInterface *fw);
virtual ~ResourceHandler();
public slots:
void updateResources() { updateResourcesHelper(false); }
void updateProjectResources() { updateResourcesHelper(true); }