feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

IWizard and derived classses: Fix WS issues

Browse Source 
No change otherwise.

Change-Id: If23c9d56e48e9878c8424fc5863b70e9e4ff12f8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Tobias Hunger
2014-02-13 15:36:40 +01:00
parent 424b9a0036
commit 075e978a8e
13 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/designer/cpp/formclasswizard.h
View File

@@ -50,7 +50,7 @@ public:
private: private:
QWizard *createWizardDialog(QWidget *parent, QWizard *createWizardDialog(QWidget *parent,
const Core::WizardDialogParameters &wizardDialogParameters) const; const Core::WizardDialogParameters &wizardDialogParameters) const;
Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
}; };

2
src/plugins/designer/formwizard.h
View File

@@ -44,7 +44,7 @@ public:
private: private:
QWizard *createWizardDialog(QWidget *parent, QWizard *createWizardDialog(QWidget *parent,
const Core::WizardDialogParameters &wizardDialogParameters) const; const Core::WizardDialogParameters &wizardDialogParameters) const;
Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
}; };

4
src/plugins/glsleditor/glslfilewizard.h
View File

@@ -53,10 +53,10 @@ private:
QString fileContents(const QString &baseName, ShaderType shaderType) const; QString fileContents(const QString &baseName, ShaderType shaderType) const;
QWizard *createWizardDialog(QWidget *parent, QWizard *createWizardDialog(QWidget *parent,
const Core::WizardDialogParameters &wizardDialogParameters) const; const Core::WizardDialogParameters &wizardDialogParameters) const;
Core::GeneratedFiles generateFiles(const QWizard *w, Core::GeneratedFiles generateFiles(const QWizard *w,
QString *errorMessage) const; QString *errorMessage) const;
QString preferredSuffix(ShaderType shaderType) const; QString preferredSuffix(ShaderType shaderType) const;

4
src/plugins/pythoneditor/wizard/pythonfilewizard.h
View File

@@ -43,9 +43,9 @@ public:
protected: protected:
QWizard *createWizardDialog(QWidget *parent, QWizard *createWizardDialog(QWidget *parent,
const Core::WizardDialogParameters &params) const; const Core::WizardDialogParameters &params) const;
Core::GeneratedFiles generateFiles( const QWizard *dialog, QString *errorMessage) const; Core::GeneratedFiles generateFiles(const QWizard *dialog, QString *errorMessage) const;
}; };
} // namespace PythonEditor } // namespace PythonEditor

2
src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.h
View File

@@ -44,7 +44,7 @@ public:
protected: protected:
QWizard *createWizardDialog(QWidget *parent, QWizard *createWizardDialog(QWidget *parent,
const Core::WizardDialogParameters &wizardDialogParameters) const; const Core::WizardDialogParameters &wizardDialogParameters) const;
Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
}; };

2
src/plugins/qmakeprojectmanager/wizards/consoleappwizard.h
View File

@@ -46,7 +46,7 @@ public:
protected: protected:
QWizard *createWizardDialog(QWidget *parent, QWizard *createWizardDialog(QWidget *parent,
const Core::WizardDialogParameters &wizardDialogParameters) const; const Core::WizardDialogParameters &wizardDialogParameters) const;
Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
}; };

2
src/plugins/qmakeprojectmanager/wizards/emptyprojectwizard.h
View File

@@ -44,7 +44,7 @@ public:
private: private:
QWizard *createWizardDialog(QWidget *parent, QWizard *createWizardDialog(QWidget *parent,
const Core::WizardDialogParameters &wizardDialogParameters) const; const Core::WizardDialogParameters &wizardDialogParameters) const;
Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
}; };

2
src/plugins/qmakeprojectmanager/wizards/guiappwizard.h
View File

@@ -46,7 +46,7 @@ public:
private: private:
QWizard *createWizardDialog(QWidget *parent, QWizard *createWizardDialog(QWidget *parent,
const Core::WizardDialogParameters &wizardDialogParameters) const; const Core::WizardDialogParameters &wizardDialogParameters) const;
Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;

2
src/plugins/qmakeprojectmanager/wizards/librarywizard.h
View File

@@ -45,7 +45,7 @@ public:
protected: protected:
QWizard *createWizardDialog(QWidget *parent, QWizard *createWizardDialog(QWidget *parent,
const Core::WizardDialogParameters &wizardDialogParameters) const; const Core::WizardDialogParameters &wizardDialogParameters) const;
Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
}; };

2
src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.h
View File

@@ -44,7 +44,7 @@ public:
private: private:
QWizard *createWizardDialog(QWidget *parent, QWizard *createWizardDialog(QWidget *parent,
const Core::WizardDialogParameters &wizardDialogParameters) const; const Core::WizardDialogParameters &wizardDialogParameters) const;
Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
bool postGenerateFiles(const QWizard *, const Core::GeneratedFiles &l, QString *errorMessage); bool postGenerateFiles(const QWizard *, const Core::GeneratedFiles &l, QString *errorMessage);

2
src/plugins/qmakeprojectmanager/wizards/testwizard.h
View File

@@ -44,7 +44,7 @@ public:
protected: protected:
QWizard *createWizardDialog(QWidget *parent, QWizard *createWizardDialog(QWidget *parent,
const Core::WizardDialogParameters &wizardDialogParameters) const; const Core::WizardDialogParameters &wizardDialogParameters) const;
Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
}; };

2
src/plugins/qmljseditor/jsfilewizard.h
View File

@@ -45,7 +45,7 @@ private:
QString fileContents(const QString &baseName, bool statelessLibrary) const; QString fileContents(const QString &baseName, bool statelessLibrary) const;
QWizard *createWizardDialog(QWidget *parent, QWizard *createWizardDialog(QWidget *parent,
const Core::WizardDialogParameters &wizardDialogParameters) const; const Core::WizardDialogParameters &wizardDialogParameters) const;
Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
}; };

2
src/plugins/texteditor/texteditorplugin.cpp
View File

@@ -114,7 +114,7 @@ public:
} }
void runWizard(const QString &, QWidget *, const QString &, const QVariantMap &) void runWizard(const QString &, QWidget *, const QString &, const QVariantMap &)
{ createFile(); } { createFile(); }
public Q_SLOTS: public Q_SLOTS:
virtual void createFile(); virtual void createFile();