diff options
Diffstat (limited to 'kcontrol')
25 files changed, 32 insertions, 32 deletions
diff --git a/kcontrol/TODO b/kcontrol/TODO index b3b8d2971..f0f84d461 100644 --- a/kcontrol/TODO +++ b/kcontrol/TODO @@ -32,9 +32,9 @@ Of course, nothing in this file is set in stone, or is "correct" or "true" for t * Move Theme manger out of KControl as a standalone app (can still be a kcm modules code wise of course). -* Move "Power Control/Laptop Battery" to "Hardware" (the only KCM left in that category). Note this is in kdeutils. It will also remove the top level Power Control so remove that in the settings.menu file +* Move "Power Control/Laptop Battery" to "Hardware" (the only KCM left in that category). Note this is in tdeutils. It will also remove the top level Power Control so remove that in the settings.menu file -* Move the laptop KCMs to "Hardware", from "System Administration". Note these are in kdeutils. +* Move the laptop KCMs to "Hardware", from "System Administration". Note these are in tdeutils. * Move "User Account� to System @@ -52,7 +52,7 @@ Of course, nothing in this file is set in stone, or is "correct" or "true" for t * Spelling - It is application specific and if they need it they will include the kcm in their configure dialog most (all?) already do. -* Security & Privacy/Privacy - It should be a seperate utility in kdeutils. It does stuff, not configuring stuff +* Security & Privacy/Privacy - It should be a seperate utility in tdeutils. It does stuff, not configuring stuff ---------- Combining Modules @@ -103,7 +103,7 @@ The desktop file is called "kcm_fonts" with "Name=Fonts" and "Categories=X-KDE-s ---------Various technical, broad design shifts: -------------------- -* Move the various KCMs in kdebase/kcontrol/* out to their respective app, as per the KCM Guidelines. +* Move the various KCMs in tdebase/kcontrol/* out to their respective app, as per the KCM Guidelines. * Convert KCMs to use ui Designer files @@ -117,7 +117,7 @@ properly in 800x600 (is it 800x600 or 1024x768?). For a start, someone needs to * Tons of KCMs and applications have options for selecting binaries which they use(frontends etc.). We need to be a little consistent here and adopt a general policy in this issue. If a binary is not in $PATH it is the distributors fault and not KDE. The reason we have a GUI is so people don't have to know about this kinds of internals. The options doesn't mean anything because users use KDE, they're not in run level 3("WTF? cdparanoia? diff? What's that?"). PATH options("Where to search for X") should be removed - it is up to the distributor. Options for selecting what binary to use should be moved out to KConfEdit - they have a use but are very rarely used. -* Rewrite kcmshell to the new KCModuleProxy and fix bugs. Move it to kdelibs. +* Rewrite kcmshell to the new KCModuleProxy and fix bugs. Move it to tdelibs. -------------------------------------------------------------------------- diff --git a/kcontrol/arts/krichtextlabel.h b/kcontrol/arts/krichtextlabel.h index 9c9971a69..43bf0afce 100644 --- a/kcontrol/arts/krichtextlabel.h +++ b/kcontrol/arts/krichtextlabel.h @@ -21,7 +21,7 @@ #include <tqlabel.h> -#include <kdelibs_export.h> +#include <tdelibs_export.h> /** * @short A replacement for TQLabel that supports richtext and proper layout management diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index 64a14ca63..4308858d0 100644 --- a/kcontrol/background/bgdialog.cpp +++ b/kcontrol/background/bgdialog.cpp @@ -402,7 +402,7 @@ TQString BGDialog::quickHelp() const void BGDialog::slotIdentifyScreens() { - // Taken from PositionTab::showIdentify in kdebase/kcontrol/kicker/positiontab_impl.cpp + // Taken from PositionTab::showIdentify in tdebase/kcontrol/kicker/positiontab_impl.cpp for(unsigned s = 0; s < m_numScreens; s++) { TQLabel *screenLabel = new TQLabel(0,"Screen Identify", (WFlags)(WDestructiveClose | WStyle_Customize | WX11BypassWM)); diff --git a/kcontrol/ebrowsing/plugins/ikws/Makefile.am b/kcontrol/ebrowsing/plugins/ikws/Makefile.am index ac7c4b7ef..bb00b6e90 100644 --- a/kcontrol/ebrowsing/plugins/ikws/Makefile.am +++ b/kcontrol/ebrowsing/plugins/ikws/Makefile.am @@ -1,4 +1,4 @@ -## Makefile.am of kdebase/kcontrol/ebrowsing/plugins/ikws +## Makefile.am of tdebase/kcontrol/ebrowsing/plugins/ikws SUBDIRS = searchproviders diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp index b91d14702..4631524e0 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp @@ -32,7 +32,7 @@ /** * IMPORTANT: If you change anything here, please run the regression test - * kdelibs/kio/tests/kurifiltertest + * tdelibs/kio/tests/kurifiltertest */ typedef KGenericFactory<KAutoWebSearch> KAutoWebSearchFactory; diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp index 9f3a245fc..f46b5c8ac 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp @@ -46,7 +46,7 @@ /** * IMPORTANT: If you change anything here, please run the regression test - * kdelibs/kio/tests/kurifiltertest + * tdelibs/kio/tests/kurifiltertest */ KURISearchFilterEngine *KURISearchFilterEngine::s_pSelf = 0; diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp index 6280f3899..8f56a0538 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp @@ -32,7 +32,7 @@ /** * IMPORTANT: If you change anything here, please run the regression test - * kdelibs/kio/tests/kurifiltertest + * tdelibs/kio/tests/kurifiltertest */ typedef KGenericFactory<KURISearchFilter> KURISearchFilterFactory; diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/kde_websvn.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/kde_websvn.desktop index 6dd1ce121..17c4fccc8 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/kde_websvn.desktop +++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/kde_websvn.desktop @@ -25,7 +25,7 @@ Name[th]=SVN บนเว็บของ KDE Name[vi]=Tra KDE WebSVN Name[wa]=WebSVN di KDE ServiceTypes=SearchProvider -Keys=websvn,kdesvn,ksvn,kvs +Keys=websvn,tdesvn,ksvn,kvs Query=http://websvn.kde.org/\\{@} Query[ja]=http://webcvs.kde.org/\\{@} Query[se]=http://webcvs.kde.org/\\{@} diff --git a/kcontrol/ebrowsing/plugins/localdomain/Makefile.am b/kcontrol/ebrowsing/plugins/localdomain/Makefile.am index 164a9ce35..362aacbf5 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/Makefile.am +++ b/kcontrol/ebrowsing/plugins/localdomain/Makefile.am @@ -1,4 +1,4 @@ -## Makefile.am of kdebase/kcontrol/ebrowsing/plugins/localdomain +## Makefile.am of tdebase/kcontrol/ebrowsing/plugins/localdomain AM_CPPFLAGS = $(all_includes) -DQT_NO_CAST_ASCII diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp index f81fda73d..1f9af3152 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp +++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp @@ -33,7 +33,7 @@ /** * IMPORTANT: If you change anything here, please run the regression test - * kdelibs/kio/tests/kurifiltertest + * tdelibs/kio/tests/kurifiltertest */ LocalDomainURIFilter::LocalDomainURIFilter( TQObject *parent, const char *name, diff --git a/kcontrol/ebrowsing/plugins/shorturi/Makefile.am b/kcontrol/ebrowsing/plugins/shorturi/Makefile.am index 8eb895dee..7ac64dd84 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/Makefile.am +++ b/kcontrol/ebrowsing/plugins/shorturi/Makefile.am @@ -1,4 +1,4 @@ -## Makefile.am of kdebase/kcontrol/ebrowsing/plugins/shorturi +## Makefile.am of tdebase/kcontrol/ebrowsing/plugins/shorturi AM_CPPFLAGS = $(all_includes) -DQT_NO_CAST_ASCII diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp index fccaf6b55..16e23efbb 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp +++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp @@ -48,10 +48,10 @@ /** * IMPORTANT: * If you change anything here, please run the regression test - * kdelibs/kio/tests/kurifiltertest. + * tdelibs/kio/tests/kurifiltertest. * * If you add anything here, make sure to add a corresponding - * test code to kdelibs/kio/tests/kurifiltertest. + * test code to tdelibs/kio/tests/kurifiltertest. */ typedef TQMap<TQString,TQString> EntryMap; diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index 163d6f378..9ab122771 100644 --- a/kcontrol/fonts/fonts.cpp +++ b/kcontrol/fonts/fonts.cpp @@ -522,7 +522,7 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &) TQValueList<TQFont> defaultFontList; - // Keep in sync with kdelibs/tdecore/kglobalsettings.cpp + // Keep in sync with tdelibs/tdecore/kglobalsettings.cpp TQFont f0("Sans Serif", 10); TQFont f1("Monospace", 10); diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp index 6c9e154f7..4fc8df5fc 100644 --- a/kcontrol/icons/icons.cpp +++ b/kcontrol/icons/icons.cpp @@ -206,7 +206,7 @@ void KIconConfig::initDefaults() if ( group != -1 ) mbAnimated[group] = true; - // This is the new default in KDE 2.2, in sync with the kiconeffect of kdelibs Nolden 2001/06/11 + // This is the new default in KDE 2.2, in sync with the kiconeffect of tdelibs Nolden 2001/06/11 int activeState = mStates.findIndex( "Active" ); if ( activeState != -1 ) { diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp index d5f103cd5..90b2179c5 100644 --- a/kcontrol/kcontrol/global.cpp +++ b/kcontrol/kcontrol/global.cpp @@ -36,7 +36,7 @@ bool KCGlobal::_infocenter = false; TQStringList KCGlobal::_types; TQString KCGlobal::_uname = ""; TQString KCGlobal::_hname = ""; -TQString KCGlobal::_kdeversion = ""; +TQString KCGlobal::_tdeversion = ""; TQString KCGlobal::_isystem = ""; TQString KCGlobal::_irelease = ""; TQString KCGlobal::_iversion = ""; diff --git a/kcontrol/kcontrol/global.h b/kcontrol/kcontrol/global.h index 80c588751..551b3fcb6 100644 --- a/kcontrol/kcontrol/global.h +++ b/kcontrol/kcontrol/global.h @@ -39,7 +39,7 @@ public: static TQStringList types() { return _types; } static TQString userName() { return _uname; } static TQString hostName() { return _hname; } - static TQString kdeVersion() { return _kdeversion; } + static TQString kdeVersion() { return _tdeversion; } static TQString systemName() { return _isystem; } static TQString systemRelease() { return _irelease; } static TQString systemVersion() { return _iversion; } @@ -53,7 +53,7 @@ public: static void setType(const TQCString& s); static void setUserName(const TQString& n){ _uname = n; } static void setHostName(const TQString& n){ _hname = n; } - static void setKDEVersion(const TQString& n){ _kdeversion = n; } + static void setKDEVersion(const TQString& n){ _tdeversion = n; } static void setSystemName(const TQString& n){ _isystem = n; } static void setSystemRelease(const TQString& n){ _irelease = n; } static void setSystemVersion(const TQString& n){ _iversion = n; } @@ -67,7 +67,7 @@ private: static bool _root; static bool _infocenter; static TQStringList _types; - static TQString _uname, _hname, _isystem, _irelease, _iversion, _imachine, _kdeversion; + static TQString _uname, _hname, _isystem, _irelease, _iversion, _imachine, _tdeversion; static IndexViewMode _viewmode; static KIcon::StdSizes _iconsize; static TQString _baseGroup; diff --git a/kcontrol/keys/kaccelaction.h b/kcontrol/keys/kaccelaction.h index 6a41d3a05..ef8ff9f33 100644 --- a/kcontrol/keys/kaccelaction.h +++ b/kcontrol/keys/kaccelaction.h @@ -1,4 +1,4 @@ -// THIS FILE IS A COPY OF kdelibs/tdecore/kaccelaction.h AND MUST BE KEPT +// THIS FILE IS A COPY OF tdelibs/tdecore/kaccelaction.h AND MUST BE KEPT // IN SYNC WITH THAT FILE. /* This file is part of the KDE libraries diff --git a/kcontrol/keys/khotkeys.h b/kcontrol/keys/khotkeys.h index 9eab62106..c71cce5db 100644 --- a/kcontrol/keys/khotkeys.h +++ b/kcontrol/keys/khotkeys.h @@ -23,7 +23,7 @@ #include <tqstring.h> -// see kdebase/khotkeys/kcontrol for info on these +// see tdebase/khotkeys/kcontrol for info on these class KHotKeys { diff --git a/kcontrol/kfontinst/kio/Makefile.am b/kcontrol/kfontinst/kio/Makefile.am index a2643d8b2..ca22d13bd 100644 --- a/kcontrol/kfontinst/kio/Makefile.am +++ b/kcontrol/kfontinst/kio/Makefile.am @@ -6,7 +6,7 @@ kio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFR kio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE -# The kxftconfig stuf really belongs to kdebase/kcontrol/fonts - here only so that can distribute this as an archive. +# The kxftconfig stuf really belongs to tdebase/kcontrol/fonts - here only so that can distribute this as an archive. noinst_HEADERS = \ KioFonts.h diff --git a/kcontrol/kfontinst/lib/FcEngine.h b/kcontrol/kfontinst/lib/FcEngine.h index 5c85b1a13..535baa6e1 100644 --- a/kcontrol/kfontinst/lib/FcEngine.h +++ b/kcontrol/kfontinst/lib/FcEngine.h @@ -9,7 +9,7 @@ #include <tqvaluevector.h> #include <tqfont.h> #include <kurl.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <fontconfig/fontconfig.h> #if (FC_VERSION<20200) diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp index 04e8c1282..d7202726a 100644 --- a/kcontrol/kicker/positiontab_impl.cpp +++ b/kcontrol/kicker/positiontab_impl.cpp @@ -659,7 +659,7 @@ void PositionTab::storeInfo() return; } - // Magic numbers stolen from kdebase/kicker/core/global.cpp + // Magic numbers stolen from tdebase/kicker/core/global.cpp // PGlobal::sizeValue() if (m_panelSize->currentItem() < KPanelExtension::SizeCustom) { diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp index f229e7f24..ea2479264 100644 --- a/kcontrol/knotify/knotify.cpp +++ b/kcontrol/knotify/knotify.cpp @@ -263,7 +263,7 @@ void PlayerSettingsDialog::load( bool useDefaults ) void PlayerSettingsDialog::save() { - // see kdelibs/arts/knotify/knotify.cpp + // see tdelibs/arts/knotify/knotify.cpp KConfig config( "knotifyrc", false, false ); config.setGroup( "Misc" ); diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp index 8640a9991..80d587877 100644 --- a/kcontrol/konqhtml/pluginopts.cpp +++ b/kcontrol/konqhtml/pluginopts.cpp @@ -373,7 +373,7 @@ void KPluginOptions::dirLoad( KConfig *config, bool useDefault ) config->setGroup("Misc"); if ( config->hasKey( "scanPaths" ) && !useDefault ) paths = config->readListEntry( "scanPaths" ); - else {//keep sync with kdebase/nsplugins + else {//keep sync with tdebase/nsplugins paths.append("$HOME/.mozilla/plugins"); paths.append("$HOME/.netscape/plugins"); paths.append("/usr/lib/iceweasel/plugins"); diff --git a/kcontrol/screensaver/kswidget.cpp b/kcontrol/screensaver/kswidget.cpp index cb5760fcc..0b11c3e23 100644 --- a/kcontrol/screensaver/kswidget.cpp +++ b/kcontrol/screensaver/kswidget.cpp @@ -11,7 +11,7 @@ KSWidget::KSWidget( TQWidget* parent, const char* name, int f ) : QXEmbed( parent, name, (WFlags)f ), colormap( None ) { // use visual with support for double-buffering, for opengl -// this code is duplicated in kdebase/kdesktop/lock/ +// this code is duplicated in tdebase/kdesktop/lock/ #ifdef HAVE_GLXCHOOSEVISUAL Visual* visual = CopyFromParent; XSetWindowAttributes attrs; diff --git a/kcontrol/smartcard/nosmartcardbase.ui b/kcontrol/smartcard/nosmartcardbase.ui index 968171316..9b3823df1 100644 --- a/kcontrol/smartcard/nosmartcardbase.ui +++ b/kcontrol/smartcard/nosmartcardbase.ui @@ -46,7 +46,7 @@ <string> 1) The KDE daemon, 'kded' is not running. You can restart it by running the command 'tdeinit' and then try reloading the KDE Control Center to see if this message goes away. -2) You don't appear to have smartcard support in the KDE libraries. You will need to recompile the kdelibs package with libpcsclite installed.</string> +2) You don't appear to have smartcard support in the KDE libraries. You will need to recompile the tdelibs package with libpcsclite installed.</string> </property> <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> |