Rename a number of classes to enhance compatibility with KDE4

14 files changed, 33 insertions, 33 deletions

diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
index 572936e7..acc736ec 100644
--- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
@@ -25,7 +25,7 @@
 #include <tqcursor.h>
 #include <tqtoolbutton.h>
 
-#define TOGGLE_ACTION(X) ((KToggleAction*)child(X))
+#define TOGGLE_ACTION(X) ((TDEToggleAction*)child(X))
 
 KivioBirdEyePanel::KivioBirdEyePanel(KivioView* view, TQWidget* parent, const char* name)
 : KivioBirdEyePanelBase(parent, name), m_pView(view), m_pCanvas(view->canvasWidget()), m_pDoc(view->doc())
diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.h b/kivio/kiviopart/ui/kivio_birdeye_panel.h
index 185e40ee..d5a2ea41 100644
--- a/kivio/kiviopart/ui/kivio_birdeye_panel.h
+++ b/kivio/kiviopart/ui/kivio_birdeye_panel.h
@@ -27,7 +27,7 @@ class KivioView;
 class KivioCanvas;
 class KivioDoc;
 class KivioPage;
-class KAction;
+class TDEAction;
 class KoZoomHandler;
 
 class KivioBirdEyePanel : public KivioBirdEyePanelBase
@@ -58,8 +58,8 @@ private:
   KivioCanvas* m_pCanvas;
   KivioDoc* m_pDoc;
 
-  KAction* zoomIn;
-  KAction* zoomOut;
+  TDEAction* zoomIn;
+  TDEAction* zoomOut;
   TQPixmap* m_buffer;
 
   TQRect varea;
diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp
index 1302f2be..2667dffd 100644
--- a/kivio/kiviopart/ui/kivio_layer_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_layer_panel.cpp
@@ -75,11 +75,11 @@ KivioLayerPanel::KivioLayerPanel(KivioView* view, TQWidget* parent, const char*
   list->setSorting(5, false);
   list->installEventFilter(this);
 
-  actNew = new KAction( i18n("New Layer"), BarIcon("layer_add",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(addItem()), TQT_TQOBJECT(this));
-  actDel = new KAction( i18n("Remove Layer"), BarIcon("layer_remove",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(removeItem()), TQT_TQOBJECT(this));
-  actRename = new KAction( i18n("Rename Layer"), BarIcon("item_rename",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(renameItem()), TQT_TQOBJECT(this));
-  actUp = new KAction( i18n("Move Layer Up"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT(upItem()), TQT_TQOBJECT(this));
-  actDown = new KAction( i18n("Move Layer Down"), "down", 0, TQT_TQOBJECT(this), TQT_SLOT(downItem()), TQT_TQOBJECT(this));
+  actNew = new TDEAction( i18n("New Layer"), BarIcon("layer_add",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(addItem()), TQT_TQOBJECT(this));
+  actDel = new TDEAction( i18n("Remove Layer"), BarIcon("layer_remove",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(removeItem()), TQT_TQOBJECT(this));
+  actRename = new TDEAction( i18n("Rename Layer"), BarIcon("item_rename",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(renameItem()), TQT_TQOBJECT(this));
+  actUp = new TDEAction( i18n("Move Layer Up"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT(upItem()), TQT_TQOBJECT(this));
+  actDown = new TDEAction( i18n("Move Layer Down"), "down", 0, TQT_TQOBJECT(this), TQT_SLOT(downItem()), TQT_TQOBJECT(this));
 
   actNew->plug(bar);
   actDel->plug(bar);
diff --git a/kivio/kiviopart/ui/kivio_layer_panel.h b/kivio/kiviopart/ui/kivio_layer_panel.h
index d4bcdb0d..cfc24a94 100644
--- a/kivio/kiviopart/ui/kivio_layer_panel.h
+++ b/kivio/kiviopart/ui/kivio_layer_panel.h
@@ -19,7 +19,7 @@
 #ifndef KIVIOLAYERPANEL_H
 #define KIVIOLAYERPANEL_H
 
-class KAction;
+class TDEAction;
 
 class KivioView;
 class KivioLayer;
@@ -73,11 +73,11 @@ class KivioLayerPanel : public KivioLayerPanelBase
   private:
     KivioView* m_pView;
 
-    KAction* actNew;
-    KAction* actDel;
-    KAction* actRename;
-    KAction* actUp;
-    KAction* actDown;
+    TDEAction* actNew;
+    TDEAction* actDel;
+    TDEAction* actRename;
+    TDEAction* actUp;
+    TDEAction* actDown;
 
     int id;
 };
diff --git a/kivio/kiviopart/ui/kivio_layer_panel_base.ui b/kivio/kiviopart/ui/kivio_layer_panel_base.ui
index 904196c2..4f6bad32 100644
--- a/kivio/kiviopart/ui/kivio_layer_panel_base.ui
+++ b/kivio/kiviopart/ui/kivio_layer_panel_base.ui
@@ -26,7 +26,7 @@
         <property name="spacing">
             <number>0</number>
         </property>
-        <widget class="KToolBar">
+        <widget class="TDEToolBar">
             <property name="name">
                 <cstring>bar</cstring>
             </property>
@@ -46,7 +46,7 @@
 </widget>
 <customwidgets>
     <customwidget>
-        <class>KToolBar</class>
+        <class>TDEToolBar</class>
         <header location="local">ktoolbar.h</header>
         <sizehint>
             <width>-1</width>
diff --git a/kivio/kiviopart/ui/kivio_protection_panel.h b/kivio/kiviopart/ui/kivio_protection_panel.h
index beadfc27..d53f140d 100644
--- a/kivio/kiviopart/ui/kivio_protection_panel.h
+++ b/kivio/kiviopart/ui/kivio_protection_panel.h
@@ -19,7 +19,7 @@
 #ifndef _KIVIO_PROTECTION_PANEL_H
 #define _KIVIO_PROTECTION_PANEL_H
 
-class KAction;
+class TDEAction;
 class KivioView;
 class KivioLayer;
 
diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
index 7e2a937a..8372b1a3 100644
--- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
+++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
@@ -112,7 +112,7 @@ namespace Kivio {
         }
         
         if(!li) {
-          li = new KListViewItem(m_stencilSetLView,
+          li = new TDEListViewItem(m_stencilSetLView,
             KivioStencilSpawnerSet::readTitle(colFInfo->absFilePath()),
             KivioStencilSpawnerSet::readId(colFInfo->absFilePath()));
           li->setPixmap(0, loadIcon("icon", colFInfo->absFilePath()));
@@ -140,7 +140,7 @@ namespace Kivio {
     {
       if( setFInfo->fileName() != ".." && setFInfo->fileName() != "." )
       {
-        KListViewItem* tmp = new KListViewItem(li, KivioStencilSpawnerSet::readTitle(setFInfo->absFilePath()),
+        TDEListViewItem* tmp = new TDEListViewItem(li, KivioStencilSpawnerSet::readTitle(setFInfo->absFilePath()),
           dir + "/" + setFInfo->fileName());
         tmp->setPixmap(0, loadIcon("icon", setFInfo->absFilePath()));
 
diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
index 613f0fd4..b72d886b 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
@@ -49,7 +49,7 @@
 #include <tqtabwidget.h>
 
 // GuidesListViewItem::GuidesListViewItem(TQListView* parent, KivioGuideLineData *gd, KoUnit::Unit u)
-// : KListViewItem(parent), m_data(gd)
+// : TDEListViewItem(parent), m_data(gd)
 // {
 //   setPixmap(0, BarIcon(m_data->orientation() == Qt::Vertical ?
 //     "guides_vertical":"guides_horizontal"));
@@ -330,7 +330,7 @@ void KivioOptionsDialog::setFontText(const TQFont& f)
 
 void KivioOptionsDialog::fontDlg()
 {
-  if(KFontDialog::getFont(m_font, false, this) == TQDialog::Accepted) {
+  if(TDEFontDialog::getFont(m_font, false, this) == TQDialog::Accepted) {
     setFontText(m_font);
   }
 }
diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.h b/kivio/kiviopart/ui/kiviooptionsdialog.h
index df055a34..69a43be8 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.h
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.h
@@ -37,7 +37,7 @@ class KivioGuideLineData;
 class TQGroupBox;
 class TQFont;
 
-// class GuidesListViewItem : public KListViewItem
+// class GuidesListViewItem : public TDEListViewItem
 // {
 //   public:
 //     GuidesListViewItem(TQListView* parent, KivioGuideLineData *gd, KoUnit::Unit u);
diff --git a/kivio/kiviopart/ui/kiviostencilsetwidget.ui b/kivio/kiviopart/ui/kiviostencilsetwidget.ui
index 48de8cc4..4b84ae30 100644
--- a/kivio/kiviopart/ui/kiviostencilsetwidget.ui
+++ b/kivio/kiviopart/ui/kiviostencilsetwidget.ui
@@ -44,7 +44,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             <property name="orientation">
                 <enum>Horizontal</enum>
             </property>
-            <widget class="KListView">
+            <widget class="TDEListView">
                 <column>
                     <property name="text">
                         <string>Stencil Set</string>
diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.cpp b/kivio/kiviopart/ui/kiviotextformatdlg.cpp
index 14c390fa..92424aaa 100644
--- a/kivio/kiviopart/ui/kiviotextformatdlg.cpp
+++ b/kivio/kiviopart/ui/kiviotextformatdlg.cpp
@@ -43,7 +43,7 @@ KivioTextFormatDlg::KivioTextFormatDlg(KivioView* parent, const char* name)
 void KivioTextFormatDlg::initFontTab()
 {
   TQFrame* tab = addPage(i18n("Font"));
-  m_fontChooser = new KFontChooser(tab);
+  m_fontChooser = new TDEFontChooser(tab);
   TQLabel* textColorLbl = new TQLabel(i18n("Text color:"), tab);
   m_textCBtn = new KColorButton(tab);
   TQGridLayout* gl = new TQGridLayout(tab);
diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.h b/kivio/kiviopart/ui/kiviotextformatdlg.h
index b095abe4..39b76929 100644
--- a/kivio/kiviopart/ui/kiviotextformatdlg.h
+++ b/kivio/kiviopart/ui/kiviotextformatdlg.h
@@ -23,7 +23,7 @@
 #include <kdialogbase.h>
 
 class KivioView;
-class KFontChooser;
+class TDEFontChooser;
 class KColorButton;
 class TQButtonGroup;
 class TQLabel;
@@ -58,7 +58,7 @@ class KivioTextFormatDlg : public KDialogBase
     void slotDefault();
 
   protected:
-    KFontChooser* m_fontChooser;
+    TDEFontChooser* m_fontChooser;
     KColorButton* m_textCBtn;
     TQButtonGroup* m_halignBGrp;
     TQButtonGroup* m_valignBGrp;
diff --git a/kivio/kiviopart/ui/objectlistpalette.cpp b/kivio/kiviopart/ui/objectlistpalette.cpp
index fbe094e5..01857617 100644
--- a/kivio/kiviopart/ui/objectlistpalette.cpp
+++ b/kivio/kiviopart/ui/objectlistpalette.cpp
@@ -37,11 +37,11 @@
 
 namespace Kivio {
 
-class ObjectListItem : public KListViewItem
+class ObjectListItem : public TDEListViewItem
 {
   public:
-    ObjectListItem(KListView* parent, KivioStencil* _stencil)
-      : KListViewItem(parent, "")
+    ObjectListItem(TDEListView* parent, KivioStencil* _stencil)
+      : TDEListViewItem(parent, "")
     {
       m_stencil = _stencil;
       setPixmap(0, Kivio::generatePixmapFromStencil(22, 22, m_stencil));
@@ -87,7 +87,7 @@ ObjectListPalette::ObjectListPalette(KivioView* parent, const char* name)
 
   TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 2);
 
-  m_objectList = new KListView(this);
+  m_objectList = new TDEListView(this);
   m_objectList->setFullWidth(true);
   m_objectList->setAllColumnsShowFocus(true);
   m_objectList->setSorting(-1);
diff --git a/kivio/kiviopart/ui/objectlistpalette.h b/kivio/kiviopart/ui/objectlistpalette.h
index 82ca4827..ed22bcc0 100644
--- a/kivio/kiviopart/ui/objectlistpalette.h
+++ b/kivio/kiviopart/ui/objectlistpalette.h
@@ -21,7 +21,7 @@
 
 #include <tqwidget.h>
 
-class KListView;
+class TDEListView;
 class KivioView;
 
 namespace Kivio {
@@ -44,7 +44,7 @@ class ObjectListPalette : public TQWidget
 
   private:
     KivioView* m_view;
-    KListView* m_objectList;
+    TDEListView* m_objectList;
 
     bool m_blockUpdate;
 };