diff options
Diffstat (limited to 'win')
35 files changed, 299 insertions, 299 deletions
diff --git a/win/pro_files/interfaces/interfaces.pro b/win/pro_files/interfaces/interfaces.pro index b766eec14..bffab613b 100644 --- a/win/pro_files/interfaces/interfaces.pro +++ b/win/pro_files/interfaces/interfaces.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs SUBDIRS += \ -ktexteditor +tdetexteditor diff --git a/win/pro_files/interfaces/ktexteditor/ktexteditor.pro b/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro index 192530e70..0661d166c 100644 --- a/win/pro_files/interfaces/ktexteditor/ktexteditor.pro +++ b/win/pro_files/interfaces/tdetexteditor/tdetexteditor.pro @@ -5,20 +5,20 @@ include( $(KDELIBS)/win/common.pro ) LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\kparts$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeparts$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX $$KDELIBDESTDIR\kabc$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\kdewin32$$KDELIB_SUFFIX -INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/ktexteditor \ - $(KDELIBS)/kabc +INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/tdetexteditor \ + $(KDELIBS)/tdeabc -TARGET = ktexteditor$$KDEBUG +TARGET = tdetexteditor$$KDEBUG system( bash kmoc ) system( bash kdcopidl ) SOURCES = \ - ktexteditor.cpp \ + tdetexteditor.cpp \ editinterface.cpp editinterfaceext.cpp \ clipboardinterface.cpp selectioninterface.cpp searchinterface.cpp \ codecompletioninterface.cpp wordwrapinterface.cpp blockselectioninterface.cpp \ diff --git a/win/pro_files/kabc/kabc.pro b/win/pro_files/kabc/kabc.pro index 95f08b747..b3eae05b4 100644 --- a/win/pro_files/kabc/kabc.pro +++ b/win/pro_files/kabc/kabc.pro @@ -5,11 +5,11 @@ include( $(KDELIBS)/win/common.pro ) # needed to export library classes: DEFINES += MAKE_KABC_LIB LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR\kresources$$KDELIB_SUFFIX $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR\tderesources$$KDELIB_SUFFIX $$KDELIBDESTDIR\dcop$$KDELIB_SUFFIX \ $$KDELIBDESTDIR\kio$$KDELIB_SUFFIX $$KDELIBDESTDIR\kvcard$$KDELIB_SUFFIX -INCLUDEPATH += $(KDELIBS)/kabc/vcard/include $(KDELIBS)/kabc/vcard/include/generated \ - $(KDELIBS)/kabc/vcardparser +INCLUDEPATH += $(KDELIBS)/tdeabc/vcard/include $(KDELIBS)/tdeabc/vcard/include/generated \ + $(KDELIBS)/tdeabc/vcardparser system( bash kmoc ) system( bash kdcopidl ) diff --git a/win/pro_files/kabc/vcard/vcard.pro b/win/pro_files/kabc/vcard/vcard.pro index 8dedc015e..e2de8e6d7 100644 --- a/win/pro_files/kabc/vcard/vcard.pro +++ b/win/pro_files/kabc/vcard/vcard.pro @@ -7,8 +7,8 @@ DEFINES += MAKE_KVCARD_LIB LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX -INCLUDEPATH += $(KDELIBS)/kabc/vcard/include $(KDELIBS)/kabc/vcard/include/generated \ - $(KDELIBS)/kabc/vcardparser +INCLUDEPATH += $(KDELIBS)/tdeabc/vcard/include $(KDELIBS)/tdeabc/vcard/include/generated \ + $(KDELIBS)/tdeabc/vcardparser system( bash kmoc ) system( bash kdcopidl ) diff --git a/win/pro_files/kate/interfaces/interfaces.pro b/win/pro_files/kate/interfaces/interfaces.pro index 22a1527fe..bfcfef97e 100644 --- a/win/pro_files/kate/interfaces/interfaces.pro +++ b/win/pro_files/kate/interfaces/interfaces.pro @@ -8,8 +8,8 @@ DEFINES += MAKE_KATEPARTINTERFACES_LIB TARGET = katepartinterfaces$$KDEBUG LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/ktexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/ktexteditor$$KDELIB_SUFFIX + $$KDELIBDESTDIR/tdetexteditor$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeparts$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tdetexteditor$$KDELIB_SUFFIX INCLUDEPATH += $(KDELIBS)/interfaces diff --git a/win/pro_files/kate/part/part.pro b/win/pro_files/kate/part/part.pro index 69bfed0be..65d87e323 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/tdecore$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tdetexteditor$$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 + $$KDELIBDESTDIR/tdeutils$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeparts$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX INCLUDEPATH += $(KDELIBS)/interfaces $(KDELIBS)/interfaces/kregexpeditor \ - $(KDELIBS)/kutils $(KDELIBS)/tdeprint + $(KDELIBS)/tdeutils $(KDELIBS)/tdeprint system( bash kmoc ) system( bash kdcopidl ) 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 f3c5cd1f8..1da63e6ec 100644 --- a/win/pro_files/kdewidgets/kdewidgets.pro +++ b/win/pro_files/kdewidgets/kdewidgets.pro @@ -3,7 +3,7 @@ CONFIG += trinitylib #this is a dynamic kde library include( $(KDELIBS)/win/common.pro ) -system( makekdewidgets -o kdewidgets.cpp kde.widgets ) +system( maketdewidgets -o kdewidgets.cpp kde.widgets ) #no _d because it's a special case @@ -11,10 +11,10 @@ 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/kutils$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kresources$$KDELIB_SUFFIX + $$KDELIBDESTDIR/tdeabc$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeutils$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tderesources$$KDELIB_SUFFIX SOURCES += classpreviews.cpp kdewidgets.cpp diff --git a/win/pro_files/kdewidgets/makekdewidgets.pro b/win/pro_files/kdewidgets/maketdewidgets.pro index cc9c0786b..bf0aabf05 100644 --- a/win/pro_files/kdewidgets/makekdewidgets.pro +++ b/win/pro_files/kdewidgets/maketdewidgets.pro @@ -3,7 +3,7 @@ TEMPLATE = app include( $(KDELIBS)/win/common.pro ) -TARGET = makekdewidgets +TARGET = maketdewidgets DESTDIR = . win32 { @@ -11,7 +11,7 @@ win32 { #CONFIG += windows } -SOURCES = makekdewidgets.cpp +SOURCES = maketdewidgets.cpp HEADERS = diff --git a/win/pro_files/kio/kio.pro b/win/pro_files/kio/kio.pro index a6b567661..dc16d76b8 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)/kwallet/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/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 \ @@ -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/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 \ \ @@ -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/kfile/tests/kfiletreeviewtest.pro b/win/pro_files/kio/tdefile/tests/tdefiletreeviewtest.pro index 4e09b8bb9..58f334806 100644 --- a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro +++ b/win/pro_files/kio/tdefile/tests/tdefiletreeviewtest.pro @@ -9,12 +9,12 @@ tdebase_release:CONFIG += windows tdebase_release:QMAKE_MAKEFILE = Makefile.release -TARGET = kfiletreeviewtest +TARGET = tdefiletreeviewtest LIBS += $$KDELIBDESTDIR/tdefx$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/dcop$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$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 @@ -22,7 +22,7 @@ LIBS+=$(KDELIBS)/win/resources/kfind.res system( bash kmoc ) SOURCES = \ -kfiletreeviewtest.cpp +tdefiletreeviewtest.cpp HEADERS = diff --git a/win/pro_files/kmdi/kmdi.pro b/win/pro_files/kmdi/kmdi.pro deleted file mode 100644 index 2bcc97053..000000000 --- a/win/pro_files/kmdi/kmdi.pro +++ /dev/null @@ -1,31 +0,0 @@ -TEMPLATE = lib - -include( $(KDELIBS)/win/common.pro ) - - -# needed to export library classes: -DEFINES += MAKE_KMDI_LIB - -TARGET = kmdi$$KDEBUG - -LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kutils$$KDELIB_SUFFIX $$KDELIBDESTDIR/kparts$$KDELIB_SUFFIX - -INCLUDEPATH += res $(KDELIBS)/kutils $(KDELIBS)/tdeui - -system( bash kmoc ) - -SOURCES = \ -kmdichildarea.cpp \ -kmdichildfrm.cpp \ -kmdichildfrmcaption.cpp \ -kmdichildview.cpp \ -kmdidockcontainer.cpp \ -kmdidocumentviewtabwidget.cpp \ -kmdifocuslist.cpp \ -kmdiguiclient.cpp \ -kmdimainfrm.cpp \ -kmditaskbar.cpp \ -kmditoolviewaccessor.cpp - -HEADERS = 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 7a81aa820..62b5d6b39 100644 --- a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro +++ b/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro @@ -37,13 +37,13 @@ pixmaploader.cpp #compile in tdefx SOURCES += \ -../../../tdefx/kstyle.cpp \ +../../../tdefx/tdestyle.cpp \ ../../../tdefx/kimageeffect.cpp \ ../../../tdefx/kpixmapeffect.cpp \ ../../../tdefx/kpixmap.cpp system( moc thinkeramik.h -o moc/thinkeramik.moc ) -system( moc ../../../tdefx/kstyle.h -o moc/kstyle.moc ) +system( moc ../../../tdefx/tdestyle.h -o moc/tdestyle.moc ) system( bash ./genemb.sh ) diff --git a/win/pro_files/tdecore/kconfig_compiler/kconfig_compiler.pro b/win/pro_files/tdecore/tdeconfig_compiler/tdeconfig_compiler.pro index 5b8272185..b8f175369 100644 --- a/win/pro_files/tdecore/kconfig_compiler/kconfig_compiler.pro +++ b/win/pro_files/tdecore/tdeconfig_compiler/tdeconfig_compiler.pro @@ -2,7 +2,7 @@ TEMPLATE = app include( $(KDELIBS)/win/common.pro ) -TARGET = kconfig_compiler +TARGET = tdeconfig_compiler win32 { #CONFIG -= console @@ -11,7 +11,7 @@ win32 { #system( bash kmoc ) -SOURCES = kconfig_compiler.cpp +SOURCES = tdeconfig_compiler.cpp HEADERS = diff --git a/win/pro_files/tdecore/tdecore.pro b/win/pro_files/tdecore/tdecore.pro index 21426a32e..fbc415726 100644 --- a/win/pro_files/tdecore/tdecore.pro +++ b/win/pro_files/tdecore/tdecore.pro @@ -38,52 +38,52 @@ kcalendarsystemgregorian.cpp \ kcalendarsystemhebrew.cpp \ kcalendarsystemhijri.cpp \ kcalendarsystemjalali.cpp \ -kaboutdata.cpp \ +tdeaboutdata.cpp \ kstringhandler.cpp \ -kcmdlineargs.cpp \ +tdecmdlineargs.cpp \ kurldrag.cpp \ kurl.cpp \ kidna.cpp \ kstaticdeleter.cpp \ kstandarddirs.cpp \ -kconfig.cpp \ -kconfigdialogmanager.cpp \ +tdeconfig.cpp \ +tdeconfigdialogmanager.cpp \ kcharsets.cpp \ -kglobal.cpp \ +tdeglobal.cpp \ kdebug.cpp \ -ktempfile.cpp \ +tdetempfile.cpp \ ktempdir.cpp \ ksavefile.cpp \ -kconfigbackend.cpp \ -kconfigbase.cpp \ -kconfigskeleton.cpp \ +tdeconfigbackend.cpp \ +tdeconfigbase.cpp \ +tdeconfigskeleton.cpp \ klockfile.cpp \ -kstdaccel.cpp \ +tdestdaccel.cpp \ kcheckaccelerators.cpp \ kkeyserver_x11.cpp \ kkeynative_x11.cpp \ -kaccelbase.cpp \ -kaccel.cpp \ -kaccelmanager.cpp \ -kshortcut.cpp \ -kshortcutmenu.cpp \ -kshortcutlist.cpp \ +tdeaccelbase.cpp \ +tdeaccel.cpp \ +tdeaccelmanager.cpp \ +tdeshortcut.cpp \ +tdeshortcutmenu.cpp \ +tdeshortcutlist.cpp \ kinstance.cpp \ tdeversion.cpp \ -klocale.cpp \ +tdelocale.cpp \ kicontheme.cpp \ kiconloader.cpp \ kiconeffect.cpp \ -kglobalsettings.cpp \ +tdeglobalsettings.cpp \ kckey.cpp \ kglobalaccel.cpp \ kglobalaccel_win.cpp \ -kaccelaction.cpp \ +tdeaccelaction.cpp \ kuniqueapplication.cpp \ -ksycoca.cpp \ -ksycocadict.cpp \ -ksycocafactory.cpp \ -kapplication.cpp \ +tdesycoca.cpp \ +tdesycocadict.cpp \ +tdesycocafactory.cpp \ +tdeapplication.cpp \ kapplication_win.cpp \ kappdcopiface.cpp \ kprocctrl.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 \ @@ -105,7 +105,7 @@ kclipboard.cpp \ kdebugdcopiface.cpp \ krandomsequence.cpp \ krfcdate.cpp \ -kmultipledrag.cpp \ +tdemultipledrag.cpp \ kipc.cpp \ kuser.cpp \ kaudioplayer.cpp \ @@ -120,7 +120,7 @@ kqiodevicegzip_p.cpp #network/tdesocketdevice.cpp \ #network/ksockssocketdevice.cpp -#kstartupinfo.cpp \ +#tdestartupinfo.cpp \ #todo: kextsock.cpp \ #todo: ksock.cpp \ #todo: ksocks.cpp \ @@ -130,8 +130,8 @@ kqiodevicegzip_p.cpp SOURCES += \ kappdcopiface_stub.cpp \ kappdcopiface_skel.cpp \ -ksycoca_stub.cpp \ -ksycoca_skel.cpp \ +tdesycoca_stub.cpp \ +tdesycoca_skel.cpp \ kdebugdcopiface_stub.cpp \ kdebugdcopiface_skel.cpp diff --git a/win/pro_files/tdefx/tdefx.pro b/win/pro_files/tdefx/tdefx.pro index f37639f92..f88c90381 100644 --- a/win/pro_files/tdefx/tdefx.pro +++ b/win/pro_files/tdefx/tdefx.pro @@ -15,7 +15,7 @@ kimageeffect.cpp \ kpixmapeffect.cpp \ kpixmapsplitter.cpp \ kpixmap.cpp \ -kstyle.cpp \ +tdestyle.cpp \ kdrawutil.cpp \ kcpuinfo.cpp diff --git a/win/pro_files/tdefx/tdefx_rel.pro b/win/pro_files/tdefx/tdefx_rel.pro index 0f013895c..358f60dc4 100644 --- a/win/pro_files/tdefx/tdefx_rel.pro +++ b/win/pro_files/tdefx/tdefx_rel.pro @@ -10,7 +10,7 @@ include( $(KDELIBS)/win/common.pro ) # needed to export library classes: DEFINES += MAKE_TDEFX_LIB -system( moc kstyle.h -o moc/kstyle.moc ) +system( moc tdestyle.h -o moc/tdestyle.moc ) LIBS -= "$(TDEDIR)\lib\kdewin32_$(KDE_VER).lib" "$(TDEDIR)\lib\ltdl_$(KDE_VER).lib" @@ -18,7 +18,7 @@ SOURCES = \ kimageeffect.cpp \ kpixmapeffect.cpp \ kpixmap.cpp \ -kstyle.cpp \ +tdestyle.cpp \ kdrawutil.cpp \ kcpuinfo.cpp diff --git a/win/pro_files/kioslave/bzip2/bzip2.pro b/win/pro_files/tdeioslave/bzip2/bzip2.pro index ba76a95a4..ba76a95a4 100644 --- a/win/pro_files/kioslave/bzip2/bzip2.pro +++ b/win/pro_files/tdeioslave/bzip2/bzip2.pro diff --git a/win/pro_files/kioslave/common.pro b/win/pro_files/tdeioslave/common.pro index e1a63c761..6b6ee9d54 100644 --- a/win/pro_files/kioslave/common.pro +++ b/win/pro_files/tdeioslave/common.pro @@ -4,5 +4,5 @@ CONFIG += trinitylib #this is a dynamic kde library include( $(KDELIBS)/win/common.pro ) -LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX diff --git a/win/pro_files/kioslave/gzip/gzip.pro b/win/pro_files/tdeioslave/gzip/gzip.pro index fb09f18c3..fb09f18c3 100644 --- a/win/pro_files/kioslave/gzip/gzip.pro +++ b/win/pro_files/tdeioslave/gzip/gzip.pro diff --git a/win/pro_files/kioslave/kioslave.pro b/win/pro_files/tdeioslave/tdeioslave.pro index a28199480..a28199480 100644 --- a/win/pro_files/kioslave/kioslave.pro +++ b/win/pro_files/tdeioslave/tdeioslave.pro diff --git a/win/pro_files/tdemdi/tdemdi.pro b/win/pro_files/tdemdi/tdemdi.pro new file mode 100644 index 000000000..7fee597d0 --- /dev/null +++ b/win/pro_files/tdemdi/tdemdi.pro @@ -0,0 +1,31 @@ +TEMPLATE = lib + +include( $(KDELIBS)/win/common.pro ) + + +# needed to export library classes: +DEFINES += MAKE_KMDI_LIB + +TARGET = tdemdi$$KDEBUG + +LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ + $$KDELIBDESTDIR/tdeutils$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeparts$$KDELIB_SUFFIX + +INCLUDEPATH += res $(KDELIBS)/tdeutils $(KDELIBS)/tdeui + +system( bash kmoc ) + +SOURCES = \ +tdemdichildarea.cpp \ +tdemdichildfrm.cpp \ +tdemdichildfrmcaption.cpp \ +tdemdichildview.cpp \ +tdemdidockcontainer.cpp \ +tdemdidocumentviewtabwidget.cpp \ +tdemdifocuslist.cpp \ +tdemdiguiclient.cpp \ +tdemdimainfrm.cpp \ +tdemditaskbar.cpp \ +tdemditoolviewaccessor.cpp + +HEADERS = diff --git a/win/pro_files/kmdi/test/test.pro b/win/pro_files/tdemdi/test/test.pro index e9536cf43..4a60cd714 100644 --- a/win/pro_files/kmdi/test/test.pro +++ b/win/pro_files/tdemdi/test/test.pro @@ -10,10 +10,10 @@ CONFIG += debug CONFIG += console unix:DEFINES = NO_INCLUDE_MOCFILES QT_NO_COMPAT -unix:LIBS += -lkmdi -L$(TDEDIR)/lib -ltdecore -ltdeui -lDCOP -lkparts +unix:LIBS += -ltdemdi -L$(TDEDIR)/lib -ltdecore -ltdeui -lDCOP -ltdeparts unix:INCLUDEPATH += . .. $(TDEDIR)/include -LIBS += $$KDELIBDESTDIR\kmdi$$KDELIB_SUFFIX $$KDELIBDESTDIR\kparts$$KDELIB_SUFFIX +LIBS += $$KDELIBDESTDIR\tdemdi$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeparts$$KDELIB_SUFFIX HEADERS = hello.h \ mainwidget.h diff --git a/win/pro_files/kparts/kparts.pro b/win/pro_files/tdeparts/tdeparts.pro index aabdc4d37..e26516544 100644 --- a/win/pro_files/kparts/kparts.pro +++ b/win/pro_files/tdeparts/tdeparts.pro @@ -6,12 +6,12 @@ include( $(KDELIBS)/win/common.pro ) # needed to export library classes: DEFINES += MAKE_KPARTS_LIB -TARGET = kparts$$KDEBUG +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/kresources/kresources.pro b/win/pro_files/tderesources/tderesources.pro index a485b2fba..6c64332c6 100644 --- a/win/pro_files/kresources/kresources.pro +++ b/win/pro_files/tderesources/tderesources.pro @@ -4,7 +4,7 @@ include( $(KDELIBS)/win/common.pro ) # needed to export library classes: -DEFINES += MAKE_KRESOURCES_LIB +DEFINES += MAKE_TDERESOURCES_LIB INCLUDEPATH += $(KDELIBS)/ab @@ -14,14 +14,14 @@ LIBS += $$KDELIBDESTDIR\tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR\tdeui$$KDELIB_SUF system( bash kmoc ) system( bash kdcopidl ) -TARGET = kresources$$KDEBUG +TARGET = tderesources$$KDEBUG SOURCES = \ configdialog.cpp \ configpage.cpp \ configwidget.cpp \ factory.cpp \ -kcmkresources.cpp \ +kcmtderesources.cpp \ managerimpl.cpp \ resource.cpp \ selectdialog.cpp \ diff --git a/win/pro_files/tdeui/tdeui.pro b/win/pro_files/tdeui/tdeui.pro index 5c438b6cf..aa1065c7d 100644 --- a/win/pro_files/tdeui/tdeui.pro +++ b/win/pro_files/tdeui/tdeui.pro @@ -15,13 +15,13 @@ system( bash kdcopidl ) TARGET = tdeui$$KDEBUG SOURCES = \ -kaboutapplication.cpp \ -kaboutdialog.cpp \ -kaboutkde.cpp \ -kactionclasses.cpp \ -kactioncollection.cpp \ -kaction.cpp \ -kactionselector.cpp \ +tdeaboutapplication.cpp \ +tdeaboutdialog.cpp \ +tdeabouttde.cpp \ +tdeactionclasses.cpp \ +tdeactioncollection.cpp \ +tdeaction.cpp \ +tdeactionselector.cpp \ kactivelabel.cpp \ kanimwidget.cpp \ karrowbutton.cpp \ @@ -30,15 +30,15 @@ kbugreport.cpp \ kbuttonbox.cpp \ kcharselect.cpp \ kcmenumngr.cpp \ -kcmodule.cpp \ +tdecmodule.cpp \ kcolorbutton.cpp \ kcolorcombo.cpp \ kcolordialog.cpp \ kcolordrag.cpp \ kcombobox.cpp \ kcommand.cpp \ -kcompletionbox.cpp \ -kconfigdialog.cpp \ +tdecompletionbox.cpp \ +tdeconfigdialog.cpp \ kcursor.cpp \ kdatepicker.cpp \ kdatetbl.cpp \ @@ -52,9 +52,9 @@ keditcl1.cpp \ keditcl2.cpp \ keditlistbox.cpp \ kedittoolbar.cpp \ -kfontcombo.cpp \ -kfontdialog.cpp \ -kfontrequester.cpp \ +tdefontcombo.cpp \ +tdefontdialog.cpp \ +tdefontrequester.cpp \ kguiitem.cpp \ khelpmenu.cpp \ kiconview.cpp \ @@ -66,12 +66,12 @@ klanguagebutton.cpp \ kled.cpp \ klineedit.cpp \ klineeditdlg.cpp \ -klistbox.cpp \ -klistview.cpp \ -klistviewsearchline.cpp \ -kmainwindowiface.cpp \ -kmainwindow.cpp \ -kmenubar.cpp \ +tdelistbox.cpp \ +tdelistview.cpp \ +tdelistviewsearchline.cpp \ +tdemainwindowiface.cpp \ +tdemainwindow.cpp \ +tdemenubar.cpp \ knuminput.cpp \ knumvalidator.cpp \ kpanelapplet.cpp \ @@ -83,18 +83,18 @@ kpassivepopup.cpp \ kpixmapio.cpp \ kpixmapregionselectordialog.cpp \ kpixmapregionselectorwidget.cpp \ -kpopupmenu.cpp \ +tdepopupmenu.cpp \ kprogress.cpp \ kpushbutton.cpp \ krestrictedline.cpp \ krootpixmap.cpp \ kruler.cpp \ ksconfig.cpp \ -kselect.cpp \ +tdeselect.cpp \ kseparator.cpp \ -kshortcutdialog.cpp \ -kspell.cpp \ -kspelldlg.cpp \ +tdeshortcutdialog.cpp \ +tdespell.cpp \ +tdespelldlg.cpp \ ksplashscreen.cpp \ ksqueezedtextlabel.cpp \ kstatusbar.cpp \ @@ -107,10 +107,10 @@ ktabctl.cpp \ ktextbrowser.cpp \ ktextedit.cpp \ ktip.cpp \ -ktoolbar.cpp \ -ktoolbarbutton.cpp \ -ktoolbarhandler.cpp \ -ktoolbarradiogroup.cpp \ +tdetoolbar.cpp \ +tdetoolbarbutton.cpp \ +tdetoolbarhandler.cpp \ +tdetoolbarradiogroup.cpp \ kurllabel.cpp \ kwhatsthismanager.cpp \ twindowinfo.cpp \ @@ -132,17 +132,17 @@ exists( kmessagebox_win.cpp ) { SOURCES += kmessagebox_win.cpp } !exists( kmessagebox_win.cpp ) { - SOURCES += kmessagebox.cpp + SOURCES += tdemessagebox.cpp } # generated: SOURCES += \ -kmainwindowiface_stub.cpp \ -kmainwindowiface_skel.cpp +tdemainwindowiface_stub.cpp \ +tdemainwindowiface_skel.cpp FORMS = \ -kshortcutdialog_advanced.ui \ -kshortcutdialog_simple.ui \ -kspellui.ui +tdeshortcutdialog_advanced.ui \ +tdeshortcutdialog_simple.ui \ +tdespellui.ui HEADERS = diff --git a/win/pro_files/kutils/kutils.pro b/win/pro_files/tdeutils/tdeutils.pro index ce4d7fe79..6507132ee 100644 --- a/win/pro_files/kutils/kutils.pro +++ b/win/pro_files/tdeutils/tdeutils.pro @@ -6,10 +6,10 @@ include( $(KDELIBS)/win/common.pro ) # needed to export library classes: DEFINES += MAKE_KUTILS_LIB -TARGET = kutils$$KDEBUG +TARGET = tdeutils$$KDEBUG LIBS += $$KDELIBDESTDIR/tdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/tdeui$$KDELIB_SUFFIX \ - $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX + $$KDELIBDESTDIR/tdeio$$KDELIB_SUFFIX INCLUDEPATH += $(KDELIBS)/interfaces/kregexpeditor @@ -18,7 +18,7 @@ system( bash kmoc ) SOURCES = \ kfind.cpp \ kfinddialog.cpp \ -kmultitabbar.cpp \ +tdemultitabbar.cpp \ kplugininfo.cpp \ kreplace.cpp \ kreplacedialog.cpp diff --git a/win/resources/kbuildsycoca.res b/win/resources/tdebuildsycoca.res Binary files differindex b26e2349c..b26e2349c 100644 --- a/win/resources/kbuildsycoca.res +++ b/win/resources/tdebuildsycoca.res diff --git a/win/tdelibs_export_win.h b/win/tdelibs_export_win.h index 17663a5fa..b9c42bde4 100644 --- a/win/tdelibs_export_win.h +++ b/win/tdelibs_export_win.h @@ -63,11 +63,11 @@ # define TDEPRINT_EXPORT KDE_IMPORT #endif -#ifndef KIO_EXPORT +#ifndef TDEIO_EXPORT # ifdef MAKE_KIO_LIB -# define KIO_EXPORT KDE_EXPORT +# define TDEIO_EXPORT KDE_EXPORT # else -# define KIO_EXPORT KDE_IMPORT +# define TDEIO_EXPORT KDE_IMPORT # endif #endif @@ -102,10 +102,10 @@ # define KVCARD_EXPORT KDE_IMPORT #endif -#ifdef MAKE_KRESOURCES_LIB -# define KRESOURCES_EXPORT KDE_EXPORT +#ifdef MAKE_TDERESOURCES_LIB +# define TDERESOURCES_EXPORT KDE_EXPORT #else -# define KRESOURCES_EXPORT KDE_IMPORT +# define TDERESOURCES_EXPORT KDE_IMPORT #endif #ifdef MAKE_TDESU_LIB @@ -114,7 +114,7 @@ # define TDESU_EXPORT KDE_IMPORT #endif -// all KStyle libs +// all TDEStyle libs #ifdef MAKE_KSTYLE_LIB # define KSTYLE_EXPORT KDE_EXPORT #else @@ -145,8 +145,8 @@ # define KATEPART_EXPORT KDE_IMPORT #endif -#ifdef MAKE_KHTML_LIB -# define KHTML_EXPORT KDE_EXPORT +#ifdef MAKE_TDEHTML_LIB +# define TDEHTML_EXPORT KDE_EXPORT #else -# define KHTML_EXPORT KDE_IMPORT +# define TDEHTML_EXPORT KDE_IMPORT #endif diff --git a/win/tdelibs_global_win.h b/win/tdelibs_global_win.h index d8b4da08a..8e7d39d99 100644 --- a/win/tdelibs_global_win.h +++ b/win/tdelibs_global_win.h @@ -162,7 +162,7 @@ declared but not defined. The compiler was unable to find any destructors for th # pragma warning(disable: 4250) # pragma warning(disable: 4006) /*libxxx : warning LNK4006: - ".... already defined in kaction.obj; second definition ignored" */ + ".... already defined in tdeaction.obj; second definition ignored" */ /* disable C4100: unreferenced formal parameter */ # pragma warning(disable: 4100) diff --git a/win/tools/build_tdelibs_dbg b/win/tools/build_tdelibs_dbg index b252b10ac..b3dcd7695 100644 --- a/win/tools/build_tdelibs_dbg +++ b/win/tools/build_tdelibs_dbg @@ -47,15 +47,15 @@ $additional \ tdecore \ tdeui \ kio \ -kresources \ -kabc/vcard \ +tderesources \ +tdeabc/vcard \ kabc \ -kutils \ -kparts \ -kmdi \ -kioslave/gzip \ -kioslave/bzip2 \ -interfaces/ktexteditor \ +tdeutils \ +tdeparts \ +tdemdi \ +tdeioslave/gzip \ +tdeioslave/bzip2 \ +interfaces/tdetexteditor \ kate/interfaces \ kate/part \ ; do @@ -69,7 +69,7 @@ kate/part \ done cd kdewidgets -qmake makekdewidgets.pro && $make clean && $make || exit 1 +qmake maketdewidgets.pro && $make clean && $make || exit 1 qmake && $make clean && $make || exit 1 # copy kdewidgets plugin for Qt Designer diff --git a/win/tools/build_tdelibs_rel b/win/tools/build_tdelibs_rel index 2a9cabbd6..2fe77ef36 100644 --- a/win/tools/build_tdelibs_rel +++ b/win/tools/build_tdelibs_rel @@ -47,15 +47,15 @@ tdecore \ tdeui \ kstyles/thinkeramik/widget-engine \ kio \ -kresources \ -kabc/vcard \ +tderesources \ +tdeabc/vcard \ kabc \ -kutils \ -kparts \ -kmdi \ -kioslave/gzip \ -kioslave/bzip2 \ -interfaces/ktexteditor \ +tdeutils \ +tdeparts \ +tdemdi \ +tdeioslave/gzip \ +tdeioslave/bzip2 \ +interfaces/tdetexteditor \ kate/interfaces \ kate/part \ ; do diff --git a/win/tools/kde_env b/win/tools/kde_env index a8c721a5d..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\\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\\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(); |