Rename a number of classes to enhance compatibility with KDE4

9 files changed, 49 insertions, 49 deletions

diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index d2fb755bb..6cdc1dbac 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -57,7 +57,7 @@ KonsoleMenu::~KonsoleMenu()
     TDEGlobal::locale()->removeCatalogue("libkickermenu_konsole");
 }
 
-static void insertItemSorted(KPopupMenu *menu,
+static void insertItemSorted(TDEPopupMenu *menu,
                              const TQIconSet &iconSet,
                              const TQString &txt, int id)
 {
@@ -196,7 +196,7 @@ void KonsoleMenu::initialize()
     id = 0;
 
     delete m_profileMenu;
-    m_profileMenu = new KPopupMenu(this);
+    m_profileMenu = new TDEPopupMenu(this);
     TQStringList profiles = TDEGlobal::dirs()->findAllResources("data",
                                                            "konsole/profiles/*",
                                                            false, true );
diff --git a/kicker/menuext/konsole/konsole_mnu.h b/kicker/menuext/konsole/konsole_mnu.h
index e64c53212..4272fbaf9 100644
--- a/kicker/menuext/konsole/konsole_mnu.h
+++ b/kicker/menuext/konsole/konsole_mnu.h
@@ -54,8 +54,8 @@ private:
     TQStringList sessionList;
     TQStringList screenList;
     TQValueVector<TQString> m_profiles;
-    KPopupMenu* m_profileMenu;
-    KPopupMenu* m_bookmarksSession;
+    TDEPopupMenu* m_profileMenu;
+    TDEPopupMenu* m_bookmarksSession;
 
     KonsoleBookmarkHandler *m_bookmarkHandlerSession;
 };
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
index 34bfb9649..314ceae10 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
@@ -21,7 +21,7 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool )
       m_konsole( konsole ),
       m_importStream( 0L )
 {
-    m_menu = new KPopupMenu( konsole, "bookmark menu" );
+    m_menu = new TDEPopupMenu( konsole, "bookmark menu" );
 
     TQString file = locate( "data", "konsole/bookmarks.xml" );
     if ( file.isEmpty() )
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.h b/kicker/menuext/konsole/konsolebookmarkhandler.h
index 733e52442..a1d2f54de 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.h
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.h
@@ -8,7 +8,7 @@
 
 
 class TQTextStream;
-class KPopupMenu;
+class TDEPopupMenu;
 class KonsoleBookmarkMenu;
 class KonsoleMenu;
 
@@ -26,7 +26,7 @@ public:
                                 { emit openURL( url, title ); }
     virtual TQString currentURL() const;
 
-    KPopupMenu *menu() const { return m_menu; }
+    TDEPopupMenu *menu() const { return m_menu; }
 
 signals:
     void openURL( const TQString& url, const TQString& title );
@@ -45,7 +45,7 @@ private:
     void importOldBookmarks( const TQString& path, const TQString& destinationPath );
 
     KonsoleMenu *m_konsole;
-    KPopupMenu *m_menu;
+    TDEPopupMenu *m_menu;
     KonsoleBookmarkMenu *m_bookmarkMenu;
     TQTextStream *m_importStream;
 
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
index 1643195e8..3284c7a03 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp
@@ -21,8 +21,8 @@
 
 
 KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr,
-                     KonsoleBookmarkHandler * _owner, KPopupMenu * _parentMenu,
-                     KActionCollection *collec, bool _isRoot, bool _add,
+                     KonsoleBookmarkHandler * _owner, TDEPopupMenu * _parentMenu,
+                     TDEActionCollection *collec, bool _isRoot, bool _add,
                      const TQString & parentAddress )
 : KBookmarkMenu( mgr, _owner, _parentMenu, collec, _isRoot, _add,
                  parentAddress),
@@ -47,7 +47,7 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr,
  *
  * Why did I do this?
  *   - when KBookmarkMenu::fillbBookmarkMenu() creates sub-KBookmarkMenus.
- *   - when ... adds KActions, it uses KBookmarkMenu::slotBookmarkSelected()
+ *   - when ... adds TDEActions, it uses KBookmarkMenu::slotBookmarkSelected()
  *     instead of KonsoleBookmarkMenu::slotBookmarkSelected().
  */
 void KonsoleBookmarkMenu::slotAboutToShow2()
@@ -64,7 +64,7 @@ void KonsoleBookmarkMenu::refill()
 {
   //kdDebug(1203) << "KBookmarkMenu::refill()" << endl;
   m_lstSubMenus.clear();
-  TQPtrListIterator<KAction> it( m_actions );
+  TQPtrListIterator<TDEAction> it( m_actions );
   for (; it.current(); ++it )
     it.current()->unplug( m_parentMenu );
   m_parentMenu->clear();
@@ -90,7 +90,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
     {
       m_parentMenu->insertSeparator();
 
-      KActionMenu * actionMenu = new KActionMenu( i18n("Netscape Bookmarks"),
+      TDEActionMenu * actionMenu = new TDEActionMenu( i18n("Netscape Bookmarks"),
                                                   "netscape",
                                                   m_actionCollection, 0L );
       actionMenu->plug( m_parentMenu );
@@ -127,7 +127,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
       {
         // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl;
         // create a normal URL item, with ID as a name
-        KAction * action = new KAction( text, bm.icon(), 0,
+        TDEAction * action = new TDEAction( text, bm.icon(), 0,
                                         this, TQT_SLOT( slotBookmarkSelected() ),
                                         m_actionCollection, bm.url().url().utf8() );
 
@@ -140,7 +140,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
     else
     {
       // kdDebug(1203) << "Creating bookmark submenu named " << bm.text() << endl;
-      KActionMenu * actionMenu = new KActionMenu( text, bm.icon(),
+      TDEActionMenu * actionMenu = new TDEActionMenu( text, bm.icon(),
                                                   m_actionCollection, 0L );
       actionMenu->plug( m_parentMenu );
       m_actions.append( actionMenu );
@@ -162,26 +162,26 @@ void KonsoleBookmarkMenu::fillBookmarkMenu()
 
 void KonsoleBookmarkMenu::slotBookmarkSelected()
 {
-    KAction * a;
+    TDEAction * a;
     TQString b;
 
     if ( !m_pOwner ) return; // this view doesn't handle bookmarks...
-    a = (KAction*)sender();
+    a = (TDEAction*)sender();
     b = a->text();
     m_kOwner->openBookmarkURL( TQString::fromUtf8(TQT_TQOBJECT_CONST(sender())->name()), /* URL */
-                               ( (KAction *)sender() )->text() /* Title */ );
+                               ( (TDEAction *)sender() )->text() /* Title */ );
 }
 
 void KonsoleBookmarkMenu::slotNSBookmarkSelected()
 {
-    KAction *a;
+    TDEAction *a;
     TQString b;
 
     TQString link(TQT_TQOBJECT_CONST(sender())->name()+8);
-    a = (KAction*)sender();
+    a = (TDEAction*)sender();
     b = a->text();
     m_kOwner->openBookmarkURL( link, /*URL */
-                               ( (KAction *)sender() )->text()  /* Title */ );
+                               ( (TDEAction *)sender() )->text()  /* Title */ );
 }
 
 #include "konsolebookmarkmenu.moc"
diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.h b/kicker/menuext/konsole/konsolebookmarkmenu.h
index a2325e264..103b6bc19 100644
--- a/kicker/menuext/konsole/konsolebookmarkmenu.h
+++ b/kicker/menuext/konsole/konsolebookmarkmenu.h
@@ -13,12 +13,12 @@
 
 class TQString;
 class KBookmark;
-class KAction;
-class KActionMenu;
-class KActionCollection;
+class TDEAction;
+class TDEActionMenu;
+class TDEActionCollection;
 class KBookmarkOwner;
 class KBookmarkMenu;
-class KPopupMenu;
+class TDEPopupMenu;
 class KonsoleBookmarkMenu;
 
 class KonsoleBookmarkMenu : public KBookmarkMenu
@@ -27,8 +27,8 @@ class KonsoleBookmarkMenu : public KBookmarkMenu
 
 public:
     KonsoleBookmarkMenu( KBookmarkManager* mgr,
-                         KonsoleBookmarkHandler * _owner, KPopupMenu * _parentMenu,
-                         KActionCollection *collec, bool _isRoot,
+                         KonsoleBookmarkHandler * _owner, TDEPopupMenu * _parentMenu,
+                         TDEActionCollection *collec, bool _isRoot,
                          bool _add = true, const TQString & parentAddress = "");
 
     void fillBookmarkMenu();
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp
index 3fb0b76d9..95f46dadc 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.cpp
+++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp
@@ -41,7 +41,7 @@ K_EXPORT_KICKER_MENUEXT(recentdocs, RecentDocsMenu)
 
 RecentDocsMenu::RecentDocsMenu(TQWidget *parent, const char *name,
                                const TQStringList &/*args*/)
-    : KPanelMenu(KRecentDocument::recentDocumentDirectory(), parent, name)
+    : KPanelMenu(TDERecentDocument::recentDocumentDirectory(), parent, name)
 {
 }
 
@@ -55,7 +55,7 @@ void RecentDocsMenu::initialize() {
 	insertItem(SmallIconSet("history_clear"), i18n("Clear History"), this, TQT_SLOT(slotClearHistory()));
 	insertSeparator();
 
-	_fileList = KRecentDocument::recentDocuments();
+	_fileList = TDERecentDocument::recentDocuments();
 
 	if (_fileList.isEmpty()) {
 		insertItem(i18n("No Entries"), 0);
@@ -90,7 +90,7 @@ void RecentDocsMenu::initialize() {
 }
 
 void RecentDocsMenu::slotClearHistory() {
-    KRecentDocument::clear();
+    TDERecentDocument::clear();
     reinitialize();
 }
 
diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc
index 100045339..a02d88a6a 100644
--- a/kicker/menuext/tom/tom.cc
+++ b/kicker/menuext/tom/tom.cc
@@ -87,7 +87,7 @@ TQObject* TOMFactory::createObject(TQObject *parent, const char *name, const cha
 class runMenuWidget : public TQWidget, public QMenuItem
 {
     public:
-        runMenuWidget(KPopupMenu* parent, int index)
+        runMenuWidget(TDEPopupMenu* parent, int index)
             : TQWidget (parent),
               m_menu(parent),
               m_index(index)
@@ -164,7 +164,7 @@ class runMenuWidget : public TQWidget, public QMenuItem
         }
 
     private:
-        KPopupMenu* m_menu;
+        TDEPopupMenu* m_menu;
         KHistoryCombo* m_runEdit;
         TQPixmap icon;
         TQRect textRect;
@@ -220,7 +220,7 @@ void TOM::initializeRecentDocs()
                                  this, TQT_SLOT(clearRecentDocHistory()));
     m_recentDocsMenu->insertSeparator();
 
-    m_recentDocURLs = KRecentDocument::recentDocuments();
+    m_recentDocURLs = TDERecentDocument::recentDocuments();
 
     if (m_recentDocURLs.isEmpty())
     {
@@ -267,10 +267,10 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu)
         return 0;
     }
 
-    KPopupMenu* taskGroup;
+    TDEPopupMenu* taskGroup;
     if( inSubMenu )
     {
-        taskGroup = new KPopupMenu(this);
+        taskGroup = new TDEPopupMenu(this);
 
         if (icon != TQString::null)
         {
@@ -370,8 +370,8 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu)
 
     if (inSubMenu)
     {
-        TQObject::connect(taskGroup, TQT_SIGNAL(aboutToShowContextMenu(KPopupMenu*, int, TQPopupMenu*)),
-                         this, TQT_SLOT(contextualizeRMBmenu(KPopupMenu*, int, TQPopupMenu*)));
+        TQObject::connect(taskGroup, TQT_SIGNAL(aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*)),
+                         this, TQT_SLOT(contextualizeRMBmenu(TDEPopupMenu*, int, TQPopupMenu*)));
 
         m_submenus.append(taskGroup);
 
@@ -384,7 +384,7 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu)
             taskGroup->insertItem("Modify These Tasks", configureMenuID);
             TQPopupMenu* rmbMenu = taskGroup->contextMenu();
             rmbMenu->setFont(m_largerFont);
-            KPopupTitle* title = new KPopupTitle();
+            TDEPopupTitle* title = new TDEPopupTitle();
             title->setText(i18n("%1 Menu Editor").arg(name));
             rmbMenu->insertItem(title, contextMenuTitleID);
             rmbMenu->insertItem(i18n("Add This Task to Panel"));
@@ -492,14 +492,14 @@ void TOM::initialize()
     // RECENTLY USED ITEMS
     insertTitle(i18n("Recently Used Items"), contextMenuTitleID);
 
-    m_recentDocsMenu = new KPopupMenu(this, "recentDocs");
+    m_recentDocsMenu = new TDEPopupMenu(this, "recentDocs");
     m_recentDocsMenu->setFont(m_largerFont);
     connect(m_recentDocsMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(initializeRecentDocs()));
     connect(m_recentDocsMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(openRecentDocument(int)));
     insertItem(DesktopIcon("document", KIcon::SizeMedium), i18n("Recent Documents"), m_recentDocsMenu);
     m_submenus.append(m_recentDocsMenu);
 
-    KPopupMenu* recentApps = new KPopupMenu(this, "recentApps");
+    TDEPopupMenu* recentApps = new TDEPopupMenu(this, "recentApps");
     recentApps->setFont(m_largerFont);
     recentApps->setKeyboardShortcutsEnabled(true);
     initializeRecentApps(recentApps);
@@ -573,7 +573,7 @@ void TOM::reload()
     initialize();
 }
 
-void TOM::contextualizeRMBmenu(KPopupMenu* menu, int menuItem, TQPopupMenu* ctxMenu)
+void TOM::contextualizeRMBmenu(TDEPopupMenu* menu, int menuItem, TQPopupMenu* ctxMenu)
 {
     if (menuItem == configureMenuID)
     {
@@ -588,7 +588,7 @@ void TOM::contextualizeRMBmenu(KPopupMenu* menu, int menuItem, TQPopupMenu* ctxM
     {
         text = text.left(parens);
     }
-    KPopupTitle* title = new KPopupTitle();
+    TDEPopupTitle* title = new TDEPopupTitle();
     title->setText(i18n("The \"%2\" Task").arg(text));
     ctxMenu->insertItem(title, contextMenuTitleID, 0);
 }
@@ -608,14 +608,14 @@ void TOM::slotExec(int /* id */)
 void TOM::removeTask()
 {
     // TODO: write this change out to the appropriate config file
-    TQString task = KPopupMenu::contextMenuFocus()->text(KPopupMenu::contextMenuFocusItem());
+    TQString task = TDEPopupMenu::contextMenuFocus()->text(TDEPopupMenu::contextMenuFocusItem());
     if (KMessageBox::warningContinueCancel(this,
                                   i18n("<qt>Are you sure you want to remove the <strong>%1</strong> task?<p>"
                                         "<em>Tip: You can restore the task after it has been removed by selecting the &quot;Modify These Tasks&quot; entry</em></qt>").arg(task),
                                   i18n("Remove Task?"),KStdGuiItem::del()) == KMessageBox::Continue)
     {
-        m_tasks.remove(KPopupMenu::contextMenuFocusItem());
-        KPopupMenu::contextMenuFocus()->removeItem(KPopupMenu::contextMenuFocusItem());
+        m_tasks.remove(TDEPopupMenu::contextMenuFocusItem());
+        TDEPopupMenu::contextMenuFocus()->removeItem(TDEPopupMenu::contextMenuFocusItem());
     }
 }
 
@@ -833,7 +833,7 @@ void TOM::runTask(int id)
 
 void TOM::clearRecentDocHistory()
 {
-    KRecentDocument::clear();
+    TDERecentDocument::clear();
 }
 
 void TOM::openRecentDocument(int id)
diff --git a/kicker/menuext/tom/tom.h b/kicker/menuext/tom/tom.h
index e4b8cc884..b67f2bd6c 100644
--- a/kicker/menuext/tom/tom.h
+++ b/kicker/menuext/tom/tom.h
@@ -24,7 +24,7 @@
 #include <kpanelmenu.h>
 #include <klibloader.h>
 
-class KPopupMenu;
+class TDEPopupMenu;
 class TQPopupMenu;
 
 typedef TQPtrList<TQPopupMenu> PopupMenuList;
@@ -49,7 +49,7 @@ class TOM : public KPanelMenu
         void slotExec(int);
         //void configChanged();
         void initialize();
-        void contextualizeRMBmenu(KPopupMenu* menu, int menuItem, TQPopupMenu* ctxMenu);
+        void contextualizeRMBmenu(TDEPopupMenu* menu, int menuItem, TQPopupMenu* ctxMenu);
         //void paletteChanged();
         void clearRecentDocHistory();
         void runCommand();
@@ -91,7 +91,7 @@ class TOM : public KPanelMenu
         bool m_detailedTaskEntries;
         bool m_detailedNamesFirst;
         TaskMap m_tasks;
-        KPopupMenu* m_recentDocsMenu;
+        TDEPopupMenu* m_recentDocsMenu;
         TQStringList m_recentDocURLs;
 };