[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeutils/ark
From:       Raphael Kubo da Costa <kubito () gmail ! com>
Date:       2009-07-19 2:58:22
Message-ID: 1247972302.466007.24621.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 999051 by rkcosta:

Remove supported{Write}MimeTypes from Interface, it's implemented in kerfuffle/archive.cpp.


 M  +3 -2      app/mainwindow.cpp  
 M  +0 -3      part/interface.h  
 M  +3 -12     part/part.cpp  
 M  +0 -3      part/part.h  


--- trunk/KDE/kdeutils/ark/app/mainwindow.cpp #999050:999051
@@ -22,6 +22,7 @@
  *
  */
 #include "mainwindow.h"
+#include "kerfuffle/archive.h"
 #include "part/interface.h"
 
 #include <KPluginLoader>
@@ -192,7 +193,7 @@
     Interface *iface = qobject_cast<Interface*>(m_part);
     Q_ASSERT(iface);
     KUrl url = KFileDialog::getOpenUrl(KUrl("kfiledialog:///ArkOpenDir"),
-                                       iface->supportedMimeTypes().join(" "),
+                                       Kerfuffle::supportedMimeTypes().join(" "),
                                        this);
     openUrl(url);
 }
@@ -228,7 +229,7 @@
 {
     Interface *iface = qobject_cast<Interface*>(m_part);
     Q_ASSERT(iface);
-    QStringList mimeTypes = iface->supportedWriteMimeTypes();
+    QStringList mimeTypes = Kerfuffle::supportedWriteMimeTypes();
 
     kDebug() << "Supported mimetypes are" << mimeTypes.join(" ");
 
--- trunk/KDE/kdeutils/ark/part/interface.h #999050:999051
@@ -29,9 +29,6 @@
 public:
     virtual ~Interface() {}
 
-    virtual QStringList supportedMimeTypes() const = 0;
-    virtual QStringList supportedWriteMimeTypes() const = 0;
-
     virtual bool isBusy() const = 0;
 };
 
--- trunk/KDE/kdeutils/ark/part/part.cpp #999050:999051
@@ -24,6 +24,7 @@
 #include "archiveview.h"
 #include "infopanel.h"
 #include "arkviewer.h"
+#include "kerfuffle/archive.h"
 #include "kerfuffle/extractiondialog.h"
 #include "kerfuffle/jobs.h"
 #include "settings.h"
@@ -335,9 +336,9 @@
         QHash<QString, QString> mimeTypes;
 
         if (arguments().metaData()["createNewArchive"] == "true")
-            mimeTypeList = supportedWriteMimeTypes();
+            mimeTypeList = Kerfuffle::supportedWriteMimeTypes();
         else
-            mimeTypeList = supportedMimeTypes();
+            mimeTypeList = Kerfuffle::supportedMimeTypes();
 
         foreach(const QString& mime, mimeTypeList) {
             KMimeType::Ptr mimePtr(KMimeType::mimeType(mime));
@@ -386,16 +387,6 @@
     return true;
 }
 
-QStringList Part::supportedMimeTypes() const
-{
-    return Kerfuffle::supportedMimeTypes();
-}
-
-QStringList Part::supportedWriteMimeTypes() const
-{
-    return Kerfuffle::supportedWriteMimeTypes();
-}
-
 void Part::slotLoadingStarted()
 {
 }
--- trunk/KDE/kdeutils/ark/part/part.h #999050:999051
@@ -51,9 +51,6 @@
     virtual bool openFile();
     virtual bool saveFile();
 
-    QStringList supportedMimeTypes() const;
-    QStringList supportedWriteMimeTypes() const;
-
     bool isBusy() const {
         return m_busy;
     }
[prev in list] [next in list] [prev in thread] [next in thread]