Rename a number of classes to enhance compatibility with KDE4

2 files changed, 22 insertions, 22 deletions

diff --git a/kivio/plugins/kiviozoomtool/tool_zoom.cpp b/kivio/plugins/kiviozoomtool/tool_zoom.cpp
index 01a148be..22e9f63c 100644
--- a/kivio/plugins/kiviozoomtool/tool_zoom.cpp
+++ b/kivio/plugins/kiviozoomtool/tool_zoom.cpp
@@ -40,9 +40,9 @@
 
 ZoomTool::ZoomTool(KivioView* parent) : Kivio::MouseTool(parent, "Zoom Mouse Tool")
 {
-  m_zoomAction = new KRadioAction(i18n("&Zoom"), "viewmag", CTRL + ALT + Key_Z, actionCollection(), "zoom");
+  m_zoomAction = new TDERadioAction(i18n("&Zoom"), "viewmag", CTRL + ALT + Key_Z, actionCollection(), "zoom");
   m_zoomAction->setWhatsThis(i18n("By pressing this button you can zoom in on a specific area."));
-  m_panAction = new KRadioAction(i18n("&Pan Document"), "kivio_zoom_hand", CTRL + ALT + Key_H, actionCollection(), "pan");
+  m_panAction = new TDERadioAction(i18n("&Pan Document"), "kivio_zoom_hand", CTRL + ALT + Key_H, actionCollection(), "pan");
   m_panAction->setWhatsThis(i18n("You can drag the document by using the mouse."));
   m_zoomAction->setExclusiveGroup("zoomAction");
   m_panAction->setExclusiveGroup("zoomAction");
@@ -62,23 +62,23 @@ ZoomTool::ZoomTool(KivioView* parent) : Kivio::MouseTool(parent, "Zoom Mouse Too
   m_pMinus = KStdAction::zoomOut(this, TQT_SLOT(zoomMinus()), actionCollection(), "zoomMinus");
   m_pMinus->setWhatsThis(i18n("By pressing this button you can zoom out of the document."));
 
-  m_pZoomWidth = new KAction( i18n("Zoom Width"), "kivio_zoom_width", SHIFT+Key_F4, actionCollection(), "zoomWidth" );
+  m_pZoomWidth = new TDEAction( i18n("Zoom Width"), "kivio_zoom_width", SHIFT+Key_F4, actionCollection(), "zoomWidth" );
   m_pZoomWidth->setWhatsThis(i18n("You can zoom the document that it fits into the window width."));
   connect(m_pZoomWidth,TQT_SIGNAL(activated()),TQT_SLOT(zoomWidth()));
 
-  m_pZoomHeight = new KAction( i18n("Zoom Height"), "kivio_zoom_height", SHIFT+Key_F5, actionCollection(), "zoomHeight" );
+  m_pZoomHeight = new TDEAction( i18n("Zoom Height"), "kivio_zoom_height", SHIFT+Key_F5, actionCollection(), "zoomHeight" );
   m_pZoomHeight->setWhatsThis(i18n("You can zoom the document that it fits into the window height."));
   connect(m_pZoomHeight,TQT_SIGNAL(activated()),TQT_SLOT(zoomHeight()));
 
-  m_pZoomPage = new KAction( i18n("Zoom Page"), "kivio_zoom_page", SHIFT+Key_F6, actionCollection(), "zoomPage" );
+  m_pZoomPage = new TDEAction( i18n("Zoom Page"), "kivio_zoom_page", SHIFT+Key_F6, actionCollection(), "zoomPage" );
   m_pZoomPage->setWhatsThis(i18n("The Zoom Page button shows the entire page."));
   connect(m_pZoomPage,TQT_SIGNAL(activated()),TQT_SLOT(zoomPage()));
 
-  m_pZoomSelected = new KAction( i18n("Zoom Selected"), "kivio_zoom_selected", CTRL+Key_Y, actionCollection(), "zoomSelected" );
+  m_pZoomSelected = new TDEAction( i18n("Zoom Selected"), "kivio_zoom_selected", CTRL+Key_Y, actionCollection(), "zoomSelected" );
   m_pZoomSelected->setWhatsThis(i18n("By pressing this button you zoom in on the document, so that all <b>selected</b> objects are visible."));
   connect(m_pZoomSelected,TQT_SIGNAL(activated()),TQT_SLOT(zoomSelected()));
 
-  m_pZoomAllObjects = new KAction( i18n("Zoom All Objects"), "kivio_zoom_allobject", 0, actionCollection(), "zoomAllObjects" );
+  m_pZoomAllObjects = new TDEAction( i18n("Zoom All Objects"), "kivio_zoom_allobject", 0, actionCollection(), "zoomAllObjects" );
   m_pZoomAllObjects->setWhatsThis(i18n("You are able to zoom in on the document, so that all objects are visible by pressing this button."));
   connect(m_pZoomAllObjects,TQT_SIGNAL(activated()),TQT_SLOT(zoomAllobjects()));
 
@@ -318,7 +318,7 @@ void ZoomTool::zoomPage()
 void ZoomTool::showPopupMenu(const TQPoint& p )
 {
   if(!m_pMenu) {
-    m_pMenu = static_cast<KPopupMenu*>(factory()->container("ZoomPopup", this));
+    m_pMenu = static_cast<TDEPopupMenu*>(factory()->container("ZoomPopup", this));
   }
   
   if(m_pMenu) {
diff --git a/kivio/plugins/kiviozoomtool/tool_zoom.h b/kivio/plugins/kiviozoomtool/tool_zoom.h
index ce100aca..7e2ce69d 100644
--- a/kivio/plugins/kiviozoomtool/tool_zoom.h
+++ b/kivio/plugins/kiviozoomtool/tool_zoom.h
@@ -24,10 +24,10 @@
 class KivioView;
 class KivioPage;
 class KivioCanvas;
-class KPopupMenu;
+class TDEPopupMenu;
 
-class KRadioAction;
-class KAction;
+class TDERadioAction;
+class TDEAction;
 
 class TQCursor;
 
@@ -64,20 +64,20 @@ class ZoomTool : public Kivio::MouseTool
     void operationDone();
   
   private:
-    KRadioAction* m_zoomAction;
-    KRadioAction* m_panAction;
+    TDERadioAction* m_zoomAction;
+    TDERadioAction* m_panAction;
   
-    KPopupMenu* m_pMenu;
+    TDEPopupMenu* m_pMenu;
   
-    KAction* m_pMinus;
-    KAction* m_pPlus;
-    KAction* m_pZoomWidth;
-    KAction* m_pZoomHeight;
-    KAction* m_pZoomSelected;
-    KAction* m_pZoomPage;
-    KAction* m_pZoomAllObjects;
+    TDEAction* m_pMinus;
+    TDEAction* m_pPlus;
+    TDEAction* m_pZoomWidth;
+    TDEAction* m_pZoomHeight;
+    TDEAction* m_pZoomSelected;
+    TDEAction* m_pZoomPage;
+    TDEAction* m_pZoomAllObjects;
   
-    KAction* m_pCurrent;
+    TDEAction* m_pCurrent;
   
     TQCursor* m_pPlusCursor;
     TQCursor* m_pMinusCursor;