diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kicker/kicker/core/extensionmanager.cpp | |
parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kicker/kicker/core/extensionmanager.cpp')
-rw-r--r-- | kicker/kicker/core/extensionmanager.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index fce133a0f..62594443f 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -87,7 +87,7 @@ ExtensionManager::~ExtensionManager() void ExtensionManager::initialize() { // kdDebug(1210) << "ExtensionManager::loadContainerConfig()" << endl; - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); PluginManager* pm = PluginManager::the(); // set up the "main" panel @@ -175,9 +175,9 @@ void ExtensionManager::initialize() void ExtensionManager::configureMenubar(bool duringInit) { - KConfig menuConfig( "kdesktoprc", true ); - if( KConfigGroup( &menuConfig, "KDE" ).readBoolEntry("macStyle", false) - || KConfigGroup( &menuConfig, "Menubar" ).readBoolEntry( "ShowMenubar", false )) + TDEConfig menuConfig( "kdesktoprc", true ); + if( TDEConfigGroup( &menuConfig, "KDE" ).readBoolEntry("macStyle", false) + || TDEConfigGroup( &menuConfig, "Menubar" ).readBoolEntry( "ShowMenubar", false )) { if (TDEGlobal::dirs()->findResource("applets", "menuapplet.desktop").isEmpty() || m_menubarPanel) @@ -239,7 +239,7 @@ void ExtensionManager::migrateMenubar() // panel, meaning kickerrc itself would have to be vastly modified // with lots of complications. not work it IMHO. - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("General"); if (config->readBoolEntry("CheckedForMenubar", false)) @@ -272,7 +272,7 @@ void ExtensionManager::migrateMenubar() config->setGroup(extensionId); TQString extension = config->readPathEntry("ConfigFile"); - KConfig extensionConfig(locate("config", extension)); + TDEConfig extensionConfig(locate("config", extension)); extensionConfig.setGroup("General"); if (extensionConfig.hasKey("Applets2")) @@ -290,7 +290,7 @@ void ExtensionManager::migrateMenubar() continue; } - KConfigGroup group(&extensionConfig, appletId.latin1()); + TDEConfigGroup group(&extensionConfig, appletId.latin1()); TQString appletType = appletId.left(appletId.findRev('_')); if (appletType == "Applet") @@ -299,7 +299,7 @@ void ExtensionManager::migrateMenubar() if (appletFile.find("menuapplet.desktop") != -1) { TQString menubarConfig = locate("config", extension); - KIO::NetAccess::copy(menubarConfig, + TDEIO::NetAccess::copy(menubarConfig, locateLocal("config", "kicker_menubarpanelrc"), 0); elist.remove(it); @@ -322,7 +322,7 @@ void ExtensionManager::saveContainerConfig() { // kdDebug(1210) << "ExtensionManager::saveContainerConfig()" << endl; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); // build the extension list TQStringList elist; |