Changes: Make some examples compile again

RevBy: TrustMe
Details: I wonder how many of them are obsolete.

7 files changed, 7 insertions, 9 deletions

diff --git a/examples/apscanner/apscannerpage.cpp b/examples/apscanner/apscannerpage.cpp
index 5c1b7632..52b87786 100644
--- a/examples/apscanner/apscannerpage.cpp
+++ b/examples/apscanner/apscannerpage.cpp
@@ -36,7 +36,7 @@ APScannerPage::~APScannerPage()
 
 void APScannerPage::createContent()
 {
-    DuiWidget *panel = centralWidget();
+    QGraphicsWidget *panel = centralWidget();
     DuiLayout *layout = new DuiLayout(panel);
     layout->setAnimation(NULL);
     panel->setLayout(layout);
diff --git a/examples/containertest/main.cpp b/examples/containertest/main.cpp
index e428aaff..16ffbda6 100644
--- a/examples/containertest/main.cpp
+++ b/examples/containertest/main.cpp
@@ -77,7 +77,7 @@ int main(int argc, char **argv)
 
     // main layout
     QGraphicsLinearLayout *main = new QGraphicsLinearLayout(Qt::Vertical, NULL);
-    DuiWidget *panel = p.centralWidget();
+    QGraphicsWidget *panel = p.centralWidget();
     panel->setLayout(main);
 
     // QT hbox
diff --git a/examples/layout/two_columns/twocolumns.cpp b/examples/layout/two_columns/twocolumns.cpp
index e5a0cb21..61c8c93a 100644
--- a/examples/layout/two_columns/twocolumns.cpp
+++ b/examples/layout/two_columns/twocolumns.cpp
@@ -25,7 +25,6 @@
 #include <DuiApplicationPage>
 #include <DuiApplicationWindow>
 #include <DuiButton>
-#include <DuiImage>
 #include <DuiLabel>
 #include <DuiLayout>
 #include <DuiLinearLayoutPolicy>
diff --git a/examples/lifecycle/containerpage.cpp b/examples/lifecycle/containerpage.cpp
index da6cbace..63526df3 100644
--- a/examples/lifecycle/containerpage.cpp
+++ b/examples/lifecycle/containerpage.cpp
@@ -39,7 +39,7 @@ void ContainerPage::createContent()
 {
     DuiApplicationPage::createContent();
 
-    DuiWidget *panel = centralWidget();
+    QGraphicsWidget *panel = centralWidget();
 
     QGraphicsLinearLayout *vbox = new QGraphicsLinearLayout(Qt::Vertical);
     panel->setLayout(vbox);
diff --git a/examples/lifecycle/mainpage.cpp b/examples/lifecycle/mainpage.cpp
index 405222bf..3442d64a 100644
--- a/examples/lifecycle/mainpage.cpp
+++ b/examples/lifecycle/mainpage.cpp
@@ -105,7 +105,7 @@ void MainPage::indicatorHidden()
 
 void MainPage::buttonPress()
 {
-    anotherPage->setEscapeButtonMode(DuiEscapeButtonPanelModel::BackMode);
+    anotherPage->setEscapeMode(DuiApplicationPageModel::EscapeManualBack);
     connect(anotherPage, SIGNAL(backButtonClicked()), this, SLOT(handleBackItemClick()));
     m_shownPage = anotherPage;
     anotherPage->appear();
@@ -113,7 +113,7 @@ void MainPage::buttonPress()
 
 void MainPage::button2Press()
 {
-    canvasPage->setEscapeButtonMode(DuiEscapeButtonPanelModel::BackMode);
+    canvasPage->setEscapeMode(DuiApplicationPageModel::EscapeManualBack);
     connect(canvasPage, SIGNAL(backButtonClicked()), this, SLOT(handleBackItemClick()));
     m_shownPage = canvasPage;
     canvasPage->appear();
diff --git a/examples/separatorTest/SeparatorTestPage.cpp b/examples/separatorTest/SeparatorTestPage.cpp
index 8c8f7862..992529eb 100644
--- a/examples/separatorTest/SeparatorTestPage.cpp
+++ b/examples/separatorTest/SeparatorTestPage.cpp
@@ -23,7 +23,6 @@
 #include <DuiButton>
 #include <DuiContainer>
 #include <DuiGridLayoutPolicy>
-#include <DuiImage>
 #include <DuiLocale>
 #include <DuiLabel>
 #include <DuiLayout>
@@ -45,7 +44,7 @@ SeparatorTestPage::~SeparatorTestPage()
 void SeparatorTestPage::createContent()
 {
     DuiApplicationPage::createContent();
-    DuiWidget *panel = centralWidget();
+    QGraphicsWidget *panel = centralWidget();
 
     DuiLayout *layout = new DuiLayout(panel);
     panel->setLayout(layout);
diff --git a/examples/testwidget/testwidget.cpp b/examples/testwidget/testwidget.cpp
index 4cc0bb71..a303abdd 100644
--- a/examples/testwidget/testwidget.cpp
+++ b/examples/testwidget/testwidget.cpp
@@ -28,7 +28,7 @@
 #include "testwidget.h"
 
 TestWidget::TestWidget(DuiWidget *parent) :
-    DuiWidgetController(NULL, new TestWidgetModel)
+    DuiWidgetController(new TestWidgetModel, parent)
 {
 
 }