57 files changed, 123 insertions, 123 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 @@ #include "playlistselection.h" #include <qstring.h> #include <qpe/config.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qwidget.h> #include <qmenubar.h> #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 @@ #include <qdragobject.h> #include <qobjectlist.h> #include <qtoolbutton.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpushbutton.h> #include <qfontdialog.h> #include <qglobal.h> @@ -282,7 +282,7 @@ void Konsole::init(const char* _pgm, QStrList & _args) // create terminal toolbar //////////////////////////////////////////////// setToolBarsMovable( FALSE ); - QPEToolBar *menuToolBar = new QPEToolBar( this ); + QToolBar *menuToolBar = new QToolBar( this ); menuToolBar->setHorizontalStretchable( TRUE ); QMenuBar *menuBar = new QMenuBar( menuToolBar ); @@ -351,7 +351,7 @@ void Konsole::init(const char* _pgm, QStrList & _args) menuBar->insertItem( tr("Options"), configMenu ); - QPEToolBar *toolbar = new QPEToolBar( this ); + QToolBar *toolbar = new QToolBar( this ); QAction *a; @@ -377,7 +377,7 @@ void Konsole::init(const char* _pgm, QStrList & _args) connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolbar ); */ - secondToolBar = new QPEToolBar( this ); + secondToolBar = new QToolBar( this ); secondToolBar->setHorizontalStretchable( TRUE ); 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 @@ #include <qintdict.h> #include <qptrdict.h> #include <qtabwidget.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qcombobox.h> #include <qcolor.h> @@ -51,7 +51,7 @@ public: Konsole(QWidget* parent = 0, const char* name = 0, WFlags fl = 0); ~Konsole(); void setColLin(int columns, int lines); - QPEToolBar *secondToolBar; + QToolBar *secondToolBar; void show(); void setColor(); 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 @@ #include <qpixmap.h> #include <qpopupmenu.h> #include <qmenubar.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpe/qcopenvelope_qws.h> #include <qtoolbutton.h> #include <qiconset.h> @@ -82,11 +82,11 @@ void HelpBrowser::init( const QString& _home ) if ( !_home.isEmpty() ) browser->setSource( _home ); - QPEToolBar* toolbar = new QPEToolBar( this ); + QToolBar* toolbar = new QToolBar( this ); toolbar->setHorizontalStretchable( TRUE ); QMenuBar *menu = new QMenuBar( toolbar ); - toolbar = new QPEToolBar( this ); + toolbar = new QToolBar( this ); // addToolBar( toolbar, "Toolbar"); 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 @@ #include <qpe/config.h> #include <qpe/qpeapplication.h> #include <qmenubar.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpe/qcopenvelope_qws.h> #include <qpoint.h> @@ -182,7 +182,7 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) setIcon( Resource::loadPixmap( "TextEditor" ) ); - QPEToolBar *bar = new QPEToolBar( this ); + QToolBar *bar = new QToolBar( this ); bar->setHorizontalStretchable( true ); menu = bar; @@ -193,7 +193,7 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) font = new QPopupMenu( this ); - bar = new QPEToolBar( this ); + bar = new QToolBar( this ); editBar = bar; QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), @@ -332,7 +332,7 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) mb->insertItem( tr( "Edit" ), edit ); mb->insertItem( tr( "View" ), font ); - searchBar = new QPEToolBar(this); + searchBar = new QToolBar(this); addToolBar( searchBar, "Search", QMainWindow::Top, true ); 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 @@ #include <qpe/qcopenvelope_qws.h> #include <qmenubar.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpe/fileselector.h> #include <qpe/qpeapplication.h> #include <qpe/lnkproperties.h> @@ -154,14 +154,14 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) setToolBarsMovable( FALSE ); // Create Toolbar - QPEToolBar *toolbar = new QPEToolBar( this ); + QToolBar *toolbar = new QToolBar( this ); toolbar->setHorizontalStretchable( TRUE ); // Create Menubar QMenuBar *menu = new QMenuBar( toolbar ); menu->setMargin( 0 ); - QPEToolBar *bar = new QPEToolBar( this ); + QToolBar *bar = new QToolBar( this ); bar->setLabel( tr( "Play Operations" ) ); // d->tbPlayCurList = new ToolButton( bar, tr( "play List" ), "opieplayer/play_current_list", // 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 @@ #include <qpe/ir.h> #include <qpe/qpemessagebox.h> #include <qpe/qcopenvelope_qws.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qmenubar.h> // #include <qtoolbar.h> // #include <qmenubar.h> @@ -90,7 +90,7 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, setToolBarsMovable( !m_config.fixedBars() ); setRightJustification( true ); - QPEToolBar *bar = new QPEToolBar( this ); + QToolBar *bar = new QToolBar( this ); bar->setHorizontalStretchable( TRUE ); QMenuBar *mbList = new QMenuBar( bar ); @@ -106,7 +106,7 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, mbList->insertItem( tr("View"), catMenu ); // Create Toolbar - listTools = new QPEToolBar( this, "list operations" ); + listTools = new QToolBar( this, "list operations" ); listTools->setHorizontalStretchable( true ); addToolBar( listTools ); 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 @@ class ContactEditor; class AbLabel; class AbTable; -class QPEToolBar; +class QToolBar; class QPopupMenu; class QToolButton; class QDialog; @@ -104,7 +104,7 @@ private: void populateCategories(); QPopupMenu *catMenu; - QPEToolBar *listTools; + QToolBar *listTools; QToolButton *deleteButton; enum Panes { paneList=0, paneView, paneEdit }; 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 @@ #include <qpe/resource.h> #include <qpe/sound.h> #include <qpe/timestring.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpe/tzselect.h> #include <qpe/xmlreader.h> @@ -100,7 +100,7 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) weekLstView = 0; monthView = 0; -// QPEToolBar *bar = new QPEToolBar( this ); +// QToolBar *bar = new QToolBar( this ); // bar->setHorizontalStretchable( TRUE ); // QMenuBar *mb = new QMenuBar( bar ); @@ -109,7 +109,7 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) // QPopupMenu *view = new QPopupMenu( this ); // mb->insertItem( tr( "View" ), view ); - QPEToolBar *sub_bar = new QPEToolBar(this); + QToolBar *sub_bar = new QToolBar(this); sub_bar->setHorizontalStretchable(TRUE); 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 @@ #include <qpe/qpeapplication.h> #include <qpe/ir.h> #include <qmenubar.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpe/qpemessagebox.h> #include <qpe/resource.h> @@ -90,7 +90,7 @@ void MainWindow::initUI() { m_stack = new QWidgetStack( this ); setCentralWidget( m_stack ); - m_toolBar = new QPEToolBar( this ); + m_toolBar = new QToolBar( this ); m_toolBar->setHorizontalStretchable( TRUE ); 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 @@ class QAction; class QWidgetStack; class QPopupMenu; -class QPEToolBar; +class QToolBar; namespace Datebook { class BookManager; class Show; @@ -62,7 +62,7 @@ namespace Datebook { void add( const OPimRecord& ); private: - QPEToolBar* toolbar(); + QToolBar* toolbar(); QPopupMenu* viewMenu(); QPopupMenu* settingsMenu(); QPopupMenu* templateMenu(); @@ -91,7 +91,7 @@ namespace Datebook { private: QList<View> m_view; // the Views.. not autoDelete QWidgetStack* m_stack; - QPEToolBar *m_toolBar; + QToolBar *m_toolBar; QPopupMenu* m_popView; QPopupMenu* m_popSetting; 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 @@ #include <qpe/qpemessagebox.h> #include <qpe/resource.h> #include <qpe/config.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpe/qpeapplication.h> #include <qpe/config.h> #include <qpe/global.h> @@ -113,8 +113,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : void MainWindow::makeMenu() { - QPEToolBar *toolBar = new QPEToolBar( this ); - QPEToolBar *searchBar = new QPEToolBar(this); + QToolBar *toolBar = new QToolBar( this ); + QToolBar *searchBar = new QToolBar(this); QMenuBar *menuBar = new QMenuBar( toolBar ); QPopupMenu *searchMenu = new QPopupMenu( menuBar ); // 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 @@ #include <qpopupmenu.h> class QAction; -class QPEToolBar; +class QToolBar; class QHBox; class QVBoxLayout; 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() { m_bar->insertItem( QWidget::tr("Options"), m_options ); m_curQuick = new QuickEditImpl( this, m_quicktask ); - addToolBar( (QPEToolBar *)m_curQuick->widget(), QWidget::tr( "QuickEdit" ), QMainWindow::Top, TRUE ); + addToolBar( (QToolBar *)m_curQuick->widget(), QWidget::tr( "QuickEdit" ), QMainWindow::Top, TRUE ); m_curQuick->signal()->connect( this, SLOT(slotQuickEntered() ) ); } 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 @@ QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible ) - : QPEToolBar( (QMainWindow *)parent ), Todo::QuickEdit( (Todo::MainWindow *)parent ) { + : QToolBar( (QMainWindow *)parent ), Todo::QuickEdit( (Todo::MainWindow *)parent ) { setHorizontalStretchable( TRUE ); // 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 @@ #include <qpixmap.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include "quickedit.h" class QLineEdit; class QLabel; -class QuickEditImpl : public QPEToolBar, public Todo::QuickEdit { +class QuickEditImpl : public QToolBar, public Todo::QuickEdit { Q_OBJECT public: QuickEditImpl( QWidget* parent, bool visible); 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 @@ -36,7 +36,7 @@ #include <qpe/config.h> #include <qpe/global.h> #include <qpe/qpeapplication.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/qpemessagebox.h> #include <qpe/qpetoolbar.h> #include <qpe/resource.h> @@ -64,13 +64,13 @@ MainWindow::MainWindow( QWidget* parent, const char* name, WFlags fl ) // Build menu and tool bars setToolBarsMovable( FALSE ); - QPEToolBar *bar = new QPEToolBar( this ); + QToolBar *bar = new QToolBar( this ); bar->setHorizontalStretchable( TRUE ); QMenuBar *mb = new QMenuBar( bar ); mb->setMargin( 0 ); QPopupMenu *popup = new QPopupMenu( this ); - bar = new QPEToolBar( this ); + bar = new QToolBar( this ); QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 ); a->setWhatsThis( tr( "Click here to create a new checkbook.\n\nYou also can select New from the Checkbook menu." ) ); connect( a, SIGNAL( activated() ), this, SLOT( slotNew() ) ); 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 @@ -19,7 +19,7 @@ #include <qpopupmenu.h> #include "editwidget.h" -class QPEToolBar; +class QToolBar; class ListViewItemConfFile; class ListViewConfDir; class ListViewItemConf; 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 @@ #include "bac.h" #include <qpe/qpetoolbar.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <opie/colorpopupmenu.h> #include <qpe/qpeapplication.h> #include <qpe/resource.h> @@ -63,7 +63,7 @@ Bartender::Bartender( QWidget* parent, const char* name, WFlags fl ) setCaption( tr( "Bartender" ) ); - ToolBar1 = new QPEToolBar( this, "ToolBar1" ); + ToolBar1 = new QToolBar( this, "ToolBar1" ); ToolBar1->setFixedHeight(22); layout->addMultiCellWidget( ToolBar1, 0, 0, 0, 4 ); 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; class QGridLayout; class QListView; class QListViewItem; -class QPEToolBar; +class QToolBar; class Bartender : public QMainWindow { @@ -32,7 +32,7 @@ public: Bartender( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~Bartender(); - QPEToolBar* ToolBar1; + QToolBar* ToolBar1; QListView* DrinkView; QFile dbFile; public slots: 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 @@ -22,7 +22,7 @@ #include <qclipboard.h> #include <qwidgetstack.h> #ifdef USEQPE -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/qpetoolbar.h> #endif #include <qmenubar.h> @@ -254,8 +254,8 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f ) setIcon( QPixmap (PICDIR "uqtreader.png") ); #endif /* USEQPE */ -// QPEToolBar *bar = new QPEToolBar( this ); -// menubar = new QPEToolBar( this ); +// QToolBar *bar = new QToolBar( this ); +// menubar = new QToolBar( this ); #ifdef USEQPE Config config( APPDIR ); #else 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 @@ -44,7 +44,7 @@ class QToolButton; class QPopupMenu; class QToolBar; #ifdef USEQPE
-class QPEToolBar; +class QToolBar; class QMenuBar;
#endif class CBkmkSelector; @@ -380,7 +380,7 @@ private slots: QWidgetStack *editorStack; QTReader* reader; QComboBox* m_fontSelector; -// QPEToolBar /* *menu,*/ *fileBar; +// QToolBar /* *menu,*/ *fileBar; QToolBar *menubar, *fileBar, *navBar, *viewBar, *markBar; #ifdef USEQPE
QMenuBar *mb;
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 @@ -463,7 +463,7 @@ void MainWindow::initMenu() void MainWindow::initStandardToolbar() { - toolbarStandard=new QPEToolBar(this); + toolbarStandard=new QToolBar(this); toolbarStandard->setHorizontalStretchable(TRUE); moveToolBar(toolbarStandard, Top); @@ -478,7 +478,7 @@ void MainWindow::initStandardToolbar() void MainWindow::initFunctionsToolbar() { - toolbarFunctions=new QPEToolBar(this); + toolbarFunctions=new QToolBar(this); toolbarFunctions->setHorizontalStretchable(TRUE); moveToolBar(toolbarFunctions, Bottom); @@ -500,7 +500,7 @@ void MainWindow::initFunctionsToolbar() void MainWindow::initEditToolbar() { - toolbarEdit=new QPEToolBar(this); + toolbarEdit=new QToolBar(this); toolbarEdit->setHorizontalStretchable(TRUE); moveToolBar(toolbarEdit, Bottom); 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 @@ -18,7 +18,7 @@ #include <qpe/applnk.h> #include <qpe/fileselector.h> #include <qmenubar.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qmainwindow.h> #include <qaction.h> #include <qlineedit.h> @@ -41,7 +41,7 @@ class MainWindow: public QMainWindow // QPE objects DocLnk* currentDoc; QMenuBar *menu; - QPEToolBar *toolbarFunctions, *toolbarEdit, *toolbarStandard; + QToolBar *toolbarFunctions, *toolbarEdit, *toolbarStandard; FileSelector *fileSelector; // QT objects 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 @@ -33,7 +33,7 @@ #include <qpe/qpetoolbar.h> /* QTE includes */ -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/qpetoolbar.h> #include <qpopupmenu.h> #include <qapplication.h> @@ -92,7 +92,7 @@ TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f QVBoxLayout *main_layout = new QVBoxLayout; /* Build tool bar */ - navigation = new QPEToolBar(this, "navigation"); + navigation = new QToolBar(this, "navigation"); QToolButton *newItemButton = new QToolButton( QIconSet(Resource::loadPixmap("new")), "New Item", QString::null, this, SLOT(newItemSlot()), navigation, "New Item"); 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 @@ -3,7 +3,7 @@ #include <qpixmap.h> #include <qdom.h> #include <qaction.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qstatusbar.h> #include <qpopupmenu.h> #include <qpushbutton.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 @@ -15,7 +15,7 @@ #include <qmainwindow.h> #include <qpe/qpeapplication.h> #include <qpe/config.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/resource.h> #include <stdlib.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 @@ -30,7 +30,7 @@ #include <qpopupmenu.h> #include <qmessagebox.h> #include <qpe/qpetoolbar.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qstringlist.h> #include <qapplication.h> @@ -48,7 +48,7 @@ FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name) PiecesTable *table = new PiecesTable( vbox ); setCentralWidget(vbox); - QPEToolBar *toolbar = new QPEToolBar(this); + QToolBar *toolbar = new QToolBar(this); toolbar->setHorizontalStretchable( TRUE ); addToolBar(toolbar); 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 @@ -26,7 +26,7 @@ #include <qpainter.h> #include <qpixmap.h> #include <qpe/qpetoolbar.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpopupmenu.h> #include <qaction.h> #include <qapplication.h> //processEvents() @@ -58,7 +58,7 @@ GoMainWidget::GoMainWidget( QWidget *parent, const char* name) : GoWidget *go = new GoWidget(this); setCentralWidget(go); - toolbar = new QPEToolBar(this); + toolbar = new QToolBar(this); toolbar->setHorizontalStretchable( TRUE ); addToolBar(toolbar); 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 @@ -214,7 +214,7 @@ MindBreaker::MindBreaker( QWidget *parent, const char *name, int wFlags ) setToolBarsMovable( FALSE ); - QPEToolBar *tb = new QPEToolBar(this); + QToolBar *tb = new QToolBar(this); tb->setHorizontalStretchable( TRUE ); QPixmap newicon = Resource::loadPixmap("new"); 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 @@ -25,7 +25,7 @@ #include <qpe/config.h> #include <qpe/qpetoolbar.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpopupmenu.h> #include <qpushbutton.h> #include <qlcdnumber.h> @@ -243,7 +243,7 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f ) setCaption( tr("Mine Hunt") ); setIcon( Resource::loadPixmap( "minesweep_icon" ) ); - QPEToolBar *toolBar = new QPEToolBar( this ); + QToolBar *toolBar = new QToolBar( this ); toolBar->setHorizontalStretchable( TRUE ); QMenuBar *menuBar = new QMenuBar( toolBar ); 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 @@ -45,7 +45,7 @@ ParaShoot::ParaShoot(QWidget* parent, const char* name, WFlags f) : setToolBarsMovable( FALSE ); - QPEToolBar* toolbar = new QPEToolBar(this); + QToolBar* toolbar = new QToolBar(this); toolbar->setHorizontalStretchable( TRUE ); setCaption( tr("ParaShoot") ); 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 @@ -45,7 +45,7 @@ SnakeGame::SnakeGame(QWidget* parent, const char* name, WFlags f) : setToolBarsMovable( FALSE ); - QPEToolBar* toolbar = new QPEToolBar( this); + QToolBar* toolbar = new QToolBar( this); toolbar->setHorizontalStretchable( TRUE ); QPixmap newicon = Resource::loadPixmap("ksnake"); 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 @@ -27,7 +27,7 @@ #include <qpe/config.h> #include <qmainwindow.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpainter.h> #include <qgfx_qws.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 @@ -134,7 +134,7 @@ WordGame::WordGame( QWidget* parent, const char* name, WFlags fl ) : vbox = new QVBox(this); setCentralWidget(vbox); - toolbar = new QPEToolBar(this); + toolbar = new QToolBar(this); addToolBar(toolbar, Bottom); reset = new QToolButton(Resource::loadPixmap("back"), tr("Back"), "", this, SLOT(resetTurn()), toolbar); done = new QToolButton(Resource::loadPixmap("done"), tr("Done"), "", this, SLOT(endTurn()), toolbar); 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 @@ -36,7 +36,7 @@ #include <qpe/applnk.h> #include <qpe/config.h> #include <qpe/global.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/qpetoolbar.h> #include <qpe/resource.h> @@ -64,7 +64,7 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags fl ) setToolBarsMovable(false); - QPEToolBar* menuToolBar = new QPEToolBar(this); + QToolBar* menuToolBar = new QToolBar(this); QMenuBar* menuBar = new QMenuBar(menuToolBar); QPopupMenu* toolsPopupMenu = new QPopupMenu(menuBar); @@ -103,7 +103,7 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags fl ) // init page toolbar - QPEToolBar* pageToolBar = new QPEToolBar(this); + QToolBar* pageToolBar = new QToolBar(this); QAction* newPageAction = new QAction(tr("New Page"), Resource::loadPixmap("new"), QString::null, 0, this); connect(newPageAction, SIGNAL(activated()), this, SLOT(newPage())); @@ -120,12 +120,12 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags fl ) deletePageAction->addTo(pageToolBar); deletePageAction->setWhatsThis( tr( "Click here to remove the current sheet." ) ); - QPEToolBar* emptyToolBar = new QPEToolBar(this); + QToolBar* emptyToolBar = new QToolBar(this); emptyToolBar->setHorizontalStretchable(true); // init navigation toolbar - QPEToolBar* navigationToolBar = new QPEToolBar(this); + QToolBar* navigationToolBar = new QToolBar(this); m_pUndoAction = new QAction(tr("Undo"), Resource::loadIconSet("undo"), QString::null, 0, this); connect(m_pUndoAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(undo())); @@ -159,7 +159,7 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags fl ) // init draw mode toolbar - QPEToolBar* drawModeToolBar = new QPEToolBar(this); + QToolBar* drawModeToolBar = new QToolBar(this); m_pLineToolButton = new QToolButton(drawModeToolBar); m_pLineToolButton->setToggleButton(true); @@ -236,13 +236,13 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags fl ) setEllipseTool(); setPointTool(); - emptyToolBar = new QPEToolBar(this); + emptyToolBar = new QToolBar(this); emptyToolBar->setHorizontalStretchable(true); emptyToolBar->addSeparator(); // init draw parameters toolbar - QPEToolBar* drawParametersToolBar = new QPEToolBar(this); + QToolBar* drawParametersToolBar = new QToolBar(this); m_pPenWidthSpinBox = new QSpinBox(1, 9, 1, drawParametersToolBar); connect(m_pPenWidthSpinBox, SIGNAL(valueChanged(int)), this, SLOT(changePenWidth(int))); 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 @@ -36,7 +36,7 @@ HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* par if ( !home_.isEmpty() ) browser->setSource( home_ ); - QPEToolBar *toolbar = new QPEToolBar( this ); + QToolBar *toolbar = new QToolBar( this ); QAction *a = new QAction( tr( "Backward" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 ); connect( a, SIGNAL( activated() ), browser, SLOT( backward() ) ); 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 @@ -36,7 +36,7 @@ #include <qpe/applnk.h> #include <qfileinfo.h> #include <math.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qwidgetstack.h> #include <qpe/qpetoolbar.h> #include <qaction.h> @@ -228,7 +228,7 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags ) setToolBarsMovable( FALSE ); - toolBar = new QPEToolBar( this ); + toolBar = new QToolBar( this ); toolBar->setHorizontalStretchable( TRUE ); menuBar = new QMenuBar( toolBar ); @@ -314,7 +314,7 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags ) imageList = fileSelector->fileList(); slideAction->setEnabled( imageList.count() != 0); - iconToolBar = new QPEToolBar(this); + iconToolBar = new QToolBar(this); QAction *a; 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 @@ -34,7 +34,7 @@ class QAction; -class QPEToolBar; +class QToolBar; class QMenuBar; class QPopupMenu; class QWidgetStack; @@ -248,8 +248,8 @@ private: QImage image; // the loaded image QPixmap pm; // the converted pixmap QPixmap pmScaled; // the scaled pixmap - QPEToolBar *toolBar; - QPEToolBar *iconToolBar; + QToolBar *toolBar; + QToolBar *iconToolBar; QMenuBar *menuBar; QMenuBar *current; 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 @@ -19,7 +19,7 @@ extern "C" { #include "inputDialog.h" -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/qpeapplication.h> #include <qpe/resource.h> #include <qpe/config.h> @@ -69,7 +69,7 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); QMenuBar *menuBar = new QMenuBar(this); -// QPEToolBar *menuBar = new QPEToolBar(this); +// QToolBar *menuBar = new QToolBar(this); // menuBar->setHorizontalStretchable( TRUE ); QWMatrix matrix; 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 @@ -31,7 +31,7 @@ class QProgressBar; class QSpinBox; class QTabWidget; class QWidget; -class QPEToolBar; +class QToolBar; class QMenuBar; class QPopupMenu; class QFile; 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,4 +1,4 @@ -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/resource.h> #include <qpe/config.h> #include <qpopupmenu.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 @@ -24,7 +24,7 @@ MainView::MainView(QWidget *parent, const char *name, WFlags fl) : QMainWindow(p setToolBarsMovable( false ); - 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"); forward = new QToolButton(Resource::loadPixmap("ubrowser/forward"), 0, 0, 0, 0, toolbar, "forward"); home = new QToolButton(Resource::loadPixmap("ubrowser/home"), 0, 0, 0, 0, toolbar, "home"); 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 @@ -15,7 +15,7 @@ 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> #include <qapplication.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 @@ -34,7 +34,7 @@ UserConfig::UserConfig(QWidget* parent, const char* name, WFlags fl) : QMainWind accounts->open(); // This actually loads the files /etc/passwd & /etc/group into memory. // 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!? adduserToolButton = new QToolButton(Resource::loadPixmap("usermanager/adduser"),"Add User",0,this,SLOT(addUser()),toolbar,"Add User"); edituserToolButton = new QToolButton(Resource::loadPixmap("usermanager/edituser"),"Edit User",0,this,SLOT(editUser()),toolbar,"Edit User"); 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 @@ -16,7 +16,7 @@ #include <qpopupmenu.h> #include <qtoolbutton.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include "userdialog.h" #include "groupdialog.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 @@ -10,7 +10,7 @@ #include "inputDialog.h" #include "output.h" -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/qpetoolbar.h> #include <qpe/qpeapplication.h> #include <qpe/resource.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 @@ -35,7 +35,7 @@ #include <qdir.h> #include <qregexp.h> #include <qheader.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpopupmenu.h> #include <qmenubar.h> #include <qaction.h> @@ -839,7 +839,7 @@ void FileBrowser::init(const QString & dir) setCentralWidget( fileView ); setToolBarsMovable( FALSE ); - QPEToolBar* toolBar = new QPEToolBar( this ); + QToolBar* toolBar = new QToolBar( this ); toolBar->setHorizontalStretchable( TRUE ); QMenuBar* menuBar = new QMenuBar( toolBar ); @@ -869,7 +869,7 @@ void FileBrowser::init(const QString & dir) menuBar->insertItem( tr("View"), viewMenu ); - toolBar = new QPEToolBar( this ); + toolBar = new QToolBar( this ); lastAction = new QAction( tr("Previous dir"), Resource::loadIconSet( "back" ), QString::null, 0, this, 0 ); 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 @@ -8,7 +8,7 @@ #include <qvbox.h> #include <qpe/qpetoolbar.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/resource.h> #include "mailstatusbar.h" @@ -21,7 +21,7 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl) setCaption(tr("Compose Message")); setToolBarsMovable(false); - toolbar = new QPEToolBar(this); + toolbar = new QToolBar(this); menubar = new QMenuBar( toolbar ); mailmenu = new QPopupMenu( menubar ); menubar->insertItem( tr( "Mail" ), mailmenu ); @@ -125,7 +125,7 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl) attachWindow->setToolBarsMovable(false); attachWindow->hide(); - attachToolbar = new QPEToolBar(attachWindow); + attachToolbar = new QToolBar(attachWindow); attachToolbar->setVerticalStretchable(true); addattach = new QAction(tr("Add an Attachement"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this); 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 @@ -7,7 +7,7 @@ class QMultiLineEdit; class MailStatusBar; class ListViewPlus; class QPopupMenu; -class QPEToolBar; +class QToolBar; class QMenuBar; class QPopupMenu; class QComboBox; @@ -42,7 +42,7 @@ protected: ListViewPlus *attachView; QMainWindow *attachWindow; QPopupMenu *attachPopup; - QPEToolBar *toolbar, *attachToolbar; + QToolBar *toolbar, *attachToolbar; QMenuBar *menubar; QPopupMenu *mailmenu; QComboBox *fromBox, *from, *receiversBox, *subjectBox, *priority; 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 @@ -5,7 +5,7 @@ #include <qvbox.h> #include <qpe/qpetoolbar.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/resource.h> #include "mainwindowbase.h" @@ -19,7 +19,7 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) setCaption(tr("E-Mail")); setToolBarsMovable(false); - toolbar = new QPEToolBar(this); + toolbar = new QToolBar(this); menubar = new QMenuBar( toolbar ); mailmenu = new QPopupMenu( menubar ); servermenu = new QPopupMenu( menubar ); 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 @@ -6,7 +6,7 @@ class ServerConnection; class MailStatusBar; class FolderWidget; -class QPEToolBar; +class QToolBar; class QMenuBar; class QPopupMenu; class MailTable; @@ -26,7 +26,7 @@ protected: ServerConnection *serverConnection; MailStatusBar *status; FolderWidget *folderView; - QPEToolBar *toolbar; + QToolBar *toolbar; QMenuBar *menubar; QPopupMenu *mailmenu, *servermenu; MailTable *mailView; 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 @@ -6,7 +6,7 @@ #include <qpopupmenu.h> #include <qpe/qpetoolbar.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/resource.h> #include "viewmailbase.h" @@ -18,7 +18,7 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) setCaption(tr("E-Mail by %1")); setToolBarsMovable(false); - toolbar = new QPEToolBar(this); + toolbar = new QToolBar(this); menubar = new QMenuBar( toolbar ); mailmenu = new QPopupMenu( menubar ); menubar->insertItem( tr( "Mail" ), mailmenu ); 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 @@ -6,7 +6,7 @@ class QAction; class OpenDiag; class QListView; -class QPEToolBar; +class QToolBar; class QTextBrowser; class QMenuBar; class QPopupMenu; @@ -21,7 +21,7 @@ public: protected: QAction *reply, *forward, *attachbutton, *deleteMail; QListView *attachments; - QPEToolBar *toolbar; + QToolBar *toolbar; QTextBrowser *browser; OpenDiag *openDiag; QMenuBar *menubar; 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 @@ -17,7 +17,7 @@ #include <qpe/qpemessagebox.h> #include <qpe/resource.h> #include <qpe/config.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpe/qcopenvelope_qws.h> #include <qaction.h> #include <qmessagebox.h> @@ -82,7 +82,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : void MainWindow::makeMenu() { - QPEToolBar *toolBar = new QPEToolBar( this ); + QToolBar *toolBar = new QToolBar( this ); QMenuBar *menuBar = new QMenuBar( toolBar ); QPopupMenu *srvMenu = new QPopupMenu( menuBar ); QPopupMenu *viewMenu = new QPopupMenu( menuBar ); @@ -142,7 +142,7 @@ void MainWindow::makeMenu() QAction *a; // SECTIONS - sectionBar = new QPEToolBar( this ); + sectionBar = new QToolBar( this ); addToolBar( sectionBar, "Section", QMainWindow::Top, TRUE ); sectionBar->setHorizontalStretchable( true ); QLabel *label = new QLabel( sectionBar, "section" ); @@ -169,7 +169,7 @@ void MainWindow::makeMenu() // sectionBar->setStretchableWidget( section ); //FIND - findBar = new QPEToolBar(this); + findBar = new QToolBar(this); addToolBar( findBar, "Filter", QMainWindow::Top, TRUE ); label = new QLabel( tr("Filter: "), findBar ); // label->setBackgroundMode( PaletteForeground ); @@ -190,7 +190,7 @@ void MainWindow::makeMenu() findAction->addTo( viewMenu ); //SEARCH - searchBar = new QPEToolBar(this); + searchBar = new QToolBar(this); addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); label = new QLabel( tr("Search: "), searchBar ); // label->setBackgroundMode( PaletteForeground ); @@ -214,7 +214,7 @@ void MainWindow::makeMenu() searchAction->addTo( viewMenu ); //DEST - destBar = new QPEToolBar(this); + destBar = new QToolBar(this); addToolBar( destBar, "Destination", QMainWindow::Top, TRUE ); label = new QLabel( tr("Destination: "), destBar ); // label->setBackgroundMode( PaletteForeground ); 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 @@ -28,7 +28,7 @@ #include "packagelistview.h" class QComboBox; -class QPEToolBar; +class QToolBar; class QLineEdit; class PackageListItem; class QCopChannel; @@ -89,18 +89,18 @@ private: QAction *runAction; QAction *updateAction; QAction *findAction; - QPEToolBar *findBar; + QToolBar *findBar; QLineEdit *findEdit; QAction *searchAction; QAction *searchCommit; - QPEToolBar *searchBar; + QToolBar *searchBar; QLineEdit *searchEdit; QAction *sectionAction; - QPEToolBar *sectionBar; + QToolBar *sectionBar; QComboBox *section; QComboBox *subsection; QAction *destAction; - QPEToolBar *destBar; + QToolBar *destBar; QComboBox *destination; QCheckBox* CheckBoxLink; }; 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 @@ -22,7 +22,7 @@ #include <qclipboard.h> #include <qpe/qpetoolbar.h> #include <qtoolbutton.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpopupmenu.h> #include <qwidgetstack.h> #include <qtimer.h> |