initial public commit of qt4 portp1

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
@@ -6,2 +6,4 @@
 #include <qdir.h>
+//Added by qt3to4:
+#include <QPixmap>
 QPixmap KIconLoader::loadIcon( const QString& name, KIcon::Group, int,
@@ -16,3 +18,3 @@ QPixmap KIconLoader::loadIcon( const QString& name, KIcon::Group, int,
 }
-QIconSet KIconLoader::loadIconSet( const QString& name) const
+QIcon KIconLoader::loadIconSet( const QString& name) const
 {
@@ -23,3 +25,3 @@ QIconSet KIconLoader::loadIconSet( const QString& name) const
     //qDebug("KIconLoader::loadIconSet: %s ************", file.latin1() );
-    QIconSet is ( pixmapLoader );
+    QIcon is ( pixmapLoader );
   return is;
@@ -79,3 +81,3 @@ QPixmap KIconLoader::loadIcon( const QString& name, KIcon::Group, int,
 
-QIconSet KIconLoader::loadIconSet( const QString& name) const
+QIcon KIconLoader::loadIconSet( const QString& name) const
 {
@@ -83,4 +85,4 @@ QIconSet KIconLoader::loadIconSet( const QString& name) const
   
-  QIconSet is ;//= Resource::loadIconSet( px );
-  QIconSet* isPtr = 0;//LR&is;
+  QIcon is ;//= Resource::loadIconSet( px );
+  QIcon* isPtr = 0;//LR&is;
   if (isPtr == 0)