-rw-r--r-- | examples/main-tab/simple.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
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 | |||
@@ -1,65 +1,67 @@ | |||
1 | #include <qaction.h> // action | 1 | #include <qaction.h> // action |
2 | #include <qmenubar.h> // menubar | 2 | #include <qmenubar.h> // menubar |
3 | #include <qtoolbar.h> // toolbar | 3 | #include <qtoolbar.h> // toolbar |
4 | #include <qlabel.h> // a label | 4 | #include <qlabel.h> // a label |
5 | #include <qpushbutton.h> // the header file for the QPushButton | 5 | #include <qpushbutton.h> // the header file for the QPushButton |
6 | #include <qlayout.h> | 6 | #include <qlayout.h> |
7 | 7 | ||
8 | #include <qpe/qpeapplication.h> // the QPEApplication | 8 | #include <qpe/qpeapplication.h> // the QPEApplication |
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 | ||
17 | /* | 17 | /* |
18 | * implementation of simple | 18 | * implementation of simple |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /* | 21 | /* |
22 | * The factory is used for quicklaunching | 22 | * The factory is used for quicklaunching |
23 | * It needs a constructor ( c'tor ) with at least QWidget, const char* and WFlags as parameter and a static QString appName() matching the TARGET of the .pro | 23 | * It needs a constructor ( c'tor ) with at least QWidget, const char* and WFlags as parameter and a static QString appName() matching the TARGET of the .pro |
24 | * | 24 | * |
25 | * Depending on the global quick launch setting this will create | 25 | * Depending on the global quick launch setting this will create |
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 ) |
32 | : QMainWindow( parent, name, fl ) { | 34 | : QMainWindow( parent, name, fl ) { |
33 | setCaption(tr("My MainWindow") ); | 35 | setCaption(tr("My MainWindow") ); |
34 | 36 | ||
35 | initUI(); | 37 | initUI(); |
36 | 38 | ||
37 | 39 | ||
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 ); |
45 | 47 | ||
46 | Simple1 *simple1 = new Simple1( this ); | 48 | Simple1 *simple1 = new Simple1( this ); |
47 | tab->addTab( simple1, "new", tr("Simple1") ); | 49 | tab->addTab( simple1, "new", tr("Simple1") ); |
48 | tab->setCurrentTab( tr("Simple1") ); | 50 | tab->setCurrentTab( tr("Simple1") ); |
49 | 51 | ||
50 | Simple2 *simple2 = new Simple2( this ); | 52 | Simple2 *simple2 = new Simple2( this ); |
51 | tab->addTab( simple2, "trash", tr("Simple2") ); | 53 | tab->addTab( simple2, "trash", tr("Simple2") ); |
52 | 54 | ||
53 | m_oldCurrent = simple1; | 55 | m_oldCurrent = simple1; |
54 | 56 | ||
55 | connect(m_fire, SIGNAL(activated() ), | 57 | connect(m_fire, SIGNAL(activated() ), |
56 | simple1, SLOT(slotFire() ) ); | 58 | simple1, SLOT(slotFire() ) ); |
57 | } | 59 | } |
58 | 60 | ||
59 | MainWindow::~MainWindow() { | 61 | MainWindow::~MainWindow() { |
60 | // again nothing to delete because Qt takes care | 62 | // again nothing to delete because Qt takes care |
61 | } | 63 | } |
62 | 64 | ||
63 | 65 | ||
64 | void MainWindow::setDocument( const QString& /*str*/ ) { | 66 | void MainWindow::setDocument( const QString& /*str*/ ) { |
65 | } | 67 | } |