Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

44 files changed, 77 insertions, 77 deletions

diff --git a/win/pro_files/README.pro_files b/win/pro_files/README.pro_files
index ba0a915f0..2192750f3 100644
--- a/win/pro_files/README.pro_files
+++ b/win/pro_files/README.pro_files
@@ -3,7 +3,7 @@ kdelibs/win32 .pro files
 (c) 2003-2005, Jaroslaw Staniek
 
 Add this directory to your PATH.
-Cygwin or (other bash tqreplacement) required.
+Cygwin or (other bash replacement) required.
 
 Please copy .pro files to destination kdelibs/ 
 subdirectores using update_kdelibs_pro_files scipt.
diff --git a/win/pro_files/dcop/KDE-ICE/KDE-ICE.pro b/win/pro_files/dcop/KDE-ICE/KDE-ICE.pro
index 6057fe6c1..d74a769a8 100644
--- a/win/pro_files/dcop/KDE-ICE/KDE-ICE.pro
+++ b/win/pro_files/dcop/KDE-ICE/KDE-ICE.pro
@@ -6,7 +6,7 @@ DEFINES += ICE_t TRANS_SERVER TRANS_CLIENT SOCKCONN TCPCONN ANSICPP
 
 TARGET = kdeice$$KDEBUG$(KDE_VER)
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 DEF_FILE = kde-ice.def
 
diff --git a/win/pro_files/dcop/client/client.pro b/win/pro_files/dcop/client/client.pro
index 44ae9ff67..4df64db5b 100644
--- a/win/pro_files/dcop/client/client.pro
+++ b/win/pro_files/dcop/client/client.pro
@@ -9,9 +9,9 @@ DEFINES += KDECORE_EXPORT=
 
 TARGET		= dcopclient
 
-#system( bash ktqmoc .. )
+#system( bash kmoc .. )
 
-#INCLUDEPATH += .. ../tqmoc
+#INCLUDEPATH += .. ../moc
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/dcop/client/dcop/dcop.pro b/win/pro_files/dcop/client/dcop/dcop.pro
index bafeb4fb6..99911eedb 100644
--- a/win/pro_files/dcop/client/dcop/dcop.pro
+++ b/win/pro_files/dcop/client/dcop/dcop.pro
@@ -9,9 +9,9 @@ DEFINES += KDECORE_EXPORT=
 
 TARGET		= dcop
 
-#system( bash ktqmoc .. )
+#system( bash kmoc .. )
 
-#INCLUDEPATH += .. ../tqmoc
+#INCLUDEPATH += .. ../moc
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/dcop/client/dcopfind/dcopfind.pro b/win/pro_files/dcop/client/dcopfind/dcopfind.pro
index 3239526f0..315dcf5a2 100644
--- a/win/pro_files/dcop/client/dcopfind/dcopfind.pro
+++ b/win/pro_files/dcop/client/dcopfind/dcopfind.pro
@@ -7,12 +7,12 @@ include( $(KDELIBS)/win/common.pro )
 
 DEFINES += KDECORE_EXPORT=
 
-TARGET		= dcoptqfind
+TARGET		= dcopfind
 
-#system( bash ktqmoc .. )
+#system( bash kmoc .. )
 
-#INCLUDEPATH += .. ../tqmoc
+#INCLUDEPATH += .. ../moc
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
 
-SOURCES	+= ../dcoptqfind.cpp
+SOURCES	+= ../dcopfind.cpp
diff --git a/win/pro_files/dcop/client/dcopref/dcopref.pro b/win/pro_files/dcop/client/dcopref/dcopref.pro
index babd68f90..13370884c 100644
--- a/win/pro_files/dcop/client/dcopref/dcopref.pro
+++ b/win/pro_files/dcop/client/dcopref/dcopref.pro
@@ -9,9 +9,9 @@ DEFINES += KDECORE_EXPORT=
 
 TARGET		= dcopref
 
-#system( bash ktqmoc .. )
+#system( bash kmoc .. )
 
-#INCLUDEPATH += .. ../tqmoc
+#INCLUDEPATH += .. ../moc
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/dcop/dcop.pro b/win/pro_files/dcop/dcop.pro
index 885d3cc90..7758cbb7b 100644
--- a/win/pro_files/dcop/dcop.pro
+++ b/win/pro_files/dcop/dcop.pro
@@ -7,7 +7,7 @@ DEFINES += MAKE_DCOP_LIB
 
 TARGET		= dcop$$KDEBUG
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 LIBS += $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/dcop/dcopserver/dcopserver.pro b/win/pro_files/dcop/dcopserver/dcopserver.pro
index a16c3ae4e..46c7b31e9 100644
--- a/win/pro_files/dcop/dcopserver/dcopserver.pro
+++ b/win/pro_files/dcop/dcopserver/dcopserver.pro
@@ -9,9 +9,9 @@ DEFINES += MAKE_DCOP_LIB
 
 TARGET		= dcopserver
 
-system( bash ktqmoc .. )
+system( bash kmoc .. )
 
-INCLUDEPATH += .. ../tqmoc
+INCLUDEPATH += .. ../moc
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/dcop/dcopserver_shutdown/dcopserver_shutdown.pro b/win/pro_files/dcop/dcopserver_shutdown/dcopserver_shutdown.pro
index 423e69ac9..c08d3c192 100644
--- a/win/pro_files/dcop/dcopserver_shutdown/dcopserver_shutdown.pro
+++ b/win/pro_files/dcop/dcopserver_shutdown/dcopserver_shutdown.pro
@@ -8,9 +8,9 @@ DEFINES += MAKE_DCOP_LIB
 
 TARGET		= dcopserver_shutdown
 
-system( bash ktqmoc .. )
+system( bash kmoc .. )
 
-INCLUDEPATH += .. ../tqmoc
+INCLUDEPATH += .. ../moc
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/dcop/testdcop/testdcop.pro b/win/pro_files/dcop/testdcop/testdcop.pro
index 55fbb8369..9876e2815 100644
--- a/win/pro_files/dcop/testdcop/testdcop.pro
+++ b/win/pro_files/dcop/testdcop/testdcop.pro
@@ -5,9 +5,9 @@ include( $(KDELIBS)/win/common.pro )
 TARGET = testdcop
 DESTDIR = .
 
-system( bash ktqmoc .. )
+system( bash kmoc .. )
 
-INCLUDEPATH += ../tqmoc
+INCLUDEPATH += ../moc
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/dcop/tests/dcop_test.pro b/win/pro_files/dcop/tests/dcop_test.pro
index 9a06150cc..4b390dd1d 100644
--- a/win/pro_files/dcop/tests/dcop_test.pro
+++ b/win/pro_files/dcop/tests/dcop_test.pro
@@ -5,10 +5,10 @@ include( $(KDELIBS)/win/common.pro )
 TARGET = dcop_test
 DESTDIR = .
 
-system( bash ktqmoc )
+system( bash kmoc )
 system( bash kdcopidl )
 
-INCLUDEPATH += .. ../tqmoc
+INCLUDEPATH += .. ../moc
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/dcop/tests/driver.pro b/win/pro_files/dcop/tests/driver.pro
index a82c8f3f1..215a8596e 100644
--- a/win/pro_files/dcop/tests/driver.pro
+++ b/win/pro_files/dcop/tests/driver.pro
@@ -5,10 +5,10 @@ include( $(KDELIBS)/win/common.pro )
 TARGET = driver
 DESTDIR = .
 
-system( bash ktqmoc )
+system( bash kmoc )
 system( bash kdcopidl )
 
-INCLUDEPATH += .. ../tqmoc
+INCLUDEPATH += .. ../moc
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/dcop/tests/tests.pro b/win/pro_files/dcop/tests/tests.pro
index 1799041ed..fd5d7cab5 100644
--- a/win/pro_files/dcop/tests/tests.pro
+++ b/win/pro_files/dcop/tests/tests.pro
@@ -7,9 +7,9 @@ DEFINES += MAKE_DCOP_LIB
 
 TARGET		= testdcop
 
-system( bash ktqmoc .. )
+system( bash kmoc .. )
 
-INCLUDEPATH += .. ../tqmoc
+INCLUDEPATH += .. ../moc
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/interfaces/ktexteditor/ktexteditor.pro b/win/pro_files/interfaces/ktexteditor/ktexteditor.pro
index c7d9891dd..45678e6ff 100644
--- a/win/pro_files/interfaces/ktexteditor/ktexteditor.pro
+++ b/win/pro_files/interfaces/ktexteditor/ktexteditor.pro
@@ -14,7 +14,7 @@ INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/ktexteditor \
 
 TARGET		= ktexteditor$$KDEBUG
 
-system( bash ktqmoc )
+system( bash kmoc )
 system( bash kdcopidl )
 
 SOURCES = \
diff --git a/win/pro_files/kabc/kabc.pro b/win/pro_files/kabc/kabc.pro
index 0070c1c96..d7826b319 100644
--- a/win/pro_files/kabc/kabc.pro
+++ b/win/pro_files/kabc/kabc.pro
@@ -11,7 +11,7 @@ LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdeui$$KDELIB_SUF
 INCLUDEPATH += $(KDELIBS)/kabc/vcard/include $(KDELIBS)/kabc/vcard/include/generated \
 	$(KDELIBS)/kabc/vcardparser
 
-system( bash ktqmoc )
+system( bash kmoc )
 system( bash kdcopidl )
 system( cd scripts && perl.exe makeaddressee )
 
diff --git a/win/pro_files/kabc/vcard/vcard.pro b/win/pro_files/kabc/vcard/vcard.pro
index 22709c549..7ccf215bc 100644
--- a/win/pro_files/kabc/vcard/vcard.pro
+++ b/win/pro_files/kabc/vcard/vcard.pro
@@ -10,7 +10,7 @@ LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX
 INCLUDEPATH += $(KDELIBS)/kabc/vcard/include $(KDELIBS)/kabc/vcard/include/generated \
 	$(KDELIBS)/kabc/vcardparser
 
-system( bash ktqmoc )
+system( bash kmoc )
 system( bash kdcopidl )
 
 TARGET		= kvcard$$KDEBUG
diff --git a/win/pro_files/kate/interfaces/interfaces.pro b/win/pro_files/kate/interfaces/interfaces.pro
index 78750e008..e327fed37 100644
--- a/win/pro_files/kate/interfaces/interfaces.pro
+++ b/win/pro_files/kate/interfaces/interfaces.pro
@@ -13,7 +13,7 @@ LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeui$$KDELIB_SUF
 
 INCLUDEPATH += $(KDELIBS)/interfaces
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 katecmd.cpp \
diff --git a/win/pro_files/kate/part/part.pro b/win/pro_files/kate/part/part.pro
index b1f8fb64d..82a9aa046 100644
--- a/win/pro_files/kate/part/part.pro
+++ b/win/pro_files/kate/part/part.pro
@@ -17,7 +17,7 @@ LIBS += $$KDELIBDESTDIR/katepartinterfaces$$KDELIB_SUFFIX \
 INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/kregexpeditor \
 	$(KDELIBS)/kutils $(KDELIBS)/kdeprint
 
-system( bash ktqmoc )
+system( bash kmoc )
 system( bash kdcopidl )
 
 SOURCES = \
diff --git a/win/pro_files/kdecore/kconfig_compiler/kconfig_compiler.pro b/win/pro_files/kdecore/kconfig_compiler/kconfig_compiler.pro
index fe0a85fd5..5b8272185 100644
--- a/win/pro_files/kdecore/kconfig_compiler/kconfig_compiler.pro
+++ b/win/pro_files/kdecore/kconfig_compiler/kconfig_compiler.pro
@@ -9,7 +9,7 @@ win32 {
 #CONFIG += windows
 }
 
-#system( bash ktqmoc )
+#system( bash kmoc )
 
 SOURCES = kconfig_compiler.cpp
 
diff --git a/win/pro_files/kdecore/kdecore.pro b/win/pro_files/kdecore/kdecore.pro
index 58093bb64..183835a43 100644
--- a/win/pro_files/kdecore/kdecore.pro
+++ b/win/pro_files/kdecore/kdecore.pro
@@ -14,7 +14,7 @@ TARGET		= kdecore$$KDEBUG
 
 INCLUDEPATH += $(KDELIBS)/libltdl $(KDELIBS)/kdecore/network
 
-system( bash ktqmoc )
+system( bash kmoc )
 system( bash kdcopidl )
 
 SOURCES += \
diff --git a/win/pro_files/kded/kded.pro b/win/pro_files/kded/kded.pro
index 2c97c420a..05f2455cc 100644
--- a/win/pro_files/kded/kded.pro
+++ b/win/pro_files/kded/kded.pro
@@ -9,13 +9,13 @@ LIBS+=$(KDELIBS)/win/resources/kbuildsycoca.res
 
 INCLUDEPATH += $(KDELIBS)/kded
 
-system( bash ktqmoc )
+system( bash kmoc )
 
-!tqcontains(CONFIG,GUI) {
-	!tqcontains(KW_CONFIG,release) {
+!contains(CONFIG,GUI) {
+	!contains(KW_CONFIG,release) {
 		TARGET = kbuildsycoca_d
 	}
-	tqcontains(KW_CONFIG,release) {
+	contains(KW_CONFIG,release) {
 		TARGET = kbuildsycoca
 	}
 }
diff --git a/win/pro_files/kded/kded_rel.pro b/win/pro_files/kded/kded_rel.pro
index 7c37884b7..a878305ba 100644
--- a/win/pro_files/kded/kded_rel.pro
+++ b/win/pro_files/kded/kded_rel.pro
@@ -2,7 +2,7 @@
 
 QMAKE_CXXFLAGS += -DKBUILDSYCOCA_GUI
 
-!tqcontains(KW_CONFIG,release) {
+!contains(KW_CONFIG,release) {
 	KW_CONFIG = debug windows
 	KDEBUG=_d
 }
diff --git a/win/pro_files/kdefx/kdefx.pro b/win/pro_files/kdefx/kdefx.pro
index 7d84f2b3a..6c9ba4a22 100644
--- a/win/pro_files/kdefx/kdefx.pro
+++ b/win/pro_files/kdefx/kdefx.pro
@@ -8,7 +8,7 @@ DEFINES += MAKE_KDEFX_LIB
 
 TARGET		= kdefx$$KDEBUG
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 kimageeffect.cpp \
diff --git a/win/pro_files/kdefx/kdefx_rel.pro b/win/pro_files/kdefx/kdefx_rel.pro
index 0062498bd..177836f03 100644
--- a/win/pro_files/kdefx/kdefx_rel.pro
+++ b/win/pro_files/kdefx/kdefx_rel.pro
@@ -10,7 +10,7 @@ include( $(KDELIBS)/win/common.pro )
 # needed to export library classes:
 DEFINES += MAKE_KDEFX_LIB
 
-system( tqmoc kstyle.h -o tqmoc/kstyle.moc )
+system( moc kstyle.h -o moc/kstyle.moc )
 
 LIBS -= "$(KDEDIR)\lib\kdewin32_$(KDE_VER).lib" "$(KDEDIR)\lib\ltdl_$(KDE_VER).lib"
 
diff --git a/win/pro_files/kdeui/kdeui.pro b/win/pro_files/kdeui/kdeui.pro
index 3d4b259a5..13404b3a8 100644
--- a/win/pro_files/kdeui/kdeui.pro
+++ b/win/pro_files/kdeui/kdeui.pro
@@ -9,7 +9,7 @@ DEFINES += MAKE_KDEUI_LIB
 LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdefx$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX 
 
-system( bash ktqmoc )
+system( bash kmoc )
 system( bash kdcopidl )
 
 TARGET		= kdeui$$KDEBUG
diff --git a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro b/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro
index 51ece483a..8bf29bf90 100644
--- a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro
+++ b/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro
@@ -17,9 +17,9 @@ LIBS +=  $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX \
   $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX
 
 # icon
-LIBS+=$(KDELIBS)/win/resources/ktqfind.res
+LIBS+=$(KDELIBS)/win/resources/kfind.res
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 kfiletreeviewtest.cpp
diff --git a/win/pro_files/kio/kio.pro b/win/pro_files/kio/kio.pro
index e41f7a0bd..9e3144856 100644
--- a/win/pro_files/kio/kio.pro
+++ b/win/pro_files/kio/kio.pro
@@ -9,17 +9,17 @@ DEFINES += MAKE_KIO_LIB
 LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdeui$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdewin32$$KDELIB_SUFFIX
 
-system( bash ktqmoc kio kfile misc bookmarks kssl )
+system( bash kmoc kio kfile misc bookmarks kssl )
 
 TARGET = kio$$KDEBUG
 
 INCLUDEPATH += $(KDELIBS)/kdecore/network $(KDELIBS)/kio/kio $(KDELIBS)/kio/misc $(KDELIBS)/kio/bookmarks \
   $(KDELIBS)/kio/kssl \
   $(KDELIBS)/libltdl $(KDELIBS)/interfaces \
-  $(KDELIBS)/kio/kio/tqmoc $(KDELIBS)/kio/misc/tqmoc $(KDELIBS)/kio/kfile/tqmoc \
-  $(KDELIBS)/kio/misc/tqmoc \
-  $(KDELIBS)/kio/bookmarks/tqmoc \
-  $(KDELIBS)/kio/kssl/tqmoc $(KDELIBS)/kwallet/client 
+  $(KDELIBS)/kio/kio/moc $(KDELIBS)/kio/misc/moc $(KDELIBS)/kio/kfile/moc \
+  $(KDELIBS)/kio/misc/moc \
+  $(KDELIBS)/kio/bookmarks/moc \
+  $(KDELIBS)/kio/kssl/moc $(KDELIBS)/kwallet/client 
 
 system( cd kio && dcopidl kdirnotify.h > kdirnotify.kidl && dcopidl2cpp --no-stub kdirnotify.kidl )
 system( cd kio && dcopidl observer.h > observer.kidl && dcopidl2cpp observer.kidl )
diff --git a/win/pro_files/kmdi/kmdi.pro b/win/pro_files/kmdi/kmdi.pro
index 73b680565..1f425b465 100644
--- a/win/pro_files/kmdi/kmdi.pro
+++ b/win/pro_files/kmdi/kmdi.pro
@@ -13,7 +13,7 @@ LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeui$$KDELIB_SUF
 
 INCLUDEPATH += res $(KDELIBS)/kutils $(KDELIBS)/kdeui
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 kmdichildarea.cpp \
diff --git a/win/pro_files/kmdi/test/test.pro b/win/pro_files/kmdi/test/test.pro
index 8f19d2c8a..85216ebb0 100644
--- a/win/pro_files/kmdi/test/test.pro
+++ b/win/pro_files/kmdi/test/test.pro
@@ -9,7 +9,7 @@ CONFIG -= windows
 CONFIG += debug
 CONFIG += console
 
-unix:DEFINES   = NO_INCLUDE_TQMOCFILES QT_NO_COMPAT
+unix:DEFINES   = NO_INCLUDE_MOCFILES QT_NO_COMPAT
 unix:LIBS       += -lkmdi -L$(KDEDIR)/lib -lkdecore -lkdeui -lDCOP -lkparts
 unix:INCLUDEPATH     += . .. $(KDEDIR)/include
 
diff --git a/win/pro_files/kparts/kparts.pro b/win/pro_files/kparts/kparts.pro
index 809eeee31..19b68a16b 100644
--- a/win/pro_files/kparts/kparts.pro
+++ b/win/pro_files/kparts/kparts.pro
@@ -13,7 +13,7 @@ LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeui$$KDELIB_SUF
 
 INCLUDEPATH += $(KDELIBS)/kio/kfile
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 browserextension.cpp \
diff --git a/win/pro_files/kresources/kresources.pro b/win/pro_files/kresources/kresources.pro
index 0d4525319..d729b82ed 100644
--- a/win/pro_files/kresources/kresources.pro
+++ b/win/pro_files/kresources/kresources.pro
@@ -11,7 +11,7 @@ INCLUDEPATH	+= $(KDELIBS)/ab
 LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdeui$$KDELIB_SUFFIX \
 	$$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX 
 
-system( bash ktqmoc )
+system( bash kmoc )
 system( bash kdcopidl )
 
 TARGET = kresources$$KDEBUG
diff --git a/win/pro_files/kstyles/activeheart/widget-engine/widget-engine.pro b/win/pro_files/kstyles/activeheart/widget-engine/widget-engine.pro
index 1d7aea90e..9245377cc 100644
--- a/win/pro_files/kstyles/activeheart/widget-engine/widget-engine.pro
+++ b/win/pro_files/kstyles/activeheart/widget-engine/widget-engine.pro
@@ -1,6 +1,6 @@
 include( ../../common.pro )
 
-system( bash ktqmoc )
+system( bash kmoc )
 system( qmake genembed.pro -o Makefile.genembed )
 system( nmake /f Makefile.genembed clean )
 system( nmake /f Makefile.genembed )
diff --git a/win/pro_files/kstyles/dotNET/dotnet/dotnet.pro b/win/pro_files/kstyles/dotNET/dotnet/dotnet.pro
index 69a42f1cb..d9ca9d8c3 100644
--- a/win/pro_files/kstyles/dotNET/dotnet/dotnet.pro
+++ b/win/pro_files/kstyles/dotNET/dotnet/dotnet.pro
@@ -5,6 +5,6 @@ TARGET		= dotnet$$KDEBUG
 SOURCES = \
 dotnet.cpp
 
-system( tqmoc dotnet.h -o tqmoc/dotnet.moc )
+system( moc dotnet.h -o moc/dotnet.moc )
 
 
diff --git a/win/pro_files/kstyles/highcolor/highcolor.pro b/win/pro_files/kstyles/highcolor/highcolor.pro
index 1f6b78563..57bfca812 100644
--- a/win/pro_files/kstyles/highcolor/highcolor.pro
+++ b/win/pro_files/kstyles/highcolor/highcolor.pro
@@ -2,7 +2,7 @@ include( ../common.pro )
 
 TARGET		= highcolor$$KDEBUG
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 highcolor.cpp
diff --git a/win/pro_files/kstyles/keramik/keramik.pro b/win/pro_files/kstyles/keramik/keramik.pro
index 378bed9cc..42094301c 100644
--- a/win/pro_files/kstyles/keramik/keramik.pro
+++ b/win/pro_files/kstyles/keramik/keramik.pro
@@ -2,7 +2,7 @@ include( ../common.pro )
 
 TARGET		= keramik$$KDEBUG
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 colorutil.cpp \
diff --git a/win/pro_files/kstyles/klegacy/klegacy.pro b/win/pro_files/kstyles/klegacy/klegacy.pro
index 0694312ce..1f280202c 100644
--- a/win/pro_files/kstyles/klegacy/klegacy.pro
+++ b/win/pro_files/kstyles/klegacy/klegacy.pro
@@ -2,7 +2,7 @@ include( ../common.pro )
 
 TARGET		= klegacy$$KDEBUG
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 klegacystyle.cpp
diff --git a/win/pro_files/kstyles/kthemestyle/themestyle.pro b/win/pro_files/kstyles/kthemestyle/themestyle.pro
index 606791e3d..773030b6b 100644
--- a/win/pro_files/kstyles/kthemestyle/themestyle.pro
+++ b/win/pro_files/kstyles/kthemestyle/themestyle.pro
@@ -9,7 +9,7 @@ kthemestyle.cpp \
 kthemebase.cpp \
 kstyledirs.cpp
 
-system( tqmoc kthemestyle.h -o tqmoc/kthemestyle.moc )
-system( tqmoc kthemebase.h -o tqmoc/kthemebase.moc )
+system( moc kthemestyle.h -o moc/kthemestyle.moc )
+system( moc kthemebase.h -o moc/kthemebase.moc )
 
 
diff --git a/win/pro_files/kstyles/light/light.pro b/win/pro_files/kstyles/light/light.pro
index ef5ec7781..025158c3a 100644
--- a/win/pro_files/kstyles/light/light.pro
+++ b/win/pro_files/kstyles/light/light.pro
@@ -2,7 +2,7 @@ include( ../common.pro )
 
 TARGET		= light$$KDEBUG
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 light.cpp \
diff --git a/win/pro_files/kstyles/plastik/plastik.pro b/win/pro_files/kstyles/plastik/plastik.pro
index 9c8ba7570..51937369c 100644
--- a/win/pro_files/kstyles/plastik/plastik.pro
+++ b/win/pro_files/kstyles/plastik/plastik.pro
@@ -2,7 +2,7 @@ include( ../common.pro )
 
 TARGET = plastik$$KDEBUG
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 plastik.cpp \
diff --git a/win/pro_files/kstyles/slickerstyle/slicker/slicker.pro b/win/pro_files/kstyles/slickerstyle/slicker/slicker.pro
index 574269bd5..0f7bab178 100644
--- a/win/pro_files/kstyles/slickerstyle/slicker/slicker.pro
+++ b/win/pro_files/kstyles/slickerstyle/slicker/slicker.pro
@@ -2,7 +2,7 @@ include( ../../common.pro )
 
 TARGET		= slicker$$KDEBUG
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 slicker.cpp
\ No newline at end of file
diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro
index f4ebff204..37e637ed7 100644
--- a/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro
+++ b/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro
@@ -13,10 +13,10 @@ win32 {
 DESTDIR=.
 
 
-tqcontains( KW_CONFIG, release ) {
+contains( KW_CONFIG, release ) {
 TARGET		= genembed_rel
 }
-!tqcontains( KW_CONFIG, release ) {
+!contains( KW_CONFIG, release ) {
 TARGET		= genembed
 }
 
diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
index f45373c78..66346be7d 100644
--- a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
+++ b/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro
@@ -4,8 +4,8 @@
 TEMPLATE	= lib
 
 unix { 
-	INCLUDEPATH += tqmoc
-	#force tqfinding libraries in current dir (for installer, etc):
+	INCLUDEPATH += moc
+	#force finding libraries in current dir (for installer, etc):
 	QMAKE_LFLAGS += -Wl,-rpath,.
 	DEFINES += KDEFX_EXPORT=
 }
@@ -42,8 +42,8 @@ SOURCES += \
 ../../../kdefx/kpixmapeffect.cpp \
 ../../../kdefx/kpixmap.cpp
 
-system( tqmoc thinkeramik.h -o tqmoc/thinkeramik.moc )
-system( tqmoc ../../../kdefx/kstyle.h -o tqmoc/kstyle.moc )
+system( moc thinkeramik.h -o moc/thinkeramik.moc )
+system( moc ../../../kdefx/kstyle.h -o moc/kstyle.moc )
 
 
 system( bash ./genemb.sh )
diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro
index 20c289549..41181415f 100644
--- a/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro
+++ b/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro
@@ -3,12 +3,12 @@ include( ../../common.pro )
 TARGET		= thinkeramik$$KDEBUG
 
 unix { 
-	INCLUDEPATH += tqmoc
-	#force tqfinding libraries in current dir (for installer, etc):
+	INCLUDEPATH += moc
+	#force finding libraries in current dir (for installer, etc):
 	QMAKE_LFLAGS += -Wl,-rpath,.
 }
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
 colorutil.cpp \
@@ -16,11 +16,11 @@ gradients.cpp \
 thinkeramik.cpp \
 pixmaploader.cpp
 
-tqcontains( KW_CONFIG, release ) {
+contains( KW_CONFIG, release ) {
 	system( bash ./genemb.sh _rel )
 }
 
-!tqcontains( KW_CONFIG, release ) {
+!contains( KW_CONFIG, release ) {
 	system( bash ./genemb.sh )
 }
 
diff --git a/win/pro_files/kutils/kutils.pro b/win/pro_files/kutils/kutils.pro
index b2eae16be..5f07d4673 100644
--- a/win/pro_files/kutils/kutils.pro
+++ b/win/pro_files/kutils/kutils.pro
@@ -13,14 +13,14 @@ LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeui$$KDELIB_SUF
 
 INCLUDEPATH += $(KDELIBS)/interfaces/kregexpeditor
 
-system( bash ktqmoc )
+system( bash kmoc )
 
 SOURCES = \
-ktqfind.cpp \
-ktqfinddialog.cpp \
+kfind.cpp \
+kfinddialog.cpp \
 kmultitabbar.cpp \
 kplugininfo.cpp \
-ktqreplace.cpp \
-ktqreplacedialog.cpp
+kreplace.cpp \
+kreplacedialog.cpp
 
 HEADERS		=