summaryrefslogtreecommitdiffstats
path: root/twin/lib/kdecoration_plugins_p.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /twin/lib/kdecoration_plugins_p.cpp
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'twin/lib/kdecoration_plugins_p.cpp')
-rw-r--r--twin/lib/kdecoration_plugins_p.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/twin/lib/kdecoration_plugins_p.cpp b/twin/lib/kdecoration_plugins_p.cpp
index b680170c3..e6c6cfe36 100644
--- a/twin/lib/kdecoration_plugins_p.cpp
+++ b/twin/lib/kdecoration_plugins_p.cpp
@@ -36,7 +36,7 @@ DEALINGS IN THE SOFTWARE.
#include "kdecorationfactory.h"
-KDecorationPlugins::KDecorationPlugins( KConfig* cfg )
+KDecorationPlugins::KDecorationPlugins( TDEConfig* cfg )
: create_ptr( NULL ),
library( NULL ),
fact( NULL ),
@@ -95,7 +95,7 @@ bool KDecorationPlugins::loadPlugin( TQString nameStr )
{
if( nameStr.isEmpty())
{
- KConfigGroupSaver saver( config, "Style" );
+ TDEConfigGroupSaver saver( config, "Style" );
nameStr = config->readEntry("PluginLib", defaultPlugin );
}
// make sure people can switch between HEAD and twin_iii branch