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

List:       kde-commits
Subject:    [kphotoalbum] /: Fixed some other KIcon calls.
From:       Tobias Leupold <tobias.leupold () web ! de>
Date:       2016-08-14 17:12:12
Message-ID: E1bYyxI-0003Bl-Ko () code ! kde ! org
[Download RAW message or body]

Git commit 72220b777b68715ceb5bce7907cd0bd9b0b4716d by Tobias Leupold.
Committed on 14/08/2016 at 17:11.
Pushed by tleupold into branch 'master'.

Fixed some other KIcon calls.

M  +6    -5    BackgroundJobs/HandleVideoThumbnailRequestJob.cpp
M  +4    -4    Browser/AbstractCategoryModel.cpp

http://commits.kde.org/kphotoalbum/72220b777b68715ceb5bce7907cd0bd9b0b4716d

diff --git a/BackgroundJobs/HandleVideoThumbnailRequestJob.cpp \
b/BackgroundJobs/HandleVideoThumbnailRequestJob.cpp index 2306783..2972ecf 100644
--- a/BackgroundJobs/HandleVideoThumbnailRequestJob.cpp
+++ b/BackgroundJobs/HandleVideoThumbnailRequestJob.cpp
@@ -1,5 +1,5 @@
 /* Copyright 2012 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 License as
    published by the Free Software Foundation; either version 2 of
@@ -7,12 +7,12 @@
    accepted by the membership of KDE e.V. (or its successor approved
    by the membership of KDE e.V.), which shall act as a proxy
    defined in Section 14 of version 3 of the license.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -22,9 +22,9 @@
 #include <QCryptographicHash>
 #include <QDir>
 #include <QImage>
+#include <QIcon>
 
 #include <KCodecs>
-#include <KIcon>
 #include <KLocalizedString>
 
 #include <ImageManager/ExtractOneVideoFrame.h>
@@ -106,7 +106,8 @@ void HandleVideoThumbnailRequestJob::sendResult(QImage image)
 
 QImage HandleVideoThumbnailRequestJob::brokenImage() const
 {
-    return  KIcon( QString::fromLatin1( "applications-multimedia" ) \
).pixmap(ThumbnailView::CellGeometry::preferredIconSize()).toImage(); +    return \
QIcon::fromTheme(QString::fromUtf8("applications-multimedia")).pixmap( +        \
ThumbnailView::CellGeometry::preferredIconSize()).toImage();  }
 
 } // namespace BackgroundJobs
diff --git a/Browser/AbstractCategoryModel.cpp b/Browser/AbstractCategoryModel.cpp
index 38627a8..36948c0 100644
--- a/Browser/AbstractCategoryModel.cpp
+++ b/Browser/AbstractCategoryModel.cpp
@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <DB/ImageDB.h>
 #include <DB/MemberMap.h>
-#include <KIcon>
+#include <QIcon>
 #include "enums.h"
 
 Browser::AbstractCategoryModel::AbstractCategoryModel( const DB::CategoryPtr& \
category, const DB::ImageSearchInfo& info ) @@ -70,9 +70,9 @@ QPixmap \
Browser::AbstractCategoryModel::icon( const QString& name ) const  }
 
     if ( m_category->viewType() == DB::Category::TreeView || m_category->viewType() \
                == DB::Category::IconView ) {
-        if ( DB::ImageDB::instance()->memberMap().isGroup( m_category->name(), name \
                ) )
-            return KIcon( QString::fromLatin1( "folder-image" ) ).pixmap(22);
-        else {
+        if (DB::ImageDB::instance()->memberMap().isGroup(m_category->name(), name)) \
{ +            return QIcon::fromTheme(QString::fromUtf8("folder-image")).pixmap(22);
+        } else {
             return m_category->icon();
         }
     }


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