From 5159cd2beb2e87806a5b54e9991b7895285c9d3e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:04:16 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- win/pro_files/kate/part/part.pro | 2 +- win/pro_files/kded/kded.pro | 10 +- win/pro_files/kded/kded_rel.pro | 2 +- win/pro_files/kdewidgets/kdewidgets.pro | 2 +- .../kio/kfile/tests/kfiletreeviewtest.pro | 29 --- win/pro_files/kio/kio.pro | 246 ++++++++++----------- .../kio/tdefile/tests/tdefiletreeviewtest.pro | 29 +++ win/pro_files/kioslave/bzip2/bzip2.pro | 10 - win/pro_files/kioslave/common.pro | 8 - win/pro_files/kioslave/gzip/gzip.pro | 9 - win/pro_files/kioslave/kioslave.pro | 11 - .../tdecore/kconfig_compiler/kconfig_compiler.pro | 18 -- .../tdeconfig_compiler/tdeconfig_compiler.pro | 18 ++ win/pro_files/tdecore/tdecore.pro | 12 +- win/pro_files/tdeioslave/bzip2/bzip2.pro | 10 + win/pro_files/tdeioslave/common.pro | 8 + win/pro_files/tdeioslave/gzip/gzip.pro | 9 + win/pro_files/tdeioslave/tdeioslave.pro | 11 + win/pro_files/tdeparts/tdeparts.pro | 4 +- win/pro_files/tdeui/tdeui.pro | 2 +- win/pro_files/tdeutils/tdeutils.pro | 2 +- win/resources/kbuildsycoca.res | Bin 2332 -> 0 bytes win/resources/tdebuildsycoca.res | Bin 0 -> 2332 bytes win/tools/build_tdelibs_dbg | 4 +- win/tools/build_tdelibs_rel | 4 +- win/tools/kde_env | 2 +- win/win32_utils.h | 2 +- 27 files changed, 232 insertions(+), 232 deletions(-) delete mode 100644 win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro create mode 100644 win/pro_files/kio/tdefile/tests/tdefiletreeviewtest.pro delete mode 100644 win/pro_files/kioslave/bzip2/bzip2.pro delete mode 100644 win/pro_files/kioslave/common.pro delete mode 100644 win/pro_files/kioslave/gzip/gzip.pro delete mode 100644 win/pro_files/kioslave/kioslave.pro delete mode 100644 win/pro_files/tdecore/kconfig_compiler/kconfig_compiler.pro create mode 100644 win/pro_files/tdecore/tdeconfig_compiler/tdeconfig_compiler.pro create mode 100644 win/pro_files/tdeioslave/bzip2/bzip2.pro create mode 100644 win/pro_files/tdeioslave/common.pro create mode 100644 win/pro_files/tdeioslave/gzip/gzip.pro create mode 100644 win/pro_files/tdeioslave/tdeioslave.pro delete mode 100644 win/resources/kbuildsycoca.res create mode 100644 win/resources/tdebuildsycoca.res (limited to 'win') diff --git a/win/pro_files/kate/part/part.pro b/win/pro_files/kate/part/part.pro index ad3acfee7..65d87e323 100644 --- a/win/pro_files/kate/part/part.pro +++ b/win/pro_files/kate/part/part.pro @@ -12,7 +12,7 @@ LIBS += $$KDELIBDESTDIR/katepartinterfaces$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/tdetexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/tdeutils$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeparts$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX + $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/kregexpeditor \ $(KDELIBS)/tdeutils $(KDELIBS)/tdeprint diff --git a/win/pro_files/kded/kded.pro b/win/pro_files/kded/kded.pro index 05f2455cc..ee8de94d2 100644 --- a/win/pro_files/kded/kded.pro +++ b/win/pro_files/kded/kded.pro @@ -5,7 +5,7 @@ include( $(KDELIBS)/win/common.pro ) LIBS += $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX # icon -LIBS+=$(KDELIBS)/win/resources/kbuildsycoca.res +LIBS+=$(KDELIBS)/win/resources/tdebuildsycoca.res INCLUDEPATH += $(KDELIBS)/kded @@ -13,15 +13,15 @@ system( bash kmoc ) !contains(CONFIG,GUI) { !contains(KW_CONFIG,release) { - TARGET = kbuildsycoca_d + TARGET = tdebuildsycoca_d } contains(KW_CONFIG,release) { - TARGET = kbuildsycoca + TARGET = tdebuildsycoca } } SOURCES = \ -kbuildsycoca.cpp \ +tdebuildsycoca.cpp \ kbuildimageiofactory.cpp \ kbuildprotocolinfofactory.cpp \ kbuildservicefactory.cpp \ @@ -32,5 +32,5 @@ vfolder_menu.cpp HEADERS = -TRANSLATIONS = kbuildsycoca_pl.ts +TRANSLATIONS = tdebuildsycoca_pl.ts diff --git a/win/pro_files/kded/kded_rel.pro b/win/pro_files/kded/kded_rel.pro index a878305ba..b17e1f3c7 100644 --- a/win/pro_files/kded/kded_rel.pro +++ b/win/pro_files/kded/kded_rel.pro @@ -9,4 +9,4 @@ QMAKE_CXXFLAGS += -DKBUILDSYCOCA_GUI include( "kded.pro" ) -TARGET = kbuildsycocaw #gui version +TARGET = tdebuildsycocaw #gui version diff --git a/win/pro_files/kdewidgets/kdewidgets.pro b/win/pro_files/kdewidgets/kdewidgets.pro index 8bbf93cd9..435087785 100644 --- a/win/pro_files/kdewidgets/kdewidgets.pro +++ b/win/pro_files/kdewidgets/kdewidgets.pro @@ -11,7 +11,7 @@ TARGET = kdewidgets DESTDIR = $$KDELIBDESTDIR/trinity/plugins/designer -LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX \ +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/kabc$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeutils$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/tderesources$$KDELIB_SUFFIX diff --git a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro b/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro deleted file mode 100644 index c2d4afa73..000000000 --- a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro +++ /dev/null @@ -1,29 +0,0 @@ -TEMPLATE = app - -include( $(KDELIBS)/win/common.pro ) - - -#allow to select target independently from debug information -tdebase_release:CONFIG -= console -tdebase_release:CONFIG += windows -tdebase_release:QMAKE_MAKEFILE = Makefile.release - - -TARGET = kfiletreeviewtest - -LIBS += $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/tdeparts$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX - -# icon -LIBS+=$(KDELIBS)/win/resources/kfind.res - -system( bash kmoc ) - -SOURCES = \ -kfiletreeviewtest.cpp - -HEADERS = - - diff --git a/win/pro_files/kio/kio.pro b/win/pro_files/kio/kio.pro index 179de7086..15056d021 100644 --- a/win/pro_files/kio/kio.pro +++ b/win/pro_files/kio/kio.pro @@ -9,17 +9,17 @@ DEFINES += MAKE_KIO_LIB LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdewin32$$KDELIB_SUFFIX -system( bash kmoc kio kfile misc bookmarks kssl ) +system( bash kmoc kio tdefile misc bookmarks kssl ) TARGET = kio$$KDEBUG -INCLUDEPATH += $(KDELIBS)/tdecore/network $(KDELIBS)/kio/kio $(KDELIBS)/kio/misc $(KDELIBS)/kio/bookmarks \ - $(KDELIBS)/kio/kssl \ +INCLUDEPATH += $(KDELIBS)/tdecore/network $(KDELIBS)/tdeio/tdeio $(KDELIBS)/tdeio/misc $(KDELIBS)/tdeio/bookmarks \ + $(KDELIBS)/tdeio/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)/tdewallet/client + $(KDELIBS)/tdeio/tdeio/moc $(KDELIBS)/tdeio/misc/moc $(KDELIBS)/tdeio/tdefile/moc \ + $(KDELIBS)/tdeio/misc/moc \ + $(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 ) @@ -29,78 +29,78 @@ system( cd misc && dcopidl uiserver.h > uiserver.kidl && dcopidl2cpp uiserver.ki 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 \ +tdeio/authinfo.cpp \ +tdeio/chmodjob.cpp \ +tdeio/connection.cpp \ +tdeio/dataprotocol.cpp \ +tdeio/dataslave.cpp \ +tdeio/davjob.cpp \ +tdeio/defaultprogress.cpp \ +tdeio/global.cpp \ +tdeio/job.cpp \ +tdeio/kacl.cpp \ +tdeio/kar.cpp \ +tdeio/karchive.cpp \ +tdeio/kdatatool.cpp \ +tdeio/kdcopservicestarter.cpp \ +tdeio/kdirlister.cpp \ +tdeio/kdirnotify.cpp \ +tdeio/kdirwatch.cpp \ +tdeio/kemailsettings.cpp \ +tdeio/tdefilefilter.cpp \ +tdeio/tdefileitem.cpp \ +tdeio/tdefilemetainfo.cpp \ +tdeio/tdefileshare.cpp \ +tdeio/kfilterbase.cpp \ +tdeio/kfilterdev.cpp \ +tdeio/kimageio.cpp \ +tdeio/kmimemagic.cpp \ +tdeio/kmimetype.cpp \ +tdeio/kmimetypechooser.cpp \ +tdeio/knfsshare.cpp \ +tdeio/kprotocolinfo.cpp \ +tdeio/kprotocolmanager.cpp \ +tdeio/kremoteencoding.cpp \ +tdeio/krun.cpp \ +tdeio/ksambashare.cpp \ +tdeio/kscan.cpp \ +tdeio/kservice.cpp \ +tdeio/kservicefactory.cpp \ +tdeio/kservicegroup.cpp \ +tdeio/kservicegroupfactory.cpp \ +tdeio/kservicetype.cpp \ +tdeio/kservicetypefactory.cpp \ +tdeio/kshellcompletion.cpp \ +tdeio/kshred.cpp \ +tdeio/ktar.cpp \ +tdeio/ktrader.cpp \ +tdeio/ktraderparse.cpp \ +tdeio/ktraderparsetree.cpp \ +tdeio/kurifilter.cpp \ +tdeio/kurlcompletion.cpp \ +tdeio/kurlpixmapprovider.cpp \ +tdeio/kuserprofile.cpp \ +tdeio/kzip.cpp \ +tdeio/lex.c \ +tdeio/metainfojob.cpp \ +tdeio/netaccess.cpp \ +tdeio/observer.cpp \ +tdeio/passdlg.cpp \ +tdeio/paste.cpp \ +tdeio/pastedialog.cpp \ +tdeio/previewjob.cpp \ +tdeio/progressbase.cpp \ +tdeio/renamedlg.cpp \ +tdeio/scheduler.cpp \ +tdeio/sessiondata.cpp \ +tdeio/skipdlg.cpp \ +tdeio/slave.cpp \ +tdeio/slavebase.cpp \ +tdeio/slaveconfig.cpp \ +tdeio/slaveinterface.cpp \ +tdeio/statusbarprogress.cpp \ +tdeio/tcpslavebase.cpp \ +tdeio/yacc.c \ \ bookmarks/kbookmark.cc \ bookmarks/kbookmarkbar.cc \ @@ -116,41 +116,41 @@ 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 \ +tdefile/kcombiview.cpp \ +tdefile/kcustommenueditor.cpp \ +tdefile/kdiroperator.cpp \ +tdefile/kdirselectdialog.cpp \ +tdefile/kdirsize.cpp \ +tdefile/kdiskfreesp.cpp \ +tdefile/kencodingfiledialog.cpp \ +tdefile/tdefilebookmarkhandler.cpp \ +tdefile/tdefiledetailview.cpp \ +tdefile/tdefiledialog.cpp \ +tdefile/tdefilefiltercombo.cpp \ +tdefile/tdefileiconview.cpp \ +tdefile/tdefilemetainfowidget.cpp \ +tdefile/tdefilemetapreview.cpp \ +tdefile/tdefilepreview.cpp \ +tdefile/tdefilesharedlg.cpp \ +tdefile/tdefilespeedbar.cpp \ +tdefile/tdefiletreebranch.cpp \ +tdefile/tdefiletreeview.cpp \ +tdefile/tdefiletreeviewitem.cpp \ +tdefile/tdefileview.cpp \ +tdefile/kicondialog.cpp \ +tdefile/kimagefilepreview.cpp \ +tdefile/kmetaprops.cpp \ +tdefile/knotifydialog.cpp \ +tdefile/kopenwith.cpp \ +tdefile/kpreviewprops.cpp \ +tdefile/kpreviewwidgetbase.cpp \ +tdefile/kpropertiesdialog.cpp \ +tdefile/krecentdirs.cpp \ +tdefile/krecentdocument.cpp \ +tdefile/kurlbar.cpp \ +tdefile/kurlcombobox.cpp \ +tdefile/kurlrequester.cpp \ +tdefile/kurlrequesterdlg.cpp \ \ misc/uiserver.cpp \ \ @@ -176,7 +176,7 @@ kssl/ksslpeerinfo.cc \ kssl/kopenssl.cc \ kssl/ksmimecrypto.cc -#removed kio/kautomount.cpp \ +#removed tdeio/kautomount.cpp \ SOURCES += \ ../tdecore/kprotocolinfo_tdecore.cpp @@ -189,10 +189,10 @@ SOURCES += \ # generated: SOURCES += \ -kio/kdirnotify_stub.cpp \ -kio/kdirnotify_skel.cpp \ -kio/observer_stub.cpp \ -kio/observer_skel.cpp \ +tdeio/kdirnotify_stub.cpp \ +tdeio/kdirnotify_skel.cpp \ +tdeio/observer_stub.cpp \ +tdeio/observer_skel.cpp \ \ bookmarks/kbookmarknotifier_stub.cpp \ bookmarks/kbookmarknotifier_skel.cpp \ @@ -206,7 +206,7 @@ misc/uiserver_skel.cpp FORMS = \ kssl/keygenwizard.ui \ kssl/keygenwizard2.ui \ -kfile/knotifywidgetbase.ui \ -kfile/kpropertiesdesktopadvbase.ui \ -kfile/kpropertiesdesktopbase.ui \ -kfile/kpropertiesmimetypebase.ui +tdefile/knotifywidgetbase.ui \ +tdefile/kpropertiesdesktopadvbase.ui \ +tdefile/kpropertiesdesktopbase.ui \ +tdefile/kpropertiesmimetypebase.ui diff --git a/win/pro_files/kio/tdefile/tests/tdefiletreeviewtest.pro b/win/pro_files/kio/tdefile/tests/tdefiletreeviewtest.pro new file mode 100644 index 000000000..58f334806 --- /dev/null +++ b/win/pro_files/kio/tdefile/tests/tdefiletreeviewtest.pro @@ -0,0 +1,29 @@ +TEMPLATE = app + +include( $(KDELIBS)/win/common.pro ) + + +#allow to select target independently from debug information +tdebase_release:CONFIG -= console +tdebase_release:CONFIG += windows +tdebase_release:QMAKE_MAKEFILE = Makefile.release + + +TARGET = tdefiletreeviewtest + +LIBS += $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tdeparts$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX + +# icon +LIBS+=$(KDELIBS)/win/resources/kfind.res + +system( bash kmoc ) + +SOURCES = \ +tdefiletreeviewtest.cpp + +HEADERS = + + diff --git a/win/pro_files/kioslave/bzip2/bzip2.pro b/win/pro_files/kioslave/bzip2/bzip2.pro deleted file mode 100644 index ba76a95a4..000000000 --- a/win/pro_files/kioslave/bzip2/bzip2.pro +++ /dev/null @@ -1,10 +0,0 @@ -include( ../common.pro ) - -INCLUDEPATH += $(KDELIBS)/win/3rdparty/bzip2 - -TARGET = kbzip2filter$$KDELIBDEBUG - -SOURCES = \ -kbzip2filter.cpp - -HEADERS = diff --git a/win/pro_files/kioslave/common.pro b/win/pro_files/kioslave/common.pro deleted file mode 100644 index e1a63c761..000000000 --- a/win/pro_files/kioslave/common.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = lib - -CONFIG += trinitylib #this is a dynamic kde library - -include( $(KDELIBS)/win/common.pro ) - -LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX - diff --git a/win/pro_files/kioslave/gzip/gzip.pro b/win/pro_files/kioslave/gzip/gzip.pro deleted file mode 100644 index fb09f18c3..000000000 --- a/win/pro_files/kioslave/gzip/gzip.pro +++ /dev/null @@ -1,9 +0,0 @@ -include( ../common.pro ) -include( $(KDELIBS)/win/zlib.pro ) - -TARGET = kgzipfilter$$KDELIBDEBUG - -SOURCES = \ -kgzipfilter.cpp - -HEADERS = diff --git a/win/pro_files/kioslave/kioslave.pro b/win/pro_files/kioslave/kioslave.pro deleted file mode 100644 index a28199480..000000000 --- a/win/pro_files/kioslave/kioslave.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += \ -gzip \ -bzip2 - -#file \ -#ftp \ -#http \ -#metainfo - diff --git a/win/pro_files/tdecore/kconfig_compiler/kconfig_compiler.pro b/win/pro_files/tdecore/kconfig_compiler/kconfig_compiler.pro deleted file mode 100644 index 5b8272185..000000000 --- a/win/pro_files/tdecore/kconfig_compiler/kconfig_compiler.pro +++ /dev/null @@ -1,18 +0,0 @@ -TEMPLATE = app - -include( $(KDELIBS)/win/common.pro ) - -TARGET = kconfig_compiler - -win32 { -#CONFIG -= console -#CONFIG += windows -} - -#system( bash kmoc ) - -SOURCES = kconfig_compiler.cpp - -HEADERS = - - diff --git a/win/pro_files/tdecore/tdeconfig_compiler/tdeconfig_compiler.pro b/win/pro_files/tdecore/tdeconfig_compiler/tdeconfig_compiler.pro new file mode 100644 index 000000000..b8f175369 --- /dev/null +++ b/win/pro_files/tdecore/tdeconfig_compiler/tdeconfig_compiler.pro @@ -0,0 +1,18 @@ +TEMPLATE = app + +include( $(KDELIBS)/win/common.pro ) + +TARGET = tdeconfig_compiler + +win32 { +#CONFIG -= console +#CONFIG += windows +} + +#system( bash kmoc ) + +SOURCES = tdeconfig_compiler.cpp + +HEADERS = + + diff --git a/win/pro_files/tdecore/tdecore.pro b/win/pro_files/tdecore/tdecore.pro index ed6662391..0e868d6f9 100644 --- a/win/pro_files/tdecore/tdecore.pro +++ b/win/pro_files/tdecore/tdecore.pro @@ -46,17 +46,17 @@ kurl.cpp \ kidna.cpp \ kstaticdeleter.cpp \ kstandarddirs.cpp \ -kconfig.cpp \ -kconfigdialogmanager.cpp \ +tdeconfig.cpp \ +tdeconfigdialogmanager.cpp \ kcharsets.cpp \ kglobal.cpp \ kdebug.cpp \ ktempfile.cpp \ ktempdir.cpp \ ksavefile.cpp \ -kconfigbackend.cpp \ -kconfigbase.cpp \ -kconfigskeleton.cpp \ +tdeconfigbackend.cpp \ +tdeconfigbase.cpp \ +tdeconfigskeleton.cpp \ klockfile.cpp \ kstdaccel.cpp \ kcheckaccelerators.cpp \ @@ -96,7 +96,7 @@ kmdcodec.cpp \ kdcoppropertyproxy.cpp \ klibloader.cpp \ kprotocolinfo_tdecore.cpp \ -../kio/kio/kprotocolinfo.cpp \ +../tdeio/tdeio/kprotocolinfo.cpp \ kprotocolinfofactory.cpp \ kmountpoint.cpp \ kmacroexpander.cpp \ diff --git a/win/pro_files/tdeioslave/bzip2/bzip2.pro b/win/pro_files/tdeioslave/bzip2/bzip2.pro new file mode 100644 index 000000000..ba76a95a4 --- /dev/null +++ b/win/pro_files/tdeioslave/bzip2/bzip2.pro @@ -0,0 +1,10 @@ +include( ../common.pro ) + +INCLUDEPATH += $(KDELIBS)/win/3rdparty/bzip2 + +TARGET = kbzip2filter$$KDELIBDEBUG + +SOURCES = \ +kbzip2filter.cpp + +HEADERS = diff --git a/win/pro_files/tdeioslave/common.pro b/win/pro_files/tdeioslave/common.pro new file mode 100644 index 000000000..6b6ee9d54 --- /dev/null +++ b/win/pro_files/tdeioslave/common.pro @@ -0,0 +1,8 @@ +TEMPLATE = lib + +CONFIG += trinitylib #this is a dynamic kde library + +include( $(KDELIBS)/win/common.pro ) + +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX + diff --git a/win/pro_files/tdeioslave/gzip/gzip.pro b/win/pro_files/tdeioslave/gzip/gzip.pro new file mode 100644 index 000000000..fb09f18c3 --- /dev/null +++ b/win/pro_files/tdeioslave/gzip/gzip.pro @@ -0,0 +1,9 @@ +include( ../common.pro ) +include( $(KDELIBS)/win/zlib.pro ) + +TARGET = kgzipfilter$$KDELIBDEBUG + +SOURCES = \ +kgzipfilter.cpp + +HEADERS = diff --git a/win/pro_files/tdeioslave/tdeioslave.pro b/win/pro_files/tdeioslave/tdeioslave.pro new file mode 100644 index 000000000..a28199480 --- /dev/null +++ b/win/pro_files/tdeioslave/tdeioslave.pro @@ -0,0 +1,11 @@ +TEMPLATE = subdirs + +SUBDIRS += \ +gzip \ +bzip2 + +#file \ +#ftp \ +#http \ +#metainfo + diff --git a/win/pro_files/tdeparts/tdeparts.pro b/win/pro_files/tdeparts/tdeparts.pro index 5e724cd1f..e26516544 100644 --- a/win/pro_files/tdeparts/tdeparts.pro +++ b/win/pro_files/tdeparts/tdeparts.pro @@ -9,9 +9,9 @@ DEFINES += MAKE_KPARTS_LIB TARGET = tdeparts$$KDEBUG 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 -INCLUDEPATH += $(KDELIBS)/kio/kfile +INCLUDEPATH += $(KDELIBS)/tdeio/tdefile system( bash kmoc ) diff --git a/win/pro_files/tdeui/tdeui.pro b/win/pro_files/tdeui/tdeui.pro index 0c8733d55..b6a0a44d2 100644 --- a/win/pro_files/tdeui/tdeui.pro +++ b/win/pro_files/tdeui/tdeui.pro @@ -38,7 +38,7 @@ kcolordrag.cpp \ kcombobox.cpp \ kcommand.cpp \ kcompletionbox.cpp \ -kconfigdialog.cpp \ +tdeconfigdialog.cpp \ kcursor.cpp \ kdatepicker.cpp \ kdatetbl.cpp \ diff --git a/win/pro_files/tdeutils/tdeutils.pro b/win/pro_files/tdeutils/tdeutils.pro index f8e035d72..6507132ee 100644 --- a/win/pro_files/tdeutils/tdeutils.pro +++ b/win/pro_files/tdeutils/tdeutils.pro @@ -9,7 +9,7 @@ DEFINES += MAKE_KUTILS_LIB TARGET = tdeutils$$KDEBUG LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX + $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX INCLUDEPATH += $(KDELIBS)/interfaces/kregexpeditor diff --git a/win/resources/kbuildsycoca.res b/win/resources/kbuildsycoca.res deleted file mode 100644 index b26e2349c..000000000 Binary files a/win/resources/kbuildsycoca.res and /dev/null differ diff --git a/win/resources/tdebuildsycoca.res b/win/resources/tdebuildsycoca.res new file mode 100644 index 000000000..b26e2349c Binary files /dev/null and b/win/resources/tdebuildsycoca.res differ diff --git a/win/tools/build_tdelibs_dbg b/win/tools/build_tdelibs_dbg index 5a6c31512..3fcfe0c20 100644 --- a/win/tools/build_tdelibs_dbg +++ b/win/tools/build_tdelibs_dbg @@ -53,8 +53,8 @@ kabc \ tdeutils \ tdeparts \ tdemdi \ -kioslave/gzip \ -kioslave/bzip2 \ +tdeioslave/gzip \ +tdeioslave/bzip2 \ interfaces/tdetexteditor \ kate/interfaces \ kate/part \ diff --git a/win/tools/build_tdelibs_rel b/win/tools/build_tdelibs_rel index 2cd412542..399dcadda 100644 --- a/win/tools/build_tdelibs_rel +++ b/win/tools/build_tdelibs_rel @@ -53,8 +53,8 @@ kabc \ tdeutils \ tdeparts \ tdemdi \ -kioslave/gzip \ -kioslave/bzip2 \ +tdeioslave/gzip \ +tdeioslave/bzip2 \ interfaces/tdetexteditor \ kate/interfaces \ kate/part \ diff --git a/win/tools/kde_env b/win/tools/kde_env index 0fbf1410c..c8e630de3 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\\kfile;$INCLUDE" +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" # Version information for binaries # We're changing this from time to time diff --git a/win/win32_utils.h b/win/win32_utils.h index a0702c84c..1f18264cc 100644 --- a/win/win32_utils.h +++ b/win/win32_utils.h @@ -81,7 +81,7 @@ bool showWin32FilePropertyDialog(const TQString& fileName); /** \return two-letter locale name (like "en" or "pl") taken from MS Windows native registry. Useful when we don't want to rely on KSyCoCa. - Used e.g. by kbuildsycoca application. + Used e.g. by tdebuildsycoca application. */ KDEWIN32_EXPORT TQCString getWin32LocaleName(); -- cgit v1.2.1