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 /core/pim/datebook2 | |
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-- | core/pim/datebook2/mainwindow.cpp | 4 | ||||
-rw-r--r-- | core/pim/datebook2/mainwindow.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/pim/datebook2/mainwindow.cpp b/core/pim/datebook2/mainwindow.cpp index 7d436ae..be30415 100644 --- a/core/pim/datebook2/mainwindow.cpp +++ b/core/pim/datebook2/mainwindow.cpp | |||
@@ -1,24 +1,24 @@ | |||
1 | 1 | ||
2 | #include <qcopchannel_qws.h> | 2 | #include <qcopchannel_qws.h> |
3 | #include <qwidgetstack.h> | 3 | #include <qwidgetstack.h> |
4 | #include <qlabel.h> | 4 | #include <qlabel.h> |
5 | #include <qaction.h> | 5 | #include <qaction.h> |
6 | #include <qpopupmenu.h> | 6 | #include <qpopupmenu.h> |
7 | #include <qtimer.h> | 7 | #include <qtimer.h> |
8 | 8 | ||
9 | #include <qpe/qpeapplication.h> | 9 | #include <qpe/qpeapplication.h> |
10 | #include <qpe/ir.h> | 10 | #include <qpe/ir.h> |
11 | #include <qmenubar.h> | 11 | #include <qmenubar.h> |
12 | #include <qpe/qpetoolbar.h> | 12 | #include <qtoolbar.h> |
13 | #include <qpe/qpemessagebox.h> | 13 | #include <qpe/qpemessagebox.h> |
14 | #include <qpe/resource.h> | 14 | #include <qpe/resource.h> |
15 | 15 | ||
16 | #include "editor.h" | 16 | #include "editor.h" |
17 | #include "show.h" | 17 | #include "show.h" |
18 | #include "templatemanager.h" | 18 | #include "templatemanager.h" |
19 | #include "bookmanager.h" | 19 | #include "bookmanager.h" |
20 | #include "mainwindow.h" | 20 | #include "mainwindow.h" |
21 | 21 | ||
22 | 22 | ||
23 | using namespace Datebook; | 23 | using namespace Datebook; |
24 | 24 | ||
@@ -81,25 +81,25 @@ void MainWindow::edit() { | |||
81 | void MainWindow::edit( int uid ) { | 81 | void MainWindow::edit( int uid ) { |
82 | 82 | ||
83 | } | 83 | } |
84 | /* | 84 | /* |
85 | * init tool bars layout and so on | 85 | * init tool bars layout and so on |
86 | */ | 86 | */ |
87 | void MainWindow::initUI() { | 87 | void MainWindow::initUI() { |
88 | setToolBarsMovable( false ); | 88 | setToolBarsMovable( false ); |
89 | 89 | ||
90 | m_stack = new QWidgetStack( this ); | 90 | m_stack = new QWidgetStack( this ); |
91 | setCentralWidget( m_stack ); | 91 | setCentralWidget( m_stack ); |
92 | 92 | ||
93 | m_toolBar = new QPEToolBar( this ); | 93 | m_toolBar = new QToolBar( this ); |
94 | m_toolBar->setHorizontalStretchable( TRUE ); | 94 | m_toolBar->setHorizontalStretchable( TRUE ); |
95 | 95 | ||
96 | QMenuBar* mb = new QMenuBar( m_toolBar ); | 96 | QMenuBar* mb = new QMenuBar( m_toolBar ); |
97 | 97 | ||
98 | m_popView = new QPopupMenu( this ); | 98 | m_popView = new QPopupMenu( this ); |
99 | m_popSetting = new QPopupMenu( this ); | 99 | m_popSetting = new QPopupMenu( this ); |
100 | 100 | ||
101 | mb->insertItem( tr("View"), m_popView ); | 101 | mb->insertItem( tr("View"), m_popView ); |
102 | mb->insertItem( tr("Settings" ), m_popSetting ); | 102 | mb->insertItem( tr("Settings" ), m_popSetting ); |
103 | 103 | ||
104 | m_popTemplate = new QPopupMenu( this ); | 104 | m_popTemplate = new QPopupMenu( this ); |
105 | m_popTemplate->setCheckable( TRUE ); | 105 | m_popTemplate->setCheckable( TRUE ); |
diff --git a/core/pim/datebook2/mainwindow.h b/core/pim/datebook2/mainwindow.h index 3c22637..33ef864 100644 --- a/core/pim/datebook2/mainwindow.h +++ b/core/pim/datebook2/mainwindow.h | |||
@@ -4,25 +4,25 @@ | |||
4 | #include <qlist.h> | 4 | #include <qlist.h> |
5 | 5 | ||
6 | #include <opie/opimmainwindow.h> | 6 | #include <opie/opimmainwindow.h> |
7 | 7 | ||
8 | #include "descriptionmanager.h" | 8 | #include "descriptionmanager.h" |
9 | #include "locationmanager.h" | 9 | #include "locationmanager.h" |
10 | #include "templatemanager.h" | 10 | #include "templatemanager.h" |
11 | #include "view.h" | 11 | #include "view.h" |
12 | 12 | ||
13 | class QAction; | 13 | class QAction; |
14 | class QWidgetStack; | 14 | class QWidgetStack; |
15 | class QPopupMenu; | 15 | class QPopupMenu; |
16 | class QPEToolBar; | 16 | class QToolBar; |
17 | namespace Datebook { | 17 | namespace Datebook { |
18 | class BookManager; | 18 | class BookManager; |
19 | class Show; | 19 | class Show; |
20 | class Editor; | 20 | class Editor; |
21 | class MainWindow : public OPimMainWindow { | 21 | class MainWindow : public OPimMainWindow { |
22 | Q_OBJECT | 22 | Q_OBJECT |
23 | friend class Show; // to avoid QObject | 23 | friend class Show; // to avoid QObject |
24 | friend class View; // to avoid QObject | 24 | friend class View; // to avoid QObject |
25 | friend class Editor; | 25 | friend class Editor; |
26 | public: | 26 | public: |
27 | MainWindow(); | 27 | MainWindow(); |
28 | ~MainWindow(); | 28 | ~MainWindow(); |
@@ -53,25 +53,25 @@ namespace Datebook { | |||
53 | void doSetDocument( const QString& str ); | 53 | void doSetDocument( const QString& str ); |
54 | void flush(); | 54 | void flush(); |
55 | void reload(); | 55 | void reload(); |
56 | int create(); | 56 | int create(); |
57 | bool remove( int uid ); | 57 | bool remove( int uid ); |
58 | void beam( int uid ); | 58 | void beam( int uid ); |
59 | void show( int uid ); | 59 | void show( int uid ); |
60 | void edit( int uid ); | 60 | void edit( int uid ); |
61 | void edit(); | 61 | void edit(); |
62 | void add( const OPimRecord& ); | 62 | void add( const OPimRecord& ); |
63 | 63 | ||
64 | private: | 64 | private: |
65 | QPEToolBar* toolbar(); | 65 | QToolBar* toolbar(); |
66 | QPopupMenu* viewMenu(); | 66 | QPopupMenu* viewMenu(); |
67 | QPopupMenu* settingsMenu(); | 67 | QPopupMenu* settingsMenu(); |
68 | QPopupMenu* templateMenu(); | 68 | QPopupMenu* templateMenu(); |
69 | View* currentView(); | 69 | View* currentView(); |
70 | BookManager* manager(); | 70 | BookManager* manager(); |
71 | TemplateManager templateManager(); | 71 | TemplateManager templateManager(); |
72 | LocationManager locationManager(); | 72 | LocationManager locationManager(); |
73 | DescriptionManager descriptionManager(); | 73 | DescriptionManager descriptionManager(); |
74 | void setLocationManager( const LocationManager& ); | 74 | void setLocationManager( const LocationManager& ); |
75 | void setDescriptionManager( const DescriptionManager& ); | 75 | void setDescriptionManager( const DescriptionManager& ); |
76 | Show* eventShow(); | 76 | Show* eventShow(); |
77 | Editor* editor(); | 77 | Editor* editor(); |
@@ -82,25 +82,25 @@ namespace Datebook { | |||
82 | 82 | ||
83 | // friend of the view | 83 | // friend of the view |
84 | private: | 84 | private: |
85 | void viewPopup( int ); | 85 | void viewPopup( int ); |
86 | void viewAdd( const QDate& date ); | 86 | void viewAdd( const QDate& date ); |
87 | void viewAdd( const QDateTime&, const QDateTime& ); | 87 | void viewAdd( const QDateTime&, const QDateTime& ); |
88 | bool viewAP()const; | 88 | bool viewAP()const; |
89 | bool viewStartMonday()const; | 89 | bool viewStartMonday()const; |
90 | // off view show | 90 | // off view show |
91 | private: | 91 | private: |
92 | QList<View> m_view; // the Views.. not autoDelete | 92 | QList<View> m_view; // the Views.. not autoDelete |
93 | QWidgetStack* m_stack; | 93 | QWidgetStack* m_stack; |
94 | QPEToolBar *m_toolBar; | 94 | QToolBar *m_toolBar; |
95 | QPopupMenu* m_popView; | 95 | QPopupMenu* m_popView; |
96 | QPopupMenu* m_popSetting; | 96 | QPopupMenu* m_popSetting; |
97 | QPopupMenu* m_popTemplate; | 97 | QPopupMenu* m_popTemplate; |
98 | BookManager* m_manager; | 98 | BookManager* m_manager; |
99 | TemplateManager m_tempMan; | 99 | TemplateManager m_tempMan; |
100 | DescriptionManager m_descMan; | 100 | DescriptionManager m_descMan; |
101 | LocationManager m_locMan; | 101 | LocationManager m_locMan; |
102 | Show* m_show; | 102 | Show* m_show; |
103 | Editor* m_edit; | 103 | Editor* m_edit; |
104 | }; | 104 | }; |
105 | } | 105 | } |
106 | 106 | ||