From 560378aaca1784ba19806a0414a32b20c744de39 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 04:12:51 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- win/3rdparty/README.3rdparty | 2 +- win/asm/socket.h | 2 +- win/bootstrap.cpp | 6 +- win/common.pro | 66 ++-- win/dirent.h | 4 +- win/in.h | 2 +- win/kdelibs_global_win.h | 2 +- win/pro_files/README.pro_files | 2 +- win/pro_files/dcop/KDE-ICE/KDE-ICE.pro | 2 +- win/pro_files/dcop/client/client.pro | 4 +- win/pro_files/dcop/client/dcop/dcop.pro | 4 +- win/pro_files/dcop/client/dcopfind/dcopfind.pro | 8 +- win/pro_files/dcop/client/dcopref/dcopref.pro | 4 +- win/pro_files/dcop/dcop.pro | 2 +- win/pro_files/dcop/dcopserver/dcopserver.pro | 4 +- .../dcopserver_shutdown/dcopserver_shutdown.pro | 4 +- win/pro_files/dcop/testdcop/testdcop.pro | 4 +- win/pro_files/dcop/tests/dcop_test.pro | 4 +- win/pro_files/dcop/tests/driver.pro | 4 +- win/pro_files/dcop/tests/tests.pro | 4 +- .../interfaces/ktexteditor/ktexteditor.pro | 2 +- win/pro_files/kabc/kabc.pro | 2 +- win/pro_files/kabc/vcard/vcard.pro | 2 +- win/pro_files/kate/interfaces/interfaces.pro | 2 +- win/pro_files/kate/part/part.pro | 2 +- .../kdecore/kconfig_compiler/kconfig_compiler.pro | 2 +- win/pro_files/kdecore/kdecore.pro | 2 +- win/pro_files/kded/kded.pro | 8 +- win/pro_files/kded/kded_rel.pro | 2 +- win/pro_files/kdefx/kdefx.pro | 2 +- win/pro_files/kdefx/kdefx_rel.pro | 2 +- win/pro_files/kdeui/kdeui.pro | 2 +- .../kio/kfile/tests/kfiletreeviewtest.pro | 58 +-- win/pro_files/kio/kio.pro | 424 ++++++++++----------- win/pro_files/kmdi/kmdi.pro | 2 +- win/pro_files/kmdi/test/test.pro | 2 +- win/pro_files/kparts/kparts.pro | 2 +- win/pro_files/kresources/kresources.pro | 2 +- .../activeheart/widget-engine/widget-engine.pro | 2 +- win/pro_files/kstyles/dotNET/dotnet/dotnet.pro | 2 +- win/pro_files/kstyles/highcolor/highcolor.pro | 2 +- win/pro_files/kstyles/keramik/keramik.pro | 2 +- win/pro_files/kstyles/klegacy/klegacy.pro | 2 +- win/pro_files/kstyles/kthemestyle/themestyle.pro | 4 +- win/pro_files/kstyles/light/light.pro | 2 +- win/pro_files/kstyles/plastik/plastik.pro | 2 +- .../kstyles/slickerstyle/slicker/slicker.pro | 2 +- .../kstyles/thinkeramik/widget-engine/genembed.pro | 4 +- .../thinkeramik/widget-engine/thinkeramik_rel.pro | 8 +- .../thinkeramik/widget-engine/widget-engine.pro | 10 +- win/pro_files/kutils/kutils.pro | 10 +- win/qeventloopex.cpp | 4 +- win/readdir.c | 6 +- win/readdir.h | 4 +- win/syslog.c | 2 +- win/syslog.h | 2 +- win/tools/README.tools | 2 +- win/tools/collect_kdelibs_pro_files | 2 +- win/tools/kdcopidl | 2 +- win/tools/kmoc | 14 +- win/tools/update_kdelibs_pro_files | 2 +- win/win.pro | 6 +- win/win32_utils2.cpp | 12 +- 63 files changed, 382 insertions(+), 382 deletions(-) (limited to 'win') diff --git a/win/3rdparty/README.3rdparty b/win/3rdparty/README.3rdparty index 5b5066896..e2f84cf05 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 -contains zlib. +tqcontains zlib. diff --git a/win/asm/socket.h b/win/asm/socket.h index 3cf450044..56483b4af 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 netmask */ +#define SIOCGIFNETMASK _IOW('s', 104, struct ifreq) /* Get if nettqmask */ #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 9f24f315c..846d58cbd 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 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 + - 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 - 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 669d22d62..e7066abb3 100644 --- a/win/common.pro +++ b/win/common.pro @@ -12,7 +12,7 @@ exists( custom_defs.pro ) { } # common version info for all libs: -!contains( CONFIG, kde3lib ) { +!tqcontains( 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 -contains(KW_CONFIG,release) { +tqcontains(KW_CONFIG,release) { CONFIG -= debug CONFIG += release } -contains(KW_CONFIG,debug) { +tqcontains(KW_CONFIG,debug) { CONFIG += debug CONFIG -= release } -contains(KW_CONFIG,windows) { +tqcontains(KW_CONFIG,windows) { CONFIG += windows CONFIG -= console } -contains(KW_CONFIG,console) { +tqcontains(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 ) { - contains(CONFIG,debug) { + tqcontains(CONFIG,debug) { KDEBUG=_d KDELIBDEBUG=_d KDELIBDEBUGLIB=_d.lib } - !contains(CONFIG,debug) { + !tqcontains(CONFIG,debug) { KDEBUG=_ - contains(CONFIG,kde3lib) { + tqcontains(CONFIG,kde3lib) { KDELIBDEBUG= } - !contains(CONFIG,kde3lib) { + !tqcontains(CONFIG,kde3lib) { KDELIBDEBUG=_ } KDELIBDEBUGLIB=.lib @@ -73,21 +73,21 @@ isEmpty( KDEBUG ) { } KDELIB_SUFFIX=$$KDEBUG$(KDE_VER).lib -contains( TEMPLATE, app ) { +tqcontains( TEMPLATE, app ) { # default dest dir for "app" -# contains(CONFIG,debug) { +# tqcontains(CONFIG,debug) { DESTDIR = $$KDEBINDESTDIR\bin # } -# !contains(CONFIG,debug) { +# !tqcontains(CONFIG,debug) { # DESTDIR = $$KDEBINDESTDIR\release-bin # } - !contains(CONFIG,nokdecore) { + !tqcontains(CONFIG,nokdecore) { LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX } - !contains(CONFIG,nokdeui) { + !tqcontains(CONFIG,nokdeui) { LIBS += $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX } - !contains(CONFIG,nokdefx) { + !tqcontains(CONFIG,nokdefx) { LIBS += $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX } } @@ -95,25 +95,25 @@ contains( TEMPLATE, app ) { isEmpty( TEMPLATE ) { TEMPLATE = lib } -contains( TEMPLATE, lib ) { +tqcontains( TEMPLATE, lib ) { CONFIG += dll # indicate that we building a library QMAKE_CXXFLAGS += -DKDE_MAKE_LIB=1 # lib/kde3 dest dir (for modules) - contains( CONFIG, kde3lib ) { + tqcontains( CONFIG, kde3lib ) { DESTDIR = $$KDEBINDESTDIR/lib/kde3 TARGET_EXT = .dll #- no ver. in filename } - !contains( CONFIG, kde3lib ) { + !tqcontains( CONFIG, kde3lib ) { DESTDIR = $$KDELIBDESTDIR } - contains( CONFIG, kstyle ) { + tqcontains( CONFIG, kstyle ) { DESTDIR = $$KDEBINDESTDIR/lib/kde3/plugins/styles CONFIG += plugin } -# !contains(CONFIG,debug) { +# !tqcontains(CONFIG,debug) { # DESTDIR = $$KDEBINDESTDIR\release-lib # } @@ -124,19 +124,19 @@ contains( TEMPLATE, lib ) { } # win32 dependent lib -!contains( DEFINES, MAKE_KDEWIN32_LIB ) { +!tqcontains( DEFINES, MAKE_KDEWIN32_LIB ) { LIBS += $$KDELIBDESTDIR/kdewin32$$KDELIB_SUFFIX } # libltdl: -!contains( DEFINES, MAKE_LTDL_LIB ) { - !contains( DEFINES, MAKE_KDEWIN32_LIB ) { +!tqcontains( DEFINES, MAKE_LTDL_LIB ) { + !tqcontains( DEFINES, MAKE_KDEWIN32_LIB ) { LIBS += $$KDELIBDESTDIR/ltdl$$KDELIB_SUFFIX DEFINES += LIBLTDL_DLL_IMPORT } } -!contains( DEFINES, QT_DLL) { +!tqcontains( 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 -#contains( CONFIG, debug ) { -# contains( KW_CONFIG, debug ) { +#tqcontains( CONFIG, debug ) { +# tqcontains( KW_CONFIG, debug ) { # QMAKE_CXXFLAGS += /GZ # } #} -# create an output file whether or not LINK finds an undefined symbol +# create an output file whether or not LINK tqfinds 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 += moc $(KDELIBS)/win $(KDELIBS) +INCLUDEPATH += tqmoc $(KDELIBS)/win $(KDELIBS) -contains(KW_CONFIG,release) { +tqcontains(KW_CONFIG,release) { OBJECTS_DIR = obj_rel } -!contains(KW_CONFIG,release) { +!tqcontains(KW_CONFIG,release) { OBJECTS_DIR = obj } -MOC_DIR = moc +TQMOC_DIR = tqmoc # enable this to temporary add debug info! # CONFIG += debug # CONFIG -= release -!contains(CONFIG,debug) { +!tqcontains(CONFIG,debug) { QMAKE_LFLAGS += /NODEFAULTLIB:MSVCRTD /NODEFAULTLIB:MSVCR71D /NODEFAULTLIB:MSVCP71D } -contains(CONFIG,debug) { +tqcontains(CONFIG,debug) { QMAKE_LFLAGS += /NODEFAULTLIB:MSVCRT /NODEFAULTLIB:MSVCR71 /NODEFAULTLIB:MSVCP71 /NODEFAULTLIB:libc } diff --git a/win/dirent.h b/win/dirent.h index 2a4edf4c8..f897c5ad1 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; /* _findfirst/_findnext handle */ + long handle; /* _tqfindfirst/_tqfindnext handle */ short offset; /* offset into directory */ short finished; /* 1 if there are not more files */ - struct _finddata_t fileinfo; /* from _findfirst/_findnext */ + struct _tqfinddata_t fileinfo; /* from _tqfindfirst/_tqfindnext */ 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 6a8114586..936a4b3a5 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 mask, not these masks. + * to the subnet tqmask, not these tqmasks. */ #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 dfb3432e8..c8882d9d3 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 find any destructors for the given type. +declared but not defined. The compiler was unable to tqfind 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 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 = diff --git a/win/qeventloopex.cpp b/win/qeventloopex.cpp index da5eba60c..9db6bd133 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 ) {// find highest fd + if ( d->sn_highest == sockfd ) {// tqfind 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... find out + // it seems a socket notifier has a bad fd... tqfind 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 501e777b0..0bd9d6ca2 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 = _findfirst(filespec, &(dp->fileinfo))) < 0) { + if ((handle = _tqfindfirst(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 (_findnext(dp->handle, &(dp->fileinfo)) < 0) { + if (_tqfindnext(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; - _findclose(dp->handle); + _tqfindclose(dp->handle); if (dp->dir) free(dp->dir); if (dp) free(dp); diff --git a/win/readdir.h b/win/readdir.h index d2330844c..82d18d2f5 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; /* _findfirst/_findnext handle */ + long handle; /* _tqfindfirst/_tqfindnext handle */ short offset; /* offset into directory */ short finished; /* 1 if there are not more files */ - struct _finddata_t fileinfo; /* from _findfirst/_findnext */ + struct _tqfinddata_t fileinfo; /* from _tqfindfirst/_tqfindnext */ 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 f2a754298..01280cf3f 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 setlogmask (int priority) +KDEWIN32_EXPORT int setlogtqmask (int priority) { /*! @todo */ return 0; diff --git a/win/syslog.h b/win/syslog.h index d5d7ea27a..6b2157517 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 setlogmask (int priority); +KDEWIN32_EXPORT int setlogtqmask (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 35b3a5264..eebc2f7e0 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 replacement) required. +Cygwin (or other bash tqreplacement) required. diff --git a/win/tools/collect_kdelibs_pro_files b/win/tools/collect_kdelibs_pro_files index ea2466ef2..01ec3c427 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 `find . -name \*.pro | grep -v "\/\.\|^\.\/win/"` kded/makeall.sh kded/makeall_rel.sh ; do +for pro in `tqfind . -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 f695659d7..406b35cfc 100755 --- a/win/tools/kdcopidl +++ b/win/tools/kdcopidl @@ -9,7 +9,7 @@ else dir="." fi -find $dir -maxdepth 1 -name \*.h | while read ; do +tqfind $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 2fef8ea60..8f08c9b7d 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 moc/ subdirectory. -# Any additional arguments are directories - kmoc will be called for each of them. +# .moc files are saved to tqmoc/ subdirectory. +# Any additional arguments are directories - ktqmoc will be called for each of them. -mkdir -p moc -find . -maxdepth 1 -name \*.h | while read ; do +mkdir -p tqmoc +tqfind . -maxdepth 1 -name \*.h | while read ; do grep Q_OBJECT $REPLY > /dev/null || continue - moc=moc/`echo $REPLY | sed -e "s/\\.h/\\.moc/;s/\\.\\///"` - if [ $moc -ot $REPLY ] ; then echo mocing $REPLY... ; moc $REPLY -o $moc ; fi + tqmoc=tqmoc/`echo $REPLY | sed -e "s/\\.h/\\.moc/;s/\\.\\///"` + if [ $tqmoc -ot $REPLY ] ; then echo tqmocing $REPLY... ; tqmoc $REPLY -o $tqmoc ; fi done pwd=`pwd` while [ $# -gt 0 ] ; do - cd $pwd/$1 && kmoc + cd $pwd/$1 && ktqmoc cd $pwd shift done diff --git a/win/tools/update_kdelibs_pro_files b/win/tools/update_kdelibs_pro_files index 15f745cf8..f0d09981d 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 `find . -name \*.pro -o -name \*.sh` ; do +for pro in `tqfind . -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 d61d2c053..6f426a181 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( moc qeventloopex.h -o moc/qeventloopex.moc ) +system( tqmoc qeventloopex.h -o tqmoc/qeventloopex.moc ) WIN9x { DEFINES += KDEWIN32_9x DESTDIR = $$KDELIBDESTDIR/win9x - contains(KW_CONFIG,release) { + tqcontains(KW_CONFIG,release) { OBJECTS_DIR = 9x/obj_rel } - !contains(KW_CONFIG,release) { + !tqcontains(KW_CONFIG,release) { OBJECTS_DIR = 9x/obj } } diff --git a/win/win32_utils2.cpp b/win/win32_utils2.cpp index 2e46d2acb..767fa92f2 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.find("\\/", pos)) != -1; ++pos) + for (pos = 0; (pos = copy.tqfind("\\/", pos)) != -1; ++pos) copy.remove(pos, 1); // @@ -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).find('|'); + int p = (*it).tqfind('|'); 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.find('('); - int p2 = new_name.findRev(')'); + p=new_name.tqfind('('); + int p2 = new_name.tqfindRev(')'); 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.replace('(',""); - new_name.replace(')',""); + new_name.tqreplace('(',""); + new_name.tqreplace(')',""); new_name = new_name.stripWhiteSpace(); // make filters unique: remove uppercase extensions (case doesn't matter on win32, BTW) -- cgit v1.2.1