summaryrefslogtreecommitdiffstats
path: root/kcontrol/style/kcmstyle.cpp
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2013-08-18 10:16:29 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2013-08-18 10:16:29 -0500
commit3fce7943f47444f0ac0ccbd225e8b48d8275764b (patch)
tree1245fb62987e54d04ddd5a245a84ab90b28eea4d /kcontrol/style/kcmstyle.cpp
parentdf510360d365d88e9496f583fc4d385680b15a17 (diff)
downloadtdebase-3fce7943f47444f0ac0ccbd225e8b48d8275764b.tar.gz
tdebase-3fce7943f47444f0ac0ccbd225e8b48d8275764b.zip
Rename KStyle to TDEStyle to avoid conflicts with KDE4.
Diffstat (limited to 'kcontrol/style/kcmstyle.cpp')
-rw-r--r--kcontrol/style/kcmstyle.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index 623ceeebf..2ca50631d 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -128,7 +128,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
m_bToolbarsDirty = false;
TDEGlobal::dirs()->addResourceType("themes",
- TDEStandardDirs::kde_default("data") + "kstyle/themes");
+ TDEStandardDirs::kde_default("data") + "tdestyle/themes");
TDEAboutData *about =
new TDEAboutData( I18N_NOOP("kcmstyle"),
@@ -451,7 +451,7 @@ void KCMStyle::styleSpecificConfig()
return;
}
- void* allocPtr = library->symbol("allocate_kstyle_config");
+ void* allocPtr = library->symbol("allocate_tdestyle_config");
if (!allocPtr)
{