From 4518f62746143246d29eb9f08030e241ac33eeb7 Mon Sep 17 00:00:00 2001 From: mickeyl Date: Sun, 07 Dec 2003 14:06:21 +0000 Subject: s/QPEToolBar/QToolBar: - remove usage of deprecated classses - makes it easier to migrate to OToolBar in the future --- (limited to 'noncore/unsupported') 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 #include #include -#include +#include #include #include #include @@ -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 #include -#include +#include #include #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 #include -#include +#include #include #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 #include -#include +#include #include #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 #include #include -#include +#include #include #include #include @@ -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 #include #include -#include +#include #include #include #include -- cgit v0.9.0.2