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

List:       kde-commits
Subject:    [kdepim] plugins/messageviewer/bodypartformatter/calendar: KMimeType--
From:       Montel Laurent <montel () kde ! org>
Date:       2014-12-01 6:43:17
Message-ID: E1XvKhZ-00051l-6x () scm ! kde ! org
[Download RAW message or body]

Git commit 0d4a421d2b6528c2286d03e69b9f557460b3a4aa by Montel Laurent.
Committed on 01/12/2014 at 06:37.
Pushed by mlaurent into branch 'master'.

KMimeType--

M  +7    -3    plugins/messageviewer/bodypartformatter/calendar/text_calendar.cpp

http://commits.kde.org/kdepim/0d4a421d2b6528c2286d03e69b9f557460b3a4aa

diff --git a/plugins/messageviewer/bodypartformatter/calendar/text_calendar.cpp \
b/plugins/messageviewer/bodypartformatter/calendar/text_calendar.cpp index \
                2000f2b..6db5326 100644
--- a/plugins/messageviewer/bodypartformatter/calendar/text_calendar.cpp
+++ b/plugins/messageviewer/bodypartformatter/calendar/text_calendar.cpp
@@ -67,7 +67,7 @@ using namespace KCalCore;
 #include <QInputDialog>
 #include <QMenu>
 #include <KMessageBox>
-#include <KMimeType>
+
 #include <KRun>
 #include <KSystemTimeZone>
 #include <QTemporaryFile>
@@ -76,6 +76,8 @@ using namespace KCalCore;
 #include <QIcon>
 #include <KLocalizedString>
 #include <QFileDialog>
+#include <QMimeDatabase>
+#include <QMimeType>
 
 using namespace MailTransport;
 
@@ -1076,7 +1078,8 @@ public:
         } else {
             // put the attachment in a temporary file and launch it
             QTemporaryFile *file;
-            QStringList patterns = \
KMimeType::mimeType(attachment->mimeType())->patterns(); +            QMimeDatabase \
db; +            QStringList patterns = \
db.mimeTypeForName(attachment->mimeType()).globPatterns();  if (!patterns.empty()) {
                 QString pattern = patterns.first();
                 file = new QTemporaryFile(QDir::tempPath() + \
QLatin1String("/messageviewer_XXXXXX") + pattern.remove(QLatin1Char('*'))); @@ \
-1123,7 +1126,8 @@ public:  } else {
             // put the attachment in a temporary file and save it
             QTemporaryFile *file;
-            QStringList patterns = KMimeType::mimeType(a->mimeType())->patterns();
+            QMimeDatabase db;
+            QStringList patterns = db.mimeTypeForName(a->mimeType()).globPatterns();
             if (!patterns.empty()) {
                 QString pattern = patterns.first();
                 file = new QTemporaryFile(QDir::tempPath() + \
QLatin1String("/messageviewer_XXXXXX") + pattern.remove(QLatin1Char('*')));


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