| -rw-r--r-- | microkde/kiconloader.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/microkde/kiconloader.cpp b/microkde/kiconloader.cpp index 4842d71..e7f657d 100644 --- a/microkde/kiconloader.cpp +++ b/microkde/kiconloader.cpp @@ -1,40 +1,42 @@ #include "kiconloader.h" #include "kglobal.h" #ifndef DESKTOP_VERSION_OEGEL #include <qdir.h> +//Added by qt3to4: +#include <QPixmap> QPixmap KIconLoader::loadIcon( const QString& name, KIcon::Group, int, int, QString *, bool ) const { QPixmap pix; QString file; file = iconPath() + name+".png"; pix.load ( file ); // qDebug("KIconLoader::loadIcon %s -----------", file.latin1()); return pix; } -QIconSet KIconLoader::loadIconSet( const QString& name) const +QIcon KIconLoader::loadIconSet( const QString& name) const { QPixmap pixmapLoader; QString file; file = iconPath() + name+".png"; pixmapLoader.load( file ); //qDebug("KIconLoader::loadIconSet: %s ************", file.latin1() ); - QIconSet is ( pixmapLoader ); + QIcon is ( pixmapLoader ); return is; } QPixmap BarIcon( const QString &name ) { QPixmap pix; pix.load ( KGlobal::iconLoader()->iconPath() + name +".png" ); return pix; } QPixmap DesktopIcon( const QString &name, int ) { QPixmap pix; pix.load ( KGlobal::iconLoader()->iconPath() + name +".png" ); return pix; @@ -64,38 +66,38 @@ QPixmap SmallIconSet( const QString &name ) #include <qpe/resource.h> #include <kglobal.h> QPixmap KIconLoader::loadIcon( const QString& name, KIcon::Group, int, int, QString *, bool ) const { QString px = this->iconPath() + "/" + name; QPixmap p = Resource::loadPixmap( px ); QPixmap* pPtr = &p; if (pPtr == 0) qDebug("KIconLoader::loadIcon: %s not found", px.latin1()); return p; } -QIconSet KIconLoader::loadIconSet( const QString& name) const +QIcon KIconLoader::loadIconSet( const QString& name) const { QString px = this->iconPath() + "/" + name; - QIconSet is ;//= Resource::loadIconSet( px ); - QIconSet* isPtr = 0;//LR&is; + QIcon is ;//= Resource::loadIconSet( px ); + QIcon* isPtr = 0;//LR&is; if (isPtr == 0) qDebug("KIconLoader::loadIconSet: %s not foun", px.latin1()); return is; } QPixmap BarIcon( const QString &name ) { QPixmap p = KGlobal::iconLoader()->loadIcon(name, KIcon::Desktop); return p; } QPixmap DesktopIcon( const QString &name, int ) { QPixmap p = KGlobal::iconLoader()->loadIcon(name, KIcon::Desktop); return p; |