From c6cb3f27942501d24b0ded69c90ebbf7c43c755e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 20:02:30 +0200 Subject: Additional k => tde renaming and fixes --- win/dummy.cpp | 2 +- .../interfaces/tdetexteditor/tdetexteditor.pro | 2 +- win/pro_files/kabc/kabc.pro | 40 ---- win/pro_files/kabc/vcard/vcard.pro | 22 --- win/pro_files/kded/kded.pro | 2 +- win/pro_files/kio/kio.pro | 212 --------------------- .../kio/tdefile/tests/tdefiletreeviewtest.pro | 29 --- win/pro_files/tdeabc/tdeabc.pro | 40 ++++ win/pro_files/tdeabc/vcard/vcard.pro | 22 +++ .../tdeio/tdefile/tests/tdefiletreeviewtest.pro | 29 +++ win/pro_files/tdeio/tdeio.pro | 212 +++++++++++++++++++++ win/pro_files/tdeparts/tdeparts.pro | 2 +- win/pro_files/tderesources/tderesources.pro | 2 +- win/pro_files/tdeutils/tdeutils.pro | 2 +- win/tdelibs_export_win.h | 14 +- win/tools/build_tdelibs_dbg | 4 +- win/tools/build_tdelibs_rel | 4 +- win/tools/kde_env | 2 +- 18 files changed, 321 insertions(+), 321 deletions(-) delete mode 100644 win/pro_files/kabc/kabc.pro delete mode 100644 win/pro_files/kabc/vcard/vcard.pro delete mode 100644 win/pro_files/kio/kio.pro delete mode 100644 win/pro_files/kio/tdefile/tests/tdefiletreeviewtest.pro create mode 100644 win/pro_files/tdeabc/tdeabc.pro create mode 100644 win/pro_files/tdeabc/vcard/vcard.pro create mode 100644 win/pro_files/tdeio/tdefile/tests/tdefiletreeviewtest.pro create mode 100644 win/pro_files/tdeio/tdeio.pro (limited to 'win') 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/kabc/kabc.pro b/win/pro_files/kabc/kabc.pro deleted file mode 100644 index b3eae05b4..000000000 --- a/win/pro_files/kabc/kabc.pro +++ /dev/null @@ -1,40 +0,0 @@ -TEMPLATE = lib - -include( $(KDELIBS)/win/common.pro ) - -# needed to export library classes: -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 - -INCLUDEPATH += $(KDELIBS)/tdeabc/vcard/include $(KDELIBS)/tdeabc/vcard/include/generated \ - $(KDELIBS)/tdeabc/vcardparser - -system( bash kmoc ) -system( bash kdcopidl ) -system( cd scripts && perl.exe makeaddressee ) - -TARGET = kabc$$KDEBUG - -SOURCES = \ - address.cpp addressbook.cpp addressee.cpp addresseedialog.cpp agent.cpp \ - distributionlist.cpp distributionlistdialog.cpp distributionlisteditor.cpp \ - errorhandler.cpp field.cpp formatfactory.cpp geo.cpp key.cpp \ - phonenumber.cpp picture.cpp plugin.cpp resource.cpp \ - resourceselectdialog.cpp secrecy.cpp sound.cpp stdaddressbook.cpp \ - timezone.cpp vcard21parser.cpp vcardconverter.cpp vcardformat.cpp \ - vcardformatimpl.cpp vcardformatplugin.cpp ldifconverter.cpp addresslineedit.cpp \ - ldapclient.cpp addresseelist.cpp vcardtool.cpp addresseehelper.cpp \ - lock.cpp locknull.cpp ldif.cpp ldapurl.cpp ldapconfigwidget.cpp \ - sortmode.cpp \ -\ -vcardparser/vcard.cpp vcardparser/vcardline.cpp vcardparser/vcardparser.cpp - -HEADERS = - -generated: -SOURCES += \ -addresseehelper_skel.cpp \ -addresseehelper_stub.cpp - diff --git a/win/pro_files/kabc/vcard/vcard.pro b/win/pro_files/kabc/vcard/vcard.pro deleted file mode 100644 index e2de8e6d7..000000000 --- a/win/pro_files/kabc/vcard/vcard.pro +++ /dev/null @@ -1,22 +0,0 @@ -TEMPLATE = lib - -include( $(KDELIBS)/win/common.pro ) - -# needed to export library classes: -DEFINES += MAKE_KVCARD_LIB - -LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX - -INCLUDEPATH += $(KDELIBS)/tdeabc/vcard/include $(KDELIBS)/tdeabc/vcard/include/generated \ - $(KDELIBS)/tdeabc/vcardparser - -system( bash kmoc ) -system( bash kdcopidl ) - -TARGET = kvcard$$KDEBUG - -SOURCES = \ -vCard-all.cpp - -HEADERS = - 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/kio/kio.pro b/win/pro_files/kio/kio.pro deleted file mode 100644 index dc16d76b8..000000000 --- a/win/pro_files/kio/kio.pro +++ /dev/null @@ -1,212 +0,0 @@ -TEMPLATE = lib - -include( $(KDELIBS)/win/common.pro ) -include( $(KDELIBS)/win/zlib.pro ) - -# needed to export library classes: -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 tdefile misc bookmarks kssl ) - -TARGET = kio$$KDEBUG - -INCLUDEPATH += $(KDELIBS)/tdecore/network $(KDELIBS)/tdeio/tdeio $(KDELIBS)/tdeio/misc $(KDELIBS)/tdeio/bookmarks \ - $(KDELIBS)/tdeio/kssl \ - $(KDELIBS)/libltdl $(KDELIBS)/interfaces \ - $(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 ) -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 = \ -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/tdeemailsettings.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/tdeprotocolmanager.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 \ -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 \ -\ -tdefile/kcombiview.cpp \ -tdefile/kcustommenueditor.cpp \ -tdefile/tdediroperator.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/tderecentdirs.cpp \ -tdefile/tderecentdocument.cpp \ -tdefile/kurlbar.cpp \ -tdefile/kurlcombobox.cpp \ -tdefile/kurlrequester.cpp \ -tdefile/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 tdeio/kautomount.cpp \ - -SOURCES += \ -../tdecore/kprotocolinfo_tdecore.cpp - -# js 2004-08-05 ^^^^^ a hack because msvc cannot split a class between two libraries! - -#kprotocolinfofactory.cpp \ - -#slavebase.cpp \ - -# generated: -SOURCES += \ -tdeio/kdirnotify_stub.cpp \ -tdeio/kdirnotify_skel.cpp \ -tdeio/observer_stub.cpp \ -tdeio/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 \ -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 deleted file mode 100644 index 58f334806..000000000 --- a/win/pro_files/kio/tdefile/tests/tdefiletreeviewtest.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 = 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/tdeabc/tdeabc.pro b/win/pro_files/tdeabc/tdeabc.pro new file mode 100644 index 000000000..71ca62093 --- /dev/null +++ b/win/pro_files/tdeabc/tdeabc.pro @@ -0,0 +1,40 @@ +TEMPLATE = lib + +include( $(KDELIBS)/win/common.pro ) + +# needed to export library classes: +DEFINES += MAKE_KABC_LIB +LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR\tderesources$$KDELIB_SUFFIX $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR\tdeio$$KDELIB_SUFFIX $$KDELIBDESTDIR\kvcard$$KDELIB_SUFFIX + +INCLUDEPATH += $(KDELIBS)/tdeabc/vcard/include $(KDELIBS)/tdeabc/vcard/include/generated \ + $(KDELIBS)/tdeabc/vcardparser + +system( bash kmoc ) +system( bash kdcopidl ) +system( cd scripts && perl.exe makeaddressee ) + +TARGET = tdeabc$$KDEBUG + +SOURCES = \ + address.cpp addressbook.cpp addressee.cpp addresseedialog.cpp agent.cpp \ + distributionlist.cpp distributionlistdialog.cpp distributionlisteditor.cpp \ + errorhandler.cpp field.cpp formatfactory.cpp geo.cpp key.cpp \ + phonenumber.cpp picture.cpp plugin.cpp resource.cpp \ + resourceselectdialog.cpp secrecy.cpp sound.cpp stdaddressbook.cpp \ + timezone.cpp vcard21parser.cpp vcardconverter.cpp vcardformat.cpp \ + vcardformatimpl.cpp vcardformatplugin.cpp ldifconverter.cpp addresslineedit.cpp \ + ldapclient.cpp addresseelist.cpp vcardtool.cpp addresseehelper.cpp \ + lock.cpp locknull.cpp ldif.cpp ldapurl.cpp ldapconfigwidget.cpp \ + sortmode.cpp \ +\ +vcardparser/vcard.cpp vcardparser/vcardline.cpp vcardparser/vcardparser.cpp + +HEADERS = + +generated: +SOURCES += \ +addresseehelper_skel.cpp \ +addresseehelper_stub.cpp + diff --git a/win/pro_files/tdeabc/vcard/vcard.pro b/win/pro_files/tdeabc/vcard/vcard.pro new file mode 100644 index 000000000..e2de8e6d7 --- /dev/null +++ b/win/pro_files/tdeabc/vcard/vcard.pro @@ -0,0 +1,22 @@ +TEMPLATE = lib + +include( $(KDELIBS)/win/common.pro ) + +# needed to export library classes: +DEFINES += MAKE_KVCARD_LIB + +LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX + +INCLUDEPATH += $(KDELIBS)/tdeabc/vcard/include $(KDELIBS)/tdeabc/vcard/include/generated \ + $(KDELIBS)/tdeabc/vcardparser + +system( bash kmoc ) +system( bash kdcopidl ) + +TARGET = kvcard$$KDEBUG + +SOURCES = \ +vCard-all.cpp + +HEADERS = + diff --git a/win/pro_files/tdeio/tdefile/tests/tdefiletreeviewtest.pro b/win/pro_files/tdeio/tdefile/tests/tdefiletreeviewtest.pro new file mode 100644 index 000000000..58f334806 --- /dev/null +++ b/win/pro_files/tdeio/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/tdeio/tdeio.pro b/win/pro_files/tdeio/tdeio.pro new file mode 100644 index 000000000..706208b2a --- /dev/null +++ b/win/pro_files/tdeio/tdeio.pro @@ -0,0 +1,212 @@ +TEMPLATE = lib + +include( $(KDELIBS)/win/common.pro ) +include( $(KDELIBS)/win/zlib.pro ) + +# needed to export library classes: +DEFINES += MAKE_TDEIO_LIB + +LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kdewin32$$KDELIB_SUFFIX + +system( bash kmoc tdeio tdefile misc bookmarks kssl ) + +TARGET = tdeio$$KDEBUG + +INCLUDEPATH += $(KDELIBS)/tdecore/network $(KDELIBS)/tdeio/tdeio $(KDELIBS)/tdeio/misc $(KDELIBS)/tdeio/bookmarks \ + $(KDELIBS)/tdeio/kssl \ + $(KDELIBS)/libltdl $(KDELIBS)/interfaces \ + $(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 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 ) + + +SOURCES = \ +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/tdeemailsettings.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/tdeprotocolmanager.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 \ +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 \ +\ +tdefile/kcombiview.cpp \ +tdefile/kcustommenueditor.cpp \ +tdefile/tdediroperator.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/tderecentdirs.cpp \ +tdefile/tderecentdocument.cpp \ +tdefile/kurlbar.cpp \ +tdefile/kurlcombobox.cpp \ +tdefile/kurlrequester.cpp \ +tdefile/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 tdeio/kautomount.cpp \ + +SOURCES += \ +../tdecore/kprotocolinfo_tdecore.cpp + +# js 2004-08-05 ^^^^^ a hack because msvc cannot split a class between two libraries! + +#kprotocolinfofactory.cpp \ + +#slavebase.cpp \ + +# generated: +SOURCES += \ +tdeio/kdirnotify_stub.cpp \ +tdeio/kdirnotify_skel.cpp \ +tdeio/observer_stub.cpp \ +tdeio/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 \ +tdefile/knotifywidgetbase.ui \ +tdefile/kpropertiesdesktopadvbase.ui \ +tdefile/kpropertiesdesktopbase.ui \ +tdefile/kpropertiesmimetypebase.ui 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 -- cgit v1.2.3