Rename a number of classes to enhance compatibility with KDE4

9 files changed, 40 insertions, 40 deletions

diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp
index 1ef72d2c7..86c5e386e 100644
--- a/kicker/kicker/ui/appletop_mnu.cpp
+++ b/kicker/kicker/ui/appletop_mnu.cpp
@@ -175,7 +175,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
           insertItem(SmallIcon("about_kde"), i18n("Switch to Trinity Classic Menu Style"), this, TQT_SLOT(toggleLegacy()));
     }
 
-    if ((actions & PanelAppletOpMenu::KMenuEditor) && kapp->authorizeKAction("menuedit"))
+    if ((actions & PanelAppletOpMenu::KMenuEditor) && kapp->authorizeTDEAction("menuedit"))
     {
         if (needSeparator)
         {
@@ -187,7 +187,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
     }
 
     if ((actions & PanelAppletOpMenu::BookmarkEditor) &&
-        kapp->authorizeKAction("edit_bookmarks"))
+        kapp->authorizeTDEAction("edit_bookmarks"))
     {
         if (needSeparator)
         {
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index ee82bc91f..6d0f2b542 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -618,7 +618,7 @@ void ItemViewTip::maybeTip( const TQPoint &pos )
 // --------------------------------------------------------------------------
 
 ItemView::ItemView(TQWidget* parent, const char* name)
-    : KListView(parent, name), m_spacer( 0 ),
+    : TDEListView(parent, name), m_spacer( 0 ),
       m_mouseMoveSelects(true), m_iconSize(32)
 {
     setHScrollBarMode( TQScrollView::AlwaysOff );
@@ -746,7 +746,7 @@ void ItemView::moveItemToIndex(KMenuItem* item, int nIndex)
 
     if (nIndex <= 0) {
           takeItem(item);
-          KListView::insertItem(item);
+          TDEListView::insertItem(item);
     }
     else {
         item->moveItem(itemAtIndex(nIndex));
@@ -909,7 +909,7 @@ void ItemView::slotItemClicked(TQListViewItem* item)
 
 void ItemView::contentsMousePressEvent ( TQMouseEvent * e )
 {
-    KListView::contentsMousePressEvent( e );
+    TDEListView::contentsMousePressEvent( e );
 
     TQPoint vp = contentsToViewport(e->pos());
     KMenuItemSeparator *si = dynamic_cast<KMenuItemSeparator*>( itemAt( vp ) );
@@ -936,15 +936,15 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e)
       return;
     }
 
-    KListView::contentsMouseMoveEvent(e);
+    TDEListView::contentsMouseMoveEvent(e);
 
     if (m_mouseMoveSelects) {
       if(i && i->isEnabled() && !i->isSelected() &&
          // FIXME: This is wrong if you drag over the items.
          (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0)
-          KListView::setSelected(i, true);
+          TDEListView::setSelected(i, true);
       else if (!i && selectedItem())
-          KListView::setSelected(selectedItem(), false);
+          TDEListView::setSelected(selectedItem(), false);
     }
 
     if ( link_cursor )
@@ -956,14 +956,14 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e)
 
 void ItemView::leaveEvent(TQEvent* e)
 {
-    KListView::leaveEvent(e);
+    TDEListView::leaveEvent(e);
 
     clearSelection();
 }
 
 void ItemView::resizeEvent ( TQResizeEvent * e )
 {
-    KListView::resizeEvent( e );
+    TDEListView::resizeEvent( e );
 //    if ( m_lastOne )
 //        int diff = itemRect( m_lastOne ).bottom() - viewport()->height();
 }
@@ -971,7 +971,7 @@ void ItemView::resizeEvent ( TQResizeEvent * e )
 void ItemView::viewportPaintEvent ( TQPaintEvent * pe )
 {
     //kdDebug() << "viewportPaintEvent " << pe->rect() << " " << contentsY () << " " << m_old_contentY << endl;
-    KListView::viewportPaintEvent( pe );
+    TDEListView::viewportPaintEvent( pe );
 
     if ( m_lastOne && m_old_contentY != contentsY() ) {
         m_old_contentY = contentsY();
@@ -981,7 +981,7 @@ void ItemView::viewportPaintEvent ( TQPaintEvent * pe )
 
 void ItemView::clear()
 {
-    KListView::clear();
+    TDEListView::clear();
     m_lastOne = 0;
     m_old_contentY = -1;
     m_back_url = TQString();
@@ -989,7 +989,7 @@ void ItemView::clear()
 
 void ItemView::contentsWheelEvent(TQWheelEvent *e)
 {
-    KListView::contentsWheelEvent(e);
+    TDEListView::contentsWheelEvent(e);
 
     TQPoint vp = contentsToViewport(e->pos());
     TQListViewItem * i = itemAt( vp );
@@ -997,9 +997,9 @@ void ItemView::contentsWheelEvent(TQWheelEvent *e)
     if(i && i->isEnabled() && !i->isSelected() &&
        // FIXME: This is wrong if you drag over the items.
        (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0)
-        KListView::setSelected(i, true);
+        TDEListView::setSelected(i, true);
     else if (!i && selectedItem())
-        KListView::setSelected(selectedItem(), false);
+        TDEListView::setSelected(selectedItem(), false);
 }
 
 TQDragObject * ItemView::dragObject()
diff --git a/kicker/kicker/ui/itemview.h b/kicker/kicker/ui/itemview.h
index c8b95ee42..995cc57b4 100644
--- a/kicker/kicker/ui/itemview.h
+++ b/kicker/kicker/ui/itemview.h
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class KickerClientMenu;
 class KBookmarkMenu;
-class KActionCollection;
+class TDEActionCollection;
 class KBookmarkOwner;
 class Panel;
 class TQWidgetStack;
@@ -152,7 +152,7 @@ public:
     void setHeight(int);
 };
 
-class ItemView : public KListView
+class ItemView : public TDEListView
 {
     friend class KMenuItem;
 
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index eb87f02d0..f19d59d8b 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -83,7 +83,7 @@ PanelKMenu::PanelKMenu()
     client_id = 10000;
     // Don't automatically clear the main menu.
     disableAutoClear();
-    actionCollection = new KActionCollection(this);
+    actionCollection = new TDEActionCollection(this);
     setCaption(i18n("TDE Menu"));
     connect(Kicker::the(), TQT_SIGNAL(configurationChanged()),
             this, TQT_SLOT(configChanged()));
@@ -263,7 +263,7 @@ void PanelKMenu::initialize()
     // Insert search field
     if (KickerSettings::useSearchBar()) {
         TQHBox* hbox = new TQHBox( this );
-        KToolBarButton *clearButton = new KToolBarButton( "locationbar_erase", 0, hbox );
+        TDEToolBarButton *clearButton = new TDEToolBarButton( "locationbar_erase", 0, hbox );
         searchEdit = new KPIM::ClickLineEdit(hbox, " "+i18n("Press '/' to search..."));
         hbox->setFocusPolicy(TQ_StrongFocus);
         hbox->setFocusProxy(searchEdit);
@@ -295,10 +295,10 @@ void PanelKMenu::initialize()
     bool need_separator = false;
 
     // insert bookmarks
-    if (KickerSettings::useBookmarks() && kapp->authorizeKAction("bookmarks"))
+    if (KickerSettings::useBookmarks() && kapp->authorizeTDEAction("bookmarks"))
     {
         // Need to create a new popup each time, it's deleted by subMenus.clear()
-        KPopupMenu * bookmarkParent = new KPopupMenu( this, "bookmarks" );
+        TDEPopupMenu * bookmarkParent = new TDEPopupMenu( this, "bookmarks" );
         if(!bookmarkOwner)
             bookmarkOwner = new KBookmarkOwner;
         delete bookmarkMenu; // can't reuse old one, the popup has been deleted
diff --git a/kicker/kicker/ui/k_mnu.h b/kicker/kicker/ui/k_mnu.h
index 53a29d809..7c76f55ed 100644
--- a/kicker/kicker/ui/k_mnu.h
+++ b/kicker/kicker/ui/k_mnu.h
@@ -39,7 +39,7 @@ namespace KPIM {
 
 class KickerClientMenu;
 class KBookmarkMenu;
-class KActionCollection;
+class TDEActionCollection;
 class KBookmarkOwner;
 class Panel;
 
@@ -112,7 +112,7 @@ private:
     bool                        delay_init;
     TQIntDict<KickerClientMenu>  clients;
     KBookmarkMenu              *bookmarkMenu;
-    KActionCollection          *actionCollection;
+    TDEActionCollection          *actionCollection;
     KBookmarkOwner             *bookmarkOwner;
     PopupMenuList               dynamicSubMenus;
     KPIM::ClickLineEdit        *searchEdit;
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 464dd87de..a8d69c220 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -176,7 +176,7 @@ KMenu::KMenu()
     // set the first client id to some arbitrarily large value.
     client_id = 10000;
     // Don't automatically clear the main menu.
-    actionCollection = new KActionCollection(this);
+    actionCollection = new TDEActionCollection(this);
 
     connect(Kicker::the(), TQT_SIGNAL(configurationChanged()),
             this, TQT_SLOT(configChanged()));
@@ -1825,7 +1825,7 @@ void KMenu::createRecentMenuItems()
 
     m_recentlyView->insertSeparator( nId++, i18n( "Documents" ), -1 );
 
-    TQStringList fileList = KRecentDocument::recentDocuments();
+    TQStringList fileList = TDERecentDocument::recentDocuments();
     kdDebug() << "createRecentMenuItems=" << fileList << endl;
     for (TQStringList::ConstIterator it = fileList.begin();
          it != fileList.end();
@@ -1876,7 +1876,7 @@ void KMenu::clearRecentAppsItems()
 
 void KMenu::clearRecentDocsItems()
 {
-    KRecentDocument::clear();
+    TDERecentDocument::clear();
     updateRecent();
 }
 
@@ -2748,7 +2748,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
         }
     }
 
-    m_popupMenu = new KPopupMenu(this);
+    m_popupMenu = new TDEPopupMenu(this);
     connect(m_popupMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int)));
     bool hasEntries = false;
 
@@ -2801,7 +2801,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
                   m_popupMenu->insertItem(SmallIconSet("desktop"),
                       i18n("Add Item to Desktop"), AddItemToDesktop);
             }
-            if (kapp->authorizeKAction("kicker_rmb") && !Kicker::the()->isImmutable())
+            if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
             {
                 hasEntries = true;
                 if (m_popupPath.menuPath.endsWith("/"))
@@ -2811,7 +2811,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
                    m_popupMenu->insertItem(SmallIconSet("kicker"),
                       i18n("Add Item to Main Panel"), AddItemToPanel);
             }
-            if (kapp->authorizeKAction("menuedit") && !kitem->menuPath().isEmpty())
+            if (kapp->authorizeTDEAction("menuedit") && !kitem->menuPath().isEmpty())
             {
                 hasEntries = true;
                 if (kitem->menuPath().endsWith("/"))
@@ -2841,7 +2841,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
             _items.append( item );
 
             const KURL kurl(uri);
-            KActionCollection act(this);
+            TDEActionCollection act(this);
 
             KonqPopupMenu * konqPopupMenu = new KonqPopupMenu( KonqBookmarkManager::self(), _items,
                                                    kurl, act, (KNewMenu*)NULL, this,
@@ -2855,7 +2855,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
                 }
                 else {
                     delete m_popupMenu;
-                    m_popupMenu = (KPopupMenu*)konqPopupMenu;
+                    m_popupMenu = (TDEPopupMenu*)konqPopupMenu;
                     m_popupMenu->insertTitle(SmallIcon(kitem->icon()),kitem->title(),-1,0);
                 }
                 hasEntries = true;
diff --git a/kicker/kicker/ui/k_new_mnu.h b/kicker/kicker/ui/k_new_mnu.h
index 8a9970789..344be9b89 100644
--- a/kicker/kicker/ui/k_new_mnu.h
+++ b/kicker/kicker/ui/k_new_mnu.h
@@ -46,7 +46,7 @@
 class KickerClientMenu;
 class KickoffTabBar;
 class KBookmarkMenu;
-class KActionCollection;
+class TDEActionCollection;
 class KBookmarkOwner;
 class Panel;
 class TQWidgetStack;
@@ -210,7 +210,7 @@ private:
     int                         client_id;
     bool                        delay_init;
     TQIntDict<KickerClientMenu>  clients;
-    KActionCollection          *actionCollection;
+    TDEActionCollection          *actionCollection;
     PopupMenuList               dynamicSubMenus;
 
     TQTimer                       m_sloppyTimer;
@@ -290,7 +290,7 @@ private:
     enum KickoffTabEntry { FavoriteTab, ApplicationsTab, ComputerTab,
         HistoryTab, LeaveTab, SearchTab, NumTabs };
 
-    KPopupMenu* m_popupMenu;
+    TDEPopupMenu* m_popupMenu;
     KService* m_popupService;
     PopupPath m_popupPath;
 
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 62cc7ec75..baea6a54b 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -587,7 +587,7 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
         contextKSycocaEntry_ = entryMap_[id];
 
         delete popupMenu_;
-        popupMenu_ = new KPopupMenu(this);
+        popupMenu_ = new TDEPopupMenu(this);
         connect(popupMenu_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int)));
         bool hasEntries = false;
 
@@ -600,13 +600,13 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
                 popupMenu_->insertItem(SmallIconSet("desktop"),
                     i18n("Add Item to Desktop"), AddItemToDesktop);
             }
-            if (kapp->authorizeKAction("kicker_rmb") && !Kicker::the()->isImmutable())
+            if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("kicker"),
                     i18n("Add Item to Main Panel"), AddItemToPanel);
             }
-            if (kapp->authorizeKAction("menuedit"))
+            if (kapp->authorizeTDEAction("menuedit"))
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("kmenuedit"),
@@ -627,13 +627,13 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
                 popupMenu_->insertItem(SmallIconSet("desktop"),
                     i18n("Add Menu to Desktop"), AddMenuToDesktop);
             }
-            if (kapp->authorizeKAction("kicker_rmb") && !Kicker::the()->isImmutable())
+            if (kapp->authorizeTDEAction("kicker_rmb") && !Kicker::the()->isImmutable())
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("kicker"),
                     i18n("Add Menu to Main Panel"), AddMenuToPanel);
             }
-            if (kapp->authorizeKAction("menuedit"))
+            if (kapp->authorizeTDEAction("menuedit"))
             {
                 hasEntries = true;
                 popupMenu_->insertItem(SmallIconSet("kmenuedit"),
diff --git a/kicker/kicker/ui/service_mnu.h b/kicker/kicker/ui/service_mnu.h
index dbc8f496c..89e66937d 100644
--- a/kicker/kicker/ui/service_mnu.h
+++ b/kicker/kicker/ui/service_mnu.h
@@ -131,7 +131,7 @@ private slots:
 private:
     enum ContextMenuEntry { AddItemToPanel, EditItem, AddMenuToPanel, EditMenu,
                             AddItemToDesktop, AddMenuToDesktop, PutIntoRunDialog };
-    KPopupMenu* popupMenu_;
+    TDEPopupMenu* popupMenu_;
     KSycocaEntry* contextKSycocaEntry_;
     void readConfig();
  };