Fix bigPixmaps BUG.

instead of returning the bigPixmap from the d->mPixmaps[1] I returned
the deprecated variable which was null

1 files changed, 1 insertions, 1 deletions

diff --git a/library/applnk.cpp b/library/applnk.cpp
index 1f053f3..44f3f58 100644
--- a/library/applnk.cpp
+++ b/library/applnk.cpp
@@ -302,385 +302,385 @@ int AppLnk::bigIconSize()
   that the application can view or edit.
 */
 /*!
     \fn const QArray<int>& AppLnk::categories() const
 
   Returns the Categories property.
 
   See the CategoryWidget for more details.
 
   \sa setCategories()
 */
 
 const QArray<int>& AppLnk::categories() const
 {
     d->ensureCatArray();
     return d->mCat;
 }
 
 /*!
     \fn int AppLnk::id() const
 
   Returns the id of the AppLnk. If the AppLnk is not in an AppLnkSet,
   this value is 0, otherwise it is a value that is unique for the
   duration of the current process.
 
   \sa AppLnkSet::find()
 */
 
 /*!
   \fn bool AppLnk::isValid() const
 
   Returns TRUE if this AppLnk is valid; otherwise returns FALSE.
 */
 
 /*!
   Creates an invalid AppLnk.
 
   \sa isValid()
 */
 AppLnk::AppLnk()
 {
     mId = 0;
     d = new AppLnkPrivate();
 }
 
 /*!
   Loads \a file (e.g. \e app.desktop) as an AppLnk.
 
   \sa writeLink()
 */
 AppLnk::AppLnk( const QString &file )
 {
     QStringList sl;
     d = new AppLnkPrivate();
     if ( !file.isNull() ) {
 	Config config( file, Config::File );
 
 	if ( config.isValid() ) {
 	    config.setGroup( "Desktop Entry" );
 
 	    mName = config.readEntry( "Name", file );
 	    mExec = config.readEntry( "Exec" );
 	    mType = config.readEntry( "Type", QString::null );
 	    mIconFile = config.readEntry( "Icon", QString::null );
 	    mRotation = config.readEntry( "Rotation", "" );
 	    mComment = config.readEntry( "Comment", QString::null );
 	    // MIME types are case-insensitive.
 	    mMimeTypes = config.readListEntry( "MimeType", ';' );
 	    for (QStringList::Iterator it=mMimeTypes.begin(); it!=mMimeTypes.end(); ++it)
 		*it = (*it).lower();
 	    mMimeTypeIcons = config.readListEntry( "MimeTypeIcons", ';' );
 	    mLinkFile = file;
 	    mFile = config.readEntry("File", QString::null);
 	    if ( mFile[0] != '/' ) {
 		int slash = file.findRev('/');
 		if ( slash >= 0 ) {
 		    mFile = file.left(slash) + '/' + mFile;
 		}
 	    }
 	    d->mCatList = config.readListEntry("Categories", ';');
 	    if ( d->mCatList[0].toInt() < -1 ) {
 		// numeric cats in file! convert to text
 		Categories cat( 0 );
 		cat.load( categoryFileName() );
 		d->mCat.resize( d->mCatList.count() );
 		int i;
 		QStringList::ConstIterator it;
 		for ( i = 0, it = d->mCatList.begin(); it != d->mCatList.end();
 		      ++it, i++ ) {
 		    bool number;
 		    int id = (*it).toInt( &number );
 		    if ( !number ) {
 			// convert from text
 			id = cat.id( "Document View", *it );
 			if ( id == 0 )
 			    id = cat.addCategory( "Document View", *it );
 		    }
 		    d->mCat[i] = id;
 		}
 		d->updateCatListFromArray();
 	    }
 	}
     }
     mId = 0;
 }
 
 AppLnk& AppLnk::operator=(const AppLnk &copy)
 {
     if ( mId )
 	qWarning("Deleting AppLnk that is in an AppLnkSet");
     if ( d )
 	delete d;
 
 
     mName = copy.mName;
 
     /* remove for Qtopia 3.0 -zecke */
     mPixmap = copy.mPixmap;
     mBigPixmap = copy.mBigPixmap;
 
     mExec = copy.mExec;
     mType = copy.mType;
     mRotation = copy.mRotation;
     mComment = copy.mComment;
     mFile = copy.mFile;
     mLinkFile = copy.mLinkFile;
     mIconFile = copy.mIconFile;
     mMimeTypes = copy.mMimeTypes;
     mMimeTypeIcons = copy.mMimeTypeIcons;
     mId = 0;
     d = new AppLnkPrivate();
     d->mCat = copy.d->mCat;
     d->mCatList = copy.d->mCatList;
     d->mPixmaps = copy.d->mPixmaps;
 
     return *this;
 }
 /*!
   protected internally to share code
   should I document that at all?
   I don't know the TT style for that
 */
 const QPixmap& AppLnk::pixmap( int pos, int size ) const {
     if ( d->mPixmaps[pos].isNull() ) {
 	AppLnk* that = (AppLnk*)this;
 	if ( mIconFile.isEmpty() ) {
 	    MimeType mt(type());
 	    that->d->mPixmaps[pos] = mt.pixmap();
 	    if ( that->d->mPixmaps[pos].isNull() )
 		that->d->mPixmaps[pos].convertFromImage(
 		    Resource::loadImage("UnknownDocument")
 			.smoothScale( size, size ) );
 	    return that->d->mPixmaps[pos];
 	}
 	QImage unscaledIcon = Resource::loadImage( that->mIconFile );
 	if ( unscaledIcon.isNull() ) {
 	    qDebug( "Cannot find icon: %s", that->mIconFile.latin1() );
 	    that->d->mPixmaps[pos].convertFromImage(
 		    Resource::loadImage("UnknownDocument")
 			.smoothScale( size, size ) );
 	} else {
 	    that->d->mPixmaps[0].convertFromImage( unscaledIcon.smoothScale( smallSize, smallSize ) );
 	    that->d->mPixmaps[1].convertFromImage( unscaledIcon.smoothScale( bigSize, bigSize ) );
 	}
 	return that->d->mPixmaps[pos];
     }
     return d->mPixmaps[pos];
 }
 
 /*!
   Returns a small pixmap associated with the application.
 
   \sa bigPixmap() setIcon()
 */
 const QPixmap& AppLnk::pixmap() const
 {
     if ( d->mPixmaps[0].isNull() ) {
         return pixmap(AppLnkPrivate::Normal, smallSize );
     }
     return d->mPixmaps[0];
 }
 
 /*!
   Returns a large pixmap associated with the application.
 
   \sa pixmap() setIcon()
 */
 const QPixmap& AppLnk::bigPixmap() const
 {
     if ( d->mPixmaps[1].isNull() ) {
         return pixmap( AppLnkPrivate::Big, bigSize );
     }
-    return mBigPixmap;
+    return d->mPixmaps[1];
 }
 
 /*!
   Returns the type of the AppLnk. For applications, games and
   settings the type is \c Application; for documents the type is the
   document's MIME type.
 */
 QString AppLnk::type() const
 {
     if ( mType.isNull() ) {
 	AppLnk* that = (AppLnk*)this;
 	QString f = file();
 	if ( !f.isNull() ) {
 	    MimeType mt(f);
 	    that->mType = mt.id();
 	    return that->mType;
 	}
     }
     return mType;
 }
 
 /*!
   Returns the file associated with the AppLnk.
 
   \sa exec() name()
 */
 QString AppLnk::file() const
 {
     if ( mFile.isNull() ) {
 	AppLnk* that = (AppLnk*)this;
 	QString ext = MimeType(mType).extension();
 	if ( !ext.isEmpty() )
 	    ext = "." + ext;
 	if ( !mLinkFile.isEmpty() ) {
 	    that->mFile =
 		mLinkFile.right(8)==".desktop" // 8 = strlen(".desktop")
 		    ? mLinkFile.left(mLinkFile.length()-8) : mLinkFile;
 	} else if ( mType.contains('/') ) {
 	    that->mFile =
 		QString(getenv("HOME"))+"/Documents/"+mType+"/"+safeFileName(that->mName);
             /*
              * A file with the same name or a .desktop file already exists
              */
 	    if ( QFile::exists(that->mFile+ext) || QFile::exists(that->mFile+".desktop") ) {
 		int n=1;
 		QString nn;
 		while (QFile::exists((nn=(that->mFile+"_"+QString::number(n)))+ext)
 			|| QFile::exists(nn+".desktop"))
 		    n++;
 		that->mFile = nn;
 	    }
 	    that->mLinkFile = that->mFile+".desktop";
 	    that->mFile += ext;
 	}
 	prepareDirectories(that->mFile);
 	if ( !that->mFile.isEmpty() ) {
 	    QFile f(that->mFile);
 	    if ( !f.open(IO_WriteOnly) )
 		that->mFile = QString::null;
 	    return that->mFile;
 	}
     }
     return mFile;
 }
 
 /*!
   Returns the desktop file corresponding to this AppLnk.
 
   \sa file() exec() name()
 */
 QString AppLnk::linkFile() const
 {
     if ( mLinkFile.isNull() ) {
 	AppLnk* that = (AppLnk*)this;
 	if ( type().contains('/') ) {
 	    StorageInfo storage;
 	    const FileSystem *fs = storage.fileSystemOf( that->mFile );
             /* tmpfs + and ramfs are available too but not removable
              * either we fix storage or add this
              */
 	    if ( fs && ( fs->isRemovable() || fs->disk() == "/dev/mtdblock6" || fs->disk() == "tmpfs") ) {
 		that->mLinkFile = fs->path();
 	    } else
 		that->mLinkFile = getenv( "HOME" );
 	    that->mLinkFile += "/Documents/"+type()+"/"+safeFileName(that->mName);
 
             /* the desktop file exists make sure we don't point to the same file */
 	    if ( QFile::exists(that->mLinkFile+".desktop") ) {
                 AppLnk lnk( that->mLinkFile + ".desktop" );
 
                 /* the linked is different */
                 if(that->file() != lnk.file() ) {
                     int n = 1;
                     QString nn;
                     while (QFile::exists((nn=that->mLinkFile+"_"+QString::number(n))+".desktop")) {
                         n++;
                         /* just to be sure */
                         AppLnk lnk(nn );
                         if (lnk.file() == that->file() )
                             break;
                     }
                     that->mLinkFile = nn;
                 }
 	    }
 	    that->mLinkFile += ".desktop";
 	    storeLink();
 	}
 	return that->mLinkFile;
     }
     return mLinkFile;
 }
 
 /*!
   Copies \a copy.
 */
 AppLnk::AppLnk( const AppLnk &copy )
 {
     mName = copy.mName;
     mPixmap = copy.mPixmap;
     mBigPixmap = copy.mBigPixmap;
     mExec = copy.mExec;
     mType = copy.mType;
     mRotation = copy.mRotation;
     mComment = copy.mComment;
     mFile = copy.mFile;
     mLinkFile = copy.mLinkFile;
     mIconFile = copy.mIconFile;
     mMimeTypes = copy.mMimeTypes;
     mMimeTypeIcons = copy.mMimeTypeIcons;
     mId = 0;
     d = new AppLnkPrivate();
     d->mCat = copy.d->mCat;
     d->mCatList = copy.d->mCatList;
     d->mPixmaps = copy.d->mPixmaps;
 }
 
 /*!
   Destroys the AppLnk. Note that if the AppLnk is currently a member
   of an AppLnkSet, this will produce a run-time warning.
 
   \sa AppLnkSet::add() AppLnkSet::remove()
 */
 AppLnk::~AppLnk()
 {
     if ( mId )
 	qWarning("Deleting AppLnk that is in an AppLnkSet");
     if ( d )
 	delete d;
 }
 
 /*!
   \overload
   Executes the application associated with this AppLnk.
 
   \sa exec()
 */
 void AppLnk::execute() const
 {
     execute(QStringList());
 }
 
 /*!
   Executes the application associated with this AppLnk, with
   \a args as arguments.
 
   \sa exec()
 */
 void AppLnk::execute(const QStringList& args) const
 {
 #ifdef Q_WS_QWS
     if ( !mRotation.isEmpty() ) {
 	// ######## this will only work in the server
 	int rot = QPEApplication::defaultRotation();
 	rot = (rot+mRotation.toInt())%360;
 	QCString old = getenv("QWS_DISPLAY");
 	setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(rot), 1);
 	invoke(args);
 	setenv("QWS_DISPLAY", old.data(), 1);
     } else
 #endif
 	invoke(args);
 }
 
 /*!
   Invokes the application associated with this AppLnk, with
   \a args as arguments. Rotation is not taken into account by
   this function, so you should not call it directly.
 
   \sa execute()
 */
 void AppLnk::invoke(const QStringList& args) const
 {