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

Remove Q_DISABLE_COPY from generated classes. QObject already defines it.

Browse Source 
Revieved-By: dt
This commit is contained in:
Daniel Molkentin
2009-06-09 13:50:37 +02:00
parent fde603d887
commit 1d50f02494
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/designer/cpp/formclasswizardparameters.cpp
View File

@@ -114,7 +114,6 @@ bool FormClassWizardParameters::generateCpp(QString *header, QString *source, in
headerStr << ", private " << uiClassName; headerStr << ", private " << uiClassName;
} }
headerStr << " {\n" << namespaceIndent << indent << "Q_OBJECT\n" headerStr << " {\n" << namespaceIndent << indent << "Q_OBJECT\n"
<< namespaceIndent << indent << "Q_DISABLE_COPY(" << unqualifiedClassName << ")\n"
<< namespaceIndent << "public:\n" << namespaceIndent << "public:\n"
<< namespaceIndent << indent << "explicit " << unqualifiedClassName << "(QWidget *parent = 0);\n"; << namespaceIndent << indent << "explicit " << unqualifiedClassName << "(QWidget *parent = 0);\n";
if (embedding == PointerAggregatedUiClass) if (embedding == PointerAggregatedUiClass)

3
src/plugins/qt4projectmanager/wizards/libraryparameters.cpp
View File

@@ -113,8 +113,7 @@ void LibraryParameters::generateCode(QtProjectParameters:: Type t,
// Is this a QObject (plugin) // Is this a QObject (plugin)
const bool inheritsQObject = t == QtProjectParameters::Qt4Plugin; const bool inheritsQObject = t == QtProjectParameters::Qt4Plugin;
if (inheritsQObject) { if (inheritsQObject) {
headerStr << namespaceIndent << indent << "Q_OBJECT\n" headerStr << namespaceIndent << indent << "Q_OBJECT\n";
<< namespaceIndent << indent << "Q_DISABLE_COPY(" << unqualifiedClassName << ")\n";
} }
headerStr << namespaceIndent << "public:\n"; headerStr << namespaceIndent << "public:\n";
if (inheritsQObject) { if (inheritsQObject) {