summaryrefslogtreecommitdiffstats
path: root/kcontrol/krdb/krdb.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 /kcontrol/krdb/krdb.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 'kcontrol/krdb/krdb.cpp')
-rw-r--r--kcontrol/krdb/krdb.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index 1f8dfcc7d..72d9c1fe0 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -99,7 +99,7 @@ static void applyGtkStyles(bool active, int version)
// -----------------------------------------------------------------------------
-static void applyQtColors( KConfig& kglobals, TQSettings& settings, TQPalette& newPal )
+static void applyQtColors( TDEConfig& kglobals, TQSettings& settings, TQPalette& newPal )
{
TQStringList actcg, inactcg, discg;
@@ -162,7 +162,7 @@ static void applyQtColors( KConfig& kglobals, TQSettings& settings, TQPalette& n
// -----------------------------------------------------------------------------
-static void applyQtSettings( KConfig& kglobals, TQSettings& settings )
+static void applyQtSettings( TDEConfig& kglobals, TQSettings& settings )
{
/* export kde's plugin library path to qtrc */
@@ -428,7 +428,7 @@ void runRdb( uint flags )
bool exportQtSettings = flags & KRdbExportQtSettings;
bool exportXftSettings = flags & KRdbExportXftSettings;
- KConfig kglobals("kdeglobals", true, false);
+ TDEConfig kglobals("kdeglobals", true, false);
kglobals.setGroup("KDE");
KTempFile tmpFile;
@@ -497,7 +497,7 @@ void runRdb( uint flags )
copyFile(tmp, homeDir + "/.Xdefaults", true);
// Export the Xcursor theme & size settings
- KConfig mousecfg( "kcminputrc" );
+ TDEConfig mousecfg( "kcminputrc" );
mousecfg.setGroup( "Mouse" );
TQString theme = mousecfg.readEntry("cursorTheme", TQString());
TQString size = mousecfg.readEntry("cursorSize", TQString());
@@ -545,7 +545,7 @@ void runRdb( uint flags )
contents += "Xft.rgba: " + subPixel + '\n';
}
- KConfig cfgfonts("kcmfonts", true);
+ TDEConfig cfgfonts("kcmfonts", true);
cfgfonts.setGroup("General");
if( cfgfonts.readNumEntry( "forceFontDPI", 0 ) != 0 )
contents += "Xft.dpi: " + cfgfonts.readEntry( "forceFontDPI" ) + '\n';