From 703fb0c89c2eee56a1e613e67a446db9d4287929 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:35:07 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kstyles/kthemestyle/kthemebase.cpp | 2 +- kstyles/kthemestyle/kthemebase.h | 4 ++-- kstyles/kthemestyle/kthemestyle.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'kstyles') diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp index 544f692e0..7ca3ffb06 100644 --- a/kstyles/kthemestyle/kthemebase.cpp +++ b/kstyles/kthemestyle/kthemebase.cpp @@ -60,7 +60,7 @@ Bugs: Can't delete old slider image when calculating the rotated one for some reason. */ -//Shamelessly stolen from KConfigBase +//Shamelessly stolen from TDEConfigBase static TQColor readColorEntry( TQSettings* s, const char *pKey, const TQColor* pDefault ) { diff --git a/kstyles/kthemestyle/kthemebase.h b/kstyles/kthemestyle/kthemebase.h index 1e002cd4a..e9ea55d5b 100644 --- a/kstyles/kthemestyle/kthemebase.h +++ b/kstyles/kthemestyle/kthemebase.h @@ -280,7 +280,7 @@ public: Background, RotSliderGroove, RotInactiveTab, RotActiveTab, WIDGETS}; /** - * The scaling type specified by the KConfig file. + * The scaling type specified by the TDEConfig file. * * @param widget A Widgets enum value. * @@ -288,7 +288,7 @@ public: */ ScaleHint scaleHint( WidgetType widget ) const; /** - * The gradient type specified by the KConfig file. + * The gradient type specified by the TDEConfig file. * * @param widget A Widgets enum value. * diff --git a/kstyles/kthemestyle/kthemestyle.h b/kstyles/kthemestyle/kthemestyle.h index 457064a56..c978601a8 100644 --- a/kstyles/kthemestyle/kthemestyle.h +++ b/kstyles/kthemestyle/kthemestyle.h @@ -72,8 +72,8 @@ public: /** * Constructs a new KThemeStyle object. * - * @param configDir The directory which has the KConfig file. - * @param configFile A KConfig file to use as the theme configuration. + * @param configDir The directory which has the TDEConfig file. + * @param configFile A TDEConfig file to use as the theme configuration. * Defaults to ~/.kderc. */ KThemeStyle( const TQString& configDir, const TQString &configFile = TQString::null ); -- cgit v1.2.3