summaryrefslogtreecommitdiffstats
path: root/languages
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-10-21 13:38:34 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-10-21 13:38:34 -0500
commitffc74f031874e3823f212e40a03cb9f25091cb5f (patch)
tree8fee0733f8a83b667665175fabc47269cb093a7c /languages
parent70a3c0d90bf27c502ec710042250d51e2eb8bd99 (diff)
downloadtdevelop-ffc74f031874e3823f212e40a03cb9f25091cb5f.tar.gz
tdevelop-ffc74f031874e3823f212e40a03cb9f25091cb5f.zip
Fix inadvertent tqt changes.
Diffstat (limited to 'languages')
-rw-r--r--languages/cpp/cppimplementationwidget.cpp2
-rw-r--r--languages/cpp/cppnewclassdlg.cpp6
-rw-r--r--languages/cpp/qtdesignercppintegration.cpp2
-rw-r--r--languages/cpp/subclassingdlg.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/languages/cpp/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp
index 9c3bf466..aeb2ae09 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 e08188b2..8cd37938 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 f61b64e2..32d407a4 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 6037f010..f4fd085e 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");