Chanegs: HAVE_N900 macros renamed to M_OS_MAEMO5

RevBy: MaxW, Holger
Details: The features are platform specific and currently we have also Meego images for N900 so the old naming was misleading

8 files changed, 25 insertions, 25 deletions

diff --git a/src/corelib/core/mcomponentdata.cpp b/src/corelib/core/mcomponentdata.cpp
index 63574976..85db91d0 100644
--- a/src/corelib/core/mcomponentdata.cpp
+++ b/src/corelib/core/mcomponentdata.cpp
@@ -312,12 +312,12 @@ void MComponentDataPrivate::init(int &argc, char **argv, const QString &appIdent
     MTheme::ThemeService themeService = MTheme::AnyTheme;
 #endif
 
-#ifdef HAVE_N900
-    //#MS - default commadline: /usr/bin/widgetsgallery -target N900 -fullscreen
+#ifdef M_OS_MAEMO5
+    //#MS - default commandline: /usr/bin/widgetsgallery -target N900 -fullscreen
     // -graphicssystem native  this we have to set in themedaemon or before MApplication()
     fullScreen = true;
     deviceName = "N900";
-#endif //HAVE_N900
+#endif //M_OS_MAEMO5
 
     parseArguments(argc, argv, themeService);
 
diff --git a/src/corelib/events/mkeyboardstatetracker.cpp b/src/corelib/events/mkeyboardstatetracker.cpp
index 3254a1d1..7e965ec1 100644
--- a/src/corelib/events/mkeyboardstatetracker.cpp
+++ b/src/corelib/events/mkeyboardstatetracker.cpp
@@ -29,7 +29,7 @@ MKeyboardStateTracker *MKeyboardStateTrackerPrivate::tracker = 0;
 MKeyboardStateTrackerPrivate::MKeyboardStateTrackerPrivate(MKeyboardStateTracker *controller) :
 #ifdef HAVE_CONTEXTSUBSCRIBER
     keyboardOpenProperty("/maemo/InternalKeyboard/Open"),
-#elif defined(HAVE_N900)
+#elif defined(M_OS_MAEMO5)
     keyboardOpenConf("/system/osso/af/slide-open"),
 #endif
     q_ptr(controller),
@@ -39,7 +39,7 @@ MKeyboardStateTrackerPrivate::MKeyboardStateTrackerPrivate(MKeyboardStateTracker
     Q_Q(MKeyboardStateTracker);
     QObject::connect(&keyboardOpenProperty, SIGNAL(valueChanged()),
                      q, SIGNAL(stateChanged()));
-#elif defined(HAVE_N900)
+#elif defined(M_OS_MAEMO5)
     Q_Q(MKeyboardStateTracker);
     QObject::connect(&keyboardOpenConf, SIGNAL(valueChanged()),
                      q, SIGNAL(stateChanged()));
@@ -55,7 +55,7 @@ void MKeyboardStateTrackerPrivate::initContextSubscriber()
     keyboardOpenProperty.waitForSubscription();
     // TODO: use actual ContextProperty for present, which is still unready.
     present = true;
-#elif defined(HAVE_N900)
+#elif defined(M_OS_MAEMO5)
     present = true;
 #endif
 }
@@ -94,7 +94,7 @@ bool MKeyboardStateTracker::isOpen() const
     if (isPresent()) {
         val = d->keyboardOpenProperty.value().toBool();
     }
-#elif defined(HAVE_N900)
+#elif defined(M_OS_MAEMO5)
     Q_D(const MKeyboardStateTracker);
     val = d->keyboardOpenConf.value().toBool();
 #endif
diff --git a/src/corelib/events/mkeyboardstatetracker_p.h b/src/corelib/events/mkeyboardstatetracker_p.h
index 9912ed8d..4b3e829d 100644
--- a/src/corelib/events/mkeyboardstatetracker_p.h
+++ b/src/corelib/events/mkeyboardstatetracker_p.h
@@ -22,7 +22,7 @@
 
 #ifdef HAVE_CONTEXTSUBSCRIBER
 #include "contextproperty.h"
-#elif defined(HAVE_N900)
+#elif defined(M_OS_MAEMO5)
 #include "mgconfitem.h"
 #endif
 
@@ -37,7 +37,7 @@ protected:
     static MKeyboardStateTracker *tracker;
 #ifdef HAVE_CONTEXTSUBSCRIBER
     ContextProperty keyboardOpenProperty;
-#elif defined(HAVE_N900)
+#elif defined(M_OS_MAEMO5)
     MGConfItem keyboardOpenConf;
 #endif
     MKeyboardStateTracker *q_ptr;
diff --git a/src/corelib/painting/mscalableimage.cpp b/src/corelib/painting/mscalableimage.cpp
index bafc0a05..95a48b99 100644
--- a/src/corelib/painting/mscalableimage.cpp
+++ b/src/corelib/painting/mscalableimage.cpp
@@ -135,7 +135,7 @@ void MScalableImagePrivate::drawScalable9(int x, int y, int w, int h, QPainter *
             QPixmapCache::insert(key, scaled);
         } else {
             // caching isn't permitted for this case; scale and render direct to screen.
-            #if defined(HAVE_N900)
+            #if defined(M_OS_MAEMO5)
                 // don't use smooth pixmap transformation on the N900, as this
                 // decreases the performance
                 qDrawBorderPixmap(painter, QRect(x, y, w, h), margins, *m_image);
@@ -144,14 +144,14 @@ void MScalableImagePrivate::drawScalable9(int x, int y, int w, int h, QPainter *
                 painter->setRenderHint(QPainter::SmoothPixmapTransform);
                 qDrawBorderPixmap(painter, QRect(x, y, w, h), margins, *m_image);
                 painter->setRenderHint(QPainter::SmoothPixmapTransform, enabled);
-            #endif
+            #endif //defined(M_OS_MAEMO5)
         }
     }
 }
 
 void MScalableImagePrivate::drawScalable1(int x, int y, int w, int h, QPainter *painter) const
 {
-#if defined(HAVE_N900)
+#if defined(M_OS_MAEMO5)
     // don't use smooth pixmap transformation on the N900, as this
     // decreases the performance
     painter->drawPixmap(QRect(x, y, w, h), *m_image, m_image->rect());
@@ -168,7 +168,7 @@ void MScalableImagePrivate::drawScalable1(int x, int y, int w, int h, QPainter *
         painter->drawPixmap(QRect(x, y, w, h), *m_image, m_image->rect());
         painter->setRenderHint(QPainter::SmoothPixmapTransform, enabled);
     }
-#endif
+#endif //defined(M_OS_MAEMO5)
 }
 
 MScalableImage::MScalableImage()
diff --git a/src/corelib/widgets/mapplicationwindow.cpp b/src/corelib/widgets/mapplicationwindow.cpp
index b08c3485..bc719e89 100644
--- a/src/corelib/widgets/mapplicationwindow.cpp
+++ b/src/corelib/widgets/mapplicationwindow.cpp
@@ -168,12 +168,12 @@ void MApplicationWindowPrivate::init()
     appendMApplicationWindowTypeProperty();
 #endif
 
-#ifdef HAVE_N900
+#ifdef M_OS_MAEMO5
     q->connect(homeButtonPanel, SIGNAL(buttonClicked()), q, SLOT(_q_exitAppView()));
 #else
     q->connect(homeButtonPanel, SIGNAL(buttonClicked()), q, SLOT(closeMenu()));
     q->connect(homeButtonPanel, SIGNAL(buttonClicked()), q, SLOT(showMinimized()));
-#endif //HAVE_N900
+#endif //M_OS_MAEMO5
 
     q->connect(navigationBar, SIGNAL(viewmenuTriggered()),
                q, SLOT(openMenu()));
@@ -545,14 +545,14 @@ void MApplicationWindowPrivate::_q_navigationBarStateChanged(
     }
 }
 
-#ifdef HAVE_N900
+#ifdef M_OS_MAEMO5
 void MApplicationWindowPrivate::_q_exitAppView()
 {
     QDBusConnection bus = QDBusConnection::sessionBus();
     QDBusMessage message = QDBusMessage::createSignal("/", "com.nokia.hildon_desktop", "exit_app_view");
     bus.send(message);
 }
-#endif //HAVE_N900
+#endif //M_OS_MAEMO5
 
 void MApplicationWindowPrivate::manageActions()
 {
diff --git a/src/corelib/widgets/mapplicationwindow.h b/src/corelib/widgets/mapplicationwindow.h
index 313cdb12..69c1f06e 100644
--- a/src/corelib/widgets/mapplicationwindow.h
+++ b/src/corelib/widgets/mapplicationwindow.h
@@ -175,9 +175,9 @@ private:
 #ifdef HAVE_CONTEXTSUBSCRIBER
     Q_PRIVATE_SLOT(d_func(), void _q_updateStatusBarVisibility())
 #endif
-#ifdef HAVE_N900
+#ifdef M_OS_MAEMO5
     Q_PRIVATE_SLOT(d_func(), void _q_exitAppView())
-#endif
+#endif //M_OS_MAEMO5
     Q_PRIVATE_SLOT(d_func(), void _q_updatePageEscapeAuto())
     Q_PRIVATE_SLOT(d_func(), void _q_updatePageExposedContentRect())
     Q_PRIVATE_SLOT(d_func(), void _q_navigationBarStateChanged(MSceneWindow::SceneWindowState newState, MSceneWindow::SceneWindowState oldState))
diff --git a/src/corelib/widgets/mapplicationwindow_p.h b/src/corelib/widgets/mapplicationwindow_p.h
index 72b57f47..4548bd40 100644
--- a/src/corelib/widgets/mapplicationwindow_p.h
+++ b/src/corelib/widgets/mapplicationwindow_p.h
@@ -166,9 +166,9 @@ public:
     void _q_menuDisappeared();
     void _q_updateStatusBarVisibility();
     void _q_navigationBarStateChanged(MSceneWindow::SceneWindowState newState, MSceneWindow::SceneWindowState oldState);
-#ifdef HAVE_N900
+#ifdef M_OS_MAEMO5
     void _q_exitAppView();
-#endif
+#endif //M_OS_MAEMO5
     void _q_updatePageExposedContentRect();
     void _q_enablePaintUpdates();
 
diff --git a/src/corelib/widgets/mwindow.cpp b/src/corelib/widgets/mwindow.cpp
index ef8e1ed3..a9bafeda 100644
--- a/src/corelib/widgets/mwindow.cpp
+++ b/src/corelib/widgets/mwindow.cpp
@@ -112,9 +112,9 @@ void MWindowPrivate::init()
     // We do window decorations ourselves. Set env variable accordingly for
     // development purposes
 
-#ifdef HAVE_N900
+#ifdef M_OS_MAEMO5
     if ( !MApplication::fullScreen() ) {
-#endif
+#endif //M_OS_MAEMO5
 
     QString env = qgetenv("M_DECORATED");
     if (env.contains("0")) {
@@ -127,9 +127,9 @@ void MWindowPrivate::init()
     }
 #endif // __arm__
 
-#ifdef HAVE_N900
+#ifdef M_OS_MAEMO5
     }
-#endif
+#endif //M_OS_MAEMO5
 
 #endif // Q_WS_X11