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

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

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

KToolInvocation--

M  +2    -2    kontact/plugins/specialdates/sdsummarywidget.cpp
M  +0    -60   plugins/messageviewer/bodypartformatter/calendar/text_calendar.cpp

http://commits.kde.org/kdepim/c0e7af7a0cd62f83b3b24ab779033d697b0ee233

diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp \
b/kontact/plugins/specialdates/sdsummarywidget.cpp index 30551a6..18dd99d 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -44,7 +44,7 @@
 #include <KUrlLabel>
 #include <KIconLoader>
 #include <KConfigGroup>
-#include <KToolInvocation>
+#include <QDesktopServices>
 #include <KHolidays/kholidays/Holidays>
 
 #include <QDate>
@@ -664,7 +664,7 @@ void SDSummaryWidget::slotItemFetchJobDone(KJob *job)
     }
     const KContacts::Addressee contact = \
lst.first().payload<KContacts::Addressee>();  
-    KToolInvocation::invokeMailer(contact.fullEmail(), QString());
+    QDesktopServices::openUrl(QUrl(contact.fullEmail()));
 }
 
 void SDSummaryWidget::viewContact(const QString &url)
diff --git a/plugins/messageviewer/bodypartformatter/calendar/text_calendar.cpp \
b/plugins/messageviewer/bodypartformatter/calendar/text_calendar.cpp index \
                6db5326..15d5422 100644
--- a/plugins/messageviewer/bodypartformatter/calendar/text_calendar.cpp
+++ b/plugins/messageviewer/bodypartformatter/calendar/text_calendar.cpp
@@ -130,66 +130,6 @@ static bool hasMyWritableEventsFolders(const QString &family)
 #endif
 }
 
-#if 0
-#ifndef KDEPIM_NO_KRESOURCES
-// Double negation, this is enabled when the old resource based code is build.
-class CalendarManager
-{
-public:
-    CalendarManager();
-    ~CalendarManager();
-    static KCal::CalendarResources *calendar();
-
-private:
-    KCal::CalendarResources *mCalendar;
-};
-
-CalendarManager::CalendarManager()
-{
-    mCalendar = new CalendarResources(KSystemTimeZones::local());
-    mCalendar->readConfig();
-    mCalendar->load();
-    bool multipleKolabResources = false;
-    CalendarResourceManager *mgr = mCalendar->resourceManager();
-    CalendarResourceManager::ActiveIterator end = mgr->activeEnd();
-    for (CalendarResourceManager::ActiveIterator it = mgr->activeBegin();
-            it != end; ++it) {
-        if ((*it)->type() == "imap" || (*it)->type() == "kolab") {
-            const QStringList subResources = (*it)->subresources();
-            QSet<QString> prefixSet;
-            QStringList::ConstIterator subEnd = subResources.constEnd();
-            for (QStringList::ConstIterator subIt = subResources.constBegin();
-                    subIt != subEnd; ++subIt) {
-                if (!(*subIt).contains("/.INBOX.directory/")) {
-                    // we don't care about shared folders
-                    continue;
-                }
-                prefixSet.insert((*subIt).left((*subIt).indexOf("/.INBOX.directory/")));
                
-            }
-            if (prefixSet.count() > 1) {
-                multipleKolabResources = true;
-            }
-        }
-    }
-    if (multipleKolabResources) {
-        qDebug() << "disabling calendar lookup because multiple active Kolab \
                resources";
-        delete mCalendar;
-        mCalendar = 0;
-    }
-}
-
-CalendarManager::~CalendarManager()
-{
-    delete mCalendar;
-}
-
-KCal::CalendarResources *CalendarManager::calendar()
-{
-    Q_GLOBAL_STATIC(CalendarManager, _self)
-    return _self->mCalendar;
-}
-#endif
-#endif
 
 static bool occurredAlready(const Incidence::Ptr &incidence)
 {


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