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

List:       kde-commits
Subject:    KDE/kdelibs/kdeui/icons
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2010-02-03 23:47:13
Message-ID: 1265240833.071988.12843.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1084914 by kossebau:

changed: KIconEngine is no public class, so no need to add an indirection with \
private class

 M  +20 -44    kiconengine.cpp  
 M  +7 -12     kiconengine_p.h  


--- trunk/KDE/kdelibs/kdeui/icons/kiconengine.cpp #1084913:1084914
@@ -18,43 +18,29 @@
 
 #include "kiconengine_p.h"
 
-#include <QPainter>
-#include <QMenu>
-#include <QToolBar>
-#include <QApplication>
-
 #include <kiconloader.h>
 
-class KIconEngine::Private
-{
-public:
-    QString iconName;
-    QStringList overlays;
-    KIconLoader* iconLoader;
-};
+#include <QtGui/QPainter>
+#include <QtGui/QMenu>
+#include <QtGui/QToolBar>
+#include <QtGui/QApplication>
 
-KIconEngine::KIconEngine(const QString& iconName, KIconLoader* iconLoader, const \
                QStringList &overlays)
-    : d(new Private)
+
+KIconEngine::KIconEngine(const QString& iconName, KIconLoader* iconLoader, const \
QStringList& overlays)  {
-    d->iconName = iconName;
-    d->iconLoader = iconLoader;
-    d->overlays = overlays;
+    mIconName = iconName;
+    mIconLoader = iconLoader;
+    mOverlays = overlays;
 }
 
 KIconEngine::KIconEngine(const QString& iconName, KIconLoader* iconLoader)
-    : d(new Private)
 {
-    d->iconName = iconName;
-    d->iconLoader = iconLoader;
+    mIconName = iconName;
+    mIconLoader = iconLoader;
 }
 
-KIconEngine::~KIconEngine()
+static inline int qIconModeToKIconState( QIcon::Mode mode )
 {
-    delete d;
-}
-
-static int qIconModeToKIconState( QIcon::Mode mode )
-{
     int kstate;
     switch (mode) {
     default:
@@ -75,9 +61,9 @@
 {
     Q_UNUSED(state)
     const int kstate = qIconModeToKIconState(mode);
-    const QPixmap pix = iconLoader()->loadIcon(d->iconName, KIconLoader::Desktop,
+    const QPixmap pix = mIconLoader->loadIcon(mIconName, KIconLoader::Desktop,
                                          qMin(size.width(), size.height()),
-                                         kstate, d->overlays);
+                                         kstate, mOverlays);
     return pix.size();
 }
 
@@ -96,27 +82,17 @@
     }
 
     const int iconSize = qMin(rect.width(), rect.height());
-    const QPixmap pix = iconLoader()->loadIcon(d->iconName, group, iconSize, kstate, \
d->overlays); +    const QPixmap pix = mIconLoader->loadIcon(mIconName, group, \
iconSize, kstate, mOverlays);  painter->drawPixmap(rect, pix);
 }
 
-const QString & KIconEngine::iconName( ) const
-{
-    return d->iconName;
-}
-
-KIconLoader * KIconEngine::iconLoader( ) const
-{
-    return d->iconLoader;
-}
-
 QPixmap KIconEngine::pixmap( const QSize & size, QIcon::Mode mode, QIcon::State \
state )  {
     Q_UNUSED(state)
 
     const int kstate = qIconModeToKIconState(mode);
     const int iconSize = qMin(size.width(), size.height());
-    QPixmap pix = iconLoader()->loadIcon(d->iconName, KIconLoader::Desktop, \
iconSize, kstate, d->overlays); +    QPixmap pix = mIconLoader->loadIcon(mIconName, \
KIconLoader::Desktop, iconSize, kstate, mOverlays);  
     if(pix.size() == size)
         return pix;
@@ -132,23 +108,23 @@
 
 QString KIconEngine::key() const
 {
-    return QLatin1String("KIconEngine");
+    return QString::fromLatin1("KIconEngine");
 }
 
 QIconEngineV2 *KIconEngine::clone() const
 {
-    return new KIconEngine(d->iconName, d->iconLoader, d->overlays);
+    return new KIconEngine(mIconName, mIconLoader, mOverlays);
 }
 
 bool KIconEngine::read(QDataStream &in)
 {
-    in >> d->iconName >> d->overlays;
+    in >> mIconName >> mOverlays;
     return true;
 }
 
 bool KIconEngine::write(QDataStream &out) const
 {
-    out << d->iconName << d->overlays;
+    out << mIconName << mOverlays;
     return true;
 }
 
--- trunk/KDE/kdelibs/kdeui/icons/kiconengine_p.h #1084913:1084914
@@ -58,16 +58,6 @@
      */
     virtual ~KIconEngine();
 
-    /**
-     * Allows the KDE icon name assigned to this icon engine to be retrieved.
-     */
-    const QString& iconName() const;
-
-    /**
-     * Returns the icon loader used by this engine for rendering purposes.
-     */
-    KIconLoader* iconLoader() const;
-
     /// Reimplementation
     virtual QSize actualSize ( const QSize & size, QIcon::Mode mode, QIcon::State \
state );  /// Reimplementation
@@ -81,8 +71,13 @@
     virtual bool write(QDataStream &out) const;
 
   private:
-    class Private;
-    Private * const d;
+    QString mIconName;
+    QStringList mOverlays;
+    KIconLoader* mIconLoader;
 };
 
+inline KIconEngine::~KIconEngine()
+{
+}
+
 #endif


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