Changes: Icon IDs update according meegotouchtheme

RevBy: TuomasK
Details: some icons has changed the name, old invalid IDs stayed in code and sometimes cause problems..

5 files changed, 50 insertions, 50 deletions

diff --git a/benchmarks/mt_mbutton/mt_mbutton.cpp b/benchmarks/mt_mbutton/mt_mbutton.cpp
index 24e23faa..206b0729 100644
--- a/benchmarks/mt_mbutton/mt_mbutton.cpp
+++ b/benchmarks/mt_mbutton/mt_mbutton.cpp
@@ -46,8 +46,8 @@ void Mt_MButton::initTestCase()
 
     warmupButton = new MButton();
     warmupButton->setText("text");
-    warmupButton->setIconID("Icon-home");
-    warmupButton->setToggledIconID("Icon-close");
+    warmupButton->setIconID("icon-m-framework-home");
+    warmupButton->setToggledIconID("icon-m-framework-close");
 
     warmupButton->setGeometry(QRectF(0, 0, W, H));
 
@@ -96,10 +96,10 @@ void Mt_MButton::memoryMButtonView_data()
 
     QTest::newRow("Empty") << W << H << "MButtonView" << "" << "" << "";
     QTest::newRow("Text") << W << H << "MButtonView" << "" << "" << "ButtonText";
-    QTest::newRow("Icon") << W << H << "MButtonView" << "Icon-home" << "" << "";
-    QTest::newRow("Text&Icon") << W << H << "MButtonView" << "Icon-home" << "" << "ButtonText";
-    QTest::newRow("Toggle") << W << H << "MButtonView" << "Icon-home" << "Icon-close" << "";
-    QTest::newRow("Toggle&Text") << W << H << "MButtonView" << "Icon-home" << "Icon-close" << "ButtonText";
+    QTest::newRow("Icon") << W << H << "MButtonView" << "icon-m-framework-home" << "" << "";
+    QTest::newRow("Text&Icon") << W << H << "MButtonView" << "icon-m-framework-home" << "" << "ButtonText";
+    QTest::newRow("Toggle") << W << H << "MButtonView" << "icon-m-framework-home" << "icon-m-framework-close" << "";
+    QTest::newRow("Toggle&Text") << W << H << "MButtonView" << "icon-m-framework-home" << "icon-m-framework-close" << "ButtonText";
 }
 
 void Mt_MButton::memoryMButtonDefaultView()
@@ -120,10 +120,10 @@ void Mt_MButton::memoryMButtonDefaultView_data()
 
     QTest::newRow("Empty") << W << H << "MButtonDefaultView" << "" << "" << "";
     QTest::newRow("Text") << W << H << "MButtonDefaultView" << "" << "" << "ButtonText";
-    QTest::newRow("Icon") << W << H << "MButtonDefaultView" << "Icon-home" << "" << "";
-    QTest::newRow("Text&Icon") << W << H << "MButtonDefaultView" << "Icon-home" << "" << "ButtonText";
-    QTest::newRow("Toggle") << W << H << "MButtonDefaultView" << "Icon-home" << "Icon-close" << "";
-    QTest::newRow("Toggle&Text") << W << H << "MButtonDefaultView" << "Icon-home" << "Icon-close" << "ButtonText";
+    QTest::newRow("Icon") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "" << "";
+    QTest::newRow("Text&Icon") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "" << "ButtonText";
+    QTest::newRow("Toggle") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "icon-m-framework-close" << "";
+    QTest::newRow("Toggle&Text") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "icon-m-framework-close" << "ButtonText";
 }
 
 void Mt_MButton::memoryMButtonIconView()
@@ -144,25 +144,25 @@ void Mt_MButton::memoryMButtonIconView_data()
 
     QTest::newRow("Empty") << W << H << "MButtonIconView" << "" << "" << "";
     QTest::newRow("Text") << W << H << "MButtonIconView" << "" << "" << "ButtonText";
-    QTest::newRow("Icon") << W << H << "MButtonIconView" << "Icon-home" << "" << "";
-    QTest::newRow("Text&Icon") << W << H << "MButtonIconView" << "Icon-home" << "" << "ButtonText";
-    QTest::newRow("Toggle") << W << H << "MButtonIconView" << "Icon-home" << "Icon-close" << "";
-    QTest::newRow("Toggle&Text") << W << H << "MButtonIconView" << "Icon-home" << "Icon-close" << "ButtonText";
+    QTest::newRow("Icon") << W << H << "MButtonIconView" << "icon-m-framework-home" << "" << "";
+    QTest::newRow("Text&Icon") << W << H << "MButtonIconView" << "icon-m-framework-home" << "" << "ButtonText";
+    QTest::newRow("Toggle") << W << H << "MButtonIconView" << "icon-m-framework-home" << "icon-m-framework-close" << "";
+    QTest::newRow("Toggle&Text") << W << H << "MButtonIconView" << "icon-m-framework-home" << "icon-m-framework-close" << "ButtonText";
 }
 
 void Mt_MButton::memoryMButtonViewTimeline()
 {
-    memoryBenchmark(W, H, "MButtonView", "Icon-home", "Icon-close", "ButtonText");
+    memoryBenchmark(W, H, "MButtonView", "icon-m-framework-home", "icon-m-framework-close", "ButtonText");
 }
 
 void Mt_MButton::memoryMButtonViewDefaultViewTimeline()
 {
-    memoryBenchmark(W, H, "MButtonDefaultView", "Icon-home", "Icon-close", "ButtonText");
+    memoryBenchmark(W, H, "MButtonDefaultView", "icon-m-framework-home", "icon-m-framework-close", "ButtonText");
 }
 
 void Mt_MButton::memoryMButtonViewIconViewTimeline()
 {
-    memoryBenchmark(W, H, "MButtonIconView", "Icon-home", "Icon-close", "ButtonText");
+    memoryBenchmark(W, H, "MButtonIconView", "icon-m-framework-home", "icon-m-framework-close", "ButtonText");
 }
 
 void Mt_MButton::memoryBenchmark(qint32 width, qint32 height, const QString &view, const QString &icon1, const QString &icon2, const QString &text)
diff --git a/benchmarks/mt_mtoolbar/mt_mtoolbar.cpp b/benchmarks/mt_mtoolbar/mt_mtoolbar.cpp
index 0fc3d358..0b1b0476 100644
--- a/benchmarks/mt_mtoolbar/mt_mtoolbar.cpp
+++ b/benchmarks/mt_mtoolbar/mt_mtoolbar.cpp
@@ -47,7 +47,7 @@ void Mt_MToolBar::initTestCase()
         QCoreApplication::processEvents();
     }
     for (int i = 0; i < 1; ++i)
-        toolbar->addAction(new MAction("Icon-music", "Action " + QString::number(i), this));
+        toolbar->addAction(new MAction("icon-l-music", "Action " + QString::number(i), this));
     toolbar->paint(&painter, NULL);
     delete toolbar;
 }
@@ -63,7 +63,7 @@ void Mt_MToolBar::memoryBenchmark_data()
     QTest::addColumn<qint32>("height");
     QTest::addColumn<QString>("icon");
 
-    QTest::newRow("300x60") << 300 << 60 << "Icon-music";
+    QTest::newRow("300x60") << 300 << 60 << "icon-l-music";
 }
 
 void Mt_MToolBar::memoryBenchmark()
diff --git a/benchmarks/pt_mbutton/pt_mbutton.cpp b/benchmarks/pt_mbutton/pt_mbutton.cpp
index 6fc6e8b8..e3327287 100644
--- a/benchmarks/pt_mbutton/pt_mbutton.cpp
+++ b/benchmarks/pt_mbutton/pt_mbutton.cpp
@@ -45,8 +45,8 @@ void Pt_MButton::initTestCase()
     QPainter painter(&pixmap);
     MButton warmupButton;
     warmupButton.setText("text");
-    warmupButton.setIconID("Icon-home");
-    warmupButton.setToggledIconID("Icon-close");
+    warmupButton.setIconID("icon-m-framework-home");
+    warmupButton.setToggledIconID("icon-m-framework-close");
     warmupButton.setGeometry(QRectF(0, 0, W, H));
     while (MTheme::hasPendingRequests()) {
         usleep(10000);
@@ -83,24 +83,24 @@ void Pt_MButton::paintPerformance_data()
 
     QTest::newRow("250x100 MButtonView") << W << H << "MButtonView" << "" << "" << "";
     QTest::newRow("250x100 MButtonView Text") << W << H << "MButtonView" << "" << "" << "ButtonText";
-    QTest::newRow("250x100 MButtonView Icon") << W << H << "MButtonView" << "Icon-home" << "" << "";
-    QTest::newRow("250x100 MButtonView Icon Text") << W << H << "MButtonView" << "Icon-home" << "" << "ButtonText";
-    QTest::newRow("250x100 MButtonView Icon ToggledIcon") << W << H << "MButtonView" << "Icon-home" << "Icon-close" << "";
-    QTest::newRow("250x100 MButtonView Icon ToggledIcon Text") << W << H << "MButtonView" << "Icon-home" << "Icon-close" << "ButtonText";
+    QTest::newRow("250x100 MButtonView Icon") << W << H << "MButtonView" << "icon-m-framework-home" << "" << "";
+    QTest::newRow("250x100 MButtonView Icon Text") << W << H << "MButtonView" << "icon-m-framework-home" << "" << "ButtonText";
+    QTest::newRow("250x100 MButtonView Icon ToggledIcon") << W << H << "MButtonView" << "icon-m-framework-home" << "icon-m-framework-close" << "";
+    QTest::newRow("250x100 MButtonView Icon ToggledIcon Text") << W << H << "MButtonView" << "icon-m-framework-home" << "icon-m-framework-close" << "ButtonText";
 
     QTest::newRow("250x100 MButtonDefaultView") << W << H << "MButtonDefaultView" << "" << "" << "";
     QTest::newRow("250x100 MButtonDefaultView Text") << W << H << "MButtonDefaultView" << "" << "" << "ButtonText";
-    QTest::newRow("250x100 MButtonDefaultView Icon") << W << H << "MButtonDefaultView" << "Icon-home" << "" << "";
-    QTest::newRow("250x100 MButtonDefaultView Icon Text") << W << H << "MButtonDefaultView" << "Icon-home" << "" << "ButtonText";
-    QTest::newRow("250x100 MButtonDefaultView Icon ToggledIcon") << W << H << "MButtonDefaultView" << "Icon-home" << "Icon-close" << "";
-    QTest::newRow("250x100 MButtonDefaultView Icon ToggledIcon Text") << W << H << "MButtonDefaultView" << "Icon-home" << "Icon-close" << "ButtonText";
+    QTest::newRow("250x100 MButtonDefaultView Icon") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "" << "";
+    QTest::newRow("250x100 MButtonDefaultView Icon Text") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "" << "ButtonText";
+    QTest::newRow("250x100 MButtonDefaultView Icon ToggledIcon") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "icon-m-framework-close" << "";
+    QTest::newRow("250x100 MButtonDefaultView Icon ToggledIcon Text") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "icon-m-framework-close" << "ButtonText";
 
     QTest::newRow("250x100 MButtonIconView") << W << H << "MButtonIconView" << "" << "" << "";
     QTest::newRow("250x100 MButtonIconView Text") << W << H << "MButtonIconView" << "" << "" << "ButtonText";
-    QTest::newRow("250x100 MButtonIconView Icon") << W << H << "MButtonIconView" << "Icon-home" << "" << "";
-    QTest::newRow("250x100 MButtonIconView Icon Text") << W << H << "MButtonIconView" << "Icon-home" << "" << "ButtonText";
-    QTest::newRow("250x100 MButtonIconView Icon ToggledIcon") << W << H << "MButtonIconView" << "Icon-home" << "Icon-close" << "";
-    QTest::newRow("250x100 MButtonIconView Icon ToggledIcon Text") << W << H << "MButtonIconView" << "Icon-home" << "Icon-close" << "ButtonText";
+    QTest::newRow("250x100 MButtonIconView Icon") << W << H << "MButtonIconView" << "icon-m-framework-home" << "" << "";
+    QTest::newRow("250x100 MButtonIconView Icon Text") << W << H << "MButtonIconView" << "icon-m-framework-home" << "" << "ButtonText";
+    QTest::newRow("250x100 MButtonIconView Icon ToggledIcon") << W << H << "MButtonIconView" << "icon-m-framework-home" << "icon-m-framework-close" << "";
+    QTest::newRow("250x100 MButtonIconView Icon ToggledIcon Text") << W << H << "MButtonIconView" << "icon-m-framework-home" << "icon-m-framework-close" << "ButtonText";
 }
 
 void Pt_MButton::paintPerformance()
@@ -183,24 +183,24 @@ void Pt_MButton::toggledPaintPerformance_data()
 
     QTest::newRow("250x100 MButtonView") << W << H << "MButtonView" << "" << "" << "";
     QTest::newRow("250x100 MButtonView Text") << W << H << "MButtonView" << "" << "" << "ButtonText";
-    QTest::newRow("250x100 MButtonView Icon") << W << H << "MButtonView" << "Icon-home" << "" << "";
-    QTest::newRow("250x100 MButtonView Icon Text") << W << H << "MButtonView" << "Icon-home" << "" << "ButtonText";
-    QTest::newRow("250x100 MButtonView Icon ToggledIcon") << W << H << "MButtonView" << "Icon-home" << "Icon-close" << "";
-    QTest::newRow("250x100 MButtonView Icon ToggledIcon Text") << W << H << "MButtonView" << "Icon-home" << "Icon-close" << "ButtonText";
+    QTest::newRow("250x100 MButtonView Icon") << W << H << "MButtonView" << "icon-m-framework-home" << "" << "";
+    QTest::newRow("250x100 MButtonView Icon Text") << W << H << "MButtonView" << "icon-m-framework-home" << "" << "ButtonText";
+    QTest::newRow("250x100 MButtonView Icon ToggledIcon") << W << H << "MButtonView" << "icon-m-framework-home" << "icon-m-framework-close" << "";
+    QTest::newRow("250x100 MButtonView Icon ToggledIcon Text") << W << H << "MButtonView" << "icon-m-framework-home" << "icon-m-framework-close" << "ButtonText";
 
     QTest::newRow("250x100 MButtonDefaultView") << W << H << "MButtonDefaultView" << "" << "" << "";
     QTest::newRow("250x100 MButtonDefaultView Text") << W << H << "MButtonDefaultView" << "" << "" << "ButtonText";
-    QTest::newRow("250x100 MButtonDefaultView Icon") << W << H << "MButtonDefaultView" << "Icon-home" << "" << "";
-    QTest::newRow("250x100 MButtonDefaultView Icon Text") << W << H << "MButtonDefaultView" << "Icon-home" << "" << "ButtonText";
-    QTest::newRow("250x100 MButtonDefaultView Icon ToggledIcon") << W << H << "MButtonDefaultView" << "Icon-home" << "Icon-close" << "";
-    QTest::newRow("250x100 MButtonDefaultView Icon ToggledIcon Text") << W << H << "MButtonDefaultView" << "Icon-home" << "Icon-close" << "ButtonText";
+    QTest::newRow("250x100 MButtonDefaultView Icon") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "" << "";
+    QTest::newRow("250x100 MButtonDefaultView Icon Text") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "" << "ButtonText";
+    QTest::newRow("250x100 MButtonDefaultView Icon ToggledIcon") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "icon-m-framework-close" << "";
+    QTest::newRow("250x100 MButtonDefaultView Icon ToggledIcon Text") << W << H << "MButtonDefaultView" << "icon-m-framework-home" << "icon-m-framework-close" << "ButtonText";
 
     QTest::newRow("250x100 MButtonIconView") << W << H << "MButtonIconView" << "" << "" << "";
     QTest::newRow("250x100 MButtonIconView Text") << W << H << "MButtonIconView" << "" << "" << "ButtonText";
-    QTest::newRow("250x100 MButtonIconView Icon") << W << H << "MButtonIconView" << "Icon-home" << "" << "";
-    QTest::newRow("250x100 MButtonIconView Icon Text") << W << H << "MButtonIconView" << "Icon-home" << "" << "ButtonText";
-    QTest::newRow("250x100 MButtonIconView Icon ToggledIcon") << W << H << "MButtonIconView" << "Icon-home" << "Icon-close" << "";
-    QTest::newRow("250x100 MButtonIconView Icon ToggledIcon Text") << W << H << "MButtonIconView" << "Icon-home" << "Icon-close" << "ButtonText";
+    QTest::newRow("250x100 MButtonIconView Icon") << W << H << "MButtonIconView" << "icon-m-framework-home" << "" << "";
+    QTest::newRow("250x100 MButtonIconView Icon Text") << W << H << "MButtonIconView" << "icon-m-framework-home" << "" << "ButtonText";
+    QTest::newRow("250x100 MButtonIconView Icon ToggledIcon") << W << H << "MButtonIconView" << "icon-m-framework-home" << "icon-m-framework-close" << "";
+    QTest::newRow("250x100 MButtonIconView Icon ToggledIcon Text") << W << H << "MButtonIconView" << "icon-m-framework-home" << "icon-m-framework-close" << "ButtonText";
 }
 
 void Pt_MButton::toggledPaintPerformance()
diff --git a/benchmarks/pt_micontestcase/pt_micontestcase.cpp b/benchmarks/pt_micontestcase/pt_micontestcase.cpp
index 60608edc..da593277 100644
--- a/benchmarks/pt_micontestcase/pt_micontestcase.cpp
+++ b/benchmarks/pt_micontestcase/pt_micontestcase.cpp
@@ -75,13 +75,13 @@ void Pt_MButton::init()
     views[ this->currentViewIndex ] = new MButtonView(m_subject);
 
     m_subject->setView(views[ this->currentViewIndex ]);   // transfers ownership to controller
-    m_subject->setIconID("Icon-mute");
+    m_subject->setIconID("icon-m-telephony-ongoing-muted");
 
     views[ this->currentViewIndex ]->updateStyle();
     views[ this->currentViewIndex ]->styleUpdated();
 
     // if this is paced above 'updateStyle()', then get a core dump; if above setView(), then no icon
-    //m_subject->setIconID("Icon-mute");
+    //m_subject->setIconID("icon-m-telephony-ongoing-muted");
     qDebug() << "ICONID" << m_subject->iconID();
 
     sleep(1);
diff --git a/benchmarks/pt_mslider/pt_mslider.cpp b/benchmarks/pt_mslider/pt_mslider.cpp
index 565f824e..ea4a50a3 100644
--- a/benchmarks/pt_mslider/pt_mslider.cpp
+++ b/benchmarks/pt_mslider/pt_mslider.cpp
@@ -58,9 +58,9 @@ void Pt_MSlider::createController()
 {
     this->m_subject = new MSlider();
 
-    this->m_subject->setMinLabelIconID("Icon-contacts");
-    this->m_subject->setMaxLabelIconID("Icon-browser");
-    this->m_subject->setHandleLabelIconID("Icon-music");
+    this->m_subject->setMinLabelIconID("icon-l-contacts");
+    this->m_subject->setMaxLabelIconID("icon-l-browser");
+    this->m_subject->setHandleLabelIconID("icon-l-music");
     this->m_subject->setMaxLabel("Max");
     this->m_subject->setHandleLabel("Thumb");
     this->m_subject->setMinLabelVisible(true);