| author | zecke <zecke> | 2004-03-14 20:08:59 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2004-03-14 20:08:59 (UTC) |
| commit | 0d79c003839718ae70b3b997162044abd5c26bf6 (patch) (side-by-side diff) | |
| tree | 19708b041da3a09df8f3b571cd634a846f4ad6d7 /examples/main-tab | |
| parent | 05c8d999941989a97a581fb5822437034ec10fd7 (diff) | |
| download | opie-0d79c003839718ae70b3b997162044abd5c26bf6.zip opie-0d79c003839718ae70b3b997162044abd5c26bf6.tar.gz opie-0d79c003839718ae70b3b997162044abd5c26bf6.tar.bz2 | |
Update the Examples
| -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 @@ config MAIN_TAB_EXAMPLE boolean "Mainwindow with OTabWidget example" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && EXAMPLES && LIBOPIE + 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 # we now also include opie -LIBS += -lqpe -lopie +LIBS += -lqpe -lopieui2 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 @@ #include <qpe/resource.h> #include <qpe/sound.h> -#include <opie/oapplicationfactory.h> // a template + macro to save the main method and allow quick launching -#include <opie/otabwidget.h> +#include <opie2/oapplicationfactory.h> // a template + macro to save the main method and allow quick launching +#include <opie2/otabwidget.h> #include "simple.h" @@ -26,6 +26,8 @@ * either a main method or one for our component plugin system */ +/* The OApplicationFactory is in the Opie::Core namespace */ +using namespace Opie::Core; OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) MainWindow::MainWindow(QWidget *parent, const char* name, WFlags fl ) @@ -38,7 +40,7 @@ MainWindow::MainWindow(QWidget *parent, const char* name, WFlags fl ) /* * Tab widget as central */ - OTabWidget *tab = new OTabWidget(this); + Opie::Ui::OTabWidget *tab = new Opie::Ui::OTabWidget(this); connect(tab, SIGNAL(currentChanged(QWidget*) ), this, SLOT( slotCurrentChanged(QWidget*) ) ); setCentralWidget( tab ); |