diff -r 9d806967057c -r 7f0462e8c3da contentstorage/caclient/inc/caicondescription_p.h --- a/contentstorage/caclient/inc/caicondescription_p.h Tue Mar 23 23:42:03 2010 +0200 +++ b/contentstorage/caclient/inc/caicondescription_p.h Tue Mar 23 23:55:55 2010 +0200 @@ -37,16 +37,11 @@ QString filename() const; void setFileName(const QString &fileName); - int bitmapId() const; - void setBitmapId(int bitmapId); + QString skinId() const; + void setSkinId(const QString &skinId); - int maskId() const; - void setMaskId(int maskId); - - int skinMajorId() const; - void setSkinMajorId(int id); - int skinMinorId() const; - void setSkinMinorId(int id); + QString applicationId() const; + void setApplicationId(const QString &applicationId); private: @@ -68,22 +63,12 @@ /*! * */ - int mBitmapId; - - /*! - * - */ - int mMaskId; + QString mSkinId; /*! * */ - int mSkinMajorId; - - /*! - * - */ - int mSkinMinorId; + QString mApplicationId; };