summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS2
-rw-r--r--CMakeLists.txt4
-rw-r--r--COMPILING20
-rw-r--r--COMPILING.html8
-rw-r--r--KDE2PORTING.html30
-rw-r--r--KDE3PORTING.html8
-rw-r--r--Makefile.am.in18
-rw-r--r--README8
-rw-r--r--TODO2
-rw-r--r--arts/configure.in.in6
-rw-r--r--arts/kde/kartsdispatcher.h2
-rw-r--r--arts/kde/kartsserver.h2
-rw-r--r--arts/kde/kaudiomanagerplay.h2
-rw-r--r--arts/kde/kaudioplaystream.h2
-rw-r--r--arts/kde/kaudiorecordstream.h2
-rw-r--r--arts/kde/kplayobjectfactory.h2
-rw-r--r--arts/message/artsmessage.cc2
-rw-r--r--configure.in.in4
-rw-r--r--dcop/Makefile.am2
-rw-r--r--dcop/dcopclient.h2
-rw-r--r--dcop/dcopidlng/kalyptus2
-rw-r--r--dcop/dcopobject.h2
-rw-r--r--dcop/dcopref.h2
-rw-r--r--dcop/dcopsignals.h2
-rw-r--r--dcop/dcopstub.h2
-rw-r--r--dnssd/README2
-rw-r--r--doc/Makefile.am2
-rw-r--r--doc/common/README.Doxygen4
-rw-r--r--interfaces/khexedit/byteseditinterface.h2
-rw-r--r--interfaces/kimproxy/library/kimproxy.cpp2
-rw-r--r--interfaces/kmediaplayer/view.h2
-rw-r--r--interfaces/kregexpeditor/kregexpeditorinterface.h10
-rw-r--r--interfaces/kscript/scriptmanager.h2
-rw-r--r--interfaces/kspeech/kspeech.h10
-rw-r--r--interfaces/ktexteditor/blockselectioninterface.h2
-rw-r--r--interfaces/ktexteditor/clipboardinterface.h2
-rw-r--r--interfaces/ktexteditor/codecompletioninterface.h2
-rw-r--r--interfaces/ktexteditor/configinterface.h2
-rw-r--r--interfaces/ktexteditor/cursorinterface.h2
-rw-r--r--interfaces/ktexteditor/documentinfo.h2
-rw-r--r--interfaces/ktexteditor/dynwordwrapinterface.h2
-rw-r--r--interfaces/ktexteditor/editinterface.h2
-rw-r--r--interfaces/ktexteditor/editinterfaceext.h2
-rw-r--r--interfaces/ktexteditor/encodinginterface.h2
-rw-r--r--interfaces/ktexteditor/highlightinginterface.h2
-rw-r--r--interfaces/ktexteditor/markinterface.h2
-rw-r--r--interfaces/ktexteditor/plugin.h2
-rw-r--r--interfaces/ktexteditor/popupmenuinterface.h2
-rw-r--r--interfaces/ktexteditor/printinterface.h2
-rw-r--r--interfaces/ktexteditor/searchinterface.h2
-rw-r--r--interfaces/ktexteditor/selectioninterface.h2
-rw-r--r--interfaces/ktexteditor/selectioninterfaceext.h2
-rw-r--r--interfaces/ktexteditor/sessionconfiginterface.h2
-rw-r--r--interfaces/ktexteditor/templateinterface.h2
-rw-r--r--interfaces/ktexteditor/texthintinterface.h2
-rw-r--r--interfaces/ktexteditor/undointerface.h2
-rw-r--r--interfaces/ktexteditor/variableinterface.h2
-rw-r--r--interfaces/ktexteditor/viewcursorinterface.h2
-rw-r--r--interfaces/ktexteditor/viewstatusmsginterface.h2
-rw-r--r--interfaces/ktexteditor/wordwrapinterface.h2
-rw-r--r--kab/README4
-rw-r--r--kab/README.KABAPI2
-rw-r--r--kab/TODO2
-rw-r--r--kabc/README2
-rw-r--r--kabc/address.h2
-rw-r--r--kabc/agent.h2
-rw-r--r--kabc/errorhandler.h2
-rw-r--r--kabc/format.h2
-rw-r--r--kabc/geo.h2
-rw-r--r--kabc/key.h2
-rw-r--r--kabc/ldif.h2
-rw-r--r--kabc/lock.h2
-rw-r--r--kabc/phonenumber.h2
-rw-r--r--kabc/picture.h2
-rw-r--r--kabc/plugin.h2
-rwxr-xr-xkabc/scripts/createisomap.pl2
-rw-r--r--kabc/secrecy.h2
-rw-r--r--kabc/sortmode.h2
-rw-r--r--kabc/sound.h2
-rw-r--r--kabc/timezone.h2
-rw-r--r--kabc/vcard/include/VCardEntity.h2
-rw-r--r--kabc/vcard/include/VCardEnum.h2
-rw-r--r--kabc/vcard/include/VCardRToken.h2
-rw-r--r--kate/ChangeLog24
-rw-r--r--kate/NEWS2
-rw-r--r--kate/TODO2
-rw-r--r--kate/data/bash.xml2
-rw-r--r--kate/data/d.xml2
-rw-r--r--kate/data/language.dtd2
-rw-r--r--kate/data/lex.xml2
-rw-r--r--kate/data/yacc.xml2
-rw-r--r--kate/interfaces/katecmd.cpp2
-rw-r--r--kate/part/katecodecompletion.cpp2
-rw-r--r--kate/part/katecodecompletion.h2
-rw-r--r--kate/part/katecursor.cpp2
-rw-r--r--kate/part/katecursor.h2
-rw-r--r--kate/part/katefont.cpp2
-rw-r--r--kate/part/katefont.h2
-rw-r--r--kate/part/kateschema.cpp2
-rw-r--r--kde.pot2
-rw-r--r--kded/HOWTO2
-rw-r--r--kded/Mainpage.dox2
-rw-r--r--kded/applications.menu2
-rw-r--r--kded/kbuildsycoca.cpp6
-rw-r--r--kded/kde-menu.cpp6
-rw-r--r--kded/kded.cpp4
-rw-r--r--kded/kdedmodule.h2
-rw-r--r--kded/khostname.cpp2
-rw-r--r--kdelibs.lsm2
-rw-r--r--kdoctools/customization/catalog2
-rw-r--r--kdoctools/customization/kde-chunk-online.xsl2
-rw-r--r--kdoctools/customization/kde-chunk.xsl2
-rw-r--r--kdoctools/customization/kde-nochunk.xsl2
-rw-r--r--kdoctools/customization/kde-web.xsl2
-rw-r--r--kdoctools/customization/ko/user.entities2
-rw-r--r--kdoctools/customization/sr/user.entities28
-rw-r--r--kdoctools/docbook/README.kde2
-rw-r--r--kdoctools/meinproc.cpp2
-rw-r--r--kdoctools/template.docbook6
-rw-r--r--khtml/CMakeLists.txt4
-rw-r--r--khtml/Makefile.am6
-rw-r--r--khtml/css/Makefile.am2
-rw-r--r--khtml/dom/Makefile.am2
-rw-r--r--khtml/dom/css_stylesheet.h2
-rw-r--r--khtml/dom/dom2_traversal.h2
-rw-r--r--khtml/dom/dom2_views.h2
-rw-r--r--khtml/dom/dom_element.h2
-rw-r--r--khtml/dom/dom_misc.h2
-rw-r--r--khtml/dom/dom_node.h2
-rw-r--r--khtml/dom/dom_string.h2
-rw-r--r--khtml/dom/html_base.h2
-rw-r--r--khtml/dom/html_block.h2
-rw-r--r--khtml/dom/html_document.h2
-rw-r--r--khtml/dom/html_element.h2
-rw-r--r--khtml/dom/html_inline.h2
-rw-r--r--khtml/dom/html_list.h2
-rw-r--r--khtml/dom/html_misc.h2
-rw-r--r--khtml/dom/html_table.h2
-rw-r--r--khtml/html/doctypes.cpp160
-rw-r--r--khtml/java/tests/testkjavaappletserver.cpp6
-rw-r--r--khtml/khtml-devel-gdb2
-rw-r--r--khtml/khtml_part.cpp2
-rw-r--r--khtml/khtml_settings.h2
-rw-r--r--khtml/khtmlview.h2
-rw-r--r--khtml/kmultipart/kmultipart.cpp2
-rw-r--r--khtml/misc/Makefile.am2
-rw-r--r--khtml/rendering/Makefile.am2
-rw-r--r--khtml/xml/Makefile.am2
-rw-r--r--kimgio/ico.cpp2
-rw-r--r--kimgio/tiffr.cpp2
-rw-r--r--kimgio/xview.cpp2
-rw-r--r--kinit/README2
-rw-r--r--kinit/kinit.cpp4
-rw-r--r--kinit/klauncher_main.cpp2
-rw-r--r--kio/bookmarks/kbookmarkmanager.h2
-rw-r--r--kio/kfile/kdiskfreesp.h2
-rw-r--r--kio/kfile/kfile.h2
-rw-r--r--kio/kfile/kpreviewwidgetbase.h2
-rw-r--r--kio/kfile/krecentdirs.h2
-rw-r--r--kio/kfile/tests/kcustommenueditortest.cpp2
-rw-r--r--kio/kfile/tests/kfstest.cpp2
-rw-r--r--kio/kio/connection.h2
-rw-r--r--kio/kio/karchive.h2
-rw-r--r--kio/kio/kautomount.h2
-rw-r--r--kio/kio/kdatatool.cpp2
-rw-r--r--kio/kio/kdirwatch.h2
-rw-r--r--kio/kio/kemailsettings.h2
-rw-r--r--kio/kio/kfilefilter.h2
-rw-r--r--kio/kio/kfileshare.h2
-rw-r--r--kio/kio/kfilterbase.h2
-rw-r--r--kio/kio/kfilterdev.h2
-rw-r--r--kio/kio/kimageio.h2
-rw-r--r--kio/kio/kmimemagic.h2
-rw-r--r--kio/kio/kmimetypechooser.cpp2
-rw-r--r--kio/kio/knfsshare.h2
-rw-r--r--kio/kio/ksambashare.h2
-rw-r--r--kio/kio/kscan.h2
-rw-r--r--kio/kio/ktrader.h4
-rw-r--r--kio/kio/skipdlg.h2
-rw-r--r--kio/kio/thumbcreator.h2
-rw-r--r--kio/kpasswdserver/Makefile.am2
-rw-r--r--kio/kssl/kssl/HOWTO2
-rw-r--r--kio/kssl/ksslcertificate.h2
-rw-r--r--kio/kssl/ksslcertificatecache.h2
-rw-r--r--kio/kssl/ksslcertificatefactory.h2
-rw-r--r--kio/kssl/ksslcertificatehome.h2
-rw-r--r--kio/kssl/ksslconnectioninfo.h2
-rw-r--r--kio/kssl/ksslcsessioncache.h2
-rw-r--r--kio/kssl/ksslpemcallback.h2
-rw-r--r--kio/kssl/ksslsession.h2
-rw-r--r--kio/kssl/ksslsigners.h2
-rw-r--r--kio/kssl/ksslx509map.h2
-rw-r--r--kio/kssl/ksslx509v3.h2
-rw-r--r--kio/misc/kmailservice.cpp2
-rw-r--r--kio/misc/kntlm/kntlm.h2
-rw-r--r--kio/misc/ksendbugmail/main.cpp2
-rw-r--r--kio/misc/ktelnetservice.cpp2
-rw-r--r--kio/misc/tdesasl/tdesasl.h2
-rw-r--r--kio/misc/uiserver.cpp2
-rw-r--r--kio/tests/jobtest.cpp2
-rw-r--r--kio/tests/kacltest.cpp2
-rw-r--r--kio/tests/kurifiltertest.cpp4
-rw-r--r--kioslave/file/Makefile.am2
-rw-r--r--kioslave/file/file.cc2
-rw-r--r--kioslave/ftp/ftp.cc2
-rw-r--r--kioslave/http/Makefile.am2
-rw-r--r--kioslave/http/TODO4
-rw-r--r--kioslave/http/http.cc2
-rw-r--r--kioslave/http/http_cache_cleaner.cpp2
-rw-r--r--kioslave/http/kcookiejar/Makefile.am2
-rw-r--r--kioslave/http/kcookiejar/main.cpp2
-rw-r--r--kioslave/http/kcookiejar/tests/Makefile.am2
-rw-r--r--kioslave/iso/Makefile.am2
-rw-r--r--kioslave/iso/iso.cpp2
-rw-r--r--kioslave/iso/iso.h2
-rw-r--r--kioslave/iso/kiso.cpp2
-rw-r--r--kioslave/iso/kiso.h2
-rw-r--r--kioslave/metainfo/Makefile.am2
-rw-r--r--kjs/kjs-devel-gdb2
-rw-r--r--kmdi/kmdi/global.h2
-rw-r--r--kmdi/kmdi/mainwindow.cpp4
-rw-r--r--kmdi/kmdi/mainwindow.h2
-rw-r--r--kmdi/kmdi/tabwidget.cpp2
-rw-r--r--kmdi/kmdi/tabwidget.h2
-rw-r--r--kmdi/kmdichildarea.cpp2
-rw-r--r--kmdi/kmdichildarea.h2
-rw-r--r--kmdi/kmdichildfrm.cpp2
-rw-r--r--kmdi/kmdichildfrm.h2
-rw-r--r--kmdi/kmdichildfrmcaption.cpp2
-rw-r--r--kmdi/kmdichildfrmcaption.h2
-rw-r--r--kmdi/kmdichildview.cpp2
-rw-r--r--kmdi/kmdichildview.h2
-rw-r--r--kmdi/kmdidefines.h4
-rw-r--r--kmdi/kmdifocuslist.h2
-rw-r--r--kmdi/kmdiguiclient.cpp2
-rw-r--r--kmdi/kmdiiterator.h2
-rw-r--r--kmdi/kmdilistiterator.h2
-rw-r--r--kmdi/kmdimainfrm.cpp4
-rw-r--r--kmdi/kmdimainfrm.h2
-rw-r--r--kmdi/kmdinulliterator.h2
-rw-r--r--kmdi/kmditaskbar.cpp2
-rw-r--r--kmdi/kmditaskbar.h2
-rw-r--r--kmdi/test/main.cpp2
-rw-r--r--kmdi/test/mainwidget.cpp2
-rw-r--r--kmdi/test/mainwidget.h2
-rw-r--r--kparts/COMMENTS8
-rw-r--r--kparts/browserinterface.h2
-rw-r--r--kparts/browserrun.cpp4
-rw-r--r--kparts/event.h2
-rw-r--r--kparts/historyprovider.h2
-rw-r--r--kparts/partmanager.h2
-rw-r--r--kparts/statusbarextension.cpp2
-rw-r--r--kparts/statusbarextension.h2
-rw-r--r--kparts/tests/example.cpp2
-rw-r--r--kparts/tests/normalktm.cpp2
-rw-r--r--krandr/libkrandr.h2
-rw-r--r--krandr/randr.cpp4
-rw-r--r--kresources/README.design2
-rw-r--r--kspell2/client.h2
-rw-r--r--kspell2/filter.h2
-rw-r--r--kspell2/settings.h2
-rw-r--r--kspell2/tests/backgroundtest.cpp4
-rw-r--r--kspell2/ui/configwidget.h2
-rw-r--r--kunittest/runner.h2
-rw-r--r--kunittest/samplemodule.h2
-rw-r--r--kunittest/tester.h10
-rw-r--r--kutils/kcmodulecontainer.cpp2
-rw-r--r--kutils/kcmoduleproxy.h2
-rw-r--r--kutils/kmultitabbar.h2
-rw-r--r--kutils/kpluginselector.h2
-rw-r--r--kutils/kpluginselector_p.h2
-rw-r--r--kutils/ksettings/dispatcher.h2
-rw-r--r--kutils/ksettings/pluginpage.h2
-rw-r--r--kwallet/client/kwallet.cc2
-rw-r--r--libkmid/deviceman.h2
-rw-r--r--libkmid/libkmid.h2
-rw-r--r--libkmid/midfile.h2
-rw-r--r--libkmid/midimapper.h2
-rw-r--r--libkmid/mt32togm.h2
-rw-r--r--libkmid/notearray.h2
-rw-r--r--libkscreensaver/kscreensaver.h2
-rw-r--r--networkstatus/networkstatus.cpp2
-rw-r--r--networkstatus/networkstatus.kdevelop4
-rw-r--r--tdecore/CMakeLists.txt6
-rw-r--r--tdecore/MAINTAINERS2
-rw-r--r--tdecore/Makefile.am10
-rw-r--r--tdecore/README.kstartupinfo6
-rw-r--r--tdecore/fakes.c2
-rw-r--r--tdecore/kaccel.cpp2
-rw-r--r--tdecore/kaccel.h2
-rw-r--r--tdecore/kaccelmanager.h2
-rw-r--r--tdecore/kallocator.h2
-rw-r--r--tdecore/kappdcopiface.h2
-rw-r--r--tdecore/kapplication.h8
-rw-r--r--tdecore/kasyncio.h2
-rw-r--r--tdecore/kaudioplayer.h2
-rw-r--r--tdecore/kcalendarsystem.h2
-rw-r--r--tdecore/kcalendarsystemfactory.h2
-rw-r--r--tdecore/kcatalogue.cpp2
-rw-r--r--tdecore/kcatalogue.h4
-rw-r--r--tdecore/kcharsets.h2
-rw-r--r--tdecore/kcheckaccelerators.h2
-rw-r--r--tdecore/kclipboard.h2
-rw-r--r--tdecore/kcmdlineargs.h2
-rw-r--r--tdecore/kcompletion.h2
-rw-r--r--tdecore/kconfig_compiler/example/Makefile.am2
-rw-r--r--tdecore/kconfigbackend.h2
-rw-r--r--tdecore/kconfigbase.h2
-rw-r--r--tdecore/kconfigdata.h2
-rw-r--r--tdecore/kconfigdialogmanager.cpp2
-rw-r--r--tdecore/kconfigdialogmanager.h6
-rw-r--r--tdecore/kcrash.h2
-rw-r--r--tdecore/kdcoppropertyproxy.h2
-rw-r--r--tdecore/kde-config.cpp.cmake2
-rw-r--r--tdecore/kde-config.cpp.in2
-rw-r--r--tdecore/kdebug.areas128
-rw-r--r--tdecore/kdebug.h2
-rw-r--r--tdecore/kdebugdcopiface.h2
-rw-r--r--tdecore/kdelibs_export.h2
-rw-r--r--tdecore/kdesktopfile.h2
-rw-r--r--tdecore/kdeversion.cpp2
-rw-r--r--tdecore/kdeversion.h2
-rw-r--r--tdecore/kextsock.h2
-rw-r--r--tdecore/kglobal.h2
-rw-r--r--tdecore/kglobalaccel.cpp2
-rw-r--r--tdecore/kglobalsettings.cpp12
-rw-r--r--tdecore/kglobalsettings.h2
-rw-r--r--tdecore/kiconeffect.h2
-rw-r--r--tdecore/kicontheme.h2
-rw-r--r--tdecore/kidna.h2
-rw-r--r--tdecore/kinstance.h2
-rw-r--r--tdecore/kipc.h2
-rw-r--r--tdecore/klocale.cpp16
-rw-r--r--tdecore/klocale.h8
-rw-r--r--tdecore/kmacroexpander.h2
-rw-r--r--tdecore/kmanagerselection.h2
-rw-r--r--tdecore/kmdcodec.h2
-rw-r--r--tdecore/kmultipledrag.h2
-rw-r--r--tdecore/knotifyclient.h2
-rw-r--r--tdecore/kpalette.h2
-rw-r--r--tdecore/kpixmapprovider.h2
-rw-r--r--tdecore/kprocess.h2
-rw-r--r--tdecore/kprocio.h2
-rw-r--r--tdecore/kpty.h2
-rw-r--r--tdecore/krandomsequence.h2
-rw-r--r--tdecore/kregexp.h2
-rw-r--r--tdecore/krfcdate.h2
-rw-r--r--tdecore/krootprop.h2
-rw-r--r--tdecore/ksharedptr.h2
-rw-r--r--tdecore/kshell.h2
-rw-r--r--tdecore/kshortcut.h2
-rw-r--r--tdecore/kshortcutlist.h2
-rw-r--r--tdecore/ksock.h2
-rw-r--r--tdecore/ksockaddr.h2
-rw-r--r--tdecore/ksocks.cpp2
-rw-r--r--tdecore/ksocks.h2
-rw-r--r--tdecore/ksortablevaluelist.h2
-rw-r--r--tdecore/kstandarddirs.h8
-rw-r--r--tdecore/kstartupinfo.cpp2
-rw-r--r--tdecore/kstartupinfo.h4
-rw-r--r--tdecore/kstdaccel.h2
-rw-r--r--tdecore/kstringhandler.h2
-rw-r--r--tdecore/ksycoca.h2
-rw-r--r--tdecore/ksycocadict.h2
-rw-r--r--tdecore/ktempdir.h2
-rw-r--r--tdecore/ktempfile.h2
-rw-r--r--tdecore/ktimezones.h2
-rw-r--r--tdecore/kurl.h8
-rw-r--r--tdecore/kurldrag.cpp2
-rw-r--r--tdecore/kurldrag.h2
-rw-r--r--tdecore/kvmallocator.h2
-rw-r--r--tdecore/kxerrorhandler.h2
-rw-r--r--tdecore/kxmessages.h2
-rw-r--r--tdecore/libintl.cpp2
-rw-r--r--tdecore/libtdecore_weak.nmcheck2
-rw-r--r--tdecore/netsupp.h2
-rw-r--r--tdecore/netwm.h2
-rw-r--r--tdecore/netwm_def.h2
-rw-r--r--tdecore/network/kbufferedsocket.h2
-rw-r--r--tdecore/network/kclientsocketbase.h2
-rw-r--r--tdecore/network/kiobuffer.h2
-rw-r--r--tdecore/network/knetworkinterface.h4
-rw-r--r--tdecore/network/ksocketaddress.h2
-rw-r--r--tdecore/network/ksocketbase.h2
-rw-r--r--tdecore/svgicons/ksvgiconengine.h2
-rw-r--r--tdecore/tests/kcmdlineargstest.cpp2
-rw-r--r--tdecore/tests/klocaletest.cpp2
-rw-r--r--tdecore/tests/kurltest.cpp14
-rw-r--r--tdecore/tests/testqtargs.cpp2
-rw-r--r--tdecore/twin.h6
-rw-r--r--tdecore/twinmodule.h2
-rw-r--r--tdefx/kcpuinfo.h2
-rw-r--r--tdefx/kdrawutil.h2
-rw-r--r--tdefx/kimageeffect.h2
-rw-r--r--tdefx/kpixmap.h2
-rw-r--r--tdefx/kpixmapeffect.h2
-rw-r--r--tdefx/kpixmapsplitter.h2
-rw-r--r--tdefx/kstyle.cpp2
-rw-r--r--tdefx/kstyle.h4
-rw-r--r--tdeprint/driver.h2
-rw-r--r--tdeprint/driverview.h2
-rw-r--r--tdeprint/foomatic2loader.h2
-rw-r--r--tdeprint/kmdbentry.h2
-rw-r--r--tdeprint/kmjob.h2
-rw-r--r--tdeprint/kmjobmanager.h2
-rw-r--r--tdeprint/kmvirtualmanager.h2
-rw-r--r--tdeprint/kpipeprocess.h2
-rw-r--r--tdeprint/kpqtpage.h2
-rw-r--r--tdeprint/kpreloadobject.h2
-rw-r--r--tdeprint/kprintdialogpage.h2
-rw-r--r--tdeprint/kprinter.h2
-rw-r--r--tdeprint/kprinterimpl.h2
-rw-r--r--tdeprint/kxmlcommand.h2
-rw-r--r--tdeprint/management/kaddprinterwizard.cpp2
-rw-r--r--tdeprint/management/kmconfigpage.h2
-rw-r--r--tdeprint/management/kmpropbackend.h2
-rw-r--r--tdeprint/management/kmpropdriver.h2
-rw-r--r--tdeprint/management/kmpropertypage.h2
-rw-r--r--tdeprint/management/kmpropwidget.h2
-rw-r--r--tdeprint/management/kmtimer.h2
-rw-r--r--tdeprint/management/kmwbackend.h2
-rw-r--r--tdeprint/management/kmwizard.h2
-rw-r--r--tdeprint/management/kmwizardpage.h2
-rw-r--r--tdeprint/management/kxmlcommandselector.h2
-rw-r--r--tdeprint/management/sidepixmap.h2
-rw-r--r--tdeprint/marginwidget.h2
-rw-r--r--tdeprint/messagewindow.h2
-rw-r--r--tdeprint/ppdloader.h2
-rw-r--r--tdesu/client.h2
-rw-r--r--tdesu/process.h2
-rw-r--r--tdesu/ssh.h2
-rw-r--r--tdesu/stub.h2
-rw-r--r--tdesu/su.h2
-rw-r--r--tdesu/tdesu_pty.h2
-rw-r--r--tdeui/colors/Makefile.am2
-rw-r--r--tdeui/kaccelgen.h2
-rw-r--r--tdeui/kactionclasses.h2
-rw-r--r--tdeui/kactionselector.h2
-rw-r--r--tdeui/kactivelabel.h2
-rw-r--r--tdeui/kanimwidget.h2
-rw-r--r--tdeui/karrowbutton.h2
-rw-r--r--tdeui/kauthicon.h2
-rw-r--r--tdeui/kbuttonbox.h2
-rw-r--r--tdeui/kcharselect.h2
-rw-r--r--tdeui/kcmenumngr.h2
-rw-r--r--tdeui/kcmodule.h2
-rw-r--r--tdeui/kcolorbutton.h2
-rw-r--r--tdeui/kcolordialog.cpp2
-rw-r--r--tdeui/kcolordrag.h2
-rw-r--r--tdeui/kcommand.h2
-rw-r--r--tdeui/kconfigdialog.cpp2
-rw-r--r--tdeui/kconfigdialog.h2
-rw-r--r--tdeui/kcursor.h2
-rw-r--r--tdeui/kdatepicker.h2
-rw-r--r--tdeui/kdatetbl.h2
-rw-r--r--tdeui/kdatetimewidget.h2
-rw-r--r--tdeui/kdatewidget.h2
-rw-r--r--tdeui/kdcopactionproxy.h2
-rw-r--r--tdeui/kdepackages.h188
-rw-r--r--tdeui/kdialog.h2
-rw-r--r--tdeui/kdockwidget.h4
-rw-r--r--tdeui/kdualcolorbutton.h2
-rw-r--r--tdeui/keditlistbox.h2
-rw-r--r--tdeui/kfontrequester.h2
-rw-r--r--tdeui/khelpmenu.h2
-rw-r--r--tdeui/kiconview.h2
-rw-r--r--tdeui/klanguagebutton.h2
-rw-r--r--tdeui/kled.h2
-rw-r--r--tdeui/klistbox.h2
-rw-r--r--tdeui/klistview.h2
-rw-r--r--tdeui/kmenubar.h2
-rw-r--r--tdeui/knuminput.h2
-rw-r--r--tdeui/knumvalidator.h2
-rw-r--r--tdeui/kpanelextension.h2
-rw-r--r--tdeui/kpassivepopup.h2
-rw-r--r--tdeui/kpixmapio.h2
-rw-r--r--tdeui/kpixmapregionselectorwidget.cpp2
-rw-r--r--tdeui/kpixmapregionselectorwidget.h4
-rw-r--r--tdeui/kpopupmenu.h2
-rw-r--r--tdeui/krootpixmap.h2
-rw-r--r--tdeui/kruler.h2
-rw-r--r--tdeui/ksconfig.h2
-rw-r--r--tdeui/kscrollview.h2
-rw-r--r--tdeui/kselect.h2
-rw-r--r--tdeui/kseparator.h2
-rw-r--r--tdeui/ksharedpixmap.h2
-rw-r--r--tdeui/kspell.h2
-rw-r--r--tdeui/ksplashscreen.h2
-rw-r--r--tdeui/ksqueezedtextlabel.h2
-rw-r--r--tdeui/kstatusbar.h2
-rw-r--r--tdeui/kstdaction.h2
-rw-r--r--tdeui/kstringvalidator.h2
-rw-r--r--tdeui/ksyntaxhighlighter.h2
-rw-r--r--tdeui/ktabbar.h2
-rw-r--r--tdeui/ktabctl.h2
-rw-r--r--tdeui/ktabwidget.h2
-rw-r--r--tdeui/ktextbrowser.h2
-rw-r--r--tdeui/ktextedit.h2
-rw-r--r--tdeui/ktimewidget.h2
-rw-r--r--tdeui/ktimezonewidget.h2
-rw-r--r--tdeui/ktoolbarradiogroup.h2
-rw-r--r--tdeui/kurllabel.h2
-rw-r--r--tdeui/kwizard.h2
-rw-r--r--tdeui/kwordwrap.h2
-rw-r--r--tdeui/kxmlguibuilder.h2
-rw-r--r--tdeui/kxmlguiclient.h2
-rw-r--r--tdeui/kxmlguifactory.h2
-rw-r--r--tdeui/qxembed.cpp4
-rw-r--r--tdeui/qxembed.h2
-rw-r--r--tdeui/tests/kcolordlgtest.cpp2
-rw-r--r--tdeui/tests/kdatepicktest.cpp2
-rw-r--r--tdeui/tests/kdatetimewidgettest.cpp2
-rw-r--r--tdeui/tests/kdatewidgettest.cpp2
-rw-r--r--tdeui/tests/kdialogbasetest.cpp2
-rw-r--r--tdeui/tests/ktimewidgettest.cpp2
-rw-r--r--tdeui/twindowinfo.h2
-rw-r--r--win/common.pro8
-rw-r--r--win/config.h2
-rw-r--r--win/dirent.h2
-rw-r--r--win/fcntl.h2
-rw-r--r--win/kde_file_win.h2
-rw-r--r--win/pro_files/README.pro_files10
-rw-r--r--win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro6
-rw-r--r--win/pro_files/tdecore/tdecore.pro2
-rw-r--r--win/pwd.h2
-rw-r--r--win/signal.h2
-rw-r--r--win/stdlib.h2
-rw-r--r--win/string.h2
-rw-r--r--win/sys/mman.h2
-rw-r--r--win/sys/resource.h2
-rw-r--r--win/sys/stat.h2
-rw-r--r--win/sys/time.h2
-rw-r--r--win/sys/times.h2
-rw-r--r--win/sys/utsname.h2
-rw-r--r--win/syslog.h2
-rwxr-xr-xwin/tools/.build_kdelibs_comon2
-rwxr-xr-xwin/tools/.check_kde_env8
-rw-r--r--win/tools/README.tools2
-rw-r--r--win/tools/build_kdelibs_dbg6
-rw-r--r--win/tools/build_kdelibs_rel6
-rwxr-xr-xwin/tools/collect_kdelibs_pro_files2
-rwxr-xr-xwin/tools/kde_env2
-rwxr-xr-xwin/tools/update_kdelibs_pro_files4
-rw-r--r--win/unistd.h2
-rw-r--r--win/win.pro4
-rw-r--r--win/win32_utils.h4
546 files changed, 957 insertions, 957 deletions
diff --git a/AUTHORS b/AUTHORS
index 84a23cda..b94e038d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,6 +2,6 @@ Look in the appropriate subdirectories or files to get more information
about the authors.
The package is maintained by Timothy Pearson <kb9vqf@pearsoncomputing.net>, however
-numerous people, too many to count, have contributed to kdelibs as a
+numerous people, too many to count, have contributed to tdelibs as a
whole. If you have a specific question, please ask on the Trinity project mailing
list at http://www.trinitydesktop.org/mailinglist.php
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ac4ce68..6962394a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,9 +14,9 @@ cmake_minimum_required( VERSION 2.8 )
##### general package setup #####################
-project( kdelibs )
+project( tdelibs )
-set( PACKAGE kdelibs )
+set( PACKAGE tdelibs )
set( VERSION "3.5.13" )
diff --git a/COMPILING b/COMPILING
index d572b2b6..af680803 100644
--- a/COMPILING
+++ b/COMPILING
@@ -18,8 +18,8 @@ Make sure you get the following stuff from the repository:
qt-copy (This is qt-3.3.2)
arts
-kdelibs
-kdebase (strongly recommended but not strictly necessary)
+tdelibs
+tdebase (strongly recommended but not strictly necessary)
<any other package you are interested in>
It is important that you compile AND INSTALL the above packages in the
@@ -91,7 +91,7 @@ file, "Makefile.in" as well as "Makefile" files. So it can be that after
some struggle to get QTDIR/KDEDIR setup correctly your setup is actually
correct, but old -incorrect- settings are still lying around.
-The best thing to do in such a case is to do a "svn-clean" (from kdesdk/scripts).
+The best thing to do in such a case is to do a "svn-clean" (from tdesdk/scripts).
This removes all files which aren't stored in the repository. You can then start all over
again with "makefile -f Makefile.cvs". Make sure you don't have any important
files lying around in your source tree any more, they will be deleted!
@@ -102,20 +102,20 @@ Makefile.am but not a Makefile. If you try to compile such a directory
you will get an error like:
Making all in management
- make[3]: Entering directory /home/gregturp/KDE/kdelibs/tdeprint/management'
+ make[3]: Entering directory /home/gregturp/KDE/tdelibs/tdeprint/management'
make[3]: *** No rule to make target all'. Stop.
- make[3]: Leaving directory /home/gregturp/KDE/kdelibs/tdeprint/management'
+ make[3]: Leaving directory /home/gregturp/KDE/tdelibs/tdeprint/management'
make[2]: *** [all-recursive] Error 1
- make[2]: Leaving directory /home/gregturp/KDE/kdelibs/tdeprint'
+ make[2]: Leaving directory /home/gregturp/KDE/tdelibs/tdeprint'
make[1]: *** [all-recursive] Error 1
- make[1]: Leaving directory /home/gregturp/KDE/kdelibs'
+ make[1]: Leaving directory /home/gregturp/KDE/tdelibs'
make: *** [all-recursive-am] Error 2
The solution is to redo "make -f Makefile.cvs; ./configure".
You can create a single Makefile from a Makefile.am file with the
-kdesdk/scripts/create_makefile script. Make sure to run it from the toplevel
-directory. (E.g. /home/gregturp/KDE/kdelibs)
+tdesdk/scripts/create_makefile script. Make sure to run it from the toplevel
+directory. (E.g. /home/gregturp/KDE/tdelibs)
Problems?
=========
@@ -131,7 +131,7 @@ a 'q', you probably have not setup your QTDIR correct or have the wrong
version of Qt.
If you encounter compile errors after updating from SVN, check whether you
-need to update kdelibs as well. If the problems persists, wait a few hours,
+need to update tdelibs as well. If the problems persists, wait a few hours,
usually compile errors are fixed shortly after they have been introduced.
If you still have problems read the kde-devel@kde.org mailinglist and/or
diff --git a/COMPILING.html b/COMPILING.html
index eb288a7d..0169e9ce 100644
--- a/COMPILING.html
+++ b/COMPILING.html
@@ -13,8 +13,8 @@ should use "make distclean" instead of "make cvs-clean")
<p><ul><li>qt-copy (This is qt-3.3.2)
<li>arts
-<li>kdelibs
-<li>kdebase (strongly recommended but not strictly necessary)
+<li>tdelibs
+<li>tdebase (strongly recommended but not strictly necessary)
<li>any other package you are interested in
</ul>
@@ -66,7 +66,7 @@ kde-common module.
<p>
Example:<br>
<pre>
-cd kdelibs
+cd tdelibs
ln -s ../kde-common/admin
</pre>
@@ -113,7 +113,7 @@ a 'q', you probably have not setup your QTDIR correct or have the wrong
version of Qt.
<p>If you encounter compile errors after updating from CVS, check whether you
-need to update kdelibs as well. If the problems persists, wait a few hours,
+need to update tdelibs as well. If the problems persists, wait a few hours,
usually compile errors are fixed shortly after they have been introduced.
<p>If you still have problems read the kde-devel@kde.org mailinglist and/or
diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index da4cd731..0995905d 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -70,9 +70,9 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
The first step to get your KDE application to compile under KDE 2.0,
is to detect KDE 2.0 and Qt 2.x at configure time. The easiest way to
get a working autoconf/automake framework, is to either use
- <a href="http://www.kdevelop.org">KDevelop</a> or
+ <a href="http://www.tdevelop.org">KDevelop</a> or
<a href="http://home.earthlink.net/~granroth/kapptemplate/index.html">kapptemplate</a>
- (available in CVS under the module "kdesdk"), to generate a new
+ (available in CVS under the module "tdesdk"), to generate a new
application template. Replace the generated source files by yours
and adapt Makefile.am accordingly.
@@ -80,11 +80,11 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
<H3><A NAME="general">Global changes</A></H3>
- We did our best to clean up the header files of kdelibs, so they do
+ We did our best to clean up the header files of tdelibs, so they do
not include unnecessary bloat for your application. As a consequence, you
may notice that some header files are missing from your source files as
they have been included before by kapp.h for example. There is a script
- in kdesdk/scripts called "fixheaders" that takes care of most of these
+ in tdesdk/scripts called "fixheaders" that takes care of most of these
cases. Just call "make -k 2&gt;&amp;1 | perl .../fixheaders" and it will try
to look after the error messages and add includes as it recognize the
errors.<P>
@@ -175,7 +175,7 @@ or <a href="http://doc.trolltech.com/porting.html">this page online</a>.<P>
certain option was specified on the command line and your application
now automatically supports --help and --version. It aborts with a
useful error message when the command line contains a syntax error.
- See kdelibs/tdecore/kcmdlineargs.h for more info.<P>
+ See tdelibs/tdecore/kcmdlineargs.h for more info.<P>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
@@ -505,14 +505,14 @@ are necessary to convert your old KDND-based stuff to Qt DND.<P>
<STRONG> Replacement table :</STRONG><P>
<TABLE BORDER="1">
-<TR><TD>KFM::download </TD><TD>-&gt; KIO::NetAccess::download (kdelibs/kio/netaccess.h)</TD></TR>
+<TR><TD>KFM::download </TD><TD>-&gt; KIO::NetAccess::download (tdelibs/kio/netaccess.h)</TD></TR>
<TR><TD>KFM::removeTempFile </TD><TD>-&gt; KIO::NetAccess::removeTempFile</TD></TR>
<TR><TD COLSPAN="2" ROWSPAN="0">refreshDesktop, sortDesktop, selectRootIcons : removed; kdesktop handles it</TD></TR>
<TR><TD>KFM::configure </TD><TD>-&gt; see konqueror DCOP interface</TD></TR>
-<TR><TD>KFM::openURL </TD><TD>-&gt; "(void) new KRun (url)" (kdelibs/kio/krun.h)</TD></TR>
+<TR><TD>KFM::openURL </TD><TD>-&gt; "(void) new KRun (url)" (tdelibs/kio/krun.h)</TD></TR>
<TR><TD>KFM::refreshDirectory </TD><TD>-&gt; not needed anymore since konqy/kdesktop use KDirWatch</TD></TR>
-<TR><TD>KFM::openProperties </TD><TD>-&gt; "(void) new KPropertiesDialog (url)" (kdelibs/kfile/kpropsdlg.h)</TD></TR>
-<TR><TD>KFM::exec </TD><TD>-&gt; "(void) new KRun (url)" (kdelibs/kio/krun.h)</TD></TR>
+<TR><TD>KFM::openProperties </TD><TD>-&gt; "(void) new KPropertiesDialog (url)" (tdelibs/kfile/kpropsdlg.h)</TD></TR>
+<TR><TD>KFM::exec </TD><TD>-&gt; "(void) new KRun (url)" (tdelibs/kio/krun.h)</TD></TR>
<TR><TD>KFM::copy, KFM::move </TD><TD>-&gt; KIO::Job (async, see kio/job.h)<BR>
or KIO::NetAccess (sync, see kio/netaccess.h)</TD></TR>
<TR><TD>DlgLocation </TD><TD>-&gt; Use KLineEditDlg (tdeui/klineeditdlg.h) instead</TD></TR>
@@ -552,10 +552,10 @@ input font most closely, but can display the given charset.<P>
<H3><A NAME="KWizard">KWizard, KNoteBook</A></H3>
KWizard is based on TQWizard now. The API has changed. Consult Qt's
-documentation and kdelibs/kdetest/kwizardtest.cpp for an example use.<P>
+documentation and tdelibs/kdetest/kwizardtest.cpp for an example use.<P>
KNoteBook (deeply entwined with the former KWizard) has been removed until
someone is willing to port it to work with the new wizard. If you want to
-use it you'll find the necessary files in kdegraphics/kiconedit.<P>
+use it you'll find the necessary files in tdegraphics/kiconedit.<P>
<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
@@ -674,7 +674,7 @@ KPixmapEffect::<BR></TD>
PipeCross,<BR>
Elliptic]</TD></TR></TABLE>
-Gradients. See kdelibs/kdetest/kgradienttest &amp; kunbalancedgradienttest for
+Gradients. See tdelibs/kdetest/kgradienttest &amp; kunbalancedgradienttest for
information on how they actually look.<P>
Look further in this document for other info about pixmap effect code
@@ -778,7 +778,7 @@ The format for modules for the KDE Control Center has changed quite
a bit. If you want to port your module to the new schema, please
consult<P>
-kdebase/kcontrol/README<P>
+tdebase/kcontrol/README<P>
which explains what needs to be done.<P>
@@ -805,9 +805,9 @@ provides some useful lists, like the list of all managed windows).
Use kdDebug, kdWarning, kdError, kdFatal to log debug output, warnings and
errors in a very flexible way. kdebug has been improved, and the API simplified.
-kdesdk/scripts/kDebug2kdDebug.sh provides a script for automating the conversion.
+tdesdk/scripts/kDebug2kdDebug.sh provides a script for automating the conversion.
Note that enabling/disabling debug output can now be done with kdebugdialog,
-which can be found in kdebase. The hidden dialog on C+S+F12 no longer exists.
+which can be found in tdebase. The hidden dialog on C+S+F12 no longer exists.
<P>
Also, note that qDebug and fprintf aren't disabled by -DNDEBUG, whereas kdDebug is.
One more reason to use kdDebug !
diff --git a/KDE3PORTING.html b/KDE3PORTING.html
index 7ef397c0..e5849d74 100644
--- a/KDE3PORTING.html
+++ b/KDE3PORTING.html
@@ -33,9 +33,9 @@ or <a href="http://doc.trolltech.com/3.0/porting.html">this page online</a>.<P>
The first step to get your KDE application to compile under KDE 3.0,
is to detect KDE 3.0 and Qt 3.x at configure time. The easiest way to
get a working autoconf/automake framework, is to either use
- <a href="http://www.kdevelop.org">KDevelop</a> or
+ <a href="http://www.tdevelop.org">KDevelop</a> or
<a href="http://home.earthlink.net/~granroth/kapptemplate/index.html">kapptemplate</a>
- (available in CVS under the module "kdesdk"), to generate a new
+ (available in CVS under the module "tdesdk"), to generate a new
application template. Replace the generated source files by yours
and adapt Makefile.am accordingly.
<p>
@@ -253,7 +253,7 @@ hardware accelerated alpha blending.
<H4>KAnimWidget</H4>
This class no longer supports reading a list of images, instead it uses a
single image-file that has been prepared with the kimage_concat tool.
-See kdelibs/pics/hicolor/kde for an example of its use.
+See tdelibs/pics/hicolor/kde for an example of its use.
<H4>KContainerLayout</H4>
This class has been removed, use Qt layouts instead.
@@ -471,7 +471,7 @@ setURLArgs does the job.
<H3><A NAME="kspell">Changes in kspell</A></H3>
<H4>KSpell</H4>
-The API has been cleaned up to be in line with the rest of kdelibs, in particular:
+The API has been cleaned up to be in line with the rest of tdelibs, in particular:
<ul>
<li>suggestions() now returns a TQStringList instead of a pointer to a QStringList
<li>intermediateBuffer() now returns a TQString instead of a pointer to a QString
diff --git a/Makefile.am.in b/Makefile.am.in
index 6a92a88a..c537e0c3 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -56,13 +56,13 @@ messages:
echo ./tdecore/kde-config.cpp.in >> files ;\
$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \
: > kde.pot ;\
- $(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/kdelibs.pot
+ $(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/tdelibs.pot
$(XGETTEXT) common_texts.cpp -o kde.pot
rm -f dirs
EXTRA_DIST = admin kde.pot \
COMPILING COMPILING.html COPYING.BSD DEBUG \
- KDE2PORTING.html NAMING common_texts.cpp kdelibs.lsm kdoc.rules \
+ KDE2PORTING.html NAMING common_texts.cpp tdelibs.lsm kdoc.rules \
qt-messages.pot configure.in.in configure.in.mid configure.in.bot
MAINTAINERCLEANFILES = configure.files subdirs
@@ -72,7 +72,7 @@ dist-hook:
# Rule for generating HTML documentation [you need kdoc installed]
# Don't forget to run qt2kdoc first (qt2kdoc $QTDIR/doc/html)
-# The kdelibs docu will end up in ./srcdoc/
+# The tdelibs docu will end up in ./srcdoc/
kdedoc:
cd $(top_srcdir) && \
makekdedoc -p'--skip-internal' --outputdir=$(top_builddir)/srcdoc
@@ -87,30 +87,30 @@ qtmessages:
grep -v $$file list > list.new && mv list.new list ;\
done ;\
xgettext -C -ktr -kQT_TRANSLATE_NOOP `cat list` ;\
- cd ../../kdelibs ;\
+ cd ../../tdelibs ;\
mv $$top_srcdir/../qt-copy/src/messages.po $$top_srcdir
echo "remove the header from messages.po and move to qt-messages.pot"
include admin/Doxyfile.am
include admin/deps.am
-apidox-am-toplevel-yes: apidox-am-toplevel-kdelibs
+apidox-am-toplevel-yes: apidox-am-toplevel-tdelibs
-apidox-am-toplevel-kdelibs: $(top_builddir)/apidocs/qt/qt.tag
+apidox-am-toplevel-tdelibs: $(top_builddir)/apidocs/qt/qt.tag
$(top_builddir)/apidocs/qt/qt.tag:
@echo "*** Creating a tag file for the Qt library:"; \
$(mkinstalldirs) $(top_builddir)/apidocs/qt; \
doxytag -t $(top_builddir)/apidocs/qt/qt.tag $(QTDOCDIR)
-install-data-local: install-apidox-kdelibs
+install-data-local: install-apidox-tdelibs
## install the tag file for the Qt documentation
-install-apidox-kdelibs:
+install-apidox-tdelibs:
if test -f $(top_builddir)/apidocs/qt/qt.tag; then \
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/qt ;\
echo $(INSTALL_DATA) $(top_builddir)/apidocs/qt/qt.tag $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/qt; \
$(INSTALL_DATA) $(top_builddir)/apidocs/qt/qt.tag $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/qt; \
fi
-.PHONY: install-apidox-kdelibs apidox-am-toplevel-kdelibs apidox-am-toplevel-yes qtmessages
+.PHONY: install-apidox-tdelibs apidox-am-toplevel-tdelibs apidox-am-toplevel-yes qtmessages
diff --git a/README b/README
index 139d8041..2d720bb4 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
In this file:
-* About kdelibs
+* About tdelibs
* Licensing
* Common Mistakes
* Upgrading
@@ -8,7 +8,7 @@ In this file:
* More Info
-About kdelibs
+About tdelibs
-------------
This is version 3.5.13 of the Trinity Desktop Environment [TDE] libraries.
@@ -165,7 +165,7 @@ See also the file DEBUG.
Upgrading
---------
-If you have an kdebase older than 3.0 installed, just copy all your .k*rc
+If you have an tdebase older than 3.0 installed, just copy all your .k*rc
files from $HOME to $HOME/.kde/share/config. In the other case, default
values are used for most apps.
@@ -232,7 +232,7 @@ So, here are some tips on bug reporting:
Linux Distributor and his appropriate mailing list or bug reporting tool.
* The chance is high that your bug has already been dealt with ... so look
- if there is a newer version of kdelibs available. Reporting bugs for
+ if there is a newer version of tdelibs available. Reporting bugs for
older, deprecated versions usually don't get that much attention :-)
* Also the chance is high that another one experienced your problem. The
diff --git a/TODO b/TODO
index afb4709e..9220d264 100644
--- a/TODO
+++ b/TODO
@@ -71,7 +71,7 @@ that we would like to make for the next binary incompatible release.
- Solve need for casting when using bitfield enums (e.g. KProcess::Communication),
if Simon's solution works.
-- Merge kdelibs/tdecore/kuser.h and kdeadmin/kuser/kuser.h.
+- Merge tdelibs/tdecore/kuser.h and tdeadmin/kuser/kuser.h.
- Simplify memory management with KParts. The part and the widget delete each other,
which in fact makes it more complex to handle. The part owns the widget so it
diff --git a/arts/configure.in.in b/arts/configure.in.in
index 6571c8b6..32cd5de0 100644
--- a/arts/configure.in.in
+++ b/arts/configure.in.in
@@ -46,7 +46,7 @@ else
Please reinstall aRts in the same prefix as KDE, different prefixes are not
supported right now.
-(kdelibs prefix is $prefix, aRts prefix is $ARTS_HAVE_PREFIX)
+(tdelibs prefix is $prefix, aRts prefix is $ARTS_HAVE_PREFIX)
])
fi
fi
@@ -57,11 +57,11 @@ supported right now.
AC_MSG_ERROR([aRts $ARTS_WANT_VERSION_MAJOR.$ARTS_WANT_VERSION_MINOR not found.
You'll need to install a suitable version of aRts in the same prefix as KDE
-before you build kdelibs.
+before you build tdelibs.
(found
* artsc-config: $ARTSCCONFIG
- * kdelibs prefix: $prefix
+ * tdelibs prefix: $prefix
* aRts prefix: $ARTS_HAVE_PREFIX
* aRts version: $ARTS_HAVE_VERSION (required: $ARTS_WANT_VERSION_MAJOR.$ARTS_WANT_VERSION_MINOR)
)
diff --git a/arts/kde/kartsdispatcher.h b/arts/kde/kartsdispatcher.h
index 26eb115d..b25085a7 100644
--- a/arts/kde/kartsdispatcher.h
+++ b/arts/kde/kartsdispatcher.h
@@ -24,7 +24,7 @@
#include <tqobject.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace Arts
{
diff --git a/arts/kde/kartsserver.h b/arts/kde/kartsserver.h
index 0735e208..c0c04e66 100644
--- a/arts/kde/kartsserver.h
+++ b/arts/kde/kartsserver.h
@@ -24,7 +24,7 @@
#include "kmedia2.h"
#include <tqobject.h>
#include "soundserver.h"
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* KArtsServer is a wrapper to conveniently get a reference to a SoundServer,
diff --git a/arts/kde/kaudiomanagerplay.h b/arts/kde/kaudiomanagerplay.h
index 89f11228..814cdf32 100644
--- a/arts/kde/kaudiomanagerplay.h
+++ b/arts/kde/kaudiomanagerplay.h
@@ -22,7 +22,7 @@
#include <artsflow.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KArtsServer;
class TQString;
diff --git a/arts/kde/kaudioplaystream.h b/arts/kde/kaudioplaystream.h
index 0d8e6b41..8c600c04 100644
--- a/arts/kde/kaudioplaystream.h
+++ b/arts/kde/kaudioplaystream.h
@@ -25,7 +25,7 @@
#include <tqcstring.h>
#include <stdsynthmodule.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KArtsServer;
namespace Arts { class StereoEffectStack; }
diff --git a/arts/kde/kaudiorecordstream.h b/arts/kde/kaudiorecordstream.h
index 8caab832..bbdb6d73 100644
--- a/arts/kde/kaudiorecordstream.h
+++ b/arts/kde/kaudiorecordstream.h
@@ -27,7 +27,7 @@
#include <tqobject.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KArtsServer;
namespace Arts { class StereoEffectStack; }
diff --git a/arts/kde/kplayobjectfactory.h b/arts/kde/kplayobjectfactory.h
index 690a9e1b..4d0fa9c8 100644
--- a/arts/kde/kplayobjectfactory.h
+++ b/arts/kde/kplayobjectfactory.h
@@ -23,7 +23,7 @@
#define KPLAYOBJECTFACTORY_H
#include <kurl.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#include "soundserver.h"
#include "kplayobject.h"
diff --git a/arts/message/artsmessage.cc b/arts/message/artsmessage.cc
index f77ecd58..c82acfa3 100644
--- a/arts/message/artsmessage.cc
+++ b/arts/message/artsmessage.cc
@@ -57,7 +57,7 @@ KAboutData aboutData("artsmessage", I18N_NOOP("artsmessage"), "0.1",
int main(int argc, char **argv) {
aboutData.addAuthor("Jeff Tranter", 0, "tranter@kde.org");
- KGlobal::locale()->setMainCatalogue("kdelibs");
+ KGlobal::locale()->setMainCatalogue("tdelibs");
KCmdLineArgs::init(argc, argv, &aboutData);
KCmdLineArgs::addCmdLineOptions(options);
KApplication app;
diff --git a/configure.in.in b/configure.in.in
index c2badfa9..8bcbdce7 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -8,7 +8,7 @@ AC_INIT(acinclude.m4) dnl a source file from your sub dir
dnl This is so we can use kde-common
AC_CONFIG_AUX_DIR(admin)
-dnl Setting the prefix for kdelibs uses a special version of KDE_SET_PREFIX
+dnl Setting the prefix for tdelibs uses a special version of KDE_SET_PREFIX
dnl (since that one normally looks for existing kde installations)
KDE_SET_PREFIX_CORE
@@ -102,7 +102,7 @@ KCONFIG_COMPILER="compiled"
MAKEKDEWIDGETS="compiled"
dnl Checks for libraries etc
-AC_BASE_PATH_KDE([don't test]) dnl kdelibs is a special case
+AC_BASE_PATH_KDE([don't test]) dnl tdelibs is a special case
KDE_ENABLE_HIDDEN_VISIBILITY
AC_CREATE_KFSSTND(default)
diff --git a/dcop/Makefile.am b/dcop/Makefile.am
index 837cc486..d59b75cd 100644
--- a/dcop/Makefile.am
+++ b/dcop/Makefile.am
@@ -1,4 +1,4 @@
-# This Makefile.am was taken from the kdelibs distribution and
+# This Makefile.am was taken from the tdelibs distribution and
# modified for DCOP. Preston Brown (Oct 10, 1999)
#
# Copyright (c) 1999 Preston Brown <pbrown@kde.org>
diff --git a/dcop/dcopclient.h b/dcop/dcopclient.h
index 0575cd1e..f673899e 100644
--- a/dcop/dcopclient.h
+++ b/dcop/dcopclient.h
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqvaluelist.h>
#include <tqstring.h>
#include <kdatastream.h> // needed for proper bool marshalling
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class DCOPObjectProxy;
class DCOPClientPrivate;
diff --git a/dcop/dcopidlng/kalyptus b/dcop/dcopidlng/kalyptus
index 9a3709fc..d76ff95b 100644
--- a/dcop/dcopidlng/kalyptus
+++ b/dcop/dcopidlng/kalyptus
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -I/Users/duke/src/kde/kdebindings/kalyptus
+#!/usr/bin/perl -I/Users/duke/src/kde/tdebindings/kalyptus
# -*- indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*-
# KDOC -- C++ and CORBA IDL interface documentation tool.
diff --git a/dcop/dcopobject.h b/dcop/dcopobject.h
index 2040379b..d864be46 100644
--- a/dcop/dcopobject.h
+++ b/dcop/dcopobject.h
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqptrlist.h>
#include <tqvaluelist.h>
#include <kdatastream.h> // needed for proper bool marshalling
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class DCOPClient;
typedef TQValueList<TQCString> QCStringList;
diff --git a/dcop/dcopref.h b/dcop/dcopref.h
index c7fa6982..f1f2f5af 100644
--- a/dcop/dcopref.h
+++ b/dcop/dcopref.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqcstring.h>
#include <dcoptypes.h>
#include <kdatastream.h> // needed for proper bool marshalling
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class TQDataStream;
class DCOPObject;
diff --git a/dcop/dcopsignals.h b/dcop/dcopsignals.h
index f3aae683..8a930b85 100644
--- a/dcop/dcopsignals.h
+++ b/dcop/dcopsignals.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqasciidict.h>
#include <tqptrlist.h>
#include <tqstring.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class DCOPConnection;
diff --git a/dcop/dcopstub.h b/dcop/dcopstub.h
index df55e0f7..b10e297c 100644
--- a/dcop/dcopstub.h
+++ b/dcop/dcopstub.h
@@ -30,7 +30,7 @@ class DCOPStubPrivate;
#include <stdlib.h>
#include <tqstring.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* Abstract base class for dcop stubs as created by the
diff --git a/dnssd/README b/dnssd/README
index c797b293..ffceb8ce 100644
--- a/dnssd/README
+++ b/dnssd/README
@@ -1,7 +1,7 @@
Checklist to ensure that zeroconf will work:
1) Install Avahi, at least version 0.3
-2) compile kdnssd-avahi and install it to replace 'stub' libkdnssd.so provided by kdelibs
+2) compile kdnssd-avahi and install it to replace 'stub' libkdnssd.so provided by tdelibs
3) check /etc/nsswitch.conf and ensure that there is 'mdns' before 'dns' in
line starting with 'host:'. It should be something like:
host: files mdns dns
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0da174f2..0531835d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = common kspell kdelibs
+SUBDIRS = common kspell tdelibs
diff --git a/doc/common/README.Doxygen b/doc/common/README.Doxygen
index 708f224c..1ed3712d 100644
--- a/doc/common/README.Doxygen
+++ b/doc/common/README.Doxygen
@@ -55,7 +55,7 @@ doxygen.sh [--recurse] [--modulename] [--doxdatadir=<dir>] [--installdir=<dir>]
a subdirectory apidocs/ . Modulename is the last part of
the <top_srcdir> (usually a KDE SVN module name).
--doxdatadir=<dir> Locate the HTML header files and support graphics.
- In kdelibs, the subdirectory doc/common/ contains these
+ In tdelibs, the subdirectory doc/common/ contains these
files (and this README). In an installed KDE system,
$KDEDIR/share/doc/HTML/en/common/ contains a copy.
This argument is mandatory if doxygen.sh can't guess where
@@ -84,7 +84,7 @@ Differences with current dox: <TODO>
#
# sh /mnt/src/tdepim/doc/api/doxygen.sh /mnt/src/tdepim kpilot/lib
#
-# When generating dox for kdelibs, a tag file for Qt is also created.
+# When generating dox for tdelibs, a tag file for Qt is also created.
# The location of Qt is specified indirectly through $QTDOCDIR or,
# if that is not set, $QTDIR, or otherwise guessed. You may explicitly
# set the location of a pre-generated tag file with $QTDOCTAG. One
diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h
index fd2bce54..4a78d59b 100644
--- a/interfaces/khexedit/byteseditinterface.h
+++ b/interfaces/khexedit/byteseditinterface.h
@@ -174,7 +174,7 @@ inline BytesEditInterface *bytesEditInterface( T *t )
* ...
*
* TQWidget *BytesEditWidget = KHE::createBytesEditWidget( this, "BytesEditWidget" );
- * // is e.g. kdeutils (incl. khexedit2) installed, so a widget could be found and created?
+ * // is e.g. tdeutils (incl. khexedit2) installed, so a widget could be found and created?
* if( BytesEditWidget )
* {
* � // fetch the editor interface
diff --git a/interfaces/kimproxy/library/kimproxy.cpp b/interfaces/kimproxy/library/kimproxy.cpp
index 44f828a0..9acfe00d 100644
--- a/interfaces/kimproxy/library/kimproxy.cpp
+++ b/interfaces/kimproxy/library/kimproxy.cpp
@@ -217,7 +217,7 @@ bool KIMProxy::initialize()
if ( !m_initialized )
{
m_initialized = true; // we should only do this once, as registeredToDCOP() will catch any new starts
- // So there is no error from a failed query when using kdelibs 3.2, which don't have this servicetype
+ // So there is no error from a failed query when using tdelibs 3.2, which don't have this servicetype
if ( KServiceType::serviceType( IM_SERVICE_TYPE ) )
{
//kdDebug( 790 ) << k_funcinfo << endl;
diff --git a/interfaces/kmediaplayer/view.h b/interfaces/kmediaplayer/view.h
index ae6ee2ea..c1d9dbe4 100644
--- a/interfaces/kmediaplayer/view.h
+++ b/interfaces/kmediaplayer/view.h
@@ -25,7 +25,7 @@
#define KMEDIAPLAYERVIEW_H
#include <tqwidget.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KMediaPlayer
{
diff --git a/interfaces/kregexpeditor/kregexpeditorinterface.h b/interfaces/kregexpeditor/kregexpeditorinterface.h
index 6995c398..3c96d8d9 100644
--- a/interfaces/kregexpeditor/kregexpeditorinterface.h
+++ b/interfaces/kregexpeditor/kregexpeditorinterface.h
@@ -8,11 +8,11 @@
*
* @author Jesper K. Pedersen blackie@kde.org
*
- * The actual editor is located in kdeutils, with an interface in
- * kdelibs. This means that it is a bit more complicated to create an
+ * The actual editor is located in tdeutils, with an interface in
+ * tdelibs. This means that it is a bit more complicated to create an
* instance of the editor, but only a little bit more complicated.
*
- * To check if kregexpeditor in kdeutils is installed and available use this line:
+ * To check if kregexpeditor in tdeutils is installed and available use this line:
*
* \code
* bool installed=!KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty();
@@ -24,7 +24,7 @@
* \code
* TQDialog *editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor" );
* if ( editorDialog ) {
- * // kdeutils was installed, so the dialog was found fetch the editor interface
+ * // tdeutils was installed, so the dialog was found fetch the editor interface
* KRegExpEditorInterface *editor = ::tqqt_cast<KRegExpEditorInterface *>( editorDialog );
* Q_ASSERT( editor ); // This should not fail!
*
@@ -52,7 +52,7 @@
* KParts::ComponentFactory::createInstanceFromQuery<TQWidget>(
* "KRegExpEditor/KRegExpEditor", TQString::null, parent );
* if ( editorWidget ) {
- * // kdeutils was installed, so the widget was found fetch the editor interface
+ * // tdeutils was installed, so the widget was found fetch the editor interface
* KRegExpEditorInterface *editor = ::tqqt_cast<KRegExpEditorInterface *>( editorWidget );
* Q_ASSERT( editor ); // This should not fail!
*
diff --git a/interfaces/kscript/scriptmanager.h b/interfaces/kscript/scriptmanager.h
index 77a447c4..d2121990 100644
--- a/interfaces/kscript/scriptmanager.h
+++ b/interfaces/kscript/scriptmanager.h
@@ -25,7 +25,7 @@
#include <tqdict.h>
#include <tqobject.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class ScriptInfo;
//namespace KScriptInterface
diff --git a/interfaces/kspeech/kspeech.h b/interfaces/kspeech/kspeech.h
index 049afbfa..21ad69d8 100644
--- a/interfaces/kspeech/kspeech.h
+++ b/interfaces/kspeech/kspeech.h
@@ -57,8 +57,8 @@
*
* @section Requirements
*
- * You may build any KDE application to use KSpeech, since the interface is in kdelibs, but
- * the kdeaccessibility package must be installed for KTTS to function.
+ * You may build any KDE application to use KSpeech, since the interface is in tdelibs, but
+ * the tdeaccessibility package must be installed for KTTS to function.
*
* You will need a speech synthesis engine, such as Festival. See the KTTS Handbook
* for the latest information on installing and configuring speech engines and voices
@@ -105,7 +105,7 @@
speech engine
@endverbatim
*
- * The %KTTSD Plugin API is documented in PluginConf in the kdeaccessibility module.
+ * The %KTTSD Plugin API is documented in PluginConf in the tdeaccessibility module.
*
* There is a separate GUI application, called kttsmgr, for providing %KTTSD
* configuration and job management.
@@ -186,11 +186,11 @@
*
* There are two methods of making DCOP calls from your application to %KTTSD.
*
- * - Manually code them using dcopClient object. See kdebase/konqueror/kttsplugin/khtmlkttsd.cpp
+ * - Manually code them using dcopClient object. See tdebase/konqueror/kttsplugin/khtmlkttsd.cpp
* for an example. This method is recommended if you want to make a few simple calls to KTTSD.
* - Use kspeech_stub as described below. This method generates the marshalling code for you
* and is recommended for a more complex speech-enabled applications. kcmkttsmgr in the
- * kdeaccessibility module is an example that uses this method.
+ * tdeaccessibility module is an example that uses this method.
*
* To make DCOP calls from your program using kspeech_stub, follow these steps:
*
diff --git a/interfaces/ktexteditor/blockselectioninterface.h b/interfaces/ktexteditor/blockselectioninterface.h
index fd71a900..3fae3468 100644
--- a/interfaces/ktexteditor/blockselectioninterface.h
+++ b/interfaces/ktexteditor/blockselectioninterface.h
@@ -19,7 +19,7 @@
#ifndef __ktexteditor_blockselectioninterface_h__
#define __ktexteditor_blockselectioninterface_h__
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQCString;
diff --git a/interfaces/ktexteditor/clipboardinterface.h b/interfaces/ktexteditor/clipboardinterface.h
index b216ebe5..365006b3 100644
--- a/interfaces/ktexteditor/clipboardinterface.h
+++ b/interfaces/ktexteditor/clipboardinterface.h
@@ -19,7 +19,7 @@
#ifndef __ktexteditor_clipboardinterface_h__
#define __ktexteditor_clipboardinterface_h__
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQCString;
diff --git a/interfaces/ktexteditor/codecompletioninterface.h b/interfaces/ktexteditor/codecompletioninterface.h
index 780c02bb..2fab7231 100644
--- a/interfaces/ktexteditor/codecompletioninterface.h
+++ b/interfaces/ktexteditor/codecompletioninterface.h
@@ -22,7 +22,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KTextEditor
{
diff --git a/interfaces/ktexteditor/configinterface.h b/interfaces/ktexteditor/configinterface.h
index db36f790..cb853846 100644
--- a/interfaces/ktexteditor/configinterface.h
+++ b/interfaces/ktexteditor/configinterface.h
@@ -19,7 +19,7 @@
#ifndef __ktexteditor_configinterface_h__
#define __ktexteditor_configinterface_h__
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQCString;
class KConfig;
diff --git a/interfaces/ktexteditor/cursorinterface.h b/interfaces/ktexteditor/cursorinterface.h
index ad3e0134..e6e8e848 100644
--- a/interfaces/ktexteditor/cursorinterface.h
+++ b/interfaces/ktexteditor/cursorinterface.h
@@ -22,7 +22,7 @@
#include <tqptrlist.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KTextEditor
{
diff --git a/interfaces/ktexteditor/documentinfo.h b/interfaces/ktexteditor/documentinfo.h
index 7b85aa54..b6d393eb 100644
--- a/interfaces/ktexteditor/documentinfo.h
+++ b/interfaces/ktexteditor/documentinfo.h
@@ -22,7 +22,7 @@
class TQString;
class TQCString;
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KTextEditor
{
diff --git a/interfaces/ktexteditor/dynwordwrapinterface.h b/interfaces/ktexteditor/dynwordwrapinterface.h
index 188a6b79..8d796c4a 100644
--- a/interfaces/ktexteditor/dynwordwrapinterface.h
+++ b/interfaces/ktexteditor/dynwordwrapinterface.h
@@ -20,7 +20,7 @@
#ifndef __ktexteditor_dynwordwrapinterface_h__
#define __ktexteditor_dynwordwrapinterface_h__
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQCString;
diff --git a/interfaces/ktexteditor/editinterface.h b/interfaces/ktexteditor/editinterface.h
index a2f8f5fe..7844995e 100644
--- a/interfaces/ktexteditor/editinterface.h
+++ b/interfaces/ktexteditor/editinterface.h
@@ -21,7 +21,7 @@
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KTextEditor
{
diff --git a/interfaces/ktexteditor/editinterfaceext.h b/interfaces/ktexteditor/editinterfaceext.h
index e5f2d910..b025d980 100644
--- a/interfaces/ktexteditor/editinterfaceext.h
+++ b/interfaces/ktexteditor/editinterfaceext.h
@@ -22,7 +22,7 @@
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KTextEditor
{
diff --git a/interfaces/ktexteditor/encodinginterface.h b/interfaces/ktexteditor/encodinginterface.h
index f317e0a4..5133d4a6 100644
--- a/interfaces/ktexteditor/encodinginterface.h
+++ b/interfaces/ktexteditor/encodinginterface.h
@@ -19,7 +19,7 @@
#ifndef __ktexteditor_encodinginterface_h__
#define __ktexteditor_encodinginterface_h__
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQString;
class TQCString;
diff --git a/interfaces/ktexteditor/highlightinginterface.h b/interfaces/ktexteditor/highlightinginterface.h
index 6927a286..4eb31659 100644
--- a/interfaces/ktexteditor/highlightinginterface.h
+++ b/interfaces/ktexteditor/highlightinginterface.h
@@ -20,7 +20,7 @@
#ifndef __ktexteditor_highlightinginterface_h__
#define __ktexteditor_highlightinginterface_h__
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQString;
class TQCString;
diff --git a/interfaces/ktexteditor/markinterface.h b/interfaces/ktexteditor/markinterface.h
index d3b3dbe7..025bcc47 100644
--- a/interfaces/ktexteditor/markinterface.h
+++ b/interfaces/ktexteditor/markinterface.h
@@ -22,7 +22,7 @@
#include <tqptrlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQCString;
diff --git a/interfaces/ktexteditor/plugin.h b/interfaces/ktexteditor/plugin.h
index 71266d3e..f3cf5d4f 100644
--- a/interfaces/ktexteditor/plugin.h
+++ b/interfaces/ktexteditor/plugin.h
@@ -21,7 +21,7 @@
#include <tqobject.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KTextEditor
{
diff --git a/interfaces/ktexteditor/popupmenuinterface.h b/interfaces/ktexteditor/popupmenuinterface.h
index adcf4f32..23c38f70 100644
--- a/interfaces/ktexteditor/popupmenuinterface.h
+++ b/interfaces/ktexteditor/popupmenuinterface.h
@@ -19,7 +19,7 @@
#ifndef __ktexteditor_popupmenuinterface_h__
#define __ktexteditor_popupmenuinterface_h__
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQCString;
class TQPopupMenu;
diff --git a/interfaces/ktexteditor/printinterface.h b/interfaces/ktexteditor/printinterface.h
index f7cfd587..3da6213a 100644
--- a/interfaces/ktexteditor/printinterface.h
+++ b/interfaces/ktexteditor/printinterface.h
@@ -20,7 +20,7 @@
#ifndef __ktexteditor_printinterface_h__
#define __ktexteditor_printinterface_h__
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQCString;
diff --git a/interfaces/ktexteditor/searchinterface.h b/interfaces/ktexteditor/searchinterface.h
index 922c3a29..69952b78 100644
--- a/interfaces/ktexteditor/searchinterface.h
+++ b/interfaces/ktexteditor/searchinterface.h
@@ -20,7 +20,7 @@
#ifndef __ktexteditor_searchinterface_h__
#define __ktexteditor_searchinterface_h__
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQRegExp;
class TQString;
diff --git a/interfaces/ktexteditor/selectioninterface.h b/interfaces/ktexteditor/selectioninterface.h
index adcf7d5e..a6ba67bd 100644
--- a/interfaces/ktexteditor/selectioninterface.h
+++ b/interfaces/ktexteditor/selectioninterface.h
@@ -22,7 +22,7 @@
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KTextEditor
{
diff --git a/interfaces/ktexteditor/selectioninterfaceext.h b/interfaces/ktexteditor/selectioninterfaceext.h
index 23511f15..255d76f6 100644
--- a/interfaces/ktexteditor/selectioninterfaceext.h
+++ b/interfaces/ktexteditor/selectioninterfaceext.h
@@ -22,7 +22,7 @@
#ifndef __ktexteditor_selectioninterface_ext_h__
#define __ktexteditor_selectioninterface_ext_h__
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQCString;
diff --git a/interfaces/ktexteditor/sessionconfiginterface.h b/interfaces/ktexteditor/sessionconfiginterface.h
index 71650703..c79de001 100644
--- a/interfaces/ktexteditor/sessionconfiginterface.h
+++ b/interfaces/ktexteditor/sessionconfiginterface.h
@@ -19,7 +19,7 @@
#ifndef __ktexteditor_sessionconfiginterface_h__
#define __ktexteditor_sessionconfiginterface_h__
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQCString;
class KConfig;
diff --git a/interfaces/ktexteditor/templateinterface.h b/interfaces/ktexteditor/templateinterface.h
index ec864a5e..a786bf46 100644
--- a/interfaces/ktexteditor/templateinterface.h
+++ b/interfaces/ktexteditor/templateinterface.h
@@ -23,7 +23,7 @@
#include <tqmap.h>
#include <tqwidget.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KTextEditor
{
diff --git a/interfaces/ktexteditor/texthintinterface.h b/interfaces/ktexteditor/texthintinterface.h
index aba23e94..e124fa36 100644
--- a/interfaces/ktexteditor/texthintinterface.h
+++ b/interfaces/ktexteditor/texthintinterface.h
@@ -22,7 +22,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KTextEditor
{
diff --git a/interfaces/ktexteditor/undointerface.h b/interfaces/ktexteditor/undointerface.h
index aa9da1bb..b03e4cb4 100644
--- a/interfaces/ktexteditor/undointerface.h
+++ b/interfaces/ktexteditor/undointerface.h
@@ -19,7 +19,7 @@
#ifndef __ktexteditor_undointerface_h__
#define __ktexteditor_undointerface_h__
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQCString;
diff --git a/interfaces/ktexteditor/variableinterface.h b/interfaces/ktexteditor/variableinterface.h
index 5a42fb4c..31310a43 100644
--- a/interfaces/ktexteditor/variableinterface.h
+++ b/interfaces/ktexteditor/variableinterface.h
@@ -19,7 +19,7 @@
#ifndef _KTEXTEDITOR_VARIABLE_INTERFACE_H_
#define _KTEXTEDITOR_VARIABLE_INTERFACE_H_
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQString;
diff --git a/interfaces/ktexteditor/viewcursorinterface.h b/interfaces/ktexteditor/viewcursorinterface.h
index 79d91841..fd6dae8f 100644
--- a/interfaces/ktexteditor/viewcursorinterface.h
+++ b/interfaces/ktexteditor/viewcursorinterface.h
@@ -20,7 +20,7 @@
#ifndef __ktexteditor_viewcursorinterface_h__
#define __ktexteditor_viewcursorinterface_h__
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQCString;
diff --git a/interfaces/ktexteditor/viewstatusmsginterface.h b/interfaces/ktexteditor/viewstatusmsginterface.h
index d692f3b7..70944812 100644
--- a/interfaces/ktexteditor/viewstatusmsginterface.h
+++ b/interfaces/ktexteditor/viewstatusmsginterface.h
@@ -19,7 +19,7 @@
#ifndef __ktexteditor_viewstatusmsginterface_h__
#define __ktexteditor_viewstatusmsginterface_h__
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQString;
class TQCString;
diff --git a/interfaces/ktexteditor/wordwrapinterface.h b/interfaces/ktexteditor/wordwrapinterface.h
index 308e97e8..155e69ae 100644
--- a/interfaces/ktexteditor/wordwrapinterface.h
+++ b/interfaces/ktexteditor/wordwrapinterface.h
@@ -20,7 +20,7 @@
#ifndef __ktexteditor_wordwrapinterface_h__
#define __ktexteditor_wordwrapinterface_h__
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQCString;
diff --git a/kab/README b/kab/README
index 56514215..2db8822a 100644
--- a/kab/README
+++ b/kab/README
@@ -1,4 +1,4 @@
-Note: libkab is now obsolete. Please use libkabc in kdelibs/kabc. libkab is
+Note: libkab is now obsolete. Please use libkabc in tdelibs/kabc. libkab is
no longer installed. It's only needed for the conversion tool converting
libkab data to libkabc data.
@@ -28,7 +28,7 @@ compile the sources using optimization level 6 (-O6). Stick to -O2, and
it should work. Note: This seems to be solved since gcc 2.95.
Since this directory provides only the kab library, you will have to
-install the kdeutils package, that contains the sources for kab's binary,
+install the tdeutils package, that contains the sources for kab's binary,
also.
Mirko Boehm, March 2000.
diff --git a/kab/README.KABAPI b/kab/README.KABAPI
index 278d787d..45f4be6d 100644
--- a/kab/README.KABAPI
+++ b/kab/README.KABAPI
@@ -9,7 +9,7 @@ include directory into your sources.
The documentation of the kab API is contained in the header file
(kabapi.h), you can extract it by parsing the file with kdoc. The kab
-binary source directory in the kdeutils package contains a sample program
+binary source directory in the tdeutils package contains a sample program
that tries to explain some basic functions of the API. It is important
that you report any bugs you find in the API or in the rest of kab to
diff --git a/kab/TODO b/kab/TODO
index fd0595d3..a4044824 100644
--- a/kab/TODO
+++ b/kab/TODO
@@ -7,7 +7,7 @@ Thanks.
PS: I am still looking for volunteers who try writing the import filters.
Most often I do not have the different other addressbook programs myselfes.
PS1: This TODO list deals with tasks to add to the KDE addressbook
-library. If you want the application to be extended, read kdeutils/kab/TODO.
+library. If you want the application to be extended, read tdeutils/kab/TODO.
--------------------------------------------------------------------------------
[done] change mail addresses to an unlimited list with selection before
sending an email
diff --git a/kabc/README b/kabc/README
index 4aa9a063..46d21b9b 100644
--- a/kabc/README
+++ b/kabc/README
@@ -4,7 +4,7 @@ PURPOSE:
libkabc provides an API for address book data. This can be used by all KDE
application using data of this type, e.g. KAddressBook, KMail, KOrganizer,
-KPilot etc. It is meant as replacement for libkab (in kdebase/kab).
+KPilot etc. It is meant as replacement for libkab (in tdebase/kab).
FEATURES:
diff --git a/kabc/address.h b/kabc/address.h
index a7c597a4..a1ffa9f1 100644
--- a/kabc/address.h
+++ b/kabc/address.h
@@ -25,7 +25,7 @@
#include <tqstring.h>
#include <tqvaluelist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
// template tags for address formatting localization
#define KABC_FMTTAG_realname TQString("%n")
diff --git a/kabc/agent.h b/kabc/agent.h
index c89ca3be..dbe048f0 100644
--- a/kabc/agent.h
+++ b/kabc/agent.h
@@ -25,7 +25,7 @@ class TQDataStream;
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KABC {
diff --git a/kabc/errorhandler.h b/kabc/errorhandler.h
index 04dda969..9a316541 100644
--- a/kabc/errorhandler.h
+++ b/kabc/errorhandler.h
@@ -24,7 +24,7 @@
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQWidget;
diff --git a/kabc/format.h b/kabc/format.h
index b7df6c53..ed036673 100644
--- a/kabc/format.h
+++ b/kabc/format.h
@@ -22,7 +22,7 @@
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KABC {
diff --git a/kabc/geo.h b/kabc/geo.h
index 019e1819..cac6abaf 100644
--- a/kabc/geo.h
+++ b/kabc/geo.h
@@ -23,7 +23,7 @@
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KABC {
diff --git a/kabc/key.h b/kabc/key.h
index ecc4492d..08df0264 100644
--- a/kabc/key.h
+++ b/kabc/key.h
@@ -23,7 +23,7 @@
#include <tqvaluelist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KABC {
diff --git a/kabc/ldif.h b/kabc/ldif.h
index 10cd15e1..f4da5f4f 100644
--- a/kabc/ldif.h
+++ b/kabc/ldif.h
@@ -25,7 +25,7 @@
#include <tqcstring.h>
#include <tqmemarray.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KABC {
diff --git a/kabc/lock.h b/kabc/lock.h
index b682ea9e..addc2032 100644
--- a/kabc/lock.h
+++ b/kabc/lock.h
@@ -24,7 +24,7 @@
#include <tqstring.h>
#include <tqobject.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KABC {
diff --git a/kabc/phonenumber.h b/kabc/phonenumber.h
index 71c9a692..3e6ae094 100644
--- a/kabc/phonenumber.h
+++ b/kabc/phonenumber.h
@@ -24,7 +24,7 @@
#include <tqvaluelist.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KABC {
diff --git a/kabc/picture.h b/kabc/picture.h
index ce619d91..e6ed690c 100644
--- a/kabc/picture.h
+++ b/kabc/picture.h
@@ -23,7 +23,7 @@
#include <tqimage.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KABC {
diff --git a/kabc/plugin.h b/kabc/plugin.h
index 17fbdd13..0c8e3b33 100644
--- a/kabc/plugin.h
+++ b/kabc/plugin.h
@@ -23,7 +23,7 @@
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KABC {
diff --git a/kabc/scripts/createisomap.pl b/kabc/scripts/createisomap.pl
index 2734db11..50ec49b4 100755
--- a/kabc/scripts/createisomap.pl
+++ b/kabc/scripts/createisomap.pl
@@ -1,7 +1,7 @@
#!/usr/bin/perl
#
# Create a translation table countryname->iso-code from the entry.desktop
-# files in kdebase/l10n/*/
+# files in tdebase/l10n/*/
#
# USAGE EXAMPLE:
# ./createisomap.pl $KDEDIR/share/locale/l10n > countrytransl.map
diff --git a/kabc/secrecy.h b/kabc/secrecy.h
index 4f9ef656..5cc60b11 100644
--- a/kabc/secrecy.h
+++ b/kabc/secrecy.h
@@ -23,7 +23,7 @@
#include <tqvaluelist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KABC {
diff --git a/kabc/sortmode.h b/kabc/sortmode.h
index aaec96bd..9768fc8c 100644
--- a/kabc/sortmode.h
+++ b/kabc/sortmode.h
@@ -21,7 +21,7 @@
#ifndef KABC_SORTMODE_H
#define KABC_SORTMODE_H
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#include <kabc/addressee.h>
diff --git a/kabc/sound.h b/kabc/sound.h
index 1a6d58d1..133c0fac 100644
--- a/kabc/sound.h
+++ b/kabc/sound.h
@@ -24,7 +24,7 @@
#include <tqcstring.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KABC {
diff --git a/kabc/timezone.h b/kabc/timezone.h
index aa0dac67..8705797f 100644
--- a/kabc/timezone.h
+++ b/kabc/timezone.h
@@ -23,7 +23,7 @@
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KABC {
diff --git a/kabc/vcard/include/VCardEntity.h b/kabc/vcard/include/VCardEntity.h
index ab17d6b8..e87c5f1a 100644
--- a/kabc/vcard/include/VCardEntity.h
+++ b/kabc/vcard/include/VCardEntity.h
@@ -25,7 +25,7 @@
#define ENTITY_H
#include <tqcstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace VCARD
{
diff --git a/kabc/vcard/include/VCardEnum.h b/kabc/vcard/include/VCardEnum.h
index 5f7902ba..4552ccdb 100644
--- a/kabc/vcard/include/VCardEnum.h
+++ b/kabc/vcard/include/VCardEnum.h
@@ -26,7 +26,7 @@
#include <tqcstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace VCARD
{
diff --git a/kabc/vcard/include/VCardRToken.h b/kabc/vcard/include/VCardRToken.h
index 5122ef55..17a3943d 100644
--- a/kabc/vcard/include/VCardRToken.h
+++ b/kabc/vcard/include/VCardRToken.h
@@ -27,7 +27,7 @@
#include <tqstrlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace VCARD
{
diff --git a/kate/ChangeLog b/kate/ChangeLog
index 21fc54ba..3e54e19d 100644
--- a/kate/ChangeLog
+++ b/kate/ChangeLog
@@ -42,7 +42,7 @@
by using run length encoding for the attributes if they are
dumped into the bytearray
-2002-06-01 Christian Couder <christian@kdevelop.org>
+2002-06-01 Christian Couder <christian@tdevelop.org>
* Move view stuff from katedocument to kateviewinternal.
2002-05-20 Christoph Cullmann <cullmann@kde.org>
@@ -51,11 +51,11 @@
(mem leak, KateUndo is now only for internal use in KateUndoGroup)
* start of convertion my*** to m_*** and add m_ to any other private stuff
-2002-05-17 Christian Couder <christian@kdevelop.org>
+2002-05-17 Christian Couder <christian@tdevelop.org>
* Move font stuff from katedocument into new katefont.h and
katefont.cpp files, and clean up katedocument font stuff.
-2002-05-14 Christian Couder <christian@kdevelop.org>
+2002-05-14 Christian Couder <christian@tdevelop.org>
* Big clean up in katedocument using new katecursor stuff.
2002-05-12 Bernd Gehrmann <bernd@mail.berlios.de>
@@ -63,17 +63,17 @@
* If servicetype in the browser extension specifies an encoding,
use that instead of user's local encoding
-2002-05-11 Christian Couder <christian@kdevelop.org>
+2002-05-11 Christian Couder <christian@tdevelop.org>
* implement the KTextEditor::Cursor in the KateCursor class
2002-05-04 Christoph Cullmann <cullmann@kde.org>
* first KTextEditor::ViewPlugin which works
drop the helloworld plugin, as it is really no good example (bad code, ..)
-2002-05-04 Christian Couder <christian@kdevelop.org>
+2002-05-04 Christian Couder <christian@tdevelop.org>
* fix undo for comment and uncomment
-2002-05-01 Christian Couder <christian@kdevelop.org>
+2002-05-01 Christian Couder <christian@tdevelop.org>
* cleanups related to the uncomment feature in katetextline and katedocument
2002-01-04 Christoph Cullmann <cullmann@kde.org>
@@ -101,7 +101,7 @@
2001-11-29 Joseph Wenninger <jowenn@kde.org>
* KWrite/Kate use different font settings for printing and viewing now
- * Fixed a small crash in my kdevelop->kate port of the codecompletion interface
+ * Fixed a small crash in my tdevelop->kate port of the codecompletion interface
2001-11-26 Christoph Cullmann <cullmann@kde.org>
* backspace bug fixed
@@ -166,21 +166,21 @@
* myself back again ;)
* now kate is clean (only qt3), no backports ;)
-2001-08-24 christian@kdevelop.org
+2001-08-24 christian@tdevelop.org
* reimplement the commenting of selections on some languages
-2001-08-19 christian@kdevelop.org
+2001-08-19 christian@tdevelop.org
* added back Sather highlighting support
* improved Eiffel language syntax highlighting support
* added Eiffel language comment directive in eiffel.xml
* added Ada language comment directive in ada.xml
-2001-08-15 christian@kdevelop.org
+2001-08-15 christian@tdevelop.org
* committed Eiffel language syntax highlighting support
2001-08-08 rokrau@yahoo.com
* committed changes to Kate's API necessary for integration of kate as
- a kpart into kdevelop
+ a kpart into tdevelop
2001-05-13 Christoph Cullmann <cullmann@kde.org>
* after some time of learning for my "Abitur" now again some fixes ;):
@@ -313,7 +313,7 @@
Soon to come
2001-02-26 Christoph Cullmann <cullmann@kde.org>
- * Kate is a part of kdebase :)
+ * Kate is a part of tdebase :)
sourceforge.net CVS won't be used in the future
2001-02-24 Phlip <phlip_cpp@my-deja.com>
diff --git a/kate/NEWS b/kate/NEWS
index df01fb9a..298a431d 100644
--- a/kate/NEWS
+++ b/kate/NEWS
@@ -22,7 +22,7 @@
2002-01-10
Kate Part is now in Kdelibs ;)
-Old news of kate part/app in kdebase:
+Old news of kate part/app in tdebase:
2002-01-03
Kate App and Part separated
diff --git a/kate/TODO b/kate/TODO
index 1f50f6b4..7ab07586 100644
--- a/kate/TODO
+++ b/kate/TODO
@@ -56,7 +56,7 @@ TODO:
switch between short / detailed descriptions)
* Whatever else is needed for multiuser editing (and perhaps put most of it
- inside the part, so eg. kate, kdevelop, quanta etc. could all use it)
+ inside the part, so eg. kate, tdevelop, quanta etc. could all use it)
* Scripting (we don't have any yet do we?)
diff --git a/kate/data/bash.xml b/kate/data/bash.xml
index cbb0f764..2c51c6f5 100644
--- a/kate/data/bash.xml
+++ b/kate/data/bash.xml
@@ -13,7 +13,7 @@
<!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
Changes by Sebastian Pipping (webmaster@hartwork.org)
- Released under the LGPL, part of kdelibs/kate -->
+ Released under the LGPL, part of tdelibs/kate -->
<highlighting>
<list name="keywords">
diff --git a/kate/data/d.xml b/kate/data/d.xml
index 2ed3a5f0..500c6e74 100644
--- a/kate/data/d.xml
+++ b/kate/data/d.xml
@@ -10,7 +10,7 @@
Copyright (C) 2007 - Jari-Matti Mäkelä <jmjm@iki.fi>
Copyright (C) 2004 - Simon J Mackenzie <project.katedxml@smackoz.fastmail.fm>
- This code is released under the LGPL as part of kdelibs/kate.
+ This code is released under the LGPL as part of tdelibs/kate.
========================================================================
diff --git a/kate/data/language.dtd b/kate/data/language.dtd
index 8830837a..2422e6eb 100644
--- a/kate/data/language.dtd
+++ b/kate/data/language.dtd
@@ -17,7 +17,7 @@
<!DOCTYPE language SYSTEM "language.dtd">
You can validate your syntax files using checkXML from the development
- package of kdelibs:
+ package of tdelibs:
checkXML yourSyntax.xml
If you see any 'validity error' lines, you should fix them. If you get
a lot of 'No template matches' lines, everything's just fine. You've
diff --git a/kate/data/lex.xml b/kate/data/lex.xml
index f2daebbb..40207688 100644
--- a/kate/data/lex.xml
+++ b/kate/data/lex.xml
@@ -6,7 +6,7 @@
LEX.XML supports syntax highlighting for Lex/Flex source under Kate.
Copyright (C) 2004 - Jan Villat <jan.villat@net2000.ch>
- This code is released under the LGPL as part of kdelibs/kate.
+ This code is released under the LGPL as part of tdelibs/kate.
========================================================================
diff --git a/kate/data/yacc.xml b/kate/data/yacc.xml
index db45ed42..b4ce9600 100644
--- a/kate/data/yacc.xml
+++ b/kate/data/yacc.xml
@@ -6,7 +6,7 @@
YACC.XML supports syntax highlighting for Yacc/Bison source under Kate.
Copyright (C) 2004 - Jan Villat <jan.villat@net2000.ch>
- This code is released under the LGPL as part of kdelibs/kate.
+ This code is released under the LGPL as part of tdelibs/kate.
========================================================================
diff --git a/kate/interfaces/katecmd.cpp b/kate/interfaces/katecmd.cpp
index 56911009..69263b57 100644
--- a/kate/interfaces/katecmd.cpp
+++ b/kate/interfaces/katecmd.cpp
@@ -118,7 +118,7 @@ const TQString KateCmd::fromHistory( uint index ) const
//BEGIN KateCmdShellCompletion
/*
A lot of the code in the below class is copied from
- kdelibs/kio/kio/kshellcompletion.cpp
+ tdelibs/kio/kio/kshellcompletion.cpp
Copyright (C) 2000 David Smith <dsmith@algonet.se>
Copyright (C) 2004 Anders Lund <anders@alweb.dk>
*/
diff --git a/kate/part/katecodecompletion.cpp b/kate/part/katecodecompletion.cpp
index 4de78428..78bd7b3c 100644
--- a/kate/part/katecodecompletion.cpp
+++ b/kate/part/katecodecompletion.cpp
@@ -2,7 +2,7 @@
Copyright (C) 2001 Joseph Wenninger <jowenn@kde.org>
Copyright (C) 2002 John Firebaugh <jfirebaugh@kde.org>
Copyright (C) 2001 by Victor Röder <Victor_Roeder@GMX.de>
- Copyright (C) 2002 by Roberto Raggi <roberto@kdevelop.org>
+ Copyright (C) 2002 by Roberto Raggi <roberto@tdevelop.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/kate/part/katecodecompletion.h b/kate/part/katecodecompletion.h
index 276c3791..3e169cce 100644
--- a/kate/part/katecodecompletion.h
+++ b/kate/part/katecodecompletion.h
@@ -3,7 +3,7 @@
Copyright (C) 2001 Joseph Wenninger <jowenn@kde.org>
Copyright (C) 2002 John Firebaugh <jfirebaugh@kde.org>
Copyright (C) 2001 by Victor Röder <Victor_Roeder@GMX.de>
- Copyright (C) 2002 by Roberto Raggi <roberto@kdevelop.org>
+ Copyright (C) 2002 by Roberto Raggi <roberto@tdevelop.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff --git a/kate/part/katecursor.cpp b/kate/part/katecursor.cpp
index dcd7c38b..e951dcd3 100644
--- a/kate/part/katecursor.cpp
+++ b/kate/part/katecursor.cpp
@@ -1,5 +1,5 @@
/* This file is part of the KDE libraries
- Copyright (C) 2002 Christian Couder <christian@kdevelop.org>
+ Copyright (C) 2002 Christian Couder <christian@tdevelop.org>
Copyright (C) 2001, 2003 Christoph Cullmann <cullmann@kde.org>
Copyright (C) 2001 Joseph Wenninger <jowenn@kde.org>
Copyright (C) 1999 Jochen Wilhelmy <digisnap@cs.tu-berlin.de>
diff --git a/kate/part/katecursor.h b/kate/part/katecursor.h
index 1b1a5322..749bb0f7 100644
--- a/kate/part/katecursor.h
+++ b/kate/part/katecursor.h
@@ -1,5 +1,5 @@
/* This file is part of the KDE libraries
- Copyright (C) 2002 Christian Couder <christian@kdevelop.org>
+ Copyright (C) 2002 Christian Couder <christian@tdevelop.org>
Copyright (C) 2001, 2003 Christoph Cullmann <cullmann@kde.org>
Copyright (C) 2001 Joseph Wenninger <jowenn@kde.org>
Copyright (C) 1999 Jochen Wilhelmy <digisnap@cs.tu-berlin.de>
diff --git a/kate/part/katefont.cpp b/kate/part/katefont.cpp
index 361ce5cc..89bfd002 100644
--- a/kate/part/katefont.cpp
+++ b/kate/part/katefont.cpp
@@ -1,5 +1,5 @@
/* This file is part of the KDE libraries
- Copyright (C) 2002 Christian Couder <christian@kdevelop.org>
+ Copyright (C) 2002 Christian Couder <christian@tdevelop.org>
Copyright (C) 2001 Christoph Cullmann <cullmann@kde.org>
Copyright (C) 2001 Joseph Wenninger <jowenn@kde.org>
Copyright (C) 1999 Jochen Wilhelmy <digisnap@cs.tu-berlin.de>
diff --git a/kate/part/katefont.h b/kate/part/katefont.h
index f9e0c1d8..ac82338e 100644
--- a/kate/part/katefont.h
+++ b/kate/part/katefont.h
@@ -1,5 +1,5 @@
/* This file is part of the KDE libraries
- Copyright (C) 2002 Christian Couder <christian@kdevelop.org>
+ Copyright (C) 2002 Christian Couder <christian@tdevelop.org>
Copyright (C) 2001 Christoph Cullmann <cullmann@kde.org>
Copyright (C) 2001 Joseph Wenninger <jowenn@kde.org>
Copyright (C) 1999 Jochen Wilhelmy <digisnap@cs.tu-berlin.de>
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index fb42ea72..b355c58a 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -296,7 +296,7 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char
label->tqsetAlignment( AlignLeft|AlignVCenter);
m_current = new KColorButton(b);
- // Markers from kdelibs/interfaces/ktextinterface/markinterface.h
+ // Markers from tdelibs/interfaces/ktextinterface/markinterface.h
b = new TQHBox (gbTextArea);
b->setSpacing(KDialog::spacingHint());
m_combobox = new KComboBox(b, "color_combo_box");
diff --git a/kde.pot b/kde.pot
index aa84dc87..65d1fb65 100644
--- a/kde.pot
+++ b/kde.pot
@@ -8,7 +8,7 @@ msgstr ""
"POT-Creation-Date: 2005-06-13 01:26+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\n"
+"Language-Team: LANGUAGE <tde-i18n-doc@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/kded/HOWTO b/kded/HOWTO
index d1596b8c..59d91b3c 100644
--- a/kded/HOWTO
+++ b/kded/HOWTO
@@ -15,4 +15,4 @@ the name of the DCOP object that is implemented by the module.
The desktop file needs to define the library in which the module is
implemented. The name of the library always starts with kded_.
-The kdelibs/kded/test/ directory contains a sample implementation.
+The tdelibs/kded/test/ directory contains a sample implementation.
diff --git a/kded/Mainpage.dox b/kded/Mainpage.dox
index 50c0493d..798f23f0 100644
--- a/kded/Mainpage.dox
+++ b/kded/Mainpage.dox
@@ -5,7 +5,7 @@ of these tasks are built in, others are started on demand.
<p>
The chances are you are looking here because you want to write a
TrinityD module. For that, see TrinityDModule in tdecore and the
-<a href="http://websvn.kde.org/trunk/Trinity/kdelibs/kded/README.kded?view=markup">TrinityD
+<a href="http://websvn.kde.org/trunk/Trinity/tdelibs/kded/README.kded?view=markup">TrinityD
README</a>.
diff --git a/kded/applications.menu b/kded/applications.menu
index dc1d46cf..4b30a56c 100644
--- a/kded/applications.menu
+++ b/kded/applications.menu
@@ -41,7 +41,7 @@
<Directory>kde-development.directory</Directory>
<Menu>
<Name>X-KDE-KDevelopIDE</Name>
- <Directory>kde-development-kdevelop.directory</Directory>
+ <Directory>kde-development-tdevelop.directory</Directory>
<Include>
<And>
<Category>Development</Category>
diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp
index 041c9db3..30b826c8 100644
--- a/kded/kbuildsycoca.cpp
+++ b/kded/kbuildsycoca.cpp
@@ -717,7 +717,7 @@ public:
extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KAboutData d(appName, I18N_NOOP("KBuildSycoca"), appVersion,
I18N_NOOP("Rebuilds the system configuration cache."),
KAboutData::License_GPL, "(c) 1999-2002 KDE Developers");
@@ -763,8 +763,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
KCrash::setEmergencySaveFunction(crashHandler);
KCrash::setApplicationName(TQString(appName));
- // this program is in kdelibs so it uses kdelibs as catalog
- KLocale::setMainCatalogue("kdelibs");
+ // this program is in tdelibs so it uses tdelibs as catalog
+ KLocale::setMainCatalogue("tdelibs");
// force generating of KLocale object. if not, the database will get
// be translated
KGlobal::locale();
diff --git a/kded/kde-menu.cpp b/kded/kde-menu.cpp
index 33faf6c7..b401953f 100644
--- a/kded/kde-menu.cpp
+++ b/kded/kde-menu.cpp
@@ -107,7 +107,7 @@ static void findMenuEntry(KServiceGroup::Ptr parent, const TQString &name, const
int main(int argc, char **argv)
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
const char *description = I18N_NOOP("KDE Menu query tool.\n"
"This tool can be used to find in which menu a specific application is shown.\n"
"The --highlight option can be used to visually indicate to the user where\n"
@@ -125,8 +125,8 @@ int main(int argc, char **argv)
KApplication k(false);
k.disableSessionManagement();
- // this program is in kdelibs so it uses kdelibs as catalog
- KLocale::setMainCatalogue("kdelibs");
+ // this program is in tdelibs so it uses tdelibs as catalog
+ KLocale::setMainCatalogue("tdelibs");
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
if (args->count() != 1)
diff --git a/kded/kded.cpp b/kded/kded.cpp
index 2a634ff5..05964b0d 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -884,8 +884,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
KCmdLineArgs::addCmdLineOptions( options );
- // this program is in kdelibs so it uses kdelibs as catalog
- KLocale::setMainCatalogue("kdelibs");
+ // this program is in tdelibs so it uses tdelibs as catalog
+ KLocale::setMainCatalogue("tdelibs");
// WABA: Make sure not to enable session management.
putenv(strdup("SESSION_MANAGER="));
diff --git a/kded/kdedmodule.h b/kded/kdedmodule.h
index 041f5030..855a0282 100644
--- a/kded/kdedmodule.h
+++ b/kded/kdedmodule.h
@@ -47,7 +47,7 @@ class Kded;
* }
* \endcode
*
- * See kdelibs/kded/HOWTO for more detailed documentation.
+ * See tdelibs/kded/HOWTO for more detailed documentation.
*
* @author Waldo Bastian <bastian@kde.org>
*/
diff --git a/kded/khostname.cpp b/kded/khostname.cpp
index 9b57e536..168ad0f5 100644
--- a/kded/khostname.cpp
+++ b/kded/khostname.cpp
@@ -365,7 +365,7 @@ void KHostName::changeSessionManager()
int main(int argc, char **argv)
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KAboutData d(appName, I18N_NOOP("KDontChangeTheHostName"), appVersion,
I18N_NOOP("Informs KDE about a change in hostname"),
KAboutData::License_GPL, "(c) 2001 Waldo Bastian");
diff --git a/kdelibs.lsm b/kdelibs.lsm
index 9501ab84..30f43867 100644
--- a/kdelibs.lsm
+++ b/kdelibs.lsm
@@ -1,5 +1,5 @@
Begin4
-Title: kdelibs
+Title: tdelibs
Version: Trinity 3.5.11
Entered-date: 2008-08-26
Description: libraries for the K Desktop Environment (KDE)
diff --git a/kdoctools/customization/catalog b/kdoctools/customization/catalog
index 8d8ec934..ed01bea5 100644
--- a/kdoctools/customization/catalog
+++ b/kdoctools/customization/catalog
@@ -50,7 +50,7 @@ PUBLIC "-//KDE//ENTITIES DocBook XML Localisation Entity Declarations V1.0//EN"
-- Various external files --
-- only DocBook XML files are in entities, the others are in
- kdelibs/doc/common or in kdelibs/licenses --
+ tdelibs/doc/common or in tdelibs/licenses --
PUBLIC "-//GNU//DOCUMENT GNU General Public License V2//EN"
"entities/gpl-license"
diff --git a/kdoctools/customization/kde-chunk-online.xsl b/kdoctools/customization/kde-chunk-online.xsl
index 5bcae5f5..73a9ed59 100644
--- a/kdoctools/customization/kde-chunk-online.xsl
+++ b/kdoctools/customization/kde-chunk-online.xsl
@@ -90,7 +90,7 @@
<xsl:if test="@targetdocent">
<xsl:value-of select="unparsed-entity-uri(string($targetdocent))"/>
</xsl:if>
- <xsl:for-each select="document('/home/fouvry/kdeutils/doc/kedit/index.docbook')">
+ <xsl:for-each select="document('/home/fouvry/tdeutils/doc/kedit/index.docbook')">
<xsl:value-of select=".//*[@id=$localinfo]"/>
</xsl:for-each>
<xsl:text>#</xsl:text>
diff --git a/kdoctools/customization/kde-chunk.xsl b/kdoctools/customization/kde-chunk.xsl
index 6a6ec38a..c212827d 100644
--- a/kdoctools/customization/kde-chunk.xsl
+++ b/kdoctools/customization/kde-chunk.xsl
@@ -110,7 +110,7 @@ set toc,title
<xsl:if test="@targetdocent">
<xsl:value-of select="unparsed-entity-uri(string($targetdocent))"/>
</xsl:if>
- <xsl:for-each select="document('/home/fouvry/kdeutils/doc/kedit/index.docbook')">
+ <xsl:for-each select="document('/home/fouvry/tdeutils/doc/kedit/index.docbook')">
<xsl:value-of select=".//*[@id=$localinfo]"/>
</xsl:for-each>
<xsl:text>#</xsl:text>
diff --git a/kdoctools/customization/kde-nochunk.xsl b/kdoctools/customization/kde-nochunk.xsl
index bd249a60..4a31968f 100644
--- a/kdoctools/customization/kde-nochunk.xsl
+++ b/kdoctools/customization/kde-nochunk.xsl
@@ -68,7 +68,7 @@
<xsl:if test="@targetdocent">
<xsl:value-of select="unparsed-entity-uri(string($targetdocent))"/>
</xsl:if>
- <xsl:for-each select="document('/home/fouvry/kdeutils/doc/kedit/index.docbook')">
+ <xsl:for-each select="document('/home/fouvry/tdeutils/doc/kedit/index.docbook')">
<xsl:value-of select=".//*[@id=$localinfo]"/>
</xsl:for-each>
<xsl:text>#</xsl:text>
diff --git a/kdoctools/customization/kde-web.xsl b/kdoctools/customization/kde-web.xsl
index 938f442d..7f15dc31 100644
--- a/kdoctools/customization/kde-web.xsl
+++ b/kdoctools/customization/kde-web.xsl
@@ -89,7 +89,7 @@
<xsl:if test="@targetdocent">
<xsl:value-of select="unparsed-entity-uri(string($targetdocent))"/>
</xsl:if>
- <xsl:for-each select="document('/home/fouvry/kdeutils/doc/kedit/index.docbook')">
+ <xsl:for-each select="document('/home/fouvry/tdeutils/doc/kedit/index.docbook')">
<xsl:value-of select=".//*[@id=$localinfo]"/>
</xsl:for-each>
<xsl:text>#</xsl:text>
diff --git a/kdoctools/customization/ko/user.entities b/kdoctools/customization/ko/user.entities
index 54290a3c..2f1da74f 100644
--- a/kdoctools/customization/ko/user.entities
+++ b/kdoctools/customization/ko/user.entities
@@ -5,4 +5,4 @@
Please keep the entities sorted on the name: it will avoid duplicate
names (which if they occur will cost you a _lot_ of time)
-->
-<!ENTITY KdeKoTeam "KDE ѱ <email>kde-i18n@kldp.org</email>">
+<!ENTITY KdeKoTeam "KDE ѱ <email>tde-i18n@kldp.org</email>">
diff --git a/kdoctools/customization/sr/user.entities b/kdoctools/customization/sr/user.entities
index ee0e5416..519b78af 100644
--- a/kdoctools/customization/sr/user.entities
+++ b/kdoctools/customization/sr/user.entities
@@ -207,28 +207,28 @@
<!ENTITY kde-nju "<acronym>КДЕ</acronym>" >
<!ENTITY kde-nmu "<acronym>КДЕ</acronym>" >
<!ENTITY kde-nmz "<acronym>КДЕ</acronym>" >
-<!ENTITY kdeaddons-n "<acronym>КДЕ</acronym>-додаци" >
-<!ENTITY kdeadmin-n "<acronym>КДЕ</acronym>-администрација" >
-<!ENTITY kdeartwork-n "<acronym>КДЕ</acronym>-уметност" >
-<!ENTITY kdebase-g "<acronym>КДЕ</acronym>-основе" >
-<!ENTITY kdebase-n "<acronym>КДЕ</acronym>-основа" >
-<!ENTITY kdebindings-n "<acronym>КДЕ</acronym>-везе" >
+<!ENTITY tdeaddons-n "<acronym>КДЕ</acronym>-додаци" >
+<!ENTITY tdeadmin-n "<acronym>КДЕ</acronym>-администрација" >
+<!ENTITY tdeartwork-n "<acronym>КДЕ</acronym>-уметност" >
+<!ENTITY tdebase-g "<acronym>КДЕ</acronym>-основе" >
+<!ENTITY tdebase-n "<acronym>КДЕ</acronym>-основа" >
+<!ENTITY tdebindings-n "<acronym>КДЕ</acronym>-везе" >
<!ENTITY kdecc-a "<application>К контролни центар</application>" >
<!ENTITY kdecc-g "<application>К контролног центра</application>" >
<!ENTITY kdecc-l "<application>К контролном центру</application>" >
<!ENTITY kdecc-n "<application>К контролни центар</application>" >
-<!ENTITY kdeedu-n "<acronym>КДЕ</acronym>-образовање" >
+<!ENTITY tdeedu-n "<acronym>КДЕ</acronym>-образовање" >
<!ENTITY kdeexp-g "К радног окружења" >
<!ENTITY kdeexp-n "К радно окружење" >
<!ENTITY tdegames-n "<acronym>КДЕ</acronym>-игре" >
-<!ENTITY kdegraphics-n "<acronym>КДЕ</acronym>-графика" >
-<!ENTITY kdelibs-n "<acronym>КДЕ</acronym>-библиотеке" >
-<!ENTITY kdemultimedia-n "<acronym>КДЕ</acronym>-мултимедија" >
-<!ENTITY kdenetwork-n "<acronym>КДЕ</acronym>-мрежа" >
+<!ENTITY tdegraphics-n "<acronym>КДЕ</acronym>-графика" >
+<!ENTITY tdelibs-n "<acronym>КДЕ</acronym>-библиотеке" >
+<!ENTITY tdemultimedia-n "<acronym>КДЕ</acronym>-мултимедија" >
+<!ENTITY tdenetwork-n "<acronym>КДЕ</acronym>-мрежа" >
<!ENTITY kdesktop-n "<application>К радна површина</application>" >
-<!ENTITY kdetoys-n "<acronym>КДЕ</acronym>-играчке" >
-<!ENTITY kdeutils-n "<acronym>КДЕ</acronym>-алати" >
-<!ENTITY kdevelop-n "<acronym>КДЕ</acronym>-развој" >
+<!ENTITY tdetoys-n "<acronym>КДЕ</acronym>-играчке" >
+<!ENTITY tdeutils-n "<acronym>КДЕ</acronym>-алати" >
+<!ENTITY tdevelop-n "<acronym>КДЕ</acronym>-развој" >
<!ENTITY kdm-a "<application>Кдм</application>" >
<!ENTITY kdm-g "<application>Кдма</application>" >
<!ENTITY kdm-n "<application>Кдм</application>" >
diff --git a/kdoctools/docbook/README.kde b/kdoctools/docbook/README.kde
index f7828f93..df33a8cb 100644
--- a/kdoctools/docbook/README.kde
+++ b/kdoctools/docbook/README.kde
@@ -1,4 +1,4 @@
-README file for kdebase/kioslave/help/docbook
+README file for tdebase/kioslave/help/docbook
=============================================
This are copies of
diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp
index b0e65e67..8f20c200 100644
--- a/kdoctools/meinproc.cpp
+++ b/kdoctools/meinproc.cpp
@@ -78,7 +78,7 @@ static KCmdLineOptions options[] =
{ "htdig", I18N_NOOP( "Create a ht://dig compatible index" ), 0 },
{ "check", I18N_NOOP( "Check the document for validity" ), 0 },
{ "cache <file>", I18N_NOOP( "Create a cache file for the document" ), 0},
- { "srcdir <dir>", I18N_NOOP( "Set the srcdir, for kdelibs" ), 0},
+ { "srcdir <dir>", I18N_NOOP( "Set the srcdir, for tdelibs" ), 0},
{ "param <key>=<value>", I18N_NOOP( "Parameters to pass to the stylesheet" ), 0},
{ "+xml", I18N_NOOP("The file to transform"), 0},
KCmdLineLastOption // End of options.
diff --git a/kdoctools/template.docbook b/kdoctools/template.docbook
index 0b0b5940..3dccbd06 100644
--- a/kdoctools/template.docbook
+++ b/kdoctools/template.docbook
@@ -5,7 +5,7 @@
<!ENTITY kmyapplication "<application>KMyApp</application>">
<!ENTITY kappname "&kmyapplication;"><!-- replace kmyapplication here
do *not* replace kappname-->
- <!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc. Leave
+ <!ENTITY package "kde-module"><!-- tdebase, tdeadmin, etc. Leave
this unchanged if your
application is not maintained in KDE CVS -->
<!ENTITY % addindex "IGNORE">
@@ -107,7 +107,7 @@ Please at least include KDE, the KDE package it is in, the name
<keywordset>
<keyword>KDE</keyword>
-<keyword>kdeutils</keyword>
+<keyword>tdeutils</keyword>
<keyword>Kapp</keyword>
<keyword>nothing</keyword>
<keyword>nothing else</keyword>
@@ -503,7 +503,7 @@ application -->
<!--
List any special requirements for your application here. This should include:
.Libraries or other software that is not included in tdesupport,
-kdelibs, or kdebase.
+tdelibs, or tdebase.
.Hardware requirements like amount of RAM, disk space, graphics card
capabilities, screen resolution, special expansion cards, etc.
.Operating systems the app will run on. If your app is designed only for a
diff --git a/khtml/CMakeLists.txt b/khtml/CMakeLists.txt
index fc503ca8..2c5e58a4 100644
--- a/khtml/CMakeLists.txt
+++ b/khtml/CMakeLists.txt
@@ -103,7 +103,7 @@ set( ${target}_SRCS
)
file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
-"#include <kdelibs_export.h>
+"#include <tdelibs_export.h>
extern \"C\" KDE_EXPORT void* init_libkhtml();
extern \"C\" KDE_EXPORT void* init_libkhtmlpart() { return init_libkhtml(); }
" )
@@ -125,7 +125,7 @@ set( ${target}_SRCS
file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/imgdummy.cpp
"
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
extern \"C\" KDE_EXPORT void* init_khtmlimagefactory();
extern \"C\" KDE_EXPORT void* init_khtmlimagepart() { return init_khtmlimagefactory(); }
" )
diff --git a/khtml/Makefile.am b/khtml/Makefile.am
index 51acc5a2..35825194 100644
--- a/khtml/Makefile.am
+++ b/khtml/Makefile.am
@@ -61,7 +61,7 @@ libkhtml_la_LIBADD = ./xml/libkhtmlxml.la ./html/libkhtmlhtml.la \
# init_libkhtml is in libkhtml.so; init_libkhtmlpart needs to be in the part
dummy.cpp: $(srcdir)/Makefile.am
- echo '#include <kdelibs_export.h>' > $@
+ echo '#include <tdelibs_export.h>' > $@
echo 'extern "C" KDE_EXPORT void* init_libkhtml();' >> $@
echo 'extern "C" KDE_EXPORT void* init_libkhtmlpart() { return init_libkhtml(); } ' >> $@
@@ -71,7 +71,7 @@ libkhtmlpart_la_LIBADD = libkhtml.la $(LIB_QT)
# init_khtmlimagefactory is in libkhtml.so; init_khtmlimagepart needs to be in the part
imgdummy.cpp: $(srcdir)/Makefile.am
- echo '#include <kdelibs_export.h>' > $@
+ echo '#include <tdelibs_export.h>' > $@
echo 'extern "C" KDE_EXPORT void* init_khtmlimagefactory();' >> $@
echo 'extern "C" KDE_EXPORT void* init_khtmlimagepart() { return init_khtmlimagefactory(); } ' >> $@
@@ -97,7 +97,7 @@ service_DATA = khtml.desktop khtmlimage.desktop
rcdir = $(kde_datadir)/khtml
rc_DATA = khtml.rc khtml_browser.rc khtml_popupmenu.rc
-SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml
+SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/khtml
## generate lib documentation
srcdoc:
diff --git a/khtml/css/Makefile.am b/khtml/css/Makefile.am
index c9f61b8b..47653ca8 100644
--- a/khtml/css/Makefile.am
+++ b/khtml/css/Makefile.am
@@ -44,7 +44,7 @@ INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
cssdir = $(kde_datadir)/khtml/css
css_DATA = html4.css quirks.css
-SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml
+SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/khtml
EXTRA_DIST = parser.y
diff --git a/khtml/dom/Makefile.am b/khtml/dom/Makefile.am
index a799e8c0..cb8b1de8 100644
--- a/khtml/dom/Makefile.am
+++ b/khtml/dom/Makefile.am
@@ -49,7 +49,7 @@ myinclude_HEADERS = \
INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
-I$(top_srcdir)/khtml -I$(top_srcdir) $(all_includes)
-SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml
+SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/khtml
## generate lib documentation
srcdoc:
diff --git a/khtml/dom/css_stylesheet.h b/khtml/dom/css_stylesheet.h
index 33b380ef..d220ffa7 100644
--- a/khtml/dom/css_stylesheet.h
+++ b/khtml/dom/css_stylesheet.h
@@ -31,7 +31,7 @@
#include <dom/dom_node.h>
#include <dom/dom_misc.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace DOM {
diff --git a/khtml/dom/dom2_traversal.h b/khtml/dom/dom2_traversal.h
index d2d3abf4..ea3d3521 100644
--- a/khtml/dom/dom2_traversal.h
+++ b/khtml/dom/dom2_traversal.h
@@ -29,7 +29,7 @@
#include <dom/dom_node.h>
#include <dom/dom_misc.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace DOM {
class Node;
diff --git a/khtml/dom/dom2_views.h b/khtml/dom/dom2_views.h
index 862cb9ef..6f326aaa 100644
--- a/khtml/dom/dom2_views.h
+++ b/khtml/dom/dom2_views.h
@@ -23,7 +23,7 @@
#ifndef _DOM_Views_h_
#define _DOM_Views_h_
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace DOM {
class Document;
diff --git a/khtml/dom/dom_element.h b/khtml/dom/dom_element.h
index e6cc1187..5a5f2986 100644
--- a/khtml/dom/dom_element.h
+++ b/khtml/dom/dom_element.h
@@ -32,7 +32,7 @@
#include <dom/dom_node.h>
#include <dom/css_value.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace DOM {
diff --git a/khtml/dom/dom_misc.h b/khtml/dom/dom_misc.h
index 52c79630..4cded0f0 100644
--- a/khtml/dom/dom_misc.h
+++ b/khtml/dom/dom_misc.h
@@ -22,7 +22,7 @@
#ifndef _DOM_RefCountImpl_h_
#define _DOM_RefCountImpl_h_
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace DOM {
diff --git a/khtml/dom/dom_node.h b/khtml/dom/dom_node.h
index 4ddd4ffb..594aa5e3 100644
--- a/khtml/dom/dom_node.h
+++ b/khtml/dom/dom_node.h
@@ -34,7 +34,7 @@
#define _DOM_Node_h_
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQRect;
diff --git a/khtml/dom/dom_string.h b/khtml/dom/dom_string.h
index 69f2f7b1..dec25988 100644
--- a/khtml/dom/dom_string.h
+++ b/khtml/dom/dom_string.h
@@ -25,7 +25,7 @@
#include <kdebug.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace DOM {
diff --git a/khtml/dom/html_base.h b/khtml/dom/html_base.h
index 8a1a2510..c7ed878c 100644
--- a/khtml/dom/html_base.h
+++ b/khtml/dom/html_base.h
@@ -32,7 +32,7 @@
#include <dom/html_element.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace DOM {
diff --git a/khtml/dom/html_block.h b/khtml/dom/html_block.h
index e57c311c..b318d8cb 100644
--- a/khtml/dom/html_block.h
+++ b/khtml/dom/html_block.h
@@ -34,7 +34,7 @@
#include <dom/html_element.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace DOM {
diff --git a/khtml/dom/html_document.h b/khtml/dom/html_document.h
index 677251e7..aa53de96 100644
--- a/khtml/dom/html_document.h
+++ b/khtml/dom/html_document.h
@@ -33,7 +33,7 @@
#include <dom/dom_doc.h>
#include <dom/dom_string.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KHTMLView;
class KHTMLPart;
diff --git a/khtml/dom/html_element.h b/khtml/dom/html_element.h
index 2d40f08a..1329793b 100644
--- a/khtml/dom/html_element.h
+++ b/khtml/dom/html_element.h
@@ -30,7 +30,7 @@
#define HTML_ELEMENT_H
#include <dom/dom_element.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KHTMLView;
diff --git a/khtml/dom/html_inline.h b/khtml/dom/html_inline.h
index d5c11d51..041c43db 100644
--- a/khtml/dom/html_inline.h
+++ b/khtml/dom/html_inline.h
@@ -31,7 +31,7 @@
#include <dom/html_element.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace DOM {
class HTMLGenericElementImpl;
diff --git a/khtml/dom/html_list.h b/khtml/dom/html_list.h
index 6aacbf5e..34c081cb 100644
--- a/khtml/dom/html_list.h
+++ b/khtml/dom/html_list.h
@@ -30,7 +30,7 @@
#define HTML_LIST_H
#include <dom/html_element.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace DOM {
diff --git a/khtml/dom/html_misc.h b/khtml/dom/html_misc.h
index bcfa0949..643e5caf 100644
--- a/khtml/dom/html_misc.h
+++ b/khtml/dom/html_misc.h
@@ -30,7 +30,7 @@
#define HTML_MISC_H
#include <dom/html_element.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace DOM {
diff --git a/khtml/dom/html_table.h b/khtml/dom/html_table.h
index 69d16372..72e38d7f 100644
--- a/khtml/dom/html_table.h
+++ b/khtml/dom/html_table.h
@@ -31,7 +31,7 @@
// --------------------------------------------------------------------------
#include <dom/html_element.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace DOM {
diff --git a/khtml/html/doctypes.cpp b/khtml/html/doctypes.cpp
index e79a56f3..e12fc4db 100644
--- a/khtml/html/doctypes.cpp
+++ b/khtml/html/doctypes.cpp
@@ -1,5 +1,5 @@
/* ANSI-C code produced by gperf version 3.0.1 */
-/* Command-line: gperf -CEot -L ANSI-C -k '*' -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards /opt/src/kde/kdelibs/khtml/html/doctypes.gperf */
+/* Command-line: gperf -CEot -L ANSI-C -k '*' -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards /opt/src/kde/tdelibs/khtml/html/doctypes.gperf */
#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
&& ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
@@ -28,7 +28,7 @@
#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
#endif
-#line 1 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 1 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
struct PubIDInfo {
enum eMode {
eQuirks, /* always quirks mode, unless there's an internal subset */
@@ -351,7 +351,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 91 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 91 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"html", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -461,7 +461,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 81 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 81 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//w3c//dtd w3 html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -480,148 +480,148 @@ findDoctypeEntry (register const char *str, register unsigned int len)
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 48 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 48 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 28 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 28 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html 3//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 73 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 73 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//w3c//dtd html 3.2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 45 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 45 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html strict//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 35 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 35 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html level 3//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 33 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 33 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html level 2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 43 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 43 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html strict level 3//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 29 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 29 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html level 0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 41 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 41 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html strict level 2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 27 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 27 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html 3.2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 37 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 37 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html strict level 0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 69 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 69 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//w30//dtd w3 html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 24 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 24 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html 3.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 50 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 50 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html//en//3.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 25 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 25 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html 3.0//en//", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 31 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 31 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html level 1//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 22 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 22 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 49 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 49 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 47 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 47 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html strict//en//3.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 36 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 36 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html level 3//en//3.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 39 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 39 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html strict level 1//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 21 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 21 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html 2.0 strict//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 46 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 46 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html strict//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 44 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 44 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html strict level 3//en//3.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 18 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 18 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html 2.0 level 2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 34 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 34 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html level 2//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 72 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 72 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//w3c//dtd html 3.2 final//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 23 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 23 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html 2.1e//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 75 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 75 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//w3c//dtd html 4.0 frameset//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks},
-#line 30 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 30 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html level 0//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 20 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 20 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html 2.0 strict level 2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 42 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 42 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html strict level 2//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 85 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 85 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//w3o//dtd w3 html 3.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 89 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 89 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//webtechs//dtd mozilla html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 86 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 86 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//w3o//dtd w3 html 3.0//en//", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 84 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 84 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//w3c//dtd xhtml 1.1//en", PubIDInfo::eAlmostStandards, PubIDInfo::eAlmostStandards},
-#line 38 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 38 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html strict level 0//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 70 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 70 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//w3c//dtd html 3 1995-03-24//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 87 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 87 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//w3o//dtd w3 html strict 3.0//en//", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 17 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 17 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html 2.0 level 1//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 32 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 32 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html level 1//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 26 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 26 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html 3.2 final//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 19 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 19 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html 2.0 strict level 1//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 40 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 40 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//ietf//dtd html strict level 1//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 77 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 77 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//w3c//dtd html 4.01 frameset//en", PubIDInfo::eQuirks, PubIDInfo::eAlmostStandards},
-#line 71 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 71 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//w3c//dtd html 3.2 draft//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 74 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 74 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//w3c//dtd html 3.2s draft//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 82 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 82 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//w3c//dtd xhtml 1.0 frameset//en", PubIDInfo::eAlmostStandards, PubIDInfo::eAlmostStandards},
-#line 80 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 80 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//w3c//dtd html experimental 970421//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 51 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 51 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//metrius//dtd metrius presentational//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 88 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 88 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//webtechs//dtd mozilla html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -639,17 +639,17 @@ findDoctypeEntry (register const char *str, register unsigned int len)
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 90 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 90 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-/w3c/dtd html 4.0 transitional/en", PubIDInfo::eQuirks, PubIDInfo::eQuirks},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 76 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 76 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//w3c//dtd html 4.0 transitional//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 79 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 79 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//w3c//dtd html experimental 19960712//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -670,22 +670,22 @@ findDoctypeEntry (register const char *str, register unsigned int len)
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 58 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 58 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//netscape comm. corp.//dtd html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 78 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 78 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//w3c//dtd html 4.01 transitional//en", PubIDInfo::eQuirks, PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 83 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 83 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//w3c//dtd xhtml 1.0 transitional//en", PubIDInfo::eAlmostStandards, PubIDInfo::eAlmostStandards},
-#line 59 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 59 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//netscape comm. corp.//dtd strict html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 65 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 65 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//spyglass//dtd html 2.0 extended//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -702,9 +702,9 @@ findDoctypeEntry (register const char *str, register unsigned int len)
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 16 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 16 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//as//dtd html 3.0 aswedit + extensions//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 66 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 66 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//sq//dtd html 2.0 hotmetal + extensions//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -727,7 +727,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 67 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 67 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//sun microsystems corp.//dtd hotjava html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -735,7 +735,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 68 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 68 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//sun microsystems corp.//dtd hotjava strict html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -746,7 +746,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 60 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 60 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//o'reilly and associates//dtd html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -761,35 +761,35 @@ findDoctypeEntry (register const char *str, register unsigned int len)
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 56 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 56 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//microsoft//dtd internet explorer 3.0 html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 53 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 53 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//microsoft//dtd internet explorer 2.0 html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 55 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 55 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//microsoft//dtd internet explorer 3.0 html strict//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 14 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 14 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"+//silmaril//dtd html pro v0r11 19970101//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
-#line 52 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 52 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//microsoft//dtd internet explorer 2.0 html strict//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 57 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 57 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//microsoft//dtd internet explorer 3.0 tables//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 54 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 54 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//microsoft//dtd internet explorer 2.0 tables//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -879,12 +879,12 @@ findDoctypeEntry (register const char *str, register unsigned int len)
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 15 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 15 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//advasoft ltd//dtd html 3.0 aswedit + extensions//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 61 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 61 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//o'reilly and associates//dtd html extended 1.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -953,7 +953,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 62 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 62 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//o'reilly and associates//dtd html extended relaxed 1.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -1089,7 +1089,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 64 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 64 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//softquad//dtd hotmetal pro 4.0::19971010::extensions to html 4.0//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
@@ -1154,7 +1154,7 @@ findDoctypeEntry (register const char *str, register unsigned int len)
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
{"",PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards},
-#line 63 "/opt/src/kde/kdelibs/khtml/html/doctypes.gperf"
+#line 63 "/opt/src/kde/tdelibs/khtml/html/doctypes.gperf"
{"-//softquad software//dtd hotmetal pro 6.0::19990601::extensions to html 4.0//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks}
};
diff --git a/khtml/java/tests/testkjavaappletserver.cpp b/khtml/java/tests/testkjavaappletserver.cpp
index 63ec3ba3..2045f751 100644
--- a/khtml/java/tests/testkjavaappletserver.cpp
+++ b/khtml/java/tests/testkjavaappletserver.cpp
@@ -11,7 +11,7 @@
static KCmdLineOptions options[] =
{
- { "+[kdelibs_path]", "path to kdelibs directory", 0 },
+ { "+[tdelibs_path]", "path to tdelibs directory", 0 },
KCmdLineLastOption
};
@@ -23,13 +23,13 @@ int main(int argc, char **argv)
KApplication app;
- TQString path_to_kdelibs = "/build/wynnw/kde-src";
+ TQString path_to_tdelibs = "/build/wynnw/kde-src";
KJavaAppletWidget *a = new KJavaAppletWidget;
a->show();
- a->applet()->setBaseURL( "file:" + path_to_kdelibs + "/kdelibs/khtml/test/" );
+ a->applet()->setBaseURL( "file:" + path_to_tdelibs + "/tdelibs/khtml/test/" );
a->applet()->setAppletName( "Lake" );
a->applet()->setAppletClass( "lake.class" );
a->applet()->setParameter( "image", "konqi.gif" );
diff --git a/khtml/khtml-devel-gdb b/khtml/khtml-devel-gdb
index bb8319b2..d5fea476 100644
--- a/khtml/khtml-devel-gdb
+++ b/khtml/khtml-devel-gdb
@@ -1,6 +1,6 @@
# This file defines handy gdb macros for KHTML
# To use it, add this line to your ~/.gdbinit :
-# source /path/to/kde/sources/kdelibs/khtml/khtml-devel-gdb
+# source /path/to/kde/sources/tdelibs/khtml/khtml-devel-gdb
define printdomstring
printdomstringimpl $arg0.impl
diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp
index 18ca537b..2e9f2897 100644
--- a/khtml/khtml_part.cpp
+++ b/khtml/khtml_part.cpp
@@ -459,7 +459,7 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
//if ( prof == BrowserViewGUI && !parentPart() )
// loadPlugins( partObject(), this, instance() );
- // "khtml" catalog does not exist, our translations are in kdelibs.
+ // "khtml" catalog does not exist, our translations are in tdelibs.
// removing this catalog from KGlobal::locale() prevents problems
// with changing the language in applications at runtime -Thomas Reitelbach
KGlobal::locale()->removeCatalogue("khtml");
diff --git a/khtml/khtml_settings.h b/khtml/khtml_settings.h
index 8641c313..bb089e5a 100644
--- a/khtml/khtml_settings.h
+++ b/khtml/khtml_settings.h
@@ -27,7 +27,7 @@ class KConfig;
#include <tqfont.h>
#include <tqmap.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
struct KPerDomainSettings;
class KHTMLSettingsPrivate;
diff --git a/khtml/khtmlview.h b/khtml/khtmlview.h
index 6c9dc880..212a02b4 100644
--- a/khtml/khtmlview.h
+++ b/khtml/khtmlview.h
@@ -28,7 +28,7 @@
// qt includes and classes
#include <tqscrollview.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQPainter;
class TQRect;
diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp
index 2023c1e8..5d82742d 100644
--- a/khtml/kmultipart/kmultipart.cpp
+++ b/khtml/kmultipart/kmultipart.cpp
@@ -181,7 +181,7 @@ bool KMultiPart::openURL( const KURL &url )
return true;
}
-// Yes, libkdenetwork's has such a parser already (MultiPart),
+// Yes, libtdenetwork's has such a parser already (MultiPart),
// but it works on the complete string, expecting the whole data to be available....
// The version here is asynchronous.
void KMultiPart::slotData( KIO::Job *job, const TQByteArray &data )
diff --git a/khtml/misc/Makefile.am b/khtml/misc/Makefile.am
index fcb4ed02..f0dc1ab7 100644
--- a/khtml/misc/Makefile.am
+++ b/khtml/misc/Makefile.am
@@ -34,7 +34,7 @@ noinst_HEADERS = \
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/dcop -I$(top_srcdir)/kio -I$(top_srcdir)/libltdl \
-I$(top_srcdir)/khtml -I$(top_srcdir)/kutils $(all_includes)
-SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml
+SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/khtml
## generate lib documentation
srcdoc:
diff --git a/khtml/rendering/Makefile.am b/khtml/rendering/Makefile.am
index c81b4bea..d41638f2 100644
--- a/khtml/rendering/Makefile.am
+++ b/khtml/rendering/Makefile.am
@@ -44,7 +44,7 @@ noinst_HEADERS = \
INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
-I$(top_srcdir)/kfile -I$(top_srcdir)/khtml -I$(top_srcdir)/kutils -I$(top_srcdir) $(all_includes)
-SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml
+SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/khtml
## generate lib documentation
srcdoc:
diff --git a/khtml/xml/Makefile.am b/khtml/xml/Makefile.am
index 676c945b..17a9779a 100644
--- a/khtml/xml/Makefile.am
+++ b/khtml/xml/Makefile.am
@@ -39,7 +39,7 @@ INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \
-I$(top_srcdir)/khtml -I$(top_srcdir) -I$(top_srcdir)/kwallet/client \
-I$(top_srcdir)/kutils -I$(top_builddir)/kjs $(all_includes)
-SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml
+SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/khtml
## generate lib documentation
srcdoc:
diff --git a/kimgio/ico.cpp b/kimgio/ico.cpp
index d973896c..b7208e57 100644
--- a/kimgio/ico.cpp
+++ b/kimgio/ico.cpp
@@ -19,7 +19,7 @@
#include <tqmemarray.h>
#include <tqpaintdevicemetrics.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#include "ico.h"
diff --git a/kimgio/tiffr.cpp b/kimgio/tiffr.cpp
index 3a95f794..0d3e1d06 100644
--- a/kimgio/tiffr.cpp
+++ b/kimgio/tiffr.cpp
@@ -8,7 +8,7 @@
#include <tqimage.h>
#include <tqfile.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#include <assert.h>
diff --git a/kimgio/xview.cpp b/kimgio/xview.cpp
index 00d604cf..3ba866c4 100644
--- a/kimgio/xview.cpp
+++ b/kimgio/xview.cpp
@@ -10,7 +10,7 @@
#include <stdlib.h>
#include <tqimage.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#include "xview.h"
diff --git a/kinit/README b/kinit/README
index 2e5f6c23..97ce088c 100644
--- a/kinit/README
+++ b/kinit/README
@@ -79,6 +79,6 @@ Disadvantages
The process name of applications started via tdeinit is "tdeinit". This problem
can be corrected to a degree by changing the application name as shown
by 'ps'. However, applications like "killall" will only see "tdeinit" as
-process name. To workaround this, use "kdekillall", from kdesdk/scripts,
+process name. To workaround this, use "kdekillall", from tdesdk/scripts,
for applications started via tdeinit.
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index 16e4e60e..6859282d 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -71,7 +71,7 @@
#include <kstartupinfo.h> // schroder
#endif
-#include <kdeversion.h>
+#include <tdeversion.h>
#include "ltdl.h"
#include "klauncher_cmds.h"
@@ -1619,7 +1619,7 @@ static void setupX()
XSetErrorHandler(tdeinit_x_errhandler);
}
-// Borrowed from kdebase/kaudio/kaudioserver.cpp
+// Borrowed from tdebase/kaudio/kaudioserver.cpp
static int initXconnection()
{
X11display = XOpenDisplay(NULL);
diff --git a/kinit/klauncher_main.cpp b/kinit/klauncher_main.cpp
index 632c82a8..92023428 100644
--- a/kinit/klauncher_main.cpp
+++ b/kinit/klauncher_main.cpp
@@ -72,7 +72,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
putenv(strdup("SESSION_MANAGER="));
// Allow the locale to initialize properly
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
diff --git a/kio/bookmarks/kbookmarkmanager.h b/kio/bookmarks/kbookmarkmanager.h
index 403a2e1b..f2d4021f 100644
--- a/kio/bookmarks/kbookmarkmanager.h
+++ b/kio/bookmarks/kbookmarkmanager.h
@@ -44,7 +44,7 @@
* <title>My own bookmarks</title>
* <bookmark href="http://www.koffice.org"><title>KOffice Web Site</title></bookmark>
* <separator/>
- * <bookmark href="http://www.kdevelop.org"><title>KDevelop Web Site</title></bookmark>
+ * <bookmark href="http://www.tdevelop.org"><title>KDevelop Web Site</title></bookmark>
* </folder>
* </folder>
* </xbel>
diff --git a/kio/kfile/kdiskfreesp.h b/kio/kfile/kdiskfreesp.h
index 5fccfe3b..b7286f2d 100644
--- a/kio/kfile/kdiskfreesp.h
+++ b/kio/kfile/kdiskfreesp.h
@@ -29,7 +29,7 @@
#include <tqobject.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KProcess;
diff --git a/kio/kfile/kfile.h b/kio/kfile/kfile.h
index 91f4f459..8e6541cb 100644
--- a/kio/kfile/kfile.h
+++ b/kio/kfile/kfile.h
@@ -20,7 +20,7 @@
#include <tqdir.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* KFile is a class which provides a namespace for some enumerated
diff --git a/kio/kfile/kpreviewwidgetbase.h b/kio/kfile/kpreviewwidgetbase.h
index 05176964..e4c77c60 100644
--- a/kio/kfile/kpreviewwidgetbase.h
+++ b/kio/kfile/kpreviewwidgetbase.h
@@ -24,7 +24,7 @@
#include <tqptrdict.h>
#include <tqwidget.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KURL;
diff --git a/kio/kfile/krecentdirs.h b/kio/kfile/krecentdirs.h
index 439fb6fe..e8c6c941 100644
--- a/kio/kfile/krecentdirs.h
+++ b/kio/kfile/krecentdirs.h
@@ -30,7 +30,7 @@
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* The goal of this class is to make sure that, when the user needs to
diff --git a/kio/kfile/tests/kcustommenueditortest.cpp b/kio/kfile/tests/kcustommenueditortest.cpp
index 532297d0..859e7545 100644
--- a/kio/kfile/tests/kcustommenueditortest.cpp
+++ b/kio/kfile/tests/kcustommenueditortest.cpp
@@ -5,7 +5,7 @@
int main(int argc, char** argv)
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KApplication app(argc, argv, "KCustomMenuEditorTest");
KCustomMenuEditor editor(0);
KConfig *cfg = new KConfig("kdesktop_custom_menu2");
diff --git a/kio/kfile/tests/kfstest.cpp b/kio/kfile/tests/kfstest.cpp
index 48c8a1a2..aad57b25 100644
--- a/kio/kfile/tests/kfstest.cpp
+++ b/kio/kfile/tests/kfstest.cpp
@@ -143,7 +143,7 @@ int main(int argc, char **argv)
TQString::tqfromLatin1("*|All Files\n"
"*.lo *.o *.la|All libtool Files"),
0, 0, true);
-// dlg.setFilter( "*.kdevelop" );
+// dlg.setFilter( "*.tdevelop" );
dlg.setMode( (KFile::Mode) (KFile::Files |
KFile::Directory |
KFile::ExistingOnly |
diff --git a/kio/kio/connection.h b/kio/kio/connection.h
index 75820296..a30131af 100644
--- a/kio/kio/connection.h
+++ b/kio/kio/connection.h
@@ -22,7 +22,7 @@
#ifndef __connection_h__
#define __connection_h__
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#include <sys/types.h>
diff --git a/kio/kio/karchive.h b/kio/kio/karchive.h
index ff1fe1f7..6f0b57cb 100644
--- a/kio/kio/karchive.h
+++ b/kio/kio/karchive.h
@@ -29,7 +29,7 @@
#include <tqstringlist.h>
#include <tqdict.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KArchiveDirectory;
class KArchiveFile;
diff --git a/kio/kio/kautomount.h b/kio/kio/kautomount.h
index e73edec3..c5aa3058 100644
--- a/kio/kio/kautomount.h
+++ b/kio/kio/kautomount.h
@@ -22,7 +22,7 @@
#include <tqobject.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#ifdef Q_MOC_RUN
#define Q_OS_UNIX
diff --git a/kio/kio/kdatatool.cpp b/kio/kio/kdatatool.cpp
index 339b9513..798a37d9 100644
--- a/kio/kio/kdatatool.cpp
+++ b/kio/kio/kdatatool.cpp
@@ -177,7 +177,7 @@ TQValueList<KDataToolInfo> KDataToolInfo::query( const TQString& datatype, const
else
constr = constr + " and " + tmp;
}
-/* Bug in KTrader ? Test with HEAD-kdelibs!
+/* Bug in KTrader ? Test with HEAD-tdelibs!
if ( instance )
{
TQString tmp = TQString::tqfromLatin1( "not ('%1' in ExcludeFrom)" ).arg( instance->instanceName() );
diff --git a/kio/kio/kdirwatch.h b/kio/kio/kdirwatch.h
index e04b0ad1..ac33a6ed 100644
--- a/kio/kio/kdirwatch.h
+++ b/kio/kio/kdirwatch.h
@@ -22,7 +22,7 @@
#include <tqdatetime.h>
#include <tqmap.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#define kdirwatch KDirWatch::self()
diff --git a/kio/kio/kemailsettings.h b/kio/kio/kemailsettings.h
index f072fa7f..9d35675c 100644
--- a/kio/kio/kemailsettings.h
+++ b/kio/kio/kemailsettings.h
@@ -31,7 +31,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KEMailSettingsPrivate;
diff --git a/kio/kio/kfilefilter.h b/kio/kio/kfilefilter.h
index c2076f0e..b17d2fe7 100644
--- a/kio/kio/kfilefilter.h
+++ b/kio/kio/kfilefilter.h
@@ -28,7 +28,7 @@
#include <sys/stat.h>
#include <unistd.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQRegExp;
class KFileItem;
diff --git a/kio/kio/kfileshare.h b/kio/kio/kfileshare.h
index a7158bf7..e46d0903 100644
--- a/kio/kio/kfileshare.h
+++ b/kio/kio/kfileshare.h
@@ -21,7 +21,7 @@
#define kfileshare_h
#include <tqobject.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KDirWatch;
diff --git a/kio/kio/kfilterbase.h b/kio/kio/kfilterbase.h
index b4670624..a9d143b6 100644
--- a/kio/kio/kfilterbase.h
+++ b/kio/kio/kfilterbase.h
@@ -22,7 +22,7 @@
#include <tqobject.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#ifdef Q_WS_WIN
#undef ERROR //avoid conflicts
diff --git a/kio/kio/kfilterdev.h b/kio/kio/kfilterdev.h
index e5280542..2df49f2c 100644
--- a/kio/kio/kfilterdev.h
+++ b/kio/kio/kfilterdev.h
@@ -20,7 +20,7 @@
#include <tqiodevice.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQFile;
class KFilterBase;
diff --git a/kio/kio/kimageio.h b/kio/kio/kimageio.h
index dba18c8f..3c14fb54 100644
--- a/kio/kio/kimageio.h
+++ b/kio/kio/kimageio.h
@@ -10,7 +10,7 @@
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* Interface to the KDE Image IO plugin architecture.
diff --git a/kio/kio/kmimemagic.h b/kio/kio/kmimemagic.h
index d73dd306..c54c9412 100644
--- a/kio/kio/kmimemagic.h
+++ b/kio/kio/kmimemagic.h
@@ -31,7 +31,7 @@
#define KMIMEMAGIC_H
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KMimeMagic; // see below (read this one first)
diff --git a/kio/kio/kmimetypechooser.cpp b/kio/kio/kmimetypechooser.cpp
index c9cdf9a0..d4d7b620 100644
--- a/kio/kio/kmimetypechooser.cpp
+++ b/kio/kio/kmimetypechooser.cpp
@@ -122,7 +122,7 @@ void KMimeTypeChooser::loadMimeTypes( const TQStringList &_selectedMimeTypes )
d->lvMimeTypes->clear();
TQMap<TQString,TQListViewItem*> groups;
- // thanks to kdebase/kcontrol/filetypes/filetypesview
+ // thanks to tdebase/kcontrol/filetypes/filetypesview
KMimeType::List mimetypes = KMimeType::allMimeTypes();
TQValueListIterator<KMimeType::Ptr> it(mimetypes.begin());
diff --git a/kio/kio/knfsshare.h b/kio/kio/knfsshare.h
index d1852d0f..fd658760 100644
--- a/kio/kio/knfsshare.h
+++ b/kio/kio/knfsshare.h
@@ -21,7 +21,7 @@
#include <tqobject.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KNFSSharePrivate;
diff --git a/kio/kio/ksambashare.h b/kio/kio/ksambashare.h
index 383bd702..ba922ecf 100644
--- a/kio/kio/ksambashare.h
+++ b/kio/kio/ksambashare.h
@@ -21,7 +21,7 @@
#include <tqobject.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KSambaSharePrivate;
diff --git a/kio/kio/kscan.h b/kio/kio/kscan.h
index c7b8d97f..5306156a 100644
--- a/kio/kio/kscan.h
+++ b/kio/kio/kscan.h
@@ -29,7 +29,7 @@ class TQImage;
/**
* This is a base class for scanning dialogs. You can derive from this class
* and implement your own dialog. An implementation is available in
- * kdegraphics/libkscan.
+ * tdegraphics/libkscan.
*
* Application developers that wish to add scanning support to their program
* can use the static method @p KScanDialog::getScanDialog() to get an instance
diff --git a/kio/kio/ktrader.h b/kio/kio/ktrader.h
index 4b2690dc..c1547a35 100644
--- a/kio/kio/ktrader.h
+++ b/kio/kio/ktrader.h
@@ -124,7 +124,7 @@ public:
* a number
*
* @return A list of services that satisfy the query
- * @see http://developer.kde.org/documentation/library/3.5-api/kdelibs-apidocs/kio/kio/html/tradersyntax.html
+ * @see http://developer.kde.org/documentation/library/3.5-api/tdelibs-apidocs/kio/kio/html/tradersyntax.html
*/
virtual OfferList query( const TQString& servicetype,
const TQString& constraint = TQString::null,
@@ -288,7 +288,7 @@ protected:
* - <tt>('KParts/ReadOnlyPart' in ServiceTypes) and ('text/plain' in ServiceTypes)</tt>@n
* All read-only KParts that handle the mime type 'text/plain'.
*
- * @author Bernd Gehrmann <a href="mailto:bernd@kdevelop.org">bernd@kdevelop.org</a>
+ * @author Bernd Gehrmann <a href="mailto:bernd@tdevelop.org">bernd@tdevelop.org</a>
*/
diff --git a/kio/kio/skipdlg.h b/kio/kio/skipdlg.h
index 87b8823e..dbf583ef 100644
--- a/kio/kio/skipdlg.h
+++ b/kio/kio/skipdlg.h
@@ -19,7 +19,7 @@
#ifndef __kio_skip_dlg__
#define __kio_skip_dlg__
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#include <kdialog.h>
class TQPushButton;
diff --git a/kio/kio/thumbcreator.h b/kio/kio/thumbcreator.h
index ce8696a1..17a7fac3 100644
--- a/kio/kio/thumbcreator.h
+++ b/kio/kio/thumbcreator.h
@@ -28,7 +28,7 @@ class TQImage;
* This is the baseclass for "thumbnail-plugins" in KDE. Using the class
* KIO::PreviewJob allows you to generate small images (thumbnails)
* for any kind of file, where a "ThumbCreator" is available. Have a look
- * at kdebase/kioslave/thumbnail/ for existing ThumbCreators.
+ * at tdebase/kioslave/thumbnail/ for existing ThumbCreators.
*
* What you need to do to create and register a ThumbCreator:
* @li Inherit from this class and reimplement the create() method to
diff --git a/kio/kpasswdserver/Makefile.am b/kio/kpasswdserver/Makefile.am
index 863055f6..694718de 100644
--- a/kio/kpasswdserver/Makefile.am
+++ b/kio/kpasswdserver/Makefile.am
@@ -1,5 +1,5 @@
# $Id$
-# Makefile.am of kdebase/kioslave/http
+# Makefile.am of tdebase/kioslave/http
INCLUDES= -I$(top_srcdir)/kwallet/client $(all_includes)
diff --git a/kio/kssl/kssl/HOWTO b/kio/kssl/kssl/HOWTO
index b5d1a8a1..9a74e418 100644
--- a/kio/kssl/kssl/HOWTO
+++ b/kio/kssl/kssl/HOWTO
@@ -24,7 +24,7 @@ maintainer (currently bradh@kde.org) with full details.
To add local files:
-1) Create the .pem file and check it into cvs in kdelibs/kio/kssl/kssl.
+1) Create the .pem file and check it into cvs in tdelibs/kio/kssl/kssl.
2) List the pem file name as a single line in 'localcerts'.
diff --git a/kio/kssl/ksslcertificate.h b/kio/kssl/ksslcertificate.h
index 16dbb208..a7906581 100644
--- a/kio/kssl/ksslcertificate.h
+++ b/kio/kssl/ksslcertificate.h
@@ -47,7 +47,7 @@ class TQDateTime;
class KSSLCertChain;
class KSSLX509V3;
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#ifdef Q_WS_WIN
#include "ksslconfig_win.h"
diff --git a/kio/kssl/ksslcertificatecache.h b/kio/kssl/ksslcertificatecache.h
index 03ee1edb..48699726 100644
--- a/kio/kssl/ksslcertificatecache.h
+++ b/kio/kssl/ksslcertificatecache.h
@@ -26,7 +26,7 @@ class KSSLCertificate;
#include <tqstringlist.h>
#include <tqdatetime.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KIO_EXPORT KSSLCertificateCache {
public:
diff --git a/kio/kssl/ksslcertificatefactory.h b/kio/kssl/ksslcertificatefactory.h
index eb280764..c259e60e 100644
--- a/kio/kssl/ksslcertificatefactory.h
+++ b/kio/kssl/ksslcertificatefactory.h
@@ -23,7 +23,7 @@
#ifndef _KSSLCERTIFICATEFACTORY_H
#define _KSSLCERTIFICATEFACTORY_H
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KSSLCertificate;
diff --git a/kio/kssl/ksslcertificatehome.h b/kio/kssl/ksslcertificatehome.h
index 1a77c1d2..549d7c16 100644
--- a/kio/kssl/ksslcertificatehome.h
+++ b/kio/kssl/ksslcertificatehome.h
@@ -26,7 +26,7 @@ class KSSLPKCS12;
#include <tqstring.h>
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KIO_EXPORT KSSLCertificateHome {
diff --git a/kio/kssl/ksslconnectioninfo.h b/kio/kssl/ksslconnectioninfo.h
index 4d82c6ce..e9bbad83 100644
--- a/kio/kssl/ksslconnectioninfo.h
+++ b/kio/kssl/ksslconnectioninfo.h
@@ -23,7 +23,7 @@
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KSSL;
diff --git a/kio/kssl/ksslcsessioncache.h b/kio/kssl/ksslcsessioncache.h
index 231b4064..4cfc77aa 100644
--- a/kio/kssl/ksslcsessioncache.h
+++ b/kio/kssl/ksslcsessioncache.h
@@ -21,7 +21,7 @@
#ifndef __KSSLCSESSIONCACHE_H
#define __KSSLCSESSIONCACHE_H
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KURL;
class TQString;
diff --git a/kio/kssl/ksslpemcallback.h b/kio/kssl/ksslpemcallback.h
index a289da00..0a8978b6 100644
--- a/kio/kssl/ksslpemcallback.h
+++ b/kio/kssl/ksslpemcallback.h
@@ -21,7 +21,7 @@
#ifndef _kde_ksslpemcallback_h
#define _kde_ksslpemcallback_h
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
int KIO_EXPORT KSSLPemCallback(char *buf, int size, int rwflag, void *userdata);
diff --git a/kio/kssl/ksslsession.h b/kio/kssl/ksslsession.h
index 20278141..d8689833 100644
--- a/kio/kssl/ksslsession.h
+++ b/kio/kssl/ksslsession.h
@@ -23,7 +23,7 @@
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KSSL;
diff --git a/kio/kssl/ksslsigners.h b/kio/kssl/ksslsigners.h
index 476c7653..21744f1d 100644
--- a/kio/kssl/ksslsigners.h
+++ b/kio/kssl/ksslsigners.h
@@ -27,7 +27,7 @@ class DCOPClient;
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
// ### KDE4 - Fix constness
/**
diff --git a/kio/kssl/ksslx509map.h b/kio/kssl/ksslx509map.h
index e0b37fb2..93c46aee 100644
--- a/kio/kssl/ksslx509map.h
+++ b/kio/kssl/ksslx509map.h
@@ -24,7 +24,7 @@
#include <tqmap.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* X.509 Map Parsing Class
diff --git a/kio/kssl/ksslx509v3.h b/kio/kssl/ksslx509v3.h
index fb163de3..45c7d706 100644
--- a/kio/kssl/ksslx509v3.h
+++ b/kio/kssl/ksslx509v3.h
@@ -23,7 +23,7 @@
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
// ### KDE4: fix constness of methods
/**
diff --git a/kio/misc/kmailservice.cpp b/kio/misc/kmailservice.cpp
index 35d82951..4413911a 100644
--- a/kio/misc/kmailservice.cpp
+++ b/kio/misc/kmailservice.cpp
@@ -28,7 +28,7 @@ static const KCmdLineOptions options[] =
int main( int argc, char **argv )
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KCmdLineArgs::init( argc, argv, "kmailservice", I18N_NOOP("KMailService"), I18N_NOOP("Mail service"), "unknown" );
KCmdLineArgs::addCmdLineOptions( options );
diff --git a/kio/misc/kntlm/kntlm.h b/kio/misc/kntlm/kntlm.h
index 8a89001a..2be0a00a 100644
--- a/kio/misc/kntlm/kntlm.h
+++ b/kio/misc/kntlm/kntlm.h
@@ -24,7 +24,7 @@
#include <tqcstring.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* @short KNTLM class implements the NTLM authentication protocol.
diff --git a/kio/misc/ksendbugmail/main.cpp b/kio/misc/ksendbugmail/main.cpp
index d6c852f6..46475e9a 100644
--- a/kio/misc/ksendbugmail/main.cpp
+++ b/kio/misc/ksendbugmail/main.cpp
@@ -58,7 +58,7 @@ void BugMailer::slotSend() {
int main(int argc, char **argv) {
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KAboutData d("ksendbugmail", I18N_NOOP("KSendBugMail"), "1.0",
I18N_NOOP("Sends a short bug report to submit@bugs.kde.org"),
KAboutData::License_GPL, "(c) 2000 Stephan Kulow");
diff --git a/kio/misc/ktelnetservice.cpp b/kio/misc/ktelnetservice.cpp
index aa7b3b22..4b21ef79 100644
--- a/kio/misc/ktelnetservice.cpp
+++ b/kio/misc/ktelnetservice.cpp
@@ -37,7 +37,7 @@ static const KCmdLineOptions options[] =
int main(int argc, char **argv)
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KCmdLineArgs::init(argc, argv, "ktelnetservice", I18N_NOOP("telnet service"),
I18N_NOOP("telnet protocol handler"), "unknown");
KCmdLineArgs::addCmdLineOptions(options);
diff --git a/kio/misc/tdesasl/tdesasl.h b/kio/misc/tdesasl/tdesasl.h
index 824b4986..1f68ac68 100644
--- a/kio/misc/tdesasl/tdesasl.h
+++ b/kio/misc/tdesasl/tdesasl.h
@@ -22,7 +22,7 @@
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KURL;
class TQStrIList;
diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp
index 3dd862b5..87f95fb2 100644
--- a/kio/misc/uiserver.cpp
+++ b/kio/misc/uiserver.cpp
@@ -1377,7 +1377,7 @@ UIServer* UIServer::createInstance()
extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
// GS 5/2001 - I changed the name to "TDE" to make it look better
// in the titles of dialogs which are displayed.
KAboutData aboutdata("kio_uiserver", I18N_NOOP("TDE"),
diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp
index 3cd33a8f..3b7a6c6d 100644
--- a/kio/tests/jobtest.cpp
+++ b/kio/tests/jobtest.cpp
@@ -44,7 +44,7 @@
#include <time.h>
#include <utime.h>
-// The code comes partly from kdebase/kioslave/trash/testtrash.cpp
+// The code comes partly from tdebase/kioslave/trash/testtrash.cpp
static bool check(const TQString& txt, TQString a, TQString b)
{
diff --git a/kio/tests/kacltest.cpp b/kio/tests/kacltest.cpp
index 372589dd..348d35e3 100644
--- a/kio/tests/kacltest.cpp
+++ b/kio/tests/kacltest.cpp
@@ -34,7 +34,7 @@
#include <assert.h>
#include <tqdir.h>
-// The code comes partly from kdebase/kioslave/trash/testtrash.cpp
+// The code comes partly from tdebase/kioslave/trash/testtrash.cpp
static bool check(const TQString& txt, TQString a, TQString b)
{
diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp
index dca72c23..9f4477e5 100644
--- a/kio/tests/kurifiltertest.cpp
+++ b/kio/tests/kurifiltertest.cpp
@@ -292,7 +292,7 @@ int main(int argc, char **argv)
TQCString home = getenv("HOME");
TQCString kdehome = getenv("KDEHOME");
- filter( "$SOMEVAR/kdelibs/kio", 0, KURIFilterData::ERROR ); // note: this dir doesn't exist...
+ filter( "$SOMEVAR/tdelibs/kio", 0, KURIFilterData::ERROR ); // note: this dir doesn't exist...
filter( "$ETC/passwd", "/etc/passwd", KURIFilterData::LOCAL_FILE );
filter( "$QTDIR/doc/html/functions.html#s", TQCString("file://")+qtdir+"/doc/html/functions.html#s", KURIFilterData::LOCAL_FILE );
filter( "http://www.kde.org/$USER", "http://www.kde.org/$USER", KURIFilterData::NET_PROTOCOL ); // no expansion
@@ -325,7 +325,7 @@ int main(int argc, char **argv)
KStandardDirs::makeDir( kdehome+"/share/Dir[Bracket" );
filter( "$KDEHOME/share/Dir[Bracket", kdehome+"/share/Dir[Bracket", KURIFilterData::LOCAL_DIR );
- filter( "$HOME/$KDEDIR/kdebase/kcontrol/ebrowsing", 0, KURIFilterData::ERROR );
+ filter( "$HOME/$KDEDIR/tdebase/kcontrol/ebrowsing", 0, KURIFilterData::ERROR );
filter( "$1/$2/$3", "http://www.google.com/search?q=$1/$2/$3&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL ); // can be used as bogus or valid test. Currently triggers default search, i.e. google
filter( "$$$$", "http://www.google.com/search?q=$$$$&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL ); // worst case scenarios.
diff --git a/kioslave/file/Makefile.am b/kioslave/file/Makefile.am
index 4c06affa..3daf0cbc 100644
--- a/kioslave/file/Makefile.am
+++ b/kioslave/file/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am of kdebase/kioslave/file
+## Makefile.am of tdebase/kioslave/file
AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
diff --git a/kioslave/file/file.cc b/kioslave/file/file.cc
index d977bbd9..496f761d 100644
--- a/kioslave/file/file.cc
+++ b/kioslave/file/file.cc
@@ -112,7 +112,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
int kdemain( int argc, char **argv )
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KInstance instance( "kio_file" );
( void ) KGlobal::locale();
diff --git a/kioslave/ftp/ftp.cc b/kioslave/ftp/ftp.cc
index 4eed185e..a3071074 100644
--- a/kioslave/ftp/ftp.cc
+++ b/kioslave/ftp/ftp.cc
@@ -139,7 +139,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
int kdemain( int argc, char **argv )
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KInstance instance( "kio_ftp" );
( void ) KGlobal::locale();
diff --git a/kioslave/http/Makefile.am b/kioslave/http/Makefile.am
index b0f027c1..f8e09914 100644
--- a/kioslave/http/Makefile.am
+++ b/kioslave/http/Makefile.am
@@ -1,5 +1,5 @@
# $Id$
-# Makefile.am of kdebase/kioslave/http
+# Makefile.am of tdebase/kioslave/http
SUBDIRS = kcookiejar
diff --git a/kioslave/http/TODO b/kioslave/http/TODO
index 6484f028..12a92952 100644
--- a/kioslave/http/TODO
+++ b/kioslave/http/TODO
@@ -20,13 +20,13 @@ features such as locking.
This might involve an external program to parse the labels, and something to
configure access accordingly. There is only some basic things that need to be
added to kio_http to support this. The majority of the work has to be done at the
-application level. A khtml plugin in kdeaddons to do this might be a nice idea.
+application level. A khtml plugin in tdeaddons to do this might be a nice idea.
- P3P support:
This can also be implemented as a plugin to konqueror and does
not need any speical support in HTTP except perhaps sending a
flag that indicates that the web page provides some P3P information.
-This is something that can be added as a plugin to kdeaddons.
+This is something that can be added as a plugin to tdeaddons.
Things that do not require programming
diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc
index a37fe27c..f772950b 100644
--- a/kioslave/http/http.cc
+++ b/kioslave/http/http.cc
@@ -97,7 +97,7 @@ extern "C" {
int kdemain( int argc, char **argv )
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KInstance instance( "kio_http" );
( void ) KGlobal::locale();
diff --git a/kioslave/http/http_cache_cleaner.cpp b/kioslave/http/http_cache_cleaner.cpp
index 8c10d0d1..cc17d972 100644
--- a/kioslave/http/http_cache_cleaner.cpp
+++ b/kioslave/http/http_cache_cleaner.cpp
@@ -189,7 +189,7 @@ void scanDirectory(FileInfoList &fileEntries, const TQString &name, const TQStri
extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KCmdLineArgs::init( argc, argv, appName,
I18N_NOOP("KDE HTTP cache maintenance tool"),
description, version, true);
diff --git a/kioslave/http/kcookiejar/Makefile.am b/kioslave/http/kcookiejar/Makefile.am
index 367e10ef..3cfb540f 100644
--- a/kioslave/http/kcookiejar/Makefile.am
+++ b/kioslave/http/kcookiejar/Makefile.am
@@ -1,4 +1,4 @@
-# Makefile.am of kdebase/kioslave/http
+# Makefile.am of tdebase/kioslave/http
SUBDIRS=tests
INCLUDES= $(all_includes)
diff --git a/kioslave/http/kcookiejar/main.cpp b/kioslave/http/kcookiejar/main.cpp
index 1a47b398..67177823 100644
--- a/kioslave/http/kcookiejar/main.cpp
+++ b/kioslave/http/kcookiejar/main.cpp
@@ -42,7 +42,7 @@ static const KCmdLineOptions options[] =
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KCmdLineArgs::init(argc, argv, "kcookiejar", I18N_NOOP("HTTP cookie daemon"),
description, version);
diff --git a/kioslave/http/kcookiejar/tests/Makefile.am b/kioslave/http/kcookiejar/tests/Makefile.am
index d6ae0a17..44a453fe 100644
--- a/kioslave/http/kcookiejar/tests/Makefile.am
+++ b/kioslave/http/kcookiejar/tests/Makefile.am
@@ -1,5 +1,5 @@
# $Id$
-# Makefile.am of kdebase/kioslave/http
+# Makefile.am of tdebase/kioslave/http
INCLUDES= $(all_includes)
diff --git a/kioslave/iso/Makefile.am b/kioslave/iso/Makefile.am
index 1e6411c4..f9c0bb75 100644
--- a/kioslave/iso/Makefile.am
+++ b/kioslave/iso/Makefile.am
@@ -58,7 +58,7 @@ uninstall-local:
# make messages.po. Move this one to ../po/ and "make merge" in po
-# the -x is for skipping messages already translated in kdelibs
+# the -x is for skipping messages already translated in tdelibs
messages:
LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
if test -n "$$LIST"; then \
diff --git a/kioslave/iso/iso.cpp b/kioslave/iso/iso.cpp
index a772dafe..9e569165 100644
--- a/kioslave/iso/iso.cpp
+++ b/kioslave/iso/iso.cpp
@@ -15,7 +15,7 @@
* *
***************************************************************************/
- /* This file is heavily based on tar.cc from kdebase
+ /* This file is heavily based on tar.cc from tdebase
* (c) David Faure <faure@kde.org>
*/
diff --git a/kioslave/iso/iso.h b/kioslave/iso/iso.h
index 6b16b638..2a488bd9 100644
--- a/kioslave/iso/iso.h
+++ b/kioslave/iso/iso.h
@@ -15,7 +15,7 @@
* *
***************************************************************************/
- /* This file is heavily based on tar.h from kdebase
+ /* This file is heavily based on tar.h from tdebase
* (c) David Faure <faure@kde.org>
*/
diff --git a/kioslave/iso/kiso.cpp b/kioslave/iso/kiso.cpp
index a260b524..7b682a78 100644
--- a/kioslave/iso/kiso.cpp
+++ b/kioslave/iso/kiso.cpp
@@ -15,7 +15,7 @@
* *
***************************************************************************/
- /* This file is heavily based on ktar.cpp from kdelibs (c) David Faure */
+ /* This file is heavily based on ktar.cpp from tdelibs (c) David Faure */
#include <stdio.h>
#include <stdlib.h>
diff --git a/kioslave/iso/kiso.h b/kioslave/iso/kiso.h
index c488dd0c..de0f06dc 100644
--- a/kioslave/iso/kiso.h
+++ b/kioslave/iso/kiso.h
@@ -15,7 +15,7 @@
* *
***************************************************************************/
- /* This file is heavily based on ktar.h from kdelibs
+ /* This file is heavily based on ktar.h from tdelibs
* (c) Torben Weis <weis@kde.org>, David Faure <faure@kde.org>
*/
diff --git a/kioslave/metainfo/Makefile.am b/kioslave/metainfo/Makefile.am
index 29d0d532..e2de616c 100644
--- a/kioslave/metainfo/Makefile.am
+++ b/kioslave/metainfo/Makefile.am
@@ -1,5 +1,5 @@
## $Id$
-## Makefile.am of kdebase/kioslave/metainfo
+## Makefile.am of tdebase/kioslave/metainfo
INCLUDES = $(all_includes)
AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
diff --git a/kjs/kjs-devel-gdb b/kjs/kjs-devel-gdb
index 41725379..ef51f7de 100644
--- a/kjs/kjs-devel-gdb
+++ b/kjs/kjs-devel-gdb
@@ -1,6 +1,6 @@
# This file defines handy gdb macros
# To use it, add this line to your ~/.gdbinit :
-# source /path/to/kde/sources/kdelibs/kjs/kjs-devel-gdb
+# source /path/to/kde/sources/tdelibs/kjs/kjs-devel-gdb
define printucharstar
set $i=0
diff --git a/kmdi/kmdi/global.h b/kmdi/kmdi/global.h
index bf66ea74..6ea09a93 100644
--- a/kmdi/kmdi/global.h
+++ b/kmdi/kmdi/global.h
@@ -35,7 +35,7 @@
// copyright : (C) 1999-2003 by Falk Brettschneider
// and
// Szymon Stefanek (stefanek@tin.it)
- // email : falkbr@kdevelop.org (Falk Brettschneider)
+ // email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
*/
diff --git a/kmdi/kmdi/mainwindow.cpp b/kmdi/kmdi/mainwindow.cpp
index 6df34d9f..358791ab 100644
--- a/kmdi/kmdi/mainwindow.cpp
+++ b/kmdi/kmdi/mainwindow.cpp
@@ -35,7 +35,7 @@
// copyright : (C) 1999-2003 by Falk Brettschneider
// and
// Szymon Stefanek (stefanek@tin.it)
- // email : falkbr@kdevelop.org (Falk Brettschneider)
+ // email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
*/
@@ -54,7 +54,7 @@
#include <kmenubar.h>
#include <kapplication.h>
#include <kdebug.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <tqtabwidget.h>
#include <klocale.h>
diff --git a/kmdi/kmdi/mainwindow.h b/kmdi/kmdi/mainwindow.h
index d7351a33..953d248d 100644
--- a/kmdi/kmdi/mainwindow.h
+++ b/kmdi/kmdi/mainwindow.h
@@ -35,7 +35,7 @@
// copyright : (C) 1999-2003 by Falk Brettschneider
// and
// Szymon Stefanek (stefanek@tin.it)
- // email : falkbr@kdevelop.org (Falk Brettschneider)
+ // email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
*/
diff --git a/kmdi/kmdi/tabwidget.cpp b/kmdi/kmdi/tabwidget.cpp
index 8e6bc162..869dbefc 100644
--- a/kmdi/kmdi/tabwidget.cpp
+++ b/kmdi/kmdi/tabwidget.cpp
@@ -35,7 +35,7 @@
// copyright : (C) 1999-2003 by Falk Brettschneider
// and
// Szymon Stefanek (stefanek@tin.it)
- // email : falkbr@kdevelop.org (Falk Brettschneider)
+ // email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
*/
diff --git a/kmdi/kmdi/tabwidget.h b/kmdi/kmdi/tabwidget.h
index 04e8f3c2..61f9e7d3 100644
--- a/kmdi/kmdi/tabwidget.h
+++ b/kmdi/kmdi/tabwidget.h
@@ -35,7 +35,7 @@
// copyright : (C) 1999-2003 by Falk Brettschneider
// and
// Szymon Stefanek (stefanek@tin.it)
- // email : falkbr@kdevelop.org (Falk Brettschneider)
+ // email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
*/
diff --git a/kmdi/kmdichildarea.cpp b/kmdi/kmdichildarea.cpp
index b65f6943..684c799d 100644
--- a/kmdi/kmdichildarea.cpp
+++ b/kmdi/kmdichildarea.cpp
@@ -13,7 +13,7 @@
// copyright : (C) 1999-2003 by Szymon Stefanek (stefanek@tin.it)
// and
// Falk Brettschneider
-// email : falkbr@kdevelop.org (Falk Brettschneider)
+// email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
//
//----------------------------------------------------------------------------
diff --git a/kmdi/kmdichildarea.h b/kmdi/kmdichildarea.h
index 2e4faf6e..747919a4 100644
--- a/kmdi/kmdichildarea.h
+++ b/kmdi/kmdichildarea.h
@@ -13,7 +13,7 @@
// copyright : (C) 1999-2003 by Falk Brettschneider
// and
// Szymon Stefanek (stefanek@tin.it)
-// email : falkbr@kdevelop.org (Falk Brettschneider)
+// email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
//
//----------------------------------------------------------------------------
diff --git a/kmdi/kmdichildfrm.cpp b/kmdi/kmdichildfrm.cpp
index 1345493c..c3e4fb9a 100644
--- a/kmdi/kmdichildfrm.cpp
+++ b/kmdi/kmdichildfrm.cpp
@@ -15,7 +15,7 @@
// copyright : (C) 1999-2003 by Szymon Stefanek (stefanek@tin.it)
// and
// Falk Brettschneider
-// email : falkbr@kdevelop.org (Falk Brettschneider)
+// email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
//
//----------------------------------------------------------------------------
diff --git a/kmdi/kmdichildfrm.h b/kmdi/kmdichildfrm.h
index 4d5f6b3b..0fe2cd2b 100644
--- a/kmdi/kmdichildfrm.h
+++ b/kmdi/kmdichildfrm.h
@@ -14,7 +14,7 @@
// copyright : (C) 1999-2003 by Falk Brettschneider
// and
// Szymon Stefanek (stefanek@tin.it)
-// email : falkbr@kdevelop.org (Falk Brettschneider)
+// email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
//
//----------------------------------------------------------------------------
diff --git a/kmdi/kmdichildfrmcaption.cpp b/kmdi/kmdichildfrmcaption.cpp
index f14b03e6..062fa626 100644
--- a/kmdi/kmdichildfrmcaption.cpp
+++ b/kmdi/kmdichildfrmcaption.cpp
@@ -13,7 +13,7 @@
// copyright : (C) 1999-2003 by Szymon Stefanek (stefanek@tin.it)
// and
// Falk Brettschneider
-// email : falkbr@kdevelop.org (Falk Brettschneider)
+// email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
//
//----------------------------------------------------------------------------
diff --git a/kmdi/kmdichildfrmcaption.h b/kmdi/kmdichildfrmcaption.h
index 1c5ec0c8..0a209bcd 100644
--- a/kmdi/kmdichildfrmcaption.h
+++ b/kmdi/kmdichildfrmcaption.h
@@ -13,7 +13,7 @@
// copyright : (C) 1999-2003 by Falk Brettschneider
// and
// Szymon Stefanek (stefanek@tin.it)
-// email : falkbr@kdevelop.org (Falk Brettschneider)
+// email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
//
//----------------------------------------------------------------------------
diff --git a/kmdi/kmdichildview.cpp b/kmdi/kmdichildview.cpp
index cda168fb..41f9974f 100644
--- a/kmdi/kmdichildview.cpp
+++ b/kmdi/kmdichildview.cpp
@@ -17,7 +17,7 @@
// copyright : (C) 1999-2003 by Szymon Stefanek (stefanek@tin.it)
// and
// Falk Brettschneider
-// email : falkbr@kdevelop.org (Falk Brettschneider)
+// email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
//
//----------------------------------------------------------------------------
diff --git a/kmdi/kmdichildview.h b/kmdi/kmdichildview.h
index 1c1f2a1c..11e74259 100644
--- a/kmdi/kmdichildview.h
+++ b/kmdi/kmdichildview.h
@@ -17,7 +17,7 @@
// copyright : (C) 1999-2003 by Falk Brettschneider
// and
// Szymon Stefanek (stefanek@tin.it)
-// email : falkbr@kdevelop.org (Falk Brettschneider)
+// email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
//
//----------------------------------------------------------------------------
diff --git a/kmdi/kmdidefines.h b/kmdi/kmdidefines.h
index 16be290a..8673876a 100644
--- a/kmdi/kmdidefines.h
+++ b/kmdi/kmdidefines.h
@@ -13,7 +13,7 @@
// copyright : (C) 1999-2003 by Falk Brettschneider
// and
// Szymon Stefanek (stefanek@tin.it)
-// email : falkbr@kdevelop.org (Falk Brettschneider)
+// email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
//
//----------------------------------------------------------------------------
@@ -27,7 +27,7 @@
#ifndef _KMDI_DEFINES_H_
#define _KMDI_DEFINES_H_
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#define KMDI_CHILDFRM_SEPARATOR 2
#define KMDI_CHILDFRM_BORDER 4
diff --git a/kmdi/kmdifocuslist.h b/kmdi/kmdifocuslist.h
index aafb7095..8de19bf3 100644
--- a/kmdi/kmdifocuslist.h
+++ b/kmdi/kmdifocuslist.h
@@ -21,7 +21,7 @@
#include <tqobject.h>
#include <tqmap.h>
#include <tqwidget.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KMDI_EXPORT KMdiFocusList: public TQObject
{
diff --git a/kmdi/kmdiguiclient.cpp b/kmdi/kmdiguiclient.cpp
index f65a21f4..4ac95c4f 100644
--- a/kmdi/kmdiguiclient.cpp
+++ b/kmdi/kmdiguiclient.cpp
@@ -31,7 +31,7 @@
#include <assert.h>
#include <kdebug.h>
#include <kdockwidget.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include "kmdimainfrm.h"
#include "kmditoolviewaccessor.h"
#include "kmditoolviewaccessor_p.h"
diff --git a/kmdi/kmdiiterator.h b/kmdi/kmdiiterator.h
index 6bb6f7ea..0b0ec235 100644
--- a/kmdi/kmdiiterator.h
+++ b/kmdi/kmdiiterator.h
@@ -12,7 +12,7 @@
// copyright : (C) 1999-2003 by Massimo Morin (mmorin@schedsys.com)
// and
// Falk Brettschneider
-// email : falkbr@kdevelop.org (Falk Brettschneider)
+// email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
//
//----------------------------------------------------------------------------
diff --git a/kmdi/kmdilistiterator.h b/kmdi/kmdilistiterator.h
index 9e788b28..2bc5d6bc 100644
--- a/kmdi/kmdilistiterator.h
+++ b/kmdi/kmdilistiterator.h
@@ -12,7 +12,7 @@
// copyright : (C) 1999-2003 by Massimo Morin (mmorin@schedsys.com)
// and
// Falk Brettschneider
-// email : falkbr@kdevelop.org (Falk Brettschneider)
+// email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
//
//----------------------------------------------------------------------------
diff --git a/kmdi/kmdimainfrm.cpp b/kmdi/kmdimainfrm.cpp
index 8fd8530f..4ac49df4 100644
--- a/kmdi/kmdimainfrm.cpp
+++ b/kmdi/kmdimainfrm.cpp
@@ -16,7 +16,7 @@
// copyright : (C) 1999-2003 by Szymon Stefanek (stefanek@tin.it)
// and
// Falk Brettschneider
-// email : falkbr@kdevelop.org (Falk Brettschneider)
+// email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
//
//----------------------------------------------------------------------------
@@ -46,7 +46,7 @@
#include <kmenubar.h>
#include <kapplication.h>
#include <kdebug.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <tqtabwidget.h>
#include <klocale.h>
#include <kstdaccel.h>
diff --git a/kmdi/kmdimainfrm.h b/kmdi/kmdimainfrm.h
index 38cef9f4..5143c8c6 100644
--- a/kmdi/kmdimainfrm.h
+++ b/kmdi/kmdimainfrm.h
@@ -16,7 +16,7 @@
// copyright : (C) 1999-2003 by Falk Brettschneider
// and
// Szymon Stefanek (stefanek@tin.it)
-// email : falkbr@kdevelop.org (Falk Brettschneider)
+// email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
//
//----------------------------------------------------------------------------
diff --git a/kmdi/kmdinulliterator.h b/kmdi/kmdinulliterator.h
index 3c976caa..ffa375d3 100644
--- a/kmdi/kmdinulliterator.h
+++ b/kmdi/kmdinulliterator.h
@@ -12,7 +12,7 @@
// copyright : (C) 1999-2003 by Massimo Morin (mmorin@schedsys.com)
// and
// Falk Brettschneider
-// email : falkbr@kdevelop.org (Falk Brettschneider)
+// email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
//
//----------------------------------------------------------------------------
diff --git a/kmdi/kmditaskbar.cpp b/kmdi/kmditaskbar.cpp
index 20034480..4ccda67e 100644
--- a/kmdi/kmditaskbar.cpp
+++ b/kmdi/kmditaskbar.cpp
@@ -14,7 +14,7 @@
// copyright : (C) 1999-2003 by Szymon Stefanek (stefanek@tin.it)
// and
// Falk Brettschneider
-// email : falkbr@kdevelop.org (Falk Brettschneider)
+// email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
//
//----------------------------------------------------------------------------
diff --git a/kmdi/kmditaskbar.h b/kmdi/kmditaskbar.h
index de6f0f51..35393b73 100644
--- a/kmdi/kmditaskbar.h
+++ b/kmdi/kmditaskbar.h
@@ -13,7 +13,7 @@
// copyright : (C) 1999-2003 by Falk Brettschneider
// and
// Szymon Stefanek (stefanek@tin.it)
-// email : falkbr@kdevelop.org (Falk Brettschneider)
+// email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
//
//----------------------------------------------------------------------------
diff --git a/kmdi/test/main.cpp b/kmdi/test/main.cpp
index 768fd087..7a1cab88 100644
--- a/kmdi/test/main.cpp
+++ b/kmdi/test/main.cpp
@@ -13,7 +13,7 @@
// copyright : (C) 1999-2000 by Szymon Stefanek (stefanek@tin.it)
// and
// Falk Brettschneider
-// email : falkbr@kdevelop.org (Falk Brettschneider)
+// email : falkbr@tdevelop.org (Falk Brettschneider)
//----------------------------------------------------------------------------
//
//----------------------------------------------------------------------------
diff --git a/kmdi/test/mainwidget.cpp b/kmdi/test/mainwidget.cpp
index e1be80cd..e8aa8da1 100644
--- a/kmdi/test/mainwidget.cpp
+++ b/kmdi/test/mainwidget.cpp
@@ -3,7 +3,7 @@
-------------------
begin : Mon Nov 8 1999
copyright : (C) 1999 by Falk Brettschneider
- email : falkbr@kdevelop.org
+ email : falkbr@tdevelop.org
***************************************************************************/
/***************************************************************************
diff --git a/kmdi/test/mainwidget.h b/kmdi/test/mainwidget.h
index 022a3b36..95351200 100644
--- a/kmdi/test/mainwidget.h
+++ b/kmdi/test/mainwidget.h
@@ -3,7 +3,7 @@
-------------------
begin : Mon Nov 8 1999
copyright : (C) 1999 by Falk Brettschneider
- email : falkbr@kdevelop.org
+ email : falkbr@tdevelop.org
***************************************************************************/
/***************************************************************************
diff --git a/kparts/COMMENTS b/kparts/COMMENTS
index e3e4d858..80e5671d 100644
--- a/kparts/COMMENTS
+++ b/kparts/COMMENTS
@@ -28,7 +28,7 @@ In this case, yes, that could be saved in the part.
--------------
4) Perhaps a part wants to know if it got activated, so we might want to
- re-introduce that PartActivateEvent from kdelibs/kparts.
+ re-introduce that PartActivateEvent from tdelibs/kparts.
Question: Shall this event be sent when the GUI of the part is activated
or shall it be sent when the part "really" got activated (via KPartManager)?
@@ -90,7 +90,7 @@ it is embedded (with or without GUI items). Hmmm..
Loading and saving in that case would mean save/load the view profile.
(David) Hmmm... somebody wanting to embed a full konqy ? Component technology allows
-you to avoid duplicate code by embedding a component that does what you want. Like kdevelop
+you to avoid duplicate code by embedding a component that does what you want. Like tdevelop
embeds a kedit component. Which app would want to embed a huge component containing
a file maneger + a web browser + a generic viewer + ... ? I think this is not a component,
but an application. Views are components...
@@ -140,7 +140,7 @@ the whole, at other places).
(David) Depends how we want to handle the popupmenu in KonqHTMLView, for
instance.
At the moment it's missing, and it will be a problem when that view is moved to
-kdelibs : no more libkonq for it. But anyway I agree : the part should
+tdelibs : no more libkonq for it. But anyway I agree : the part should
generally take care of its own menu (I'm thinking of KNotePadPart for instance)
Perhaps this would remain in KBrowserPart though (we need it in konqueror).
@@ -331,7 +331,7 @@ changes.
<dfaure> well I think _yes_ you would expect its actions to become available to the user, no ?
<weis> dfaure: Imagine you write a report generator that shows database queries using the browser view. Would you as a programmer want to have menu entries like "OpenURL" and "History" in your report generator? I would not.
<dfaure> hmmm ... then it's the HTML widget you're using, not the part...
-<dfaure> when kdevelop embeds kwrite, it wants the actions from kwrite...
+<dfaure> when tdevelop embeds kwrite, it wants the actions from kwrite...
<dfaure> open file, save file, ...
<weis> dfaure: Well,. why not load a HTML widget at runtime as a part ...
<dfaure> sure, why not :-)
diff --git a/kparts/browserinterface.h b/kparts/browserinterface.h
index 37e6cef4..302f474d 100644
--- a/kparts/browserinterface.h
+++ b/kparts/browserinterface.h
@@ -4,7 +4,7 @@
#include <tqobject.h>
#include <tqvariant.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KParts
{
diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp
index 5546cdd9..c617a5f9 100644
--- a/kparts/browserrun.cpp
+++ b/kparts/browserrun.cpp
@@ -300,7 +300,7 @@ static TQString makeQuestion( const KURL& url, const TQString& mimeType, const T
BrowserRun::AskSaveResult BrowserRun::askSave( const KURL & url, KService::Ptr offer, const TQString& mimeType, const TQString & suggestedFilename )
{
// SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC
- // NOTE: Keep this function in sync with kdebase/kcontrol/filetypes/filetypedetails.cpp
+ // NOTE: Keep this function in sync with tdebase/kcontrol/filetypes/filetypedetails.cpp
// FileTypeDetails::updateAskSave()
TQString question = makeQuestion( url, mimeType, suggestedFilename );
@@ -323,7 +323,7 @@ BrowserRun::AskSaveResult BrowserRun::askSave( const KURL & url, KService::Ptr o
BrowserRun::AskSaveResult BrowserRun::askEmbedOrSave( const KURL & url, const TQString& mimeType, const TQString & suggestedFilename, int flags )
{
// SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC
- // NOTE: Keep this funcion in sync with kdebase/kcontrol/filetypes/filetypedetails.cpp
+ // NOTE: Keep this funcion in sync with tdebase/kcontrol/filetypes/filetypedetails.cpp
// FileTypeDetails::updateAskSave()
KMimeType::Ptr mime = KMimeType::mimeType( mimeType );
diff --git a/kparts/event.h b/kparts/event.h
index 001cc0a1..70916dd4 100644
--- a/kparts/event.h
+++ b/kparts/event.h
@@ -22,7 +22,7 @@
#include <tqevent.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQWidget;
diff --git a/kparts/historyprovider.h b/kparts/historyprovider.h
index 91fefd67..1acd8d27 100644
--- a/kparts/historyprovider.h
+++ b/kparts/historyprovider.h
@@ -23,7 +23,7 @@
#include <tqdict.h>
#include <tqobject.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KParts {
diff --git a/kparts/partmanager.h b/kparts/partmanager.h
index ca1ccfea..ba5c726c 100644
--- a/kparts/partmanager.h
+++ b/kparts/partmanager.h
@@ -25,7 +25,7 @@
#include <tqwidget.h>
#include <tqptrlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KInstance;
diff --git a/kparts/statusbarextension.cpp b/kparts/statusbarextension.cpp
index f7da19fe..3e64bcec 100644
--- a/kparts/statusbarextension.cpp
+++ b/kparts/statusbarextension.cpp
@@ -26,7 +26,7 @@
#include <kstatusbar.h>
#include <kmainwindow.h>
#include <kdebug.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#include <kparts/part.h>
#include <kparts/event.h>
diff --git a/kparts/statusbarextension.h b/kparts/statusbarextension.h
index 81bf6854..fa635a12 100644
--- a/kparts/statusbarextension.h
+++ b/kparts/statusbarextension.h
@@ -24,7 +24,7 @@
#include <tqwidget.h>
#include <tqvaluelist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KStatusBar;
class KMainWindow;
diff --git a/kparts/tests/example.cpp b/kparts/tests/example.cpp
index a1e8110e..7792c5d4 100644
--- a/kparts/tests/example.cpp
+++ b/kparts/tests/example.cpp
@@ -26,7 +26,7 @@ Shell::Shell()
// We can do this "switch active part" because we have a splitter with
// two items in it.
- // I wonder what kdevelop uses/will use to embed kedit, BTW.
+ // I wonder what tdevelop uses/will use to embed kedit, BTW.
m_splitter = new TQSplitter( this );
m_part1 = new Part1(this, m_splitter);
diff --git a/kparts/tests/normalktm.cpp b/kparts/tests/normalktm.cpp
index ec4420a7..bb54521d 100644
--- a/kparts/tests/normalktm.cpp
+++ b/kparts/tests/normalktm.cpp
@@ -20,7 +20,7 @@ Shell::Shell()
{
// We can do this "switch active part" because we have a splitter with
// two items in it.
- // I wonder what kdevelop uses/will use to embed kedit, BTW.
+ // I wonder what tdevelop uses/will use to embed kedit, BTW.
m_splitter = new TQSplitter( this );
m_part1 = new Part1(this, m_splitter);
diff --git a/krandr/libkrandr.h b/krandr/libkrandr.h
index 72dd9d43..f29383f0 100644
--- a/krandr/libkrandr.h
+++ b/krandr/libkrandr.h
@@ -33,7 +33,7 @@
#include <kconfig.h>
#include <ksimpleconfig.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* Simple API covering most of the uses of libkrandr.
diff --git a/krandr/randr.cpp b/krandr/randr.cpp
index 45f89dc0..85f360f5 100644
--- a/krandr/randr.cpp
+++ b/krandr/randr.cpp
@@ -197,7 +197,7 @@ bool RandRScreen::applyProposedAndConfirm()
bool RandRScreen::confirm()
{
// uncomment the line below and edit out the KTimerDialog stuff to get
- // a version which works on today's kdelibs (no accept dialog is presented)
+ // a version which works on today's tdelibs (no accept dialog is presented)
// FIXME remember to put the dialog on the right screen
@@ -780,7 +780,7 @@ bool RandRDisplay::showTestConfigurationDialog()
bool RandRScreen::showTestConfigurationDialog()
{
// uncomment the line below and edit out the KTimerDialog stuff to get
- // a version which works on today's kdelibs (no accept dialog is presented)
+ // a version which works on today's tdelibs (no accept dialog is presented)
// FIXME remember to put the dialog on the right screen
diff --git a/kresources/README.design b/kresources/README.design
index 2a34ca8b..beafa0bf 100644
--- a/kresources/README.design
+++ b/kresources/README.design
@@ -5,7 +5,7 @@ KDE RESOURCES
-------------
The KDE Resource framework can be used to manage resources of
different types, organized in families. The Resource framework is
-currently used for addressbook resources in kdelibs/kabc and for
+currently used for addressbook resources in tdelibs/kabc and for
calendar resources in libkcal.
A resource family represents stores of information of a certain kind
(appointments, contacts). A resource type class represents a way in
diff --git a/kspell2/client.h b/kspell2/client.h
index f06b760b..5bc5a2bb 100644
--- a/kspell2/client.h
+++ b/kspell2/client.h
@@ -26,7 +26,7 @@
#include <tqstringlist.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KSpell2
{
diff --git a/kspell2/filter.h b/kspell2/filter.h
index 5e463549..c89ce6fc 100644
--- a/kspell2/filter.h
+++ b/kspell2/filter.h
@@ -24,7 +24,7 @@
#define KSPELL_FILTER_H
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KSpell2
{
diff --git a/kspell2/settings.h b/kspell2/settings.h
index d351f971..2346f077 100644
--- a/kspell2/settings.h
+++ b/kspell2/settings.h
@@ -24,7 +24,7 @@
#include <tqstringlist.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KSharedConfig;
diff --git a/kspell2/tests/backgroundtest.cpp b/kspell2/tests/backgroundtest.cpp
index db9ad9a6..8050115a 100644
--- a/kspell2/tests/backgroundtest.cpp
+++ b/kspell2/tests/backgroundtest.cpp
@@ -105,9 +105,9 @@ seems sensible.\
Building \
========\
\
-This code needs to live in a subdir off the khtml directory in kdelibs. The\
+This code needs to live in a subdir off the khtml directory in tdelibs. The\
subdir should be called 'xpath'. The easiest way to regenerate the makefiles\
-is to go to the root of the kdelibs tree and run: \
+is to go to the root of the tdelibs tree and run: \
create_makefiles khtml/xpath\
\
This code is intended to compile, but not to work.\
diff --git a/kspell2/ui/configwidget.h b/kspell2/ui/configwidget.h
index e51be6b8..e3fd1542 100644
--- a/kspell2/ui/configwidget.h
+++ b/kspell2/ui/configwidget.h
@@ -22,7 +22,7 @@
#define KSPELL_CONFIGWIDGET_H
#include <tqwidget.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KSpell2
{
diff --git a/kunittest/runner.h b/kunittest/runner.h
index 1e0c1ec7..5ed386b0 100644
--- a/kunittest/runner.h
+++ b/kunittest/runner.h
@@ -40,7 +40,7 @@ using namespace std;
#include <tqasciidict.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#include "tester.h"
diff --git a/kunittest/samplemodule.h b/kunittest/samplemodule.h
index b9def68f..b5fd2bcd 100644
--- a/kunittest/samplemodule.h
+++ b/kunittest/samplemodule.h
@@ -27,7 +27,7 @@
#define SAMPLETESTMODULE_H
#include "tester.h"
-// Outside of kdelibs you would use: #include <kunittest/tester.h>
+// Outside of tdelibs you would use: #include <kunittest/tester.h>
class SampleTester : public KUnitTest::Tester
{
diff --git a/kunittest/tester.h b/kunittest/tester.h
index 0b4dc382..278f0d18 100644
--- a/kunittest/tester.h
+++ b/kunittest/tester.h
@@ -53,9 +53,9 @@
* You are responsible for what you do with it though. It
* is licensed under a BSD license - read the top of each file.
*
- * All the GUI related stuff is in kdesdk/kunittest, the core libraries are in kdelibs/kunittest.
+ * All the GUI related stuff is in tdesdk/kunittest, the core libraries are in tdelibs/kunittest.
* A simple example modules is in kdelisbs/kunittest/samplemodule.{h,cpp}, however more examples
- * can be found in kdesdk/kunittest/example.
+ * can be found in tdesdk/kunittest/example.
*
* There are roughly two ways to use the KUnitTest library. Either you create dynamically
* loadable modules and use the kunittestmodrunner or kunittestguimodrunner programs to run
@@ -67,7 +67,7 @@
* them.
* @li runnergui.{h,cpp} - the GUI wrapper around the runner. The GUI neatly organizes the
* test results. With the kunittest helper script it can even add the debug output
- * to the test results. For this you need to have the kdesdk module installed.
+ * to the test results. For this you need to have the tdesdk module installed.
* @li tester.h - which holds the base of a pure test object (Tester).
* @li module.h - defines macros to create a dynamically loadable module.
*
@@ -314,7 +314,7 @@ SampleTest - 1 test passed, 1 test failed
* @li kunittestmod --folder [folder] --query [query] : Loads and runs all modules in the folder matching the query. Use a GUI.
* @li kunittest_debughelper [dcopobject] : A PERL script that is able to redirect debug output to a RunnerGUI instance.
*
- * These scripts are part of the kdesdk/kunittest module.
+ * These scripts are part of the tdesdk/kunittest module.
*/
/*!
@@ -329,7 +329,7 @@ using namespace std;
#include <tqstringlist.h>
#include <tqasciidict.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/*! @def CHECK(x,y)
* Use this macro to perform an equality check. For example
diff --git a/kutils/kcmodulecontainer.cpp b/kutils/kcmodulecontainer.cpp
index e75ecc3c..c613e438 100644
--- a/kutils/kcmodulecontainer.cpp
+++ b/kutils/kcmodulecontainer.cpp
@@ -125,7 +125,7 @@ void KCModuleContainer::addModule( const TQString& module )
{
/* In case it doesn't exist we just silently drop it.
* This allows people to easily extend containers.
- * For example, KCM monitor gamma can be in kdegraphics.
+ * For example, KCM monitor gamma can be in tdegraphics.
*/
if ( !KService::serviceByDesktopName( module ) )
{
diff --git a/kutils/kcmoduleproxy.h b/kutils/kcmoduleproxy.h
index ff2b0657..1848d903 100644
--- a/kutils/kcmoduleproxy.h
+++ b/kutils/kcmoduleproxy.h
@@ -25,7 +25,7 @@
#include <tqstringlist.h>
#include <kservice.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KAboutData;
class KCModule;
diff --git a/kutils/kmultitabbar.h b/kutils/kmultitabbar.h
index 0cbbe075..a3533b2b 100644
--- a/kutils/kmultitabbar.h
+++ b/kutils/kmultitabbar.h
@@ -33,7 +33,7 @@
#include <tqptrlist.h>
#include <tqpushbutton.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQPixmap;
class TQPainter;
diff --git a/kutils/kpluginselector.h b/kutils/kpluginselector.h
index bf351d9e..27890679 100644
--- a/kutils/kpluginselector.h
+++ b/kutils/kpluginselector.h
@@ -23,7 +23,7 @@
#include <tqwidget.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KInstance;
class KPluginInfo;
diff --git a/kutils/kpluginselector_p.h b/kutils/kpluginselector_p.h
index b915aae7..eb509a41 100644
--- a/kutils/kpluginselector_p.h
+++ b/kutils/kpluginselector_p.h
@@ -22,7 +22,7 @@
#include <tqwidget.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KConfigGroup;
class TQListViewItem;
diff --git a/kutils/ksettings/dispatcher.h b/kutils/ksettings/dispatcher.h
index 8bbe79fc..a35cfc14 100644
--- a/kutils/ksettings/dispatcher.h
+++ b/kutils/ksettings/dispatcher.h
@@ -22,7 +22,7 @@
#include <tqobject.h>
#include <tqmap.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQCString;
class TQSignal;
diff --git a/kutils/ksettings/pluginpage.h b/kutils/ksettings/pluginpage.h
index acd0ace1..6f6fdda8 100644
--- a/kutils/ksettings/pluginpage.h
+++ b/kutils/ksettings/pluginpage.h
@@ -21,7 +21,7 @@
#define KSETTINGS_PLUGINPAGE_H
#include <kcmodule.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KPluginSelector;
diff --git a/kwallet/client/kwallet.cc b/kwallet/client/kwallet.cc
index 9fb47641..a823a06d 100644
--- a/kwallet/client/kwallet.cc
+++ b/kwallet/client/kwallet.cc
@@ -22,7 +22,7 @@
#include "kwallet.h"
#include <kconfig.h>
#include <kdebug.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <dcopclient.h>
#include <dcopref.h>
#include <tqpopupmenu.h>
diff --git a/libkmid/deviceman.h b/libkmid/deviceman.h
index 463bbfba..8bd0728a 100644
--- a/libkmid/deviceman.h
+++ b/libkmid/deviceman.h
@@ -24,7 +24,7 @@
#define DEVICEMAN_H
#include <libkmid/dattypes.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class MidiOut;
class MidiMapper;
diff --git a/libkmid/libkmid.h b/libkmid/libkmid.h
index 45f41bd7..53f76509 100644
--- a/libkmid/libkmid.h
+++ b/libkmid/libkmid.h
@@ -27,7 +27,7 @@
#ifdef __cplusplus
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* Simple API covering most of the uses of libkmid.
diff --git a/libkmid/midfile.h b/libkmid/midfile.h
index 843e4fc4..18687b25 100644
--- a/libkmid/midfile.h
+++ b/libkmid/midfile.h
@@ -27,7 +27,7 @@
#include <libkmid/dattypes.h>
#include <libkmid/track.h>
#include <stdio.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* Contains all the information about a MIDI file.
diff --git a/libkmid/midimapper.h b/libkmid/midimapper.h
index 702c104c..0edefdee 100644
--- a/libkmid/midimapper.h
+++ b/libkmid/midimapper.h
@@ -26,7 +26,7 @@
#include <stdio.h>
#include <libkmid/dattypes.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#define KM_NAME_SIZE 30
diff --git a/libkmid/mt32togm.h b/libkmid/mt32togm.h
index 1da38a2f..74fb2787 100644
--- a/libkmid/mt32togm.h
+++ b/libkmid/mt32togm.h
@@ -24,7 +24,7 @@
#ifndef _MT32TOGM_H
#define _MT32TOGM_H
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
extern int KMID_EXPORT MT32toGM[128];
diff --git a/libkmid/notearray.h b/libkmid/notearray.h
index d462b06b..b09e0dd1 100644
--- a/libkmid/notearray.h
+++ b/libkmid/notearray.h
@@ -25,7 +25,7 @@
#define NOTEARRAY_H
#include <libkmid/dattypes.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* Holds a resizeable array of note on/off and patch change events. It can
diff --git a/libkscreensaver/kscreensaver.h b/libkscreensaver/kscreensaver.h
index 2879172a..de23f843 100644
--- a/libkscreensaver/kscreensaver.h
+++ b/libkscreensaver/kscreensaver.h
@@ -23,7 +23,7 @@
#include <tqwidget.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQTimer;
class KScreenSaverPrivate;
diff --git a/networkstatus/networkstatus.cpp b/networkstatus/networkstatus.cpp
index 1031faf7..ed7c402f 100644
--- a/networkstatus/networkstatus.cpp
+++ b/networkstatus/networkstatus.cpp
@@ -33,7 +33,7 @@
#include "serviceifaceimpl.h"
#include "network.h"
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kdemacros.h>
#if KDE_IS_VERSION( 3,3,90 )
diff --git a/networkstatus/networkstatus.kdevelop b/networkstatus/networkstatus.kdevelop
index 29168abf..543efe32 100644
--- a/networkstatus/networkstatus.kdevelop
+++ b/networkstatus/networkstatus.kdevelop
@@ -1,5 +1,5 @@
<?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
<general>
<author>Will Stephenson</author>
<email>wstephenson@suse.de</email>
@@ -105,4 +105,4 @@
<headerCompletionDelay>250</headerCompletionDelay>
</codecompletion>
</kdevcppsupport>
-</kdevelop>
+</tdevelop>
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
index c82e2540..1409c6cd 100644
--- a/tdecore/CMakeLists.txt
+++ b/tdecore/CMakeLists.txt
@@ -47,7 +47,7 @@ install( FILES
kconfigdialogmanager.h kconfigbase.h kdesktopfile.h
kurl.h ksock.h kaboutdata.h kcmdlineargs.h kconfigbackend.h
kapp.h kapplication.h kuniqueapp.h kuniqueapplication.h
- kcharsets.h kdeversion.h kpty.h kprocess.h kprocctrl.h
+ kcharsets.h tdeversion.h kpty.h kprocess.h kprocctrl.h
klocale.h kicontheme.h kiconloader.h kdebug.h twinmodule.h
twin.h krootprop.h kshortcut.h kkeynative.h kaccel.h
kglobalaccel.h kstdaccel.h kshortcutlist.h kcatalogue.h
@@ -66,7 +66,7 @@ install( FILES
kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h
kmanagerselection.h kmountpoint.h kuser.h klockfile.h
kidna.h ktempdir.h kshell.h fixx11h.h kxerrorhandler.h
- kdelibs_export.h kde_file.h ktimezones.h
+ tdelibs_export.h kde_file.h ktimezones.h
${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h
DESTINATION ${INCLUDE_INSTALL_DIR} )
@@ -115,7 +115,7 @@ set( ${target}_SRCS
ksycocafactory.cpp kxmessages.cpp kstartupinfo.cpp
kcatalogue.cpp kasyncio.cpp kmultipledrag.cpp kstaticdeleter.cpp
kappdcopiface.cpp kappdcopiface.skel kclipboard.cpp
- kcheckaccelerators.cpp kdeversion.cpp kdebugdcopiface.cpp
+ kcheckaccelerators.cpp tdeversion.cpp kdebugdcopiface.cpp
kdebugdcopiface.skel kcalendarsystem.cpp kcalendarsystemgregorian.cpp
kcalendarsystemhijri.cpp kcalendarsystemhebrew.cpp
kcalendarsystemfactory.cpp kmacroexpander.cpp kidna.cpp
diff --git a/tdecore/MAINTAINERS b/tdecore/MAINTAINERS
index c052a36d..07a996b2 100644
--- a/tdecore/MAINTAINERS
+++ b/tdecore/MAINTAINERS
@@ -97,7 +97,7 @@ kclipboard.cpp Carsten Pfeiffer <pfeiffer@kde.org> (copyright)
kconfigdialogmanager.cpp
kconfigskeleton.cpp
kdebugdcopiface.cpp Andreas Beckermann (b_mann@gmx.de) (copyright)
-kdeversion.cpp
+tdeversion.cpp
kglobalaccel_win.cpp Ellis Whitehead <ellis@kde.org> (copyright)
kkeyserver_x11.cpp
klockfile.cpp Waldo Bastian <bastian@kde.org> (copyright)
diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am
index a9c44ee1..976307eb 100644
--- a/tdecore/Makefile.am
+++ b/tdecore/Makefile.am
@@ -40,7 +40,7 @@ include_HEADERS = kconfig.h kconfigskeleton.h \
kconfigdata.h ksimpleconfig.h kconfigdialogmanager.h \
kconfigbase.h kdesktopfile.h kurl.h ksock.h kaboutdata.h \
kcmdlineargs.h kconfigbackend.h kapp.h kapplication.h kuniqueapp.h \
- kuniqueapplication.h kcharsets.h kdeversion.h kpty.h kprocess.h \
+ kuniqueapplication.h kcharsets.h tdeversion.h kpty.h kprocess.h \
kprocctrl.h klocale.h kicontheme.h kiconloader.h kdebug.h \
twinmodule.h twin.h krootprop.h kshortcut.h kkeynative.h kaccel.h \
kglobalaccel.h kstdaccel.h kshortcutlist.h kcatalogue.h \
@@ -58,7 +58,7 @@ include_HEADERS = kconfig.h kconfigskeleton.h \
ktypelist.h ksortablevaluelist.h kdebugclasses.h kclipboard.h \
kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h \
kmanagerselection.h kmountpoint.h kuser.h klockfile.h \
- kidna.h ktempdir.h kshell.h fixx11h.h kxerrorhandler.h kdelibs_export.h \
+ kidna.h ktempdir.h kshell.h fixx11h.h kxerrorhandler.h tdelibs_export.h \
kdemacros.h kde_file.h ktimezones.h
libtdefakes_la_SOURCES = fakes.c vsnprintf.c
@@ -112,7 +112,7 @@ libtdecore_la_SOURCES = libintl.cpp kapplication.cpp \
kxmessages.cpp kstartupinfo.cpp kcatalogue.cpp kasyncio.cpp \
kmultipledrag.cpp kstaticdeleter.cpp kappdcopiface.cpp \
kappdcopiface.skel kclipboard.cpp kcheckaccelerators.cpp \
- kdeversion.cpp kdebugdcopiface.cpp kdebugdcopiface.skel \
+ tdeversion.cpp kdebugdcopiface.cpp kdebugdcopiface.skel \
kcalendarsystem.cpp kcalendarsystemgregorian.cpp \
kcalendarsystemhijri.cpp kcalendarsystemhebrew.cpp \
kcalendarsystemfactory.cpp kmacroexpander.cpp kidna.cpp \
@@ -130,7 +130,7 @@ libtdecore_la_NMCHECKWEAK = $(srcdir)/libtdecore_weak.nmcheck $(srcdir)/libqt-mt
libtdecore_la_METASOURCES = AUTO
-SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/tdecore
+SRCDOC_DEST=$(kde_htmldir)/en/tdelibs/tdecore
kdebugdir = $(kde_confdir)
kdebug_DATA = kdebug.areas kdebugrc language.codes
@@ -154,7 +154,7 @@ install-data-local:
uninstall-local:
-rm -f $(DESTDIR)$(includedir)/kio/kmdcodec.h
-# If you add a color palette file here, please change kdelibs/tdeui/kcolordialog.cpp too to allow to translate the name
+# If you add a color palette file here, please change tdelibs/tdeui/kcolordialog.cpp too to allow to translate the name
colors_DATA = 40.colors Web.colors Royal.colors Rainbow.colors
colorsdir = $(kde_confdir)/colors
diff --git a/tdecore/README.kstartupinfo b/tdecore/README.kstartupinfo
index cbb6a6df..cd02cce6 100644
--- a/tdecore/README.kstartupinfo
+++ b/tdecore/README.kstartupinfo
@@ -68,7 +68,7 @@ MapNotify=<bool>
- this key is obsolete
- true is equivalent to X-KDE-StartupNotify=true and no X-KDE-WMClass set
- false is equivalent to X-KDE-StartupNotify=true and X-KDE-WMClass=0
- - many .desktop files in KDE ( especially in kdebase/kappfinder )
+ - many .desktop files in KDE ( especially in tdebase/kappfinder )
seem to have MapNotify=false even though it's not needed, this
needs to be checked and replaced by the needed X-KDE-* values,
often just X-KDE-StartupNotify=true should be enough
@@ -88,7 +88,7 @@ The KStartupInfo classes :
--------------------------
In some cases, or if you are interested in getting the ASN information, you
-have to use the KStartupInfo classes in kdelibs/tdecore.
+have to use the KStartupInfo classes in tdelibs/tdecore.
Receiving the application startup notification information :
------------------------------------------------------------
@@ -147,7 +147,7 @@ update the ASN info when necessary, e.g. when KUniqueApplication
forks into background, it sends the PID change. That's how compliant
applications should work, and this support for ASN should be provided
by toolkits. All KDE application should be compliant by now, since
-kdelibs do all the necessary things. The KDE_STARTUP_ENV variable
+tdelibs do all the necessary things. The KDE_STARTUP_ENV variable
is read and unset in KApplication constructor, and _KDE_STARTUP_ID
is set on every toplevel window in KApplication::setTopWidget().
However, majority of applications aren't compliant now, and even
diff --git a/tdecore/fakes.c b/tdecore/fakes.c
index b64f55d2..44c63d37 100644
--- a/tdecore/fakes.c
+++ b/tdecore/fakes.c
@@ -19,7 +19,7 @@
Boston, MA 02110-1301, USA.
*/
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
#include <config.h>
diff --git a/tdecore/kaccel.cpp b/tdecore/kaccel.cpp
index b1fe773c..1abc8d38 100644
--- a/tdecore/kaccel.cpp
+++ b/tdecore/kaccel.cpp
@@ -572,7 +572,7 @@ bool KAccel::insertItem( const TQString& sLabel, const TQString& sAction,
return pAction != 0;
}
-// Used in kdeutils/kjots
+// Used in tdeutils/kjots
bool KAccel::insertStdItem( KStdAccel::StdAccel id, const TQString& sLabel )
{
KAccelAction* pAction = d->insert( KStdAccel::name( id ), sLabel, TQString::null,
diff --git a/tdecore/kaccel.h b/tdecore/kaccel.h
index b223be9b..7f24a5e7 100644
--- a/tdecore/kaccel.h
+++ b/tdecore/kaccel.h
@@ -23,7 +23,7 @@
#include <tqaccel.h>
#include <kshortcut.h>
#include <kstdaccel.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class TQPopupMenu; // for obsolete insertItem() methods below
class TQWidget;
diff --git a/tdecore/kaccelmanager.h b/tdecore/kaccelmanager.h
index 69846dad..29304803 100644
--- a/tdecore/kaccelmanager.h
+++ b/tdecore/kaccelmanager.h
@@ -25,7 +25,7 @@
class TQWidget;
class TQString;
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* KDE Accelerator manager.
diff --git a/tdecore/kallocator.h b/tdecore/kallocator.h
index 2d5d39f2..abc4c4b6 100644
--- a/tdecore/kallocator.h
+++ b/tdecore/kallocator.h
@@ -27,7 +27,7 @@
#define KALLOCATOR_H
#include <tqvaluelist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KZoneAllocatorPrivate;
diff --git a/tdecore/kappdcopiface.h b/tdecore/kappdcopiface.h
index 76e62ca6..187c9f5a 100644
--- a/tdecore/kappdcopiface.h
+++ b/tdecore/kappdcopiface.h
@@ -24,7 +24,7 @@
#include <tqstringlist.h>
#include <tqcstring.h>
#include <dcopref.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KApplication;
diff --git a/tdecore/kapplication.h b/tdecore/kapplication.h
index 014b1cad..894b6857 100644
--- a/tdecore/kapplication.h
+++ b/tdecore/kapplication.h
@@ -22,8 +22,8 @@
#define _KAPP_H
// Version macros. Never put this further down.
-#include "kdeversion.h"
-#include "kdelibs_export.h"
+#include "tdeversion.h"
+#include "tdelibs_export.h"
class KConfig;
class KCharsets;
@@ -1078,7 +1078,7 @@ public:
/**
* Updates the last user action timestamp to the given time, or to the current time,
* if 0 is given. Do not use unless you're really sure what you're doing.
- * Consult focus stealing prevention section in kdebase/twin/README.
+ * Consult focus stealing prevention section in tdebase/twin/README.
* @since 3.2
*/
void updateUserTimestamp( unsigned long time = 0 );
@@ -1095,7 +1095,7 @@ public:
* to the given time, or to this application's user time, if 0 is given.
* Use before causing user interaction in the remote application, e.g. invoking a dialog
* in the application using a DCOP call.
- * Consult focus stealing prevention section in kdebase/twin/README.
+ * Consult focus stealing prevention section in tdebase/twin/README.
* @since 3.3
*/
void updateRemoteUserTimestamp( const TQCString& dcopId, unsigned long time = 0 );
diff --git a/tdecore/kasyncio.h b/tdecore/kasyncio.h
index f72bbffd..dbe7cd60 100644
--- a/tdecore/kasyncio.h
+++ b/tdecore/kasyncio.h
@@ -23,7 +23,7 @@
#include <tqobject.h>
#include <tqiodevice.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
#ifdef Q_MOC_RUN
#define USE_QT4
diff --git a/tdecore/kaudioplayer.h b/tdecore/kaudioplayer.h
index f9a8c0ca..dae00c4c 100644
--- a/tdecore/kaudioplayer.h
+++ b/tdecore/kaudioplayer.h
@@ -24,7 +24,7 @@
#define __KAUDIOPLAYER_H__
#include <tqobject.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KAudioPlayerPrivate;
/**
diff --git a/tdecore/kcalendarsystem.h b/tdecore/kcalendarsystem.h
index 1fbfb017..bd936336 100644
--- a/tdecore/kcalendarsystem.h
+++ b/tdecore/kcalendarsystem.h
@@ -23,7 +23,7 @@
#include <tqdatetime.h>
#include <tqstring.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KLocale;
diff --git a/tdecore/kcalendarsystemfactory.h b/tdecore/kcalendarsystemfactory.h
index 3517d4c8..75b5782e 100644
--- a/tdecore/kcalendarsystemfactory.h
+++ b/tdecore/kcalendarsystemfactory.h
@@ -23,7 +23,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KCalendarSystem;
class KLocale;
diff --git a/tdecore/kcatalogue.cpp b/tdecore/kcatalogue.cpp
index 764cd461..df07fef4 100644
--- a/tdecore/kcatalogue.cpp
+++ b/tdecore/kcatalogue.cpp
@@ -58,7 +58,7 @@ KCatalogue::KCatalogue(const TQString & name, const TQString & language )
d->name = name;
d->language = language;
// at the moment we do not know more. To find out the plural type we first have to look into
- // kdelibs.mo for the language. And for this we already need a catalog object. So this data
+ // tdelibs.mo for the language. And for this we already need a catalog object. So this data
// has to be set after we have the first catalog objects.
d->pluralType = -1;
diff --git a/tdecore/kcatalogue.h b/tdecore/kcatalogue.h
index 2cee80fe..be918789 100644
--- a/tdecore/kcatalogue.h
+++ b/tdecore/kcatalogue.h
@@ -21,7 +21,7 @@
#define KCATALOGUE_H
#include <tqstring.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
struct kde_loaded_l10nfile;
@@ -83,7 +83,7 @@ public:
int pluralType() const;
/**
- * Sets the plural type for the catalog. The caller has probably looked it up in a kdelibs.mo-catalog
+ * Sets the plural type for the catalog. The caller has probably looked it up in a tdelibs.mo-catalog
* for the appropriate language
*
* @return The plural type for the catalog
diff --git a/tdecore/kcharsets.h b/tdecore/kcharsets.h
index d3b4eec4..2816e4fc 100644
--- a/tdecore/kcharsets.h
+++ b/tdecore/kcharsets.h
@@ -23,7 +23,7 @@
#include <tqfont.h>
#include <tqstringlist.h>
#include <tqptrlist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KGlobal;
class KCharsetsPrivate;
diff --git a/tdecore/kcheckaccelerators.h b/tdecore/kcheckaccelerators.h
index 7f25b438..00adf4fd 100644
--- a/tdecore/kcheckaccelerators.h
+++ b/tdecore/kcheckaccelerators.h
@@ -31,7 +31,7 @@
class TQMenuData;
class TQTextView;
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
@internal
diff --git a/tdecore/kclipboard.h b/tdecore/kclipboard.h
index bd6605b6..7facc86f 100644
--- a/tdecore/kclipboard.h
+++ b/tdecore/kclipboard.h
@@ -23,7 +23,7 @@
#include <tqmime.h>
#include <tqobject.h>
#include <tqstrlist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* This class is only for internal use.
diff --git a/tdecore/kcmdlineargs.h b/tdecore/kcmdlineargs.h
index 08a2a661..dc48fc45 100644
--- a/tdecore/kcmdlineargs.h
+++ b/tdecore/kcmdlineargs.h
@@ -19,7 +19,7 @@
#ifndef _KCMDLINEARGS_H_
#define _KCMDLINEARGS_H_
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
#include <kurl.h>
#include <tqptrlist.h>
diff --git a/tdecore/kcompletion.h b/tdecore/kcompletion.h
index e6ac3675..703f2c95 100644
--- a/tdecore/kcompletion.h
+++ b/tdecore/kcompletion.h
@@ -27,7 +27,7 @@
#include <tqstringlist.h>
#include <tqguardedptr.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
#include <kglobalsettings.h>
#include <ksortablevaluelist.h>
#include <kshortcut.h>
diff --git a/tdecore/kconfig_compiler/example/Makefile.am b/tdecore/kconfig_compiler/example/Makefile.am
index 5009a3e6..f7834ba6 100644
--- a/tdecore/kconfig_compiler/example/Makefile.am
+++ b/tdecore/kconfig_compiler/example/Makefile.am
@@ -22,6 +22,6 @@ METASOURCES = AUTO
CLEANFILES = exampleprefs_base.h exampleprefs_base.cpp
-## The example's messages should not go into kdelibs.pot
+## The example's messages should not go into tdelibs.pot
messages: rc.cpp
true
diff --git a/tdecore/kconfigbackend.h b/tdecore/kconfigbackend.h
index cb094720..03655ab2 100644
--- a/tdecore/kconfigbackend.h
+++ b/tdecore/kconfigbackend.h
@@ -26,7 +26,7 @@
#include <kconfigbase.h>
#include <klockfile.h>
#include <klocale.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class TQFile;
class KConfigBackEndPrivate;
diff --git a/tdecore/kconfigbase.h b/tdecore/kconfigbase.h
index 13d2a176..01c758da 100644
--- a/tdecore/kconfigbase.h
+++ b/tdecore/kconfigbase.h
@@ -33,7 +33,7 @@
#include <tqmap.h>
#include "kconfigdata.h"
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KConfigBackEnd;
class KConfigBasePrivate;
diff --git a/tdecore/kconfigdata.h b/tdecore/kconfigdata.h
index 940c5430..f99f72c0 100644
--- a/tdecore/kconfigdata.h
+++ b/tdecore/kconfigdata.h
@@ -23,7 +23,7 @@
#define _KCONFIGDATA_H
#include <tqmap.h> // generic red-black tree class
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* map/dict/list config node entry.
diff --git a/tdecore/kconfigdialogmanager.cpp b/tdecore/kconfigdialogmanager.cpp
index 97e741f6..adebca52 100644
--- a/tdecore/kconfigdialogmanager.cpp
+++ b/tdecore/kconfigdialogmanager.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (C) 2003 Benjamin C Meyer (ben+kdelibs at meyerhome dot net)
+ * Copyright (C) 2003 Benjamin C Meyer (ben+tdelibs at meyerhome dot net)
* Copyright (C) 2003 Waldo Bastian <bastian@kde.org>
*
* This library is free software; you can redistribute it and/or
diff --git a/tdecore/kconfigdialogmanager.h b/tdecore/kconfigdialogmanager.h
index 3c268e48..46c2b03a 100644
--- a/tdecore/kconfigdialogmanager.h
+++ b/tdecore/kconfigdialogmanager.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (C) 2003 Benjamin C Meyer (ben+kdelibs at meyerhome dot net)
+ * Copyright (C) 2003 Benjamin C Meyer (ben+tdelibs at meyerhome dot net)
* Copyright (C) 2003 Waldo Bastian <bastian@kde.org>
*
* This library is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
#include <tqobject.h>
#include <tqptrlist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KConfigSkeleton;
class KConfigSkeletonItem;
@@ -72,7 +72,7 @@ class TQSqlPropertyMap;
* it is modified you should add its signal using addWidgetChangedSignal().
* @since 3.2
- * @author Benjamin C Meyer <ben+kdelibs at meyerhome dot net>
+ * @author Benjamin C Meyer <ben+tdelibs at meyerhome dot net>
* @author Waldo Bastian <bastian@kde.org>
*/
class TDECORE_EXPORT KConfigDialogManager : public TQObject {
diff --git a/tdecore/kcrash.h b/tdecore/kcrash.h
index 197f61f8..790c5fd3 100644
--- a/tdecore/kcrash.h
+++ b/tdecore/kcrash.h
@@ -23,7 +23,7 @@
#define __KCRASH_H
#include <tqstring.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* This class handles segmentation-faults.
diff --git a/tdecore/kdcoppropertyproxy.h b/tdecore/kdcoppropertyproxy.h
index a5b1e4b2..e56cd64c 100644
--- a/tdecore/kdcoppropertyproxy.h
+++ b/tdecore/kdcoppropertyproxy.h
@@ -22,7 +22,7 @@
#include <tqobject.h>
#include <tqcstring.h>
#include <tqvaluelist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KDCOPPropertyProxyPrivate;
/**
diff --git a/tdecore/kde-config.cpp.cmake b/tdecore/kde-config.cpp.cmake
index 1f093fa9..0f6d286d 100644
--- a/tdecore/kde-config.cpp.cmake
+++ b/tdecore/kde-config.cpp.cmake
@@ -113,7 +113,7 @@ void printResult(const TQString &s)
int main(int argc, char **argv)
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KAboutData about("kde-config", "kde-config", "1.0", description, KAboutData::License_GPL, "(C) 2000 Stephan Kulow");
KCmdLineArgs::init( argc, argv, &about);
diff --git a/tdecore/kde-config.cpp.in b/tdecore/kde-config.cpp.in
index 2f56483c..9699c28b 100644
--- a/tdecore/kde-config.cpp.in
+++ b/tdecore/kde-config.cpp.in
@@ -113,7 +113,7 @@ void printResult(const TQString &s)
int main(int argc, char **argv)
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KAboutData about("kde-config", "kde-config", "1.0", description, KAboutData::License_GPL, "(C) 2000 Stephan Kulow");
KCmdLineArgs::init( argc, argv, &about);
diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas
index 03f7a8c9..fa52f5ef 100644
--- a/tdecore/kdebug.areas
+++ b/tdecore/kdebug.areas
@@ -24,12 +24,12 @@
177 tdecore (KConfigSkeleton)
178 tdecore (KConfigDialogManager)
179 tdecore (KNetwork resolver)
-180 tdecore (kdelibs)
+180 tdecore (tdelibs)
200 tdeui (KMainWindow)
220 tdeui (KToolBar)
230 tdeui (KCommand)
-240 tdeui (kdelibs)
-250 kfile (kdelibs)
+240 tdeui (tdelibs)
+250 kfile (tdelibs)
264 tdecore (KIconLoader)
265 tdecore (KIconEffect)
270 tdeui (KRootPixmap)
@@ -56,20 +56,20 @@
711 kutils (KCModuleProxy)
712 kutils (KCModuleInfo)
713 kutils (KCModuleContainer)
-750 kspell (kdelibs)
+750 kspell (tdelibs)
760 kmdi
-780 kcmshell (kdelibs)
-790 kimproxy (kdelibs)
-800 kabapi (kdelibs)
-900 tdesu (kdelibs)
-912 ksmartcard (kdelibs)
+780 kcmshell (tdelibs)
+790 kimproxy (tdelibs)
+800 kabapi (tdelibs)
+900 tdesu (tdelibs)
+912 ksmartcard (tdelibs)
1000 kparts
1001 kparts (mainwindow)
1002 kparts (factory)
-# kdebase
+# tdebase
1201 konqtree
1202 konqueror
1203 libkonq
@@ -90,7 +90,7 @@
1219 media kioslave
1220 remote kioslave
-1400 khelpcenter (kdebase)
+1400 khelpcenter (tdebase)
1401 kcmhelpcenter
1402 khc_indexbuilder
@@ -102,11 +102,11 @@
1432 nspluginviewer (part)
1433 nspluginscan
-# kdeutils
-1501 khexedit (kdeutils)
-1511 kdessh (kdeutils)
-1512 kdepasswd (kdeutils)
-1601 ark (kdeutils)
+# tdeutils
+1501 khexedit (tdeutils)
+1511 kdessh (tdeutils)
+1512 kdepasswd (tdeutils)
+1601 ark (tdeutils)
1901 kfind
1902 kfind (KfindWindow::updateResults)
1903 kfind (KfindTabDialog::createQuery)
@@ -120,21 +120,21 @@
# 2500-2999 Reserved for private use
-# kdeadmin
+# tdeadmin
3000 ksysv
3100 ksysv (model)
-# kdegraphics
-4300 kdvi (kdegraphics)
-4400 kpaint (kdegraphics)
-4500 kghostview (kdegraphics)
+# tdegraphics
+4300 kdvi (tdegraphics)
+4400 kpaint (tdegraphics)
+4500 kghostview (tdegraphics)
4600 kview
4610 kviewviewer
4620 kviewcanvas
4630 kview_plugin
4640 kiconedit
-# kdenetwork
+# tdenetwork
5001 kget
5002 kppp
5003 knode
@@ -147,7 +147,7 @@
5050 libkmime
5051 libkmime (Codecs)
5052 libkmime (Plugin Loader)
-5100 libkdenetwork
+5100 libtdenetwork
5150 libkleopatra
@@ -290,7 +290,7 @@
7127 kio_fish
7128 kio_svn
-# kdesdk
+# tdesdk
8100 kompare
8101 kompare (libs)
8102 kompare (shell)
@@ -304,44 +304,44 @@
8050 cervisia
8051 cervisia (cvsservice)
-# kdevelop
-9000 kdevelop (core)
-9001 kdevelop (grep view)
-9002 kdevelop (doc tree view)
-9003 kdevelop (class view)
-9004 kdevelop (output views)
-9005 kdevelop (class store)
-9006 kdevelop (cvs interface)
-9007 kdevelop (cpp support)
-9008 kdevelop (gcc options)
-9009 kdevelop (astyle)
-9010 kdevelop (appwizard)
-9011 kdevelop (python scripting)
-9012 kdevelop (debugger)
-9013 kdevelop (java support)
-9014 kdevelop (python support)
-9015 kdevelop (script project)
-9016 kdevelop (perl support)
-9017 kdevelop (file view)
-9018 kdevelop (php support)
-9019 kdevelop (fortran support)
-9020 kdevelop (auto project)
-9021 kdevelop (pgi options)
-9022 kdevelop (ctags)
-9023 kdevelop (regexptest)
-9024 kdevelop (trollproject)
-9025 kdevelop (customproject)
-9026 kdevelop (doxygen)
-9027 kdevelop (cvs)
-9028 kdevelop (abbrev)
-9029 kdevelop (filter)
-9030 kdevelop (texttools)
-9031 kdevelop (history)
+# tdevelop
+9000 tdevelop (core)
+9001 tdevelop (grep view)
+9002 tdevelop (doc tree view)
+9003 tdevelop (class view)
+9004 tdevelop (output views)
+9005 tdevelop (class store)
+9006 tdevelop (cvs interface)
+9007 tdevelop (cpp support)
+9008 tdevelop (gcc options)
+9009 tdevelop (astyle)
+9010 tdevelop (appwizard)
+9011 tdevelop (python scripting)
+9012 tdevelop (debugger)
+9013 tdevelop (java support)
+9014 tdevelop (python support)
+9015 tdevelop (script project)
+9016 tdevelop (perl support)
+9017 tdevelop (file view)
+9018 tdevelop (php support)
+9019 tdevelop (fortran support)
+9020 tdevelop (auto project)
+9021 tdevelop (pgi options)
+9022 tdevelop (ctags)
+9023 tdevelop (regexptest)
+9024 tdevelop (trollproject)
+9025 tdevelop (customproject)
+9026 tdevelop (doxygen)
+9027 tdevelop (cvs)
+9028 tdevelop (abbrev)
+9029 tdevelop (filter)
+9030 tdevelop (texttools)
+9031 tdevelop (history)
9032 qeditor
-9033 kdevelop (diff frontend)
-9034 kdevelop (filecreate part)
-9035 kdevelop (konsole part)
-9036 kdevelop (subversion part)
+9033 tdevelop (diff frontend)
+9034 tdevelop (filecreate part)
+9035 tdevelop (konsole part)
+9036 tdevelop (subversion part)
# toys and games
10000 amor
@@ -547,7 +547,7 @@
51000 KIPI (general)
51001 KIPI (loading)
-# kdemultimedia
+# tdemultimedia
60001 kreatecd
60002 kaudiocreator
60005 krec
@@ -558,11 +558,11 @@
67100 kmix
67200 kmid
-# kdebindings
+# tdebindings
70001 dcoppython
80001 kjsembed
-# kdeaddons
+# tdeaddons
90000 vimpart
90010 noatun-plugins (dub)
90020 noatun-plugins (lyrics)
diff --git a/tdecore/kdebug.h b/tdecore/kdebug.h
index fbeefcc4..fc9bb129 100644
--- a/tdecore/kdebug.h
+++ b/tdecore/kdebug.h
@@ -23,7 +23,7 @@
#define _KDEBUG_H_
#include <tqstring.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class TQWidget;
class TQDateTime;
diff --git a/tdecore/kdebugdcopiface.h b/tdecore/kdebugdcopiface.h
index c6100f58..770a5e38 100644
--- a/tdecore/kdebugdcopiface.h
+++ b/tdecore/kdebugdcopiface.h
@@ -22,7 +22,7 @@
#include <dcopobject.h>
#include <dcopref.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* @short DCOP interface to KDebug.
diff --git a/tdecore/kdelibs_export.h b/tdecore/kdelibs_export.h
index 44ac7c2d..b644985b 100644
--- a/tdecore/kdelibs_export.h
+++ b/tdecore/kdelibs_export.h
@@ -27,7 +27,7 @@
#include <tqglobal.h>
#ifdef Q_WS_WIN
-#include <kdelibs_export_win.h>
+#include <tdelibs_export_win.h>
#else /* Q_OS_UNIX */
diff --git a/tdecore/kdesktopfile.h b/tdecore/kdesktopfile.h
index 2d6b251d..ff19981c 100644
--- a/tdecore/kdesktopfile.h
+++ b/tdecore/kdesktopfile.h
@@ -20,7 +20,7 @@
#define _KDESKTOPFILE_H
#include "kconfig.h"
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KDesktopFilePrivate;
diff --git a/tdecore/kdeversion.cpp b/tdecore/kdeversion.cpp
index 8ff80a6b..4dfaec53 100644
--- a/tdecore/kdeversion.cpp
+++ b/tdecore/kdeversion.cpp
@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/
-#include "kdeversion.h"
+#include "tdeversion.h"
unsigned int KDE::version()
{
diff --git a/tdecore/kdeversion.h b/tdecore/kdeversion.h
index a1060ea0..bde3b686 100644
--- a/tdecore/kdeversion.h
+++ b/tdecore/kdeversion.h
@@ -20,7 +20,7 @@
#ifndef _TDE_VERSION_H_
#define _TDE_VERSION_H_
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/*
R <ABI VERSION> . <BUGFIX REVISION> . <SECURITY PATCHLEVEL>
diff --git a/tdecore/kextsock.h b/tdecore/kextsock.h
index 3f6a4641..57f3dc8e 100644
--- a/tdecore/kextsock.h
+++ b/tdecore/kextsock.h
@@ -20,7 +20,7 @@
#ifndef KEXTSOCK_H
#define KEXTSOCK_H
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
#ifdef Q_MOC_RUN
#define Q_OS_UNIX
diff --git a/tdecore/kglobal.h b/tdecore/kglobal.h
index e2f55b00..ca010114 100644
--- a/tdecore/kglobal.h
+++ b/tdecore/kglobal.h
@@ -18,7 +18,7 @@
#ifndef _KGLOBAL_H
#define _KGLOBAL_H
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
#include <kinstance.h> // KDE4: class KInstance is enough here
class KCharsets;
diff --git a/tdecore/kglobalaccel.cpp b/tdecore/kglobalaccel.cpp
index 689b0861..32ed04f3 100644
--- a/tdecore/kglobalaccel.cpp
+++ b/tdecore/kglobalaccel.cpp
@@ -115,7 +115,7 @@ bool KGlobalAccel::setActionEnabled( const TQString& sAction, bool bEnable )
const TQString& KGlobalAccel::configGroup() const
{ return d->configGroup(); }
-// for kdemultimedia/kmix
+// for tdemultimedia/kmix
void KGlobalAccel::setConfigGroup( const TQString& s )
{ d->setConfigGroup( s ); }
diff --git a/tdecore/kglobalsettings.cpp b/tdecore/kglobalsettings.cpp
index 6d2a487d..6ff632f9 100644
--- a/tdecore/kglobalsettings.cpp
+++ b/tdecore/kglobalsettings.cpp
@@ -356,7 +356,7 @@ TQFont KGlobalSettings::generalFont()
if (_generalFont)
return *_generalFont;
- // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+ // Sync default with tdebase/kcontrol/fonts/fonts.cpp
_generalFont = new TQFont("Sans Serif", 10);
_generalFont->setPointSize(10);
_generalFont->setStyleHint(TQFont::SansSerif);
@@ -372,7 +372,7 @@ TQFont KGlobalSettings::fixedFont()
if (_fixedFont)
return *_fixedFont;
- // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+ // Sync default with tdebase/kcontrol/fonts/fonts.cpp
_fixedFont = new TQFont("Monospace", 10);
_fixedFont->setPointSize(10);
_fixedFont->setStyleHint(TQFont::TypeWriter);
@@ -388,7 +388,7 @@ TQFont KGlobalSettings::toolBarFont()
if(_toolBarFont)
return *_toolBarFont;
- // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+ // Sync default with tdebase/kcontrol/fonts/fonts.cpp
_toolBarFont = new TQFont("Sans Serif", 10);
_toolBarFont->setPointSize(10);
_toolBarFont->setStyleHint(TQFont::SansSerif);
@@ -404,7 +404,7 @@ TQFont KGlobalSettings::menuFont()
if(_menuFont)
return *_menuFont;
- // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+ // Sync default with tdebase/kcontrol/fonts/fonts.cpp
_menuFont = new TQFont("Sans Serif", 10);
_menuFont->setPointSize(10);
_menuFont->setStyleHint(TQFont::SansSerif);
@@ -420,7 +420,7 @@ TQFont KGlobalSettings::windowTitleFont()
if(_windowTitleFont)
return *_windowTitleFont;
- // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+ // Sync default with tdebase/kcontrol/fonts/fonts.cpp
_windowTitleFont = new TQFont("Sans Serif", 9, TQFont::Bold);
_windowTitleFont->setPointSize(10);
_windowTitleFont->setStyleHint(TQFont::SansSerif);
@@ -436,7 +436,7 @@ TQFont KGlobalSettings::taskbarFont()
if(_taskbarFont)
return *_taskbarFont;
- // Sync default with kdebase/kcontrol/fonts/fonts.cpp
+ // Sync default with tdebase/kcontrol/fonts/fonts.cpp
_taskbarFont = new TQFont("Sans Serif", 10);
_taskbarFont->setPointSize(10);
_taskbarFont->setStyleHint(TQFont::SansSerif);
diff --git a/tdecore/kglobalsettings.h b/tdecore/kglobalsettings.h
index b4c809f2..5fef2f67 100644
--- a/tdecore/kglobalsettings.h
+++ b/tdecore/kglobalsettings.h
@@ -21,7 +21,7 @@
#include <tqstring.h>
#include <tqcolor.h>
#include <tqfont.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
#define KDE_DEFAULT_SINGLECLICK false
#define KDE_DEFAULT_ICONTEXTROUNDED true
diff --git a/tdecore/kiconeffect.h b/tdecore/kiconeffect.h
index 7aec46b7..299be3d2 100644
--- a/tdecore/kiconeffect.h
+++ b/tdecore/kiconeffect.h
@@ -17,7 +17,7 @@
#include <tqpixmap.h>
#include <tqcolor.h>
#include <tqrect.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class TQWidget;
diff --git a/tdecore/kicontheme.h b/tdecore/kicontheme.h
index 5db2855f..9aa4d8e3 100644
--- a/tdecore/kicontheme.h
+++ b/tdecore/kicontheme.h
@@ -17,7 +17,7 @@
#include <tqstringlist.h>
#include <tqptrlist.h>
#include <tqvaluelist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KConfig;
class KIconThemeDir;
diff --git a/tdecore/kidna.h b/tdecore/kidna.h
index 8d2d7d93..ae174cf7 100644
--- a/tdecore/kidna.h
+++ b/tdecore/kidna.h
@@ -22,7 +22,7 @@
#define _KIDNA_H
#include <tqstring.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
namespace KIDNA {
/**
diff --git a/tdecore/kinstance.h b/tdecore/kinstance.h
index 97434c38..22da3bb3 100644
--- a/tdecore/kinstance.h
+++ b/tdecore/kinstance.h
@@ -29,7 +29,7 @@ class KMimeSourceFactory;
class KSharedConfig;
#include <tqstring.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
diff --git a/tdecore/kipc.h b/tdecore/kipc.h
index 35ba3f18..45e96f19 100644
--- a/tdecore/kipc.h
+++ b/tdecore/kipc.h
@@ -23,7 +23,7 @@
#define __KIPC_h_Included__
#include <tqwindowdefs.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* This class implements a very simple IPC mechanism for KDE. You can send
diff --git a/tdecore/klocale.cpp b/tdecore/klocale.cpp
index 1fae4fba..114746d0 100644
--- a/tdecore/klocale.cpp
+++ b/tdecore/klocale.cpp
@@ -47,7 +47,7 @@
#include <windows.h>
#endif
-static const char * const SYSTEM_MESSAGES = "kdelibs";
+static const char * const SYSTEM_MESSAGES = "tdelibs";
static const char *maincatalogue = 0;
@@ -136,7 +136,7 @@ void KLocale::initMainCatalogues(const TQString & catalog)
// do not use insertCatalogue here, that would already trigger updateCatalogs
d->catalogNames.append( mainCatalogue ); // application catalog
if (mainCatalogue.contains("desktop") == 0 || mainCatalogue.contains("kdesktop") == 1) { //don't bother if we're looking up desktop translations
- d->catalogNames.append( SYSTEM_MESSAGES ); // always include kdelibs.mo
+ d->catalogNames.append( SYSTEM_MESSAGES ); // always include tdelibs.mo
d->catalogNames.append( "kio" ); // always include kio.mo
d->catalogNames.append( "xdg-user-dirs" );
}
@@ -216,7 +216,7 @@ int KLocale::pluralType( const TQString & language )
return pluralType( *it );
}
}
- // kdelibs.mo does not seem to exist for this language
+ // tdelibs.mo does not seem to exist for this language
return -1;
}
@@ -229,7 +229,7 @@ int KLocale::pluralType( const KCatalogue& catalog )
"thd@kde.org and coolo@kde.org, they will tell you. "
"Better leave that out if unsure, the programs will "
"crash!!\nDefinition of PluralForm - to be set by the "
- "translator of kdelibs.po");
+ "translator of tdelibs.po");
TQString pf (catalog.translate( pluralFormString));
if ( pf.isEmpty() ) {
return -1;
@@ -440,10 +440,10 @@ bool KLocale::setLanguage(const TQStringList & languages)
// 1) some empty strings that we have to eliminate
// 2) duplicate entries like in de:fr:de, where we have to keep the first occurrance of a language in order
// to preserve the order of precenence of the user => iterate backwards
- // 3) languages into which the application is not translated. For those languages we should not even load kdelibs.mo or kio.po.
+ // 3) languages into which the application is not translated. For those languages we should not even load tdelibs.mo or kio.po.
// these langugage have to be dropped. Otherwise we get strange side effects, e.g. with Hebrew:
// the right/left switch for languages that write from
- // right to left (like Hebrew or Arabic) is set in kdelibs.mo. If you only have kdelibs.mo
+ // right to left (like Hebrew or Arabic) is set in tdelibs.mo. If you only have tdelibs.mo
// but nothing from appname.mo, you get a mostly English app with layout from right to left.
// That was considered to be a bug by the Hebrew translators.
for( TQStringList::Iterator it = languageList.fromLast();
@@ -672,8 +672,8 @@ void KLocale::updateCatalogues( )
}
// now iterate over all languages and all wanted catalog names and append or create them in the right order
- // the sequence must be e.g. nds/appname nds/kdelibs nds/kio de/appname de/kdelibs de/kio etc.
- // and not nds/appname de/appname nds/kdelibs de/kdelibs etc. Otherwise we would be in trouble with a language
+ // the sequence must be e.g. nds/appname nds/tdelibs nds/kio de/appname de/tdelibs de/kio etc.
+ // and not nds/appname de/appname nds/tdelibs de/tdelibs etc. Otherwise we would be in trouble with a language
// sequende nds,en_US, de. In this case en_US must hide everything below in the language list.
for ( TQStringList::ConstIterator itLangs = d->languageList.begin();
itLangs != d->languageList.end(); ++itLangs)
diff --git a/tdecore/klocale.h b/tdecore/klocale.h
index e94143fb..4359da4a 100644
--- a/tdecore/klocale.h
+++ b/tdecore/klocale.h
@@ -23,7 +23,7 @@
#define _KLOCALE_H
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQStringList;
class TQTextCodec;
@@ -1188,7 +1188,7 @@ private:
void initFormat(KConfig *config);
/**
- * @internal Initializes the catalogs appname, kdelibs and kio for all chosen languages.
+ * @internal Initializes the catalogs appname, tdelibs and kio for all chosen languages.
*
* @param config The configuration object used for init
* @param useEnv True if we should use environment variables
@@ -1283,14 +1283,14 @@ private:
*/
void initPluralTypes( );
/**
- * @internal Find the plural type for a language. Look this up in the corresponding kdelibs.po.
+ * @internal Find the plural type for a language. Look this up in the corresponding tdelibs.po.
*
* @param language The language to examine
*/
int pluralType( const TQString & language );
/**
- * @internal Find the plural type information for a given catalog. This catalog will be a kdelibs.mo. Method
+ * @internal Find the plural type information for a given catalog. This catalog will be a tdelibs.mo. Method
* just exists to make code more readable.
*
* @param language The language to examine
diff --git a/tdecore/kmacroexpander.h b/tdecore/kmacroexpander.h
index 4244efb1..73537a11 100644
--- a/tdecore/kmacroexpander.h
+++ b/tdecore/kmacroexpander.h
@@ -25,7 +25,7 @@
#include <tqstringlist.h>
#include <tqstring.h>
#include <tqmap.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* Abstract base class for the worker classes behind the KMacroExpander namespace
diff --git a/tdecore/kmanagerselection.h b/tdecore/kmanagerselection.h
index 669451e6..5b46488a 100644
--- a/tdecore/kmanagerselection.h
+++ b/tdecore/kmanagerselection.h
@@ -26,7 +26,7 @@ DEALINGS IN THE SOFTWARE.
#define __KMANAGERSELECTION_H
#include <tqobject.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#ifdef Q_MOC_RUN
#define Q_WS_X11
diff --git a/tdecore/kmdcodec.h b/tdecore/kmdcodec.h
index a45cc329..093cdece 100644
--- a/tdecore/kmdcodec.h
+++ b/tdecore/kmdcodec.h
@@ -39,7 +39,7 @@
#include <tqglobal.h>
#include <tqstring.h>
#include <tqiodevice.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* A wrapper class for the most commonly used encoding and
diff --git a/tdecore/kmultipledrag.h b/tdecore/kmultipledrag.h
index 361bdcae..019a3c5e 100644
--- a/tdecore/kmultipledrag.h
+++ b/tdecore/kmultipledrag.h
@@ -24,7 +24,7 @@
#include <tqdragobject.h>
#include <tqvaluelist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KMultipleDragPrivate;
/**
diff --git a/tdecore/knotifyclient.h b/tdecore/knotifyclient.h
index ae7acbb7..eeb5868d 100644
--- a/tdecore/knotifyclient.h
+++ b/tdecore/knotifyclient.h
@@ -18,7 +18,7 @@
#ifndef _KNOTIFY_CLIENT
#define _KNOTIFY_CLIENT
#include <tqstring.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KInstance;
#undef None // X11 headers...
diff --git a/tdecore/kpalette.h b/tdecore/kpalette.h
index 332e34a6..9d48d711 100644
--- a/tdecore/kpalette.h
+++ b/tdecore/kpalette.h
@@ -26,7 +26,7 @@
#include <tqptrlist.h>
#include <tqstring.h>
#include <tqstringlist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KPalettePrivate;
diff --git a/tdecore/kpixmapprovider.h b/tdecore/kpixmapprovider.h
index 362bf32b..009f1ed7 100644
--- a/tdecore/kpixmapprovider.h
+++ b/tdecore/kpixmapprovider.h
@@ -22,7 +22,7 @@
#define KPIXMAPPROVIDER_H
#include <tqpixmap.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* A tiny abstract class with just one method:
diff --git a/tdecore/kprocess.h b/tdecore/kprocess.h
index 17551c87..65496bf1 100644
--- a/tdecore/kprocess.h
+++ b/tdecore/kprocess.h
@@ -27,7 +27,7 @@
#include <tqvaluelist.h>
#include <tqcstring.h>
#include <tqobject.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class TQSocketNotifier;
class KProcessPrivate;
diff --git a/tdecore/kprocio.h b/tdecore/kprocio.h
index 406a0f01..6c3d482b 100644
--- a/tdecore/kprocio.h
+++ b/tdecore/kprocio.h
@@ -21,7 +21,7 @@
#include <tqstring.h>
#include <kprocess.h>
#include <tqstrlist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KProcIOPrivate;
class TQTextCodec;
diff --git a/tdecore/kpty.h b/tdecore/kpty.h
index bb166f4a..6cff274a 100644
--- a/tdecore/kpty.h
+++ b/tdecore/kpty.h
@@ -24,7 +24,7 @@
#define __kpty_h__
#include <tqglobal.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#ifdef Q_OS_UNIX
diff --git a/tdecore/krandomsequence.h b/tdecore/krandomsequence.h
index 621cb0d6..8fa6e3c2 100644
--- a/tdecore/krandomsequence.h
+++ b/tdecore/krandomsequence.h
@@ -18,7 +18,7 @@
#ifndef K_RANDOM_SEQUENCE_H
#define K_RANDOM_SEQUENCE_H
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KRandomSequencePrivate;
class TQGList;
diff --git a/tdecore/kregexp.h b/tdecore/kregexp.h
index 50f755ed..8e6baac9 100644
--- a/tdecore/kregexp.h
+++ b/tdecore/kregexp.h
@@ -18,7 +18,7 @@
#ifndef __kregexp_h__
#define __kregexp_h__
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KRegExpPrivate;
diff --git a/tdecore/krfcdate.h b/tdecore/krfcdate.h
index ca4f309c..e7416c96 100644
--- a/tdecore/krfcdate.h
+++ b/tdecore/krfcdate.h
@@ -22,7 +22,7 @@
#include <tqstring.h>
#include <time.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* The KRFCDate class contains functions related to the parsing of dates.
diff --git a/tdecore/krootprop.h b/tdecore/krootprop.h
index b1f6497c..002790ca 100644
--- a/tdecore/krootprop.h
+++ b/tdecore/krootprop.h
@@ -26,7 +26,7 @@ typedef unsigned long Atom;
#include <tqmap.h>
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KRootPropPrivate;
diff --git a/tdecore/ksharedptr.h b/tdecore/ksharedptr.h
index 8338145c..16ece722 100644
--- a/tdecore/ksharedptr.h
+++ b/tdecore/ksharedptr.h
@@ -18,7 +18,7 @@
#ifndef KSharedPTR_H
#define KSharedPTR_H
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* Reference counting for shared objects. If you derive your object
diff --git a/tdecore/kshell.h b/tdecore/kshell.h
index 8f18603c..e60df848 100644
--- a/tdecore/kshell.h
+++ b/tdecore/kshell.h
@@ -23,7 +23,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* \namespace KShell
diff --git a/tdecore/kshortcut.h b/tdecore/kshortcut.h
index ee4a269f..9baf31b0 100644
--- a/tdecore/kshortcut.h
+++ b/tdecore/kshortcut.h
@@ -22,7 +22,7 @@
#include <tqkeysequence.h>
#include <tqstring.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class TQKeyEvent;
class KKeyNative;
diff --git a/tdecore/kshortcutlist.h b/tdecore/kshortcutlist.h
index bd148288..7a1890c1 100644
--- a/tdecore/kshortcutlist.h
+++ b/tdecore/kshortcutlist.h
@@ -22,7 +22,7 @@
#include <tqglobal.h> // For uint
#include <tqstring.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class TQVariant;
class KConfigBase;
diff --git a/tdecore/ksock.h b/tdecore/ksock.h
index 7f4f0b17..d6e4515e 100644
--- a/tdecore/ksock.h
+++ b/tdecore/ksock.h
@@ -20,7 +20,7 @@
#ifndef KSOCK_H
#define KSOCK_H
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
#ifdef Q_MOC_RUN
#define Q_OS_UNIX
diff --git a/tdecore/ksockaddr.h b/tdecore/ksockaddr.h
index 2510d121..fd73e722 100644
--- a/tdecore/ksockaddr.h
+++ b/tdecore/ksockaddr.h
@@ -23,7 +23,7 @@
#include <tqobject.h>
#include <tqcstring.h>
#include <tqstring.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/*
* This file defines a class that envelopes most, if not all, socket addresses
diff --git a/tdecore/ksocks.cpp b/tdecore/ksocks.cpp
index e596c50d..3de74bd8 100644
--- a/tdecore/ksocks.cpp
+++ b/tdecore/ksocks.cpp
@@ -110,7 +110,7 @@ KSocksTable::~KSocksTable() {
* libraries differently. Expect .so, .sl, .a (!) (AIX does this).
* 3) Find a unique symbol in the library that we can use to identify that
* library and write out the test case in the constructor
- * 4) Make necessary changes to the KControl module in kdebase/kcontrol/....
+ * 4) Make necessary changes to the KControl module in tdebase/kcontrol/....
* 5) TEST!
*
*/
diff --git a/tdecore/ksocks.h b/tdecore/ksocks.h
index add847ab..14067c0f 100644
--- a/tdecore/ksocks.h
+++ b/tdecore/ksocks.h
@@ -22,7 +22,7 @@
#include <sys/types.h>
#include <sys/time.h>
#include <kstaticdeleter.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#ifdef Q_OS_UNIX
diff --git a/tdecore/ksortablevaluelist.h b/tdecore/ksortablevaluelist.h
index 3f7885ca..40b311ed 100644
--- a/tdecore/ksortablevaluelist.h
+++ b/tdecore/ksortablevaluelist.h
@@ -22,7 +22,7 @@
#include <tqpair.h>
#include <tqvaluelist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* KSortableItem is a TQPair that provides several operators
diff --git a/tdecore/kstandarddirs.h b/tdecore/kstandarddirs.h
index ed4cff3c..afa87589 100644
--- a/tdecore/kstandarddirs.h
+++ b/tdecore/kstandarddirs.h
@@ -35,7 +35,7 @@ class KStandardDirsPrivate;
* @short Site-independent access to standard KDE directories.
* @author Stephan Kulow <coolo@kde.org> and Sirtaj Singh Kang <taj@kde.org>
*
- * This is one of the most central classes in kdelibs as
+ * This is one of the most central classes in tdelibs as
* it provides a basic service: It knows where the files
* reside on the user's hard disk. And it's meant to be the
* only one that knows -- to make the real location as
@@ -52,7 +52,7 @@ class KStandardDirsPrivate;
*
* The main idea behind KStandardDirs is that there are several
* toplevel prefixes below which the files lie. One of these prefixes is
- * the one where the user installed kdelibs, one is where the
+ * the one where the user installed tdelibs, one is where the
* application was installed, and one is $HOME/.kde, but there
* may be even more. Under these prefixes there are several well
* defined suffixes where specific resource types are to be found.
@@ -66,7 +66,7 @@ class KStandardDirsPrivate;
* specific directories that aren't in his $HOME/.kde directory for,
* for example, icons.
*
- * <b>Standard resources that kdelibs allocates are:</b>\n
+ * <b>Standard resources that tdelibs allocates are:</b>\n
*
* @li apps - Applications menu (.desktop files).
* @li cache - Cached information (e.g. favicons, web-pages)
@@ -138,7 +138,7 @@ public:
/**
* Adds another search dir to front of the @p fsstnd list.
*
- * @li When compiling kdelibs, the prefix is added to this.
+ * @li When compiling tdelibs, the prefix is added to this.
* @li KDEDIRS or KDEDIR is taking into account
* @li Additional dirs may be loaded from kdeglobals.
*
diff --git a/tdecore/kstartupinfo.cpp b/tdecore/kstartupinfo.cpp
index ae3b3d27..00a9f5b8 100644
--- a/tdecore/kstartupinfo.cpp
+++ b/tdecore/kstartupinfo.cpp
@@ -66,7 +66,7 @@ DEALINGS IN THE SOFTWARE.
static const char* const NET_STARTUP_MSG = "_NET_STARTUP_INFO";
static const char* const NET_STARTUP_WINDOW = "_NET_STARTUP_ID";
// DESKTOP_STARTUP_ID is used also in kinit/wrapper.c ,
-// tdesu in both kdelibs and kdebase and who knows where else
+// tdesu in both tdelibs and tdebase and who knows where else
static const char* const NET_STARTUP_ENV = "DESKTOP_STARTUP_ID";
static bool auto_app_started_sending = true;
diff --git a/tdecore/kstartupinfo.h b/tdecore/kstartupinfo.h
index d14213dc..d384ceee 100644
--- a/tdecore/kstartupinfo.h
+++ b/tdecore/kstartupinfo.h
@@ -37,7 +37,7 @@ DEALINGS IN THE SOFTWARE.
#include <tqcstring.h>
#include <tqstring.h>
#include <tqvaluelist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KStartupInfoId;
class KStartupInfoData;
@@ -49,7 +49,7 @@ class KStartupInfoPrivate;
*
* This class can be used to send information about started application,
* change the information and receive this information. For detailed
- * description, see kdelibs/tdecore/README.kstartupinfo.
+ * description, see tdelibs/tdecore/README.kstartupinfo.
*
* You usually don't need to use this class for sending the notification
* information, as KDE libraries should do this when an application is
diff --git a/tdecore/kstdaccel.h b/tdecore/kstdaccel.h
index 6707cc3d..813255cc 100644
--- a/tdecore/kstdaccel.h
+++ b/tdecore/kstdaccel.h
@@ -22,7 +22,7 @@
#include <tqstring.h>
#include <kshortcut.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class TQKeyEvent;
class KAccelActions;
diff --git a/tdecore/kstringhandler.h b/tdecore/kstringhandler.h
index 23b76513..40cfa361 100644
--- a/tdecore/kstringhandler.h
+++ b/tdecore/kstringhandler.h
@@ -23,7 +23,7 @@
#include <tqstringlist.h>
#include <tqregexp.h> // for the word ranges
#include <tqfontmetrics.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
/**
* This class contains utility functions for handling strings.
diff --git a/tdecore/ksycoca.h b/tdecore/ksycoca.h
index 1d3d32d8..19ab6674 100644
--- a/tdecore/ksycoca.h
+++ b/tdecore/ksycoca.h
@@ -23,7 +23,7 @@
#include <tqobject.h>
#include <tqstringlist.h>
#include "ksycocatype.h"
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQDataStream;
class KSycocaPrivate;
diff --git a/tdecore/ksycocadict.h b/tdecore/ksycocadict.h
index 592d6bfe..79f1432e 100644
--- a/tdecore/ksycocadict.h
+++ b/tdecore/ksycocadict.h
@@ -22,7 +22,7 @@
#include <tqstring.h>
#include <tqvaluelist.h>
#include <tqdatastream.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KSycocaEntry;
class KSycocaDictStringList;
diff --git a/tdecore/ktempdir.h b/tdecore/ktempdir.h
index 92917e78..414eabf5 100644
--- a/tdecore/ktempdir.h
+++ b/tdecore/ktempdir.h
@@ -23,7 +23,7 @@
#include <tqstring.h>
#include <stdio.h>
#include <errno.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class TQDir;
class KTempDirPrivate;
diff --git a/tdecore/ktempfile.h b/tdecore/ktempfile.h
index 18503a53..1c9378ba 100644
--- a/tdecore/ktempfile.h
+++ b/tdecore/ktempfile.h
@@ -23,7 +23,7 @@
#include <tqstring.h>
#include <stdio.h>
#include <errno.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class TQFile;
class TQTextStream;
diff --git a/tdecore/ktimezones.h b/tdecore/ktimezones.h
index 77d0ef16..d24e8ec1 100644
--- a/tdecore/ktimezones.h
+++ b/tdecore/ktimezones.h
@@ -20,7 +20,7 @@
#ifndef _KTIMEZONES_H
#define _KTIMEZONES_H
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
#include <tqdatetime.h>
#include <tqnamespace.h>
#include <tqmap.h>
diff --git a/tdecore/kurl.h b/tdecore/kurl.h
index 0fb86a1c..9cfac288 100644
--- a/tdecore/kurl.h
+++ b/tdecore/kurl.h
@@ -22,7 +22,7 @@
#include <tqstring.h>
#include <tqvaluelist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class TQUrl;
class TQStringList;
@@ -749,7 +749,7 @@ public:
* @brief Tests if the URL has a reference part
*
* @return @c true if the URL has a reference part. In a URL like
- * <tt>"http://www.kde.org/kdebase.tar#tar:/README"</tt> it would
+ * <tt>"http://www.kde.org/tdebase.tar#tar:/README"</tt> it would
* return @c true as well
*
* @see ref()
@@ -1493,7 +1493,7 @@ public:
*
* Example for a nested URL:
* @code
- * file:///home/weis/kde.tgz#gzip:/#tar:/kdebase
+ * file:///home/weis/kde.tgz#gzip:/#tar:/tdebase
* @endcode
* A URL like <tt>"http://www.kde.org#tar:/kde/README.hml#ref1"</tt> will be
* split in <tt>"http://www.kde.org#ref1"</tt> and
@@ -1521,7 +1521,7 @@ public:
*
* Example for a nested URL:
* @code
- * file:///home/weis/kde.tgz#gzip:/#tar:/kdebase
+ * file:///home/weis/kde.tgz#gzip:/#tar:/tdebase
* @endcode
* A URL like <tt>"http://www.kde.org#tar:/kde/README.hml#ref1"</tt> will be
* split in <tt>"http://www.kde.org#ref1"</tt> and
diff --git a/tdecore/kurldrag.cpp b/tdecore/kurldrag.cpp
index e0a7be22..7153b807 100644
--- a/tdecore/kurldrag.cpp
+++ b/tdecore/kurldrag.cpp
@@ -23,7 +23,7 @@
#include <tqfont.h>
#include <unistd.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kglobal.h>
#include <klocale.h>
#include <kdebug.h>
diff --git a/tdecore/kurldrag.h b/tdecore/kurldrag.h
index 15dc2d1a..e44557f9 100644
--- a/tdecore/kurldrag.h
+++ b/tdecore/kurldrag.h
@@ -23,7 +23,7 @@
#include <tqstringlist.h>
#include <tqdragobject.h>
#include <kurl.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class TQMimeSource;
class KURLDragPrivate;
diff --git a/tdecore/kvmallocator.h b/tdecore/kvmallocator.h
index 5cfacb6c..e85e0344 100644
--- a/tdecore/kvmallocator.h
+++ b/tdecore/kvmallocator.h
@@ -26,7 +26,7 @@
#define KVMALLOCATOR_H
#include <sys/types.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
class KVMAllocatorPrivate;
diff --git a/tdecore/kxerrorhandler.h b/tdecore/kxerrorhandler.h
index ab017ace..cfa67627 100644
--- a/tdecore/kxerrorhandler.h
+++ b/tdecore/kxerrorhandler.h
@@ -27,7 +27,7 @@
#include <tqvaluelist.h>
#include <tqwindowdefs.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#include <X11/Xlib.h>
/**
diff --git a/tdecore/kxmessages.h b/tdecore/kxmessages.h
index 34fc559a..261dc6fd 100644
--- a/tdecore/kxmessages.h
+++ b/tdecore/kxmessages.h
@@ -28,7 +28,7 @@ DEALINGS IN THE SOFTWARE.
#include <tqwidget.h>
#include <tqcstring.h>
#include <tqmap.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#ifdef Q_MOC_RUN
#define Q_WS_X11
diff --git a/tdecore/libintl.cpp b/tdecore/libintl.cpp
index 83e2d371..5d2f6a08 100644
--- a/tdecore/libintl.cpp
+++ b/tdecore/libintl.cpp
@@ -47,7 +47,7 @@ License along with the GNU C Library; see the file COPYING.LIB. If
not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
#include "kde_file.h"
#include <config.h>
diff --git a/tdecore/libtdecore_weak.nmcheck b/tdecore/libtdecore_weak.nmcheck
index 43efca97..dc43acb6 100644
--- a/tdecore/libtdecore_weak.nmcheck
+++ b/tdecore/libtdecore_weak.nmcheck
@@ -1,6 +1,6 @@
# KDE namespace check file
-# kdelibs classes
+# tdelibs classes
KApplication::*
# these should preferably go in some namespace in KDE4
diff --git a/tdecore/netsupp.h b/tdecore/netsupp.h
index 3519d7a3..1fa32431 100644
--- a/tdecore/netsupp.h
+++ b/tdecore/netsupp.h
@@ -21,7 +21,7 @@
#ifndef _NETSUPP_H_
#define _NETSUPP_H_
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/tdecore/netwm.h b/tdecore/netwm.h
index 18d5041f..ca8ed513 100644
--- a/tdecore/netwm.h
+++ b/tdecore/netwm.h
@@ -27,7 +27,7 @@
#ifndef __net_wm_h
#define __net_wm_h
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
#include <tqwidget.h>
#ifdef Q_WS_X11
#include <X11/Xlib.h>
diff --git a/tdecore/netwm_def.h b/tdecore/netwm_def.h
index c2a8e49b..0ce12d91 100644
--- a/tdecore/netwm_def.h
+++ b/tdecore/netwm_def.h
@@ -26,7 +26,7 @@
#ifndef __netwm_def_h
#define __netwm_def_h
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
Simple point class for NET classes.
diff --git a/tdecore/network/kbufferedsocket.h b/tdecore/network/kbufferedsocket.h
index dffffb5e..2035098d 100644
--- a/tdecore/network/kbufferedsocket.h
+++ b/tdecore/network/kbufferedsocket.h
@@ -29,7 +29,7 @@
#include <tqcstring.h>
#include <tqvaluelist.h>
#include "kstreamsocket.h"
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KIOBufferBase;
diff --git a/tdecore/network/kclientsocketbase.h b/tdecore/network/kclientsocketbase.h
index 8228015a..55f12a99 100644
--- a/tdecore/network/kclientsocketbase.h
+++ b/tdecore/network/kclientsocketbase.h
@@ -30,7 +30,7 @@
#include "ksocketbase.h"
#include "kresolver.h"
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#ifdef Q_MOC_RUN
#define USE_QT4
diff --git a/tdecore/network/kiobuffer.h b/tdecore/network/kiobuffer.h
index 02f75a42..ac1352a4 100644
--- a/tdecore/network/kiobuffer.h
+++ b/tdecore/network/kiobuffer.h
@@ -27,7 +27,7 @@
#include <tqcstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQIODevice;
diff --git a/tdecore/network/knetworkinterface.h b/tdecore/network/knetworkinterface.h
index 74fd52d5..d4eb43f0 100644
--- a/tdecore/network/knetworkinterface.h
+++ b/tdecore/network/knetworkinterface.h
@@ -24,7 +24,7 @@
#ifndef KNETWORKINTERFACE_H
#define KNETWORKINTERFACE_H
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
namespace KNetwork {
@@ -32,7 +32,7 @@ namespace KNetwork {
* A place-holder class for a future network interface class.
* This class is to be replaced with a more powerful version, inspired
* by:
- * - KInetInterface (kdenetwork/krfb/srvloc)
+ * - KInetInterface (tdenetwork/krfb/srvloc)
* - NWInterface (kdenonbeta/knot/lib)
* - java.net.NetworkInterface
*/
diff --git a/tdecore/network/ksocketaddress.h b/tdecore/network/ksocketaddress.h
index 6f786932..d02a6984 100644
--- a/tdecore/network/ksocketaddress.h
+++ b/tdecore/network/ksocketaddress.h
@@ -28,7 +28,7 @@
#include <tqstring.h>
#include <tqcstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
struct sockaddr;
struct sockaddr_in;
diff --git a/tdecore/network/ksocketbase.h b/tdecore/network/ksocketbase.h
index dd1e1e51..ef1d061d 100644
--- a/tdecore/network/ksocketbase.h
+++ b/tdecore/network/ksocketbase.h
@@ -60,7 +60,7 @@
#include <tqstring.h>
#include "ksocketaddress.h"
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/*
* This is extending QIODevice's error codes
diff --git a/tdecore/svgicons/ksvgiconengine.h b/tdecore/svgicons/ksvgiconengine.h
index b4fe50ed..033064c0 100644
--- a/tdecore/svgicons/ksvgiconengine.h
+++ b/tdecore/svgicons/ksvgiconengine.h
@@ -21,7 +21,7 @@
#ifndef KSVGIconEngine_H
#define KSVGIconEngine_H
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/** \internal DO NOT USE! */
diff --git a/tdecore/tests/kcmdlineargstest.cpp b/tdecore/tests/kcmdlineargstest.cpp
index 0ad9807c..29919681 100644
--- a/tdecore/tests/kcmdlineargstest.cpp
+++ b/tdecore/tests/kcmdlineargstest.cpp
@@ -24,7 +24,7 @@ static KCmdLineOptions options[] =
int
main(int argc, char *argv[])
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KCmdLineArgs::init( argc, argv, "testapp", description, version);
KCmdLineArgs::addCmdLineOptions( options ); // Add my own options.
diff --git a/tdecore/tests/klocaletest.cpp b/tdecore/tests/klocaletest.cpp
index 39bef8dd..29f6cd3e 100644
--- a/tdecore/tests/klocaletest.cpp
+++ b/tdecore/tests/klocaletest.cpp
@@ -99,7 +99,7 @@ void Test::createFields()
int main( int argc, char ** argv )
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KApplication a( argc, argv, "klocaletest" );
KGlobal::locale()->setLanguage(TQString::tqfromLatin1("en_US"));
diff --git a/tdecore/tests/kurltest.cpp b/tdecore/tests/kurltest.cpp
index c8e5bcce..bcee63ac 100644
--- a/tdecore/tests/kurltest.cpp
+++ b/tdecore/tests/kurltest.cpp
@@ -125,8 +125,8 @@ int main(int argc, char *argv[])
baseURL = "http://www.foo.bar/top//test2/file2.html";
check( "KURL::url()", baseURL.url(), "http://www.foo.bar/top//test2/file2.html" );
- baseURL = "file:/usr/local/src/kde2/////kdelibs/kio";
- check( "KURL::url()", baseURL.url(), "file:///usr/local/src/kde2/////kdelibs/kio" );
+ baseURL = "file:/usr/local/src/kde2/////tdelibs/kio";
+ check( "KURL::url()", baseURL.url(), "file:///usr/local/src/kde2/////tdelibs/kio" );
baseURL = "http://www.foo.bar";
KURL rel_url2( baseURL, "mailto:bastian@kde.org" );
@@ -135,9 +135,9 @@ int main(int argc, char *argv[])
baseURL = "mailto:bastian@kde.org?subject=hello";
check( "KURL::url()", baseURL.url(), "mailto:bastian@kde.org?subject=hello" );
- baseURL = "file:/usr/local/src/kde2/kdelibs/kio/";
- KURL url2( baseURL, "../../////kdebase/konqueror" );
- check( "KURL::url()", url2.url(), "file:///usr/local/src/kde2/////kdebase/konqueror" );
+ baseURL = "file:/usr/local/src/kde2/tdelibs/kio/";
+ KURL url2( baseURL, "../../////tdebase/konqueror" );
+ check( "KURL::url()", url2.url(), "file:///usr/local/src/kde2/////tdebase/konqueror" );
TQString u1 = "file:/home/dfaure/my#myref";
url1 = u1;
@@ -318,8 +318,8 @@ int main(int argc, char *argv[])
"http://www.google.com/foo%20%20%20%20%20%20 bar/");
KURL carsten;
- carsten.setPath("/home/gis/src/kde/kdelibs/kfile/.#kfiledetailview.cpp.1.18");
- check("KURL::path()", carsten.path(), "/home/gis/src/kde/kdelibs/kfile/.#kfiledetailview.cpp.1.18");
+ carsten.setPath("/home/gis/src/kde/tdelibs/kfile/.#kfiledetailview.cpp.1.18");
+ check("KURL::path()", carsten.path(), "/home/gis/src/kde/tdelibs/kfile/.#kfiledetailview.cpp.1.18");
KURL charles;
charles.setPath( "/home/charles/foo%20moo" );
diff --git a/tdecore/tests/testqtargs.cpp b/tdecore/tests/testqtargs.cpp
index d1c8ff24..0bbb0436 100644
--- a/tdecore/tests/testqtargs.cpp
+++ b/tdecore/tests/testqtargs.cpp
@@ -37,7 +37,7 @@ application palette (light and dark shades are\ncalculated)."), 0},
it looks for "background" instead of "-background" so never find the arg.
- Software: g++ 2.95, kdelibs from CVS Jan 28, Qt 3.01
+ Software: g++ 2.95, tdelibs from CVS Jan 28, Qt 3.01
OS: Debian GNU/Linux 3.0 (sid)
diff --git a/tdecore/twin.h b/tdecore/twin.h
index e8f00f44..c7aa37a6 100644
--- a/tdecore/twin.h
+++ b/tdecore/twin.h
@@ -23,7 +23,7 @@
#include <tqwindowdefs.h>
#include <tqstring.h>
#include <tqpixmap.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
#ifdef Q_OS_UNIX
@@ -80,8 +80,8 @@ public:
* Except for rare cases, this request will be always honored,
* and normal applications are forbidden to use it.
*
- * In case of problems, consult the KWin README in the kdebase
- * package (kdebase/twin/README), or ask on the twin@kde.org
+ * In case of problems, consult the KWin README in the tdebase
+ * package (tdebase/twin/README), or ask on the twin@kde.org
* mailing list.
*
* @param win the id of the window to make active
diff --git a/tdecore/twinmodule.h b/tdecore/twinmodule.h
index afde0259..0357c1c6 100644
--- a/tdecore/twinmodule.h
+++ b/tdecore/twinmodule.h
@@ -25,7 +25,7 @@
#include <tqobject.h>
#include <tqvaluelist.h>
-#include "kdelibs_export.h"
+#include "tdelibs_export.h"
#ifdef Q_MOC_RUN
#define Q_OS_UNIX
diff --git a/tdefx/kcpuinfo.h b/tdefx/kcpuinfo.h
index 69c840e4..64d810c1 100644
--- a/tdefx/kcpuinfo.h
+++ b/tdefx/kcpuinfo.h
@@ -27,7 +27,7 @@
#ifndef __KCPUINFO_H
#define __KCPUINFO_H
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* This class provides a means for applications to obtain information at
diff --git a/tdefx/kdrawutil.h b/tdefx/kdrawutil.h
index 76d6070c..44041968 100644
--- a/tdefx/kdrawutil.h
+++ b/tdefx/kdrawutil.h
@@ -23,7 +23,7 @@
#include <tqbitmap.h>
#include <tqpalette.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/*
* Various drawing routines. Also see Qt's tqdrawutil.h for some more routines
diff --git a/tdefx/kimageeffect.h b/tdefx/kimageeffect.h
index 77a6fc9c..cc79533f 100644
--- a/tdefx/kimageeffect.h
+++ b/tdefx/kimageeffect.h
@@ -31,7 +31,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef __KIMAGE_EFFECT_H
#define __KIMAGE_EFFECT_H
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQImage;
class TQSize;
diff --git a/tdefx/kpixmap.h b/tdefx/kpixmap.h
index a9cade98..e319ab81 100644
--- a/tdefx/kpixmap.h
+++ b/tdefx/kpixmap.h
@@ -26,7 +26,7 @@
#include <tqpixmap.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
const int KColorMode_Mask = 0x00000300;
const int WebOnly = 0x00000200;
diff --git a/tdefx/kpixmapeffect.h b/tdefx/kpixmapeffect.h
index 79df9285..471a5031 100644
--- a/tdefx/kpixmapeffect.h
+++ b/tdefx/kpixmapeffect.h
@@ -10,7 +10,7 @@
#ifndef __KPIXMAP_EFFECT_H
#define __KPIXMAP_EFFECT_H
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#include <tqsize.h>
class KPixmap;
diff --git a/tdefx/kpixmapsplitter.h b/tdefx/kpixmapsplitter.h
index 3cb25ca9..3e7a6dfa 100644
--- a/tdefx/kpixmapsplitter.h
+++ b/tdefx/kpixmapsplitter.h
@@ -25,7 +25,7 @@
#include <tqsize.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KPixmapSplitterPrivate;
/**
diff --git a/tdefx/kstyle.cpp b/tdefx/kstyle.cpp
index f80094fe..85503632 100644
--- a/tdefx/kstyle.cpp
+++ b/tdefx/kstyle.cpp
@@ -541,7 +541,7 @@ int KStyle::kPixelMetric( KStylePixelMetric kpm, const TQWidget* /* widget */) c
// -----------------------------------------------------------------------------
-// #ifdef USE_QT4 // kdebindings / smoke needs this function declaration available at all times. Furthermore I don't think it would hurt to have the declaration available at all times...so leave these commented out for now
+// #ifdef USE_QT4 // tdebindings / smoke needs this function declaration available at all times. Furthermore I don't think it would hurt to have the declaration available at all times...so leave these commented out for now
//void KStyle::tqdrawPrimitive( TQ_ControlElement pe,
// TQPainter* p,
diff --git a/tdefx/kstyle.h b/tdefx/kstyle.h
index 9f87af88..da71d83b 100644
--- a/tdefx/kstyle.h
+++ b/tdefx/kstyle.h
@@ -34,7 +34,7 @@
#include <tqcommonstyle.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KPixmap;
@@ -282,7 +282,7 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::SO_Default ) const;
-// #ifdef USE_QT4 // kdebindings / smoke needs this function declaration available at all times. Furthermore I don't think it would hurt to have the declaration available at all times...so leave these commented out for now
+// #ifdef USE_QT4 // tdebindings / smoke needs this function declaration available at all times. Furthermore I don't think it would hurt to have the declaration available at all times...so leave these commented out for now
// void tqdrawPrimitive( TQ_ControlElement pe,
// TQPainter* p,
diff --git a/tdeprint/driver.h b/tdeprint/driver.h
index 423f8c85..9c1200fc 100644
--- a/tdeprint/driver.h
+++ b/tdeprint/driver.h
@@ -32,7 +32,7 @@
#include <tqrect.h>
#include <tqsize.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class DriverItem;
class TQListView;
diff --git a/tdeprint/driverview.h b/tdeprint/driverview.h
index e0ba373c..a975fd26 100644
--- a/tdeprint/driverview.h
+++ b/tdeprint/driverview.h
@@ -25,7 +25,7 @@
#include <klistview.h>
#include <tqmap.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class DrOptionView;
class DrMain;
diff --git a/tdeprint/foomatic2loader.h b/tdeprint/foomatic2loader.h
index dc2419f8..86bedb41 100644
--- a/tdeprint/foomatic2loader.h
+++ b/tdeprint/foomatic2loader.h
@@ -23,7 +23,7 @@
#include <tqmap.h>
#include <tqvariant.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class DrBase;
class DrMain;
diff --git a/tdeprint/kmdbentry.h b/tdeprint/kmdbentry.h
index e2ca1dfd..87575450 100644
--- a/tdeprint/kmdbentry.h
+++ b/tdeprint/kmdbentry.h
@@ -23,7 +23,7 @@
#include <tqstring.h>
#include <tqptrlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
struct TDEPRINT_EXPORT KMDBEntry
{
diff --git a/tdeprint/kmjob.h b/tdeprint/kmjob.h
index b4a31bf5..b54c36e8 100644
--- a/tdeprint/kmjob.h
+++ b/tdeprint/kmjob.h
@@ -28,7 +28,7 @@
#include <tqstring.h>
#include <tqvaluevector.h>
#include <tdeprint/kmobject.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* @internal
diff --git a/tdeprint/kmjobmanager.h b/tdeprint/kmjobmanager.h
index cfdf09bf..159cdc63 100644
--- a/tdeprint/kmjobmanager.h
+++ b/tdeprint/kmjobmanager.h
@@ -29,7 +29,7 @@
#include <tqdict.h>
#include <tqvaluelist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KMJob;
class KMThreadJob;
diff --git a/tdeprint/kmvirtualmanager.h b/tdeprint/kmvirtualmanager.h
index 4916ab16..ceeec182 100644
--- a/tdeprint/kmvirtualmanager.h
+++ b/tdeprint/kmvirtualmanager.h
@@ -24,7 +24,7 @@
#include <tqptrlist.h>
#include <tqdatetime.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#include "kpreloadobject.h"
diff --git a/tdeprint/kpipeprocess.h b/tdeprint/kpipeprocess.h
index ca0b5ebb..c682ed77 100644
--- a/tdeprint/kpipeprocess.h
+++ b/tdeprint/kpipeprocess.h
@@ -23,7 +23,7 @@
#include <tqfile.h>
#include <stdio.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TDEPRINT_EXPORT KPipeProcess : public TQFile
{
diff --git a/tdeprint/kpqtpage.h b/tdeprint/kpqtpage.h
index 8a57ce9e..ee78ffa8 100644
--- a/tdeprint/kpqtpage.h
+++ b/tdeprint/kpqtpage.h
@@ -22,7 +22,7 @@
#include "kprintdialogpage.h"
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQButtonGroup;
class TQComboBox;
diff --git a/tdeprint/kpreloadobject.h b/tdeprint/kpreloadobject.h
index 14b5e931..c646ca0c 100644
--- a/tdeprint/kpreloadobject.h
+++ b/tdeprint/kpreloadobject.h
@@ -20,7 +20,7 @@
#ifndef KPRELOADOBJECT_H
#define KPRELOADOBJECT_H
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TDEPRINT_EXPORT KPReloadObject
{
diff --git a/tdeprint/kprintdialogpage.h b/tdeprint/kprintdialogpage.h
index aebf3acf..bffa8a47 100644
--- a/tdeprint/kprintdialogpage.h
+++ b/tdeprint/kprintdialogpage.h
@@ -24,7 +24,7 @@
#include <tqwidget.h>
#include <tqmap.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KMPrinter;
class DrMain;
diff --git a/tdeprint/kprinter.h b/tdeprint/kprinter.h
index 7d7e7ea4..79f02c6b 100644
--- a/tdeprint/kprinter.h
+++ b/tdeprint/kprinter.h
@@ -28,7 +28,7 @@
#include <tqstringlist.h>
#include <tqvaluelist.h>
#include <kdemacros.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#include <tdeprint/kpreloadobject.h>
diff --git a/tdeprint/kprinterimpl.h b/tdeprint/kprinterimpl.h
index e8cbecc0..24da07be 100644
--- a/tdeprint/kprinterimpl.h
+++ b/tdeprint/kprinterimpl.h
@@ -26,7 +26,7 @@
#include <tqmap.h>
#include <tqptrlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KPrinter;
class KMPrinter;
diff --git a/tdeprint/kxmlcommand.h b/tdeprint/kxmlcommand.h
index 657194c2..bf56836d 100644
--- a/tdeprint/kxmlcommand.h
+++ b/tdeprint/kxmlcommand.h
@@ -24,7 +24,7 @@
#include <tqmap.h>
#include <tqobject.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class DrMain;
class DrGroup;
diff --git a/tdeprint/management/kaddprinterwizard.cpp b/tdeprint/management/kaddprinterwizard.cpp
index 65d355a8..5ce4ca2f 100644
--- a/tdeprint/management/kaddprinterwizard.cpp
+++ b/tdeprint/management/kaddprinterwizard.cpp
@@ -19,7 +19,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
"0.1");
KCmdLineArgs::addCmdLineOptions(options);
- KGlobal::locale()->setMainCatalogue("kdelibs");
+ KGlobal::locale()->setMainCatalogue("tdelibs");
KApplication app;
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
diff --git a/tdeprint/management/kmconfigpage.h b/tdeprint/management/kmconfigpage.h
index ac0495ab..59b93fb3 100644
--- a/tdeprint/management/kmconfigpage.h
+++ b/tdeprint/management/kmconfigpage.h
@@ -22,7 +22,7 @@
#include <tqwidget.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KConfig;
diff --git a/tdeprint/management/kmpropbackend.h b/tdeprint/management/kmpropbackend.h
index 8f576829..4eb0468b 100644
--- a/tdeprint/management/kmpropbackend.h
+++ b/tdeprint/management/kmpropbackend.h
@@ -22,7 +22,7 @@
#include "kmpropwidget.h"
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQLabel;
diff --git a/tdeprint/management/kmpropdriver.h b/tdeprint/management/kmpropdriver.h
index ebc22cb5..7566790d 100644
--- a/tdeprint/management/kmpropdriver.h
+++ b/tdeprint/management/kmpropdriver.h
@@ -22,7 +22,7 @@
#include "kmpropwidget.h"
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQLabel;
diff --git a/tdeprint/management/kmpropertypage.h b/tdeprint/management/kmpropertypage.h
index 3994e9a9..5acee87f 100644
--- a/tdeprint/management/kmpropertypage.h
+++ b/tdeprint/management/kmpropertypage.h
@@ -23,7 +23,7 @@
#include "cjanuswidget.h"
#include "kmprinterpage.h"
#include <tdeprint/kpreloadobject.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#include <tqptrlist.h>
class KMPropWidget;
diff --git a/tdeprint/management/kmpropwidget.h b/tdeprint/management/kmpropwidget.h
index 45773ba0..9d418066 100644
--- a/tdeprint/management/kmpropwidget.h
+++ b/tdeprint/management/kmpropwidget.h
@@ -22,7 +22,7 @@
#include <tqwidget.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KMPrinter;
class KMWizard;
diff --git a/tdeprint/management/kmtimer.h b/tdeprint/management/kmtimer.h
index 6c5cf4b9..d6b21c05 100644
--- a/tdeprint/management/kmtimer.h
+++ b/tdeprint/management/kmtimer.h
@@ -25,7 +25,7 @@
#endif
#include <tqtimer.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* @internal
diff --git a/tdeprint/management/kmwbackend.h b/tdeprint/management/kmwbackend.h
index 7b7b9270..826a724f 100644
--- a/tdeprint/management/kmwbackend.h
+++ b/tdeprint/management/kmwbackend.h
@@ -21,7 +21,7 @@
#define KMWBACKEND_H
#include "kmwizardpage.h"
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#include <tqmap.h>
class TQButtonGroup;
diff --git a/tdeprint/management/kmwizard.h b/tdeprint/management/kmwizard.h
index f5331b87..171158b3 100644
--- a/tdeprint/management/kmwizard.h
+++ b/tdeprint/management/kmwizard.h
@@ -24,7 +24,7 @@
#include <tqintdict.h>
#include <tqvaluestack.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQWidgetStack;
class TQLabel;
diff --git a/tdeprint/management/kmwizardpage.h b/tdeprint/management/kmwizardpage.h
index 207f065b..b02dbe9f 100644
--- a/tdeprint/management/kmwizardpage.h
+++ b/tdeprint/management/kmwizardpage.h
@@ -22,7 +22,7 @@
#include <tqwidget.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KMPrinter;
diff --git a/tdeprint/management/kxmlcommandselector.h b/tdeprint/management/kxmlcommandselector.h
index dbd89f73..5b2d109e 100644
--- a/tdeprint/management/kxmlcommandselector.h
+++ b/tdeprint/management/kxmlcommandselector.h
@@ -23,7 +23,7 @@
#include <tqwidget.h>
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQComboBox;
class TQLineEdit;
diff --git a/tdeprint/management/sidepixmap.h b/tdeprint/management/sidepixmap.h
index 2d3916ff..d9f87661 100644
--- a/tdeprint/management/sidepixmap.h
+++ b/tdeprint/management/sidepixmap.h
@@ -23,7 +23,7 @@
#include <tqframe.h>
#include <tqpixmap.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TDEPRINT_EXPORT SidePixmap : public TQFrame
{
diff --git a/tdeprint/marginwidget.h b/tdeprint/marginwidget.h
index 6be534d4..0668beeb 100644
--- a/tdeprint/marginwidget.h
+++ b/tdeprint/marginwidget.h
@@ -23,7 +23,7 @@
#include <tqwidget.h>
#include <tqvaluevector.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class MarginValueWidget;
class MarginPreview;
diff --git a/tdeprint/messagewindow.h b/tdeprint/messagewindow.h
index a6685528..26de652d 100644
--- a/tdeprint/messagewindow.h
+++ b/tdeprint/messagewindow.h
@@ -23,7 +23,7 @@
#include <tqwidget.h>
#include <tqptrdict.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQLabel;
diff --git a/tdeprint/ppdloader.h b/tdeprint/ppdloader.h
index 70b5d1fe..e7e17a35 100644
--- a/tdeprint/ppdloader.h
+++ b/tdeprint/ppdloader.h
@@ -26,7 +26,7 @@
#include <tqvariant.h>
#include <tqdict.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class DrGroup;
class DrBase;
diff --git a/tdesu/client.h b/tdesu/client.h
index def5c25e..750dd926 100644
--- a/tdesu/client.h
+++ b/tdesu/client.h
@@ -16,7 +16,7 @@
#define __KDE_su_Client_h_Included__
#include <tqglobal.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#ifdef Q_OS_UNIX
diff --git a/tdesu/process.h b/tdesu/process.h
index a6ac77dc..941021d9 100644
--- a/tdesu/process.h
+++ b/tdesu/process.h
@@ -20,7 +20,7 @@
#include <tqstringlist.h>
#include <tqvaluelist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class PTY;
typedef TQValueList<TQCString> QCStringList;
diff --git a/tdesu/ssh.h b/tdesu/ssh.h
index 65787de7..d4e91688 100644
--- a/tdesu/ssh.h
+++ b/tdesu/ssh.h
@@ -17,7 +17,7 @@
#include "stub.h"
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* Executes a remote command, using ssh.
diff --git a/tdesu/stub.h b/tdesu/stub.h
index 1281c551..af4e624e 100644
--- a/tdesu/stub.h
+++ b/tdesu/stub.h
@@ -19,7 +19,7 @@
#include "process.h"
#include "kcookie.h"
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
typedef TQValueList<TQCString> QCStringList;
diff --git a/tdesu/su.h b/tdesu/su.h
index edf1bb75..ff189106 100644
--- a/tdesu/su.h
+++ b/tdesu/su.h
@@ -15,7 +15,7 @@
#include <tqcstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#include "stub.h"
diff --git a/tdesu/tdesu_pty.h b/tdesu/tdesu_pty.h
index 4b5c5a9f..fb961701 100644
--- a/tdesu/tdesu_pty.h
+++ b/tdesu/tdesu_pty.h
@@ -20,7 +20,7 @@
#include <tqcstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TDESU_EXPORT PTY {
diff --git a/tdeui/colors/Makefile.am b/tdeui/colors/Makefile.am
index 4a298bc5..e47c88e4 100644
--- a/tdeui/colors/Makefile.am
+++ b/tdeui/colors/Makefile.am
@@ -5,6 +5,6 @@ messages:
for i in $$list; do \
echo "i18n(\"color\", \"$$i\");" | sed -e "s#!# #g" >> colors.cpp ;\
done
- $(XGETTEXT) colors.cpp -o $(podir)/kdelibs_colors.pot
+ $(XGETTEXT) colors.cpp -o $(podir)/tdelibs_colors.pot
-rm -f colors.cpp
diff --git a/tdeui/kaccelgen.h b/tdeui/kaccelgen.h
index 8f0c50be..222d948b 100644
--- a/tdeui/kaccelgen.h
+++ b/tdeui/kaccelgen.h
@@ -24,7 +24,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* Provides functions that, given a collection of QStrings, will
diff --git a/tdeui/kactionclasses.h b/tdeui/kactionclasses.h
index 2974cbdb..235a3905 100644
--- a/tdeui/kactionclasses.h
+++ b/tdeui/kactionclasses.h
@@ -930,7 +930,7 @@ public:
const char* name = 0 );
// The ctors with fontListCriteria were added after 3.3-beta1.
-// This define is used in koffice. Remove when koffice has a dependency on kdelibs-3.3 or more.
+// This define is used in koffice. Remove when koffice has a dependency on tdelibs-3.3 or more.
#define KFONTACTION_HAS_CRITERIA_ARG
KFontAction( uint fontListCriteria, const TQString& text,
const KShortcut& cut = KShortcut(), TQObject* parent = 0,
diff --git a/tdeui/kactionselector.h b/tdeui/kactionselector.h
index 8d38911b..43dc6822 100644
--- a/tdeui/kactionselector.h
+++ b/tdeui/kactionselector.h
@@ -21,7 +21,7 @@
#include <tqwidget.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQListBox;
class TQListBoxItem;
diff --git a/tdeui/kactivelabel.h b/tdeui/kactivelabel.h
index 422dcfa5..027ea246 100644
--- a/tdeui/kactivelabel.h
+++ b/tdeui/kactivelabel.h
@@ -21,7 +21,7 @@
#include <tqtextbrowser.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
// ### inherit KTextBrowser in KDE4
diff --git a/tdeui/kanimwidget.h b/tdeui/kanimwidget.h
index 2caf74b4..c9090112 100644
--- a/tdeui/kanimwidget.h
+++ b/tdeui/kanimwidget.h
@@ -20,7 +20,7 @@
#include <tqframe.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQStringList;
class TQPainter;
diff --git a/tdeui/karrowbutton.h b/tdeui/karrowbutton.h
index 96c2be8e..1d4c20bc 100644
--- a/tdeui/karrowbutton.h
+++ b/tdeui/karrowbutton.h
@@ -21,7 +21,7 @@
#include <tqpushbutton.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KArrowButtonPrivate;
/**
diff --git a/tdeui/kauthicon.h b/tdeui/kauthicon.h
index a55819e2..ef25de41 100644
--- a/tdeui/kauthicon.h
+++ b/tdeui/kauthicon.h
@@ -23,7 +23,7 @@
#include <tqstring.h>
#include <tqwidget.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQHBoxLayout;
class TQLabel;
diff --git a/tdeui/kbuttonbox.h b/tdeui/kbuttonbox.h
index d30b1b94..381cf8ba 100644
--- a/tdeui/kbuttonbox.h
+++ b/tdeui/kbuttonbox.h
@@ -20,7 +20,7 @@
#ifndef __KBUTTONBOX__H__
#define __KBUTTONBOX__H__
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#include <tqwidget.h>
class TQPushButton;
diff --git a/tdeui/kcharselect.h b/tdeui/kcharselect.h
index 7aa9ca78..244f0695 100644
--- a/tdeui/kcharselect.h
+++ b/tdeui/kcharselect.h
@@ -29,7 +29,7 @@
#include <tqpoint.h>
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQFont;
class TQFontDatabase;
diff --git a/tdeui/kcmenumngr.h b/tdeui/kcmenumngr.h
index 605fa43c..f59ec828 100644
--- a/tdeui/kcmenumngr.h
+++ b/tdeui/kcmenumngr.h
@@ -26,7 +26,7 @@
#include <tqptrdict.h>
#include <tqkeysequence.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQWidget;
class TQPopupMenu;
diff --git a/tdeui/kcmodule.h b/tdeui/kcmodule.h
index eec6c7f3..40a14b61 100644
--- a/tdeui/kcmodule.h
+++ b/tdeui/kcmodule.h
@@ -25,7 +25,7 @@
#include <tqwidget.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQStringList;
diff --git a/tdeui/kcolorbutton.h b/tdeui/kcolorbutton.h
index ebc3f59a..40d069bb 100644
--- a/tdeui/kcolorbutton.h
+++ b/tdeui/kcolorbutton.h
@@ -22,7 +22,7 @@
#include <tqpushbutton.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KColorButtonPrivate;
/**
diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp
index cb5b9906..9f0ae972 100644
--- a/tdeui/kcolordialog.cpp
+++ b/tdeui/kcolordialog.cpp
@@ -645,7 +645,7 @@ KPaletteTable::readNamedColor( void )
return; // Strings already present
}
- KGlobal::locale()->insertCatalogue("kdelibs_colors");
+ KGlobal::locale()->insertCatalogue("tdelibs_colors");
//
// Code somewhat inspired by KPalette.
diff --git a/tdeui/kcolordrag.h b/tdeui/kcolordrag.h
index 9c834bdf..55f69de0 100644
--- a/tdeui/kcolordrag.h
+++ b/tdeui/kcolordrag.h
@@ -24,7 +24,7 @@
#include <tqdragobject.h>
#include <tqcolor.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KColorDragPrivate;
/**
diff --git a/tdeui/kcommand.h b/tdeui/kcommand.h
index 8ba782a2..f802f8d6 100644
--- a/tdeui/kcommand.h
+++ b/tdeui/kcommand.h
@@ -24,7 +24,7 @@
#include <tqptrlist.h>
#include <tqstring.h>
#include <tqobject.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KAction;
class KActionCollection;
diff --git a/tdeui/kconfigdialog.cpp b/tdeui/kconfigdialog.cpp
index 2a6f95a2..ccbba1cf 100644
--- a/tdeui/kconfigdialog.cpp
+++ b/tdeui/kconfigdialog.cpp
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (C) 2003 Benjamin C Meyer (ben+kdelibs at meyerhome dot net)
+ * Copyright (C) 2003 Benjamin C Meyer (ben+tdelibs at meyerhome dot net)
* Copyright (C) 2003 Waldo Bastian <bastian@kde.org>
* Copyright (C) 2004 Michael Brade <brade@kde.org>
*
diff --git a/tdeui/kconfigdialog.h b/tdeui/kconfigdialog.h
index 167834c8..9268ab1f 100644
--- a/tdeui/kconfigdialog.h
+++ b/tdeui/kconfigdialog.h
@@ -1,6 +1,6 @@
/*
* This file is part of the KDE libraries
- * Copyright (C) 2003 Benjamin C Meyer (ben+kdelibs at meyerhome dot net)
+ * Copyright (C) 2003 Benjamin C Meyer (ben+tdelibs at meyerhome dot net)
* Copyright (C) 2003 Waldo Bastian <bastian@kde.org>
*
* This library is free software; you can redistribute it and/or
diff --git a/tdeui/kcursor.h b/tdeui/kcursor.h
index 6838445b..7be14601 100644
--- a/tdeui/kcursor.h
+++ b/tdeui/kcursor.h
@@ -24,7 +24,7 @@
#define _KCURSOR_H
#include <tqcursor.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQWidget;
diff --git a/tdeui/kdatepicker.h b/tdeui/kdatepicker.h
index 08d030ac..52288421 100644
--- a/tdeui/kdatepicker.h
+++ b/tdeui/kdatepicker.h
@@ -21,7 +21,7 @@
#define KDATEPICKER_H
#include <tqdatetime.h>
#include <tqframe.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQLineEdit;
class TQToolButton;
diff --git a/tdeui/kdatetbl.h b/tdeui/kdatetbl.h
index 76208979..159b3224 100644
--- a/tdeui/kdatetbl.h
+++ b/tdeui/kdatetbl.h
@@ -28,7 +28,7 @@
#include <tqdatetime.h>
#include <tqcolor.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KPopupMenu;
diff --git a/tdeui/kdatetimewidget.h b/tdeui/kdatetimewidget.h
index 35439e45..6c14448e 100644
--- a/tdeui/kdatetimewidget.h
+++ b/tdeui/kdatetimewidget.h
@@ -22,7 +22,7 @@
#include <tqwidget.h>
#include <tqdatetime.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* @short A combination of a date and a time selection widget.
diff --git a/tdeui/kdatewidget.h b/tdeui/kdatewidget.h
index fbb19243..fc32a1e2 100644
--- a/tdeui/kdatewidget.h
+++ b/tdeui/kdatewidget.h
@@ -22,7 +22,7 @@
#include <tqwidget.h>
#include <tqdatetime.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* @short A pushbutton to display or allow user selection of a date.
diff --git a/tdeui/kdcopactionproxy.h b/tdeui/kdcopactionproxy.h
index 7b5c2039..42926489 100644
--- a/tdeui/kdcopactionproxy.h
+++ b/tdeui/kdcopactionproxy.h
@@ -21,7 +21,7 @@
#include <dcopobject.h>
#include <dcopref.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KActionCollection;
class KAction;
diff --git a/tdeui/kdepackages.h b/tdeui/kdepackages.h
index 2997391c..275b8167 100644
--- a/tdeui/kdepackages.h
+++ b/tdeui/kdepackages.h
@@ -401,41 +401,41 @@ const char * const packages[] = {
"kde/clipboard",
"kde/dualhead",
"kde/xinerama",
-"kdeaddons",
-"kdeaddons/dirfilter-plugin",
-"kdeaddons/kate-cppsymbolviewer",
-"kdeaddons/kate-filelistloader",
-"kdeaddons/kate-filetemplates",
-"kdeaddons/kate-insertcommand",
-"kdeaddons/kate-xmltools",
-"kdeaddons/khtmlsettings-plugin",
-"kdeaddons/useragent-plugin",
+"tdeaddons",
+"tdeaddons/dirfilter-plugin",
+"tdeaddons/kate-cppsymbolviewer",
+"tdeaddons/kate-filelistloader",
+"tdeaddons/kate-filetemplates",
+"tdeaddons/kate-insertcommand",
+"tdeaddons/kate-xmltools",
+"tdeaddons/khtmlsettings-plugin",
+"tdeaddons/useragent-plugin",
"kdebugdialog",
-"kdelibs",
-"kdelibs/kbugreport",
-"kdelibs/kcertpart",
-"kdelibs/tdecore",
-"kdelibs/kded",
-"kdelibs/tdeinit",
-"kdelibs/tdesasl",
-"kdelibs/tdeui",
-"kdelibs/kedittoolbar",
-"kdelibs/kimgio",
-"kdelibs/klauncher",
-"kdelibs/klocale",
-"kdelibs/kmdi",
-"kdelibs/knetwork",
-"kdelibs/knewstuff",
-"kdelibs/knotify",
-"kdelibs/kspell",
-"kdelibs/kstyle",
-"kdelibs/ksycoca",
-"kdelibs/kwallet",
-"kdelibs/qt",
+"tdelibs",
+"tdelibs/kbugreport",
+"tdelibs/kcertpart",
+"tdelibs/tdecore",
+"tdelibs/kded",
+"tdelibs/tdeinit",
+"tdelibs/tdesasl",
+"tdelibs/tdeui",
+"tdelibs/kedittoolbar",
+"tdelibs/kimgio",
+"tdelibs/klauncher",
+"tdelibs/klocale",
+"tdelibs/kmdi",
+"tdelibs/knetwork",
+"tdelibs/knewstuff",
+"tdelibs/knotify",
+"tdelibs/kspell",
+"tdelibs/kstyle",
+"tdelibs/ksycoca",
+"tdelibs/kwallet",
+"tdelibs/qt",
"kdelirc",
"kdelirc/irkick",
"kdelirc/kcmlirc",
-"kdemultimedia",
+"tdemultimedia",
"kdepasswd",
"tdepimlibs",
"tdepimlibs/gpgme++",
@@ -451,10 +451,10 @@ const char * const packages[] = {
"tdeprint",
"tdeprint/tdeprintfax",
"tdeprint/kjobviewer",
-"kdesdk-scripts",
-"kdesdk-scripts/Miscellaneous",
-"kdesdk-scripts/cmake",
-"kdesdk-scripts/source_control",
+"tdesdk-scripts",
+"tdesdk-scripts/Miscellaneous",
+"tdesdk-scripts/cmake",
+"tdesdk-scripts/source_control",
"kdesktop",
"kdesktop/icons",
"kdesktop/minicli",
@@ -463,66 +463,66 @@ const char * const packages[] = {
"tdesu",
"tdesu/tdesu",
"tdesu/tdesud",
-"kdesvn-build",
+"tdesvn-build",
"kdetv",
-"kdevelop",
-"kdevelop/Appwizard Templates",
-"kdevelop/Build tools: ANT",
-"kdevelop/Build tools: Automake",
-"kdevelop/Build tools: Custom Makefiles",
-"kdevelop/Build tools: QMake",
-"kdevelop/Buildtools: Make",
-"kdevelop/CPP Debugger",
-"kdevelop/CTags",
-"kdevelop/Language Support: Ada",
-"kdevelop/Language Support: CPP",
-"kdevelop/Language Support: Java",
-"kdevelop/Language Support: PHP",
-"kdevelop/Language Support: Pascal",
-"kdevelop/Language Support: Perl",
-"kdevelop/Language Support: Python",
-"kdevelop/Language Support: Ruby",
-"kdevelop/Output Views",
-"kdevelop/Profiles",
-"kdevelop/Qt Designer Integration",
-"kdevelop/UI: IDEAl",
-"kdevelop/UI: all modes",
-"kdevelop/UI: childframe window",
-"kdevelop/UI: tabbed pages",
-"kdevelop/UI: toplevel window",
-"kdevelop/VCS: CVS",
-"kdevelop/VCS: CVSService",
-"kdevelop/VCS: Clearcase",
-"kdevelop/VCS: Perforce",
-"kdevelop/VCS: SVN",
-"kdevelop/abbreviation plugin",
-"kdevelop/all build tools",
-"kdevelop/all editors",
-"kdevelop/appwizard",
-"kdevelop/astyle",
-"kdevelop/bookmarks part",
-"kdevelop/classview",
-"kdevelop/code completion",
-"kdevelop/cpp-parser",
-"kdevelop/distpart",
-"kdevelop/doctreeview",
-"kdevelop/documentation viewer",
-"kdevelop/doxygen integration",
-"kdevelop/file create",
-"kdevelop/file groups",
-"kdevelop/file selector",
-"kdevelop/file tree",
-"kdevelop/grep frontend",
-"kdevelop/kate integration",
-"kdevelop/kdevelop 2.x (obsolete)",
-"kdevelop/konsole part",
-"kdevelop/partexplorer",
-"kdevelop/php support",
-"kdevelop/problem reporter",
-"kdevelop/qeditor",
-"kdevelop/replace part",
-"kdevelop/scriptproject",
-"kdevelop/valgrind integration",
+"tdevelop",
+"tdevelop/Appwizard Templates",
+"tdevelop/Build tools: ANT",
+"tdevelop/Build tools: Automake",
+"tdevelop/Build tools: Custom Makefiles",
+"tdevelop/Build tools: QMake",
+"tdevelop/Buildtools: Make",
+"tdevelop/CPP Debugger",
+"tdevelop/CTags",
+"tdevelop/Language Support: Ada",
+"tdevelop/Language Support: CPP",
+"tdevelop/Language Support: Java",
+"tdevelop/Language Support: PHP",
+"tdevelop/Language Support: Pascal",
+"tdevelop/Language Support: Perl",
+"tdevelop/Language Support: Python",
+"tdevelop/Language Support: Ruby",
+"tdevelop/Output Views",
+"tdevelop/Profiles",
+"tdevelop/Qt Designer Integration",
+"tdevelop/UI: IDEAl",
+"tdevelop/UI: all modes",
+"tdevelop/UI: childframe window",
+"tdevelop/UI: tabbed pages",
+"tdevelop/UI: toplevel window",
+"tdevelop/VCS: CVS",
+"tdevelop/VCS: CVSService",
+"tdevelop/VCS: Clearcase",
+"tdevelop/VCS: Perforce",
+"tdevelop/VCS: SVN",
+"tdevelop/abbreviation plugin",
+"tdevelop/all build tools",
+"tdevelop/all editors",
+"tdevelop/appwizard",
+"tdevelop/astyle",
+"tdevelop/bookmarks part",
+"tdevelop/classview",
+"tdevelop/code completion",
+"tdevelop/cpp-parser",
+"tdevelop/distpart",
+"tdevelop/doctreeview",
+"tdevelop/documentation viewer",
+"tdevelop/doxygen integration",
+"tdevelop/file create",
+"tdevelop/file groups",
+"tdevelop/file selector",
+"tdevelop/file tree",
+"tdevelop/grep frontend",
+"tdevelop/kate integration",
+"tdevelop/tdevelop 2.x (obsolete)",
+"tdevelop/konsole part",
+"tdevelop/partexplorer",
+"tdevelop/php support",
+"tdevelop/problem reporter",
+"tdevelop/qeditor",
+"tdevelop/replace part",
+"tdevelop/scriptproject",
+"tdevelop/valgrind integration",
"kdevplatform",
"kdevplatform/classbrowser",
"kdevplatform/contextbrowser",
diff --git a/tdeui/kdialog.h b/tdeui/kdialog.h
index e829cb4c..fff80a10 100644
--- a/tdeui/kdialog.h
+++ b/tdeui/kdialog.h
@@ -23,7 +23,7 @@
#define _KDIALOG_H_
#include <tqdialog.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQLayoutItem;
diff --git a/tdeui/kdockwidget.h b/tdeui/kdockwidget.h
index daf6368b..c084dff5 100644
--- a/tdeui/kdockwidget.h
+++ b/tdeui/kdockwidget.h
@@ -1,6 +1,6 @@
/* This file is part of the KDE libraries
Copyright (C) 2000 Max Judin <novaprint@mtu-net.ru>
- Copyright (C) 2000 Falk Brettschneider <falk@kdevelop.org>
+ Copyright (C) 2000 Falk Brettschneider <falk@tdevelop.org>
Copyright (C) 2002,2003 Joseph Wenninger <jowenn@kde.org>
This library is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
-----------
05/2001 - : useful patches, bugfixes by Christoph Cullmann <crossfire@babylon2k.de>,
Joseph Wenninger <jowenn@bigfoot.com> and Falk Brettschneider
- 03/2001 - 05/2001 : maintained and enhanced by Falk Brettschneider <falk@kdevelop.org>
+ 03/2001 - 05/2001 : maintained and enhanced by Falk Brettschneider <falk@tdevelop.org>
03/2000 : class documentation added by Falk Brettschneider <gigafalk@yahoo.com>
10/1999 - 03/2000 : programmed by Max Judin <novaprint@mtu-net.ru>
diff --git a/tdeui/kdualcolorbutton.h b/tdeui/kdualcolorbutton.h
index aff55c1e..3dd8b1e0 100644
--- a/tdeui/kdualcolorbutton.h
+++ b/tdeui/kdualcolorbutton.h
@@ -22,7 +22,7 @@ class TQBitmap;
#include <tqbrush.h>
#include <tqwidget.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* @short A widget for selecting two related colors.
diff --git a/tdeui/keditlistbox.h b/tdeui/keditlistbox.h
index 069907a6..b7b988a7 100644
--- a/tdeui/keditlistbox.h
+++ b/tdeui/keditlistbox.h
@@ -23,7 +23,7 @@
#include <tqgroupbox.h>
#include <tqlistbox.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KLineEdit;
class KComboBox;
diff --git a/tdeui/kfontrequester.h b/tdeui/kfontrequester.h
index a397ffcd..f9a8d06c 100644
--- a/tdeui/kfontrequester.h
+++ b/tdeui/kfontrequester.h
@@ -24,7 +24,7 @@
#include <tqfont.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQLabel;
class TQPushButton;
diff --git a/tdeui/khelpmenu.h b/tdeui/khelpmenu.h
index 9a87c4f1..e58569bf 100644
--- a/tdeui/khelpmenu.h
+++ b/tdeui/khelpmenu.h
@@ -25,7 +25,7 @@
#include <tqobject.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KActionCollection;
class KPopupMenu;
diff --git a/tdeui/kiconview.h b/tdeui/kiconview.h
index 5071f263..12b120b0 100644
--- a/tdeui/kiconview.h
+++ b/tdeui/kiconview.h
@@ -21,7 +21,7 @@
#include <tqcursor.h>
#include <tqiconview.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* @short A variant of TQIconView that honors KDE's system-wide settings.
diff --git a/tdeui/klanguagebutton.h b/tdeui/klanguagebutton.h
index f15bd5a9..e13ad956 100644
--- a/tdeui/klanguagebutton.h
+++ b/tdeui/klanguagebutton.h
@@ -29,7 +29,7 @@
#include <tqwidget.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KLanguageButtonPrivate;
class TQIconSet;
diff --git a/tdeui/kled.h b/tdeui/kled.h
index f060c892..e945871a 100644
--- a/tdeui/kled.h
+++ b/tdeui/kled.h
@@ -24,7 +24,7 @@
#define _KLED_H_
#include <tqwidget.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQColor;
/**
diff --git a/tdeui/klistbox.h b/tdeui/klistbox.h
index 810c5bfd..981cfa3a 100644
--- a/tdeui/klistbox.h
+++ b/tdeui/klistbox.h
@@ -20,7 +20,7 @@
#include <tqlistbox.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* @short A variant of TQListBox that honors KDE's system-wide settings.
diff --git a/tdeui/klistview.h b/tdeui/klistview.h
index b15f9c9c..07b51445 100644
--- a/tdeui/klistview.h
+++ b/tdeui/klistview.h
@@ -23,7 +23,7 @@
#include <tqlistview.h>
#include <tqptrlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQDragObject;
class KConfig;
diff --git a/tdeui/kmenubar.h b/tdeui/kmenubar.h
index 68cb24dd..7509ff83 100644
--- a/tdeui/kmenubar.h
+++ b/tdeui/kmenubar.h
@@ -27,7 +27,7 @@
#include <tqmenubar.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* %KDE Style-able menubar.
diff --git a/tdeui/knuminput.h b/tdeui/knuminput.h
index 3c4cb15f..8f6b2391 100644
--- a/tdeui/knuminput.h
+++ b/tdeui/knuminput.h
@@ -29,7 +29,7 @@
#include <tqwidget.h>
#include <tqspinbox.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQLabel;
class TQSlider;
diff --git a/tdeui/knumvalidator.h b/tdeui/knumvalidator.h
index 04d5bf27..24596923 100644
--- a/tdeui/knumvalidator.h
+++ b/tdeui/knumvalidator.h
@@ -26,7 +26,7 @@
#include <tqvalidator.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQWidget;
class TQString;
diff --git a/tdeui/kpanelextension.h b/tdeui/kpanelextension.h
index c96cc354..15d49d9d 100644
--- a/tdeui/kpanelextension.h
+++ b/tdeui/kpanelextension.h
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define __kpanelextension_h__
#include <tqframe.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQPopupMenu;
class KConfig;
diff --git a/tdeui/kpassivepopup.h b/tdeui/kpassivepopup.h
index feacfe31..3fc4f3a2 100644
--- a/tdeui/kpassivepopup.h
+++ b/tdeui/kpassivepopup.h
@@ -13,7 +13,7 @@
#include <tqframe.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQBoxLayout;
class TQTimer;
diff --git a/tdeui/kpixmapio.h b/tdeui/kpixmapio.h
index 8d69221f..24537464 100644
--- a/tdeui/kpixmapio.h
+++ b/tdeui/kpixmapio.h
@@ -11,7 +11,7 @@
#ifndef __KPixmapIO_h_Included__
#define __KPixmapIO_h_Included__
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQPixmap;
class TQImage;
diff --git a/tdeui/kpixmapregionselectorwidget.cpp b/tdeui/kpixmapregionselectorwidget.cpp
index 1af5ef14..615b50a2 100644
--- a/tdeui/kpixmapregionselectorwidget.cpp
+++ b/tdeui/kpixmapregionselectorwidget.cpp
@@ -18,7 +18,7 @@
*/
/* NOTE: There are two copies of this .h and the .cpp file, with subtle differences.
- * One copy is in kdelibs/tdeui, and the other copy is in tdepim/libtdepim
+ * One copy is in tdelibs/tdeui, and the other copy is in tdepim/libtdepim
* This is because tdepim has to remain backwards compatible. Any changes
* to either file should be made to the other.
*/
diff --git a/tdeui/kpixmapregionselectorwidget.h b/tdeui/kpixmapregionselectorwidget.h
index 0e7f13e9..344580ff 100644
--- a/tdeui/kpixmapregionselectorwidget.h
+++ b/tdeui/kpixmapregionselectorwidget.h
@@ -27,14 +27,14 @@
class KPopupMenu;
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* KPixmapRegionSelectorWidget is a widget that shows a picture and provides the
* user with a friendly way to select a rectangular subregion of the pixmap.
*
* NOTE: There are two copies of this .h and the .cpp file, with subtle differences.
- * One copy is in kdelibs/tdeui, and the other copy is in tdepim/libtdepim
+ * One copy is in tdelibs/tdeui, and the other copy is in tdepim/libtdepim
* This is because tdepim has to remain backwards compatible. Any changes
* to either file should be made to the other.
*
diff --git a/tdeui/kpopupmenu.h b/tdeui/kpopupmenu.h
index 0eab0971..82f4ee20 100644
--- a/tdeui/kpopupmenu.h
+++ b/tdeui/kpopupmenu.h
@@ -23,7 +23,7 @@
#include <tqpopupmenu.h>
#include <kpixmapeffect.h>
#include <kpixmap.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* @short KPopupMenu title widget.
*
diff --git a/tdeui/krootpixmap.h b/tdeui/krootpixmap.h
index c773780e..8ca135e1 100644
--- a/tdeui/krootpixmap.h
+++ b/tdeui/krootpixmap.h
@@ -13,7 +13,7 @@
#include <tqobject.h>
#include <tqcolor.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#ifndef Q_WS_QWS //FIXME
diff --git a/tdeui/kruler.h b/tdeui/kruler.h
index efb9b141..1c48a36d 100644
--- a/tdeui/kruler.h
+++ b/tdeui/kruler.h
@@ -23,7 +23,7 @@
#include <tqframe.h>
#include <tqrangecontrol.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* A ruler widget.
diff --git a/tdeui/ksconfig.h b/tdeui/ksconfig.h
index c3741488..b9cabe22 100644
--- a/tdeui/ksconfig.h
+++ b/tdeui/ksconfig.h
@@ -22,7 +22,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQCheckBox;
class TQComboBox;
diff --git a/tdeui/kscrollview.h b/tdeui/kscrollview.h
index 263e415f..315ea1c8 100644
--- a/tdeui/kscrollview.h
+++ b/tdeui/kscrollview.h
@@ -20,7 +20,7 @@
#include <tqscrollview.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* @short A variant of TQScrollView that supports smooth scrolling.
diff --git a/tdeui/kselect.h b/tdeui/kselect.h
index 387f5cf0..b9ab92fd 100644
--- a/tdeui/kselect.h
+++ b/tdeui/kselect.h
@@ -27,7 +27,7 @@
#include <tqrangecontrol.h>
#include <tqpixmap.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* KXYSelector is the base class for other widgets which
diff --git a/tdeui/kseparator.h b/tdeui/kseparator.h
index 171b1323..17ff7253 100644
--- a/tdeui/kseparator.h
+++ b/tdeui/kseparator.h
@@ -22,7 +22,7 @@
#include <tqframe.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* Standard horizontal or vertical separator.
diff --git a/tdeui/ksharedpixmap.h b/tdeui/ksharedpixmap.h
index 43f11098..07431678 100644
--- a/tdeui/ksharedpixmap.h
+++ b/tdeui/ksharedpixmap.h
@@ -40,7 +40,7 @@ class KSharedPixmapPrivate;
*
* The server part of shared pixmaps is not implemented here.
* That part is provided by KPixmapServer, in the source file:
- * kdebase/kdesktop/pixmapserver.cc.
+ * tdebase/kdesktop/pixmapserver.cc.
*
* An example: copy from a shared pixmap:
* \code
diff --git a/tdeui/kspell.h b/tdeui/kspell.h
index 95f07cee..e96b61a2 100644
--- a/tdeui/kspell.h
+++ b/tdeui/kspell.h
@@ -24,7 +24,7 @@
#include <tqobject.h>
#include <tqstringlist.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQTextCodec;
class KProcIO;
diff --git a/tdeui/ksplashscreen.h b/tdeui/ksplashscreen.h
index 79aebf57..f4d1c22e 100644
--- a/tdeui/ksplashscreen.h
+++ b/tdeui/ksplashscreen.h
@@ -22,7 +22,7 @@
#include <tqsplashscreen.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQPixmap;
diff --git a/tdeui/ksqueezedtextlabel.h b/tdeui/ksqueezedtextlabel.h
index b6a46f57..f8c11b19 100644
--- a/tdeui/ksqueezedtextlabel.h
+++ b/tdeui/ksqueezedtextlabel.h
@@ -21,7 +21,7 @@
#include <tqlabel.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* @short A replacement for TQLabel that squeezes its text
diff --git a/tdeui/kstatusbar.h b/tdeui/kstatusbar.h
index 11a03455..580c8467 100644
--- a/tdeui/kstatusbar.h
+++ b/tdeui/kstatusbar.h
@@ -24,7 +24,7 @@
#include <tqstatusbar.h>
#include <tqintdict.h>
#include <tqlabel.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KStatusBar;
diff --git a/tdeui/kstdaction.h b/tdeui/kstdaction.h
index cfbd9a37..7fa18968 100644
--- a/tdeui/kstdaction.h
+++ b/tdeui/kstdaction.h
@@ -30,7 +30,7 @@ class KToggleFullScreenAction;
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* Convenience methods to access all standard KDE actions.
diff --git a/tdeui/kstringvalidator.h b/tdeui/kstringvalidator.h
index 55905ab7..af0ce5ef 100644
--- a/tdeui/kstringvalidator.h
+++ b/tdeui/kstringvalidator.h
@@ -25,7 +25,7 @@
#include <tqvalidator.h>
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* @short A TQValidator to (dis)allow certain strings
diff --git a/tdeui/ksyntaxhighlighter.h b/tdeui/ksyntaxhighlighter.h
index e5cf5a69..6ac4264a 100644
--- a/tdeui/ksyntaxhighlighter.h
+++ b/tdeui/ksyntaxhighlighter.h
@@ -29,7 +29,7 @@
#include <tqcolor.h>
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQAccel;
class TQTimer;
diff --git a/tdeui/ktabbar.h b/tdeui/ktabbar.h
index b7d93c32..3877994e 100644
--- a/tdeui/ktabbar.h
+++ b/tdeui/ktabbar.h
@@ -23,7 +23,7 @@
#include <tqtabbar.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQTimer;
class TQPushButton;
diff --git a/tdeui/ktabctl.h b/tdeui/ktabctl.h
index ba353c1f..b24ea889 100644
--- a/tdeui/ktabctl.h
+++ b/tdeui/ktabctl.h
@@ -27,7 +27,7 @@
#include <tqtabbar.h>
#include <tqmemarray.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* Tabbed dialog with extended features.
diff --git a/tdeui/ktabwidget.h b/tdeui/ktabwidget.h
index 9b215191..d63e41c0 100644
--- a/tdeui/ktabwidget.h
+++ b/tdeui/ktabwidget.h
@@ -24,7 +24,7 @@
#include <tqtabwidget.h>
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KTabWidgetPrivate;
diff --git a/tdeui/ktextbrowser.h b/tdeui/ktextbrowser.h
index 7401d526..32c81bd4 100644
--- a/tdeui/ktextbrowser.h
+++ b/tdeui/ktextbrowser.h
@@ -22,7 +22,7 @@
#include <tqtextbrowser.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* @short Extended TQTextBrowser.
diff --git a/tdeui/ktextedit.h b/tdeui/ktextedit.h
index 5150dfb6..930409b0 100644
--- a/tdeui/ktextedit.h
+++ b/tdeui/ktextedit.h
@@ -22,7 +22,7 @@
#include <tqtextedit.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KSpell;
diff --git a/tdeui/ktimewidget.h b/tdeui/ktimewidget.h
index 24d762a7..7cb5239c 100644
--- a/tdeui/ktimewidget.h
+++ b/tdeui/ktimewidget.h
@@ -22,7 +22,7 @@
#include <tqwidget.h>
#include <tqdatetime.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* @short A time selection widget.
diff --git a/tdeui/ktimezonewidget.h b/tdeui/ktimezonewidget.h
index 03764d24..8e42e3a6 100644
--- a/tdeui/ktimezonewidget.h
+++ b/tdeui/ktimezonewidget.h
@@ -20,7 +20,7 @@
#ifndef KTIMEZONEWIDGET_H
#define KTIMEZONEWIDGET_H
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#include <klistview.h>
#include <tqstring.h>
diff --git a/tdeui/ktoolbarradiogroup.h b/tdeui/ktoolbarradiogroup.h
index 7a4ae8be..6b2cc514 100644
--- a/tdeui/ktoolbarradiogroup.h
+++ b/tdeui/ktoolbarradiogroup.h
@@ -24,7 +24,7 @@
#include <tqobject.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KToolBar;
class KToolBarButtonList;
diff --git a/tdeui/kurllabel.h b/tdeui/kurllabel.h
index cff7bee8..e77b8d5e 100644
--- a/tdeui/kurllabel.h
+++ b/tdeui/kurllabel.h
@@ -23,7 +23,7 @@
#include <tqlabel.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQColor;
class TQCursor;
diff --git a/tdeui/kwizard.h b/tdeui/kwizard.h
index 44df0595..56995a2e 100644
--- a/tdeui/kwizard.h
+++ b/tdeui/kwizard.h
@@ -25,7 +25,7 @@
#include <tqwizard.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* General-purpose multi-page dialog.
diff --git a/tdeui/kwordwrap.h b/tdeui/kwordwrap.h
index 2681bfa2..50d90e1e 100644
--- a/tdeui/kwordwrap.h
+++ b/tdeui/kwordwrap.h
@@ -24,7 +24,7 @@
#include <tqrect.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* Word-wrap algorithm that takes into account beautifulness ;)
diff --git a/tdeui/kxmlguibuilder.h b/tdeui/kxmlguibuilder.h
index 2cd77ef4..f32c3024 100644
--- a/tdeui/kxmlguibuilder.h
+++ b/tdeui/kxmlguibuilder.h
@@ -23,7 +23,7 @@
#include <tqdom.h>
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KXMLGUIBuilderPrivate;
class TQWidget;
diff --git a/tdeui/kxmlguiclient.h b/tdeui/kxmlguiclient.h
index 194491d3..c05a1afd 100644
--- a/tdeui/kxmlguiclient.h
+++ b/tdeui/kxmlguiclient.h
@@ -24,7 +24,7 @@
#include <tqmap.h>
#include <tqstringlist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class TQWidget;
class KAction;
diff --git a/tdeui/kxmlguifactory.h b/tdeui/kxmlguifactory.h
index 02c759f1..9b473379 100644
--- a/tdeui/kxmlguifactory.h
+++ b/tdeui/kxmlguifactory.h
@@ -26,7 +26,7 @@
#include <tqdom.h>
#include <tqvaluelist.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
class KAction;
class KXMLGUIFactoryPrivate;
diff --git a/tdeui/qxembed.cpp b/tdeui/qxembed.cpp
index e81e58b3..769625a8 100644
--- a/tdeui/qxembed.cpp
+++ b/tdeui/qxembed.cpp
@@ -447,7 +447,7 @@ static int qxembed_x11_event_filter( XEvent* e)
extra->embedded = 1;
#ifdef USE_QT4
// [FIXME]
- printf("[FIXME] WId not set in kdelibs/tdeui/qxembed.cpp\n\r");
+ printf("[FIXME] WId not set in tdelibs/tdeui/qxembed.cpp\n\r");
#else // USE_QT4
extra->parentWinId = e->xclient.data.l[3];
#endif // USE_QT4
@@ -1320,7 +1320,7 @@ void QXEmbed::embedClientIntoWindow(TQWidget* client, WId window)
((QXEmbed*)client)->topData()->embedded = true;
#ifdef USE_QT4
// [FIXME]
- printf("[FIXME] WId not set in kdelibs/tdeui/qxembed.cpp\n\r");
+ printf("[FIXME] WId not set in tdelibs/tdeui/qxembed.cpp\n\r");
#else // USE_QT4
((QXEmbed*)client)->topData()->parentWinId = window;
#endif // USE_QT4
diff --git a/tdeui/qxembed.h b/tdeui/qxembed.h
index 626f8960..03ebff8e 100644
--- a/tdeui/qxembed.h
+++ b/tdeui/qxembed.h
@@ -23,7 +23,7 @@
#define QXEMBED_H
#include <tqwidget.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#ifdef Q_MOC_RUN
#define Q_WS_X11
diff --git a/tdeui/tests/kcolordlgtest.cpp b/tdeui/tests/kcolordlgtest.cpp
index a7e64928..f372e6a9 100644
--- a/tdeui/tests/kcolordlgtest.cpp
+++ b/tdeui/tests/kcolordlgtest.cpp
@@ -26,7 +26,7 @@ int main( int argc, char *argv[] )
{
TQColor color;
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
TQApplication::setColorMode( TQApplication::CustomColors );
KApplication a( argc, argv, "KColorDialogTest" );
KConfig aConfig;
diff --git a/tdeui/tests/kdatepicktest.cpp b/tdeui/tests/kdatepicktest.cpp
index c982dbe9..bea01a43 100644
--- a/tdeui/tests/kdatepicktest.cpp
+++ b/tdeui/tests/kdatepicktest.cpp
@@ -5,7 +5,7 @@
int main(int argc, char** argv)
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KApplication app(argc, argv, "KDatePickertest");
KDatePicker picker;
app.setMainWidget(&picker);
diff --git a/tdeui/tests/kdatetimewidgettest.cpp b/tdeui/tests/kdatetimewidgettest.cpp
index fd3680be..ab55b0a3 100644
--- a/tdeui/tests/kdatetimewidgettest.cpp
+++ b/tdeui/tests/kdatetimewidgettest.cpp
@@ -4,7 +4,7 @@
int main(int argc, char** argv)
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KApplication app(argc, argv, "KDateTimeWidgettest");
KDateTimeWidget dateTimeWidget;
app.setMainWidget(&dateTimeWidget);
diff --git a/tdeui/tests/kdatewidgettest.cpp b/tdeui/tests/kdatewidgettest.cpp
index 8550ab36..af75b42b 100644
--- a/tdeui/tests/kdatewidgettest.cpp
+++ b/tdeui/tests/kdatewidgettest.cpp
@@ -5,7 +5,7 @@
int main(int argc, char** argv)
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KApplication app(argc, argv, "KDateWidgettest");
KDateWidget dateWidget;
app.setMainWidget(&dateWidget);
diff --git a/tdeui/tests/kdialogbasetest.cpp b/tdeui/tests/kdialogbasetest.cpp
index ec77e745..35da840a 100644
--- a/tdeui/tests/kdialogbasetest.cpp
+++ b/tdeui/tests/kdialogbasetest.cpp
@@ -44,7 +44,7 @@ int main(int argc, char** argv)
KDialogBase dialog;
/* Set a help chapter. If you do not set one, the link is not shown, and the
upper part of the frame shrinks as much as possible. The help window "
- "will of course only pop up if you correctly installed kdebase. */
+ "will of course only pop up if you correctly installed tdebase. */
// I disabled it, as khcclient did not run for me.
// dialog.setHelp("kdehelp/intro.html", "", "");
/* This TQTextView is intended to be the main widget of our dialog. The
diff --git a/tdeui/tests/ktimewidgettest.cpp b/tdeui/tests/ktimewidgettest.cpp
index f2767b41..324accc7 100644
--- a/tdeui/tests/ktimewidgettest.cpp
+++ b/tdeui/tests/ktimewidgettest.cpp
@@ -4,7 +4,7 @@
int main(int argc, char** argv)
{
- KLocale::setMainCatalogue("kdelibs");
+ KLocale::setMainCatalogue("tdelibs");
KApplication app(argc, argv, "KTimeWidgettest");
KTimeWidget timeWidget;
app.setMainWidget(&timeWidget);
diff --git a/tdeui/twindowinfo.h b/tdeui/twindowinfo.h
index 780578d7..df1333c2 100644
--- a/tdeui/twindowinfo.h
+++ b/tdeui/twindowinfo.h
@@ -13,7 +13,7 @@
#include <tqpixmap.h>
#include <tqstring.h>
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
/**
* Displays messages in the window icon and title. The message is usually
diff --git a/win/common.pro b/win/common.pro
index a27fe889..12816231 100644
--- a/win/common.pro
+++ b/win/common.pro
@@ -142,12 +142,12 @@ contains( TEMPLATE, lib ) {
# global definitions
win32-borland {
- QMAKE_CXXFLAGS += /I $(KDELIBS)/win/kdelibs_global_win.h
- QMAKE_CFLAGS += /I $(KDELIBS)/win/kdelibs_global_win.h
+ QMAKE_CXXFLAGS += /I $(KDELIBS)/win/tdelibs_global_win.h
+ QMAKE_CFLAGS += /I $(KDELIBS)/win/tdelibs_global_win.h
}
win32-msvc* {
- QMAKE_CXXFLAGS += /FI$(KDELIBS)/win/kdelibs_global_win.h
- QMAKE_CFLAGS += /FI$(KDELIBS)/win/kdelibs_global_win.h
+ QMAKE_CXXFLAGS += /FI$(KDELIBS)/win/tdelibs_global_win.h
+ QMAKE_CFLAGS += /FI$(KDELIBS)/win/tdelibs_global_win.h
# Language Extensions
QMAKE_CXXFLAGS += /Ze
diff --git a/win/config.h b/win/config.h
index 46549814..40bba653 100644
--- a/win/config.h
+++ b/win/config.h
@@ -22,7 +22,7 @@
#ifndef _KDE_WIN_CONFIG_H_
#define _KDE_WIN_CONFIG_H_
-#include <kdelibs_export.h>
+#include <tdelibs_export.h>
#ifndef HAVE_LIMITS_H
#define HAVE_LIMITS_H 1
diff --git a/win/dirent.h b/win/dirent.h
index 19af3be3..e6e67c73 100644
--- a/win/dirent.h
+++ b/win/dirent.h
@@ -22,7 +22,7 @@
#ifndef _SYS_DIRENT_H
#define _SYS_DIRENT_H
-#include <tdecore/kdelibs_export.h>
+#include <tdecore/tdelibs_export.h>
#include <sys/types.h>
#include <io.h>
diff --git a/win/fcntl.h b/win/fcntl.h
index 4c495863..1dc65a17 100644
--- a/win/fcntl.h
+++ b/win/fcntl.h
@@ -20,7 +20,7 @@
#ifndef _FCNTL_H
#define _FCNTL_H
-#include <tdecore/kdelibs_export.h>
+#include <tdecore/tdelibs_export.h>
#ifdef __cplusplus
extern "C" {
diff --git a/win/kde_file_win.h b/win/kde_file_win.h
index 1c9e2230..0f32d266 100644
--- a/win/kde_file_win.h
+++ b/win/kde_file_win.h
@@ -27,7 +27,7 @@
#include <fcntl.h>
#include <ctype.h>
-#include <tdecore/kdelibs_export.h>
+#include <tdecore/tdelibs_export.h>
#ifdef __cplusplus
extern "C" {
diff --git a/win/pro_files/README.pro_files b/win/pro_files/README.pro_files
index 2192750f..4ea2cdd3 100644
--- a/win/pro_files/README.pro_files
+++ b/win/pro_files/README.pro_files
@@ -1,14 +1,14 @@
-kdelibs/win32 .pro files
+tdelibs/win32 .pro files
(c) 2003-2005, Jaroslaw Staniek
Add this directory to your PATH.
Cygwin or (other bash replacement) required.
-Please copy .pro files to destination kdelibs/
-subdirectores using update_kdelibs_pro_files scipt.
+Please copy .pro files to destination tdelibs/
+subdirectores using update_tdelibs_pro_files scipt.
-.pro files were copied here from kdelibs/ directory
-using collect_kdelibs_pro_files scipt.
+.pro files were copied here from tdelibs/ directory
+using collect_tdelibs_pro_files scipt.
Scripts are available in win/tools/.
diff --git a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro b/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro
index 448cec67..4e09b8bb 100644
--- a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro
+++ b/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro
@@ -4,9 +4,9 @@ include( $(KDELIBS)/win/common.pro )
#allow to select target independently from debug information
-kdebase_release:CONFIG -= console
-kdebase_release:CONFIG += windows
-kdebase_release:QMAKE_MAKEFILE = Makefile.release
+tdebase_release:CONFIG -= console
+tdebase_release:CONFIG += windows
+tdebase_release:QMAKE_MAKEFILE = Makefile.release
TARGET = kfiletreeviewtest
diff --git a/win/pro_files/tdecore/tdecore.pro b/win/pro_files/tdecore/tdecore.pro
index 04bfcd3f..23067323 100644
--- a/win/pro_files/tdecore/tdecore.pro
+++ b/win/pro_files/tdecore/tdecore.pro
@@ -69,7 +69,7 @@ kshortcut.cpp \
kshortcutmenu.cpp \
kshortcutlist.cpp \
kinstance.cpp \
-kdeversion.cpp \
+tdeversion.cpp \
klocale.cpp \
kicontheme.cpp \
kiconloader.cpp \
diff --git a/win/pwd.h b/win/pwd.h
index f827918f..6c544967 100644
--- a/win/pwd.h
+++ b/win/pwd.h
@@ -35,7 +35,7 @@
#ifndef _PWD_H_
-#include <tdecore/kdelibs_export.h>
+#include <tdecore/tdelibs_export.h>
#include <sys/types.h>
diff --git a/win/signal.h b/win/signal.h
index fc59997f..571280f4 100644
--- a/win/signal.h
+++ b/win/signal.h
@@ -20,7 +20,7 @@
#ifndef SIGNAL_H
#define SIGNAL_H
-#include <tdecore/kdelibs_export.h>
+#include <tdecore/tdelibs_export.h>
#ifdef __cplusplus
extern "C" {
diff --git a/win/stdlib.h b/win/stdlib.h
index 967b7653..96f458b0 100644
--- a/win/stdlib.h
+++ b/win/stdlib.h
@@ -21,7 +21,7 @@
* Definitions for common types, variables, and functions.
*/
-#include <tdecore/kdelibs_export.h>
+#include <tdecore/tdelibs_export.h>
#ifdef _MSC_VER
# include <msvc/stdlib.h>
diff --git a/win/string.h b/win/string.h
index 4c4ae2b9..2ed94261 100644
--- a/win/string.h
+++ b/win/string.h
@@ -20,7 +20,7 @@
#ifndef KDEWIN_STRING_H
#define KDEWIN_STRING_H
-#include <tdecore/kdelibs_export.h>
+#include <tdecore/tdelibs_export.h>
#define strncasecmp strnicmp
#define strcasecmp stricmp
diff --git a/win/sys/mman.h b/win/sys/mman.h
index 6ec8abcb..af12ce18 100644
--- a/win/sys/mman.h
+++ b/win/sys/mman.h
@@ -23,7 +23,7 @@
#ifndef _MMAP_H
#define _MMAP_H
-#include <tdecore/kdelibs_export.h>
+#include <tdecore/tdelibs_export.h>
#include <sys/types.h>
diff --git a/win/sys/resource.h b/win/sys/resource.h
index d49a21f4..91aee90d 100644
--- a/win/sys/resource.h
+++ b/win/sys/resource.h
@@ -20,7 +20,7 @@
#ifndef _SYS_RESOURCE_H_
#define _SYS_RESOURCE_H_
-#include <tdecore/kdelibs_export.h>
+#include <tdecore/tdelibs_export.h>
#include <sys/time.h>
#ifdef __cplusplus
diff --git a/win/sys/stat.h b/win/sys/stat.h
index f65a56e0..28878203 100644
--- a/win/sys/stat.h
+++ b/win/sys/stat.h
@@ -20,7 +20,7 @@
#ifndef _SYS_STAT_H
#define _SYS_STAT_H
-#include <tdecore/kdelibs_export.h>
+#include <tdecore/tdelibs_export.h>
/* regular sys/stat.h */
#ifdef _MSC_VER
diff --git a/win/sys/time.h b/win/sys/time.h
index ebb5144b..ea40014b 100644
--- a/win/sys/time.h
+++ b/win/sys/time.h
@@ -20,7 +20,7 @@
#ifndef _SYS_TIME_H_
#define _SYS_TIME_H_
-#include <tdecore/kdelibs_export.h>
+#include <tdecore/tdelibs_export.h>
//??#if !defined(_INC_TIME)
diff --git a/win/sys/times.h b/win/sys/times.h
index 6ee6d652..59d5992a 100644
--- a/win/sys/times.h
+++ b/win/sys/times.h
@@ -20,7 +20,7 @@
#ifndef _SYS_TIMES_H
#define _SYS_TIMES_H
-#include <tdecore/kdelibs_export.h>
+#include <tdecore/tdelibs_export.h>
//#include <_ansi.h>
#include <machine/types.h>
diff --git a/win/sys/utsname.h b/win/sys/utsname.h
index 55f0b323..ce21168f 100644
--- a/win/sys/utsname.h
+++ b/win/sys/utsname.h
@@ -20,7 +20,7 @@
#ifndef _SYS_UTSNAME_H
#define _SYS_UTSNAME_H
-#include <tdecore/kdelibs_export.h>
+#include <tdecore/tdelibs_export.h>
#ifdef __cplusplus
extern "C" {
diff --git a/win/syslog.h b/win/syslog.h
index 38398fcb..d3d6dba5 100644
--- a/win/syslog.h
+++ b/win/syslog.h
@@ -24,7 +24,7 @@
#ifndef _SYS_LOG_H
#define _SYS_LOG_H
-#include <tdecore/kdelibs_export.h>
+#include <tdecore/tdelibs_export.h>
#define LOG_EMERG 0
#define LOG_ALERT 1
diff --git a/win/tools/.build_kdelibs_comon b/win/tools/.build_kdelibs_comon
index 5ed09f72..6ef96f94 100755
--- a/win/tools/.build_kdelibs_comon
+++ b/win/tools/.build_kdelibs_comon
@@ -1,5 +1,5 @@
#!/bin/bash
-# compile entire kdelibs/win32 : common part for dbg and release target
+# compile entire tdelibs/win32 : common part for dbg and release target
# (c) 2005, Jaroslaw Staniek, js@iidea.pl
pwd=`pwd`
diff --git a/win/tools/.check_kde_env b/win/tools/.check_kde_env
index d22cf13e..e4605ed1 100755
--- a/win/tools/.check_kde_env
+++ b/win/tools/.check_kde_env
@@ -3,18 +3,18 @@
# checks current environment
if [ -z "$KDEWIN" ] ; then
- echo `basename $0`": \$KDEWIN environment variable is not set. Set it to absolute path of kdelibs/win32 source code, e.g. C:\\kdelibs"
+ echo `basename $0`": \$KDEWIN environment variable is not set. Set it to absolute path of tdelibs/win32 source code, e.g. C:\\tdelibs"
exit 1
fi
if [ -z "$KDEDIR" ] ; then
- echo `basename $0`": \$KDEDIR environment variable is not set. Set it to absolute path of kdelibs/win32 binaries, e.g. C:\\kde"
+ echo `basename $0`": \$KDEDIR environment variable is not set. Set it to absolute path of tdelibs/win32 binaries, e.g. C:\\kde"
exit 1
fi
-if [ -z "$KDELIBS" -o "$KDEWIN\\kdelibs" != "$KDELIBS" ] ; then
+if [ -z "$KDELIBS" -o "$KDEWIN\\tdelibs" != "$KDELIBS" ] ; then
echo `basename $0`": \$KDELIBS = \"$KDELIBS\" but \$KDEWIN = \"$KDEWIN\""
- echo "\$KDELIBS environment variable is not properly set. Set it to absolute path of kdelibs/win32 source code. It needs to be equal to \"\$KDEWIN\\kdelibs\", e.g. C:\\kdewin32\\kdelibs".
+ echo "\$KDELIBS environment variable is not properly set. Set it to absolute path of tdelibs/win32 source code. It needs to be equal to \"\$KDEWIN\\tdelibs\", e.g. C:\\kdewin32\\tdelibs".
echo "You may need to run:"
echo " source kde_env"
exit 1
diff --git a/win/tools/README.tools b/win/tools/README.tools
index 35b3a526..f21079ca 100644
--- a/win/tools/README.tools
+++ b/win/tools/README.tools
@@ -1,4 +1,4 @@
-kdelibs/win32 build tools
+tdelibs/win32 build tools
(c) 2003-2005, Jaroslaw Staniek
diff --git a/win/tools/build_kdelibs_dbg b/win/tools/build_kdelibs_dbg
index 9af5cc9b..cabec259 100644
--- a/win/tools/build_kdelibs_dbg
+++ b/win/tools/build_kdelibs_dbg
@@ -1,14 +1,14 @@
#!/bin/bash
-# compile entire kdelibs/win32 in debug mode
+# compile entire tdelibs/win32 in debug mode
# (c) 2003-2005, Jaroslaw Staniek, js@iidea.pl
if [ "$1" == "noclean" ] ; then
noclean=1
fi
-update_kdelibs_pro_files || exit 1
+update_tdelibs_pro_files || exit 1
.copy_missing_headers || exit 1
-source .build_kdelibs_comon || exit 1
+source .build_tdelibs_comon || exit 1
cd "$KDELIBS"
diff --git a/win/tools/build_kdelibs_rel b/win/tools/build_kdelibs_rel
index f8c9ba41..7490c486 100644
--- a/win/tools/build_kdelibs_rel
+++ b/win/tools/build_kdelibs_rel
@@ -1,14 +1,14 @@
#!/bin/bash
-# compile entire kdelibs/win32 in release mode
+# compile entire tdelibs/win32 in release mode
# (c) 2003-2005, Jaroslaw Staniek, js@iidea.pl
if [ "$1" == "noclean" ] ; then
noclean=1
fi
-update_kdelibs_pro_files || exit 1
+update_tdelibs_pro_files || exit 1
.copy_missing_headers || exit 1
-source .build_kdelibs_comon || exit 1
+source .build_tdelibs_comon || exit 1
cd "$KDELIBS"
diff --git a/win/tools/collect_kdelibs_pro_files b/win/tools/collect_kdelibs_pro_files
index ea2466ef..3925f675 100755
--- a/win/tools/collect_kdelibs_pro_files
+++ b/win/tools/collect_kdelibs_pro_files
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copies all used .pro (and a few shell) files kdelibs/ to kdelibs/win/pro_files/
+# Copies all used .pro (and a few shell) files tdelibs/ to tdelibs/win/pro_files/
# what makes it easier to commit that to KDE CVS
# (c) 2005, Jaroslaw Staniek
diff --git a/win/tools/kde_env b/win/tools/kde_env
index 287fef1b..a8c721a5 100755
--- a/win/tools/kde_env
+++ b/win/tools/kde_env
@@ -13,7 +13,7 @@ if [ -n "$MSVC" ] ; then
fi
# Generic settings
-export KDELIBS=$KDEWIN\\kdelibs # KDElibs/win32 source directory
+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"
# Version information for binaries
diff --git a/win/tools/update_kdelibs_pro_files b/win/tools/update_kdelibs_pro_files
index 15f745cf..92125fec 100755
--- a/win/tools/update_kdelibs_pro_files
+++ b/win/tools/update_kdelibs_pro_files
@@ -1,7 +1,7 @@
#!/bin/bash
-# Copies all used .pro (and a few shell) files from kdelibs/win/pro_files/ to kdelibs/
-# so they can be used to build kdelibs.
+# Copies all used .pro (and a few shell) files from tdelibs/win/pro_files/ to tdelibs/
+# so they can be used to build tdelibs.
# Note: only newer files are copied over older.
# (c) 2005, Jaroslaw Staniek, js@iidea.pl
diff --git a/win/unistd.h b/win/unistd.h
index 297d6993..4b9c501b 100644
--- a/win/unistd.h
+++ b/win/unistd.h
@@ -20,7 +20,7 @@
#ifndef _KDEWIN_UNISTD_H
#define _KDEWIN_UNISTD_H
-#include <tdecore/kdelibs_export.h>
+#include <tdecore/tdelibs_export.h>
#include <io.h> /* access(), etc.*/
#include <process.h> /* getpid(), etc.*/
diff --git a/win/win.pro b/win/win.pro
index 94ca2d54..90c30f3f 100644
--- a/win/win.pro
+++ b/win/win.pro
@@ -5,8 +5,8 @@ include( $(KDELIBS)/win/common.pro )
TARGET = kdewin32$$KDEBUG
-QMAKE_CXXFLAGS += /FI$(KDELIBS)/tdecore/kdelibs_export.h
-QMAKE_CFLAGS += /FI$(KDELIBS)/tdecore/kdelibs_export.h
+QMAKE_CXXFLAGS += /FI$(KDELIBS)/tdecore/tdelibs_export.h
+QMAKE_CFLAGS += /FI$(KDELIBS)/tdecore/tdelibs_export.h
system( moc qeventloopex.h -o moc/qeventloopex.moc )
diff --git a/win/win32_utils.h b/win/win32_utils.h
index e42864cc..a0702c84 100644
--- a/win/win32_utils.h
+++ b/win/win32_utils.h
@@ -22,7 +22,7 @@
#include <windows.h>
-#include <tdecore/kdelibs_export.h>
+#include <tdecore/tdelibs_export.h>
#ifdef __cplusplus
#include <tqstring.h>
@@ -88,7 +88,7 @@ TQCString getWin32LocaleName();
/*! Temporary solutiuon
\return a KFileDialog-compatible filter string converted to TQFileDialog compatible one.
- This is temporary solution for kdelibs/win32... */
+ This is temporary solution for tdelibs/win32... */
KDEWIN32_EXPORT TQString convertKFileDialogFilterToQFileDialogFilter(const TQString& filter);
#endif //__cplusplus