Updated build for Harmattan.

[medard] / src / mainwindow.cpp

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index c82f413..f79476c 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 #include <MLayout>
 #include <MAction>
 #include <MWidgetAction>
@@ -30,7 +30,7 @@
 #include "aboutdialog.h"
 #include "mainwindow.h"
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 MainWindow::MainWindow(QGraphicsItem *parent) : MApplicationPage(parent)
 {
     m_downloader = new MedardDownloader();
@@ -128,7 +128,7 @@ MainWindow::~MainWindow()
     delete m_downloader;
 }
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 void MainWindow::setupUi()
 {
     setAttribute(Qt::WA_LockPortraitOrientation, true);
@@ -203,7 +203,7 @@ void MainWindow::setupUi()
 }
 #endif
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 void MainWindow::setupMenu()
 {
     QStringList forecastDomainList;
@@ -318,7 +318,7 @@ void MainWindow::loadSettings()
     int forecastType = settings.value("ForecastType").toInt();
 
     m_downloader->setForecastDomain((MedardDownloader::ForecastDomain) forecastDomain);
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
     m_forecastDomainComboBox->setCurrentIndex(forecastDomain);
 #else
     m_domainActionGroup->actions().at(forecastDomain)->setChecked(true);
@@ -415,7 +415,7 @@ void MainWindow::setForecastDateOffset(int offset)
 
 void MainWindow::seaLevelPreasureMenuClicked()
 {
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
     m_forecastTypeComboBox->setCurrentIndex(MedardDownloader::SeaLevelPressure);
 #endif
     setForecastType(tr("Sea Level Pressure"), MedardDownloader::SeaLevelPressure);
@@ -423,7 +423,7 @@ void MainWindow::seaLevelPreasureMenuClicked()
 
 void MainWindow::precipitationMenuClicked()
 {
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
     m_forecastTypeComboBox->setCurrentIndex(MedardDownloader::Precipitation);
 #endif
     setForecastType(tr("Precipitation"), MedardDownloader::Precipitation);
@@ -431,7 +431,7 @@ void MainWindow::precipitationMenuClicked()
 
 void MainWindow::windVelocityMenuClicked()
 {
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
     m_forecastTypeComboBox->setCurrentIndex(MedardDownloader::WindVelocity);
 #endif
     setForecastType(tr("Wind Velocity"), MedardDownloader::WindVelocity);
@@ -439,7 +439,7 @@ void MainWindow::windVelocityMenuClicked()
 
 void MainWindow::cloudinessMenuClicked()
 {
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
     m_forecastTypeComboBox->setCurrentIndex(MedardDownloader::Cloudiness);
 #endif
     setForecastType(tr("Cloudiness"), MedardDownloader::Cloudiness);
@@ -447,7 +447,7 @@ void MainWindow::cloudinessMenuClicked()
 
 void MainWindow::temperatureMenuClicked()
 {
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
     m_forecastTypeComboBox->setCurrentIndex(MedardDownloader::Temperature);
 #endif
     setForecastType(tr("Temperature"), MedardDownloader::Temperature);
@@ -456,7 +456,7 @@ void MainWindow::temperatureMenuClicked()
 void MainWindow::aboutMenuClicked()
 {
     AboutDialog *dialog = new AboutDialog();
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
     dialog->appear(MSceneWindow::DestroyWhenDismissed);
 #else
     dialog->exec();
@@ -491,7 +491,7 @@ void MainWindow::minusHourClicked()
     setForecastDateOffset(-1);
 }
 
-#ifdef Q_WS_MAEMO_6
+#ifdef MEEGO_EDITION_HARMATTAN
 void MainWindow::forecastDomainChanged(int index)
 {
     m_forecast->clearImage(false);