Rename a number of classes to enhance compatibility with KDE4

4 files changed, 8 insertions, 8 deletions

diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp
index 5c6a2aca..26103e0e 100644
--- a/kolourpaint/widgets/kpcolortoolbar.cpp
+++ b/kolourpaint/widgets/kpcolortoolbar.cpp
@@ -953,7 +953,7 @@ void kpColorSimilarityToolBarItem::mouseDoubleClickEvent (TQMouseEvent * /*e*/)
  */
 
 kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow, const char *name)
-    : KToolBar (mainWindow, name),
+    : TDEToolBar (mainWindow, name),
       m_mainWindow (mainWindow)
 {
     setText (label);
@@ -993,7 +993,7 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow,
     m_lastDockedOrientationSet = false;
     setOrientation (orientation ());
 
-    KToolBar::insertWidget (0, base->width (), base);
+    TDEToolBar::insertWidget (0, base->width (), base);
 }
 
 // virtual
@@ -1025,7 +1025,7 @@ void kpColorToolBar::setOrientation (Qt::Orientation o)
 
     m_colorPalette->setOrientation (o);
 
-    KToolBar::setOrientation (o);
+    TDEToolBar::setOrientation (o);
 }
 
 kpColorToolBar::~kpColorToolBar ()
diff --git a/kolourpaint/widgets/kpcolortoolbar.h b/kolourpaint/widgets/kpcolortoolbar.h
index 8f5080cc..14b613c6 100644
--- a/kolourpaint/widgets/kpcolortoolbar.h
+++ b/kolourpaint/widgets/kpcolortoolbar.h
@@ -245,7 +245,7 @@ private:
 };
 
 
-class kpColorToolBar : public KToolBar
+class kpColorToolBar : public TDEToolBar
 {
 Q_OBJECT
   
diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp
index abe63d87..fb0ca446 100644
--- a/kolourpaint/widgets/kptooltoolbar.cpp
+++ b/kolourpaint/widgets/kptooltoolbar.cpp
@@ -81,7 +81,7 @@ protected:
 
 
 kpToolToolBar::kpToolToolBar (const TQString &label, kpMainWindow *mainWindow, int colsOrRows, const char *name)
-    : KToolBar ((TQWidget *) mainWindow, name, false/*don't use global toolBar settings*/, true/*readConfig*/),
+    : TDEToolBar ((TQWidget *) mainWindow, name, false/*don't use global toolBar settings*/, true/*readConfig*/),
       m_vertCols (colsOrRows),
       m_buttonGroup (0),
       m_baseWidget (0),
@@ -507,7 +507,7 @@ void kpToolToolBar::slotToolActionActivated ()
 
     if (m_currentTool)
     {
-        // If the user clicks on the same KToggleAction, it unchecks it
+        // If the user clicks on the same TDEToggleAction, it unchecks it
         // - this is inconsistent with the Tool Box so always make sure it's
         // checked.
         kpToolAction *action = m_currentTool->action ();
@@ -620,7 +620,7 @@ void kpToolToolBar::setOrientation (Qt::Orientation o)
         }
     }
 
-    KToolBar::setOrientation (o);
+    TDEToolBar::setOrientation (o);
 }
 
 // private
diff --git a/kolourpaint/widgets/kptooltoolbar.h b/kolourpaint/widgets/kptooltoolbar.h
index 0607a377..3777c1fa 100644
--- a/kolourpaint/widgets/kptooltoolbar.h
+++ b/kolourpaint/widgets/kptooltoolbar.h
@@ -51,7 +51,7 @@ class kpToolWidgetLineWidth;
 class kpToolWidgetOpaqueOrTransparent;
 class kpToolWidgetSpraycanSize;
 
-class kpToolToolBar : public KToolBar
+class kpToolToolBar : public TDEToolBar
 {
 Q_OBJECT