--- a/contentstorage/caclient/src/caicondescription.cpp Tue Mar 23 23:42:03 2010 +0200
+++ b/contentstorage/caclient/src/caicondescription.cpp Tue Mar 23 23:55:55 2010 +0200
@@ -127,76 +127,41 @@
m_d->setFileName(filename);
}
-/*!
- Returns bitmap id.
- \retval bitmap id.
- */
-int CaIconDescription::bitmapId() const
-{
- return m_d->bitmapId();
-}
/*!
- Sets bitmap id
- \param bitmap id
+ Returns skin id.
+ \retval skin id.
*/
-void CaIconDescription::setBitmapId(int id)
+QString CaIconDescription::skinId() const
{
- m_d->setBitmapId(id);
-}
-
-/*!
- Returns icon mask id
- \retval icon mask id
- */
-int CaIconDescription::maskId() const
-{
- return m_d->maskId();
+ return m_d->skinId();
}
/*!
- Sets icon mask id
- \param icon mask id
+ Sets skin id
+ \param skin id
*/
-void CaIconDescription::setMaskId(int id)
+void CaIconDescription::setSkinId(const QString &skinId)
{
- m_d->setMaskId(id);
-}
-
-/*!
- Returns skin major id
- \retval skin major id
- */
-int CaIconDescription::skinMajorId() const
-{
- return m_d->skinMajorId();
+ m_d->setSkinId(skinId);
}
/*!
- Sets skin major id
- \param skin major id
+ Returns icon application id.
+ \retval icon application id.
*/
-void CaIconDescription::setSkinMajorId(int id)
+QString CaIconDescription::applicationId() const
{
- m_d->setSkinMajorId(id);
+ return m_d->applicationId();
}
/*!
- Returns skin minor id
- \retval skin minor id
+ Sets icon application id.
+ \param QString with icon application id.
*/
-int CaIconDescription::skinMinorId() const
+void CaIconDescription::setApplicationId(const QString &applicationId)
{
- return m_d->skinMinorId();
-}
-
-/*!
- Sets skin minor id
- \param skin minor id
- */
-void CaIconDescription::setSkinMinorId(int id)
-{
- m_d->setSkinMinorId(id);
+ m_d->setApplicationId(applicationId);
}
/*!
@@ -214,8 +179,8 @@
*/
CaIconDescriptionPrivate::CaIconDescriptionPrivate(
CaIconDescription *iconDescriptionPublic) :
- m_q(iconDescriptionPublic), mBitmapId(0), mMaskId(0), mSkinMajorId(0),
- mSkinMinorId(0)
+ m_q(iconDescriptionPublic), mId(0), mFilename(), mSkinId(),
+ mApplicationId(0)
{
}
@@ -257,73 +222,38 @@
Returns bitmap id.
\retval bitmap id.
*/
-int CaIconDescriptionPrivate::bitmapId() const
+QString CaIconDescriptionPrivate::skinId() const
{
- return mBitmapId;
-}
-
-/*!
- Sets bitmap id.
- \param bitmap id.
- */
-void CaIconDescriptionPrivate::setBitmapId(int bitmapId)
-{
- mBitmapId = bitmapId;
+ return mSkinId;
}
/*!
- Returns icon mask id.
- \retval icon mask id.
+ Sets skin id.
+ \param skinId skin id.
*/
-int CaIconDescriptionPrivate::maskId() const
+void CaIconDescriptionPrivate::setSkinId(const QString &skinId)
{
- return mMaskId;
-}
-
-/*!
- Sets icon mask id.
- \param maskId icon mask id.
- */
-void CaIconDescriptionPrivate::setMaskId(int maskId)
-{
- mMaskId = maskId;
+ mSkinId = skinId;
}
/*!
- Returns skin major id.
- \retval skin major id.
+ Returns icon application id.
+ \retval icon application id.
*/
-int CaIconDescriptionPrivate::skinMajorId() const
+QString CaIconDescriptionPrivate::applicationId() const
{
- return mSkinMajorId;
+ return mApplicationId;
}
/*!
- Sets skin major id.
- \param id skin major id.
+ Sets icon application id.
+ \param applicationId icon application id.
*/
-void CaIconDescriptionPrivate::setSkinMajorId(int id)
+void CaIconDescriptionPrivate::setApplicationId(const QString &applicationId)
{
- mSkinMajorId = id;
+ mApplicationId = applicationId;
}
-/*!
- Returns skin minor id.
- \retval skin minor id.
- */
-int CaIconDescriptionPrivate::skinMinorId() const
-{
- return mSkinMinorId;
-}
-
-/*!
- Sets skin minor id.
- \param skin minor id.
- */
-void CaIconDescriptionPrivate::setSkinMinorId(int id)
-{
- mSkinMinorId = id;
-}
/*!
Sets icon id.