author | mickeyl <mickeyl> | 2003-12-07 14:06:21 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-07 14:06:21 (UTC) |
commit | 4518f62746143246d29eb9f08030e241ac33eeb7 (patch) (unidiff) | |
tree | beda04d2c1ddadefd4d0dc2bb18774a15da03bf2 /noncore/apps/opie-bartender | |
parent | c648101ca50a9782911b58b5158b31e1d0427ab3 (diff) | |
download | opie-4518f62746143246d29eb9f08030e241ac33eeb7.zip opie-4518f62746143246d29eb9f08030e241ac33eeb7.tar.gz opie-4518f62746143246d29eb9f08030e241ac33eeb7.tar.bz2 |
s/QPEToolBar/QToolBar:
- remove usage of deprecated classses
- makes it easier to migrate to OToolBar in the future
-rw-r--r-- | noncore/apps/opie-bartender/bartender.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/opie-bartender/bartender.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/noncore/apps/opie-bartender/bartender.cpp b/noncore/apps/opie-bartender/bartender.cpp index 3a0d8d1..8c4ee93 100644 --- a/noncore/apps/opie-bartender/bartender.cpp +++ b/noncore/apps/opie-bartender/bartender.cpp | |||
@@ -18,7 +18,7 @@ | |||
18 | #include "bac.h" | 18 | #include "bac.h" |
19 | 19 | ||
20 | #include <qpe/qpetoolbar.h> | 20 | #include <qpe/qpetoolbar.h> |
21 | #include <qpe/qpemenubar.h> | 21 | #include <qmenubar.h> |
22 | #include <opie/colorpopupmenu.h> | 22 | #include <opie/colorpopupmenu.h> |
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | #include <qpe/resource.h> | 24 | #include <qpe/resource.h> |
@@ -63,7 +63,7 @@ Bartender::Bartender( QWidget* parent, const char* name, WFlags fl ) | |||
63 | 63 | ||
64 | setCaption( tr( "Bartender" ) ); | 64 | setCaption( tr( "Bartender" ) ); |
65 | 65 | ||
66 | ToolBar1 = new QPEToolBar( this, "ToolBar1" ); | 66 | ToolBar1 = new QToolBar( this, "ToolBar1" ); |
67 | ToolBar1->setFixedHeight(22); | 67 | ToolBar1->setFixedHeight(22); |
68 | layout->addMultiCellWidget( ToolBar1, 0, 0, 0, 4 ); | 68 | layout->addMultiCellWidget( ToolBar1, 0, 0, 0, 4 ); |
69 | 69 | ||
diff --git a/noncore/apps/opie-bartender/bartender.h b/noncore/apps/opie-bartender/bartender.h index 69cfa82..df1af76 100644 --- a/noncore/apps/opie-bartender/bartender.h +++ b/noncore/apps/opie-bartender/bartender.h | |||
@@ -22,7 +22,7 @@ class QHBoxLayout; | |||
22 | class QGridLayout; | 22 | class QGridLayout; |
23 | class QListView; | 23 | class QListView; |
24 | class QListViewItem; | 24 | class QListViewItem; |
25 | class QPEToolBar; | 25 | class QToolBar; |
26 | 26 | ||
27 | class Bartender : public QMainWindow | 27 | class Bartender : public QMainWindow |
28 | { | 28 | { |
@@ -32,7 +32,7 @@ public: | |||
32 | Bartender( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 32 | Bartender( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
33 | ~Bartender(); | 33 | ~Bartender(); |
34 | 34 | ||
35 | QPEToolBar* ToolBar1; | 35 | QToolBar* ToolBar1; |
36 | QListView* DrinkView; | 36 | QListView* DrinkView; |
37 | QFile dbFile; | 37 | QFile dbFile; |
38 | public slots: | 38 | public slots: |