From 97717b60e66d49b657727f5e0376b9b4c105d8fd Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Tue, 9 Jun 2009 15:52:58 +0200 Subject: [PATCH] class wizards: Do not qualify constructors with explicit, do not use "virtual". Again, consistency with other existing code generators. explicit is only useful for libraries and confuses new users. virtual is not repeated for subclasses in Qt. by other generators either. --- src/plugins/designer/cpp/formclasswizardparameters.cpp | 6 +++--- src/plugins/qt4projectmanager/wizards/libraryparameters.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/designer/cpp/formclasswizardparameters.cpp b/src/plugins/designer/cpp/formclasswizardparameters.cpp index 0132f85bd24..74c6000a287 100644 --- a/src/plugins/designer/cpp/formclasswizardparameters.cpp +++ b/src/plugins/designer/cpp/formclasswizardparameters.cpp @@ -115,13 +115,13 @@ bool FormClassWizardParameters::generateCpp(QString *header, QString *source, in } headerStr << " {\n" << namespaceIndent << indent << "Q_OBJECT\n" << namespaceIndent << "public:\n" - << namespaceIndent << indent << "explicit " << unqualifiedClassName << "(QWidget *parent = 0);\n"; + << namespaceIndent << indent << unqualifiedClassName << "(QWidget *parent = 0);\n"; if (embedding == PointerAggregatedUiClass) - headerStr << namespaceIndent << indent << "virtual ~" << unqualifiedClassName << "();\n"; + headerStr << namespaceIndent << indent << "~" << unqualifiedClassName << "();\n"; // retranslation if (languageChange) headerStr << '\n' << namespaceIndent << "protected:\n" - << namespaceIndent << indent << "virtual void changeEvent(QEvent *e);\n"; + << namespaceIndent << indent << "void changeEvent(QEvent *e);\n"; // Member variable if (embedding != InheritedUiClass) { headerStr << '\n' << namespaceIndent << "private:\n" diff --git a/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp b/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp index a0ad471643a..203382561e6 100644 --- a/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp +++ b/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp @@ -117,7 +117,7 @@ void LibraryParameters::generateCode(QtProjectParameters:: Type t, } headerStr << namespaceIndent << "public:\n"; if (inheritsQObject) { - headerStr << namespaceIndent << indent << "explicit " << unqualifiedClassName << "(QObject *parent = 0);\n"; + headerStr << namespaceIndent << indent << unqualifiedClassName << "(QObject *parent = 0);\n"; } else { headerStr << namespaceIndent << indent << unqualifiedClassName << "();\n"; }