Rename a number of classes to enhance compatibility with KDE4

1 files changed, 4 insertions, 4 deletions

diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
index af04017..bbffb01 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
@@ -145,7 +145,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
           const TQString priority = cfg.readEntry("X-TDE-Priority");
           const TQString submenuName = cfg.readEntry( "X-TDE-Submenu" );
           bool usePopup = false;
-          KPopupMenu *popup;
+          TDEPopupMenu *popup;
           
           if(!submenuName.isEmpty()){
             usePopup = true;
@@ -156,7 +156,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
             else{              
               MetabarWidget::addEntry(html, submenuName, "servicepopup://" + idString, "1rightarrow", "popup" + idString, count < maxActions ? TQString() : TQString("hiddenaction"), count >= maxActions);
               
-              popup = new KPopupMenu();
+              popup = new TDEPopupMenu();
               popups.insert(idString, popup);
               
               count++;
@@ -168,7 +168,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
           for (TQValueList<KDEDesktopMimeType::Service>::iterator it = list.begin(); it != list.end(); ++it){
           
             if(usePopup){
-              KAction *action = new KAction((*it).m_strName, (*it).m_strIcon, KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(runAction()), TQT_TQOBJECT(popup), idString.utf8());
+              TDEAction *action = new TDEAction((*it).m_strName, (*it).m_strIcon, TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(runAction()), TQT_TQOBJECT(popup), idString.utf8());
               action->plug(popup);
             }
             else{
@@ -204,7 +204,7 @@ void ServiceLoader::runAction(const TQString& name)
 
 void ServiceLoader::showPopup(const TQString &popup, const TQPoint &point)
 {
-  KPopupMenu *p = popups[popup];
+  TDEPopupMenu *p = popups[popup];
   if(p){
     p->exec(point);
   }