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

List:       kde-commits
Subject:    [kdesvn/frameworks] src: KMimeType -> QMimeType
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2016-03-31 19:21:07
Message-ID: E1ali9T-0005rB-CU () scm ! kde ! org
[Download RAW message or body]

Git commit ac2d6b3de47f143f72de49e08c8777e20cc8bfba by Christian Ehrlicher.
Committed on 28/03/2016 at 18:20.
Pushed by chehrlic into branch 'frameworks'.

KMimeType -> QMimeType

M  +0    -1    src/kiosvn/kiosvn.cpp
M  +2    -2    src/svnfrontend/maintreewidget.cpp
M  +5    -3    src/svnfrontend/svnactions.cpp
M  +15   -11   src/svnfrontend/svnitem.cpp
M  +2    -2    src/svnfrontend/svnitem.h

http://commits.kde.org/kdesvn/ac2d6b3de47f143f72de49e08c8777e20cc8bfba

diff --git a/src/kiosvn/kiosvn.cpp b/src/kiosvn/kiosvn.cpp
index 9522b08..b2aa412 100644
--- a/src/kiosvn/kiosvn.cpp
+++ b/src/kiosvn/kiosvn.cpp
@@ -50,7 +50,6 @@
 #include <netdb.h>
 
 #include <kglobal.h>
-#include <kmimetype.h>
 
 namespace KIO
 {
diff --git a/src/svnfrontend/maintreewidget.cpp b/src/svnfrontend/maintreewidget.cpp
index d0f696a..2ae6803 100644
--- a/src/svnfrontend/maintreewidget.cpp
+++ b/src/svnfrontend/maintreewidget.cpp
@@ -882,14 +882,14 @@ KService::List MainTreeWidget::offersList(SvnItem *item, bool \
execOnly) const  if (!item) {
         return offers;
     }
-    if (!item->mimeType()) {
+    if (!item->mimeType().isValid()) {
         return offers;
     }
     QString constraint(QLatin1String("(DesktopEntryName != 'kdesvn') and (Type == \
'Application')"));  if (execOnly) {
         constraint += QLatin1String(" and (exist Exec)");
     }
-    offers = KMimeTypeTrader::self()->query(item->mimeType()->name(), \
QString::fromLatin1("Application"), constraint); +    offers = \
KMimeTypeTrader::self()->query(item->mimeType().name(), \
QString::fromLatin1("Application"), constraint);  return offers;
 }
 
diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index 0f07e6f..f26a194 100644
--- a/src/svnfrontend/svnactions.cpp
+++ b/src/svnfrontend/svnactions.cpp
@@ -75,6 +75,7 @@
 #include <QFontDatabase>
 #include <QInputDialog>
 #include <QMap>
+#include <QMimeDatabase>
 #include <QReadWriteLock>
 #include <QString>
 #include <QTimer>
@@ -593,12 +594,13 @@ void SvnActions::slotMakeCat(const svn::Revision &start, const \
QString &what, co  return;
     }
     EMIT_FINISHED;
-    KMimeType::Ptr mptr(KMimeType::findByFileContent(tname));
-    KService::List offers = KMimeTypeTrader::self()->query(mptr->name(),
+    QMimeDatabase db;
+    const QMimeType mimeType(db.mimeTypeForFile(tname));
+    KService::List offers = KMimeTypeTrader::self()->query(mimeType.name(),
                                                            \
                QLatin1String("Application"),
                                                            QLatin1String("Type == \
'Application' or (exist Exec)"));  if (offers.isEmpty() || \
                offers.first()->exec().isEmpty()) {
-        offers = KMimeTypeTrader::self()->query(mptr->name(),
+        offers = KMimeTypeTrader::self()->query(mimeType.name(),
                                                 QLatin1String("Application"),
                                                 QLatin1String("Type == \
'Application'"));  }
diff --git a/src/svnfrontend/svnitem.cpp b/src/svnfrontend/svnitem.cpp
index 973bf58..46e95f7 100644
--- a/src/svnfrontend/svnitem.cpp
+++ b/src/svnfrontend/svnitem.cpp
@@ -36,6 +36,7 @@
 #include <QString>
 #include <QFileInfo>
 #include <QImage>
+#include <QMimeDatabase>
 #include <QPainter>
 #include <QPixmap>
 #include <QMutexLocker>
@@ -48,7 +49,7 @@ public:
 
     KFileItem &createItem(const svn::Revision &peg);
     QUrl &kdeName(const svn::Revision &);
-    KMimeType::Ptr mimeType(bool dir);
+    QMimeType mimeType(bool dir);
 
     svn::StatusPtr m_Stat;
     void init();
@@ -60,7 +61,7 @@ public:
     KFileItem m_fitem;
     bool isWc;
     svn::Revision lRev;
-    KMimeType::Ptr mptr;
+    QMimeType m_mimeType;
     QMutex _infoTextMutex;
 };
 
@@ -82,7 +83,7 @@ void SvnItem_p::init()
     isWc = false;
     m_full = m_Stat->path();
     m_kdename.clear();
-    mptr = 0;
+    m_mimeType = QMimeType();
     lRev = svn::Revision::UNDEFINED;
     while (m_full.endsWith(QLatin1Char('/'))) {
         /* dir name possible */
@@ -100,19 +101,20 @@ void SvnItem_p::init()
     m_infoText.clear();
 }
 
-KMimeType::Ptr SvnItem_p::mimeType(bool dir)
+QMimeType SvnItem_p::mimeType(bool dir)
 {
-    if (!mptr || m_kdename.isEmpty()) {
+    if (!m_mimeType.isValid() || m_kdename.isEmpty()) {
         if (m_kdename.isEmpty()) {
             kdeName(svn::Revision::UNDEFINED);
         }
+        QMimeDatabase db;
         if (dir) {
-            mptr = KMimeType::mimeType("inode/directory");
+            m_mimeType = db.mimeTypeForName(QLatin1String("inode/directory"));
         } else {
-            mptr = KMimeType::findByUrl(m_kdename, 0, isWc, !isWc);
+            m_mimeType = db.mimeTypeForUrl(m_kdename);
         }
     }
-    return mptr;
+    return m_mimeType;
 }
 
 QUrl &SvnItem_p::kdeName(const svn::Revision &r)
@@ -324,7 +326,7 @@ QPixmap SvnItem::getPixmap(int size, bool overlay)
 #endif
     if (svn::Url::isValid(p_Item->m_Stat->path())) {
         /* remote access */
-        p = KIconLoader::global()->loadMimeTypeIcon(p_Item->mimeType(isDir())->iconName(),
 +        p = KIconLoader::global()->loadMimeTypeIcon(p_Item->mimeType(isDir()).iconName(),
  KIconLoader::Desktop,
                 size,
                 KIconLoader::DefaultState);
@@ -350,7 +352,9 @@ QPixmap SvnItem::getPixmap(int size, bool overlay)
         } else {
             // local access
             const QUrl uri(QUrl::fromLocalFile(fullName()));
-            p = KIconLoader::global()->loadMimeTypeIcon(KMimeType::iconNameForUrl(uri), \
KIconLoader::Desktop, size); +            QMimeDatabase db;
+            const QMimeType mimeType(db.mimeTypeForUrl(uri));
+            p = KIconLoader::global()->loadMimeTypeIcon(mimeType.iconName(), \
KIconLoader::Desktop, size);  p = getPixmap(p, size, overlay);
         }
     }
@@ -622,7 +626,7 @@ const QUrl &SvnItem::kdeName(const svn::Revision &r)
     return p_Item->kdeName(r);
 }
 
-KMimeType::Ptr SvnItem::mimeType()
+QMimeType SvnItem::mimeType()
 {
     return p_Item->mimeType(isDir());
 }
diff --git a/src/svnfrontend/svnitem.h b/src/svnfrontend/svnitem.h
index 985f525..a3cb616 100644
--- a/src/svnfrontend/svnitem.h
+++ b/src/svnfrontend/svnitem.h
@@ -22,9 +22,9 @@
 #define SVN_ITEM_H
 
 #include "svnqt/status.h"
-#include <kmimetype.h>
 #include <QString>
 #include <QDateTime>
+#include <QMimeType>
 #include <QPixmap>
 #include <QScopedPointer>
 #include <QList>
@@ -50,7 +50,7 @@ public:
     virtual const QString &shortName()const;
     virtual const QUrl &Url()const;
     virtual const QUrl &kdeName(const svn::Revision &);
-    virtual KMimeType::Ptr mimeType();
+    virtual QMimeType mimeType();
     virtual const QDateTime &fullDate()const;
     virtual bool isDir()const;
     virtual bool isVersioned()const;


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