Rename a number of classes to enhance compatibility with KDE4

3 files changed, 20 insertions, 20 deletions

diff --git a/quanta/components/cvsservice/cvscommitdlgs.ui b/quanta/components/cvsservice/cvscommitdlgs.ui
index ad33e4f4..6f79a85e 100644
--- a/quanta/components/cvsservice/cvscommitdlgs.ui
+++ b/quanta/components/cvsservice/cvscommitdlgs.ui
@@ -28,7 +28,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="KListBox" row="1" column="0" rowspan="1" colspan="4">
+        <widget class="TDEListBox" row="1" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>fileList</cstring>
             </property>
diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp
index 58f7d667..e423a221 100644
--- a/quanta/components/cvsservice/cvsservice.cpp
+++ b/quanta/components/cvsservice/cvsservice.cpp
@@ -44,33 +44,33 @@
 
 #define CVSSERVICE_TIMEOUT 1000*60
 
-CVSService::CVSService(KActionCollection *ac)
+CVSService::CVSService(TDEActionCollection *ac)
 {
-  m_menu = new KPopupMenu();
-  KAction *action = new KAction(i18n("&Commit..."), "vcs_commit", 0, this, TQT_SLOT(slotCommit()), ac, "vcs_commit");
+  m_menu = new TDEPopupMenu();
+  TDEAction *action = new TDEAction(i18n("&Commit..."), "vcs_commit", 0, this, TQT_SLOT(slotCommit()), ac, "vcs_commit");
   action->plug(m_menu);
-  action = new KAction(i18n("&Update"), "vcs_update", 0, this, TQT_SLOT(slotUpdate()), ac, "vcs_update");
+  action = new TDEAction(i18n("&Update"), "vcs_update", 0, this, TQT_SLOT(slotUpdate()), ac, "vcs_update");
   action->plug(m_menu);
-  KPopupMenu *updateToMenu = new KPopupMenu(m_menu);
+  TDEPopupMenu *updateToMenu = new TDEPopupMenu(m_menu);
   m_menu->insertItem(SmallIconSet("vcs_update"), i18n("Update &To"), updateToMenu);
-  action = new KAction(i18n("&Tag/Date..."), "vcs_update", 0, this, TQT_SLOT(slotUpdateToTag()), ac, "vcs_update_tag_date");
+  action = new TDEAction(i18n("&Tag/Date..."), "vcs_update", 0, this, TQT_SLOT(slotUpdateToTag()), ac, "vcs_update_tag_date");
   action->plug(updateToMenu);
-  action = new KAction(i18n("&HEAD"), "vcs_update", 0, this, TQT_SLOT(slotUpdateToHead()), ac, "vcs_update_head");
+  action = new TDEAction(i18n("&HEAD"), "vcs_update", 0, this, TQT_SLOT(slotUpdateToHead()), ac, "vcs_update_head");
   action->plug(updateToMenu);
-  action = new KAction(i18n("Re&vert"), "reload", 0, this, TQT_SLOT(slotRevert()), ac, "vcs_revert");
+  action = new TDEAction(i18n("Re&vert"), "reload", 0, this, TQT_SLOT(slotRevert()), ac, "vcs_revert");
   action->plug(m_menu);
   m_menu->insertSeparator();
-  action = new KAction(i18n("&Add to Repository..."), "vcs_add", 0, this, TQT_SLOT(slotAdd()), ac, "vcs_add");
+  action = new TDEAction(i18n("&Add to Repository..."), "vcs_add", 0, this, TQT_SLOT(slotAdd()), ac, "vcs_add");
   action->plug(m_menu);
-  action = new KAction(i18n("&Remove From Repository..."), "vcs_remove", 0, this, TQT_SLOT(slotRemove()), ac, "vcs_remove");
+  action = new TDEAction(i18n("&Remove From Repository..."), "vcs_remove", 0, this, TQT_SLOT(slotRemove()), ac, "vcs_remove");
   action->plug(m_menu);
-  action = new KAction(i18n("&Ignore in CVS Operations"), 0, this, TQT_SLOT(slotAddToCVSIgnore()), ac);
+  action = new TDEAction(i18n("&Ignore in CVS Operations"), 0, this, TQT_SLOT(slotAddToCVSIgnore()), ac);
   action->plug(m_menu);
-  action = new KAction(i18n("Do &Not Ignore in CVS Operations"), 0, this, TQT_SLOT(slotRemoveFromCVSIgnore()), ac);
+  action = new TDEAction(i18n("Do &Not Ignore in CVS Operations"), 0, this, TQT_SLOT(slotRemoveFromCVSIgnore()), ac);
   action->plug(m_menu);
   
   m_menu->insertSeparator();
-  action = new KAction(i18n("Show &Log Messages"), 0, this, TQT_SLOT(slotBrowseLog()), ac);
+  action = new TDEAction(i18n("Show &Log Messages"), 0, this, TQT_SLOT(slotBrowseLog()), ac);
   action->plug(m_menu);
     
   m_cvsJob = 0L;
diff --git a/quanta/components/cvsservice/cvsservice.h b/quanta/components/cvsservice/cvsservice.h
index 4ff92cbe..5c12d91a 100644
--- a/quanta/components/cvsservice/cvsservice.h
+++ b/quanta/components/cvsservice/cvsservice.h
@@ -26,8 +26,8 @@
 #include "cvsservicedcopif.h"
 
 class TQTimer;
-class KPopupMenu;
-class KActionCollection;
+class TDEPopupMenu;
+class TDEActionCollection;
 class CvsJob_stub;
 class CvsService_stub;
 class Repository_stub;
@@ -49,7 +49,7 @@ public:
    *  since this class is a singleton you must use this function to access it
    *  @return the class pointer
    */
-  static CVSService* ref(KActionCollection *ac = 0L)
+  static CVSService* ref(TDEActionCollection *ac = 0L)
   {
     static CVSService *m_ref;
     if (!m_ref) m_ref = new CVSService(ac);
@@ -63,7 +63,7 @@ public:
   bool exists() {return !m_appId.isEmpty();}
   void setRepository(const TQString &repository);
   void setCurrentFile(const TQString &file) {m_defaultFile = file;}
-  KPopupMenu *menu() {return m_menu;}
+  TDEPopupMenu *menu() {return m_menu;}
 
 public slots:
   void slotUpdate();
@@ -97,12 +97,12 @@ private slots:
   void slotTimeout();
   
 private:
-  CVSService(KActionCollection *ac);
+  CVSService(TDEActionCollection *ac);
   void notInRepository();
   void startService();
 
   TQCString m_appId;
-  KPopupMenu *m_menu;
+  TDEPopupMenu *m_menu;
   Repository_stub *m_repository;
   CvsJob_stub *m_cvsJob;
   CvsService_stub *m_cvsService;