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 /core/pim | |
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/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 |
10 files changed, 21 insertions, 21 deletions
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); |