Rename KShared

pull/21/head
Timothy Pearson 11 years ago
parent eda50d1bce
commit 0922423eb8

@ -132,7 +132,7 @@ KMKernel::KMKernel (TQObject *parent, const char *name) :
// make sure that we check for config updates before doing anything else // make sure that we check for config updates before doing anything else
KMKernel::config(); 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() // so better do it here, than in some code where changing the group of config()
// would be unexpected // would be unexpected
GlobalSettings::self(); GlobalSettings::self();
@ -2291,7 +2291,7 @@ TDEConfig* KMKernel::config()
assert(mySelf); assert(mySelf);
if (!mySelf->mConfig) if (!mySelf->mConfig)
{ {
mySelf->mConfig = KSharedConfig::openConfig( "kmailrc" ); mySelf->mConfig = TDESharedConfig::openConfig( "kmailrc" );
// Check that all updates have been run on the config file: // Check that all updates have been run on the config file:
KMail::checkConfigUpdates(); KMail::checkConfigUpdates();
} }

@ -487,7 +487,7 @@ private:
bool the_firstInstance; bool the_firstInstance;
bool mMailCheckAborted; bool mMailCheckAborted;
static KMKernel *mySelf; static KMKernel *mySelf;
KSharedConfig::Ptr mConfig; TDESharedConfig::Ptr mConfig;
TQTextCodec *netCodec; TQTextCodec *netCodec;
TDEInstance* mXmlGuiInstance; TDEInstance* mXmlGuiInstance;
ConfigureDialog *mConfigureDialog; ConfigureDialog *mConfigureDialog;

@ -62,7 +62,7 @@ KNGlobals::~KNGlobals( )
TDEConfig* KNGlobals::config() TDEConfig* KNGlobals::config()
{ {
if (!c_onfig) { if (!c_onfig) {
c_onfig = KSharedConfig::openConfig( "knoderc" ); c_onfig = TDESharedConfig::openConfig( "knoderc" );
} }
return c_onfig; return c_onfig;
} }

@ -79,7 +79,7 @@ class KDE_EXPORT KNGlobals {
void setStatusMsg(const TQString& text = TQString(), int id = SB_MAIN); void setStatusMsg(const TQString& text = TQString(), int id = SB_MAIN);
private: private:
KSharedConfig::Ptr c_onfig; TDESharedConfig::Ptr c_onfig;
KNNetAccess *mNetAccess; KNNetAccess *mNetAccess;
KNConfigManager *mCfgManager; KNConfigManager *mCfgManager;

@ -83,7 +83,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
: TQFrame( parent, name, WStyle_Customize | WStyle_NoBorder | WDestructiveClose ), : 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_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_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 ) m_busy( 0 ), m_deleteWhenIdle( false ), m_blockEmitDataChanged( false )
{ {
setAcceptDrops( true ); 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" // we want to write to configFile, so use "false"
bool newNote = !TDEIO::NetAccess::exists( KURL::fromPathOrURL( configFile ), false, 0 ); 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->readConfig();
m_config->setVersion( KNOTES_VERSION ); m_config->setVersion( KNOTES_VERSION );

@ -176,7 +176,7 @@ private:
KToggleAction *m_keepAbove; KToggleAction *m_keepAbove;
KToggleAction *m_keepBelow; KToggleAction *m_keepBelow;
KSharedConfig::Ptr m_twinConf; TDESharedConfig::Ptr m_twinConf;
static int s_ppOffset; static int s_ppOffset;

@ -152,7 +152,7 @@ bool KNotesLegacy::convertKNotes1Config( Journal *journal, TQDir& noteDir,
0 0
); );
KNoteConfig config( KSharedConfig::openConfig( configFile, false, false ) ); KNoteConfig config( TDESharedConfig::openConfig( configFile, false, false ) );
config.readConfig(); config.readConfig();
config.setVersion( KNOTES_VERSION ); config.setVersion( KNOTES_VERSION );

@ -61,7 +61,7 @@ public:
enum ShutdownMode { StartingUp, Running, ShuttingDown, DoneShutdown }; enum ShutdownMode { StartingUp, Running, ShuttingDown, DoneShutdown };
ShutdownMode shutdownMode; ShutdownMode shutdownMode;
KSharedConfig::Ptr config; TDESharedConfig::Ptr config;
// Plugins pending for loading // Plugins pending for loading
TQValueStack<TQString> pluginsToLoad; TQValueStack<TQString> pluginsToLoad;
}; };
@ -226,7 +226,7 @@ PluginManager::loadAllPlugins()
// FIXME: We need session management here - Martijn // FIXME: We need session management here - Martijn
if ( !d->config ) if ( !d->config )
d->config = KSharedConfig::openConfig( "komposerrc" ); d->config = TDESharedConfig::openConfig( "komposerrc" );
TQMap<TQString, TQString> entries = d->config->entryMap( TQMap<TQString, TQString> entries = d->config->entryMap(
TQString::fromLatin1( "Plugins" ) ); TQString::fromLatin1( "Plugins" ) );
@ -470,7 +470,7 @@ bool
PluginManager::setPluginEnabled( const TQString &pluginId, bool enabled /* = true */ ) PluginManager::setPluginEnabled( const TQString &pluginId, bool enabled /* = true */ )
{ {
if ( !d->config ) if ( !d->config )
d->config = KSharedConfig::openConfig( "komposerrc" ); d->config = TDESharedConfig::openConfig( "komposerrc" );
d->config->setGroup( "Plugins" ); d->config->setGroup( "Plugins" );

Loading…
Cancel
Save