-rw-r--r-- | examples/main-tab/config.in | 2 | ||||
-rw-r--r-- | examples/main-tab/example.pro | 2 | ||||
-rw-r--r-- | examples/main-tab/simple.cpp | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/examples/main-tab/config.in b/examples/main-tab/config.in index e021d59..3a67bcb 100644 --- a/examples/main-tab/config.in +++ b/examples/main-tab/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config MAIN_TAB_EXAMPLE | 1 | config MAIN_TAB_EXAMPLE |
2 | boolean "Mainwindow with OTabWidget example" | 2 | boolean "Mainwindow with OTabWidget example" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && EXAMPLES && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && EXAMPLES && LIBOPIEUI2 |
diff --git a/examples/main-tab/example.pro b/examples/main-tab/example.pro index 3cafc20..87abf22 100644 --- a/examples/main-tab/example.pro +++ b/examples/main-tab/example.pro | |||
@@ -12,6 +12,6 @@ DEPENDPATH += $(OPIEDIR)/include | |||
12 | 12 | ||
13 | 13 | ||
14 | # we now also include opie | 14 | # we now also include opie |
15 | LIBS += -lqpe -lopie | 15 | LIBS += -lqpe -lopieui2 |
16 | 16 | ||
17 | include ( $(OPIEDIR)/include.pro ) | 17 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/examples/main-tab/simple.cpp b/examples/main-tab/simple.cpp index c5a6d5a..7edb557 100644 --- a/examples/main-tab/simple.cpp +++ b/examples/main-tab/simple.cpp | |||
@@ -9,8 +9,8 @@ | |||
9 | #include <qpe/resource.h> | 9 | #include <qpe/resource.h> |
10 | #include <qpe/sound.h> | 10 | #include <qpe/sound.h> |
11 | 11 | ||
12 | #include <opie/oapplicationfactory.h> // a template + macro to save the main method and allow quick launching | 12 | #include <opie2/oapplicationfactory.h> // a template + macro to save the main method and allow quick launching |
13 | #include <opie/otabwidget.h> | 13 | #include <opie2/otabwidget.h> |
14 | 14 | ||
15 | #include "simple.h" | 15 | #include "simple.h" |
16 | 16 | ||
@@ -26,6 +26,8 @@ | |||
26 | * either a main method or one for our component plugin system | 26 | * either a main method or one for our component plugin system |
27 | */ | 27 | */ |
28 | 28 | ||
29 | /* The OApplicationFactory is in the Opie::Core namespace */ | ||
30 | using namespace Opie::Core; | ||
29 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) | 31 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) |
30 | 32 | ||
31 | MainWindow::MainWindow(QWidget *parent, const char* name, WFlags fl ) | 33 | MainWindow::MainWindow(QWidget *parent, const char* name, WFlags fl ) |
@@ -38,7 +40,7 @@ MainWindow::MainWindow(QWidget *parent, const char* name, WFlags fl ) | |||
38 | /* | 40 | /* |
39 | * Tab widget as central | 41 | * Tab widget as central |
40 | */ | 42 | */ |
41 | OTabWidget *tab = new OTabWidget(this); | 43 | Opie::Ui::OTabWidget *tab = new Opie::Ui::OTabWidget(this); |
42 | connect(tab, SIGNAL(currentChanged(QWidget*) ), | 44 | connect(tab, SIGNAL(currentChanged(QWidget*) ), |
43 | this, SLOT( slotCurrentChanged(QWidget*) ) ); | 45 | this, SLOT( slotCurrentChanged(QWidget*) ) ); |
44 | setCentralWidget( tab ); | 46 | setCentralWidget( tab ); |