author | mickeyl <mickeyl> | 2003-12-07 14:06:21 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-07 14:06:21 (UTC) |
commit | 4518f62746143246d29eb9f08030e241ac33eeb7 (patch) (side-by-side diff) | |
tree | beda04d2c1ddadefd4d0dc2bb18774a15da03bf2 /noncore/apps | |
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/checkbook/mainwindow.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/confedit/mainwindow.h | 2 | ||||
-rw-r--r-- | noncore/apps/opie-bartender/bartender.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/opie-bartender/bartender.h | 4 | ||||
-rw-r--r-- | noncore/apps/opie-reader/QTReaderApp.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/opie-reader/QTReaderApp.h | 4 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/mainwindow.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/mainwindow.h | 4 | ||||
-rw-r--r-- | noncore/apps/tableviewer/tableviewer.cpp | 4 |
9 files changed, 20 insertions, 20 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( |