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

List:       kde-commits
Subject:    [tellico/frameworks] src/core: Remove versioned code
From:       Robby Stephenson <robby () periapsis ! org>
Date:       2015-05-01 1:57:04
Message-ID: E1Yo0CO-0005S8-97 () scm ! kde ! org
[Download RAW message or body]

Git commit b9702263b8f6a57503a067b4d9e0b50fe4b5ea18 by Robby Stephenson.
Committed on 30/04/2015 at 18:50.
Pushed by rstephenson into branch 'frameworks'.

Remove versioned code

M  +0    -13   src/core/netaccess.cpp

http://commits.kde.org/tellico/b9702263b8f6a57503a067b4d9e0b50fe4b5ea18

diff --git a/src/core/netaccess.cpp b/src/core/netaccess.cpp
index dce16e9..9c767fb 100644
--- a/src/core/netaccess.cpp
+++ b/src/core/netaccess.cpp
@@ -33,7 +33,6 @@
 #include <kio/jobuidelegate.h>
 #include <ktemporaryfile.h>
 #include <klocale.h>
-#include <kdeversion.h>
 #include <kurl.h>
 
 #include <QEventLoop>
@@ -100,14 +99,8 @@ bool NetAccess::download(const KUrl& url_, QString& target_, QWidget* window_, b
 QPixmap NetAccess::filePreview(const KUrl& url, int size) {
   NetAccess netaccess;
 
-#if KDE_IS_VERSION(4,7,0)
   KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, url, true);
   KIO::Job* previewJob = KIO::filePreview(KFileItemList() << fileItem, QSize(size, size));
-#else
-  KUrl::List list;
-  list.append(url);
-  KIO::Job* previewJob = KIO::filePreview(list, size, size);
-#endif
   connect(previewJob, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
           &netaccess, SLOT(slotPreview(const KFileItem&, const QPixmap&)));
 
@@ -118,13 +111,7 @@ QPixmap NetAccess::filePreview(const KUrl& url, int size) {
 QPixmap NetAccess::filePreview(const KFileItem& item, int size) {
   NetAccess netaccess;
 
-#if KDE_IS_VERSION(4,7,0)
   KIO::Job* previewJob = KIO::filePreview(KFileItemList() << item, QSize(size, size));
-#else
-  KFileItemList list;
-  list.append(item);
-  KIO::Job* previewJob = KIO::filePreview(list, size, size);
-#endif
   connect(previewJob, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
           &netaccess, SLOT(slotPreview(const KFileItem&, const QPixmap&)));
 

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