aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel d'Andrada <daniel.dandrada@nokia.com>2010-03-30 11:18:17 +0300
committerDaniel d'Andrada <daniel.dandrada@nokia.com>2010-03-30 11:18:17 +0300
commitf78ed75e1875d8697dd82717c6b806e1635fb5b4 (patch)
tree6d697dec9796cad6c5022360a9dff025feaf952d
parent2481fc14cdac423a46c66c31da3446c39d4439eb (diff)
Changes: Updated examples to not use DuiSceneWindow::appearNow()
RevBy: TrustMe Details: That method was removed.
-rw-r--r--examples/calculator/calculator.cpp2
-rw-r--r--examples/chaining/chainingexampleapp1/main.cpp2
-rw-r--r--examples/chaining/chainingexampleapp2/main.cpp2
-rw-r--r--examples/containertest/main.cpp2
-rw-r--r--examples/helloworld/main.cpp4
-rw-r--r--examples/layout/duiflowlayoutpolicy/duiflowlayoutpolicy.cpp2
-rw-r--r--examples/layout/duifreestylelayoutpolicy/duifreestylelayoutpolicy.cpp2
-rw-r--r--examples/layout/duigridlayoutpolicy/duigridlayoutpolicy.cpp2
-rw-r--r--examples/layout/duilinearlayoutpolicy/duilinearlayoutpolicy.cpp2
-rw-r--r--examples/layout/hidden_widgets/hidden_widgets.cpp2
-rw-r--r--examples/layout/layout_inside_layout/layout_inside_layout.cpp2
-rw-r--r--examples/layout/multiplepolicies/multiplepolicies.cpp2
-rw-r--r--examples/layout/qgraphicsgridlayout/qgraphicsgridlayout.cpp2
-rw-r--r--examples/layout/qgraphicslayout/qgraphicslayout.cpp2
-rw-r--r--examples/layout/qgraphicslinearlayout/qgraphicslinearlayout.cpp2
-rw-r--r--examples/layout/two_columns/twocolumns.cpp3
-rw-r--r--examples/multipleinstances/main.cpp4
-rw-r--r--examples/separatorTest/main.cpp7
-rw-r--r--examples/trackergrid/main.cpp7
19 files changed, 23 insertions, 30 deletions
diff --git a/examples/calculator/calculator.cpp b/examples/calculator/calculator.cpp
index f4d9250c..91962f16 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();
window.show();
- page.appearNow();
return app.exec();
}
diff --git a/examples/chaining/chainingexampleapp1/main.cpp b/examples/chaining/chainingexampleapp1/main.cpp
index ba28c88c..4373374a 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();
DuiApplicationPage p;
- p.appearNow();
+ p.appear();
DuiButton b(p.centralWidget());
b.setText("IMAGE");
diff --git a/examples/chaining/chainingexampleapp2/main.cpp b/examples/chaining/chainingexampleapp2/main.cpp
index 39678fad..da017727 100644
--- a/examples/chaining/chainingexampleapp2/main.cpp
+++ b/examples/chaining/chainingexampleapp2/main.cpp
@@ -16,7 +16,7 @@ int main(int argc, char** argv)
w.show();
DuiApplicationPage p;
- p.appearNow();
+ p.appear();
DuiButton b(p.centralWidget());
b.setText("NO");
diff --git a/examples/containertest/main.cpp b/examples/containertest/main.cpp
index 16ffbda6..b9c2a91c 100644
--- a/examples/containertest/main.cpp
+++ b/examples/containertest/main.cpp
@@ -73,7 +73,7 @@ int main(int argc, char **argv)
DuiApplicationWindow w;
w.show();
DuiApplicationPage p;
- p.appearNow();
+ p.appear();
// main layout
QGraphicsLinearLayout *main = new QGraphicsLinearLayout(Qt::Vertical, NULL);
diff --git a/examples/helloworld/main.cpp b/examples/helloworld/main.cpp
index 3bb256be..93ded2e4 100644
--- a/examples/helloworld/main.cpp
+++ b/examples/helloworld/main.cpp
@@ -41,9 +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 */
DuiApplicationPage p;
- p.appearNow(); /* appearNow causes the page to be visible without
- a transition animation, which is recommended
- for the initial application page */
+ p.appear();
/* Let's add a simple push button to our page */
DuiButton b(p.centralWidget()); /* The (optional) constructor parameter
diff --git a/examples/layout/duiflowlayoutpolicy/duiflowlayoutpolicy.cpp b/examples/layout/duiflowlayoutpolicy/duiflowlayoutpolicy.cpp
index 5b0b69ae..75b5c2fb 100644
--- a/examples/layout/duiflowlayoutpolicy/duiflowlayoutpolicy.cpp
+++ b/examples/layout/duiflowlayoutpolicy/duiflowlayoutpolicy.cpp
@@ -57,7 +57,7 @@ int main(int argc, char **argv)
/* Attach the layout to the page */
page.centralWidget()->setLayout(layout);
+ page.appear();
window.show();
- page.appearNow();
return app.exec();
}
diff --git a/examples/layout/duifreestylelayoutpolicy/duifreestylelayoutpolicy.cpp b/examples/layout/duifreestylelayoutpolicy/duifreestylelayoutpolicy.cpp
index bf4c2261..2e34c46e 100644
--- a/examples/layout/duifreestylelayoutpolicy/duifreestylelayoutpolicy.cpp
+++ b/examples/layout/duifreestylelayoutpolicy/duifreestylelayoutpolicy.cpp
@@ -43,8 +43,8 @@ int main(int argc, char **argv)
DuiApplicationPage page;
/* Attach the layout to the page */
page.centralWidget()->setLayout(layout);
+ page.appear();
window.show();
- page.appearNow();
int n = 20;
for (int i = 0; i < n; ++i) {
diff --git a/examples/layout/duigridlayoutpolicy/duigridlayoutpolicy.cpp b/examples/layout/duigridlayoutpolicy/duigridlayoutpolicy.cpp
index e2fbdcaa..f096cff0 100644
--- a/examples/layout/duigridlayoutpolicy/duigridlayoutpolicy.cpp
+++ b/examples/layout/duigridlayoutpolicy/duigridlayoutpolicy.cpp
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
/* Attach the layout to the page */
page.centralWidget()->setLayout(layout);
+ page.appear();
window.show();
- page.appearNow();
return app.exec();
}
diff --git a/examples/layout/duilinearlayoutpolicy/duilinearlayoutpolicy.cpp b/examples/layout/duilinearlayoutpolicy/duilinearlayoutpolicy.cpp
index 6a31dde9..0c5e3d27 100644
--- a/examples/layout/duilinearlayoutpolicy/duilinearlayoutpolicy.cpp
+++ b/examples/layout/duilinearlayoutpolicy/duilinearlayoutpolicy.cpp
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
/* Attach the layout to the page */
page.centralWidget()->setLayout(layout);
+ page.appear();
window.show();
- page.appearNow();
return app.exec();
}
diff --git a/examples/layout/hidden_widgets/hidden_widgets.cpp b/examples/layout/hidden_widgets/hidden_widgets.cpp
index 4fa025ee..8db369a4 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();
window.show();
- page.appearNow();
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 23b4c972..68573a7d 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();
window.show();
- page.appearNow();
return app.exec();
}
diff --git a/examples/layout/multiplepolicies/multiplepolicies.cpp b/examples/layout/multiplepolicies/multiplepolicies.cpp
index 3f6bdb56..71636938 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();
window.show();
- page.appearNow();
return app.exec();
}
diff --git a/examples/layout/qgraphicsgridlayout/qgraphicsgridlayout.cpp b/examples/layout/qgraphicsgridlayout/qgraphicsgridlayout.cpp
index c3688efb..3a6635b8 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();
window.show();
- page.appearNow();
return app.exec();
}
diff --git a/examples/layout/qgraphicslayout/qgraphicslayout.cpp b/examples/layout/qgraphicslayout/qgraphicslayout.cpp
index 6c0887af..c93b64b9 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 DuiButton("Button 2"));
secondRow->addStretch();
+ page.appear();
window.show();
- page.appearNow();
return app.exec();
}
diff --git a/examples/layout/qgraphicslinearlayout/qgraphicslinearlayout.cpp b/examples/layout/qgraphicslinearlayout/qgraphicslinearlayout.cpp
index f8d85ffa..28371f4a 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();
window.show();
- page.appearNow();
return app.exec();
}
diff --git a/examples/layout/two_columns/twocolumns.cpp b/examples/layout/two_columns/twocolumns.cpp
index 61c8c93a..fafcf506 100644
--- a/examples/layout/two_columns/twocolumns.cpp
+++ b/examples/layout/two_columns/twocolumns.cpp
@@ -67,9 +67,8 @@ int main(int argc, char **argv)
nameLayout->setPreferredWidth(1);
labelLayout->setPreferredWidth(1);
- /* Attach the layout to the page */
+ page.appear();
window.show();
- page.appearNow();
return app.exec();
}
diff --git a/examples/multipleinstances/main.cpp b/examples/multipleinstances/main.cpp
index 51641378..20d12273 100644
--- a/examples/multipleinstances/main.cpp
+++ b/examples/multipleinstances/main.cpp
@@ -61,9 +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 */
DuiApplicationPage p;
- p.appearNow(); /* appearNow causes the page to be visible without
- a transition animation, which is recommended
- for the initial application page */
+ p.appear();
/* Let's add a simple push button to our page */
DuiButton b(p.centralWidget()); /* The (optional) constructor parameter
diff --git a/examples/separatorTest/main.cpp b/examples/separatorTest/main.cpp
index 26d04aa5..1ff1819a 100644
--- a/examples/separatorTest/main.cpp
+++ b/examples/separatorTest/main.cpp
@@ -36,15 +36,14 @@ int main(int argc, char **argv)
the Home and Back/Close framework controls, Navigation bar,
View menu and Toolbar components */
DuiApplicationWindow w;
- w.show();
/* Pages represent one "view" of an application, into which you
can add your application's contents. An application can have
any number of pages with transitions between them */
SeparatorTestPage p;
- p.appearNow(); /* appearNow causes the page to be visible without
- a transition animation, which is recommended
- for the initial application page */
+
+ p.appear();
+ w.show();
return app.exec();
}
diff --git a/examples/trackergrid/main.cpp b/examples/trackergrid/main.cpp
index 807c1cfc..7474e855 100644
--- a/examples/trackergrid/main.cpp
+++ b/examples/trackergrid/main.cpp
@@ -36,15 +36,14 @@ int main(int argc, char **argv)
the Home and Back/Close framework controls, Navigation bar,
View menu and Toolbar components */
DuiApplicationWindow w;
- w.show();
/* Pages represent one "view" of an application, into which you
can add your application's contents. An application can have
any number of pages with transitions between them */
TrackerGridPage p;
- p.appearNow(); /* appearNow causes the page to be visible without
- a transition animation, which is recommended
- for the initial application page */
+ p.appear();
+
+ w.show();
return app.exec();
}