From: David Faure <faure@kde.org>
Date: Mon, 26 Mar 2007 08:24:06 +0000 (+0000)
Subject: KDEDesktopMimeType -> KDesktopFileActions
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/2d9dfdf3b3d8585d5aeb93c115967450c863405b

KDEDesktopMimeType -> KDesktopFileActions

svn path=/trunk/KDE/kdebase/libkonq/; revision=646598
---

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index e78f3ec1c..fff3b5ac3 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -170,7 +170,7 @@ void DolphinContextMenu::openItemContextMenu()
     const QList<QAction*> openWithActions = insertOpenWithItems(popup, openWithVector);
 
     // Insert 'Actions' sub menu
-    QVector<KDEDesktopMimeType::Service> actionsVector;
+    QVector<KDesktopFileActions::Service> actionsVector;
     const QList<QAction*> serviceActions = insertActionItems(popup, actionsVector);
     popup->addSeparator();
 
@@ -196,7 +196,7 @@ void DolphinContextMenu::openItemContextMenu()
     else if (serviceActions.contains(activatedAction)) {
         // one of the 'Actions' items has been selected
         int id = serviceActions.indexOf(activatedAction);
-        KDEDesktopMimeType::executeService(m_selectedUrls, actionsVector[id]);
+        KDesktopFileActions::executeService(m_selectedUrls, actionsVector[id]);
     }
     else if (openWithActions.contains(activatedAction)) {
         // one of the 'Open With' items has been selected
@@ -380,7 +380,7 @@ QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
 }
 
 QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
-                                                      QVector<KDEDesktopMimeType::Service>& actionsVector)
+                                                      QVector<KDesktopFileActions::Service>& actionsVector)
 {
     // Parts of the following code have been taken
     // from the class KonqOperations located in
@@ -449,12 +449,12 @@ QList<QAction*> DolphinContextMenu::insertActionItems(KMenu* popup,
                             actionsMenu->addMenu(menu);
                         }
 
-                        Q3ValueList<KDEDesktopMimeType::Service> userServices =
-                            KDEDesktopMimeType::userDefinedServices(*dirIt + *entryIt, true);
+                        Q3ValueList<KDesktopFileActions::Service> userServices =
+                            KDesktopFileActions::userDefinedServices(*dirIt + *entryIt, true);
 
-                        Q3ValueList<KDEDesktopMimeType::Service>::Iterator serviceIt;
+                        Q3ValueList<KDesktopFileActions::Service>::Iterator serviceIt;
                         for (serviceIt = userServices.begin(); serviceIt != userServices.end(); ++serviceIt) {
-                            KDEDesktopMimeType::Service service = (*serviceIt);
+                            KDesktopFileActions::Service service = (*serviceIt);
                             if (!service.m_strIcon.isEmpty()) {
                                 QAction* action = menu->addAction(SmallIcon(service.m_strIcon),
                                                                   service.m_strName);
diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index f3f075717..5674c96c3 100644
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -20,7 +20,7 @@
 #ifndef DOLPHINCONTEXTMENU_H
 #define DOLPHINCONTEXTMENU_H
 
-#include <kdedesktopmimetype.h>
+#include <kdesktopfileactions.h>
 #include <kfileitem.h>
 #include <kservice.h>
 #include <kurl.h>
@@ -99,7 +99,7 @@ private:
      *                       services.
      */
     QList<QAction*> insertActionItems(KMenu* popup,
-                                      QVector<KDEDesktopMimeType::Service>& actionsVector);
+                                      QVector<KDesktopFileActions::Service>& actionsVector);
 
     /**
      * Returns true, if 'menu' contains already
diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index 50f9eb0f8..889fd21f1 100644
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -233,11 +233,11 @@ void InfoSidebarPage::startService(int index)
 {
     if (m_currentSelection.count() > 0) {
         // TODO: Use "at()" as soon as executeService is fixed to take a const param (BIC)
-        KDEDesktopMimeType::executeService(m_currentSelection.urlList(), m_actionsVector[index]);
+        KDesktopFileActions::executeService(m_currentSelection.urlList(), m_actionsVector[index]);
     }
     else {
         // TODO: likewise
-        KDEDesktopMimeType::executeService(m_shownUrl, m_actionsVector[index]);
+        KDesktopFileActions::executeService(m_shownUrl, m_actionsVector[index]);
     }
 }
 
@@ -456,13 +456,13 @@ void InfoSidebarPage::insertActions()
                             button->show();
                         }
 
-                        QList<KDEDesktopMimeType::Service> userServices =
-                            KDEDesktopMimeType::userDefinedServices(*dirIt + *entryIt, true);
+                        QList<KDesktopFileActions::Service> userServices =
+                            KDesktopFileActions::userDefinedServices(*dirIt + *entryIt, true);
 
                         // iterate through all actions and add them to a widget
-                        QList<KDEDesktopMimeType::Service>::Iterator serviceIt;
+                        QList<KDesktopFileActions::Service>::Iterator serviceIt;
                         for (serviceIt = userServices.begin(); serviceIt != userServices.end(); ++serviceIt) {
-                            KDEDesktopMimeType::Service service = (*serviceIt);
+                            KDesktopFileActions::Service service = (*serviceIt);
                             if (popup == 0) {
                                 ServiceButton* button = new ServiceButton(KIcon(service.m_strIcon),
                                                                           service.m_strName,
diff --git a/src/infosidebarpage.h b/src/infosidebarpage.h
index 938b86959..cd233b6ef 100644
--- a/src/infosidebarpage.h
+++ b/src/infosidebarpage.h
@@ -30,7 +30,7 @@
 
 #include <kurl.h>
 #include <kmimetype.h>
-#include <kdedesktopmimetype.h>
+#include <kdesktopfileactions.h>
 #include <kvbox.h>
 
 namespace KIO {
@@ -148,7 +148,7 @@ private:
     QLabel* m_infos;
 
     KVBox* m_actionBox;
-    QVector<KDEDesktopMimeType::Service> m_actionsVector;
+    QVector<KDesktopFileActions::Service> m_actionsVector;
 
     MetaDataWidget* m_metadataWidget;
 };