[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=384809e

The following commit has been merged in the master branch:
commit 384809e353553f9fd29c6b4498fc7f96c5d60f7e
Author: Alin Marin Elena <alinm.elena at gmail.com>
Date:   Mon Dec 15 11:44:36 2014 +0100

    Replace kicon with QIcon and remove kdeversion.h and friends
---
 contact-view-hover-button.cpp | 2 +-
 main-widget.cpp               | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/contact-view-hover-button.cpp b/contact-view-hover-button.cpp
index 434ab7b..d16d1cc 100644
--- a/contact-view-hover-button.cpp
+++ b/contact-view-hover-button.cpp
@@ -32,7 +32,7 @@
 
 // KDE includes
 
-#include <kicon.h>
+#include <QIcon>
 #include <kiconloader.h>
 #include <kiconeffect.h>
 
diff --git a/main-widget.cpp b/main-widget.cpp
index d6cfabc..e49b589 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -62,8 +62,6 @@
 #include <KWindowSystem>
 #include <KLocalizedString>
 
-#include <kdeversion.h>
-
 #ifdef HAVE_KPEOPLE
 // #include <kpeople/widgets/mergedialog.h> //Disable for now, re-enable when kpeople re-enables it
 #include <KPeople/PersonsModel>
@@ -729,9 +727,6 @@ void MainWidget::onModelInitialized(bool success)
     if (!success) {
         m_messageWidget->setMessageType(KMessageWidget::Warning);
         m_messageWidget->setText(i18n("Some data sources failed to initialize properly, your contact list might be incomplete."));
-        #if KDE_IS_VERSION(4, 11, 0)
-        m_messageWidget->setIcon(QIcon::fromTheme(QLatin1String("dialog-warning")));
-        #endif
         m_messageWidget->animatedShow();
     }
 

-- 
ktp-contact-list packaging