summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
Diffstat (limited to 'win')
-rw-r--r--win/3rdparty/README.3rdparty2
-rw-r--r--win/asm/socket.h2
-rw-r--r--win/bootstrap.cpp6
-rw-r--r--win/common.pro66
-rw-r--r--win/dirent.h4
-rw-r--r--win/in.h2
-rw-r--r--win/kdelibs_global_win.h2
-rw-r--r--win/pro_files/README.pro_files2
-rw-r--r--win/pro_files/dcop/KDE-ICE/KDE-ICE.pro2
-rw-r--r--win/pro_files/dcop/client/client.pro4
-rw-r--r--win/pro_files/dcop/client/dcop/dcop.pro4
-rw-r--r--win/pro_files/dcop/client/dcopfind/dcopfind.pro8
-rw-r--r--win/pro_files/dcop/client/dcopref/dcopref.pro4
-rw-r--r--win/pro_files/dcop/dcop.pro2
-rw-r--r--win/pro_files/dcop/dcopserver/dcopserver.pro4
-rw-r--r--win/pro_files/dcop/dcopserver_shutdown/dcopserver_shutdown.pro4
-rw-r--r--win/pro_files/dcop/testdcop/testdcop.pro4
-rw-r--r--win/pro_files/dcop/tests/dcop_test.pro4
-rw-r--r--win/pro_files/dcop/tests/driver.pro4
-rw-r--r--win/pro_files/dcop/tests/tests.pro4
-rw-r--r--win/pro_files/interfaces/ktexteditor/ktexteditor.pro2
-rw-r--r--win/pro_files/kabc/kabc.pro2
-rw-r--r--win/pro_files/kabc/vcard/vcard.pro2
-rw-r--r--win/pro_files/kate/interfaces/interfaces.pro2
-rw-r--r--win/pro_files/kate/part/part.pro2
-rw-r--r--win/pro_files/kdecore/kconfig_compiler/kconfig_compiler.pro2
-rw-r--r--win/pro_files/kdecore/kdecore.pro2
-rw-r--r--win/pro_files/kded/kded.pro8
-rw-r--r--win/pro_files/kded/kded_rel.pro2
-rw-r--r--win/pro_files/kdefx/kdefx.pro2
-rw-r--r--win/pro_files/kdefx/kdefx_rel.pro2
-rw-r--r--win/pro_files/kdeui/kdeui.pro2
-rw-r--r--win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro4
-rw-r--r--win/pro_files/kio/kio.pro10
-rw-r--r--win/pro_files/kmdi/kmdi.pro2
-rw-r--r--win/pro_files/kmdi/test/test.pro2
-rw-r--r--win/pro_files/kparts/kparts.pro2
-rw-r--r--win/pro_files/kresources/kresources.pro2
-rw-r--r--win/pro_files/kstyles/activeheart/widget-engine/widget-engine.pro2
-rw-r--r--win/pro_files/kstyles/dotNET/dotnet/dotnet.pro2
-rw-r--r--win/pro_files/kstyles/highcolor/highcolor.pro2
-rw-r--r--win/pro_files/kstyles/keramik/keramik.pro2
-rw-r--r--win/pro_files/kstyles/klegacy/klegacy.pro2
-rw-r--r--win/pro_files/kstyles/kthemestyle/themestyle.pro4
-rw-r--r--win/pro_files/kstyles/light/light.pro2
-rw-r--r--win/pro_files/kstyles/plastik/plastik.pro2
-rw-r--r--win/pro_files/kstyles/slickerstyle/slicker/slicker.pro2
-rw-r--r--win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro4
-rw-r--r--win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro8
-rw-r--r--win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro10
-rw-r--r--win/pro_files/kutils/kutils.pro10
-rw-r--r--win/qeventloopex.cpp4
-rw-r--r--win/readdir.c6
-rw-r--r--win/readdir.h4
-rw-r--r--win/syslog.c2
-rw-r--r--win/syslog.h2
-rw-r--r--win/tools/README.tools2
-rwxr-xr-xwin/tools/collect_kdelibs_pro_files2
-rwxr-xr-xwin/tools/kdcopidl2
-rwxr-xr-xwin/tools/kmoc14
-rwxr-xr-xwin/tools/update_kdelibs_pro_files2
-rw-r--r--win/win.pro6
-rw-r--r--win/win32_utils2.cpp12
63 files changed, 148 insertions, 148 deletions
diff --git a/win/3rdparty/README.3rdparty b/win/3rdparty/README.3rdparty
index e2f84cf05..5b5066896 100644
--- a/win/3rdparty/README.3rdparty
+++ b/win/3rdparty/README.3rdparty
@@ -11,5 +11,5 @@ Optionally you can also get binaries and copy include files to above
directories.
You can give up with touching zlib diectory at all if your Qt library
-tqcontains zlib.
+contains zlib.
diff --git a/win/asm/socket.h b/win/asm/socket.h
index 56483b4af..3cf450044 100644
--- a/win/asm/socket.h
+++ b/win/asm/socket.h
@@ -44,7 +44,7 @@
#define SIOCGIFFLAGS _IOW('s', 101, struct ifreq) /* Get if flags */
#define SIOCGIFADDR _IOW('s', 102, struct ifreq) /* Get if addr */
#define SIOCGIFBRDADDR _IOW('s', 103, struct ifreq) /* Get if broadcastaddr */
-#define SIOCGIFNETMASK _IOW('s', 104, struct ifreq) /* Get if nettqmask */
+#define SIOCGIFNETMASK _IOW('s', 104, struct ifreq) /* Get if netmask */
#define SIOCGIFHWADDR _IOW('s', 105, struct ifreq) /* Get hw addr */
#define SIOCGIFMETRIC _IOW('s', 106, struct ifreq) /* get metric */
#define SIOCGIFMTU _IOW('s', 107, struct ifreq) /* get MTU size */
diff --git a/win/bootstrap.cpp b/win/bootstrap.cpp
index 846d58cbd..9f24f315c 100644
--- a/win/bootstrap.cpp
+++ b/win/bootstrap.cpp
@@ -35,9 +35,9 @@ QEventLoopEx* qeventloopex = 0;
Additional algorithm for win9x (including Millenium), where are problems with
easy setting environment variables:
- - try to tqfind HOME env. variable
- - if not found, try to tqfind USERPROFILE env. variable
- - if not found, try to tqfind both HOMEDRIVE and HOMEPATH env. variables
+ - try to find HOME env. variable
+ - if not found, try to find USERPROFILE env. variable
+ - if not found, try to find both HOMEDRIVE and HOMEPATH env. variables
- if not found, try in the Windows Registry:
- try get 'Software\KDE' value from HKEY_CURRENT_USER section of Windows Registry
- if not found, try to get from
diff --git a/win/common.pro b/win/common.pro
index e7066abb3..669d22d62 100644
--- a/win/common.pro
+++ b/win/common.pro
@@ -12,7 +12,7 @@ exists( custom_defs.pro ) {
}
# common version info for all libs:
-!tqcontains( CONFIG, kde3lib ) {
+!contains( CONFIG, kde3lib ) {
VER_MAJ = $(KDE_VER_MAJ)
VER_MIN = $(KDE_VER_MIN)
VER_PAT = $(KDE_VER_PAT)
@@ -27,19 +27,19 @@ isEmpty( KW_CONFIG ) {
}
# release switch has priority over debug
-tqcontains(KW_CONFIG,release) {
+contains(KW_CONFIG,release) {
CONFIG -= debug
CONFIG += release
}
-tqcontains(KW_CONFIG,debug) {
+contains(KW_CONFIG,debug) {
CONFIG += debug
CONFIG -= release
}
-tqcontains(KW_CONFIG,windows) {
+contains(KW_CONFIG,windows) {
CONFIG += windows
CONFIG -= console
}
-tqcontains(KW_CONFIG,console) {
+contains(KW_CONFIG,console) {
CONFIG -= windows
CONFIG += console
}
@@ -55,17 +55,17 @@ KDELIBDESTDIR = $$KDEBINDESTDIR\bin #shared with all binaries
# dlls suffixes for given target
isEmpty( KDEBUG ) {
- tqcontains(CONFIG,debug) {
+ contains(CONFIG,debug) {
KDEBUG=_d
KDELIBDEBUG=_d
KDELIBDEBUGLIB=_d.lib
}
- !tqcontains(CONFIG,debug) {
+ !contains(CONFIG,debug) {
KDEBUG=_
- tqcontains(CONFIG,kde3lib) {
+ contains(CONFIG,kde3lib) {
KDELIBDEBUG=
}
- !tqcontains(CONFIG,kde3lib) {
+ !contains(CONFIG,kde3lib) {
KDELIBDEBUG=_
}
KDELIBDEBUGLIB=.lib
@@ -73,21 +73,21 @@ isEmpty( KDEBUG ) {
}
KDELIB_SUFFIX=$$KDEBUG$(KDE_VER).lib
-tqcontains( TEMPLATE, app ) {
+contains( TEMPLATE, app ) {
# default dest dir for "app"
-# tqcontains(CONFIG,debug) {
+# contains(CONFIG,debug) {
DESTDIR = $$KDEBINDESTDIR\bin
# }
-# !tqcontains(CONFIG,debug) {
+# !contains(CONFIG,debug) {
# DESTDIR = $$KDEBINDESTDIR\release-bin
# }
- !tqcontains(CONFIG,nokdecore) {
+ !contains(CONFIG,nokdecore) {
LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX
}
- !tqcontains(CONFIG,nokdeui) {
+ !contains(CONFIG,nokdeui) {
LIBS += $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX
}
- !tqcontains(CONFIG,nokdefx) {
+ !contains(CONFIG,nokdefx) {
LIBS += $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX
}
}
@@ -95,25 +95,25 @@ tqcontains( TEMPLATE, app ) {
isEmpty( TEMPLATE ) {
TEMPLATE = lib
}
-tqcontains( TEMPLATE, lib ) {
+contains( TEMPLATE, lib ) {
CONFIG += dll
# indicate that we building a library
QMAKE_CXXFLAGS += -DKDE_MAKE_LIB=1
# lib/kde3 dest dir (for modules)
- tqcontains( CONFIG, kde3lib ) {
+ contains( CONFIG, kde3lib ) {
DESTDIR = $$KDEBINDESTDIR/lib/kde3
TARGET_EXT = .dll #- no ver. in filename
}
- !tqcontains( CONFIG, kde3lib ) {
+ !contains( CONFIG, kde3lib ) {
DESTDIR = $$KDELIBDESTDIR
}
- tqcontains( CONFIG, kstyle ) {
+ contains( CONFIG, kstyle ) {
DESTDIR = $$KDEBINDESTDIR/lib/kde3/plugins/styles
CONFIG += plugin
}
-# !tqcontains(CONFIG,debug) {
+# !contains(CONFIG,debug) {
# DESTDIR = $$KDEBINDESTDIR\release-lib
# }
@@ -124,19 +124,19 @@ tqcontains( TEMPLATE, lib ) {
}
# win32 dependent lib
-!tqcontains( DEFINES, MAKE_KDEWIN32_LIB ) {
+!contains( DEFINES, MAKE_KDEWIN32_LIB ) {
LIBS += $$KDELIBDESTDIR/kdewin32$$KDELIB_SUFFIX
}
# libltdl:
-!tqcontains( DEFINES, MAKE_LTDL_LIB ) {
- !tqcontains( DEFINES, MAKE_KDEWIN32_LIB ) {
+!contains( DEFINES, MAKE_LTDL_LIB ) {
+ !contains( DEFINES, MAKE_KDEWIN32_LIB ) {
LIBS += $$KDELIBDESTDIR/ltdl$$KDELIB_SUFFIX
DEFINES += LIBLTDL_DLL_IMPORT
}
}
-!tqcontains( DEFINES, QT_DLL) {
+!contains( DEFINES, QT_DLL) {
DEFINES += QT_DLL
}
@@ -161,13 +161,13 @@ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_EXCEPTIONS_ON # /GX for msvc
# catch Release-Build Errors in Debug Build
#DISABLED for msvc.net
-#tqcontains( CONFIG, debug ) {
-# tqcontains( KW_CONFIG, debug ) {
+#contains( CONFIG, debug ) {
+# contains( KW_CONFIG, debug ) {
# QMAKE_CXXFLAGS += /GZ
# }
#}
-# create an output file whether or not LINK tqfinds an undefined symbol
+# create an output file whether or not LINK finds an undefined symbol
# (warning 4006 will be raised instead of error):
QMAKE_LFLAGS += /FORCE:MULTIPLE
@@ -175,24 +175,24 @@ QMAKE_LFLAGS += /FORCE:MULTIPLE
# a .cpp or .cxx extension, thus .cc files are compiled properly with msvc
QMAKE_CXXFLAGS += /TP
-INCLUDEPATH += tqmoc $(KDELIBS)/win $(KDELIBS)
+INCLUDEPATH += moc $(KDELIBS)/win $(KDELIBS)
-tqcontains(KW_CONFIG,release) {
+contains(KW_CONFIG,release) {
OBJECTS_DIR = obj_rel
}
-!tqcontains(KW_CONFIG,release) {
+!contains(KW_CONFIG,release) {
OBJECTS_DIR = obj
}
-TQMOC_DIR = tqmoc
+MOC_DIR = moc
# enable this to temporary add debug info!
# CONFIG += debug
# CONFIG -= release
-!tqcontains(CONFIG,debug) {
+!contains(CONFIG,debug) {
QMAKE_LFLAGS += /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCR71D /NODEFAULTLIB:MSVCP71D
}
-tqcontains(CONFIG,debug) {
+contains(CONFIG,debug) {
QMAKE_LFLAGS += /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:MSVCR71 /NODEFAULTLIB:MSVCP71 /NODEFAULTLIB:libc
}
diff --git a/win/dirent.h b/win/dirent.h
index f897c5ad1..2a4edf4c8 100644
--- a/win/dirent.h
+++ b/win/dirent.h
@@ -52,10 +52,10 @@ struct dirent {
/* typedef DIR - not the same as Unix */
typedef struct {
- long handle; /* _tqfindfirst/_tqfindnext handle */
+ long handle; /* _findfirst/_findnext handle */
short offset; /* offset into directory */
short finished; /* 1 if there are not more files */
- struct _tqfinddata_t fileinfo; /* from _tqfindfirst/_tqfindnext */
+ struct _finddata_t fileinfo; /* from _findfirst/_findnext */
char *dir; /* the dir we are reading */
struct dirent dent; /* the dirent to return */
} DIR;
diff --git a/win/in.h b/win/in.h
index 936a4b3a5..6a8114586 100644
--- a/win/in.h
+++ b/win/in.h
@@ -121,7 +121,7 @@ struct sockaddr_in
/*
* Definitions of the bits in an Internet address integer.
* On subnets, host and network parts are found according
- * to the subnet tqmask, not these tqmasks.
+ * to the subnet mask, not these masks.
*/
#define IN_CLASSA(a) ((((long int) (a)) & 0x80000000) == 0)
#define IN_CLASSA_NET 0xff000000
diff --git a/win/kdelibs_global_win.h b/win/kdelibs_global_win.h
index c8882d9d3..dfb3432e8 100644
--- a/win/kdelibs_global_win.h
+++ b/win/kdelibs_global_win.h
@@ -141,7 +141,7 @@ typedef int mode_t;
/* warning C4150: deletion of pointer to incomplete type 'type'; no destructor called
The delete operator was called to delete the given type, which was
-declared but not defined. The compiler was unable to tqfind any destructors for the given type.
+declared but not defined. The compiler was unable to find any destructors for the given type.
*/
#pragma warning( disable: 4150 )
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 =
diff --git a/win/qeventloopex.cpp b/win/qeventloopex.cpp
index 9db6bd133..da5eba60c 100644
--- a/win/qeventloopex.cpp
+++ b/win/qeventloopex.cpp
@@ -263,7 +263,7 @@ void QEventLoopEx::unregisterSocketNotifier( TQSocketNotifier *notifier )
SetEvent(d->m_evPendingListEmpty);
list->remove(); // remove notifier found above
- if ( d->sn_highest == sockfd ) {// tqfind highest fd
+ if ( d->sn_highest == sockfd ) {// find highest fd
d->sn_highest = -1;
for ( int i=0; i<3; i++ ) {
if ( d->sn_vec[i].list && ! d->sn_vec[i].list->isEmpty() )
@@ -433,7 +433,7 @@ void QEventLoopEx::run()
if (WSAGetLastError() == WSAENOTSOCK) {
- // it seems a socket notifier has a bad fd... tqfind out
+ // it seems a socket notifier has a bad fd... find out
// which one it is and disable it
fd_set fdset;
struct timeval zerotm;
diff --git a/win/readdir.c b/win/readdir.c
index 0bd9d6ca2..501e777b0 100644
--- a/win/readdir.c
+++ b/win/readdir.c
@@ -94,7 +94,7 @@ KDEWIN32_EXPORT DIR * opendir(const char *dir)
dp->finished = 0;
dp->dir = strdup(dir);
- if ((handle = _tqfindfirst(filespec, &(dp->fileinfo))) < 0) {
+ if ((handle = _findfirst(filespec, &(dp->fileinfo))) < 0) {
if (errno == ENOENT)
dp->finished = 1;
else
@@ -112,7 +112,7 @@ KDEWIN32_EXPORT struct dirent * readdir(DIR *dp)
if (!dp || dp->finished) return NULL;
if (dp->offset != 0) {
- if (_tqfindnext(dp->handle, &(dp->fileinfo)) < 0) {
+ if (_findnext(dp->handle, &(dp->fileinfo)) < 0) {
dp->finished = 1;
return NULL;
}
@@ -137,7 +137,7 @@ KDEWIN32_EXPORT struct dirent* readdir_r(DIR *dirp, struct dirent *entry, struct
KDEWIN32_EXPORT int closedir(DIR *dp)
{
if (!dp) return 0;
- _tqfindclose(dp->handle);
+ _findclose(dp->handle);
if (dp->dir) free(dp->dir);
if (dp) free(dp);
diff --git a/win/readdir.h b/win/readdir.h
index 82d18d2f5..d2330844c 100644
--- a/win/readdir.h
+++ b/win/readdir.h
@@ -88,10 +88,10 @@ struct dirent {
/* typedef DIR - not the same as Unix */
typedef struct {
- long handle; /* _tqfindfirst/_tqfindnext handle */
+ long handle; /* _findfirst/_findnext handle */
short offset; /* offset into directory */
short finished; /* 1 if there are not more files */
- struct _tqfinddata_t fileinfo; /* from _tqfindfirst/_tqfindnext */
+ struct _finddata_t fileinfo; /* from _findfirst/_findnext */
char *dir; /* the dir we are reading */
struct dirent dent; /* the dirent to return */
} DIR;
diff --git a/win/syslog.c b/win/syslog.c
index 01280cf3f..f2a754298 100644
--- a/win/syslog.c
+++ b/win/syslog.c
@@ -29,7 +29,7 @@ KDEWIN32_EXPORT void openlog (const char *ident , int option , int facility)
/*! @todo */
}
-KDEWIN32_EXPORT int setlogtqmask (int priority)
+KDEWIN32_EXPORT int setlogmask (int priority)
{
/*! @todo */
return 0;
diff --git a/win/syslog.h b/win/syslog.h
index 6b2157517..d5d7ea27a 100644
--- a/win/syslog.h
+++ b/win/syslog.h
@@ -89,7 +89,7 @@ extern "C" {
KDEWIN32_EXPORT void closelog (void);
KDEWIN32_EXPORT void openlog (const char *ident , int option , int facility);
-KDEWIN32_EXPORT int setlogtqmask (int priority);
+KDEWIN32_EXPORT int setlogmask (int priority);
KDEWIN32_EXPORT void syslog (int priority, const char * format, ...);
#ifdef __cplusplus
diff --git a/win/tools/README.tools b/win/tools/README.tools
index eebc2f7e0..35b3a5264 100644
--- a/win/tools/README.tools
+++ b/win/tools/README.tools
@@ -3,4 +3,4 @@ kdelibs/win32 build tools
(c) 2003-2005, Jaroslaw Staniek
Add this directory to your PATH.
-Cygwin (or other bash tqreplacement) required.
+Cygwin (or other bash replacement) required.
diff --git a/win/tools/collect_kdelibs_pro_files b/win/tools/collect_kdelibs_pro_files
index 01ec3c427..ea2466ef2 100755
--- a/win/tools/collect_kdelibs_pro_files
+++ b/win/tools/collect_kdelibs_pro_files
@@ -11,7 +11,7 @@ mkdir -p $dest
cd "$KDELIBS"
-for pro in `tqfind . -name \*.pro | grep -v "\/\.\|^\.\/win/"` kded/makeall.sh kded/makeall_rel.sh ; do
+for pro in `find . -name \*.pro | grep -v "\/\.\|^\.\/win/"` kded/makeall.sh kded/makeall_rel.sh ; do
dir=`dirname "$pro"`
mkdir -p "$dest/$dir"
if [ "$pro" -nt "$dest/$pro" ] ; then
diff --git a/win/tools/kdcopidl b/win/tools/kdcopidl
index 406b35cfc..f695659d7 100755
--- a/win/tools/kdcopidl
+++ b/win/tools/kdcopidl
@@ -9,7 +9,7 @@ else
dir="."
fi
-tqfind $dir -maxdepth 1 -name \*.h | while read ; do
+find $dir -maxdepth 1 -name \*.h | while read ; do
grep K_DCOP $REPLY > /dev/null || continue
name=`echo $REPLY | sed -e "s/\\.h//"`
if [ $name".kidl" -ot $REPLY -o ! -f $name".kidl" -o ! -f $name"_skel.cpp" -o ! -f $name"_stub.cpp" ] ; then
diff --git a/win/tools/kmoc b/win/tools/kmoc
index 8f08c9b7d..2fef8ea60 100755
--- a/win/tools/kmoc
+++ b/win/tools/kmoc
@@ -1,19 +1,19 @@
#!/bin/bash
# Creates KDE-compatible .moc files out of .h files in current directory
-# .moc files are saved to tqmoc/ subdirectory.
-# Any additional arguments are directories - ktqmoc will be called for each of them.
+# .moc files are saved to moc/ subdirectory.
+# Any additional arguments are directories - kmoc will be called for each of them.
-mkdir -p tqmoc
-tqfind . -maxdepth 1 -name \*.h | while read ; do
+mkdir -p moc
+find . -maxdepth 1 -name \*.h | while read ; do
grep Q_OBJECT $REPLY > /dev/null || continue
- tqmoc=tqmoc/`echo $REPLY | sed -e "s/\\.h/\\.moc/;s/\\.\\///"`
- if [ $tqmoc -ot $REPLY ] ; then echo tqmocing $REPLY... ; tqmoc $REPLY -o $tqmoc ; fi
+ moc=moc/`echo $REPLY | sed -e "s/\\.h/\\.moc/;s/\\.\\///"`
+ if [ $moc -ot $REPLY ] ; then echo mocing $REPLY... ; moc $REPLY -o $moc ; fi
done
pwd=`pwd`
while [ $# -gt 0 ] ; do
- cd $pwd/$1 && ktqmoc
+ cd $pwd/$1 && kmoc
cd $pwd
shift
done
diff --git a/win/tools/update_kdelibs_pro_files b/win/tools/update_kdelibs_pro_files
index f0d09981d..15f745cf8 100755
--- a/win/tools/update_kdelibs_pro_files
+++ b/win/tools/update_kdelibs_pro_files
@@ -12,7 +12,7 @@ dest=../..
cd "$KDELIBS/$src"
-for pro in `tqfind . -name \*.pro -o -name \*.sh` ; do
+for pro in `find . -name \*.pro -o -name \*.sh` ; do
dir=`dirname "$pro"`
if [ ! -d "$KDELIBS/$dir" ] ; then
echo "no \$KDELIBS/$dir directory: creating it"
diff --git a/win/win.pro b/win/win.pro
index 6f426a181..d61d2c053 100644
--- a/win/win.pro
+++ b/win/win.pro
@@ -8,17 +8,17 @@ TARGET = kdewin32$$KDEBUG
QMAKE_CXXFLAGS += /FI$(KDELIBS)/kdecore/kdelibs_export.h
QMAKE_CFLAGS += /FI$(KDELIBS)/kdecore/kdelibs_export.h
-system( tqmoc qeventloopex.h -o tqmoc/qeventloopex.moc )
+system( moc qeventloopex.h -o moc/qeventloopex.moc )
WIN9x {
DEFINES += KDEWIN32_9x
DESTDIR = $$KDELIBDESTDIR/win9x
- tqcontains(KW_CONFIG,release) {
+ contains(KW_CONFIG,release) {
OBJECTS_DIR = 9x/obj_rel
}
- !tqcontains(KW_CONFIG,release) {
+ !contains(KW_CONFIG,release) {
OBJECTS_DIR = 9x/obj
}
}
diff --git a/win/win32_utils2.cpp b/win/win32_utils2.cpp
index 767fa92f2..2e46d2acb 100644
--- a/win/win32_utils2.cpp
+++ b/win/win32_utils2.cpp
@@ -98,7 +98,7 @@ TQString convertKFileDialogFilterToQFileDialogFilter(const TQString& filter)
// escaped '/' characters.
TQString copy (kde_filters);
- for (pos = 0; (pos = copy.tqfind("\\/", pos)) != -1; ++pos)
+ for (pos = 0; (pos = copy.find("\\/", pos)) != -1; ++pos)
copy.remove(pos, 1);
//<js>
@@ -112,7 +112,7 @@ TQString convertKFileDialogFilterToQFileDialogFilter(const TQString& filter)
current = *it;
TQString new_f;//filter part
TQString new_name;//filter name part
- int p = (*it).tqfind('|');
+ int p = (*it).find('|');
if (p!=-1) {
new_f = current.left(p);
new_name = current.mid(p+1);
@@ -122,8 +122,8 @@ TQString convertKFileDialogFilterToQFileDialogFilter(const TQString& filter)
new_name = current; //nothing better
}
//remove (.....) from name
- p=new_name.tqfind('(');
- int p2 = new_name.tqfindRev(')');
+ p=new_name.find('(');
+ int p2 = new_name.findRev(')');
TQString new_name1, new_name2;
if (p!=-1)
new_name1 = new_name.left(p);
@@ -131,8 +131,8 @@ TQString convertKFileDialogFilterToQFileDialogFilter(const TQString& filter)
new_name2 = new_name.mid(p2+1);
if (!new_name1.isEmpty() || !new_name2.isEmpty())
new_name = new_name1.stripWhiteSpace() + " " + new_name2.stripWhiteSpace();
- new_name.tqreplace('(',"");
- new_name.tqreplace(')',"");
+ new_name.replace('(',"");
+ new_name.replace(')',"");
new_name = new_name.stripWhiteSpace();
// make filters unique: remove uppercase extensions (case doesn't matter on win32, BTW)