44 files changed, 311 insertions, 311 deletions
diff --git a/win/pro_files/README.pro_files b/win/pro_files/README.pro_files
index 2192750f3..ba0a915f0 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 replacement) required.
+Cygwin or (other bash tqreplacement) 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 d74a769a8..6057fe6c1 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 kmoc )
+system( bash ktqmoc )
 
 DEF_FILE = kde-ice.def
 
diff --git a/win/pro_files/dcop/client/client.pro b/win/pro_files/dcop/client/client.pro
index 4df64db5b..44ae9ff67 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 kmoc .. )
+#system( bash ktqmoc .. )
 
-#INCLUDEPATH += .. ../moc
+#INCLUDEPATH += .. ../tqmoc
 
 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 99911eedb..bafeb4fb6 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 kmoc .. )
+#system( bash ktqmoc .. )
 
-#INCLUDEPATH += .. ../moc
+#INCLUDEPATH += .. ../tqmoc
 
 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 315dcf5a2..3239526f0 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		= dcopfind
+TARGET		= dcoptqfind
 
-#system( bash kmoc .. )
+#system( bash ktqmoc .. )
 
-#INCLUDEPATH += .. ../moc
+#INCLUDEPATH += .. ../tqmoc
 
 LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
 
-SOURCES	+= ../dcopfind.cpp
+SOURCES	+= ../dcoptqfind.cpp
diff --git a/win/pro_files/dcop/client/dcopref/dcopref.pro b/win/pro_files/dcop/client/dcopref/dcopref.pro
index 13370884c..babd68f90 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 kmoc .. )
+#system( bash ktqmoc .. )
 
-#INCLUDEPATH += .. ../moc
+#INCLUDEPATH += .. ../tqmoc
 
 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 7758cbb7b..885d3cc90 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 kmoc )
+system( bash ktqmoc )
 
 LIBS += $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX
 
diff --git a/win/pro_files/dcop/dcopserver/dcopserver.pro b/win/pro_files/dcop/dcopserver/dcopserver.pro
index 46c7b31e9..a16c3ae4e 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 kmoc .. )
+system( bash ktqmoc .. )
 
-INCLUDEPATH += .. ../moc
+INCLUDEPATH += .. ../tqmoc
 
 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 c08d3c192..423e69ac9 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 kmoc .. )
+system( bash ktqmoc .. )
 
-INCLUDEPATH += .. ../moc
+INCLUDEPATH += .. ../tqmoc
 
 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 9876e2815..55fbb8369 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 kmoc .. )
+system( bash ktqmoc .. )
 
-INCLUDEPATH += ../moc
+INCLUDEPATH += ../tqmoc
 
 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 4b390dd1d..9a06150cc 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 kmoc )
+system( bash ktqmoc )
 system( bash kdcopidl )
 
-INCLUDEPATH += .. ../moc
+INCLUDEPATH += .. ../tqmoc
 
 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 215a8596e..a82c8f3f1 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 kmoc )
+system( bash ktqmoc )
 system( bash kdcopidl )
 
-INCLUDEPATH += .. ../moc
+INCLUDEPATH += .. ../tqmoc
 
 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 fd5d7cab5..1799041ed 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 kmoc .. )
+system( bash ktqmoc .. )
 
-INCLUDEPATH += .. ../moc
+INCLUDEPATH += .. ../tqmoc
 
 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 45678e6ff..c7d9891dd 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 kmoc )
+system( bash ktqmoc )
 system( bash kdcopidl )
 
 SOURCES = \
diff --git a/win/pro_files/kabc/kabc.pro b/win/pro_files/kabc/kabc.pro
index d7826b319..0070c1c96 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 kmoc )
+system( bash ktqmoc )
 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 7ccf215bc..22709c549 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 kmoc )
+system( bash ktqmoc )
 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 e327fed37..78750e008 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 kmoc )
+system( bash ktqmoc )
 
 SOURCES = \
 katecmd.cpp \
diff --git a/win/pro_files/kate/part/part.pro b/win/pro_files/kate/part/part.pro
index 82a9aa046..b1f8fb64d 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 kmoc )
+system( bash ktqmoc )
 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 5b8272185..fe0a85fd5 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 kmoc )
+#system( bash ktqmoc )
 
 SOURCES = kconfig_compiler.cpp
 
diff --git a/win/pro_files/kdecore/kdecore.pro b/win/pro_files/kdecore/kdecore.pro
index 183835a43..58093bb64 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 kmoc )
+system( bash ktqmoc )
 system( bash kdcopidl )
 
 SOURCES += \
diff --git a/win/pro_files/kded/kded.pro b/win/pro_files/kded/kded.pro
index 05f2455cc..2c97c420a 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 kmoc )
+system( bash ktqmoc )
 
-!contains(CONFIG,GUI) {
-	!contains(KW_CONFIG,release) {
+!tqcontains(CONFIG,GUI) {
+	!tqcontains(KW_CONFIG,release) {
 		TARGET = kbuildsycoca_d
 	}
-	contains(KW_CONFIG,release) {
+	tqcontains(KW_CONFIG,release) {
 		TARGET = kbuildsycoca
 	}
 }
diff --git a/win/pro_files/kded/kded_rel.pro b/win/pro_files/kded/kded_rel.pro
index a878305ba..7c37884b7 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
 
-!contains(KW_CONFIG,release) {
+!tqcontains(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 6c9ba4a22..7d84f2b3a 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 kmoc )
+system( bash ktqmoc )
 
 SOURCES = \
 kimageeffect.cpp \
diff --git a/win/pro_files/kdefx/kdefx_rel.pro b/win/pro_files/kdefx/kdefx_rel.pro
index 177836f03..0062498bd 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( moc kstyle.h -o moc/kstyle.moc )
+system( tqmoc kstyle.h -o tqmoc/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 13404b3a8..3d4b259a5 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 kmoc )
+system( bash ktqmoc )
 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 da3cffa19..51ece483a 100644
--- a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro
+++ b/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro
@@ -1,29 +1,29 @@
-TEMPLATE	= app
-
-include( $(KDELIBS)/win/common.pro )
-
-
-#allow to select target independently from debug information
-kdebase_release:CONFIG -= console
-kdebase_release:CONFIG += windows
-kdebase_release:QMAKE_MAKEFILE = Makefile.release
-
-
-TARGET		= kfiletreeviewtest
-
-LIBS +=  $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX \
-  $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX \
-  $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX \
-  $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX
-
-# icon
-LIBS+=$(KDELIBS)/win/resources/kfind.res
-
-system( bash kmoc )
-
-SOURCES = \
-kfiletreeviewtest.cpp
-
-HEADERS		= 
-
-
+TEMPLATE	= app
+
+include( $(KDELIBS)/win/common.pro )
+
+
+#allow to select target independently from debug information
+kdebase_release:CONFIG -= console
+kdebase_release:CONFIG += windows
+kdebase_release:QMAKE_MAKEFILE = Makefile.release
+
+
+TARGET		= kfiletreeviewtest
+
+LIBS +=  $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX \
+  $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX \
+  $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX \
+  $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX
+
+# icon
+LIBS+=$(KDELIBS)/win/resources/ktqfind.res
+
+system( bash ktqmoc )
+
+SOURCES = \
+kfiletreeviewtest.cpp
+
+HEADERS		= 
+
+
diff --git a/win/pro_files/kio/kio.pro b/win/pro_files/kio/kio.pro
index 6381bc387..e41f7a0bd 100644
--- a/win/pro_files/kio/kio.pro
+++ b/win/pro_files/kio/kio.pro
@@ -1,212 +1,212 @@
-TEMPLATE	= lib
-
-include( $(KDELIBS)/win/common.pro )
-include( $(KDELIBS)/win/zlib.pro )
-
-# needed to export library classes:
-DEFINES += MAKE_KIO_LIB
-
-LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdeui$$KDELIB_SUFFIX \
-	$$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdewin32$$KDELIB_SUFFIX
-
-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/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 )
-system( cd bookmarks && dcopidl kbookmarknotifier.h > kbookmarknotifier.kidl && dcopidl2cpp kbookmarknotifier.kidl )
-system( cd bookmarks && dcopidl kbookmarkmanager.h > kbookmarkmanager.kidl && dcopidl2cpp kbookmarkmanager.kidl )
-system( cd misc && dcopidl uiserver.h > uiserver.kidl && dcopidl2cpp uiserver.kidl )
-
-
-SOURCES = \
-kio/authinfo.cpp \
-kio/chmodjob.cpp \
-kio/connection.cpp \
-kio/dataprotocol.cpp \
-kio/dataslave.cpp \
-kio/davjob.cpp \
-kio/defaultprogress.cpp \
-kio/global.cpp \
-kio/job.cpp \
-kio/kacl.cpp \
-kio/kar.cpp \
-kio/karchive.cpp \
-kio/kdatatool.cpp \
-kio/kdcopservicestarter.cpp \
-kio/kdirlister.cpp \
-kio/kdirnotify.cpp \
-kio/kdirwatch.cpp \
-kio/kemailsettings.cpp \
-kio/kfilefilter.cpp \
-kio/kfileitem.cpp \
-kio/kfilemetainfo.cpp \
-kio/kfileshare.cpp \
-kio/kfilterbase.cpp \
-kio/kfilterdev.cpp \
-kio/kimageio.cpp \
-kio/kmimemagic.cpp \
-kio/kmimetype.cpp \
-kio/kmimetypechooser.cpp \
-kio/knfsshare.cpp \
-kio/kprotocolinfo.cpp \
-kio/kprotocolmanager.cpp \
-kio/kremoteencoding.cpp \
-kio/krun.cpp \
-kio/ksambashare.cpp \
-kio/kscan.cpp \
-kio/kservice.cpp \
-kio/kservicefactory.cpp \
-kio/kservicegroup.cpp \
-kio/kservicegroupfactory.cpp \
-kio/kservicetype.cpp \
-kio/kservicetypefactory.cpp \
-kio/kshellcompletion.cpp \
-kio/kshred.cpp \
-kio/ktar.cpp \
-kio/ktrader.cpp \
-kio/ktraderparse.cpp \
-kio/ktraderparsetree.cpp \
-kio/kurifilter.cpp \
-kio/kurlcompletion.cpp \
-kio/kurlpixmapprovider.cpp \
-kio/kuserprofile.cpp \
-kio/kzip.cpp \
-kio/lex.c \
-kio/metainfojob.cpp \
-kio/netaccess.cpp \
-kio/observer.cpp \
-kio/passdlg.cpp \
-kio/paste.cpp \
-kio/pastedialog.cpp \
-kio/previewjob.cpp \
-kio/progressbase.cpp \
-kio/renamedlg.cpp \
-kio/scheduler.cpp \
-kio/sessiondata.cpp \
-kio/skipdlg.cpp \
-kio/slave.cpp \
-kio/slavebase.cpp \
-kio/slaveconfig.cpp \
-kio/slaveinterface.cpp \
-kio/statusbarprogress.cpp \
-kio/tcpslavebase.cpp \
-kio/yacc.c \
-\
-bookmarks/kbookmark.cc \
-bookmarks/kbookmarkbar.cc \
-bookmarks/kbookmarkdombuilder.cc \
-bookmarks/kbookmarkdrag.cc \
-bookmarks/kbookmarkexporter.cc \
-bookmarks/kbookmarkimporter.cc \
-bookmarks/kbookmarkimporter_crash.cc \
-bookmarks/kbookmarkimporter_ie.cc \
-bookmarks/kbookmarkimporter_kde1.cc \
-bookmarks/kbookmarkimporter_ns.cc \
-bookmarks/kbookmarkimporter_opera.cc \
-bookmarks/kbookmarkmanager.cc \
-bookmarks/kbookmarkmenu.cc \
-\
-kfile/kcombiview.cpp \
-kfile/kcustommenueditor.cpp \
-kfile/kdiroperator.cpp \
-kfile/kdirselectdialog.cpp \
-kfile/kdirsize.cpp \
-kfile/kdiskfreesp.cpp \
-kfile/kencodingfiledialog.cpp \
-kfile/kfilebookmarkhandler.cpp \
-kfile/kfiledetailview.cpp \
-kfile/kfiledialog.cpp \
-kfile/kfilefiltercombo.cpp \
-kfile/kfileiconview.cpp \
-kfile/kfilemetainfowidget.cpp \
-kfile/kfilemetapreview.cpp \
-kfile/kfilepreview.cpp \
-kfile/kfilesharedlg.cpp \
-kfile/kfilespeedbar.cpp \
-kfile/kfiletreebranch.cpp \
-kfile/kfiletreeview.cpp \
-kfile/kfiletreeviewitem.cpp \
-kfile/kfileview.cpp \
-kfile/kicondialog.cpp \
-kfile/kimagefilepreview.cpp \
-kfile/kmetaprops.cpp \
-kfile/knotifydialog.cpp \
-kfile/kopenwith.cpp \
-kfile/kpreviewprops.cpp \
-kfile/kpreviewwidgetbase.cpp \
-kfile/kpropertiesdialog.cpp \
-kfile/krecentdirs.cpp \
-kfile/krecentdocument.cpp \
-kfile/kurlbar.cpp \
-kfile/kurlcombobox.cpp \
-kfile/kurlrequester.cpp \
-kfile/kurlrequesterdlg.cpp \
-\
-misc/uiserver.cpp \
-\
-kssl/ksslcertdlg.cc \
-kssl/ksslinfodlg.cc \
-kssl/ksslcsessioncache.cc \
-kssl/ksslsession.cc \
-kssl/ksslsettings.cc \
-kssl/ksslcertchain.cc \
-kssl/ksslcertificate.cc \
-kssl/ksslcertificatecache.cc \
-kssl/ksslcertificatehome.cc \
-kssl/ksslcertificatefactory.cc \
-kssl/kssl.cc \
-kssl/ksslconnectioninfo.cc \
-kssl/ksslkeygen.cc \
-kssl/ksslpkcs7.cc \
-kssl/ksslpkcs12.cc \
-kssl/ksslx509v3.cc \
-kssl/ksslx509map.cc \
-kssl/ksslsigners.cc \
-kssl/ksslpeerinfo.cc \
-kssl/kopenssl.cc \
-kssl/ksmimecrypto.cc
-
-#removed kio/kautomount.cpp \
-
-SOURCES += \
-../kdecore/kprotocolinfo_kdecore.cpp
-
-# js 2004-08-05 ^^^^^ a hack because msvc cannot split a class between two libraries!
-
-#kprotocolinfofactory.cpp \
-
-#slavebase.cpp \
-
-# generated:
-SOURCES += \
-kio/kdirnotify_stub.cpp \
-kio/kdirnotify_skel.cpp \
-kio/observer_stub.cpp \
-kio/observer_skel.cpp \
-\
-bookmarks/kbookmarknotifier_stub.cpp \
-bookmarks/kbookmarknotifier_skel.cpp \
-bookmarks/kbookmarkmanager_stub.cpp \
-bookmarks/kbookmarkmanager_skel.cpp \
-\
-misc/uiserver_stub.cpp \
-misc/uiserver_skel.cpp
-
-
-FORMS = \
-kssl/keygenwizard.ui \
-kssl/keygenwizard2.ui \
-kfile/knotifywidgetbase.ui \
-kfile/kpropertiesdesktopadvbase.ui \
-kfile/kpropertiesdesktopbase.ui \
-kfile/kpropertiesmimetypebase.ui
+TEMPLATE	= lib
+
+include( $(KDELIBS)/win/common.pro )
+include( $(KDELIBS)/win/zlib.pro )
+
+# needed to export library classes:
+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 )
+
+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 
+
+system( cd kio && dcopidl kdirnotify.h > kdirnotify.kidl && dcopidl2cpp --no-stub kdirnotify.kidl )
+system( cd kio && dcopidl observer.h > observer.kidl && dcopidl2cpp observer.kidl )
+system( cd bookmarks && dcopidl kbookmarknotifier.h > kbookmarknotifier.kidl && dcopidl2cpp kbookmarknotifier.kidl )
+system( cd bookmarks && dcopidl kbookmarkmanager.h > kbookmarkmanager.kidl && dcopidl2cpp kbookmarkmanager.kidl )
+system( cd misc && dcopidl uiserver.h > uiserver.kidl && dcopidl2cpp uiserver.kidl )
+
+
+SOURCES = \
+kio/authinfo.cpp \
+kio/chmodjob.cpp \
+kio/connection.cpp \
+kio/dataprotocol.cpp \
+kio/dataslave.cpp \
+kio/davjob.cpp \
+kio/defaultprogress.cpp \
+kio/global.cpp \
+kio/job.cpp \
+kio/kacl.cpp \
+kio/kar.cpp \
+kio/karchive.cpp \
+kio/kdatatool.cpp \
+kio/kdcopservicestarter.cpp \
+kio/kdirlister.cpp \
+kio/kdirnotify.cpp \
+kio/kdirwatch.cpp \
+kio/kemailsettings.cpp \
+kio/kfilefilter.cpp \
+kio/kfileitem.cpp \
+kio/kfilemetainfo.cpp \
+kio/kfileshare.cpp \
+kio/kfilterbase.cpp \
+kio/kfilterdev.cpp \
+kio/kimageio.cpp \
+kio/kmimemagic.cpp \
+kio/kmimetype.cpp \
+kio/kmimetypechooser.cpp \
+kio/knfsshare.cpp \
+kio/kprotocolinfo.cpp \
+kio/kprotocolmanager.cpp \
+kio/kremoteencoding.cpp \
+kio/krun.cpp \
+kio/ksambashare.cpp \
+kio/kscan.cpp \
+kio/kservice.cpp \
+kio/kservicefactory.cpp \
+kio/kservicegroup.cpp \
+kio/kservicegroupfactory.cpp \
+kio/kservicetype.cpp \
+kio/kservicetypefactory.cpp \
+kio/kshellcompletion.cpp \
+kio/kshred.cpp \
+kio/ktar.cpp \
+kio/ktrader.cpp \
+kio/ktraderparse.cpp \
+kio/ktraderparsetree.cpp \
+kio/kurifilter.cpp \
+kio/kurlcompletion.cpp \
+kio/kurlpixmapprovider.cpp \
+kio/kuserprofile.cpp \
+kio/kzip.cpp \
+kio/lex.c \
+kio/metainfojob.cpp \
+kio/netaccess.cpp \
+kio/observer.cpp \
+kio/passdlg.cpp \
+kio/paste.cpp \
+kio/pastedialog.cpp \
+kio/previewjob.cpp \
+kio/progressbase.cpp \
+kio/renamedlg.cpp \
+kio/scheduler.cpp \
+kio/sessiondata.cpp \
+kio/skipdlg.cpp \
+kio/slave.cpp \
+kio/slavebase.cpp \
+kio/slaveconfig.cpp \
+kio/slaveinterface.cpp \
+kio/statusbarprogress.cpp \
+kio/tcpslavebase.cpp \
+kio/yacc.c \
+\
+bookmarks/kbookmark.cc \
+bookmarks/kbookmarkbar.cc \
+bookmarks/kbookmarkdombuilder.cc \
+bookmarks/kbookmarkdrag.cc \
+bookmarks/kbookmarkexporter.cc \
+bookmarks/kbookmarkimporter.cc \
+bookmarks/kbookmarkimporter_crash.cc \
+bookmarks/kbookmarkimporter_ie.cc \
+bookmarks/kbookmarkimporter_kde1.cc \
+bookmarks/kbookmarkimporter_ns.cc \
+bookmarks/kbookmarkimporter_opera.cc \
+bookmarks/kbookmarkmanager.cc \
+bookmarks/kbookmarkmenu.cc \
+\
+kfile/kcombiview.cpp \
+kfile/kcustommenueditor.cpp \
+kfile/kdiroperator.cpp \
+kfile/kdirselectdialog.cpp \
+kfile/kdirsize.cpp \
+kfile/kdiskfreesp.cpp \
+kfile/kencodingfiledialog.cpp \
+kfile/kfilebookmarkhandler.cpp \
+kfile/kfiledetailview.cpp \
+kfile/kfiledialog.cpp \
+kfile/kfilefiltercombo.cpp \
+kfile/kfileiconview.cpp \
+kfile/kfilemetainfowidget.cpp \
+kfile/kfilemetapreview.cpp \
+kfile/kfilepreview.cpp \
+kfile/kfilesharedlg.cpp \
+kfile/kfilespeedbar.cpp \
+kfile/kfiletreebranch.cpp \
+kfile/kfiletreeview.cpp \
+kfile/kfiletreeviewitem.cpp \
+kfile/kfileview.cpp \
+kfile/kicondialog.cpp \
+kfile/kimagefilepreview.cpp \
+kfile/kmetaprops.cpp \
+kfile/knotifydialog.cpp \
+kfile/kopenwith.cpp \
+kfile/kpreviewprops.cpp \
+kfile/kpreviewwidgetbase.cpp \
+kfile/kpropertiesdialog.cpp \
+kfile/krecentdirs.cpp \
+kfile/krecentdocument.cpp \
+kfile/kurlbar.cpp \
+kfile/kurlcombobox.cpp \
+kfile/kurlrequester.cpp \
+kfile/kurlrequesterdlg.cpp \
+\
+misc/uiserver.cpp \
+\
+kssl/ksslcertdlg.cc \
+kssl/ksslinfodlg.cc \
+kssl/ksslcsessioncache.cc \
+kssl/ksslsession.cc \
+kssl/ksslsettings.cc \
+kssl/ksslcertchain.cc \
+kssl/ksslcertificate.cc \
+kssl/ksslcertificatecache.cc \
+kssl/ksslcertificatehome.cc \
+kssl/ksslcertificatefactory.cc \
+kssl/kssl.cc \
+kssl/ksslconnectioninfo.cc \
+kssl/ksslkeygen.cc \
+kssl/ksslpkcs7.cc \
+kssl/ksslpkcs12.cc \
+kssl/ksslx509v3.cc \
+kssl/ksslx509map.cc \
+kssl/ksslsigners.cc \
+kssl/ksslpeerinfo.cc \
+kssl/kopenssl.cc \
+kssl/ksmimecrypto.cc
+
+#removed kio/kautomount.cpp \
+
+SOURCES += \
+../kdecore/kprotocolinfo_kdecore.cpp
+
+# js 2004-08-05 ^^^^^ a hack because msvc cannot split a class between two libraries!
+
+#kprotocolinfofactory.cpp \
+
+#slavebase.cpp \
+
+# generated:
+SOURCES += \
+kio/kdirnotify_stub.cpp \
+kio/kdirnotify_skel.cpp \
+kio/observer_stub.cpp \
+kio/observer_skel.cpp \
+\
+bookmarks/kbookmarknotifier_stub.cpp \
+bookmarks/kbookmarknotifier_skel.cpp \
+bookmarks/kbookmarkmanager_stub.cpp \
+bookmarks/kbookmarkmanager_skel.cpp \
+\
+misc/uiserver_stub.cpp \
+misc/uiserver_skel.cpp
+
+
+FORMS = \
+kssl/keygenwizard.ui \
+kssl/keygenwizard2.ui \
+kfile/knotifywidgetbase.ui \
+kfile/kpropertiesdesktopadvbase.ui \
+kfile/kpropertiesdesktopbase.ui \
+kfile/kpropertiesmimetypebase.ui
diff --git a/win/pro_files/kmdi/kmdi.pro b/win/pro_files/kmdi/kmdi.pro
index 1f425b465..73b680565 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 kmoc )
+system( bash ktqmoc )
 
 SOURCES = \
 kmdichildarea.cpp \
diff --git a/win/pro_files/kmdi/test/test.pro b/win/pro_files/kmdi/test/test.pro
index 85216ebb0..8f19d2c8a 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_MOCFILES QT_NO_COMPAT
+unix:DEFINES   = NO_INCLUDE_TQMOCFILES 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 19b68a16b..809eeee31 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 kmoc )
+system( bash ktqmoc )
 
 SOURCES = \
 browserextension.cpp \
diff --git a/win/pro_files/kresources/kresources.pro b/win/pro_files/kresources/kresources.pro
index d729b82ed..0d4525319 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 kmoc )
+system( bash ktqmoc )
 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 9245377cc..1d7aea90e 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 kmoc )
+system( bash ktqmoc )
 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 d9ca9d8c3..69a42f1cb 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( moc dotnet.h -o moc/dotnet.moc )
+system( tqmoc dotnet.h -o tqmoc/dotnet.moc )
 
 
diff --git a/win/pro_files/kstyles/highcolor/highcolor.pro b/win/pro_files/kstyles/highcolor/highcolor.pro
index 57bfca812..1f6b78563 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 kmoc )
+system( bash ktqmoc )
 
 SOURCES = \
 highcolor.cpp
diff --git a/win/pro_files/kstyles/keramik/keramik.pro b/win/pro_files/kstyles/keramik/keramik.pro
index 42094301c..378bed9cc 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 kmoc )
+system( bash ktqmoc )
 
 SOURCES = \
 colorutil.cpp \
diff --git a/win/pro_files/kstyles/klegacy/klegacy.pro b/win/pro_files/kstyles/klegacy/klegacy.pro
index 1f280202c..0694312ce 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 kmoc )
+system( bash ktqmoc )
 
 SOURCES = \
 klegacystyle.cpp
diff --git a/win/pro_files/kstyles/kthemestyle/themestyle.pro b/win/pro_files/kstyles/kthemestyle/themestyle.pro
index 773030b6b..606791e3d 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( moc kthemestyle.h -o moc/kthemestyle.moc )
-system( moc kthemebase.h -o moc/kthemebase.moc )
+system( tqmoc kthemestyle.h -o tqmoc/kthemestyle.moc )
+system( tqmoc kthemebase.h -o tqmoc/kthemebase.moc )
 
 
diff --git a/win/pro_files/kstyles/light/light.pro b/win/pro_files/kstyles/light/light.pro
index 025158c3a..ef5ec7781 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 kmoc )
+system( bash ktqmoc )
 
 SOURCES = \
 light.cpp \
diff --git a/win/pro_files/kstyles/plastik/plastik.pro b/win/pro_files/kstyles/plastik/plastik.pro
index 51937369c..9c8ba7570 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 kmoc )
+system( bash ktqmoc )
 
 SOURCES = \
 plastik.cpp \
diff --git a/win/pro_files/kstyles/slickerstyle/slicker/slicker.pro b/win/pro_files/kstyles/slickerstyle/slicker/slicker.pro
index 0f7bab178..574269bd5 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 kmoc )
+system( bash ktqmoc )
 
 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 37e637ed7..f4ebff204 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=.
 
 
-contains( KW_CONFIG, release ) {
+tqcontains( KW_CONFIG, release ) {
 TARGET		= genembed_rel
 }
-!contains( KW_CONFIG, release ) {
+!tqcontains( 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 66346be7d..f45373c78 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 += moc
-	#force finding libraries in current dir (for installer, etc):
+	INCLUDEPATH += tqmoc
+	#force tqfinding 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( moc thinkeramik.h -o moc/thinkeramik.moc )
-system( moc ../../../kdefx/kstyle.h -o moc/kstyle.moc )
+system( tqmoc thinkeramik.h -o tqmoc/thinkeramik.moc )
+system( tqmoc ../../../kdefx/kstyle.h -o tqmoc/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 41181415f..20c289549 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 += moc
-	#force finding libraries in current dir (for installer, etc):
+	INCLUDEPATH += tqmoc
+	#force tqfinding libraries in current dir (for installer, etc):
 	QMAKE_LFLAGS += -Wl,-rpath,.
 }
 
-system( bash kmoc )
+system( bash ktqmoc )
 
 SOURCES = \
 colorutil.cpp \
@@ -16,11 +16,11 @@ gradients.cpp \
 thinkeramik.cpp \
 pixmaploader.cpp
 
-contains( KW_CONFIG, release ) {
+tqcontains( KW_CONFIG, release ) {
 	system( bash ./genemb.sh _rel )
 }
 
-!contains( KW_CONFIG, release ) {
+!tqcontains( KW_CONFIG, release ) {
 	system( bash ./genemb.sh )
 }
 
diff --git a/win/pro_files/kutils/kutils.pro b/win/pro_files/kutils/kutils.pro
index 5f07d4673..b2eae16be 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 kmoc )
+system( bash ktqmoc )
 
 SOURCES = \
-kfind.cpp \
-kfinddialog.cpp \
+ktqfind.cpp \
+ktqfinddialog.cpp \
 kmultitabbar.cpp \
 kplugininfo.cpp \
-kreplace.cpp \
-kreplacedialog.cpp
+ktqreplace.cpp \
+ktqreplacedialog.cpp
 
 HEADERS		=