summaryrefslogtreecommitdiff
path: root/noncore
authormickeyl <mickeyl>2003-12-07 14:06:21 (UTC)
committer mickeyl <mickeyl>2003-12-07 14:06:21 (UTC)
commit4518f62746143246d29eb9f08030e241ac33eeb7 (patch) (side-by-side diff)
treebeda04d2c1ddadefd4d0dc2bb18774a15da03bf2 /noncore
parentc648101ca50a9782911b58b5158b31e1d0427ab3 (diff)
downloadopie-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
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/checkbook/mainwindow.cpp6
-rw-r--r--noncore/apps/confedit/mainwindow.h2
-rw-r--r--noncore/apps/opie-bartender/bartender.cpp4
-rw-r--r--noncore/apps/opie-bartender/bartender.h4
-rw-r--r--noncore/apps/opie-reader/QTReaderApp.cpp6
-rw-r--r--noncore/apps/opie-reader/QTReaderApp.h4
-rw-r--r--noncore/apps/opie-sheet/mainwindow.cpp6
-rw-r--r--noncore/apps/opie-sheet/mainwindow.h4
-rw-r--r--noncore/apps/tableviewer/tableviewer.cpp4
-rw-r--r--noncore/comm/keypebble/kvnc.cpp2
-rw-r--r--noncore/games/backgammon/backgammon.cpp2
-rw-r--r--noncore/games/fifteen/fifteen.cpp4
-rw-r--r--noncore/games/go/gowidget.cpp4
-rw-r--r--noncore/games/mindbreaker/mindbreaker.cpp2
-rw-r--r--noncore/games/minesweep/minesweep.cpp4
-rw-r--r--noncore/games/parashoot/interface.cpp2
-rw-r--r--noncore/games/snake/interface.cpp2
-rw-r--r--noncore/games/solitaire/canvascardgame.cpp2
-rw-r--r--noncore/games/wordgame/wordgame.cpp2
-rw-r--r--noncore/graphics/drawpad/drawpad.cpp16
-rw-r--r--noncore/multimedia/opierec/helpwindow.cpp2
-rw-r--r--noncore/multimedia/showimg/showimg.cpp6
-rw-r--r--noncore/multimedia/showimg/showimg.h6
-rw-r--r--noncore/net/opieftp/opieftp.cpp4
-rw-r--r--noncore/net/opieftp/opieftp.h2
-rw-r--r--noncore/net/opieirc/mainwindow.cpp2
-rw-r--r--noncore/net/ubrowser/mainview.cpp2
-rw-r--r--noncore/net/ubrowser/mainview.h2
-rw-r--r--noncore/settings/usermanager/usermanager.cpp2
-rw-r--r--noncore/settings/usermanager/usermanager.h2
-rw-r--r--noncore/tools/formatter/formatter.cpp2
-rw-r--r--noncore/unsupported/filebrowser/filebrowser.cpp6
-rw-r--r--noncore/unsupported/mail2/composerbase.cpp6
-rw-r--r--noncore/unsupported/mail2/composerbase.h4
-rw-r--r--noncore/unsupported/mail2/mainwindowbase.cpp4
-rw-r--r--noncore/unsupported/mail2/mainwindowbase.h4
-rw-r--r--noncore/unsupported/mail2/viewmailbase.cpp4
-rw-r--r--noncore/unsupported/mail2/viewmailbase.h4
-rw-r--r--noncore/unsupported/oipkg/mainwindow.cpp12
-rw-r--r--noncore/unsupported/oipkg/mainwindow.h10
-rw-r--r--noncore/unsupported/qpdf/qpdf.cpp2
41 files changed, 85 insertions, 85 deletions
diff --git a/noncore/apps/checkbook/mainwindow.cpp b/noncore/apps/checkbook/mainwindow.cpp
index 25f9910..9fc2125 100644
--- a/noncore/apps/checkbook/mainwindow.cpp
+++ b/noncore/apps/checkbook/mainwindow.cpp
@@ -38,3 +38,3 @@
#include <qpe/qpeapplication.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/qpemessagebox.h>
@@ -66,3 +66,3 @@ MainWindow::MainWindow( QWidget* parent, const char* name, WFlags fl )
- QPEToolBar *bar = new QPEToolBar( this );
+ QToolBar *bar = new QToolBar( this );
bar->setHorizontalStretchable( TRUE );
@@ -72,3 +72,3 @@ MainWindow::MainWindow( QWidget* parent, const char* name, WFlags fl )
- bar = new QPEToolBar( this );
+ bar = new QToolBar( this );
QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
diff --git a/noncore/apps/confedit/mainwindow.h b/noncore/apps/confedit/mainwindow.h
index 96331db..23aca52 100644
--- a/noncore/apps/confedit/mainwindow.h
+++ b/noncore/apps/confedit/mainwindow.h
@@ -21,3 +21,3 @@
-class QPEToolBar;
+class QToolBar;
class ListViewItemConfFile;
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
@@ -20,3 +20,3 @@
#include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <opie/colorpopupmenu.h>
@@ -65,3 +65,3 @@ Bartender::Bartender( QWidget* parent, const char* name, WFlags fl )
- ToolBar1 = new QPEToolBar( this, "ToolBar1" );
+ ToolBar1 = new QToolBar( this, "ToolBar1" );
ToolBar1->setFixedHeight(22);
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
@@ -24,3 +24,3 @@ class QListView;
class QListViewItem;
-class QPEToolBar;
+class QToolBar;
@@ -34,3 +34,3 @@ public:
- QPEToolBar* ToolBar1;
+ QToolBar* ToolBar1;
QListView* DrinkView;
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index 8c0d138..f10020a 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
@@ -24,3 +24,3 @@
#ifdef USEQPE
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/qpetoolbar.h>
@@ -256,4 +256,4 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
-// QPEToolBar *bar = new QPEToolBar( this );
-// menubar = new QPEToolBar( this );
+// QToolBar *bar = new QToolBar( this );
+// menubar = new QToolBar( this );
#ifdef USEQPE
diff --git a/noncore/apps/opie-reader/QTReaderApp.h b/noncore/apps/opie-reader/QTReaderApp.h
index 86c14b1..ab6f60e 100644
--- a/noncore/apps/opie-reader/QTReaderApp.h
+++ b/noncore/apps/opie-reader/QTReaderApp.h
@@ -46,3 +46,3 @@ class QToolBar;
#ifdef USEQPE
-class QPEToolBar;
+class QToolBar;
class QMenuBar;
@@ -382,3 +382,3 @@ private slots:
QComboBox* m_fontSelector;
-// QPEToolBar /* *menu,*/ *fileBar;
+// QToolBar /* *menu,*/ *fileBar;
QToolBar *menubar, *fileBar, *navBar, *viewBar, *markBar;
diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp
index fb2ca79..78b3073 100644
--- a/noncore/apps/opie-sheet/mainwindow.cpp
+++ b/noncore/apps/opie-sheet/mainwindow.cpp
@@ -465,3 +465,3 @@ void MainWindow::initStandardToolbar()
{
- toolbarStandard=new QPEToolBar(this);
+ toolbarStandard=new QToolBar(this);
toolbarStandard->setHorizontalStretchable(TRUE);
@@ -480,3 +480,3 @@ void MainWindow::initFunctionsToolbar()
{
- toolbarFunctions=new QPEToolBar(this);
+ toolbarFunctions=new QToolBar(this);
toolbarFunctions->setHorizontalStretchable(TRUE);
@@ -502,3 +502,3 @@ void MainWindow::initEditToolbar()
{
- toolbarEdit=new QPEToolBar(this);
+ toolbarEdit=new QToolBar(this);
toolbarEdit->setHorizontalStretchable(TRUE);
diff --git a/noncore/apps/opie-sheet/mainwindow.h b/noncore/apps/opie-sheet/mainwindow.h
index 4007f88..bd99c36 100644
--- a/noncore/apps/opie-sheet/mainwindow.h
+++ b/noncore/apps/opie-sheet/mainwindow.h
@@ -20,3 +20,3 @@
#include <qmenubar.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
#include <qmainwindow.h>
@@ -43,3 +43,3 @@ class MainWindow: public QMainWindow
QMenuBar *menu;
- QPEToolBar *toolbarFunctions, *toolbarEdit, *toolbarStandard;
+ QToolBar *toolbarFunctions, *toolbarEdit, *toolbarStandard;
FileSelector *fileSelector;
diff --git a/noncore/apps/tableviewer/tableviewer.cpp b/noncore/apps/tableviewer/tableviewer.cpp
index fdf0072..207172d 100644
--- a/noncore/apps/tableviewer/tableviewer.cpp
+++ b/noncore/apps/tableviewer/tableviewer.cpp
@@ -35,3 +35,3 @@
/* QTE includes */
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/qpetoolbar.h>
@@ -94,3 +94,3 @@ TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f
/* Build tool bar */
- navigation = new QPEToolBar(this, "navigation");
+ navigation = new QToolBar(this, "navigation");
QToolButton *newItemButton = new QToolButton(
diff --git a/noncore/comm/keypebble/kvnc.cpp b/noncore/comm/keypebble/kvnc.cpp
index c89dec5..25c8919 100644
--- a/noncore/comm/keypebble/kvnc.cpp
+++ b/noncore/comm/keypebble/kvnc.cpp
@@ -5,3 +5,3 @@
#include <qaction.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qstatusbar.h>
diff --git a/noncore/games/backgammon/backgammon.cpp b/noncore/games/backgammon/backgammon.cpp
index 755ed10..e9e5467 100644
--- a/noncore/games/backgammon/backgammon.cpp
+++ b/noncore/games/backgammon/backgammon.cpp
@@ -17,3 +17,3 @@
#include <qpe/config.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/resource.h>
diff --git a/noncore/games/fifteen/fifteen.cpp b/noncore/games/fifteen/fifteen.cpp
index 212f7b1..2e4ed94 100644
--- a/noncore/games/fifteen/fifteen.cpp
+++ b/noncore/games/fifteen/fifteen.cpp
@@ -32,3 +32,3 @@
#include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qstringlist.h>
@@ -50,3 +50,3 @@ FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name)
- QPEToolBar *toolbar = new QPEToolBar(this);
+ QToolBar *toolbar = new QToolBar(this);
toolbar->setHorizontalStretchable( TRUE );
diff --git a/noncore/games/go/gowidget.cpp b/noncore/games/go/gowidget.cpp
index 476f7ce1..6d06f3b 100644
--- a/noncore/games/go/gowidget.cpp
+++ b/noncore/games/go/gowidget.cpp
@@ -28,3 +28,3 @@
#include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpopupmenu.h>
@@ -60,3 +60,3 @@ GoMainWidget::GoMainWidget( QWidget *parent, const char* name) :
setCentralWidget(go);
- toolbar = new QPEToolBar(this);
+ toolbar = new QToolBar(this);
toolbar->setHorizontalStretchable( TRUE );
diff --git a/noncore/games/mindbreaker/mindbreaker.cpp b/noncore/games/mindbreaker/mindbreaker.cpp
index 1a1d05d..7802e38 100644
--- a/noncore/games/mindbreaker/mindbreaker.cpp
+++ b/noncore/games/mindbreaker/mindbreaker.cpp
@@ -216,3 +216,3 @@ MindBreaker::MindBreaker( QWidget *parent, const char *name, int wFlags )
- QPEToolBar *tb = new QPEToolBar(this);
+ QToolBar *tb = new QToolBar(this);
tb->setHorizontalStretchable( TRUE );
diff --git a/noncore/games/minesweep/minesweep.cpp b/noncore/games/minesweep/minesweep.cpp
index 814070b..48644b3 100644
--- a/noncore/games/minesweep/minesweep.cpp
+++ b/noncore/games/minesweep/minesweep.cpp
@@ -27,3 +27,3 @@
#include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpopupmenu.h>
@@ -245,3 +245,3 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f )
- QPEToolBar *toolBar = new QPEToolBar( this );
+ QToolBar *toolBar = new QToolBar( this );
toolBar->setHorizontalStretchable( TRUE );
diff --git a/noncore/games/parashoot/interface.cpp b/noncore/games/parashoot/interface.cpp
index 84e5e60..db98720 100644
--- a/noncore/games/parashoot/interface.cpp
+++ b/noncore/games/parashoot/interface.cpp
@@ -47,3 +47,3 @@ ParaShoot::ParaShoot(QWidget* parent, const char* name, WFlags f) :
- QPEToolBar* toolbar = new QPEToolBar(this);
+ QToolBar* toolbar = new QToolBar(this);
toolbar->setHorizontalStretchable( TRUE );
diff --git a/noncore/games/snake/interface.cpp b/noncore/games/snake/interface.cpp
index 68e0f14..f1227cb 100644
--- a/noncore/games/snake/interface.cpp
+++ b/noncore/games/snake/interface.cpp
@@ -47,3 +47,3 @@ SnakeGame::SnakeGame(QWidget* parent, const char* name, WFlags f) :
- QPEToolBar* toolbar = new QPEToolBar( this);
+ QToolBar* toolbar = new QToolBar( this);
toolbar->setHorizontalStretchable( TRUE );
diff --git a/noncore/games/solitaire/canvascardgame.cpp b/noncore/games/solitaire/canvascardgame.cpp
index 8250193..9ae2a23 100644
--- a/noncore/games/solitaire/canvascardgame.cpp
+++ b/noncore/games/solitaire/canvascardgame.cpp
@@ -29,3 +29,3 @@
#include <qmainwindow.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpainter.h>
diff --git a/noncore/games/wordgame/wordgame.cpp b/noncore/games/wordgame/wordgame.cpp
index d46e824..c01551d 100644
--- a/noncore/games/wordgame/wordgame.cpp
+++ b/noncore/games/wordgame/wordgame.cpp
@@ -136,3 +136,3 @@ WordGame::WordGame( QWidget* parent, const char* name, WFlags fl ) :
setCentralWidget(vbox);
- toolbar = new QPEToolBar(this);
+ toolbar = new QToolBar(this);
addToolBar(toolbar, Bottom);
diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp
index feae237..86a10a5 100644
--- a/noncore/graphics/drawpad/drawpad.cpp
+++ b/noncore/graphics/drawpad/drawpad.cpp
@@ -38,3 +38,3 @@
#include <qpe/global.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/qpetoolbar.h>
@@ -66,3 +66,3 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags fl )
- QPEToolBar* menuToolBar = new QPEToolBar(this);
+ QToolBar* menuToolBar = new QToolBar(this);
QMenuBar* menuBar = new QMenuBar(menuToolBar);
@@ -105,3 +105,3 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags fl )
- QPEToolBar* pageToolBar = new QPEToolBar(this);
+ QToolBar* pageToolBar = new QToolBar(this);
@@ -122,3 +122,3 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags fl )
- QPEToolBar* emptyToolBar = new QPEToolBar(this);
+ QToolBar* emptyToolBar = new QToolBar(this);
emptyToolBar->setHorizontalStretchable(true);
@@ -127,3 +127,3 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags fl )
- QPEToolBar* navigationToolBar = new QPEToolBar(this);
+ QToolBar* navigationToolBar = new QToolBar(this);
@@ -161,3 +161,3 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags fl )
- QPEToolBar* drawModeToolBar = new QPEToolBar(this);
+ QToolBar* drawModeToolBar = new QToolBar(this);
@@ -238,3 +238,3 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags fl )
- emptyToolBar = new QPEToolBar(this);
+ emptyToolBar = new QToolBar(this);
emptyToolBar->setHorizontalStretchable(true);
@@ -244,3 +244,3 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags fl )
- QPEToolBar* drawParametersToolBar = new QPEToolBar(this);
+ QToolBar* drawParametersToolBar = new QToolBar(this);
diff --git a/noncore/multimedia/opierec/helpwindow.cpp b/noncore/multimedia/opierec/helpwindow.cpp
index 1ab6510..a3b29fa 100644
--- a/noncore/multimedia/opierec/helpwindow.cpp
+++ b/noncore/multimedia/opierec/helpwindow.cpp
@@ -38,3 +38,3 @@ HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* par
browser->setSource( home_ );
- QPEToolBar *toolbar = new QPEToolBar( this );
+ QToolBar *toolbar = new QToolBar( this );
diff --git a/noncore/multimedia/showimg/showimg.cpp b/noncore/multimedia/showimg/showimg.cpp
index b7754f7..ba76e57 100644
--- a/noncore/multimedia/showimg/showimg.cpp
+++ b/noncore/multimedia/showimg/showimg.cpp
@@ -38,3 +38,3 @@
#include <math.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qwidgetstack.h>
@@ -230,3 +230,3 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
- toolBar = new QPEToolBar( this );
+ toolBar = new QToolBar( this );
toolBar->setHorizontalStretchable( TRUE );
@@ -316,3 +316,3 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
- iconToolBar = new QPEToolBar(this);
+ iconToolBar = new QToolBar(this);
diff --git a/noncore/multimedia/showimg/showimg.h b/noncore/multimedia/showimg/showimg.h
index da4c0b6..9cf9bfd 100644
--- a/noncore/multimedia/showimg/showimg.h
+++ b/noncore/multimedia/showimg/showimg.h
@@ -36,3 +36,3 @@
class QAction;
-class QPEToolBar;
+class QToolBar;
class QMenuBar;
@@ -250,4 +250,4 @@ private:
QPixmap pmScaled; // the scaled pixmap
- QPEToolBar *toolBar;
- QPEToolBar *iconToolBar;
+ QToolBar *toolBar;
+ QToolBar *iconToolBar;
QMenuBar *menuBar;
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index 48629bf..3250627 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -21,3 +21,3 @@ extern "C" {
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/qpeapplication.h>
@@ -71,3 +71,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
QMenuBar *menuBar = new QMenuBar(this);
-// QPEToolBar *menuBar = new QPEToolBar(this);
+// QToolBar *menuBar = new QToolBar(this);
// menuBar->setHorizontalStretchable( TRUE );
diff --git a/noncore/net/opieftp/opieftp.h b/noncore/net/opieftp/opieftp.h
index f58778a..076a906 100644
--- a/noncore/net/opieftp/opieftp.h
+++ b/noncore/net/opieftp/opieftp.h
@@ -33,3 +33,3 @@ class QTabWidget;
class QWidget;
-class QPEToolBar;
+class QToolBar;
class QMenuBar;
diff --git a/noncore/net/opieirc/mainwindow.cpp b/noncore/net/opieirc/mainwindow.cpp
index 95fbdcd..be6f8ed 100644
--- a/noncore/net/opieirc/mainwindow.cpp
+++ b/noncore/net/opieirc/mainwindow.cpp
@@ -1,2 +1,2 @@
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/resource.h>
diff --git a/noncore/net/ubrowser/mainview.cpp b/noncore/net/ubrowser/mainview.cpp
index 0d3f171..f299b54 100644
--- a/noncore/net/ubrowser/mainview.cpp
+++ b/noncore/net/ubrowser/mainview.cpp
@@ -26,3 +26,3 @@ MainView::MainView(QWidget *parent, const char *name, WFlags fl) : QMainWindow(p
- QPEToolBar *toolbar = new QPEToolBar(this, "toolbar");
+ QToolBar *toolbar = new QToolBar(this, "toolbar");
back = new QToolButton(Resource::loadPixmap("ubrowser/back"), 0, 0, 0, 0, toolbar, "back");
diff --git a/noncore/net/ubrowser/mainview.h b/noncore/net/ubrowser/mainview.h
index cc63729..7ce890c 100644
--- a/noncore/net/ubrowser/mainview.h
+++ b/noncore/net/ubrowser/mainview.h
@@ -17,3 +17,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include <qpe/resource.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
#include <qpe/applnk.h>
diff --git a/noncore/settings/usermanager/usermanager.cpp b/noncore/settings/usermanager/usermanager.cpp
index 65bbd8b..5c90525 100644
--- a/noncore/settings/usermanager/usermanager.cpp
+++ b/noncore/settings/usermanager/usermanager.cpp
@@ -36,3 +36,3 @@ UserConfig::UserConfig(QWidget* parent, const char* name, WFlags fl) : QMainWind
// Create the toolbar.
- QPEToolBar *toolbar = new QPEToolBar(this,"Toolbar");
+ QToolBar *toolbar = new QToolBar(this,"Toolbar");
toolbar->setHorizontalStretchable(1); // Is there any other way to get the toolbar to stretch of the full screen!?
diff --git a/noncore/settings/usermanager/usermanager.h b/noncore/settings/usermanager/usermanager.h
index d7c25b8..678d1f9 100644
--- a/noncore/settings/usermanager/usermanager.h
+++ b/noncore/settings/usermanager/usermanager.h
@@ -18,3 +18,3 @@
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
diff --git a/noncore/tools/formatter/formatter.cpp b/noncore/tools/formatter/formatter.cpp
index a8dd11c..532ee40 100644
--- a/noncore/tools/formatter/formatter.cpp
+++ b/noncore/tools/formatter/formatter.cpp
@@ -12,3 +12,3 @@
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/qpetoolbar.h>
diff --git a/noncore/unsupported/filebrowser/filebrowser.cpp b/noncore/unsupported/filebrowser/filebrowser.cpp
index 114ebfa..8cf8a60 100644
--- a/noncore/unsupported/filebrowser/filebrowser.cpp
+++ b/noncore/unsupported/filebrowser/filebrowser.cpp
@@ -37,3 +37,3 @@
#include <qheader.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
#include <qpopupmenu.h>
@@ -841,3 +841,3 @@ void FileBrowser::init(const QString & dir)
- QPEToolBar* toolBar = new QPEToolBar( this );
+ QToolBar* toolBar = new QToolBar( this );
toolBar->setHorizontalStretchable( TRUE );
@@ -871,3 +871,3 @@ void FileBrowser::init(const QString & dir)
- toolBar = new QPEToolBar( this );
+ toolBar = new QToolBar( this );
diff --git a/noncore/unsupported/mail2/composerbase.cpp b/noncore/unsupported/mail2/composerbase.cpp
index 34d6eb6..94de15c 100644
--- a/noncore/unsupported/mail2/composerbase.cpp
+++ b/noncore/unsupported/mail2/composerbase.cpp
@@ -10,3 +10,3 @@
#include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/resource.h>
@@ -23,3 +23,3 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
- toolbar = new QPEToolBar(this);
+ toolbar = new QToolBar(this);
menubar = new QMenuBar( toolbar );
@@ -127,3 +127,3 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
- attachToolbar = new QPEToolBar(attachWindow);
+ attachToolbar = new QToolBar(attachWindow);
attachToolbar->setVerticalStretchable(true);
diff --git a/noncore/unsupported/mail2/composerbase.h b/noncore/unsupported/mail2/composerbase.h
index 2c832d6..c14144b 100644
--- a/noncore/unsupported/mail2/composerbase.h
+++ b/noncore/unsupported/mail2/composerbase.h
@@ -9,3 +9,3 @@ class ListViewPlus;
class QPopupMenu;
-class QPEToolBar;
+class QToolBar;
class QMenuBar;
@@ -44,3 +44,3 @@ protected:
QPopupMenu *attachPopup;
- QPEToolBar *toolbar, *attachToolbar;
+ QToolBar *toolbar, *attachToolbar;
QMenuBar *menubar;
diff --git a/noncore/unsupported/mail2/mainwindowbase.cpp b/noncore/unsupported/mail2/mainwindowbase.cpp
index 119acfb..4e804c2 100644
--- a/noncore/unsupported/mail2/mainwindowbase.cpp
+++ b/noncore/unsupported/mail2/mainwindowbase.cpp
@@ -7,3 +7,3 @@
#include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/resource.h>
@@ -21,3 +21,3 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
- toolbar = new QPEToolBar(this);
+ toolbar = new QToolBar(this);
menubar = new QMenuBar( toolbar );
diff --git a/noncore/unsupported/mail2/mainwindowbase.h b/noncore/unsupported/mail2/mainwindowbase.h
index b2e1dc5..c1d6371 100644
--- a/noncore/unsupported/mail2/mainwindowbase.h
+++ b/noncore/unsupported/mail2/mainwindowbase.h
@@ -8,3 +8,3 @@ class MailStatusBar;
class FolderWidget;
-class QPEToolBar;
+class QToolBar;
class QMenuBar;
@@ -28,3 +28,3 @@ protected:
FolderWidget *folderView;
- QPEToolBar *toolbar;
+ QToolBar *toolbar;
QMenuBar *menubar;
diff --git a/noncore/unsupported/mail2/viewmailbase.cpp b/noncore/unsupported/mail2/viewmailbase.cpp
index 10aa14d..f72026f 100644
--- a/noncore/unsupported/mail2/viewmailbase.cpp
+++ b/noncore/unsupported/mail2/viewmailbase.cpp
@@ -8,3 +8,3 @@
#include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/resource.h>
@@ -20,3 +20,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
- toolbar = new QPEToolBar(this);
+ toolbar = new QToolBar(this);
menubar = new QMenuBar( toolbar );
diff --git a/noncore/unsupported/mail2/viewmailbase.h b/noncore/unsupported/mail2/viewmailbase.h
index 6e55021..898522e 100644
--- a/noncore/unsupported/mail2/viewmailbase.h
+++ b/noncore/unsupported/mail2/viewmailbase.h
@@ -8,3 +8,3 @@ class OpenDiag;
class QListView;
-class QPEToolBar;
+class QToolBar;
class QTextBrowser;
@@ -23,3 +23,3 @@ protected:
QListView *attachments;
- QPEToolBar *toolbar;
+ QToolBar *toolbar;
QTextBrowser *browser;
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 6930d60..a09bc30 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -19,3 +19,3 @@
#include <qpe/config.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
#include <qpe/qcopenvelope_qws.h>
@@ -84,3 +84,3 @@ void MainWindow::makeMenu()
- QPEToolBar *toolBar = new QPEToolBar( this );
+ QToolBar *toolBar = new QToolBar( this );
QMenuBar *menuBar = new QMenuBar( toolBar );
@@ -144,3 +144,3 @@ void MainWindow::makeMenu()
// SECTIONS
- sectionBar = new QPEToolBar( this );
+ sectionBar = new QToolBar( this );
addToolBar( sectionBar, "Section", QMainWindow::Top, TRUE );
@@ -171,3 +171,3 @@ void MainWindow::makeMenu()
//FIND
- findBar = new QPEToolBar(this);
+ findBar = new QToolBar(this);
addToolBar( findBar, "Filter", QMainWindow::Top, TRUE );
@@ -192,3 +192,3 @@ void MainWindow::makeMenu()
//SEARCH
- searchBar = new QPEToolBar(this);
+ searchBar = new QToolBar(this);
addToolBar( searchBar, "Search", QMainWindow::Top, TRUE );
@@ -216,3 +216,3 @@ void MainWindow::makeMenu()
//DEST
- destBar = new QPEToolBar(this);
+ destBar = new QToolBar(this);
addToolBar( destBar, "Destination", QMainWindow::Top, TRUE );
diff --git a/noncore/unsupported/oipkg/mainwindow.h b/noncore/unsupported/oipkg/mainwindow.h
index 7446135..ae9fd0c 100644
--- a/noncore/unsupported/oipkg/mainwindow.h
+++ b/noncore/unsupported/oipkg/mainwindow.h
@@ -30,3 +30,3 @@
class QComboBox;
-class QPEToolBar;
+class QToolBar;
class QLineEdit;
@@ -91,3 +91,3 @@ private:
QAction *findAction;
- QPEToolBar *findBar;
+ QToolBar *findBar;
QLineEdit *findEdit;
@@ -95,6 +95,6 @@ private:
QAction *searchCommit;
- QPEToolBar *searchBar;
+ QToolBar *searchBar;
QLineEdit *searchEdit;
QAction *sectionAction;
- QPEToolBar *sectionBar;
+ QToolBar *sectionBar;
QComboBox *section;
@@ -102,3 +102,3 @@ private:
QAction *destAction;
- QPEToolBar *destBar;
+ QToolBar *destBar;
QComboBox *destination;
diff --git a/noncore/unsupported/qpdf/qpdf.cpp b/noncore/unsupported/qpdf/qpdf.cpp
index de1dcf3..5cdcccf 100644
--- a/noncore/unsupported/qpdf/qpdf.cpp
+++ b/noncore/unsupported/qpdf/qpdf.cpp
@@ -24,3 +24,3 @@
#include <qtoolbutton.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpopupmenu.h>