From a08aff328d4393031d5ba7d622c2b05705a89d73 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Wed, 04 Jul 2007 11:23:42 +0000 Subject: initial public commit of qt4 port --- (limited to 'microkde/kiconloader.cpp') diff --git a/microkde/kiconloader.cpp b/microkde/kiconloader.cpp index 4842d71..e7f657d 100644 --- a/microkde/kiconloader.cpp +++ b/microkde/kiconloader.cpp @@ -4,6 +4,8 @@ #ifndef DESKTOP_VERSION_OEGEL #include +//Added by qt3to4: +#include QPixmap KIconLoader::loadIcon( const QString& name, KIcon::Group, int, int, QString *, bool ) const { @@ -14,14 +16,14 @@ QPixmap KIconLoader::loadIcon( const QString& name, KIcon::Group, int, // 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; } @@ -77,12 +79,12 @@ QPixmap KIconLoader::loadIcon( const QString& name, KIcon::Group, int, 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()); -- cgit v0.9.0.2