From 0ae5679aa160245af248836e1d7743aeff63f2e1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 02:31:13 -0600 Subject: Additional kde to tde renaming --- win/common.pro | 12 ++++++------ win/dirent.h | 2 +- win/fcntl.h | 2 +- win/kde_file_win.h | 2 +- win/pro_files/dcop/client/client.pro | 2 +- win/pro_files/dcop/client/dcop/dcop.pro | 2 +- win/pro_files/dcop/client/dcopfind/dcopfind.pro | 2 +- win/pro_files/dcop/client/dcopref/dcopref.pro | 2 +- win/pro_files/dcop/dcopidl/dcopidl.pro | 4 ++-- win/pro_files/dcop/dcopidl2cpp/dcopidl2cpp.pro | 4 ++-- win/pro_files/dcop/dcopserver/dcopserver.pro | 2 +- .../dcop/dcopserver_shutdown/dcopserver_shutdown.pro | 2 +- win/pro_files/dcop/iceauth/iceauth.pro | 2 +- win/pro_files/dcop/testdcop/testdcop.pro | 2 +- win/pro_files/dcop/tests/dcop_test.pro | 2 +- win/pro_files/dcop/tests/driver.pro | 2 +- win/pro_files/dcop/tests/tests.pro | 2 +- win/pro_files/interfaces/ktexteditor/ktexteditor.pro | 4 ++-- 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 | 6 +++--- win/pro_files/kdecore/kdecore.pro | 12 ++++++------ win/pro_files/kdefx/kdefx.pro | 2 +- win/pro_files/kdefx/kdefx_rel.pro | 2 +- win/pro_files/kdeprint/kdeprint.pro | 2 +- win/pro_files/kdeui/kdeui.pro | 4 ++-- win/pro_files/kdewidgets/kdewidgets.pro | 4 ++-- win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro | 2 +- win/pro_files/kio/kio.pro | 6 +++--- win/pro_files/kioslave/common.pro | 2 +- win/pro_files/kmdi/kmdi.pro | 4 ++-- win/pro_files/kmdi/test/test.pro | 2 +- win/pro_files/kparts/kparts.pro | 2 +- win/pro_files/kresources/kresources.pro | 2 +- win/pro_files/kstyles/common.pro | 2 +- win/pro_files/kstyles/kthemestyle/themestyle.pro | 2 +- .../kstyles/thinkeramik/widget-engine/genembed.pro | 2 +- .../kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro | 14 +++++++------- win/pro_files/kutils/kutils.pro | 2 +- win/pwd.h | 2 +- win/signal.h | 2 +- win/stdlib.h | 2 +- win/string.h | 2 +- win/sys/mman.h | 2 +- win/sys/resource.h | 2 +- win/sys/stat.h | 2 +- win/sys/time.h | 2 +- win/sys/times.h | 2 +- win/sys/utsname.h | 2 +- win/syslog.h | 2 +- win/tools/build_kdelibs_dbg | 6 +++--- win/tools/build_kdelibs_rel | 6 +++--- win/tools/kde_env | 2 +- win/unistd.h | 2 +- win/win.pro | 4 ++-- win/win32_utils.h | 2 +- 57 files changed, 88 insertions(+), 88 deletions(-) (limited to 'win') diff --git a/win/common.pro b/win/common.pro index 2e7837a82..a27fe889e 100644 --- a/win/common.pro +++ b/win/common.pro @@ -81,14 +81,14 @@ contains( TEMPLATE, app ) { # !contains(CONFIG,debug) { # DESTDIR = $$KDEBINDESTDIR\release-bin # } - !contains(CONFIG,nokdecore) { - LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX + !contains(CONFIG,notdecore) { + LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX } - !contains(CONFIG,nokdeui) { - LIBS += $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX + !contains(CONFIG,notdeui) { + LIBS += $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX } - !contains(CONFIG,nokdefx) { - LIBS += $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX + !contains(CONFIG,notdefx) { + LIBS += $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX } } # default template is "lib" diff --git a/win/dirent.h b/win/dirent.h index 2a4edf4c8..19af3be3c 100644 --- a/win/dirent.h +++ b/win/dirent.h @@ -22,7 +22,7 @@ #ifndef _SYS_DIRENT_H #define _SYS_DIRENT_H -#include +#include #include #include diff --git a/win/fcntl.h b/win/fcntl.h index ba098c3ab..4c495863a 100644 --- a/win/fcntl.h +++ b/win/fcntl.h @@ -20,7 +20,7 @@ #ifndef _FCNTL_H #define _FCNTL_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/win/kde_file_win.h b/win/kde_file_win.h index ada37eec8..1c9e22304 100644 --- a/win/kde_file_win.h +++ b/win/kde_file_win.h @@ -27,7 +27,7 @@ #include #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/win/pro_files/dcop/client/client.pro b/win/pro_files/dcop/client/client.pro index 4df64db5b..cb732b012 100644 --- a/win/pro_files/dcop/client/client.pro +++ b/win/pro_files/dcop/client/client.pro @@ -13,6 +13,6 @@ TARGET = dcopclient #INCLUDEPATH += .. ../moc -LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX SOURCES = dcopclient.c diff --git a/win/pro_files/dcop/client/dcop/dcop.pro b/win/pro_files/dcop/client/dcop/dcop.pro index 99911eedb..946a128c4 100644 --- a/win/pro_files/dcop/client/dcop/dcop.pro +++ b/win/pro_files/dcop/client/dcop/dcop.pro @@ -13,6 +13,6 @@ TARGET = dcop #INCLUDEPATH += .. ../moc -LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX SOURCES += ../dcop.cpp diff --git a/win/pro_files/dcop/client/dcopfind/dcopfind.pro b/win/pro_files/dcop/client/dcopfind/dcopfind.pro index 315dcf5a2..6c643bb14 100644 --- a/win/pro_files/dcop/client/dcopfind/dcopfind.pro +++ b/win/pro_files/dcop/client/dcopfind/dcopfind.pro @@ -13,6 +13,6 @@ TARGET = dcopfind #INCLUDEPATH += .. ../moc -LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX SOURCES += ../dcopfind.cpp diff --git a/win/pro_files/dcop/client/dcopref/dcopref.pro b/win/pro_files/dcop/client/dcopref/dcopref.pro index 13370884c..65ba00a9d 100644 --- a/win/pro_files/dcop/client/dcopref/dcopref.pro +++ b/win/pro_files/dcop/client/dcopref/dcopref.pro @@ -13,6 +13,6 @@ TARGET = dcopref #INCLUDEPATH += .. ../moc -LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX SOURCES += ../dcopref.c diff --git a/win/pro_files/dcop/dcopidl/dcopidl.pro b/win/pro_files/dcop/dcopidl/dcopidl.pro index 017bfa5c8..2febfaa2c 100644 --- a/win/pro_files/dcop/dcopidl/dcopidl.pro +++ b/win/pro_files/dcop/dcopidl/dcopidl.pro @@ -6,8 +6,8 @@ include( $(KDELIBS)/win/common.pro ) LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX -LIBS -= $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX +LIBS -= $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX TARGET = dcopidl diff --git a/win/pro_files/dcop/dcopidl2cpp/dcopidl2cpp.pro b/win/pro_files/dcop/dcopidl2cpp/dcopidl2cpp.pro index af8cef771..1794fa5c6 100644 --- a/win/pro_files/dcop/dcopidl2cpp/dcopidl2cpp.pro +++ b/win/pro_files/dcop/dcopidl2cpp/dcopidl2cpp.pro @@ -2,8 +2,8 @@ TEMPLATE = app include( $(KDELIBS)/win/common.pro ) -LIBS -= $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX +LIBS -= $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX TARGET = dcopidl2cpp diff --git a/win/pro_files/dcop/dcopserver/dcopserver.pro b/win/pro_files/dcop/dcopserver/dcopserver.pro index 46c7b31e9..bba419cdf 100644 --- a/win/pro_files/dcop/dcopserver/dcopserver.pro +++ b/win/pro_files/dcop/dcopserver/dcopserver.pro @@ -2,7 +2,7 @@ TEMPLATE = app # needed to export library classes: -CONFIG += nokdecore nokdefx nokdeui +CONFIG += notdecore notdefx notdeui include( $(KDELIBS)/win/common.pro ) DEFINES += MAKE_DCOP_LIB diff --git a/win/pro_files/dcop/dcopserver_shutdown/dcopserver_shutdown.pro b/win/pro_files/dcop/dcopserver_shutdown/dcopserver_shutdown.pro index c08d3c192..98b6893f4 100644 --- a/win/pro_files/dcop/dcopserver_shutdown/dcopserver_shutdown.pro +++ b/win/pro_files/dcop/dcopserver_shutdown/dcopserver_shutdown.pro @@ -1,6 +1,6 @@ TEMPLATE = app -CONFIG += nokdecore nokdefx nokdeui +CONFIG += notdecore notdefx notdeui include( $(KDELIBS)/win/common.pro ) # needed to export library classes: diff --git a/win/pro_files/dcop/iceauth/iceauth.pro b/win/pro_files/dcop/iceauth/iceauth.pro index b5c2bdf3b..6b243ba5e 100644 --- a/win/pro_files/dcop/iceauth/iceauth.pro +++ b/win/pro_files/dcop/iceauth/iceauth.pro @@ -1,6 +1,6 @@ TEMPLATE = app -CONFIG += nokdecore nokdefx nokdeui +CONFIG += notdecore notdefx notdeui include( $(KDELIBS)/win/common.pro ) # needed to export library classes: diff --git a/win/pro_files/dcop/testdcop/testdcop.pro b/win/pro_files/dcop/testdcop/testdcop.pro index 9876e2815..9e190c396 100644 --- a/win/pro_files/dcop/testdcop/testdcop.pro +++ b/win/pro_files/dcop/testdcop/testdcop.pro @@ -9,6 +9,6 @@ system( bash kmoc .. ) INCLUDEPATH += ../moc -LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX SOURCES = ../testdcop.cpp diff --git a/win/pro_files/dcop/tests/dcop_test.pro b/win/pro_files/dcop/tests/dcop_test.pro index 4b390dd1d..1fe241467 100644 --- a/win/pro_files/dcop/tests/dcop_test.pro +++ b/win/pro_files/dcop/tests/dcop_test.pro @@ -10,6 +10,6 @@ system( bash kdcopidl ) INCLUDEPATH += .. ../moc -LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX SOURCES += test.cpp test_skel.cpp test_stub.cpp diff --git a/win/pro_files/dcop/tests/driver.pro b/win/pro_files/dcop/tests/driver.pro index 215a8596e..f7d5e5e3a 100644 --- a/win/pro_files/dcop/tests/driver.pro +++ b/win/pro_files/dcop/tests/driver.pro @@ -10,6 +10,6 @@ system( bash kdcopidl ) INCLUDEPATH += .. ../moc -LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX SOURCES += driver.cpp test_stub.cpp diff --git a/win/pro_files/dcop/tests/tests.pro b/win/pro_files/dcop/tests/tests.pro index fd5d7cab5..ad27c8471 100644 --- a/win/pro_files/dcop/tests/tests.pro +++ b/win/pro_files/dcop/tests/tests.pro @@ -11,7 +11,7 @@ system( bash kmoc .. ) INCLUDEPATH += .. ../moc -LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeice$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX SOURCES += ../testdcop.cpp diff --git a/win/pro_files/interfaces/ktexteditor/ktexteditor.pro b/win/pro_files/interfaces/ktexteditor/ktexteditor.pro index 45678e6ff..192530e70 100644 --- a/win/pro_files/interfaces/ktexteditor/ktexteditor.pro +++ b/win/pro_files/interfaces/ktexteditor/ktexteditor.pro @@ -3,8 +3,8 @@ DEFINES += MAKE_KTEXTEDITOR_LIB include( $(KDELIBS)/win/common.pro ) -LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kparts$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX $$KDELIBDESTDIR\kabc$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\kdewin32$$KDELIB_SUFFIX diff --git a/win/pro_files/kabc/kabc.pro b/win/pro_files/kabc/kabc.pro index d7826b319..95f08b747 100644 --- a/win/pro_files/kabc/kabc.pro +++ b/win/pro_files/kabc/kabc.pro @@ -4,7 +4,7 @@ include( $(KDELIBS)/win/common.pro ) # needed to export library classes: DEFINES += MAKE_KABC_LIB -LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdeui$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\kresources$$KDELIB_SUFFIX $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX $$KDELIBDESTDIR\kvcard$$KDELIB_SUFFIX diff --git a/win/pro_files/kabc/vcard/vcard.pro b/win/pro_files/kabc/vcard/vcard.pro index 7ccf215bc..8dedc015e 100644 --- a/win/pro_files/kabc/vcard/vcard.pro +++ b/win/pro_files/kabc/vcard/vcard.pro @@ -5,7 +5,7 @@ include( $(KDELIBS)/win/common.pro ) # needed to export library classes: DEFINES += MAKE_KVCARD_LIB -LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX INCLUDEPATH += $(KDELIBS)/kabc/vcard/include $(KDELIBS)/kabc/vcard/include/generated \ $(KDELIBS)/kabc/vcardparser diff --git a/win/pro_files/kate/interfaces/interfaces.pro b/win/pro_files/kate/interfaces/interfaces.pro index e327fed37..22a1527fe 100644 --- a/win/pro_files/kate/interfaces/interfaces.pro +++ b/win/pro_files/kate/interfaces/interfaces.pro @@ -7,7 +7,7 @@ DEFINES += MAKE_KATEPARTINTERFACES_LIB TARGET = katepartinterfaces$$KDEBUG -LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/ktexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/ktexteditor$$KDELIB_SUFFIX diff --git a/win/pro_files/kate/part/part.pro b/win/pro_files/kate/part/part.pro index 46edc6508..69bfed0be 100644 --- a/win/pro_files/kate/part/part.pro +++ b/win/pro_files/kate/part/part.pro @@ -9,13 +9,13 @@ DEFINES += MAKE_KATEPART_LIB TARGET = katepart$$KDELIBDEBUG LIBS += $$KDELIBDESTDIR/katepartinterfaces$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/ktexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/ktexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/kutils$$KDELIB_SUFFIX $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/kregexpeditor \ - $(KDELIBS)/kutils $(KDELIBS)/kdeprint + $(KDELIBS)/kutils $(KDELIBS)/tdeprint system( bash kmoc ) system( bash kdcopidl ) diff --git a/win/pro_files/kdecore/kdecore.pro b/win/pro_files/kdecore/kdecore.pro index 183835a43..c4579a5cf 100644 --- a/win/pro_files/kdecore/kdecore.pro +++ b/win/pro_files/kdecore/kdecore.pro @@ -7,12 +7,12 @@ include( $(KDELIBS)/win/zlib.pro ) # needed to export library classes: DEFINES += MAKE_KDECORE_LIB -LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX \ -lqassistantclient -TARGET = kdecore$$KDEBUG +TARGET = tdecore$$KDEBUG -INCLUDEPATH += $(KDELIBS)/libltdl $(KDELIBS)/kdecore/network +INCLUDEPATH += $(KDELIBS)/libltdl $(KDELIBS)/tdecore/network system( bash kmoc ) system( bash kdcopidl ) @@ -95,7 +95,7 @@ ksockaddr.cpp \ kmdcodec.cpp \ kdcoppropertyproxy.cpp \ klibloader.cpp \ -kprotocolinfo_kdecore.cpp \ +kprotocolinfo_tdecore.cpp \ ../kio/kio/kprotocolinfo.cpp \ kprotocolinfofactory.cpp \ kmountpoint.cpp \ @@ -136,8 +136,8 @@ kdebugdcopiface_stub.cpp \ kdebugdcopiface_skel.cpp -exists( custom_kdecore.pro ) { - include( custom_kdecore.pro ) +exists( custom_tdecore.pro ) { + include( custom_tdecore.pro ) } HEADERS = diff --git a/win/pro_files/kdefx/kdefx.pro b/win/pro_files/kdefx/kdefx.pro index 6c9ba4a22..eab9ea7d9 100644 --- a/win/pro_files/kdefx/kdefx.pro +++ b/win/pro_files/kdefx/kdefx.pro @@ -6,7 +6,7 @@ include( $(KDELIBS)/win/common.pro ) # needed to export library classes: DEFINES += MAKE_KDEFX_LIB -TARGET = kdefx$$KDEBUG +TARGET = tdefx$$KDEBUG system( bash kmoc ) diff --git a/win/pro_files/kdefx/kdefx_rel.pro b/win/pro_files/kdefx/kdefx_rel.pro index 177836f03..66ae8f1a4 100644 --- a/win/pro_files/kdefx/kdefx_rel.pro +++ b/win/pro_files/kdefx/kdefx_rel.pro @@ -24,4 +24,4 @@ kcpuinfo.cpp HEADERS = -TARGET = kdefx +TARGET = tdefx diff --git a/win/pro_files/kdeprint/kdeprint.pro b/win/pro_files/kdeprint/kdeprint.pro index c541548ae..eb1bfff69 100644 --- a/win/pro_files/kdeprint/kdeprint.pro +++ b/win/pro_files/kdeprint/kdeprint.pro @@ -6,7 +6,7 @@ include( $(KDELIBS)/win/common.pro ) # needed to export library classes: DEFINES += MAKE_KDEPRINT_LIB -TARGET = kdeprint$$KDEBUG +TARGET = tdeprint$$KDEBUG SOURCES = \ kprinter.cpp \ diff --git a/win/pro_files/kdeui/kdeui.pro b/win/pro_files/kdeui/kdeui.pro index 13404b3a8..20f8c26ee 100644 --- a/win/pro_files/kdeui/kdeui.pro +++ b/win/pro_files/kdeui/kdeui.pro @@ -6,13 +6,13 @@ include( $(KDELIBS)/win/common.pro ) # needed to export library classes: DEFINES += MAKE_KDEUI_LIB -LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdefx$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdefx$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX system( bash kmoc ) system( bash kdcopidl ) -TARGET = kdeui$$KDEBUG +TARGET = tdeui$$KDEBUG SOURCES = \ kaboutapplication.cpp \ diff --git a/win/pro_files/kdewidgets/kdewidgets.pro b/win/pro_files/kdewidgets/kdewidgets.pro index e56eaba06..f3c5cd1f8 100644 --- a/win/pro_files/kdewidgets/kdewidgets.pro +++ b/win/pro_files/kdewidgets/kdewidgets.pro @@ -11,8 +11,8 @@ TARGET = kdewidgets DESTDIR = $$KDELIBDESTDIR/trinity/plugins/designer -LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/kabc$$KDELIB_SUFFIX $$KDELIBDESTDIR/kutils$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/kresources$$KDELIB_SUFFIX diff --git a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro b/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro index 8bf29bf90..448cec678 100644 --- a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro +++ b/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro @@ -11,7 +11,7 @@ kdebase_release:QMAKE_MAKEFILE = Makefile.release TARGET = kfiletreeviewtest -LIBS += $$KDELIBDESTDIR/kdefx$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX diff --git a/win/pro_files/kio/kio.pro b/win/pro_files/kio/kio.pro index 9e3144856..a6b567661 100644 --- a/win/pro_files/kio/kio.pro +++ b/win/pro_files/kio/kio.pro @@ -6,14 +6,14 @@ include( $(KDELIBS)/win/zlib.pro ) # needed to export library classes: DEFINES += MAKE_KIO_LIB -LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdeui$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$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 \ +INCLUDEPATH += $(KDELIBS)/tdecore/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 \ @@ -179,7 +179,7 @@ kssl/ksmimecrypto.cc #removed kio/kautomount.cpp \ SOURCES += \ -../kdecore/kprotocolinfo_kdecore.cpp +../tdecore/kprotocolinfo_tdecore.cpp # js 2004-08-05 ^^^^^ a hack because msvc cannot split a class between two libraries! diff --git a/win/pro_files/kioslave/common.pro b/win/pro_files/kioslave/common.pro index 35fbaf5d9..e1a63c761 100644 --- a/win/pro_files/kioslave/common.pro +++ b/win/pro_files/kioslave/common.pro @@ -4,5 +4,5 @@ CONFIG += trinitylib #this is a dynamic kde library include( $(KDELIBS)/win/common.pro ) -LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX diff --git a/win/pro_files/kmdi/kmdi.pro b/win/pro_files/kmdi/kmdi.pro index 1f425b465..2bcc97053 100644 --- a/win/pro_files/kmdi/kmdi.pro +++ b/win/pro_files/kmdi/kmdi.pro @@ -8,10 +8,10 @@ DEFINES += MAKE_KMDI_LIB TARGET = kmdi$$KDEBUG -LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/kutils$$KDELIB_SUFFIX $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX -INCLUDEPATH += res $(KDELIBS)/kutils $(KDELIBS)/kdeui +INCLUDEPATH += res $(KDELIBS)/kutils $(KDELIBS)/tdeui system( bash kmoc ) diff --git a/win/pro_files/kmdi/test/test.pro b/win/pro_files/kmdi/test/test.pro index 85216ebb0..d400e29f5 100644 --- a/win/pro_files/kmdi/test/test.pro +++ b/win/pro_files/kmdi/test/test.pro @@ -10,7 +10,7 @@ CONFIG += debug CONFIG += console unix:DEFINES = NO_INCLUDE_MOCFILES QT_NO_COMPAT -unix:LIBS += -lkmdi -L$(KDEDIR)/lib -lkdecore -lkdeui -lDCOP -lkparts +unix:LIBS += -lkmdi -L$(KDEDIR)/lib -ltdecore -ltdeui -lDCOP -lkparts unix:INCLUDEPATH += . .. $(KDEDIR)/include LIBS += $$KDELIBDESTDIR\kmdi$$KDELIB_SUFFIX $$KDELIBDESTDIR\kparts$$KDELIB_SUFFIX diff --git a/win/pro_files/kparts/kparts.pro b/win/pro_files/kparts/kparts.pro index 19b68a16b..aabdc4d37 100644 --- a/win/pro_files/kparts/kparts.pro +++ b/win/pro_files/kparts/kparts.pro @@ -8,7 +8,7 @@ DEFINES += MAKE_KPARTS_LIB TARGET = kparts$$KDEBUG -LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX INCLUDEPATH += $(KDELIBS)/kio/kfile diff --git a/win/pro_files/kresources/kresources.pro b/win/pro_files/kresources/kresources.pro index d729b82ed..a485b2fba 100644 --- a/win/pro_files/kresources/kresources.pro +++ b/win/pro_files/kresources/kresources.pro @@ -8,7 +8,7 @@ DEFINES += MAKE_KRESOURCES_LIB INCLUDEPATH += $(KDELIBS)/ab -LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdeui$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX system( bash kmoc ) diff --git a/win/pro_files/kstyles/common.pro b/win/pro_files/kstyles/common.pro index d76111c37..6cc40111c 100644 --- a/win/pro_files/kstyles/common.pro +++ b/win/pro_files/kstyles/common.pro @@ -8,5 +8,5 @@ include( $(KDELIBS)/win/common.pro ) # needed to export library classes: DEFINES += MAKE_KSTYLE_LIB -LIBS += $$KDELIBDESTDIR\kdefx$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR\tdefx$$KDELIB_SUFFIX diff --git a/win/pro_files/kstyles/kthemestyle/themestyle.pro b/win/pro_files/kstyles/kthemestyle/themestyle.pro index 773030b6b..fa55f19e3 100644 --- a/win/pro_files/kstyles/kthemestyle/themestyle.pro +++ b/win/pro_files/kstyles/kthemestyle/themestyle.pro @@ -1,6 +1,6 @@ include( ../common.pro ) -LIBS += $$KDELIBDESTDIR\kdecore$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX TARGET = kthemestyle$$KDEBUG diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro index 37e637ed7..0424eb476 100644 --- a/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro +++ b/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro @@ -3,7 +3,7 @@ TEMPLATE = app include( $(KDELIBS)/win/common.pro ) -unix:LIBS += -lkdefx +unix:LIBS += -ltdefx win32 { CONFIG +=console 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..549e2344f 100644 --- a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro +++ b/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro @@ -1,4 +1,4 @@ -# release version with compiled-in kdefx classes +# release version with compiled-in tdefx classes # this is used eg. for QT-only apps like Installer TEMPLATE = lib @@ -35,15 +35,15 @@ gradients.cpp \ thinkeramik.cpp \ pixmaploader.cpp -#compile in kdefx +#compile in tdefx SOURCES += \ -../../../kdefx/kstyle.cpp \ -../../../kdefx/kimageeffect.cpp \ -../../../kdefx/kpixmapeffect.cpp \ -../../../kdefx/kpixmap.cpp +../../../tdefx/kstyle.cpp \ +../../../tdefx/kimageeffect.cpp \ +../../../tdefx/kpixmapeffect.cpp \ +../../../tdefx/kpixmap.cpp system( moc thinkeramik.h -o moc/thinkeramik.moc ) -system( moc ../../../kdefx/kstyle.h -o moc/kstyle.moc ) +system( moc ../../../tdefx/kstyle.h -o moc/kstyle.moc ) system( bash ./genemb.sh ) diff --git a/win/pro_files/kutils/kutils.pro b/win/pro_files/kutils/kutils.pro index 5f07d4673..ce4d7fe79 100644 --- a/win/pro_files/kutils/kutils.pro +++ b/win/pro_files/kutils/kutils.pro @@ -8,7 +8,7 @@ DEFINES += MAKE_KUTILS_LIB TARGET = kutils$$KDEBUG -LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX INCLUDEPATH += $(KDELIBS)/interfaces/kregexpeditor diff --git a/win/pwd.h b/win/pwd.h index 69aaf82a6..f827918f4 100644 --- a/win/pwd.h +++ b/win/pwd.h @@ -35,7 +35,7 @@ #ifndef _PWD_H_ -#include +#include #include diff --git a/win/signal.h b/win/signal.h index 32ca1663b..fc59997f5 100644 --- a/win/signal.h +++ b/win/signal.h @@ -20,7 +20,7 @@ #ifndef SIGNAL_H #define SIGNAL_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/win/stdlib.h b/win/stdlib.h index 576f72ad4..1f5c01f89 100644 --- a/win/stdlib.h +++ b/win/stdlib.h @@ -21,7 +21,7 @@ * Definitions for common types, variables, and functions. */ -#include +#include #ifdef _MSC_VER # include diff --git a/win/string.h b/win/string.h index 47895aa12..14127b6e8 100644 --- a/win/string.h +++ b/win/string.h @@ -20,7 +20,7 @@ #ifndef KDEWIN_STRING_H #define KDEWIN_STRING_H -#include +#include #define strncasecmp strnicmp #define strcasecmp stricmp diff --git a/win/sys/mman.h b/win/sys/mman.h index d28bcba88..6ec8abcbe 100644 --- a/win/sys/mman.h +++ b/win/sys/mman.h @@ -23,7 +23,7 @@ #ifndef _MMAP_H #define _MMAP_H -#include +#include #include diff --git a/win/sys/resource.h b/win/sys/resource.h index a505f2838..d49a21f4b 100644 --- a/win/sys/resource.h +++ b/win/sys/resource.h @@ -20,7 +20,7 @@ #ifndef _SYS_RESOURCE_H_ #define _SYS_RESOURCE_H_ -#include +#include #include #ifdef __cplusplus diff --git a/win/sys/stat.h b/win/sys/stat.h index 2b22558bc..f65a56e0c 100644 --- a/win/sys/stat.h +++ b/win/sys/stat.h @@ -20,7 +20,7 @@ #ifndef _SYS_STAT_H #define _SYS_STAT_H -#include +#include /* regular sys/stat.h */ #ifdef _MSC_VER diff --git a/win/sys/time.h b/win/sys/time.h index 0f0ca08a6..ebb5144be 100644 --- a/win/sys/time.h +++ b/win/sys/time.h @@ -20,7 +20,7 @@ #ifndef _SYS_TIME_H_ #define _SYS_TIME_H_ -#include +#include //??#if !defined(_INC_TIME) diff --git a/win/sys/times.h b/win/sys/times.h index e555e4888..6ee6d652a 100644 --- a/win/sys/times.h +++ b/win/sys/times.h @@ -20,7 +20,7 @@ #ifndef _SYS_TIMES_H #define _SYS_TIMES_H -#include +#include //#include <_ansi.h> #include diff --git a/win/sys/utsname.h b/win/sys/utsname.h index 1560e0e6b..55f0b3237 100644 --- a/win/sys/utsname.h +++ b/win/sys/utsname.h @@ -20,7 +20,7 @@ #ifndef _SYS_UTSNAME_H #define _SYS_UTSNAME_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/win/syslog.h b/win/syslog.h index d5d7ea27a..38398fcbf 100644 --- a/win/syslog.h +++ b/win/syslog.h @@ -24,7 +24,7 @@ #ifndef _SYS_LOG_H #define _SYS_LOG_H -#include +#include #define LOG_EMERG 0 #define LOG_ALERT 1 diff --git a/win/tools/build_kdelibs_dbg b/win/tools/build_kdelibs_dbg index ca46d6865..9af5cc9b2 100644 --- a/win/tools/build_kdelibs_dbg +++ b/win/tools/build_kdelibs_dbg @@ -42,10 +42,10 @@ dcop/dcopidl2cpp \ dcop/dcopserver \ dcop/dcopserver_shutdown \ dcop/iceauth \ -kdefx \ +tdefx \ $additional \ -kdecore \ -kdeui \ +tdecore \ +tdeui \ kio \ kresources \ kabc/vcard \ diff --git a/win/tools/build_kdelibs_rel b/win/tools/build_kdelibs_rel index 54221f333..f8c9ba410 100644 --- a/win/tools/build_kdelibs_rel +++ b/win/tools/build_kdelibs_rel @@ -42,9 +42,9 @@ dcop/dcopidl2cpp \ dcop/dcopserver \ dcop/dcopserver_shutdown \ dcop/iceauth \ -kdefx \ -kdecore \ -kdeui \ +tdefx \ +tdecore \ +tdeui \ kstyles/thinkeramik/widget-engine \ kio \ kresources \ diff --git a/win/tools/kde_env b/win/tools/kde_env index 5920eae99..287fef1bb 100755 --- a/win/tools/kde_env +++ b/win/tools/kde_env @@ -14,7 +14,7 @@ fi # Generic settings export KDELIBS=$KDEWIN\\kdelibs # KDElibs/win32 source directory -export INCLUDE="$KDELIBS\\win;$KDELIBS;$KDELIBS\\kdecore;$KDELIBS\\kdefx;$KDELIBS\\kdeprint;$KDELIBS\\kdeui;$KDELIBS\\kmdi;$KDELIBS\\dcop;$KDELIBS\\kio;$KDELIBS\\kio\\kio;$KDELIBS\\kio\\kfile;$INCLUDE" +export INCLUDE="$KDELIBS\\win;$KDELIBS;$KDELIBS\\tdecore;$KDELIBS\\tdefx;$KDELIBS\\tdeprint;$KDELIBS\\tdeui;$KDELIBS\\kmdi;$KDELIBS\\dcop;$KDELIBS\\kio;$KDELIBS\\kio\\kio;$KDELIBS\\kio\\kfile;$INCLUDE" # Version information for binaries # We're changing this from time to time diff --git a/win/unistd.h b/win/unistd.h index 21fe8955e..297d69933 100644 --- a/win/unistd.h +++ b/win/unistd.h @@ -20,7 +20,7 @@ #ifndef _KDEWIN_UNISTD_H #define _KDEWIN_UNISTD_H -#include +#include #include /* access(), etc.*/ #include /* getpid(), etc.*/ diff --git a/win/win.pro b/win/win.pro index d61d2c053..94ca2d541 100644 --- a/win/win.pro +++ b/win/win.pro @@ -5,8 +5,8 @@ include( $(KDELIBS)/win/common.pro ) TARGET = kdewin32$$KDEBUG -QMAKE_CXXFLAGS += /FI$(KDELIBS)/kdecore/kdelibs_export.h -QMAKE_CFLAGS += /FI$(KDELIBS)/kdecore/kdelibs_export.h +QMAKE_CXXFLAGS += /FI$(KDELIBS)/tdecore/kdelibs_export.h +QMAKE_CFLAGS += /FI$(KDELIBS)/tdecore/kdelibs_export.h system( moc qeventloopex.h -o moc/qeventloopex.moc ) diff --git a/win/win32_utils.h b/win/win32_utils.h index ca3459427..e42864ccb 100644 --- a/win/win32_utils.h +++ b/win/win32_utils.h @@ -22,7 +22,7 @@ #include -#include +#include #ifdef __cplusplus #include -- cgit v1.2.1