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

List:       kde-commits
Subject:    [kphotoalbum] Browser: Replaced depreciated KIcon code with QIcon.
From:       Tobias Leupold <tobias.leupold () web ! de>
Date:       2016-08-14 14:09:13
Message-ID: E1bYw6D-0007fz-5y () code ! kde ! org
[Download RAW message or body]

Git commit 0c1f82389e28837e466b717c1ba70aade73e5c1e by Tobias Leupold.
Committed on 14/08/2016 at 14:08.
Pushed by tleupold into branch 'master'.

Replaced depreciated KIcon code with QIcon.

M  +6    -6    Browser/OverviewPage.cpp

http://commits.kde.org/kphotoalbum/0c1f82389e28837e466b717c1ba70aade73e5c1e

diff --git a/Browser/OverviewPage.cpp b/Browser/OverviewPage.cpp
index 859a334..9cf53a5 100644
--- a/Browser/OverviewPage.cpp
+++ b/Browser/OverviewPage.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2010 Jesper K. Pedersen <blackie@kde.org>
+/* Copyright (C) 2003-2016 Jesper K. Pedersen <blackie@kde.org>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public
@@ -30,7 +30,7 @@
 #include <MainWindow/Window.h>
 #include <klocale.h>
 #include <DB/ImageDB.h>
-#include <kicon.h>
+#include <QIcon>
 #include <config-kpa-exiv2.h>
 #include "DB/CategoryCollection.h"
 
@@ -133,7 +133,7 @@ QVariant Browser::OverviewPage::exivInfo( int role ) const
     if ( role == Qt::DisplayRole )
         return i18n("Exif Info");
     else if ( role == Qt::DecorationRole ) {
-        return KIcon(QString::fromLatin1("document-properties")).pixmap(THUMBNAILSIZE);
+        return QIcon::fromTheme(QString::fromLatin1("document-properties")).pixmap(THUMBNAILSIZE);
     }
 
     return QVariant();
@@ -144,7 +144,7 @@ QVariant Browser::OverviewPage::searchInfo( int role ) const
     if ( role == Qt::DisplayRole )
         return i18nc("@action Search button in the browser view.","Search");
     else if ( role == Qt::DecorationRole )
-        return KIcon( QString::fromLatin1( "system-search" ) ).pixmap(THUMBNAILSIZE);
+        return QIcon::fromTheme( QString::fromLatin1( "system-search" ) ).pixmap(THUMBNAILSIZE);
     return QVariant();
 }
 
@@ -153,7 +153,7 @@ QVariant Browser::OverviewPage::untaggedImagesInfo( int role ) const
     if ( role == Qt::DisplayRole )
         return i18n("Untagged Images");
     else if ( role == Qt::DecorationRole )
-        return KIcon(QString::fromUtf8("archive-insert")).pixmap(THUMBNAILSIZE);
+        return QIcon::fromTheme(QString::fromUtf8("archive-insert")).pixmap(THUMBNAILSIZE);
     return QVariant();
 
 }
@@ -163,7 +163,7 @@ QVariant Browser::OverviewPage::imageInfo( int role ) const
     if ( role == Qt::DisplayRole )
         return i18n("Show Thumbnails");
     else if ( role == Qt::DecorationRole )
-        return KIcon(QString::fromUtf8("view-preview")).pixmap(THUMBNAILSIZE);
+        return QIcon::fromTheme(QString::fromUtf8("view-preview")).pixmap(THUMBNAILSIZE);
     return QVariant();
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]