From aa3abfa2a78cccfcb1f91d808753c79295d618e9 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 3 Feb 2013 23:01:18 -0600
Subject: Rename KStyle to TDEStyle to avoid conflicts with KDE4

---
 kstyles/kthemestyle/kthemestyle.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'kstyles/kthemestyle/kthemestyle.cpp')

diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp
index 7d2c72c2a..4cc374e5d 100644
--- a/kstyles/kthemestyle/kthemestyle.cpp
+++ b/kstyles/kthemestyle/kthemestyle.cpp
@@ -130,7 +130,7 @@ public:
     TQStringList keys() const
     {
         TQSettings cfg;
-        KStyleDirs::dirs()->addToSearch( "config", cfg );
+        TDEStyleDirs::dirs()->addToSearch( "config", cfg );
 
         TQStringList keys;
         bool ok;
@@ -145,7 +145,7 @@ public:
     TQStyle* create( const TQString& key )
     {
         TQSettings cfg;
-        KStyleDirs::dirs()->addToSearch( "config", cfg );
+        TDEStyleDirs::dirs()->addToSearch( "config", cfg );
 
         TQString file = cfg.readEntry( "/kthemestyle/" + key + "/file" );
         if ( !key.isEmpty() )
@@ -330,7 +330,7 @@ TQRect KThemeStyle::subRect(SubRect sr, const TQStyleControlElementData &ceData,
             return checkbox;
         }
     }
-    return KStyle::subRect(sr, ceData, elementFlags, widget);
+    return TDEStyle::subRect(sr, ceData, elementFlags, widget);
 }
 
 int KThemeStyle::pixelMetric ( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * widget ) const
@@ -515,7 +515,7 @@ bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, C
         }
     }
 
-    return KStyle::objectEventHandler(ceData, elementFlags, source, event);
+    return TDEStyle::objectEventHandler(ceData, elementFlags, source, event);
 }
 
 void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
@@ -626,7 +626,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen
         }
     }
 
-    KStyle::polish( ceData, elementFlags, ptr );
+    TDEStyle::polish( ceData, elementFlags, ptr );
 }
 
 void KThemeStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
@@ -662,7 +662,7 @@ void KThemeStyle::unPolish( const TQStyleControlElementData &ceData, ControlElem
          w->unsetPalette();
     }
 
-    KStyle::unPolish( ceData, elementFlags, ptr );
+    TDEStyle::unPolish( ceData, elementFlags, ptr );
 }
 
 
@@ -1831,7 +1831,7 @@ void KThemeStyle::drawControlMask( ControlElement element,
 }
 
 
-void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe,
+void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
                                        TQPainter* p,
                                        const TQStyleControlElementData &ceData,
                                        ControlElementFlags elementFlags,
@@ -2004,7 +2004,7 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe,
 
     if ( !handled )
     {
-        KThemeBase::drawKStylePrimitive( kpe, p, ceData, elementFlags,
+        KThemeBase::drawTDEStylePrimitive( kpe, p, ceData, elementFlags,
                                          r, cg, flags, opt, widget );
     }
 
-- 
cgit v1.2.1