From 3fce7943f47444f0ac0ccbd225e8b48d8275764b Mon Sep 17 00:00:00 2001
From: Darrell Anderson <humanreadable@yahoo.com>
Date: Sun, 18 Aug 2013 10:16:29 -0500
Subject: Rename KStyle to TDEStyle to avoid conflicts with KDE4.

---
 kcontrol/style/kcmstyle.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kcontrol/style/kcmstyle.cpp')

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)
 	{
-- 
cgit v1.2.1