-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 @@ -6,3 +6,3 @@ #include <qpe/config.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qwidget.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 @@ -30,3 +30,3 @@ #include <qtoolbutton.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpushbutton.h> @@ -284,3 +284,3 @@ void Konsole::init(const char* _pgm, QStrList & _args) setToolBarsMovable( FALSE ); - QPEToolBar *menuToolBar = new QPEToolBar( this ); + QToolBar *menuToolBar = new QToolBar( this ); menuToolBar->setHorizontalStretchable( TRUE ); @@ -353,3 +353,3 @@ void Konsole::init(const char* _pgm, QStrList & _args) - QPEToolBar *toolbar = new QPEToolBar( this ); + QToolBar *toolbar = new QToolBar( this ); @@ -379,3 +379,3 @@ void Konsole::init(const char* _pgm, QStrList & _args) - secondToolBar = new QPEToolBar( this ); + secondToolBar = new QToolBar( this ); secondToolBar->setHorizontalStretchable( TRUE ); 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 @@ -32,3 +32,3 @@ #include <qtabwidget.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qcombobox.h> @@ -53,3 +53,3 @@ public: void setColLin(int columns, int lines); - QPEToolBar *secondToolBar; + QToolBar *secondToolBar; void show(); 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 @@ -35,3 +35,3 @@ #include <qmenubar.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpe/qcopenvelope_qws.h> @@ -84,3 +84,3 @@ void HelpBrowser::init( const QString& _home ) - QPEToolBar* toolbar = new QPEToolBar( this ); + QToolBar* toolbar = new QToolBar( this ); toolbar->setHorizontalStretchable( TRUE ); @@ -88,3 +88,3 @@ void HelpBrowser::init( const QString& _home ) - toolbar = new QPEToolBar( this ); + toolbar = new QToolBar( this ); // addToolBar( toolbar, "Toolbar"); 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 @@ -29,3 +29,3 @@ #include <qmenubar.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpe/qcopenvelope_qws.h> @@ -184,3 +184,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) - QPEToolBar *bar = new QPEToolBar( this ); + QToolBar *bar = new QToolBar( this ); bar->setHorizontalStretchable( true ); @@ -195,3 +195,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) - bar = new QPEToolBar( this ); + bar = new QToolBar( this ); editBar = bar; @@ -334,3 +334,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) - searchBar = new QPEToolBar(this); + searchBar = new QToolBar(this); addToolBar( searchBar, "Search", QMainWindow::Top, 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 @@ -24,3 +24,3 @@ #include <qmenubar.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpe/fileselector.h> @@ -156,3 +156,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) // Create Toolbar - QPEToolBar *toolbar = new QPEToolBar( this ); + QToolBar *toolbar = new QToolBar( this ); toolbar->setHorizontalStretchable( TRUE ); @@ -163,3 +163,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) - QPEToolBar *bar = new QPEToolBar( this ); + QToolBar *bar = new QToolBar( this ); bar->setLabel( tr( "Play Operations" ) ); 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 @@ -38,3 +38,3 @@ #include <qpe/qcopenvelope_qws.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qmenubar.h> @@ -92,3 +92,3 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, - QPEToolBar *bar = new QPEToolBar( this ); + QToolBar *bar = new QToolBar( this ); bar->setHorizontalStretchable( TRUE ); @@ -108,3 +108,3 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, // Create Toolbar - listTools = new QPEToolBar( this, "list operations" ); + listTools = new QToolBar( this, "list operations" ); listTools->setHorizontalStretchable( true ); 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 @@ -36,3 +36,3 @@ class AbLabel; class AbTable; -class QPEToolBar; +class QToolBar; class QPopupMenu; @@ -106,3 +106,3 @@ private: QPopupMenu *catMenu; - QPEToolBar *listTools; + QToolBar *listTools; QToolButton *deleteButton; 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 @@ -43,3 +43,3 @@ #include <qpe/timestring.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpe/tzselect.h> @@ -102,3 +102,3 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) -// QPEToolBar *bar = new QPEToolBar( this ); +// QToolBar *bar = new QToolBar( this ); // bar->setHorizontalStretchable( TRUE ); @@ -111,3 +111,3 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) - QPEToolBar *sub_bar = new QPEToolBar(this); + QToolBar *sub_bar = new QToolBar(this); sub_bar->setHorizontalStretchable(TRUE); 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 @@ -11,3 +11,3 @@ #include <qmenubar.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpe/qpemessagebox.h> @@ -92,3 +92,3 @@ void MainWindow::initUI() { - m_toolBar = new QPEToolBar( this ); + m_toolBar = new QToolBar( this ); m_toolBar->setHorizontalStretchable( TRUE ); diff --git a/core/pim/datebook2/mainwindow.h b/core/pim/datebook2/mainwindow.h index 3c22637..33ef864 100644 --- a/core/pim/datebook2/mainwindow.h +++ b/core/pim/datebook2/mainwindow.h @@ -15,3 +15,3 @@ class QWidgetStack; class QPopupMenu; -class QPEToolBar; +class QToolBar; namespace Datebook { @@ -64,3 +64,3 @@ namespace Datebook { private: - QPEToolBar* toolbar(); + QToolBar* toolbar(); QPopupMenu* viewMenu(); @@ -93,3 +93,3 @@ namespace Datebook { QWidgetStack* m_stack; - QPEToolBar *m_toolBar; + QToolBar *m_toolBar; QPopupMenu* m_popView; 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 @@ -34,3 +34,3 @@ #include <qpe/config.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpe/qpeapplication.h> @@ -115,4 +115,4 @@ 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 ); 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 @@ -24,3 +24,3 @@ class QAction; -class QPEToolBar; +class QToolBar; class QHBox; 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 @@ -214,3 +214,3 @@ void MainWindow::initActions() { 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 @@ -13,3 +13,3 @@ QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible ) - : QPEToolBar( (QMainWindow *)parent ), Todo::QuickEdit( (Todo::MainWindow *)parent ) { + : QToolBar( (QMainWindow *)parent ), Todo::QuickEdit( (Todo::MainWindow *)parent ) { setHorizontalStretchable( TRUE ); 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 @@ -5,3 +5,3 @@ -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> @@ -12,3 +12,3 @@ class QLabel; -class QuickEditImpl : public QPEToolBar, public Todo::QuickEdit { +class QuickEditImpl : public QToolBar, public Todo::QuickEdit { Q_OBJECT |