diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /twin/options.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 'twin/options.cpp')
| -rw-r--r-- | twin/options.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/twin/options.cpp b/twin/options.cpp index c78cec2d9..d1dc123c5 100644 --- a/twin/options.cpp +++ b/twin/options.cpp @@ -46,7 +46,7 @@ Options::~Options() unsigned long Options::updateSettings() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); unsigned long changed = 0; changed |= d->updateKWinSettings( config ); // read decoration settings @@ -84,7 +84,7 @@ unsigned long Options::updateSettings() if( !focusPolicyIsReasonable()) // #48786, comments #7 and later focusStealingPreventionLevel = 0; - KConfig *gc = new KConfig("kdeglobals", false, false); + TDEConfig *gc = new TDEConfig("kdeglobals", false, false); gc->setGroup("Windows"); xineramaEnabled = gc->readBoolEntry ("XineramaEnabled", true ); xineramaPlacementEnabled = gc->readBoolEntry ("XineramaPlacementEnabled", true); @@ -218,11 +218,11 @@ unsigned long Options::updateSettings() // Since we want to allow users to enable window decoration tooltips // and not kstyle tooltips and vise-versa, we don't read the // "EffectNoTooltip" setting from kdeglobals. - KConfig globalConfig("kdeglobals"); + TDEConfig globalConfig("kdeglobals"); globalConfig.setGroup("KDE"); topmenus = globalConfig.readBoolEntry( "macStyle", false ); - KConfig kdesktopcfg( "kdesktoprc", true ); + TDEConfig kdesktopcfg( "kdesktoprc", true ); kdesktopcfg.setGroup( "Menubar" ); desktop_topmenu = kdesktopcfg.readBoolEntry( "ShowMenubar", false ); if( desktop_topmenu ) |