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

List:       kde-commits
Subject:    branches/work/kde4/kdelibs/kdecore
From:       Michel Hermier <michel.hermier () wanadoo ! fr>
Date:       2005-06-03 7:32:59
Message-ID: 1117783979.117484.28161.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 421463 by hermier:

Changed the signature of KIconLoader::loadMovie to accept a parent QObject.

 M  +3 -3      kiconloader.cpp  
 M  +4 -12     kiconloader.h  


--- branches/work/kde4/kdelibs/kdecore/kiconloader.cpp #421462:421463
@@ -23,9 +23,9 @@
 #include <qfileinfo.h>
 #include <qdir.h>
 #include <qicon.h>
-#include <qmovie.h>
 #include <qbitmap.h>
 #include <QPainter>
+#include <QMovie>
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
@@ -916,7 +916,7 @@
 
 
 
-QMovie *KIconLoader::loadMovie(const QString& name, KIcon::Group group, int size) const
+QMovie *KIconLoader::loadMovie(const QString& name, KIcon::Group group, int size, QObject *parent) const
 {
     QString file = moviePath( name, group, size );
     if (file.isEmpty())
@@ -925,7 +925,7 @@
     QString icon = iconPath(name, size ? -size : group, true);
     if (!icon.isEmpty() && file.left(dirLen) != icon.left(dirLen))
 	return 0;
-    return new QMovie(file);
+    return new QMovie(file, QByteArray(), parent);
 }
 
 QString KIconLoader::moviePath(const QString& name, KIcon::Group group, int size) const
--- branches/work/kde4/kdelibs/kdecore/kiconloader.h #421462:421463
@@ -16,21 +16,12 @@
 #include <qpixmap.h>
 #include <qicon.h>
 
-// Grmbl, X headers.....
-#ifdef Status
-#define KIconLoaderXStatus Status
-#undef Status
-#endif
-#include <qmovie.h>
-#ifdef KIconLoaderXStatus
-#define Status int
-#undef KIconLoaderXStatus
-#endif
-
 #include <kglobal.h>
 #include <kinstance.h>
 #include <kicontheme.h>
 
+class QMovie;
+
 struct KIconGroup;
 class KIconThemeNode;
 class KConfig;
@@ -186,10 +177,11 @@
      * @param group The icon group. See loadIcon().
      * @param size Override the default size for @p group.
      *             See KIcon::StdSizes.
+     * @param parent The parent object of the returned QMovie.
      * @return A QMovie object. Can be null if not found.
      *         Ownership is passed to the caller.
      */
-    QMovie *loadMovie(const QString& name, KIcon::Group group, int size=0) const;
+    QMovie *loadMovie(const QString& name, KIcon::Group group, int size=0, QObject *parent=0) const;
 
     /**
      * Returns the path to an animated icon.
[prev in list] [next in list] [prev in thread] [next in thread]