Changes: Don't use deprecated MSceneWindow::appear(policy)

RevBy: TrustMe
Details: Use either MSceneWindow::appear(window, policy) or
MSceneWindow::appear(scene, policy)

34 files changed, 41 insertions, 41 deletions

diff --git a/benchmarks/pt_minimalmapplication/pt_minimalmapplication.cpp b/benchmarks/pt_minimalmapplication/pt_minimalmapplication.cpp
index df9c458c..8b210c59 100644
--- a/benchmarks/pt_minimalmapplication/pt_minimalmapplication.cpp
+++ b/benchmarks/pt_minimalmapplication/pt_minimalmapplication.cpp
@@ -95,7 +95,7 @@ void Pt_minimalmapplication::createMApplicationPage()
 void Pt_minimalmapplication::pageAppear()
 {
     if (appearType == "appear") {
-        MY_QBENCHMARK_ONCE(page->appear();)
+        MY_QBENCHMARK_ONCE(page->appear(window);)
     } else {
         MY_QBENCHMARK_ONCE(window->sceneManager()->appearSceneWindowNow(page);)
     }
diff --git a/demos/widgetsgallery/maincategorypage.cpp b/demos/widgetsgallery/maincategorypage.cpp
index af32fcc8..dc3f23d1 100644
--- a/demos/widgetsgallery/maincategorypage.cpp
+++ b/demos/widgetsgallery/maincategorypage.cpp
@@ -102,5 +102,5 @@ void MainCategoryPage::galleryPageItemClicked(const QModelIndex &index)
 {
     TemplatePage *page = static_cast<TemplatePage *>(index.data(MainPage::Page).value<void *>());
     page->setParent(this);
-    page->appear();
+    page->appear(scene());
 }
diff --git a/demos/widgetsgallery/mainpage.cpp b/demos/widgetsgallery/mainpage.cpp
index c1541cac..6464eecd 100644
--- a/demos/widgetsgallery/mainpage.cpp
+++ b/demos/widgetsgallery/mainpage.cpp
@@ -381,7 +381,7 @@ void MainPage::handleListItemClick()
 void MainPage::showPage(MApplicationPage *page)
 {
     if (page) {
-        page->appear();
+        page->appear(scene());
         shownPage = page;
     }
 }
@@ -392,7 +392,7 @@ void MainPage::showLanguageSettingsPage()
         languageSettingsPage = new LanguagePage();
         languageSettingsPage->setParent(this);
     }
-    languageSettingsPage->appear();
+    languageSettingsPage->appear(scene());
 }
 
 TemplatePage *MainPage::findPageByTimedemoTitle(const QString& title) const
diff --git a/demos/widgetsgallery/panningbenchmark.cpp b/demos/widgetsgallery/panningbenchmark.cpp
index 5e15ed8c..6566339d 100644
--- a/demos/widgetsgallery/panningbenchmark.cpp
+++ b/demos/widgetsgallery/panningbenchmark.cpp
@@ -46,7 +46,7 @@ void PanningBenchmark::start()
     MApplication::activeWindow()->setOrientationAngleLocked(true);
     if (!applicationPage->isOnDisplay()) {
         connect(applicationPage, SIGNAL(appeared()), this, SLOT(waitBeforePanning()));
-        applicationPage->appear();
+        applicationPage->appear(MApplication::activeWindow());
         verifyAppearanceTimer->start(5000);
     } else {
         waitBeforePanning();
diff --git a/demos/widgetsgallery/staticpagebenchmark.cpp b/demos/widgetsgallery/staticpagebenchmark.cpp
index 5e68f18d..dca95783 100644
--- a/demos/widgetsgallery/staticpagebenchmark.cpp
+++ b/demos/widgetsgallery/staticpagebenchmark.cpp
@@ -28,7 +28,7 @@ void StaticPageBenchmark::start()
     MApplication::activeWindow()->setOrientationAngleLocked(true);
     if (!applicationPage->isOnDisplay()) {
         connect(applicationPage, SIGNAL(appeared()), this, SLOT(stabilizeFps()));
-        applicationPage->appear();
+        applicationPage->appear(MApplication::activeWindow());
         verifyAppearanceTimer->start(5000);
     } else {
         QTimer::singleShot(0, this, SLOT(stabilizeFps()));
diff --git a/examples/apscanner/main.cpp b/examples/apscanner/main.cpp
index 09c51d64..2d609d9d 100644
--- a/examples/apscanner/main.cpp
+++ b/examples/apscanner/main.cpp
@@ -28,7 +28,7 @@ int main(int argc, char **argv)
     window.show();
 
     APScannerPage page;
-    page.appear();
+    page.appear(&window);
 
     return app.exec();
 }
diff --git a/examples/calculator/calculator.cpp b/examples/calculator/calculator.cpp
index 1f57bdab..5e94a9de 100644
--- a/examples/calculator/calculator.cpp
+++ b/examples/calculator/calculator.cpp
@@ -39,7 +39,7 @@ int main(int argc, char **argv)
     CalculatorWidget *calculatorWidget = new CalculatorWidget;
 
     page.setCentralWidget(calculatorWidget);
-    page.appear();
+    page.appear(&window);
     window.show();
     return app.exec();
 }
diff --git a/examples/chaining/chainingexampleapp1/main.cpp b/examples/chaining/chainingexampleapp1/main.cpp
index 8524929d..553a4444 100644
--- a/examples/chaining/chainingexampleapp1/main.cpp
+++ b/examples/chaining/chainingexampleapp1/main.cpp
@@ -13,7 +13,7 @@ int main(int argc, char** argv)
     w.show();
 
     MApplicationPage p;
-    p.appear();
+    p.appear(&w);
 
     MButton b(p.centralWidget());
     b.setText("IMAGE");
diff --git a/examples/containertest/main.cpp b/examples/containertest/main.cpp
index cf735378..6c53f125 100644
--- a/examples/containertest/main.cpp
+++ b/examples/containertest/main.cpp
@@ -73,7 +73,7 @@ int main(int argc, char **argv)
     MApplicationWindow w;
     w.show();
     MApplicationPage p;
-    p.appear();
+    p.appear(&w);
 
     // main layout
     QGraphicsLinearLayout *main = new QGraphicsLinearLayout(Qt::Vertical, NULL);
diff --git a/examples/focus/main.cpp b/examples/focus/main.cpp
index 2d489d19..c7d6afa1 100644
--- a/examples/focus/main.cpp
+++ b/examples/focus/main.cpp
@@ -48,7 +48,7 @@ int main(int argc, char **argv)
     w.show();
 
     MyPage p;
-    p.appear();
+    p.appear(&w);
 
     return app.exec();
 }
diff --git a/examples/gestures/main.cpp b/examples/gestures/main.cpp
index db9917a6..fcb115c7 100644
--- a/examples/gestures/main.cpp
+++ b/examples/gestures/main.cpp
@@ -38,7 +38,7 @@ int main(int argc, char **argv)
     w.show();
 
     MyPage p;
-    p.appear();
+    p.appear(&w);
 
     p.grabKeyboard(); // Forcing all keyboard events to the page
 
diff --git a/examples/helloworld/main.cpp b/examples/helloworld/main.cpp
index b32d91ba..3623119b 100644
--- a/examples/helloworld/main.cpp
+++ b/examples/helloworld/main.cpp
@@ -41,7 +41,7 @@ int main(int argc, char **argv)
        can add your application's contents. An application can have
        any number of pages with transitions between them */
     MApplicationPage p;
-    p.appear();
+    p.appear(&w);
 
     /* Let's add a simple push button to our page */
     MButton b(p.centralWidget()); /* The (optional) constructor parameter
diff --git a/examples/imtoolbar/main.cpp b/examples/imtoolbar/main.cpp
index c5bad585..c35bea02 100644
--- a/examples/imtoolbar/main.cpp
+++ b/examples/imtoolbar/main.cpp
@@ -38,7 +38,7 @@ int main(int argc, char **argv)
 
     // Create application page and make it visible.
     ImToolbarPage page;
-    page.appear();
+    page.appear(&window);
 
     return application.exec();
 }
diff --git a/examples/layout/hidden_widgets/hidden_widgets.cpp b/examples/layout/hidden_widgets/hidden_widgets.cpp
index 76fb7c05..e30974a3 100644
--- a/examples/layout/hidden_widgets/hidden_widgets.cpp
+++ b/examples/layout/hidden_widgets/hidden_widgets.cpp
@@ -53,7 +53,7 @@ int main(int argc, char **argv)
 
     /* Attach the layout to the page */
     page.centralWidget()->setLayout(layout);
-    page.appear();
+    page.appear(&window);
     window.show();
     return app.exec();
 }
diff --git a/examples/layout/layout_inside_layout/layout_inside_layout.cpp b/examples/layout/layout_inside_layout/layout_inside_layout.cpp
index 7c2d601f..5a95094d 100644
--- a/examples/layout/layout_inside_layout/layout_inside_layout.cpp
+++ b/examples/layout/layout_inside_layout/layout_inside_layout.cpp
@@ -68,7 +68,7 @@ int main(int argc, char **argv)
 
     /* Attach the layout to the page */
     page.centralWidget()->setLayout(layout);
-    page.appear();
+    page.appear(&window);
     window.show();
     return app.exec();
 }
diff --git a/examples/layout/mflowlayoutpolicy/mflowlayoutpolicy.cpp b/examples/layout/mflowlayoutpolicy/mflowlayoutpolicy.cpp
index b6d9dadb..bc6ffdcc 100644
--- a/examples/layout/mflowlayoutpolicy/mflowlayoutpolicy.cpp
+++ b/examples/layout/mflowlayoutpolicy/mflowlayoutpolicy.cpp
@@ -57,7 +57,7 @@ int main(int argc, char **argv)
 
     /* Attach the layout to the page */
     page.centralWidget()->setLayout(layout);
-    page.appear();
+    page.appear(&window);
     window.show();
     return app.exec();
 }
diff --git a/examples/layout/mfreestylelayoutpolicy/mfreestylelayoutpolicy.cpp b/examples/layout/mfreestylelayoutpolicy/mfreestylelayoutpolicy.cpp
index 4d7c0724..e2e3451a 100644
--- a/examples/layout/mfreestylelayoutpolicy/mfreestylelayoutpolicy.cpp
+++ b/examples/layout/mfreestylelayoutpolicy/mfreestylelayoutpolicy.cpp
@@ -43,7 +43,7 @@ int main(int argc, char **argv)
     MApplicationPage page;
     /* Attach the layout to the page */
     page.centralWidget()->setLayout(layout);
-    page.appear();
+    page.appear(&window);
     window.show();
 
     int n = 20;
diff --git a/examples/layout/mgridlayoutpolicy/mgridlayoutpolicy.cpp b/examples/layout/mgridlayoutpolicy/mgridlayoutpolicy.cpp
index 36c0e906..dcdf2884 100644
--- a/examples/layout/mgridlayoutpolicy/mgridlayoutpolicy.cpp
+++ b/examples/layout/mgridlayoutpolicy/mgridlayoutpolicy.cpp
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
 
     /* Attach the layout to the page */
     page.centralWidget()->setLayout(layout);
-    page.appear();
+    page.appear(&window);
     window.show();
     return app.exec();
 }
diff --git a/examples/layout/mlinearlayoutpolicy/mlinearlayoutpolicy.cpp b/examples/layout/mlinearlayoutpolicy/mlinearlayoutpolicy.cpp
index fd8f47dd..b8a51421 100644
--- a/examples/layout/mlinearlayoutpolicy/mlinearlayoutpolicy.cpp
+++ b/examples/layout/mlinearlayoutpolicy/mlinearlayoutpolicy.cpp
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
 
     /* Attach the layout to the page */
     page.centralWidget()->setLayout(layout);
-    page.appear();
+    page.appear(&window);
     window.show();
     return app.exec();
 }
diff --git a/examples/layout/multiplepolicies/multiplepolicies.cpp b/examples/layout/multiplepolicies/multiplepolicies.cpp
index 80b784fa..67957ea8 100644
--- a/examples/layout/multiplepolicies/multiplepolicies.cpp
+++ b/examples/layout/multiplepolicies/multiplepolicies.cpp
@@ -58,7 +58,7 @@ int main(int argc, char **argv)
     layout->setLandscapePolicy(linearPolicy);
     layout->setPortraitPolicy(flowPolicy);
 
-    page.appear();
+    page.appear(&window);
     window.show();
     return app.exec();
 }
diff --git a/examples/layout/qgraphicsgridlayout/qgraphicsgridlayout.cpp b/examples/layout/qgraphicsgridlayout/qgraphicsgridlayout.cpp
index 7dcb9d4b..5c8aec00 100644
--- a/examples/layout/qgraphicsgridlayout/qgraphicsgridlayout.cpp
+++ b/examples/layout/qgraphicsgridlayout/qgraphicsgridlayout.cpp
@@ -48,7 +48,7 @@ int main(int argc, char **argv)
 
     /* Attach the layout to the page */
     page.centralWidget()->setLayout(layout);
-    page.appear();
+    page.appear(&window);
     window.show();
     return app.exec();
 }
diff --git a/examples/layout/qgraphicslayout/qgraphicslayout.cpp b/examples/layout/qgraphicslayout/qgraphicslayout.cpp
index b5dc64f2..1d34feb3 100644
--- a/examples/layout/qgraphicslayout/qgraphicslayout.cpp
+++ b/examples/layout/qgraphicslayout/qgraphicslayout.cpp
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
     secondRow->addItem(new MButton("Button 2"));
     secondRow->addStretch();
 
-    page.appear();
+    page.appear(&window);
     window.show();
     return app.exec();
 }
diff --git a/examples/layout/qgraphicslinearlayout/qgraphicslinearlayout.cpp b/examples/layout/qgraphicslinearlayout/qgraphicslinearlayout.cpp
index 201334b3..e620cbf1 100644
--- a/examples/layout/qgraphicslinearlayout/qgraphicslinearlayout.cpp
+++ b/examples/layout/qgraphicslinearlayout/qgraphicslinearlayout.cpp
@@ -48,7 +48,7 @@ int main(int argc, char **argv)
 
     /* Attach the layout to the page */
     page.centralWidget()->setLayout(layout);
-    page.appear();
+    page.appear(&window);
     window.show();
     return app.exec();
 }
diff --git a/examples/layout/two_columns/twocolumns.cpp b/examples/layout/two_columns/twocolumns.cpp
index bff0df07..c7f8d880 100644
--- a/examples/layout/two_columns/twocolumns.cpp
+++ b/examples/layout/two_columns/twocolumns.cpp
@@ -67,7 +67,7 @@ int main(int argc, char **argv)
     nameLayout->setPreferredWidth(1);
     labelLayout->setPreferredWidth(1);
 
-    page.appear();
+    page.appear(&window);
     window.show();
 
     return app.exec();
diff --git a/examples/lifecycle/main.cpp b/examples/lifecycle/main.cpp
index 764de27d..7b8ae249 100644
--- a/examples/lifecycle/main.cpp
+++ b/examples/lifecycle/main.cpp
@@ -32,7 +32,7 @@ int main(int argc, char **argv)
     window.show();
 
     MainPage mainPage;
-    mainPage.appear();
+    mainPage.appear(&window);
 
     // Run activateWidgets() here to setup things if app is NOT prestarted now
     if (!app.isPrestarted()) {
diff --git a/examples/multipleinstances/main.cpp b/examples/multipleinstances/main.cpp
index ce4950dc..6222099d 100644
--- a/examples/multipleinstances/main.cpp
+++ b/examples/multipleinstances/main.cpp
@@ -61,7 +61,7 @@ int main(int argc, char **argv)
        can add your application's contents. An application can have
        any number of pages with transitions between them */
     MApplicationPage p;
-    p.appear();
+    p.appear(&w);
 
     /* Let's add a simple push button to our page */
     MButton b(p.centralWidget()); /* The (optional) constructor parameter
diff --git a/examples/separatorTest/main.cpp b/examples/separatorTest/main.cpp
index 17def978..6e24cfc4 100644
--- a/examples/separatorTest/main.cpp
+++ b/examples/separatorTest/main.cpp
@@ -42,7 +42,7 @@ int main(int argc, char **argv)
        any number of pages with transitions between them */
     SeparatorTestPage p;
 
-    p.appear();
+    p.appear(&w);
     w.show();
 
     return app.exec();
diff --git a/examples/testwidget/main.cpp b/examples/testwidget/main.cpp
index d808326b..67b45401 100644
--- a/examples/testwidget/main.cpp
+++ b/examples/testwidget/main.cpp
@@ -44,7 +44,7 @@ int main(int argc, char **argv)
 
     // Create application page and make it visible.
     MApplicationPage page;
-    page.appear();
+    page.appear(&window);
 
     // Load widget style from CSS file.
     MTheme::loadCSS("testwidgetstyle.css");
diff --git a/examples/trackergrid/main.cpp b/examples/trackergrid/main.cpp
index 5e601099..001a69b2 100644
--- a/examples/trackergrid/main.cpp
+++ b/examples/trackergrid/main.cpp
@@ -41,7 +41,7 @@ int main(int argc, char **argv)
        can add your application's contents. An application can have
        any number of pages with transitions between them */
     TrackerGridPage p;
-    p.appear();
+    p.appear(&w);
 
     w.show();
 
diff --git a/examples/tutorial/tutorial_main_step_03.cpp b/examples/tutorial/tutorial_main_step_03.cpp
index c0d27089..57e8266d 100644
--- a/examples/tutorial/tutorial_main_step_03.cpp
+++ b/examples/tutorial/tutorial_main_step_03.cpp
@@ -11,7 +11,7 @@ int main(int argc, char **argv)
 
     page.setTitle("My First Page");
     page.setCentralWidget(new MLabel("Hello World!"));
-    page.appear();
+    page.appear(&window);
 
     window.show();
 
diff --git a/tests/ut_mapplicationmenu/ut_mapplicationmenu.cpp b/tests/ut_mapplicationmenu/ut_mapplicationmenu.cpp
index 1b72e274..cd18f4ca 100644
--- a/tests/ut_mapplicationmenu/ut_mapplicationmenu.cpp
+++ b/tests/ut_mapplicationmenu/ut_mapplicationmenu.cpp
@@ -239,7 +239,7 @@ void Ut_MApplicationMenu::testClear()
 
 void Ut_MApplicationMenu::testEventsPassingThrough()
 {
-    m_subject->appear();
+    m_subject->appear(appWin);
     // The event should be swallowed if it is not triggering any action.
     QGraphicsSceneMouseEvent mousePressEvent(QEvent::GraphicsSceneMousePress);
     QVERIFY(mousePressEvent.isAccepted());
@@ -281,7 +281,7 @@ void Ut_MApplicationMenu::testRotation()
     /* Rotate the scene by 90 degrees and back again. We should find that the
      * preferred size hasn't changed overall.  We call processEvents to check that there
      * are no outstanding layouting etc */
-    m_subject->appear();
+    m_subject->appear(appWin);
     MApplication::activeWindow()->setOrientationAngle(M::Angle0);
     QSizeF preferredSizeLandscape = m_subject->preferredSize();
     app->processEvents();
diff --git a/tests/ut_mapplicationpage/ut_mapplicationpage.cpp b/tests/ut_mapplicationpage/ut_mapplicationpage.cpp
index 50c1f82a..d7191bb0 100644
--- a/tests/ut_mapplicationpage/ut_mapplicationpage.cpp
+++ b/tests/ut_mapplicationpage/ut_mapplicationpage.cpp
@@ -235,7 +235,7 @@ void Ut_MApplicationPage::testUpdatingWindowTitleWithChangingPageTitle()
     QString title3_longest("Multiple length variants title");
     QString title4;
 
-    m_subject->appear();
+    m_subject->appear(appWin);
 
     m_subject->setTitle(title);
     QCOMPARE(appWin->windowTitle(), title);
@@ -249,7 +249,7 @@ void Ut_MApplicationPage::testUpdatingWindowTitleWithChangingPageTitle()
 
 void Ut_MApplicationPage::testIfPositionIndicatorGeometryFollowsExposedRect()
 {
-    m_subject->appear();
+    m_subject->appear(appWin);
     QCOMPARE(m_subject->pannableViewport()->positionIndicator()->geometry(), m_subject->exposedContentRect());
 }
 
diff --git a/tests/ut_mdialog/ut_mdialog.cpp b/tests/ut_mdialog/ut_mdialog.cpp
index 920f5bee..3fa4e19c 100644
--- a/tests/ut_mdialog/ut_mdialog.cpp
+++ b/tests/ut_mdialog/ut_mdialog.cpp
@@ -321,14 +321,14 @@ void Ut_MDialog::dismissDialog()
 
 void Ut_MDialog::testRotation()
 {
-    dialog->appear();
-    MApplication::activeWindow()->setOrientationAngle(M::Angle0);
+    dialog->appear(appWin);
+    appWin->setOrientationAngle(M::Angle0);
     QSizeF preferredSizeLandscape = dialog->preferredSize();
-    MApplication::activeWindow()->setOrientationAngle(M::Angle90);
+    appWin->setOrientationAngle(M::Angle90);
     QSizeF preferredSizePortrait = dialog->preferredSize();
-    MApplication::activeWindow()->setOrientationAngle(M::Angle0);
+    appWin->setOrientationAngle(M::Angle0);
     QCOMPARE(dialog->preferredSize(), preferredSizeLandscape);
-    MApplication::activeWindow()->setOrientationAngle(M::Angle90);
+    appWin->setOrientationAngle(M::Angle90);
     QCOMPARE(dialog->preferredSize(), preferredSizePortrait);
 }
 
diff --git a/tools/mapplicationextensiontester/mapplicationextensiontester.cpp b/tools/mapplicationextensiontester/mapplicationextensiontester.cpp
index 806d0f20..e4879446 100644
--- a/tools/mapplicationextensiontester/mapplicationextensiontester.cpp
+++ b/tools/mapplicationextensiontester/mapplicationextensiontester.cpp
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
     MApplicationWindow window;
     ApplicationExtensionPage page(argv[optind]);
     window.show();
-    page.appear();
+    page.appear(&window);
 
     return m_app.exec();
 }