diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 13:38:34 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-11-17 18:35:36 +0100 |
| commit | a660674175fc38adc9a3d232e619cd856034b875 (patch) | |
| tree | c246be2e75a2577ade93ed03c3bac231e83109bd /languages/cpp | |
| parent | 236c8d66c5bbcb9b3790de5f032699f12a95d990 (diff) | |
| download | tdevelop-a660674175fc38adc9a3d232e619cd856034b875.tar.gz tdevelop-a660674175fc38adc9a3d232e619cd856034b875.zip | |
Fix inadvertent tqt changes.
(cherry picked from commit ffc74f031874e3823f212e40a03cb9f25091cb5f)
Diffstat (limited to 'languages/cpp')
| -rw-r--r-- | languages/cpp/cppimplementationwidget.cpp | 2 | ||||
| -rw-r--r-- | languages/cpp/cppnewclassdlg.cpp | 6 | ||||
| -rw-r--r-- | languages/cpp/qtdesignercppintegration.cpp | 2 | ||||
| -rw-r--r-- | languages/cpp/subclassingdlg.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/languages/cpp/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp index 75d01b5f..08ac64c2 100644 --- a/languages/cpp/cppimplementationwidget.cpp +++ b/languages/cpp/cppimplementationwidget.cpp @@ -57,7 +57,7 @@ TQStringList CppImplementationWidget::createClassFiles() template_cpp.replace( TQRegExp( "\\$CLASSINCLUDE\\$" ), fileNameEdit->text() + ".h" ); template_cpp.replace( TQRegExp( "\\$CLASSNAME\\$" ), classNameEdit->text() ); template_cpp.replace( TQRegExp( "\\$BASECLASSNAME\\$" ), m_baseClassName ); - template_cpp.replace( TQRegExp( "\\$TQMOCINCLUDE\\$" ), fileNameEdit->text() + ".tqmoc" ); + template_cpp.replace( TQRegExp( "\\$TQMOCINCLUDE\\$" ), fileNameEdit->text() + ".moc" ); template_h = FileTemplate::read( m_part, "h" ) + template_h; template_cpp = FileTemplate::read( m_part, "cpp" ) + template_cpp; diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp index 4742c6e9..68272116 100644 --- a/languages/cpp/cppnewclassdlg.cpp +++ b/languages/cpp/cppnewclassdlg.cpp @@ -1820,9 +1820,9 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() if ( ( dlg.m_part->project() ) && ( childClass || qobject ) && ( dlg.m_part->project() ->options() & KDevProject::UsesAutotoolsBuildSystem ) ) { - TQString tqmoc = header; - tqmoc.replace( TQRegExp( "\\..*" ), ".tqmoc" ); - classImpl += "#include \"" + tqmoc + "\"\n"; + TQString moc = header; + moc.replace( TQRegExp( "\\..*" ), ".moc" ); + classImpl += "#include \"" + moc + "\"\n"; } if ( dlg.gen_config->reformat_box->isChecked() ) diff --git a/languages/cpp/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp index d709eaf2..c6ba49c8 100644 --- a/languages/cpp/qtdesignercppintegration.cpp +++ b/languages/cpp/qtdesignercppintegration.cpp @@ -158,7 +158,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function } else { - if ( editIface->textLine( line ).contains( TQRegExp( ".*#include .*\\.tqmoc.*" ) ) ) + if ( editIface->textLine( line ).contains( TQRegExp( ".*#include .*\\.moc.*" ) ) ) atLine = line; break; } diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp index d4edb897..50da2d63 100644 --- a/languages/cpp/subclassingdlg.cpp +++ b/languages/cpp/subclassingdlg.cpp @@ -476,7 +476,7 @@ void SubclassingDlg::accept() buffer.replace(TQRegExp("\\$MODULE\\$"),module); buffer.replace(TQRegExp("\\$FILENAME\\$"),basefilename); if ( (m_cppSupport->project()) && (m_cppSupport->project()->options() & KDevProject::UsesAutotoolsBuildSystem)) - buffer += "\n#include \"$NEWFILENAMELC$.tqmoc\"\n"; + buffer += "\n#include \"$NEWFILENAMELC$.moc\"\n"; } else loadBuffer(buffer,m_filename+".cpp"); |