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

List:       kde-commits
Subject:    =?utf-8?q?=5Blibqapt=5D_/=3A_Move_iconsForDebFile=28=29_from_qap?=
From:       Jonathan Thomas <echidnaman () kubuntu ! org>
Date:       2011-02-05 1:16:46
Message-ID: 20110205011646.9AB89A609B () git ! kde ! org
[Download RAW message or body]

Git commit 11a7ea232a2c0fc124f0fea8745d1ba07aa22968 by Jonathan Thomas.
Committed on 05/02/11 at 02:15.
Pushed by jmthomas into branch 'master'.

Move iconsForDebFile() from qapt-deb-thumbnailer to QApt::DebFile as \
DebFile::iconList()

M  +22   -0    src/debfile.cpp     
M  +7    -0    src/debfile.h     
M  +2    -24   utils/qapt-deb-thumbnailer/DebThumbnailer.cpp     
M  +0    -3    utils/qapt-deb-thumbnailer/DebThumbnailer.h     

http://commits.kde.org/libqapt/11a7ea232a2c0fc124f0fea8745d1ba07aa22968

diff --git a/src/debfile.cpp b/src/debfile.cpp
index 36b0626..bc3b187 100644
--- a/src/debfile.cpp
+++ b/src/debfile.cpp
@@ -203,6 +203,28 @@ QStringList DebFile::fileList() const
     return filesList;
 }
 
+QStringList DebFile::iconList() const
+{
+    QStringList fileNames = fileList();
+    QStringList iconsList;
+    foreach (const QString &fileName, fileNames) {
+        if (fileName.startsWith(QLatin1String("./usr/share/icons"))) {
+            iconsList << fileName;
+        }
+    }
+
+    // XPM as a fallback. It's really not pretty when scaled up
+    if (iconsList.isEmpty()) {
+        foreach (const QString &fileName, fileNames) {
+            if (fileName.startsWith(QLatin1String("./usr/share/pixmaps"))) {
+                iconsList << fileName;
+            }
+        }
+    }
+
+    return iconsList;
+}
+
 qint64 DebFile::installedSize() const
 {
     QString sizeString = \
                QLatin1String(d->controlData.FindS("Installed-Size").c_str());
diff --git a/src/debfile.h b/src/debfile.h
index b076452..07eebb8 100644
--- a/src/debfile.h
+++ b/src/debfile.h
@@ -162,6 +162,13 @@ public:
     QStringList fileList() const;
 
    /**
+    * Returns a list of potential app icons in this archive
+    *
+    * @return A @c QStringList of icon paths
+    */
+    QStringList iconList() const;
+
+   /**
     * Returns the installed size of the package that this archive contains
     *
     * @return The package's installed size as a 64-bit integer
diff --git a/utils/qapt-deb-thumbnailer/DebThumbnailer.cpp \
b/utils/qapt-deb-thumbnailer/DebThumbnailer.cpp index 796f73f..dba7741 100644
--- a/utils/qapt-deb-thumbnailer/DebThumbnailer.cpp
+++ b/utils/qapt-deb-thumbnailer/DebThumbnailer.cpp
@@ -26,7 +26,7 @@
 
 #include <KIcon>
 
-#include <LibQApt/DebFile>
+#include "../../src/debfile.h"
 
 extern "C"
 {
@@ -53,7 +53,7 @@ bool DebThumbnailer::create(const QString &path, int width, int \
height, QImage &  return false;
     }
 
-    QStringList iconsList = iconsFromDebFile(debFile);
+    QStringList iconsList = debFile.iconList();
 
     if (iconsList.isEmpty()) {
         return false;
@@ -87,25 +87,3 @@ ThumbCreator::Flags DebThumbnailer::flags() const
 {
     return (Flags)(None);
 }
-
-QStringList DebThumbnailer::iconsFromDebFile(const QApt::DebFile &debFile)
-{
-    QStringList fileList = debFile.fileList();
-    QStringList iconsList;
-    foreach (const QString &fileName, fileList) {
-        if (fileName.startsWith(QLatin1String("./usr/share/icons"))) {
-            iconsList << fileName;
-        }
-    }
-
-    // XPM as a fallback. It's really not pretty when scaled up
-    if (iconsList.isEmpty()) {
-        foreach (const QString &fileName, fileList) {
-            if (fileName.startsWith(QLatin1String("./usr/share/pixmaps"))) {
-                iconsList << fileName;
-            }
-        }
-    }
-
-    return iconsList;
-}
diff --git a/utils/qapt-deb-thumbnailer/DebThumbnailer.h \
b/utils/qapt-deb-thumbnailer/DebThumbnailer.h index 45fc6dd..b80439d 100644
--- a/utils/qapt-deb-thumbnailer/DebThumbnailer.h
+++ b/utils/qapt-deb-thumbnailer/DebThumbnailer.h
@@ -37,9 +37,6 @@ public:
 
     virtual bool create(const QString &path, int w, int h, QImage &img);
     virtual Flags flags() const;
-
-private:
-    QStringList iconsFromDebFile(const QApt::DebFile &deb);
 };
 
 #endif


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