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 | |
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/apps/embeddedkonsole/commandeditdialog.cpp | 2 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/konsole.cpp | 8 | ||||
-rw-r--r-- | core/apps/embeddedkonsole/konsole.h | 4 | ||||
-rw-r--r-- | core/apps/helpbrowser/helpbrowser.cpp | 6 | ||||
-rw-r--r-- | core/apps/textedit/textedit.cpp | 8 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 6 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 6 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.h | 4 | ||||
-rw-r--r-- | core/pim/datebook/datebook.cpp | 6 | ||||
-rw-r--r-- | core/pim/datebook2/mainwindow.cpp | 4 | ||||
-rw-r--r-- | core/pim/datebook2/mainwindow.h | 6 | ||||
-rw-r--r-- | core/pim/osearch/mainwindow.cpp | 6 | ||||
-rw-r--r-- | core/pim/osearch/mainwindow.h | 2 | ||||
-rw-r--r-- | core/pim/todo/mainwindow.cpp | 2 | ||||
-rw-r--r-- | core/pim/todo/quickeditimpl.cpp | 2 | ||||
-rw-r--r-- | core/pim/todo/quickeditimpl.h | 4 |
16 files changed, 38 insertions, 38 deletions
diff --git a/core/apps/embeddedkonsole/commandeditdialog.cpp b/core/apps/embeddedkonsole/commandeditdialog.cpp index 97b0a9e..dd35466 100644 --- a/core/apps/embeddedkonsole/commandeditdialog.cpp +++ b/core/apps/embeddedkonsole/commandeditdialog.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | #include "playlistselection.h" | 4 | #include "playlistselection.h" |
5 | #include <qstring.h> | 5 | #include <qstring.h> |
6 | #include <qpe/config.h> | 6 | #include <qpe/config.h> |
7 | #include <qpe/qpetoolbar.h> | 7 | #include <qtoolbar.h> |
8 | #include <qwidget.h> | 8 | #include <qwidget.h> |
9 | #include <qmenubar.h> | 9 | #include <qmenubar.h> |
10 | #include <qpe/resource.h> | 10 | #include <qpe/resource.h> |
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index d855d90..fff2f68 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <qdragobject.h> | 28 | #include <qdragobject.h> |
29 | #include <qobjectlist.h> | 29 | #include <qobjectlist.h> |
30 | #include <qtoolbutton.h> | 30 | #include <qtoolbutton.h> |
31 | #include <qpe/qpetoolbar.h> | 31 | #include <qtoolbar.h> |
32 | #include <qpushbutton.h> | 32 | #include <qpushbutton.h> |
33 | #include <qfontdialog.h> | 33 | #include <qfontdialog.h> |
34 | #include <qglobal.h> | 34 | #include <qglobal.h> |
@@ -282,7 +282,7 @@ void Konsole::init(const char* _pgm, QStrList & _args) | |||
282 | 282 | ||
283 | // create terminal toolbar //////////////////////////////////////////////// | 283 | // create terminal toolbar //////////////////////////////////////////////// |
284 | setToolBarsMovable( FALSE ); | 284 | setToolBarsMovable( FALSE ); |
285 | QPEToolBar *menuToolBar = new QPEToolBar( this ); | 285 | QToolBar *menuToolBar = new QToolBar( this ); |
286 | menuToolBar->setHorizontalStretchable( TRUE ); | 286 | menuToolBar->setHorizontalStretchable( TRUE ); |
287 | 287 | ||
288 | QMenuBar *menuBar = new QMenuBar( menuToolBar ); | 288 | QMenuBar *menuBar = new QMenuBar( menuToolBar ); |
@@ -351,7 +351,7 @@ void Konsole::init(const char* _pgm, QStrList & _args) | |||
351 | 351 | ||
352 | menuBar->insertItem( tr("Options"), configMenu ); | 352 | menuBar->insertItem( tr("Options"), configMenu ); |
353 | 353 | ||
354 | QPEToolBar *toolbar = new QPEToolBar( this ); | 354 | QToolBar *toolbar = new QToolBar( this ); |
355 | 355 | ||
356 | QAction *a; | 356 | QAction *a; |
357 | 357 | ||
@@ -377,7 +377,7 @@ void Konsole::init(const char* _pgm, QStrList & _args) | |||
377 | connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolbar ); | 377 | connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolbar ); |
378 | */ | 378 | */ |
379 | 379 | ||
380 | secondToolBar = new QPEToolBar( this ); | 380 | secondToolBar = new QToolBar( this ); |
381 | secondToolBar->setHorizontalStretchable( TRUE ); | 381 | secondToolBar->setHorizontalStretchable( TRUE ); |
382 | 382 | ||
383 | commonCombo = new QComboBox( secondToolBar ); | 383 | commonCombo = new QComboBox( secondToolBar ); |
diff --git a/core/apps/embeddedkonsole/konsole.h b/core/apps/embeddedkonsole/konsole.h index e9d0e4b..7d5a908 100644 --- a/core/apps/embeddedkonsole/konsole.h +++ b/core/apps/embeddedkonsole/konsole.h | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <qintdict.h> | 30 | #include <qintdict.h> |
31 | #include <qptrdict.h> | 31 | #include <qptrdict.h> |
32 | #include <qtabwidget.h> | 32 | #include <qtabwidget.h> |
33 | #include <qpe/qpetoolbar.h> | 33 | #include <qtoolbar.h> |
34 | #include <qcombobox.h> | 34 | #include <qcombobox.h> |
35 | #include <qcolor.h> | 35 | #include <qcolor.h> |
36 | 36 | ||
@@ -51,7 +51,7 @@ public: | |||
51 | Konsole(QWidget* parent = 0, const char* name = 0, WFlags fl = 0); | 51 | Konsole(QWidget* parent = 0, const char* name = 0, WFlags fl = 0); |
52 | ~Konsole(); | 52 | ~Konsole(); |
53 | void setColLin(int columns, int lines); | 53 | void setColLin(int columns, int lines); |
54 | QPEToolBar *secondToolBar; | 54 | QToolBar *secondToolBar; |
55 | void show(); | 55 | void show(); |
56 | void setColor(); | 56 | void setColor(); |
57 | int lastSelectedMenu; | 57 | int lastSelectedMenu; |
diff --git a/core/apps/helpbrowser/helpbrowser.cpp b/core/apps/helpbrowser/helpbrowser.cpp index ed1c165..6f84ae2 100644 --- a/core/apps/helpbrowser/helpbrowser.cpp +++ b/core/apps/helpbrowser/helpbrowser.cpp | |||
@@ -33,7 +33,7 @@ | |||
33 | #include <qpixmap.h> | 33 | #include <qpixmap.h> |
34 | #include <qpopupmenu.h> | 34 | #include <qpopupmenu.h> |
35 | #include <qmenubar.h> | 35 | #include <qmenubar.h> |
36 | #include <qpe/qpetoolbar.h> | 36 | #include <qtoolbar.h> |
37 | #include <qpe/qcopenvelope_qws.h> | 37 | #include <qpe/qcopenvelope_qws.h> |
38 | #include <qtoolbutton.h> | 38 | #include <qtoolbutton.h> |
39 | #include <qiconset.h> | 39 | #include <qiconset.h> |
@@ -82,11 +82,11 @@ void HelpBrowser::init( const QString& _home ) | |||
82 | if ( !_home.isEmpty() ) | 82 | if ( !_home.isEmpty() ) |
83 | browser->setSource( _home ); | 83 | browser->setSource( _home ); |
84 | 84 | ||
85 | QPEToolBar* toolbar = new QPEToolBar( this ); | 85 | QToolBar* toolbar = new QToolBar( this ); |
86 | toolbar->setHorizontalStretchable( TRUE ); | 86 | toolbar->setHorizontalStretchable( TRUE ); |
87 | QMenuBar *menu = new QMenuBar( toolbar ); | 87 | QMenuBar *menu = new QMenuBar( toolbar ); |
88 | 88 | ||
89 | toolbar = new QPEToolBar( this ); | 89 | toolbar = new QToolBar( this ); |
90 | // addToolBar( toolbar, "Toolbar"); | 90 | // addToolBar( toolbar, "Toolbar"); |
91 | 91 | ||
92 | QPopupMenu* go = new QPopupMenu( this ); | 92 | QPopupMenu* go = new QPopupMenu( this ); |
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 0e3254f..be18140 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
@@ -27,7 +27,7 @@ | |||
27 | #include <qpe/config.h> | 27 | #include <qpe/config.h> |
28 | #include <qpe/qpeapplication.h> | 28 | #include <qpe/qpeapplication.h> |
29 | #include <qmenubar.h> | 29 | #include <qmenubar.h> |
30 | #include <qpe/qpetoolbar.h> | 30 | #include <qtoolbar.h> |
31 | #include <qpe/qcopenvelope_qws.h> | 31 | #include <qpe/qcopenvelope_qws.h> |
32 | 32 | ||
33 | #include <qpoint.h> | 33 | #include <qpoint.h> |
@@ -182,7 +182,7 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
182 | 182 | ||
183 | setIcon( Resource::loadPixmap( "TextEditor" ) ); | 183 | setIcon( Resource::loadPixmap( "TextEditor" ) ); |
184 | 184 | ||
185 | QPEToolBar *bar = new QPEToolBar( this ); | 185 | QToolBar *bar = new QToolBar( this ); |
186 | bar->setHorizontalStretchable( true ); | 186 | bar->setHorizontalStretchable( true ); |
187 | menu = bar; | 187 | menu = bar; |
188 | 188 | ||
@@ -193,7 +193,7 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
193 | 193 | ||
194 | font = new QPopupMenu( this ); | 194 | font = new QPopupMenu( this ); |
195 | 195 | ||
196 | bar = new QPEToolBar( this ); | 196 | bar = new QToolBar( this ); |
197 | editBar = bar; | 197 | editBar = bar; |
198 | 198 | ||
199 | QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), | 199 | QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), |
@@ -332,7 +332,7 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
332 | mb->insertItem( tr( "Edit" ), edit ); | 332 | mb->insertItem( tr( "Edit" ), edit ); |
333 | mb->insertItem( tr( "View" ), font ); | 333 | mb->insertItem( tr( "View" ), font ); |
334 | 334 | ||
335 | searchBar = new QPEToolBar(this); | 335 | searchBar = new QToolBar(this); |
336 | addToolBar( searchBar, "Search", QMainWindow::Top, true ); | 336 | addToolBar( searchBar, "Search", QMainWindow::Top, true ); |
337 | 337 | ||
338 | searchBar->setHorizontalStretchable( true ); | 338 | searchBar->setHorizontalStretchable( true ); |
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index cfcfd41..5ce53b8 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <qpe/qcopenvelope_qws.h> | 22 | #include <qpe/qcopenvelope_qws.h> |
23 | 23 | ||
24 | #include <qmenubar.h> | 24 | #include <qmenubar.h> |
25 | #include <qpe/qpetoolbar.h> | 25 | #include <qtoolbar.h> |
26 | #include <qpe/fileselector.h> | 26 | #include <qpe/fileselector.h> |
27 | #include <qpe/qpeapplication.h> | 27 | #include <qpe/qpeapplication.h> |
28 | #include <qpe/lnkproperties.h> | 28 | #include <qpe/lnkproperties.h> |
@@ -154,14 +154,14 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
154 | setToolBarsMovable( FALSE ); | 154 | setToolBarsMovable( FALSE ); |
155 | 155 | ||
156 | // Create Toolbar | 156 | // Create Toolbar |
157 | QPEToolBar *toolbar = new QPEToolBar( this ); | 157 | QToolBar *toolbar = new QToolBar( this ); |
158 | toolbar->setHorizontalStretchable( TRUE ); | 158 | toolbar->setHorizontalStretchable( TRUE ); |
159 | 159 | ||
160 | // Create Menubar | 160 | // Create Menubar |
161 | QMenuBar *menu = new QMenuBar( toolbar ); | 161 | QMenuBar *menu = new QMenuBar( toolbar ); |
162 | menu->setMargin( 0 ); | 162 | menu->setMargin( 0 ); |
163 | 163 | ||
164 | QPEToolBar *bar = new QPEToolBar( this ); | 164 | QToolBar *bar = new QToolBar( this ); |
165 | bar->setLabel( tr( "Play Operations" ) ); | 165 | bar->setLabel( tr( "Play Operations" ) ); |
166 | // d->tbPlayCurList = new ToolButton( bar, tr( "play List" ), "opieplayer/play_current_list", | 166 | // d->tbPlayCurList = new ToolButton( bar, tr( "play List" ), "opieplayer/play_current_list", |
167 | // this , SLOT( addSelected()) ); | 167 | // this , SLOT( addSelected()) ); |
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 406ced6..9f668f4 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp | |||
@@ -36,7 +36,7 @@ | |||
36 | #include <qpe/ir.h> | 36 | #include <qpe/ir.h> |
37 | #include <qpe/qpemessagebox.h> | 37 | #include <qpe/qpemessagebox.h> |
38 | #include <qpe/qcopenvelope_qws.h> | 38 | #include <qpe/qcopenvelope_qws.h> |
39 | #include <qpe/qpetoolbar.h> | 39 | #include <qtoolbar.h> |
40 | #include <qmenubar.h> | 40 | #include <qmenubar.h> |
41 | // #include <qtoolbar.h> | 41 | // #include <qtoolbar.h> |
42 | // #include <qmenubar.h> | 42 | // #include <qmenubar.h> |
@@ -90,7 +90,7 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | |||
90 | setToolBarsMovable( !m_config.fixedBars() ); | 90 | setToolBarsMovable( !m_config.fixedBars() ); |
91 | setRightJustification( true ); | 91 | setRightJustification( true ); |
92 | 92 | ||
93 | QPEToolBar *bar = new QPEToolBar( this ); | 93 | QToolBar *bar = new QToolBar( this ); |
94 | bar->setHorizontalStretchable( TRUE ); | 94 | bar->setHorizontalStretchable( TRUE ); |
95 | 95 | ||
96 | QMenuBar *mbList = new QMenuBar( bar ); | 96 | QMenuBar *mbList = new QMenuBar( bar ); |
@@ -106,7 +106,7 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | |||
106 | mbList->insertItem( tr("View"), catMenu ); | 106 | mbList->insertItem( tr("View"), catMenu ); |
107 | 107 | ||
108 | // Create Toolbar | 108 | // Create Toolbar |
109 | listTools = new QPEToolBar( this, "list operations" ); | 109 | listTools = new QToolBar( this, "list operations" ); |
110 | listTools->setHorizontalStretchable( true ); | 110 | listTools->setHorizontalStretchable( true ); |
111 | addToolBar( listTools ); | 111 | addToolBar( listTools ); |
112 | moveToolBar( listTools, m_config.getToolBarPos() ); | 112 | moveToolBar( listTools, m_config.getToolBarPos() ); |
diff --git a/core/pim/addressbook/addressbook.h b/core/pim/addressbook/addressbook.h index 34bcb2a..9217e95 100644 --- a/core/pim/addressbook/addressbook.h +++ b/core/pim/addressbook/addressbook.h | |||
@@ -34,7 +34,7 @@ | |||
34 | class ContactEditor; | 34 | class ContactEditor; |
35 | class AbLabel; | 35 | class AbLabel; |
36 | class AbTable; | 36 | class AbTable; |
37 | class QPEToolBar; | 37 | class QToolBar; |
38 | class QPopupMenu; | 38 | class QPopupMenu; |
39 | class QToolButton; | 39 | class QToolButton; |
40 | class QDialog; | 40 | class QDialog; |
@@ -104,7 +104,7 @@ private: | |||
104 | void populateCategories(); | 104 | void populateCategories(); |
105 | 105 | ||
106 | QPopupMenu *catMenu; | 106 | QPopupMenu *catMenu; |
107 | QPEToolBar *listTools; | 107 | QToolBar *listTools; |
108 | QToolButton *deleteButton; | 108 | QToolButton *deleteButton; |
109 | enum Panes { paneList=0, paneView, paneEdit }; | 109 | enum Panes { paneList=0, paneView, paneEdit }; |
110 | ContactEditor *abEditor; | 110 | ContactEditor *abEditor; |
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index a040d7c..44f1515 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp | |||
@@ -41,7 +41,7 @@ | |||
41 | #include <qpe/resource.h> | 41 | #include <qpe/resource.h> |
42 | #include <qpe/sound.h> | 42 | #include <qpe/sound.h> |
43 | #include <qpe/timestring.h> | 43 | #include <qpe/timestring.h> |
44 | #include <qpe/qpetoolbar.h> | 44 | #include <qtoolbar.h> |
45 | #include <qpe/tzselect.h> | 45 | #include <qpe/tzselect.h> |
46 | #include <qpe/xmlreader.h> | 46 | #include <qpe/xmlreader.h> |
47 | 47 | ||
@@ -100,7 +100,7 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | |||
100 | weekLstView = 0; | 100 | weekLstView = 0; |
101 | monthView = 0; | 101 | monthView = 0; |
102 | 102 | ||
103 | // QPEToolBar *bar = new QPEToolBar( this ); | 103 | // QToolBar *bar = new QToolBar( this ); |
104 | // bar->setHorizontalStretchable( TRUE ); | 104 | // bar->setHorizontalStretchable( TRUE ); |
105 | 105 | ||
106 | // QMenuBar *mb = new QMenuBar( bar ); | 106 | // QMenuBar *mb = new QMenuBar( bar ); |
@@ -109,7 +109,7 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | |||
109 | // QPopupMenu *view = new QPopupMenu( this ); | 109 | // QPopupMenu *view = new QPopupMenu( this ); |
110 | // mb->insertItem( tr( "View" ), view ); | 110 | // mb->insertItem( tr( "View" ), view ); |
111 | 111 | ||
112 | QPEToolBar *sub_bar = new QPEToolBar(this); | 112 | QToolBar *sub_bar = new QToolBar(this); |
113 | sub_bar->setHorizontalStretchable(TRUE); | 113 | sub_bar->setHorizontalStretchable(TRUE); |
114 | 114 | ||
115 | QActionGroup *g = new QActionGroup( this ); | 115 | QActionGroup *g = new QActionGroup( this ); |
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 | |||
@@ -9,7 +9,7 @@ | |||
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 | ||
@@ -90,7 +90,7 @@ void MainWindow::initUI() { | |||
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 ); |
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 | |||
@@ -13,7 +13,7 @@ | |||
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; |
@@ -62,7 +62,7 @@ namespace Datebook { | |||
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(); |
@@ -91,7 +91,7 @@ namespace Datebook { | |||
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; |
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp index 80738df..07403a1 100644 --- a/core/pim/osearch/mainwindow.cpp +++ b/core/pim/osearch/mainwindow.cpp | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <qpe/qpemessagebox.h> | 32 | #include <qpe/qpemessagebox.h> |
33 | #include <qpe/resource.h> | 33 | #include <qpe/resource.h> |
34 | #include <qpe/config.h> | 34 | #include <qpe/config.h> |
35 | #include <qpe/qpetoolbar.h> | 35 | #include <qtoolbar.h> |
36 | #include <qpe/qpeapplication.h> | 36 | #include <qpe/qpeapplication.h> |
37 | #include <qpe/config.h> | 37 | #include <qpe/config.h> |
38 | #include <qpe/global.h> | 38 | #include <qpe/global.h> |
@@ -113,8 +113,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : | |||
113 | 113 | ||
114 | void MainWindow::makeMenu() | 114 | void MainWindow::makeMenu() |
115 | { | 115 | { |
116 | QPEToolBar *toolBar = new QPEToolBar( this ); | 116 | QToolBar *toolBar = new QToolBar( this ); |
117 | QPEToolBar *searchBar = new QPEToolBar(this); | 117 | QToolBar *searchBar = new QToolBar(this); |
118 | QMenuBar *menuBar = new QMenuBar( toolBar ); | 118 | QMenuBar *menuBar = new QMenuBar( toolBar ); |
119 | QPopupMenu *searchMenu = new QPopupMenu( menuBar ); | 119 | QPopupMenu *searchMenu = new QPopupMenu( menuBar ); |
120 | // QPopupMenu *viewMenu = new QPopupMenu( menuBar ); | 120 | // QPopupMenu *viewMenu = new QPopupMenu( menuBar ); |
diff --git a/core/pim/osearch/mainwindow.h b/core/pim/osearch/mainwindow.h index 75054f0..bdc6c5f 100644 --- a/core/pim/osearch/mainwindow.h +++ b/core/pim/osearch/mainwindow.h | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <qpopupmenu.h> | 22 | #include <qpopupmenu.h> |
23 | 23 | ||
24 | class QAction; | 24 | class QAction; |
25 | class QPEToolBar; | 25 | class QToolBar; |
26 | class QHBox; | 26 | class QHBox; |
27 | class QVBoxLayout; | 27 | class QVBoxLayout; |
28 | class QTextView; | 28 | class QTextView; |
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp index 7f40645..d06a405 100644 --- a/core/pim/todo/mainwindow.cpp +++ b/core/pim/todo/mainwindow.cpp | |||
@@ -212,7 +212,7 @@ void MainWindow::initActions() { | |||
212 | m_bar->insertItem( QWidget::tr("Options"), m_options ); | 212 | m_bar->insertItem( QWidget::tr("Options"), m_options ); |
213 | 213 | ||
214 | m_curQuick = new QuickEditImpl( this, m_quicktask ); | 214 | m_curQuick = new QuickEditImpl( this, m_quicktask ); |
215 | addToolBar( (QPEToolBar *)m_curQuick->widget(), QWidget::tr( "QuickEdit" ), QMainWindow::Top, TRUE ); | 215 | addToolBar( (QToolBar *)m_curQuick->widget(), QWidget::tr( "QuickEdit" ), QMainWindow::Top, TRUE ); |
216 | m_curQuick->signal()->connect( this, SLOT(slotQuickEntered() ) ); | 216 | m_curQuick->signal()->connect( this, SLOT(slotQuickEntered() ) ); |
217 | 217 | ||
218 | } | 218 | } |
diff --git a/core/pim/todo/quickeditimpl.cpp b/core/pim/todo/quickeditimpl.cpp index 70e0582..1863ef4 100644 --- a/core/pim/todo/quickeditimpl.cpp +++ b/core/pim/todo/quickeditimpl.cpp | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | 12 | ||
13 | QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible ) | 13 | QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible ) |
14 | : QPEToolBar( (QMainWindow *)parent ), Todo::QuickEdit( (Todo::MainWindow *)parent ) { | 14 | : QToolBar( (QMainWindow *)parent ), Todo::QuickEdit( (Todo::MainWindow *)parent ) { |
15 | setHorizontalStretchable( TRUE ); | 15 | setHorizontalStretchable( TRUE ); |
16 | 16 | ||
17 | // Load priority icons | 17 | // Load priority icons |
diff --git a/core/pim/todo/quickeditimpl.h b/core/pim/todo/quickeditimpl.h index 1253f3d..89b94f8 100644 --- a/core/pim/todo/quickeditimpl.h +++ b/core/pim/todo/quickeditimpl.h | |||
@@ -3,14 +3,14 @@ | |||
3 | 3 | ||
4 | #include <qpixmap.h> | 4 | #include <qpixmap.h> |
5 | 5 | ||
6 | #include <qpe/qpetoolbar.h> | 6 | #include <qtoolbar.h> |
7 | 7 | ||
8 | #include "quickedit.h" | 8 | #include "quickedit.h" |
9 | 9 | ||
10 | class QLineEdit; | 10 | class QLineEdit; |
11 | class QLabel; | 11 | class QLabel; |
12 | 12 | ||
13 | class QuickEditImpl : public QPEToolBar, public Todo::QuickEdit { | 13 | class QuickEditImpl : public QToolBar, public Todo::QuickEdit { |
14 | Q_OBJECT | 14 | Q_OBJECT |
15 | public: | 15 | public: |
16 | QuickEditImpl( QWidget* parent, bool visible); | 16 | QuickEditImpl( QWidget* parent, bool visible); |