Rename a number of classes to enhance compatibility with KDE4

5 files changed, 14 insertions, 14 deletions

diff --git a/kstyles/klegacy/klegacystyle.cpp b/kstyles/klegacy/klegacystyle.cpp
index bd1deffb8..d19dcec0a 100644
--- a/kstyles/klegacy/klegacystyle.cpp
+++ b/kstyles/klegacy/klegacystyle.cpp
@@ -2979,7 +2979,7 @@ void KLegacyStyle::drawTab(TQPainter *p, const TQTabBar *tabbar, TQTab *tab, boo
 
 
 void KLegacyStyle::drawKBarHandle(TQPainter *p, int x, int y, int w, int h,
-				  const TQColorGroup &g, KToolBarPos type, TQBrush *fill)
+				  const TQColorGroup &g, TDEToolBarPos type, TQBrush *fill)
 {
     GtkObject *gobj = priv->gtkDict.find(TQToolBar::staticMetaObject());
 
diff --git a/kstyles/klegacy/klegacystyle.h b/kstyles/klegacy/klegacystyle.h
index 18c073f9a..5288fd4f8 100644
--- a/kstyles/klegacy/klegacystyle.h
+++ b/kstyles/klegacy/klegacystyle.h
@@ -60,7 +60,7 @@ public:
     
     // toolbar stuffs
     virtual void drawKBarHandle(TQPainter *p, int x, int y, int w, int h,
-                                const TQColorGroup &g, KToolBarPos type, TQBrush *fill = 0);
+                                const TQColorGroup &g, TDEToolBarPos type, TQBrush *fill = 0);
     virtual void drawKickerHandle(TQPainter *p, int x, int y, int w, int h,
                                   const TQColorGroup &g, TQBrush *fill = 0);
     virtual void drawKickerAppletHandle(TQPainter *p, int x, int y, int w, int h,
diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp
index ff7199939..7d2c72c2a 100644
--- a/kstyles/kthemestyle/kthemestyle.cpp
+++ b/kstyles/kthemestyle/kthemestyle.cpp
@@ -569,7 +569,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen
         {
             w->setBackgroundMode( TQWidget::NoBackground );
         }
-        else if ( w->inherits( "KToolBarSeparator" ) || w->inherits( "QToolBarSeparator" ) )
+        else if ( w->inherits( "TDEToolBarSeparator" ) || w->inherits( "QToolBarSeparator" ) )
         {
             w->setBackgroundMode( TQWidget::PaletteBackground );
         }
@@ -652,7 +652,7 @@ void KThemeStyle::unPolish( const TQStyleControlElementData &ceData, ControlElem
             w->setBackgroundMode( TQWidget::PaletteButton );
 
         //For toolbar internal separators, return to button, too (can't use tqqt_cast here since don't have access to the class)
-        else if ( w->inherits( "KToolBarSeparator" ) || w->inherits( "QToolBarSeparator" ) )
+        else if ( w->inherits( "TDEToolBarSeparator" ) || w->inherits( "QToolBarSeparator" ) )
             w->setBackgroundMode( TQWidget::PaletteButton );
 
         //For scrollbars, we don't do much, since the widget queries the style on the switch
diff --git a/kstyles/web/webstyle.cpp b/kstyles/web/webstyle.cpp
index ab5282e06..3e850394f 100644
--- a/kstyles/web/webstyle.cpp
+++ b/kstyles/web/webstyle.cpp
@@ -965,7 +965,7 @@ WebStyle::drawSlider
 }
 
   void
-WebStyle::drawKToolBar
+WebStyle::drawTDEToolBar
 (
  TQPainter * p,
  int x,
@@ -973,7 +973,7 @@ WebStyle::drawKToolBar
  int w,
  int h,
  const TQColorGroup & g,
- KToolBarPos /* pos */,
+ TDEToolBarPos /* pos */,
  TQBrush * /* fill */
 )
 {
@@ -993,7 +993,7 @@ WebStyle::drawKBarHandle
  int w,
  int h,
  const TQColorGroup & g,
- KToolBarPos /* pos */,
+ TDEToolBarPos /* pos */,
  TQBrush * /* fill */
 )
 {
@@ -1025,7 +1025,7 @@ WebStyle::drawKMenuBar
 }
 
   void
-WebStyle::drawKToolBarButton
+WebStyle::drawTDEToolBarButton
 (
  TQPainter * p,
  int x,
@@ -1037,7 +1037,7 @@ WebStyle::drawKToolBarButton
  bool raised,
  bool enabled,
  bool popup,
- KToolButtonType type,
+ TDEToolButtonType type,
  const TQString & btext,
  const TQPixmap * pixmap,
  TQFont * font,
diff --git a/kstyles/web/webstyle.h b/kstyles/web/webstyle.h
index 5cd930c73..611cf8485 100644
--- a/kstyles/web/webstyle.h
+++ b/kstyles/web/webstyle.h
@@ -210,7 +210,7 @@ class WebStyle : public KStyle
        bool tickBelow
       );
 
-    void drawKToolBar
+    void drawTDEToolBar
       (
        TQPainter *, 
        int x, 
@@ -218,7 +218,7 @@ class WebStyle : public KStyle
        int w, 
        int h,
        const TQColorGroup &, 
-       KToolBarPos,
+       TDEToolBarPos,
        TQBrush * fill = 0
       );
 
@@ -230,7 +230,7 @@ class WebStyle : public KStyle
        int w, 
        int h,
        const TQColorGroup &,
-       KToolBarPos, 
+       TDEToolBarPos, 
        TQBrush * fill = 0
       );
 
@@ -246,7 +246,7 @@ class WebStyle : public KStyle
        TQBrush * fill = 0
       );
 
-    void drawKToolBarButton
+    void drawTDEToolBarButton
       (
        TQPainter * p, 
        int x, 
@@ -258,7 +258,7 @@ class WebStyle : public KStyle
        bool raised = true, 
        bool enabled = true,
        bool popup = false,
-       KToolButtonType = Icon,
+       TDEToolButtonType = Icon,
        const TQString & btext = TQString::null,
        const TQPixmap * = 0,
        TQFont * = 0,