diff options
Diffstat (limited to 'win')
| -rw-r--r-- | win/dummy.cpp | 2 | ||||
| -rw-r--r-- | win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro | 2 | ||||
| -rw-r--r-- | win/pro_files/kded/kded.pro | 2 | ||||
| -rw-r--r-- | win/pro_files/tdeabc/tdeabc.pro (renamed from win/pro_files/kabc/kabc.pro) | 4 | ||||
| -rw-r--r-- | win/pro_files/tdeabc/vcard/vcard.pro (renamed from win/pro_files/kabc/vcard/vcard.pro) | 0 | ||||
| -rw-r--r-- | win/pro_files/tdeio/tdefile/tests/tdefiletreeviewtest.pro (renamed from win/pro_files/kio/tdefile/tests/tdefiletreeviewtest.pro) | 0 | ||||
| -rw-r--r-- | win/pro_files/tdeio/tdeio.pro (renamed from win/pro_files/kio/kio.pro) | 10 | ||||
| -rw-r--r-- | win/pro_files/tdeparts/tdeparts.pro | 2 | ||||
| -rw-r--r-- | win/pro_files/tderesources/tderesources.pro | 2 | ||||
| -rw-r--r-- | win/pro_files/tdeutils/tdeutils.pro | 2 | ||||
| -rw-r--r-- | win/tdelibs_export_win.h | 14 | ||||
| -rw-r--r-- | win/tools/build_tdelibs_dbg | 4 | ||||
| -rw-r--r-- | win/tools/build_tdelibs_rel | 4 | ||||
| -rwxr-xr-x | win/tools/kde_env | 2 |
14 files changed, 25 insertions, 25 deletions
diff --git a/win/dummy.cpp b/win/dummy.cpp index 21b26172d..5e97e57b6 100644 --- a/win/dummy.cpp +++ b/win/dummy.cpp @@ -21,7 +21,7 @@ /** tqt_enter_modal() and tqt_enter_modal() from qapplication_win.cpp are not exported - by default, then we can't use it in NetAccess::enter_loop() (kio). + by default, then we can't use it in NetAccess::enter_loop() (tdeio). Empty implementation created as a workaround. */ KDEWIN32_EXPORT void tqt_enter_modal( TQWidget *widget ) diff --git a/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro b/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro index 0661d166c..285023906 100644 --- a/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro +++ b/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro @@ -6,7 +6,7 @@ include( $(KDELIBS)/win/common.pro ) LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeparts$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX $$KDELIBDESTDIR\kabc$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR\tdeio$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeabc$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\kdewin32$$KDELIB_SUFFIX INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/tdetexteditor \ diff --git a/win/pro_files/kded/kded.pro b/win/pro_files/kded/kded.pro index ee8de94d2..83bac7d4a 100644 --- a/win/pro_files/kded/kded.pro +++ b/win/pro_files/kded/kded.pro @@ -2,7 +2,7 @@ TEMPLATE = app include( $(KDELIBS)/win/common.pro ) -LIBS += $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeio$$KDELIB_SUFFIX # icon LIBS+=$(KDELIBS)/win/resources/tdebuildsycoca.res diff --git a/win/pro_files/kabc/kabc.pro b/win/pro_files/tdeabc/tdeabc.pro index b3eae05b4..71ca62093 100644 --- a/win/pro_files/kabc/kabc.pro +++ b/win/pro_files/tdeabc/tdeabc.pro @@ -6,7 +6,7 @@ include( $(KDELIBS)/win/common.pro ) DEFINES += MAKE_KABC_LIB LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\tderesources$$KDELIB_SUFFIX $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX $$KDELIBDESTDIR\kvcard$$KDELIB_SUFFIX + $$KDELIBDESTDIR\tdeio$$KDELIB_SUFFIX $$KDELIBDESTDIR\kvcard$$KDELIB_SUFFIX INCLUDEPATH += $(KDELIBS)/tdeabc/vcard/include $(KDELIBS)/tdeabc/vcard/include/generated \ $(KDELIBS)/tdeabc/vcardparser @@ -15,7 +15,7 @@ system( bash kmoc ) system( bash kdcopidl ) system( cd scripts && perl.exe makeaddressee ) -TARGET = kabc$$KDEBUG +TARGET = tdeabc$$KDEBUG SOURCES = \ address.cpp addressbook.cpp addressee.cpp addresseedialog.cpp agent.cpp \ diff --git a/win/pro_files/kabc/vcard/vcard.pro b/win/pro_files/tdeabc/vcard/vcard.pro index e2de8e6d7..e2de8e6d7 100644 --- a/win/pro_files/kabc/vcard/vcard.pro +++ b/win/pro_files/tdeabc/vcard/vcard.pro diff --git a/win/pro_files/kio/tdefile/tests/tdefiletreeviewtest.pro b/win/pro_files/tdeio/tdefile/tests/tdefiletreeviewtest.pro index 58f334806..58f334806 100644 --- a/win/pro_files/kio/tdefile/tests/tdefiletreeviewtest.pro +++ b/win/pro_files/tdeio/tdefile/tests/tdefiletreeviewtest.pro diff --git a/win/pro_files/kio/kio.pro b/win/pro_files/tdeio/tdeio.pro index dc16d76b8..706208b2a 100644 --- a/win/pro_files/kio/kio.pro +++ b/win/pro_files/tdeio/tdeio.pro @@ -4,14 +4,14 @@ include( $(KDELIBS)/win/common.pro ) include( $(KDELIBS)/win/zlib.pro ) # needed to export library classes: -DEFINES += MAKE_KIO_LIB +DEFINES += MAKE_TDEIO_LIB LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdewin32$$KDELIB_SUFFIX -system( bash kmoc kio tdefile misc bookmarks kssl ) +system( bash kmoc tdeio tdefile misc bookmarks kssl ) -TARGET = kio$$KDEBUG +TARGET = tdeio$$KDEBUG INCLUDEPATH += $(KDELIBS)/tdecore/network $(KDELIBS)/tdeio/tdeio $(KDELIBS)/tdeio/misc $(KDELIBS)/tdeio/bookmarks \ $(KDELIBS)/tdeio/kssl \ @@ -21,8 +21,8 @@ INCLUDEPATH += $(KDELIBS)/tdecore/network $(KDELIBS)/tdeio/tdeio $(KDELIBS)/tdei $(KDELIBS)/tdeio/bookmarks/moc \ $(KDELIBS)/tdeio/kssl/moc $(KDELIBS)/tdewallet/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 tdeio && dcopidl kdirnotify.h > kdirnotify.kidl && dcopidl2cpp --no-stub kdirnotify.kidl ) +system( cd tdeio && 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 ) diff --git a/win/pro_files/tdeparts/tdeparts.pro b/win/pro_files/tdeparts/tdeparts.pro index e26516544..6867fdf4f 100644 --- a/win/pro_files/tdeparts/tdeparts.pro +++ b/win/pro_files/tdeparts/tdeparts.pro @@ -4,7 +4,7 @@ include( $(KDELIBS)/win/common.pro ) # needed to export library classes: -DEFINES += MAKE_KPARTS_LIB +DEFINES += MAKE_TDEPARTS_LIB TARGET = tdeparts$$KDEBUG diff --git a/win/pro_files/tderesources/tderesources.pro b/win/pro_files/tderesources/tderesources.pro index 6c64332c6..4a02537dc 100644 --- a/win/pro_files/tderesources/tderesources.pro +++ b/win/pro_files/tderesources/tderesources.pro @@ -9,7 +9,7 @@ DEFINES += MAKE_TDERESOURCES_LIB INCLUDEPATH += $(KDELIBS)/ab LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX + $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeio$$KDELIB_SUFFIX system( bash kmoc ) system( bash kdcopidl ) diff --git a/win/pro_files/tdeutils/tdeutils.pro b/win/pro_files/tdeutils/tdeutils.pro index 6507132ee..b460c361a 100644 --- a/win/pro_files/tdeutils/tdeutils.pro +++ b/win/pro_files/tdeutils/tdeutils.pro @@ -4,7 +4,7 @@ include( $(KDELIBS)/win/common.pro ) # needed to export library classes: -DEFINES += MAKE_KUTILS_LIB +DEFINES += MAKE_TDEUTILS_LIB TARGET = tdeutils$$KDEBUG diff --git a/win/tdelibs_export_win.h b/win/tdelibs_export_win.h index 98f055ae5..830eb10d9 100644 --- a/win/tdelibs_export_win.h +++ b/win/tdelibs_export_win.h @@ -64,7 +64,7 @@ #endif #ifndef TDEIO_EXPORT -# ifdef MAKE_KIO_LIB +# ifdef MAKE_TDEIO_LIB # define TDEIO_EXPORT KDE_EXPORT # else # define TDEIO_EXPORT KDE_IMPORT @@ -77,10 +77,10 @@ # define DCOP_EXPORT KDE_IMPORT #endif -#ifdef MAKE_KPARTS_LIB -# define KPARTS_EXPORT KDE_EXPORT +#ifdef MAKE_TDEPARTS_LIB +# define TDEPARTS_EXPORT KDE_EXPORT #else -# define KPARTS_EXPORT KDE_IMPORT +# define TDEPARTS_EXPORT KDE_IMPORT #endif #ifdef MAKE_KTEXTEDITOR_LIB @@ -127,10 +127,10 @@ # define KMDI_EXPORT KDE_IMPORT #endif -#ifdef MAKE_KUTILS_LIB -# define KUTILS_EXPORT KDE_EXPORT +#ifdef MAKE_TDEUTILS_LIB +# define TDEUTILS_EXPORT KDE_EXPORT #else -# define KUTILS_EXPORT KDE_IMPORT +# define TDEUTILS_EXPORT KDE_IMPORT #endif #ifdef MAKE_KATEPARTINTERFACES_LIB diff --git a/win/tools/build_tdelibs_dbg b/win/tools/build_tdelibs_dbg index 25212f67a..e726ff855 100644 --- a/win/tools/build_tdelibs_dbg +++ b/win/tools/build_tdelibs_dbg @@ -46,10 +46,10 @@ tdefx \ $additional \ tdecore \ tdeui \ -kio \ +tdeio \ tderesources \ tdeabc/vcard \ -kabc \ +tdeabc \ tdeutils \ tdeparts \ tdemdi \ diff --git a/win/tools/build_tdelibs_rel b/win/tools/build_tdelibs_rel index 39b8f9928..4bf8ae19d 100644 --- a/win/tools/build_tdelibs_rel +++ b/win/tools/build_tdelibs_rel @@ -46,10 +46,10 @@ tdefx \ tdecore \ tdeui \ tdestyles/thinkeramik/widget-engine \ -kio \ +tdeio \ tderesources \ tdeabc/vcard \ -kabc \ +tdeabc \ tdeutils \ tdeparts \ tdemdi \ diff --git a/win/tools/kde_env b/win/tools/kde_env index c8e630de3..96fb4cb57 100755 --- a/win/tools/kde_env +++ b/win/tools/kde_env @@ -14,7 +14,7 @@ fi # Generic settings export KDELIBS=$KDEWIN\\tdelibs # KDElibs/win32 source directory -export INCLUDE="$KDELIBS\\win;$KDELIBS;$KDELIBS\\tdecore;$KDELIBS\\tdefx;$KDELIBS\\tdeprint;$KDELIBS\\tdeui;$KDELIBS\\tdemdi;$KDELIBS\\dcop;$KDELIBS\\kio;$KDELIBS\\kio\\kio;$KDELIBS\\kio\\tdefile;$INCLUDE" +export INCLUDE="$KDELIBS\\win;$KDELIBS;$KDELIBS\\tdecore;$KDELIBS\\tdefx;$KDELIBS\\tdeprint;$KDELIBS\\tdeui;$KDELIBS\\tdemdi;$KDELIBS\\dcop;$KDELIBS\\tdeio;$KDELIBS\\tdeio\\tdeio;$KDELIBS\\tdeio\\tdefile;$INCLUDE" # Version information for binaries # We're changing this from time to time |