summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kmail/kmkernel.cpp4
-rw-r--r--kmail/kmkernel.h2
-rw-r--r--knode/knglobals.cpp2
-rw-r--r--knode/knglobals.h2
-rw-r--r--knotes/knote.cpp4
-rw-r--r--knotes/knote.h2
-rw-r--r--knotes/knoteslegacy.cpp2
-rw-r--r--libtdepim/komposer/core/pluginmanager.cpp6
8 files changed, 12 insertions, 12 deletions
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 1761a7629..4ca2440c5 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -132,7 +132,7 @@ KMKernel::KMKernel (TQObject *parent, const char *name) :
// make sure that we check for config updates before doing anything else
KMKernel::config();
- // this shares the kmailrc parsing too (via KSharedConfig), and reads values from it
+ // this shares the kmailrc parsing too (via TDESharedConfig), and reads values from it
// so better do it here, than in some code where changing the group of config()
// would be unexpected
GlobalSettings::self();
@@ -2291,7 +2291,7 @@ TDEConfig* KMKernel::config()
assert(mySelf);
if (!mySelf->mConfig)
{
- mySelf->mConfig = KSharedConfig::openConfig( "kmailrc" );
+ mySelf->mConfig = TDESharedConfig::openConfig( "kmailrc" );
// Check that all updates have been run on the config file:
KMail::checkConfigUpdates();
}
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index 5d80d659d..748ec6809 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -487,7 +487,7 @@ private:
bool the_firstInstance;
bool mMailCheckAborted;
static KMKernel *mySelf;
- KSharedConfig::Ptr mConfig;
+ TDESharedConfig::Ptr mConfig;
TQTextCodec *netCodec;
TDEInstance* mXmlGuiInstance;
ConfigureDialog *mConfigureDialog;
diff --git a/knode/knglobals.cpp b/knode/knglobals.cpp
index 48a257168..baab06afb 100644
--- a/knode/knglobals.cpp
+++ b/knode/knglobals.cpp
@@ -62,7 +62,7 @@ KNGlobals::~KNGlobals( )
TDEConfig* KNGlobals::config()
{
if (!c_onfig) {
- c_onfig = KSharedConfig::openConfig( "knoderc" );
+ c_onfig = TDESharedConfig::openConfig( "knoderc" );
}
return c_onfig;
}
diff --git a/knode/knglobals.h b/knode/knglobals.h
index a2bde078f..f361f3bb2 100644
--- a/knode/knglobals.h
+++ b/knode/knglobals.h
@@ -79,7 +79,7 @@ class KDE_EXPORT KNGlobals {
void setStatusMsg(const TQString& text = TQString(), int id = SB_MAIN);
private:
- KSharedConfig::Ptr c_onfig;
+ TDESharedConfig::Ptr c_onfig;
KNNetAccess *mNetAccess;
KNConfigManager *mCfgManager;
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index dd3940c80..e59be706b 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -83,7 +83,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
: TQFrame( parent, name, WStyle_Customize | WStyle_NoBorder | WDestructiveClose ),
m_label( 0 ), m_pushpin( 0 ), m_fold( 0 ), m_button( 0 ), m_tool( 0 ), m_editor( 0 ),
m_config( 0 ), m_journal( j ), m_find( 0 ),
- m_twinConf( KSharedConfig::openConfig( "twinrc", true ) ),
+ m_twinConf( TDESharedConfig::openConfig( "twinrc", true ) ),
m_busy( 0 ), m_deleteWhenIdle( false ), m_blockEmitDataChanged( false )
{
setAcceptDrops( true );
@@ -221,7 +221,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
// we want to write to configFile, so use "false"
bool newNote = !TDEIO::NetAccess::exists( KURL::fromPathOrURL( configFile ), false, 0 );
- m_config = new KNoteConfig( KSharedConfig::openConfig( configFile, false, false ) );
+ m_config = new KNoteConfig( TDESharedConfig::openConfig( configFile, false, false ) );
m_config->readConfig();
m_config->setVersion( KNOTES_VERSION );
diff --git a/knotes/knote.h b/knotes/knote.h
index cc12dcdc2..3b7928c42 100644
--- a/knotes/knote.h
+++ b/knotes/knote.h
@@ -176,7 +176,7 @@ private:
KToggleAction *m_keepAbove;
KToggleAction *m_keepBelow;
- KSharedConfig::Ptr m_twinConf;
+ TDESharedConfig::Ptr m_twinConf;
static int s_ppOffset;
diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp
index fc8c71b4a..2605d7f44 100644
--- a/knotes/knoteslegacy.cpp
+++ b/knotes/knoteslegacy.cpp
@@ -152,7 +152,7 @@ bool KNotesLegacy::convertKNotes1Config( Journal *journal, TQDir& noteDir,
0
);
- KNoteConfig config( KSharedConfig::openConfig( configFile, false, false ) );
+ KNoteConfig config( TDESharedConfig::openConfig( configFile, false, false ) );
config.readConfig();
config.setVersion( KNOTES_VERSION );
diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp
index f2778178a..c3355f551 100644
--- a/libtdepim/komposer/core/pluginmanager.cpp
+++ b/libtdepim/komposer/core/pluginmanager.cpp
@@ -61,7 +61,7 @@ public:
enum ShutdownMode { StartingUp, Running, ShuttingDown, DoneShutdown };
ShutdownMode shutdownMode;
- KSharedConfig::Ptr config;
+ TDESharedConfig::Ptr config;
// Plugins pending for loading
TQValueStack<TQString> pluginsToLoad;
};
@@ -226,7 +226,7 @@ PluginManager::loadAllPlugins()
// FIXME: We need session management here - Martijn
if ( !d->config )
- d->config = KSharedConfig::openConfig( "komposerrc" );
+ d->config = TDESharedConfig::openConfig( "komposerrc" );
TQMap<TQString, TQString> entries = d->config->entryMap(
TQString::fromLatin1( "Plugins" ) );
@@ -470,7 +470,7 @@ bool
PluginManager::setPluginEnabled( const TQString &pluginId, bool enabled /* = true */ )
{
if ( !d->config )
- d->config = KSharedConfig::openConfig( "komposerrc" );
+ d->config = TDESharedConfig::openConfig( "komposerrc" );
d->config->setGroup( "Plugins" );