diff options
Diffstat (limited to 'tdeutils')
| -rw-r--r-- | tdeutils/kplugininfo.cpp | 6 | ||||
| -rw-r--r-- | tdeutils/kpluginselector.cpp | 6 | ||||
| -rw-r--r-- | tdeutils/kpluginselector.h | 4 | ||||
| -rw-r--r-- | tdeutils/ksettings/README.dox | 2 | ||||
| -rw-r--r-- | tdeutils/ksettings/dialog.cpp | 4 | ||||
| -rw-r--r-- | tdeutils/ksettings/dispatcher.cpp | 2 | ||||
| -rw-r--r-- | tdeutils/tdecmoduleinfo.cpp | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/tdeutils/kplugininfo.cpp b/tdeutils/kplugininfo.cpp index 9a5613745..c1b30307c 100644 --- a/tdeutils/kplugininfo.cpp +++ b/tdeutils/kplugininfo.cpp @@ -18,13 +18,13 @@ */ #include "kplugininfo.h" -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <ktrader.h> #include <kdebug.h> #include <tdeconfigbase.h> #include <tdeglobal.h> #include <tdestandarddirs.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kservice.h> class KPluginInfo::KPluginInfoPrivate @@ -70,7 +70,7 @@ class KPluginInfo::KPluginInfoPrivate KPluginInfo::KPluginInfo( const TQString & filename, const char* resource ) : d( new KPluginInfoPrivate ) { - KDesktopFile file( filename, true, resource ); + TDEDesktopFile file( filename, true, resource ); d->specfile = filename; diff --git a/tdeutils/kpluginselector.cpp b/tdeutils/kpluginselector.cpp index ac8caf25b..84d1629ea 100644 --- a/tdeutils/kpluginselector.cpp +++ b/tdeutils/kpluginselector.cpp @@ -37,7 +37,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdelistview.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kdialog.h> #include <tdeglobal.h> #include <tdeglobalsettings.h> @@ -55,7 +55,7 @@ #include <tqsplitter.h> #include <tqframe.h> #include "kplugininfo.h" -#include <kinstance.h> +#include <tdeinstance.h> #include <tqptrdict.h> #include <tqstringlist.h> #include "tdecmoduleproxy.h" @@ -589,7 +589,7 @@ void KPluginSelector::addPlugins( const TQString & instanceName, checkNeedForTabWidget(); Q_ASSERT( config ); // please set config, or use addPlugins( instance, ... ) which takes care of it if ( !config ) // KDE4: ensure that config is always set; make it second in the arg list? - config = new KSimpleConfig( instanceName ); // memleak! + config = new TDESimpleConfig( instanceName ); // memleak! TDEConfigGroup * cfgGroup = new TDEConfigGroup( config, "KParts Plugins" ); kdDebug( 702 ) << k_funcinfo << "cfgGroup = " << cfgGroup << endl; addPluginsInternal( plugininfos, catname, category, cfgGroup ); diff --git a/tdeutils/kpluginselector.h b/tdeutils/kpluginselector.h index 12d484d0e..212e8737f 100644 --- a/tdeutils/kpluginselector.h +++ b/tdeutils/kpluginselector.h @@ -95,7 +95,7 @@ class TDEUTILS_EXPORT KPluginSelector : public TQWidget * always pass a TDEConfig object if you use * KSettings::PluginPage since you never know from where the * page will be called (think global config app). - * For example KViewCanvas passes KSimpleConfig( + * For example KViewCanvas passes TDESimpleConfig( * "kviewcanvas" ). */ void addPlugins( const TQString & instanceName, @@ -134,7 +134,7 @@ class TDEUTILS_EXPORT KPluginSelector : public TQWidget * always pass a TDEConfig object if you use * KSettings::PluginPage since you never know from where the * page will be called (think global config app). - * For example KViewCanvas passes KSimpleConfig( + * For example KViewCanvas passes TDESimpleConfig( * "kviewcanvas" ). */ void addPlugins( const TQValueList<KPluginInfo*> & plugininfos, diff --git a/tdeutils/ksettings/README.dox b/tdeutils/ksettings/README.dox index 83a71767e..96da18a26 100644 --- a/tdeutils/ksettings/README.dox +++ b/tdeutils/ksettings/README.dox @@ -77,7 +77,7 @@ MyAppConfig::MyAppConfig( TQWidget *parent, const char *, const QStringList &arg \endcode For the TDEConfig object you can either use -TDEGlobal::config() (I don't recommend it) or KSimpleConfig( "myapprc" ). +TDEGlobal::config() (I don't recommend it) or TDESimpleConfig( "myapprc" ). I added a method to KSettings::Dispatcher that gives you the TDEConfig object for every registered instance name: \ref KSettings::Dispatcher::configForInstanceName diff --git a/tdeutils/ksettings/dialog.cpp b/tdeutils/ksettings/dialog.cpp index 6aeccd3c8..cf84b0753 100644 --- a/tdeutils/ksettings/dialog.cpp +++ b/tdeutils/ksettings/dialog.cpp @@ -28,7 +28,7 @@ #include <kplugininfo.h> #include "ksettings/dispatcher.h" #include "ksettings/componentsdialog.h" -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <kiconloader.h> #include <tqvbox.h> @@ -511,7 +511,7 @@ bool Dialog::isPluginForKCMEnabled( TDECModuleInfo * moduleinfo ) const void Dialog::parseGroupFile( const TQString & filename ) { - KSimpleConfig file( filename ); + TDESimpleConfig file( filename ); TQStringList groups = file.groupList(); for( TQStringList::ConstIterator it = groups.begin(); it != groups.end(); ++it ) diff --git a/tdeutils/ksettings/dispatcher.cpp b/tdeutils/ksettings/dispatcher.cpp index 5cd5a4208..869cd86df 100644 --- a/tdeutils/ksettings/dispatcher.cpp +++ b/tdeutils/ksettings/dispatcher.cpp @@ -93,7 +93,7 @@ TDEConfig * Dispatcher::configForInstanceName( const TQCString & instanceName ) return inst->config(); } //if( fallback ) - //return new KSimpleConfig( instanceName ); + //return new TDESimpleConfig( instanceName ); return 0; } diff --git a/tdeutils/tdecmoduleinfo.cpp b/tdeutils/tdecmoduleinfo.cpp index 91a1814d4..dada2ad3b 100644 --- a/tdeutils/tdecmoduleinfo.cpp +++ b/tdeutils/tdecmoduleinfo.cpp @@ -23,7 +23,7 @@ #include <tqvariant.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h> #include <kdebug.h> #include <tdeglobal.h> #include <tdestandarddirs.h> |