summaryrefslogtreecommitdiffstats
path: root/khtml/css
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
commit703fb0c89c2eee56a1e613e67a446db9d4287929 (patch)
treedd8c5ca66075cd89c2638a2b48cf78386a9870a7 /khtml/css
parent818e7abec3d5d3809b6b77293558678371c16b71 (diff)
downloadtdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz
tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'khtml/css')
-rw-r--r--khtml/css/cssstyleselector.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp
index 6559a2b9e..3f4a8cd26 100644
--- a/khtml/css/cssstyleselector.cpp
+++ b/khtml/css/cssstyleselector.cpp
@@ -2076,7 +2076,7 @@ static TQColor colorForCSSValue( int css_value )
else if ( css_value == CSS_VAL_INFOTEXT )
return TQToolTip::palette().inactive().foreground();
else if ( css_value == CSS_VAL_BACKGROUND ) {
- KConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support
+ TDEConfig bckgrConfig("kdesktoprc", true, false); // No multi-screen support
bckgrConfig.setGroup("Desktop0");
// Desktop background.
return bckgrConfig.readColorEntry("Color1", &tqApp->palette().disabled().background());
@@ -2089,7 +2089,7 @@ static TQColor colorForCSSValue( int css_value )
TQColor c = pal.color( uicol->group, uicol->role );
#ifndef APPLE_CHANGES
if ( uicol->configEntry ) {
- KConfig *globalConfig = TDEGlobal::config();
+ TDEConfig *globalConfig = TDEGlobal::config();
globalConfig->setGroup( uicol->configGroup );
c = globalConfig->readColorEntry( uicol->configEntry, &c );
}