Fix inadvertent tqt changes.

19 files changed, 42 insertions, 42 deletions

diff --git a/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate b/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate
index a69024da..2b33cdac 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 b9158789..bed3b544 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 a7ad0e8b..759a6aa3 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 f1abb9d2..8e60ad7d 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 3440ffa5..2ff17956 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 8c3e28bd..29bb8607 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_TDECORE)
 %{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 529fe0ef..0bf1851f 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 f4552a3c..db1f4bab 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 f3aab0da..5a18baa8 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 95da64db..32c817ce 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 d09cb623..c991c0b3 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 8c6423b6..1b3ad2d3 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 17b45ad3..d16564cf 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 529fe0ef..0bf1851f 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 a2378171..8c7325b9 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"/>