Fix inadvertent tq changes.

(cherry picked from commit c8388916e47a7fdf453c5c83339c362bb016d140)

8 files changed, 25 insertions, 25 deletions

diff --git a/buildtools/autotools/kfilednddetailview.cpp b/buildtools/autotools/kfilednddetailview.cpp
index d3e86b33..745c65b0 100644
--- a/buildtools/autotools/kfilednddetailview.cpp
+++ b/buildtools/autotools/kfilednddetailview.cpp
@@ -207,6 +207,6 @@ void KFileDnDDetailView::setDnDEnabled( bool useDnD ){
 	viewport()->setAcceptDrops( useDnD );
 }
 //-----------------------------------------------
-#ifndef NO_INCLUDE_TQMOCFILES
+#ifndef NO_INCLUDE_MOCFILES
 #include "kfilednddetailview.moc"
 #endif
diff --git a/buildtools/autotools/kfiledndiconview.cpp b/buildtools/autotools/kfiledndiconview.cpp
index d4cccdb8..7bf8a852 100644
--- a/buildtools/autotools/kfiledndiconview.cpp
+++ b/buildtools/autotools/kfiledndiconview.cpp
@@ -189,6 +189,6 @@ bool KFileDnDIconView::acceptDrag(TQDropEvent* e ) const {
 				|| e->action() == TQDropEvent::Link );
 }
 //-----------------------------------------------
-#ifndef NO_INCLUDE_TQMOCFILES
+#ifndef NO_INCLUDE_MOCFILES
 #include "kfiledndiconview.moc"
 #endif
diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui
index f472e598..32886b69 100644
--- a/buildtools/qmake/projectconfigurationdlgbase.ui
+++ b/buildtools/qmake/projectconfigurationdlgbase.ui
@@ -1733,7 +1733,7 @@
                                             <cstring>mocdir_label</cstring>
                                         </property>
                                         <property name="text">
-                                            <string>TQMOC files:</string>
+                                            <string>MOC files:</string>
                                         </property>
                                         <property name="buddy" stdset="0">
                                             <cstring>mocdir_url</cstring>
diff --git a/kdevdesigner/designer/project.cpp b/kdevdesigner/designer/project.cpp
index c2bb3116..4a82188e 100644
--- a/kdevdesigner/designer/project.cpp
+++ b/kdevdesigner/designer/project.cpp
@@ -691,7 +691,7 @@ void Project::save( bool onlyProjectFile )
  	contents +=
  	    "unix {\n"
  	    "  UI_DIR = .ui\n"
- 	    "  TQMOC_DIR = .moc\n"
+ 	    "  MOC_DIR = .moc\n"
  	    "  OBJECTS_DIR = .obj\n"
  	    "}\n";
     }
diff --git a/languages/cpp/app_templates/kscons_kmdi/QUICKSTART b/languages/cpp/app_templates/kscons_kmdi/QUICKSTART
index 53ae8c9e..b6411d09 100644
--- a/languages/cpp/app_templates/kscons_kmdi/QUICKSTART
+++ b/languages/cpp/app_templates/kscons_kmdi/QUICKSTART
@@ -12,7 +12,7 @@ http://freehackers.org/~tnagy/bksys_manual.html
 
 CONFIGURING AND COMPILING THE PROJECT(S)
 SCONS TIPS
-TQMOC PROCESSING
+MOC PROCESSING
 SCONS MINIMUM DISTRIBUTION
 MORE TIPS
 
@@ -61,7 +61,7 @@ checkinstall --fstrans=no --nodoc scons install
 To make scons run (much) faster, consult ./addons/README in bksys
 
 ------------------------------------------
-TQMOC PROCESSING
+MOC PROCESSING
 
 In qt programs, when a header 'foo.h' contains a class that has
 Q_SIGNALS and Q_SLOTS, then 'foo.h' must contain the macro Q_OBJECT
diff --git a/languages/cpp/app_templates/kscons_kxt/QUICKSTART b/languages/cpp/app_templates/kscons_kxt/QUICKSTART
index 53ae8c9e..b6411d09 100644
--- a/languages/cpp/app_templates/kscons_kxt/QUICKSTART
+++ b/languages/cpp/app_templates/kscons_kxt/QUICKSTART
@@ -12,7 +12,7 @@ http://freehackers.org/~tnagy/bksys_manual.html
 
 CONFIGURING AND COMPILING THE PROJECT(S)
 SCONS TIPS
-TQMOC PROCESSING
+MOC PROCESSING
 SCONS MINIMUM DISTRIBUTION
 MORE TIPS
 
@@ -61,7 +61,7 @@ checkinstall --fstrans=no --nodoc scons install
 To make scons run (much) faster, consult ./addons/README in bksys
 
 ------------------------------------------
-TQMOC PROCESSING
+MOC PROCESSING
 
 In qt programs, when a header 'foo.h' contains a class that has
 Q_SIGNALS and Q_SLOTS, then 'foo.h' must contain the macro Q_OBJECT
diff --git a/languages/cpp/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp
index 08ac64c2..9ae6ab66 100644
--- a/languages/cpp/cppimplementationwidget.cpp
+++ b/languages/cpp/cppimplementationwidget.cpp
@@ -46,7 +46,7 @@ TQStringList CppImplementationWidget::createClassFiles()
 	TQString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nQ_OBJECT\nTQ_OBJECT\npublic:\n    $CLASSNAME$(TQWidget *parent = 0, const char *name = 0);\n};\n\n#endif\n";
 	TQString template_cpp = "#include \"$CLASSINCLUDE$\"\n\n$CLASSNAME$::$CLASSNAME$(TQWidget *parent, const char *name)\n    :$BASECLASSNAME$(parent, name)\n{\n}\n";
 	if ( m_part->project() ->options() == KDevProject::UsesAutotoolsBuildSystem )
-		template_cpp += "\n#include \"$TQMOCINCLUDE$\"\n";
+		template_cpp += "\n#include \"$MOCINCLUDE$\"\n";
 
 	TQFileInfo formInfo( m_formName );
 	template_h.replace( TQRegExp( "\\$BASEINCLUDE\\$" ), formInfo.baseName() + ".h" );
@@ -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() + ".moc" );
+	template_cpp.replace( TQRegExp( "\\$MOCINCLUDE\\$" ), fileNameEdit->text() + ".moc" );
 
 	template_h = FileTemplate::read( m_part, "h" ) + template_h;
 	template_cpp = FileTemplate::read( m_part, "cpp" ) + template_cpp;
diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py
index f1c3a0f9..fd256b60 100644
--- a/parts/appwizard/common/scons/admin/kde.py
+++ b/parts/appwizard/common/scons/admin/kde.py
@@ -113,7 +113,7 @@ def detect_kde(env):
 		else:
 			print RED + "moc was not found - set QTDIR or put it in your PATH ?" + NORMAL
 			env.Exit(1)
-	env['QT_TQMOC'] = moc
+	env['QT_MOC'] = moc
 
 	## check for the qt and kde includes
 	print "Checking for the qt includes      : ",
@@ -326,7 +326,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 					# h file with the Q_OBJECT macro found -> add .moc or _moc.cpp file
 					moc_cpp = None
 
-					if env.has_key('NOTQMOCSCAN'):
+					if env.has_key('NOMOCSCAN'):
 						moc_cpp = env.Moc(h)
 					else:
 						reg = '\n\s*#include\s*("|<)'+splitext(cpp.name)[0]+'.moc("|>)'
@@ -369,7 +369,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 		('QTLIBPATH', 'path to the qt libraries'),
 		('QTINCLUDEPATH', 'path to the qt includes'),
 		('QT_UIC', 'moc directory'),
-		('QT_TQMOC', 'moc executable command'),
+		('QT_MOC', 'moc executable command'),
 		('QTPLUGINS', 'uic executable command'),
 		('KDEDIR', 'root of kde directory'),
 		('KDELIBPATH', 'path to the kde libs'),
@@ -412,8 +412,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 	env['QT_UICIMPLPREFIX'] = ''
 	env['QT_UICIMPLSUFFIX'] = '.cpp'
 
-	env['QT_TQMOCHPREFIX']    = ''
-	env['QT_TQMOCHSUFFIX']    = '.moc'
+	env['QT_MOCHPREFIX']    = ''
+	env['QT_MOCHSUFFIX']    = '.moc'
 	env['KDE_KCFG_IMPLPREFIX'] = ''
 	env['KDE_KCFG_IMPL_HSUFFIX'] = '.h'
 	env['KDE_KCFG_IMPL_CSUFFIX'] = '.cpp'
@@ -427,7 +427,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 		inc_moc  = '#include "%s"\n' % target[2].name
 		comp_h   = '$QT_UIC $QT_UIC_HFLAGS -o %s %s' % (target[0].path, source[0].path)
 		comp_c   = '$QT_UIC $QT_UIC_CFLAGS -impl %s %s' % (target[0].path, source[0].path)
-		comp_moc = '$QT_TQMOC -o %s %s' % (target[2].path, target[0].path)
+		comp_moc = '$QT_MOC -o %s %s' % (target[2].path, target[0].path)
 		
 		ret = env.Execute(comp_h)
 		if ret:
@@ -461,8 +461,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 		if len(target) < 3:
 			# third target is .moc file
 			target.append(adjustixes(bs,
-				env.subst('$QT_TQMOCHPREFIX'),
-				env.subst('$QT_TQMOCHSUFFIX')))
+				env.subst('$QT_MOCHPREFIX'),
+				env.subst('$QT_MOCHSUFFIX')))
 		return target, source
 	
 	UIC_BUILDER = Builder(
@@ -472,15 +472,15 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 		src_suffix = '.ui')
 	
 	## moc file processing
-	env['QT_TQMOCCOM'] = ('$QT_TQMOC -o ${TARGETS[0]} $SOURCE')
+	env['QT_MOCCOM'] = ('$QT_MOC -o ${TARGETS[0]} $SOURCE')
 	
-	TQMOC_BUILDER = Builder(
-		action     = '$QT_TQMOCCOM',
+	MOC_BUILDER = Builder(
+		action     = '$QT_MOCCOM',
 		suffix     = '.moc',
 		src_suffix = '.h')
 	
-	TQMOCCPP_BUILDER = Builder(
-		action     = '$QT_TQMOCCOM',
+	MOCCPP_BUILDER = Builder(
+		action     = '$QT_MOCCOM',
 		suffix     = '_moc.cpp',
 		src_suffix = '.h')
 	
@@ -576,8 +576,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 	
 	## register the builders
 	env['BUILDERS']['Uic']       = UIC_BUILDER
-	env['BUILDERS']['Moc']       = TQMOC_BUILDER
-	env['BUILDERS']['Moccpp']    = TQMOCCPP_BUILDER
+	env['BUILDERS']['Moc']       = MOC_BUILDER
+	env['BUILDERS']['Moccpp']    = MOCCPP_BUILDER
 	env['BUILDERS']['Dcop']      = DCOP_BUILDER
 	env['BUILDERS']['Kcfg']      = KCFG_BUILDER
 	env['BUILDERS']['LaFile']    = LA_BUILDER