Fix inadvertent tqt changes.

(cherry picked from commit 3d1c7581ff395fc373ca4b8bd8f65b540b37b12f)

24 files changed, 90 insertions, 90 deletions

diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui
index 6c1006b3..f472e598 100644
--- a/buildtools/qmake/projectconfigurationdlgbase.ui
+++ b/buildtools/qmake/projectconfigurationdlgbase.ui
@@ -1730,13 +1730,13 @@
                                     </property>
                                     <widget class="TQLabel">
                                         <property name="name">
-                                            <cstring>tqmocdir_label</cstring>
+                                            <cstring>mocdir_label</cstring>
                                         </property>
                                         <property name="text">
                                             <string>TQMOC files:</string>
                                         </property>
                                         <property name="buddy" stdset="0">
-                                            <cstring>tqmocdir_url</cstring>
+                                            <cstring>mocdir_url</cstring>
                                         </property>
                                     </widget>
                                     <widget class="TQLabel">
@@ -1784,7 +1784,7 @@
                                     </property>
                                     <widget class="KURLRequester">
                                         <property name="name">
-                                            <cstring>tqmocdir_url</cstring>
+                                            <cstring>mocdir_url</cstring>
                                         </property>
                                     </widget>
                                     <widget class="KURLRequester">
@@ -2242,13 +2242,13 @@
         <slot>activateApply(const QString&amp;)</slot>
     </connection>
     <connection>
-        <sender>tqmocdir_url</sender>
+        <sender>mocdir_url</sender>
         <signal>textChanged(const QString&amp;)</signal>
         <receiver>ProjectConfigurationDlgBase</receiver>
         <slot>activateApply(const QString&amp;)</slot>
     </connection>
     <connection>
-        <sender>tqmocdir_url</sender>
+        <sender>mocdir_url</sender>
         <signal>urlSelected(const QString&amp;)</signal>
         <receiver>ProjectConfigurationDlgBase</receiver>
         <slot>activateApply(const QString&amp;)</slot>
@@ -2768,7 +2768,7 @@
     <tabstop>m_debugFlags</tabstop>
     <tabstop>m_releaseFlags</tabstop>
     <tabstop>m_defines</tabstop>
-    <tabstop>tqmocdir_url</tabstop>
+    <tabstop>mocdir_url</tabstop>
     <tabstop>uidir_url</tabstop>
     <tabstop>objdir_url</tabstop>
     <tabstop>rccdir_url</tabstop>
diff --git a/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate b/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate
index 5240b2ee..cd3783f7 100644
--- a/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate
+++ b/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate
@@ -51,11 +51,11 @@ Comment[ja]=共有ライブラリのテンプレートを作成します。同�
 Comment[nds]=Stellt en Vörlaag för en deelt Bibliotheek mit en Testprogramm in C op. Dat Kompileren bruukt ansteed vun de "automake/autoconf/libtool"-Kombinatschoon "CMake" in de Verschoon 2.1 (ut dat cmake-CVS) oder 2.2 (de tokamen Utgaav).
 Comment[ne]=C मा परीक्षण अनुप्रयोग सहितको साझेदारी टेम्प्लेट उत्पन्न गर्दछ । यसले automake/autoconf/libtool संयोजनको सट्टामा CMake निर्माण उपकरण प्रयोग गरेर कम्पाइल गर्दछ । यसका लागि cmake 2.1 (cmake cvs बाट उपलब्ध हुन्छ) वा अब आउने cmake 2.2 उत्पादन आवश्यक पर्दछ ।
 Comment[nl]=Genereert een gedeelde-bibliotheek-sjabloon inclusief een testtoepassing in C. Het compileert met behulp van de CMake build tool in plaats van de combinatie automake/autoconf/libtool. Het vereist cmake 2.1 (beschikbaar in het cvs van cmake) of de aankomende cmake 2.2-uitgave.
-Comment[pl]=Generuje szablon współdzielonej biblioteki zawierający także program testowy w języku C. Kompilacja odbywa sie za potqmocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostępnego z cvs-u cmake) lub nadchodzącej wersji 2.2.
+Comment[pl]=Generuje szablon współdzielonej biblioteki zawierający także program testowy w języku C. Kompilacja odbywa sie za pomocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostępnego z cvs-u cmake) lub nadchodzącej wersji 2.2.
 Comment[pt]=Gera um modelo de uma biblioteca dinâmica, que inclui uma aplicação de testes em C. Ele é compilado com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponível no CVS do 'cmake') ou da próxima versão cmake 2.2.
 Comment[pt_BR]=Gera um modelo de uma biblioteca dinâmica, que inclui uma aplicação de testes em C. Ele é compilado com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponível no CVS do 'cmake') ou da próxima versão cmake 2.2.
 Comment[ru]=Создание шаблона разделяемой библиотеки, включая тестовую программу на C. Для сборки потребуется CMake вместо комбинации automake/autoconf/libtool. Потребуется cmake 2.1 (из CVS cmake) или релиз cmake 2.2.
-Comment[sk]=Vygeneruje šablónu pre zdieľanú knižnicu vrátane testovacej aplikácie v C.Kompiluje sa potqmocou nástroja CMake namiesto kombinácie automake/autoconf/libtool.Vyžaduje cmake 2.1 (dostupné v cmake cvs) alebo nadchádzajúci cmake 2.2 release.
+Comment[sk]=Vygeneruje šablónu pre zdieľanú knižnicu vrátane testovacej aplikácie v C.Kompiluje sa pomocou nástroja CMake namiesto kombinácie automake/autoconf/libtool.Vyžaduje cmake 2.1 (dostupné v cmake cvs) alebo nadchádzajúci cmake 2.2 release.
 Comment[sl]=Ustvari predlogo za deljeno knjižnico in testni program v C. Za prevajanje se namesto kombinacije automake/autoconf/libtool uporabi orodje za gradnjo CMake. Potreben je CMake 2.1 ali CMake 2.2.
 Comment[sr]=Прави шаблон дељене библиотеке, укључујући и пробни програм у C-у. Преводи се помоћу алата CMake уместо комбинације Automake/Autoconf/Libtool. Захтева CMake 2.1 (доступан у CVS-у CMake-а) или надолазеће издање CMake 2.2.
 Comment[sr@Latn]=Pravi šablon deljene biblioteke, uključujući i probni program u C-u. Prevodi se pomoću alata CMake umesto kombinacije Automake/Autoconf/Libtool. Zahteva CMake 2.1 (dostupan u CVS-u CMake-a) ili nadolazeće izdanje CMake 2.2.
diff --git a/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate b/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate
index 8f3d0cf9..e6e6ac44 100644
--- a/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate
+++ b/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate
@@ -51,11 +51,11 @@ Comment[ja]=共有ライブラリのテンプレートを作成します。同�
 Comment[nds]=Stellt en Vörlaag för en deelt Bibliotheek mit en Testprogramm in C++ op. Dat Kompileren bruukt ansteed vun de "automake/autoconf/libtool"-Kombinatschoon "CMake" in de Verschoon 2.1 (ut dat cmake-CVS) oder 2.2 (de tokamen Utgaav).
 Comment[ne]=C++ मा परीक्षण अनुप्रयोग सहितको साझेदारी टेम्प्लेट उत्पन्न गर्दछ । यसले automake/autoconf/libtool संयोजनको सट्टामा CMake निर्माण उपकरण प्रयोग गरेर कम्पाइल गर्दछ । यसका लागि cmake 2.1 (cmake cvs बाट उपलब्ध हुन्छ) वा अब आउने cmake 2.2 उत्पादन आवश्यक पर्दछ ।
 Comment[nl]=Genereert een gedeelde-bibliotheek-sjabloon inclusief een testtoepassing in C++. Het compileert met behulp van de CMake build tool in plaats van de combinatie automake/autoconf/libtool. Het vereist cmake 2.1 (uit het cvs van cmake) of de aankomende cmake 2.2-uitgave.
-Comment[pl]=Generuje szablon współdzielonej biblioteki zawierający także program testowy w języku C++. Kompilacja odbywa sie za potqmocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostępnego z cvs-u cmake) lub nadchodzącej wersji 2.2.
+Comment[pl]=Generuje szablon współdzielonej biblioteki zawierający także program testowy w języku C++. Kompilacja odbywa sie za pomocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostępnego z cvs-u cmake) lub nadchodzącej wersji 2.2.
 Comment[pt]=Gera um modelo de uma biblioteca dinâmica, que inclui uma aplicação de testes em C++. Ele é compilado com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponível no CVS do 'cmake') ou da próxima versão cmake 2.2.
 Comment[pt_BR]=Gera um modelo de uma biblioteca dinâmica, que inclui uma aplicação de testes em C++. Ele é compilado com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponível no CVS do 'cmake') ou da próxima versão cmake 2.2.
 Comment[ru]=Создание шаблона разделяемой библиотеки, включая тестовую программу на C++. Для сборки потребуется CMake вместо комбинации automake/autoconf/libtool. Потребуется cmake 2.1 (из CVS cmake) или релиз cmake 2.2.
-Comment[sk]=Vygeneruje šablónu zdieľanej knižnice vrátane testovacej aplikácie v C++.Kompiluje sa potqmocou nástroja CMake namiesto kombinácie automake/autoconf/libtool.Vyžaduje cmake 2.1 (dostupné v cmake cvs) alebo nadchádzajúci cmake 2.2 release.
+Comment[sk]=Vygeneruje šablónu zdieľanej knižnice vrátane testovacej aplikácie v C++.Kompiluje sa pomocou nástroja CMake namiesto kombinácie automake/autoconf/libtool.Vyžaduje cmake 2.1 (dostupné v cmake cvs) alebo nadchádzajúci cmake 2.2 release.
 Comment[sl]=Ustvari predlogo za deljeno knjižnico in testni program v C++. Za prevajanje se namesto kombinacije automake/autoconf/libtool uporabi orodje za gradnjo CMake. Potreben je CMake 2.1 ali CMake 2.2.
 Comment[sr]=Прави шаблон дељене библиотеке укључујући и пробни програм у C++-у. Преводи се помоћу алата CMake уместо комбинације Automake/Autoconf/Libtool. Захтева CMake 2.1 (доступан у CVS-у CMake-а) или надолазеће издање CMake 2.2.
 Comment[sr@Latn]=Pravi šablon deljene biblioteke uključujući i probni program u C++-u. Prevodi se pomoću alata CMake umesto kombinacije Automake/Autoconf/Libtool. Zahteva CMake 2.1 (dostupan u CVS-u CMake-a) ili nadolazeće izdanje CMake 2.2.
diff --git a/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate b/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate
index a80c8079..2e6032e8 100644
--- a/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate
+++ b/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate
@@ -44,7 +44,7 @@ Comment[it]=Genera un semplice programma di "Hello world" in C++ che usa CMake i
 Comment[ja]=ビルドに automake/autoconf/libtool ではなく CMake を使った簡単な Hello World プログラムを C++ で作成します。CMake 2.1 または 2.2 が必要です。
 Comment[nds]=Stellt en eenfach "Moin Welt"-Programm in C++ op, mit "CMake" ansteed vun de "automake/autoconf/libtool"-Reeg. Nödig is Verschoon 2.1 oder 2.2 vun CMake.
 Comment[nl]=Genereert een eenvoudig Hello World-programma in C++ met behulp van de CMake build tool in plaats van de combinatie automake/autoconf/libtool. Het vereist cmake 2.1 of cmake 2.2.
-Comment[pl]=Generuje prosty program 'Witaj świecie' w języku C++. Kompilacja odbywa sie za potqmocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake w wersji 2.1 lub 2.2.
+Comment[pl]=Generuje prosty program 'Witaj świecie' w języku C++. Kompilacja odbywa sie za pomocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake w wersji 2.1 lub 2.2.
 Comment[pt]=Gera um programa simples Olá Mundo em C++, com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 ou do cmake 2.2.
 Comment[pt_BR]=Gera um programa simples Olá Mundo em C++, com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 ou do cmake 2.2.
 Comment[ru]=Создание простого приложения Hello world на C++. Для сборки потребуется CMake вместо комбинации automake/autoconf/libtool. Потребуется cmake версии 2.1 или 2.2.
diff --git a/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate b/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate
index 3068fdd3..3fc09047 100644
--- a/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate
+++ b/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate
@@ -49,7 +49,7 @@ Comment[ja]=ビルドに automake/autoconf/libtool ではなく CMake を使っ�
 Comment[nds]=Stellt en eenfach "Moin Welt"-Programm in C op mit "CMake" in de Verschoon 2.1 (ut dat cmake-CVS) oder 2.2 (de tokamen Utgaav) ansteed vun de "automake/autoconf/libtool"-Kombinatschoon.
 Comment[ne]= automake/autoconf/libtool संयोजनको सट्टामा CMake निर्माण उपकरण प्रयोग गरेर C मा साधारण हेल्लो वोल्ड कार्यक्रम उत्पन्न गर्दछ । यसलाई cmake 2.1 (cmake cvs बाट उपलब्ध हुन्छ) वा आउदै गरेको cmake 2.2 उत्पादन आवश्यक हुन्छ ।
 Comment[nl]=Genereert een eenvoudig Hello World-programma in C met behulp van de CMake build tool in plaats van de combinatie automake/autoconf/libtool. Het vereist cmake 2.1 (uit het cvs van cmake) of de aankomende cmake 2.2-uitgave.
-Comment[pl]=Generuje prosty program 'Witaj świecie' w języku C. Kompilacja odbywa sie za potqmocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostępnego z cvs-u cmake) lub nadchodzącej wersji 2.2.
+Comment[pl]=Generuje prosty program 'Witaj świecie' w języku C. Kompilacja odbywa sie za pomocą narzędzia CMake zamiast kombinacji automake/autoconf/libtool. Wymaga cmake 2.1 (dostępnego z cvs-u cmake) lub nadchodzącej wersji 2.2.
 Comment[pt]=Gera um programa simples Olá Mundo em C, com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponível no CVS do 'cmake') ou da próxima versão cmake 2.2.
 Comment[pt_BR]=Gera um programa simples Olá Mundo em C, com a ferramenta CMake em vez da combinação automake/autoconf/libtool. Necessita do cmake 2.1 (disponível no CVS do 'cmake') ou da próxima versão cmake 2.2.
 Comment[ru]=Создание простого приложения Hello world на C. Для сборки потребуется CMake вместо комбинации automake/autoconf/libtool. Потребуется cmake 2.1 (из CVS cmake) или релиз cmake 2.2.
diff --git a/languages/cpp/app_templates/generichello/generichello.kdevtemplate b/languages/cpp/app_templates/generichello/generichello.kdevtemplate
index 2c71b0ad..787140ff 100644
--- a/languages/cpp/app_templates/generichello/generichello.kdevtemplate
+++ b/languages/cpp/app_templates/generichello/generichello.kdevtemplate
@@ -18,7 +18,7 @@ Name[ja]=C++ プログラム (シェルスクリプトベースのビルドシ�
 Name[nds]=C++-Programm (Konsoolskript-Opstellsystem)
 Name[ne]=C++ कार्यक्रम (शेल स्क्रिप्ट निर्माण प्रणाली)
 Name[nl]=C++-programma (shellscript build system)
-Name[pl]=Program w C++ (system budowania za potqmocą skryptów powłoki)
+Name[pl]=Program w C++ (system budowania za pomocą skryptów powłoki)
 Name[pt]=Programa em C++ (sistema de compilação em 'shell script')
 Name[pt_BR]=Programa em C++ (sistema de compilação em 'shell script')
 Name[ru]=Приложение C++ (сборка на скриптах командной оболочки)
diff --git a/languages/cpp/app_templates/kapp/src-Makefile.am b/languages/cpp/app_templates/kapp/src-Makefile.am
index 318e274a..58fe4df9 100644
--- a/languages/cpp/app_templates/kapp/src-Makefile.am
+++ b/languages/cpp/app_templates/kapp/src-Makefile.am
@@ -25,7 +25,7 @@ noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h pref.h
 %{APPNAMELC}_client_LDADD   = $(LIB_KDECORE)
 %{APPNAMELC}_client_SOURCES = %{APPNAMELC}_client.cpp
 
-# let autotqmoc handle all of the meta source files (tqmoc)
+# let automoc handle all of the meta source files ((moc))
 METASOURCES = AUTO
 
 messages: rc.cpp
diff --git a/languages/cpp/app_templates/kconfig35/src-Makefile.am b/languages/cpp/app_templates/kconfig35/src-Makefile.am
index 737b7399..d391b8f0 100644
--- a/languages/cpp/app_templates/kconfig35/src-Makefile.am
+++ b/languages/cpp/app_templates/kconfig35/src-Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS = %{APPNAMELC}
 # set the include path for X, qt and KDE
 INCLUDES         = $(all_includes)
 
-# let autotqmoc handle all of the meta source files (tqmoc)
+# let automoc handle all of the meta source files ((moc))
 METASOURCES = AUTO
 
 # the library search path. 
diff --git a/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt b/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt
index c29d33da..2544a271 100644
--- a/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt
+++ b/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt
@@ -9,7 +9,7 @@ set(%{APPNAMELC}_SRCS
    %{APPNAMELC}view.cpp
  )
 
-#kde4_autotqmoc(${%{APPNAMELC}_SRCS})
+#kde4_automoc(${%{APPNAMELC}_SRCS})
 
 kde4_add_ui_files(%{APPNAMELC}_SRCS %{APPNAMELC}view_base.ui prefs_base.ui)
 
diff --git a/languages/cpp/app_templates/kdedcop/src-Makefile.am b/languages/cpp/app_templates/kdedcop/src-Makefile.am
index 69cbe936..70155ed8 100644
--- a/languages/cpp/app_templates/kdedcop/src-Makefile.am
+++ b/languages/cpp/app_templates/kdedcop/src-Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = $(all_includes)
 # these are the headers for your project
 noinst_HEADERS = %{APPNAMELC}.h
 
-# let autotqmoc handle all of the meta source files (tqmoc)
+# let automoc handle all of the meta source files ((moc))
 METASOURCES = AUTO
 
 messages: rc.cpp
diff --git a/languages/cpp/app_templates/kfileplugin/src-Makefile.am b/languages/cpp/app_templates/kfileplugin/src-Makefile.am
index a0395825..d49696a1 100644
--- a/languages/cpp/app_templates/kfileplugin/src-Makefile.am
+++ b/languages/cpp/app_templates/kfileplugin/src-Makefile.am
@@ -11,7 +11,7 @@ kfile_%{APPNAMELC}_la_SOURCES = kfile_%{APPNAMELC}.cpp
 kfile_%{APPNAMELC}_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kfile_%{APPNAMELC}_la_LIBADD = $(LIB_KIO)
 
-# let autotqmoc handle all of the meta source files (tqmoc)
+# let automoc handle all of the meta source files ((moc))
 METASOURCES = AUTO
 
 services_DATA = kfile_%{APPNAMELC}.desktop
diff --git a/languages/cpp/app_templates/khello/src-Makefile.am b/languages/cpp/app_templates/khello/src-Makefile.am
index 9537dc00..1c76ceb1 100644
--- a/languages/cpp/app_templates/khello/src-Makefile.am
+++ b/languages/cpp/app_templates/khello/src-Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = $(all_includes)
 # these are the headers for your project
 noinst_HEADERS = %{APPNAMELC}.h
 
-# let autotqmoc handle all of the meta source files (tqmoc)
+# let automoc handle all of the meta source files ((moc))
 METASOURCES = AUTO
 
 messages: rc.cpp
diff --git a/languages/cpp/app_templates/khello2/src-Makefile.am b/languages/cpp/app_templates/khello2/src-Makefile.am
index 748c54e3..770c7287 100644
--- a/languages/cpp/app_templates/khello2/src-Makefile.am
+++ b/languages/cpp/app_templates/khello2/src-Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = $(all_includes)
 # these are the headers for your project
 noinst_HEADERS = %{APPNAMELC}.h
 
-# let autotqmoc handle all of the meta source files (tqmoc)
+# let automoc handle all of the meta source files ((moc))
 METASOURCES = AUTO
 
 messages: rc.cpp
diff --git a/languages/cpp/app_templates/kpartapp/src-Makefile.am b/languages/cpp/app_templates/kpartapp/src-Makefile.am
index cd5ee2b6..3259b68c 100644
--- a/languages/cpp/app_templates/kpartapp/src-Makefile.am
+++ b/languages/cpp/app_templates/kpartapp/src-Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = $(all_includes)
 # these are the headers for your project
 noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}_part.h
 
-# let autotqmoc handle all of the meta source files (tqmoc)
+# let automoc handle all of the meta source files ((moc))
 METASOURCES = AUTO
 
 messages: rc.cpp
diff --git a/languages/cpp/app_templates/kscons_kmdi/QUICKSTART b/languages/cpp/app_templates/kscons_kmdi/QUICKSTART
index 0ba306bb..53ae8c9e 100644
--- a/languages/cpp/app_templates/kscons_kmdi/QUICKSTART
+++ b/languages/cpp/app_templates/kscons_kmdi/QUICKSTART
@@ -65,16 +65,16 @@ TQMOC 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
-in order to compile. foo_tqmoc.cpp is usually generated, and is 
-used to produce foo_tqmoc.o which is linked with the 
+in order to compile. foo_moc.cpp is usually generated, and is 
+used to produce foo_moc.o which is linked with the 
 program or the library.
 
-In kde programs, 'foo.tqmoc' is generated instead of foo_tqmoc.cpp, 
+In kde programs, 'foo.moc' is generated instead of foo_moc.cpp, 
 and it must be included at the very end of foo.cpp 
 (add #include "foo.moc" : this increases the speed of 
 compilation a *lot* and makes less object files.
 
-Both modes are provided though, see test6-tqmocfiesta/
+Both modes are provided though, see test6-mocfiesta/
 
 ------------------------------------------
 MINIMUM SCONS DISTRIBUTION
@@ -127,7 +127,7 @@ remember that libtool is broken on many systems (invalid flags
 among others), so when you can work without libtool
 (small projects especially), just do it.
 
-** tqmoc processing **
+** moc processing **
 As stated above, you should always add #include "foo.moc"
 for your qt classes (Q_OBJECT) to save precious compilation time.
 
diff --git a/languages/cpp/app_templates/kscons_kmdi/SConscript-src b/languages/cpp/app_templates/kscons_kmdi/SConscript-src
index 9850e2ae..746cdf98 100644
--- a/languages/cpp/app_templates/kscons_kmdi/SConscript-src
+++ b/languages/cpp/app_templates/kscons_kmdi/SConscript-src
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 ## This script is a quick test to demonstrate (and test) 
-## the bksys tqmoc handling '#include "file.moc"' can be added .. or not
+## the bksys moc handling '#include "file.moc"' can be added .. or not
 ##
 ## Thomas Nagy, 2005
 ## This file can be reused freely for any project (see COPYING)
diff --git a/languages/cpp/app_templates/kscons_kxt/QUICKSTART b/languages/cpp/app_templates/kscons_kxt/QUICKSTART
index 0ba306bb..53ae8c9e 100644
--- a/languages/cpp/app_templates/kscons_kxt/QUICKSTART
+++ b/languages/cpp/app_templates/kscons_kxt/QUICKSTART
@@ -65,16 +65,16 @@ TQMOC 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
-in order to compile. foo_tqmoc.cpp is usually generated, and is 
-used to produce foo_tqmoc.o which is linked with the 
+in order to compile. foo_moc.cpp is usually generated, and is 
+used to produce foo_moc.o which is linked with the 
 program or the library.
 
-In kde programs, 'foo.tqmoc' is generated instead of foo_tqmoc.cpp, 
+In kde programs, 'foo.moc' is generated instead of foo_moc.cpp, 
 and it must be included at the very end of foo.cpp 
 (add #include "foo.moc" : this increases the speed of 
 compilation a *lot* and makes less object files.
 
-Both modes are provided though, see test6-tqmocfiesta/
+Both modes are provided though, see test6-mocfiesta/
 
 ------------------------------------------
 MINIMUM SCONS DISTRIBUTION
@@ -127,7 +127,7 @@ remember that libtool is broken on many systems (invalid flags
 among others), so when you can work without libtool
 (small projects especially), just do it.
 
-** tqmoc processing **
+** moc processing **
 As stated above, you should always add #include "foo.moc"
 for your qt classes (Q_OBJECT) to save precious compilation time.
 
diff --git a/languages/cpp/app_templates/kscons_kxt/SConscript-src b/languages/cpp/app_templates/kscons_kxt/SConscript-src
index bc91cc0b..02432be5 100644
--- a/languages/cpp/app_templates/kscons_kxt/SConscript-src
+++ b/languages/cpp/app_templates/kscons_kxt/SConscript-src
@@ -33,7 +33,7 @@ myenv.KDEprogram( "%{APPNAMELC}", %{APPNAMELC}_sources )
 ## Customization
 
 ## Additional include paths for compiling the source files
-## Always add '../' (top-level directory) because tqmoc makes code that needs it
+## Always add '../' (top-level directory) because moc makes code that needs it
 myenv.KDEaddpaths_includes( "./ ../" )
 
 ## Necessary libraries to link against
diff --git a/languages/cpp/app_templates/kxt/src-Makefile.am b/languages/cpp/app_templates/kxt/src-Makefile.am
index 737b7399..d391b8f0 100644
--- a/languages/cpp/app_templates/kxt/src-Makefile.am
+++ b/languages/cpp/app_templates/kxt/src-Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS = %{APPNAMELC}
 # set the include path for X, qt and KDE
 INCLUDES         = $(all_includes)
 
-# let autotqmoc handle all of the meta source files (tqmoc)
+# let automoc handle all of the meta source files ((moc))
 METASOURCES = AUTO
 
 # the library search path. 
diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc
index f9a64f40..857935d1 100644
--- a/languages/cpp/doc/kde2book.toc
+++ b/languages/cpp/doc/kde2book.toc
@@ -38,7 +38,7 @@
     <tocsect3 name="What It Is For (Look and Feel)" url=""/>
     <tocsect3 name="Inside the Qt Toolkit" url="ch03lev1sec2.html"/>
     <tocsect3 name="Signals and Slots" url="ch03lev1sec3.html"/>
-    <tocsect3 name="Meta Object Compiler (tqmoc)" url="ch03lev1sec4.html"/>
+    <tocsect3 name="Meta Object Compiler (moc)" url="ch03lev1sec4.html"/>
     <tocsect3 name="The Utility Classes" url="ch03lev1sec5.html"/>
     <tocsect3 name="Special Features (ImageIO, OpenGL, Mesa)" url="ch03lev1sec6.html"/>
     <tocsect3 name="Summary" url="ch03lev1sec7.html"/>
@@ -1427,7 +1427,7 @@
 <entry name="keyReleaseEvent() event handler, widgets" url="ch04.html"/>
 <entry name="keystrokes, handling, widgets" url="ch04lev1sec4.html"/>
 <entry name="KeyWordSet tag (DocBook)" url="ch15lev1sec2.html"/>
-<entry name="keywords, tqmoc" url="ch03lev1sec4.html"/>
+<entry name="keywords, moc" url="ch03lev1sec4.html"/>
 <entry name="Keyword tag (DocBook)" url="ch15lev1sec2.html"/>
 <entry name="KFileDialog" url="ch05lev1sec3.html"/>
 <entry name="KFontDialog" url="ch05lev1sec3.html"/>
@@ -1750,7 +1750,7 @@
 <entry name="listings, KXOSquare widget, main() method" url="ch04lev1sec2.html"/>
 <entry name="listings, Makefile.am" url="ch16lev1sec2.html"/>
 <entry name="listings, Makefiles, example of" url="ch02lev1sec2.html"/>
-<entry name="listings, tqmoc example" url="ch03lev1sec4.html"/>
+<entry name="listings, moc example" url="ch03lev1sec4.html"/>
 <entry name="listings, MyWindow class implementation" url="ch03lev1sec4.html"/>
 <entry name="listings, network transparency, complete example" url="ch06lev1sec8.html"/>
 <entry name="listings, network transparency, filenames" url="ch06lev1sec8.html"/>
@@ -1886,7 +1886,7 @@
 <entry name="Meta Object Compiler, executing programs" url="ch03lev1sec4.html"/>
 <entry name="Meta Object Compiler, keywords" url="ch03lev1sec4.html"/>
 <entry name="Meta Object Compiler, main program file example" url="ch03lev1sec4.html"/>
-<entry name="Meta Object Compiler (tqmoc)" url="ch03lev1sec2.html"/>
+<entry name="Meta Object Compiler (moc)" url="ch03lev1sec2.html"/>
 <entry name="Meta Object Compiler" url="ch03lev1sec4.html"/>
 <entry name="methods, attach()" url="ch13lev1sec5.html"/>
 <entry name="methods, beginTransaction()" url="ch13lev1sec5.html"/>
@@ -1962,11 +1962,11 @@
 <entry name="MIDI, LibKMid" url="ch14lev1sec6.html"/>
 <entry name="mime resource type" url="ch07lev1sec4.html"/>
 <entry name="Mini application template" url="ch18lev1sec2.html"/>
-<entry name="tqmoc, executing programs" url="ch03lev1sec4.html"/>
-<entry name="tqmoc, keywords" url="ch03lev1sec4.html"/>
-<entry name="tqmoc, main program file example" url="ch03lev1sec4.html"/>
-<entry name="tqmoc (Meta Object Compiler" url="ch03lev1sec2.html"/>
-<entry name="tqmoc" url="ch03lev1sec4.html"/>
+<entry name="moc, executing programs" url="ch03lev1sec4.html"/>
+<entry name="moc, keywords" url="ch03lev1sec4.html"/>
+<entry name="moc, main program file example" url="ch03lev1sec4.html"/>
+<entry name="moc (Meta Object Compiler" url="ch03lev1sec2.html"/>
+<entry name="moc" url="ch03lev1sec4.html"/>
 <entry name="modalCheck() method" url="ch10lev1sec3.html"/>
 <entry name="modal dialog boxes, advantages/disadvantages" url="ch08lev1sec3.html"/>
 <entry name="modal dialog boxes, modal dialog allocated from the heap" url="ch08lev1sec3.html"/>
@@ -2298,11 +2298,11 @@
 <entry name="Qt library, supported image formats" url="ch10lev1sec2.html"/>
 <entry name="Qt, license, FreeQt" url="ch19lev1sec3.html"/>
 <entry name="Qt, Mesa" url="ch03lev1sec6.html"/>
-<entry name="Qt, tqmoc, executing programs" url="ch03lev1sec4.html"/>
-<entry name="Qt, tqmoc, keywords" url="ch03lev1sec4.html"/>
-<entry name="Qt, tqmoc, main program file example" url="ch03lev1sec4.html"/>
-<entry name="Qt, tqmoc (Meta Object Compiler)" url="ch03lev1sec2.html"/>
-<entry name="Qt, tqmoc" url="ch03lev1sec4.html"/>
+<entry name="Qt, moc, executing programs" url="ch03lev1sec4.html"/>
+<entry name="Qt, moc, keywords" url="ch03lev1sec4.html"/>
+<entry name="Qt, moc, main program file example" url="ch03lev1sec4.html"/>
+<entry name="Qt, moc (Meta Object Compiler)" url="ch03lev1sec2.html"/>
+<entry name="Qt, moc" url="ch03lev1sec4.html"/>
 <entry name="Qt, OpenGL" url="ch03lev1sec6.html"/>
 <entry name="Qt, paremeters" url="ch03lev1sec3.html"/>
 <entry name="Qt, QObject class" url="ch03lev1sec2.html"/>
diff --git a/languages/ruby/app_templates/kapp/src-Makefile.am b/languages/ruby/app_templates/kapp/src-Makefile.am
index ad999e1c..c496d754 100644
--- a/languages/ruby/app_templates/kapp/src-Makefile.am
+++ b/languages/ruby/app_templates/kapp/src-Makefile.am
@@ -16,7 +16,7 @@ INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR)
 # which sources should be compiled for %{APPNAMELC}
 %{APPNAMELC}_SOURCES = %{APPNAMELC}.cpp
 
-# let autotqmoc handle all of the meta source files (tqmoc)
+# let automoc handle all of the meta source files ((moc))
 METASOURCES = AUTO
 
 KDE_ICON = AUTO
diff --git a/languages/ruby/app_templates/kxt/src-Makefile.am b/languages/ruby/app_templates/kxt/src-Makefile.am
index e121d0bc..edb9d6e8 100644
--- a/languages/ruby/app_templates/kxt/src-Makefile.am
+++ b/languages/ruby/app_templates/kxt/src-Makefile.am
@@ -16,7 +16,7 @@ INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR)
 # which sources should be compiled for %{APPNAMELC}
 %{APPNAMELC}_SOURCES = %{APPNAMELC}.cpp
 
-# let autotqmoc handle all of the meta source files (tqmoc)
+# let automoc handle all of the meta source files ((moc))
 METASOURCES = AUTO
 
 KDE_ICON = AUTO
diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py
index f74943dd..f1c3a0f9 100644
--- a/parts/appwizard/common/scons/admin/kde.py
+++ b/parts/appwizard/common/scons/admin/kde.py
@@ -81,7 +81,7 @@ def detect_kde(env):
 			env.Exit(1)
 	env['QTDIR'] = qtdir.strip()
 
-	## Find the necessary programs uic and tqmoc
+	## Find the necessary programs uic and moc
 	print "Checking for uic                  : ",
 	uic = qtdir + "/bin/uic"
 	if os.path.isfile(uic):
@@ -99,21 +99,21 @@ def detect_kde(env):
 				env.Exit(1)
 	env['QT_UIC'] = uic
 
-	print "Checking for tqmoc                  : ",
-	tqmoc = qtdir + "/bin/tqmoc"
-	if os.path.isfile(tqmoc):
-		print GREEN + "tqmoc was found as " + tqmoc + NORMAL
+	print "Checking for moc                  : ",
+	moc = qtdir + "/bin/moc"
+	if os.path.isfile(moc):
+		print GREEN + "moc was found as " + moc + NORMAL
 	else:
-		tqmoc = os.popen("which tqmoc 2>/dev/null").read().strip()
-		if len(tqmoc):
-			print YELLOW + "tqmoc was found as " + tqmoc + NORMAL
-		elif os.path.isfile("/usr/share/qt3/bin/tqmoc"):
-			tqmoc = "/usr/share/qt3/bin/tqmoc"
-			print YELLOW + "tqmoc was found as " + tqmoc + NORMAL
+		moc = os.popen("which moc 2>/dev/null").read().strip()
+		if len(moc):
+			print YELLOW + "moc was found as " + moc + NORMAL
+		elif os.path.isfile("/usr/share/qt3/bin/moc"):
+			moc = "/usr/share/qt3/bin/moc"
+			print YELLOW + "moc was found as " + moc + NORMAL
 		else:
-			print RED + "tqmoc was not found - set QTDIR or put it in your PATH ?" + NORMAL
+			print RED + "moc was not found - set QTDIR or put it in your PATH ?" + NORMAL
 			env.Exit(1)
-	env['QT_TQMOC'] = tqmoc
+	env['QT_TQMOC'] = moc
 
 	## check for the qt and kde includes
 	print "Checking for the qt includes      : ",
@@ -204,7 +204,7 @@ def detect_kde(env):
 	env['QTLIBPATH']=qtlibs
 
 def generate(env):
-	""""Set up the qt and kde environment and builders - the tqmoc part is difficult to understand """
+	""""Set up the qt and kde environment and builders - the moc part is difficult to understand """
 	if env['HELP']:
 		print """
 """+BOLD+"""*** KDE options ***
@@ -270,7 +270,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 			# The following is kind of hacky to get builders working properly (FIXME) ??
 			objBuilderEnv = objBuilder.env
 			objBuilder.env = env
-			tqmocBuilderEnv = env.Moc.env
+			mocBuilderEnv = env.Moc.env
 			env.Moc.env = env
 
 			# make a deep copy for the result; MocH objects will be appended
@@ -323,22 +323,22 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 				if not h and qtdebug:
 					print "scons: qt: no header for '%s'." % (str(cpp))
 				if h and q_object_search.search(h_contents):
-					# h file with the Q_OBJECT macro found -> add .tqmoc or _tqmoc.cpp file
-					tqmoc_cpp = None
+					# h file with the Q_OBJECT macro found -> add .moc or _moc.cpp file
+					moc_cpp = None
 
 					if env.has_key('NOTQMOCSCAN'):
-						tqmoc_cpp = env.Moc(h)
+						moc_cpp = env.Moc(h)
 					else:
-						reg = '\n\s*#include\s*("|<)'+splitext(cpp.name)[0]+'.tqmoc("|>)'
+						reg = '\n\s*#include\s*("|<)'+splitext(cpp.name)[0]+'.moc("|>)'
 						meta_object_search = re.compile(reg)
 						if meta_object_search.search(cpp_contents):
-							tqmoc_cpp = env.Moc(h)
+							moc_cpp = env.Moc(h)
 						else:
-							tqmoc_cpp = env.Moccpp(h)
-							tqmoc_o = objBuilder(tqmoc_cpp)
-							out_sources.append(tqmoc_o)
+							moc_cpp = env.Moccpp(h)
+							moc_o = objBuilder(moc_cpp)
+							out_sources.append(moc_o)
 					if qtdebug:
-						print "scons: qt: found Q_OBJECT macro in '%s', tqmoc'ing to '%s'" % (str(h), str(tqmoc_cpp[0]))
+						print "scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(h), str(moc_cpp[0]))
 	
 				if cpp and q_object_search.search(cpp_contents):
 					print "error, bksys cannot handle cpp files with Q_OBJECT classes"
@@ -347,7 +347,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 
 			# restore the original env attributes (FIXME)
 			objBuilder.env = objBuilderEnv
-			env.Moc.env = tqmocBuilderEnv
+			env.Moc.env = mocBuilderEnv
 
 			return (target, out_sources)
 	
@@ -368,8 +368,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 		('QTDIR', 'root of qt directory'),
 		('QTLIBPATH', 'path to the qt libraries'),
 		('QTINCLUDEPATH', 'path to the qt includes'),
-		('QT_UIC', 'tqmoc directory'),
-		('QT_TQMOC', 'tqmoc executable command'),
+		('QT_UIC', 'moc directory'),
+		('QT_TQMOC', 'moc executable command'),
 		('QTPLUGINS', 'uic executable command'),
 		('KDEDIR', 'root of kde directory'),
 		('KDELIBPATH', 'path to the kde libs'),
@@ -413,7 +413,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 	env['QT_UICIMPLSUFFIX'] = '.cpp'
 
 	env['QT_TQMOCHPREFIX']    = ''
-	env['QT_TQMOCHSUFFIX']    = '.tqmoc'
+	env['QT_TQMOCHSUFFIX']    = '.moc'
 	env['KDE_KCFG_IMPLPREFIX'] = ''
 	env['KDE_KCFG_IMPL_HSUFFIX'] = '.h'
 	env['KDE_KCFG_IMPL_CSUFFIX'] = '.cpp'
@@ -424,10 +424,10 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 	## ui file processing
 	def uic_processing(target, source, env):
 		inc_kde  = '#include <klocale.h>\n#include <kdialog.h>\n'
-		inc_tqmoc  = '#include "%s"\n' % target[2].name
+		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_tqmoc = '$QT_TQMOC -o %s %s' % (target[2].path, target[0].path)
+		comp_moc = '$QT_TQMOC -o %s %s' % (target[2].path, target[0].path)
 		
 		ret = env.Execute(comp_h)
 		if ret:
@@ -442,10 +442,10 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 			return ret
 
 		dest = open( target[1].path, "a" )
-		dest.write(inc_tqmoc)
+		dest.write(inc_moc)
 		dest.close()
 
-		ret = env.Execute( comp_tqmoc )
+		ret = env.Execute( comp_moc )
 		return ret
 	
 	def uicEmitter(target, source, env):
@@ -459,7 +459,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 				env.subst('$QT_UICIMPLPREFIX'),
 				env.subst('$QT_UICIMPLSUFFIX')))
 		if len(target) < 3:
-			# third target is .tqmoc file
+			# third target is .moc file
 			target.append(adjustixes(bs,
 				env.subst('$QT_TQMOCHPREFIX'),
 				env.subst('$QT_TQMOCHSUFFIX')))
@@ -471,17 +471,17 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 		suffix     = '.h',
 		src_suffix = '.ui')
 	
-	## tqmoc file processing
+	## moc file processing
 	env['QT_TQMOCCOM'] = ('$QT_TQMOC -o ${TARGETS[0]} $SOURCE')
 	
 	TQMOC_BUILDER = Builder(
 		action     = '$QT_TQMOCCOM',
-		suffix     = '.tqmoc',
+		suffix     = '.moc',
 		src_suffix = '.h')
 	
 	TQMOCCPP_BUILDER = Builder(
 		action     = '$QT_TQMOCCOM',
-		suffix     = '_tqmoc.cpp',
+		suffix     = '_moc.cpp',
 		src_suffix = '.h')
 	
 	## kcfg file processing
@@ -596,7 +596,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 	static_obj.src_builder.append('Transfiles')
 	shared_obj.src_builder.append('Transfiles')
 
-	## Find the files to tqmoc, dcop, and link against kde and qt
+	## Find the files to moc, dcop, and link against kde and qt
 	env.AppendUnique(PROGEMITTER = [MetasourcesStatic], SHLIBEMITTER=[MetasourcesShared], LIBEMITTER =[MetasourcesStatic])
 
 	## Handy helpers for building kde programs
@@ -631,9 +631,9 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 			if ext in skel_ext:
 				lenv.Dcop(bs+'.h')
 				src.append(bs+'_skel.cpp')
-			elif ext == ".tqmoch":
+			elif ext == ".moch":
 				lenv.Moccpp(bs+'.h')
-				src.append(bs+'_tqmoc.cpp')
+				src.append(bs+'_moc.cpp')
 			else:
 				src.append(file)
 
diff --git a/parts/astyle/astyleconfig.ui b/parts/astyle/astyleconfig.ui
index fd68fe48..baed83ea 100644
--- a/parts/astyle/astyleconfig.ui
+++ b/parts/astyle/astyleconfig.ui
@@ -254,7 +254,7 @@ Settings/Configure Kdevelop/Formatting.</string>
 *.cc *.hh 
 *.c++ *.h++
 *.inl *.tlh
-*.tqmoc *.xpm
+*.moc *.xpm
 *.diff *.patch
 *.java</string>
                                 </property>