diff options
Diffstat (limited to 'tdecore')
108 files changed, 216 insertions, 216 deletions
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt index c82e25408..1409c6cde 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 c052a36d6..07a996b24 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 a9c44ee15..976307ebd 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 cbb6a6dfb..cd02cce66 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 b64f55d25..44c63d377 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 b1fe773c6..1abc8d381 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 b223be9bb..7f24a5e73 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 69846dad2..29304803b 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 2d5d39f2a..abc4c4b64 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 76e62ca64..187c9f5ae 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 014b1cad5..894b68578 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 f72bbffd2..dbe7cd603 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 f9a8c0ca8..dae00c4c7 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 1fbfb017c..bd936336c 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 3517d4c86..75b5782e4 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 764cd4618..df07fef44 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 2cee80feb..be918789d 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 d3b4eec41..2816e4fcd 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 7f25b4380..00adf4fd1 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 bd6605b6b..7facc86fd 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 08a2a6614..dc48fc45d 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 e6ac36758..703f2c958 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 5009a3e6a..f7834ba63 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 cb0947203..03655ab2d 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 13d2a1761..01c758da5 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 940c54305..f99f72c08 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 97e741f65..adebca525 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 3c268e487..46c2b03a6 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 197f61f87..790c5fd38 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 a5b1e4b22..e56cd64c2 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 1f093fa91..0f6d286d5 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 2f56483cd..9699c28b0 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 03f7a8c95..fa52f5ef2 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 fbeefcc48..fc9bb1294 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 c6100f58a..770a5e386 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 44ac7c2dd..b644985b5 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 2d6b251d8..ff19981cd 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 8ff80a6bb..4dfaec53c 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 a1060ea0c..bde3b686e 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 3f6a46411..57f3dc8e2 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 e2f55b007..ca0101149 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 689b08616..32ed04f3f 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 6d2a487d4..6ff632f9e 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 b4c809f2e..5fef2f67a 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 7aec46b7b..299be3d2e 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 5db2855f7..9aa4d8e32 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 8d2d7d937..ae174cf72 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 97434c385..22da3bb3c 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 35ba3f18e..45e96f194 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 1fae4fbab..114746d0f 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 e94143fb6..4359da4af 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 4244efb18..73537a11a 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 669451e68..5b46488ab 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 a45cc3290..093cdeceb 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 361bdcae7..019a3c5e0 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 ae7acbb79..eeb5868d2 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 332e34a6b..9d48d7116 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 362bf32b2..009f1ed75 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 17551c873..65496bf10 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 406a0f01b..6c3d482bb 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 bb166f4a0..6cff274a8 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 621cb0d68..8fa6e3c29 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 50f755ed9..8e6baac98 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 ca4f309c7..e7416c96b 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 b1f6497c9..002790ca4 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 8338145cc..16ece722c 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 8f18603cd..e60df848f 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 ee4a269f3..9baf31b0d 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 bd1482880..7a1890c1c 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 7f4f0b178..d6e4515ea 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 2510d1218..fd73e722a 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 e596c50d9..3de74bd88 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 add847aba..14067c0f3 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 3f7885ca4..40b311edc 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 ed4cff3c0..afa875895 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 ae3b3d277..00a9f5b81 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 d14213dc7..d384ceeed 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 6707cc3d2..813255cc3 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 23b765134..40cfa3617 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 1d3d32d88..19ab6674b 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 592d6bfef..79f1432e8 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 92917e780..414eabf52 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 18503a534..1c9378ba8 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 77d0ef169..d24e8ec10 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 0fb86a1c8..9cfac2885 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 e0a7be227..7153b8077 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 15dc2d1ad..e44557f99 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 5cfacb6c3..e85e03446 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 ab017ace2..cfa67627b 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 34fc559ac..261dc6fdf 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 83e2d3711..5d2f6a086 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 43efca972..dc43acb6b 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 3519d7a35..1fa32431f 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 18d5041fe..ca8ed5139 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 c2a8e49b0..0ce12d915 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 dffffb5e8..2035098df 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 8228015a0..55f12a99c 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 02f75a420..ac1352a4d 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 74fd52d55..d4eb43f08 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 6f7869323..d02a6984c 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 dd1e1e515..ef1d061d8 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 b4fe50ed4..033064c0b 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 0ad9807c9..299196810 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 39bef8dde..29f6cd3e3 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 c8e5bcced..bcee63ac3 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 d1c8ff244..0bbb0436b 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 e8f00f44a..c7aa37a6a 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 afde02597..0357c1c66 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 |