summaryrefslogtreecommitdiff
authorconber <conber>2002-06-15 16:05:38 (UTC)
committer conber <conber>2002-06-15 16:05:38 (UTC)
commitf2f238ad06ce87e644bf56d0c6950a2aeae35ed4 (patch) (side-by-side diff)
tree82a465db09f4fa05a7af710492fe6c953f4a8e0f
parent3e9adfcfcc674ad9b329fcb17880ea24789dbcde (diff)
downloadopie-f2f238ad06ce87e644bf56d0c6950a2aeae35ed4.zip
opie-f2f238ad06ce87e644bf56d0c6950a2aeae35ed4.tar.gz
opie-f2f238ad06ce87e644bf56d0c6950a2aeae35ed4.tar.bz2
changed QToolBar to QPEToolBar
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/mail2/composerbase.cpp6
-rw-r--r--noncore/unsupported/mail2/composerbase.h4
-rw-r--r--noncore/unsupported/mail2/mainwindowbase.cpp4
-rw-r--r--noncore/unsupported/mail2/mainwindowbase.h4
-rw-r--r--noncore/unsupported/mail2/viewmailbase.cpp4
-rw-r--r--noncore/unsupported/mail2/viewmailbase.h4
6 files changed, 13 insertions, 13 deletions
diff --git a/noncore/unsupported/mail2/composerbase.cpp b/noncore/unsupported/mail2/composerbase.cpp
index 7754863..10d567d 100644
--- a/noncore/unsupported/mail2/composerbase.cpp
+++ b/noncore/unsupported/mail2/composerbase.cpp
@@ -1,28 +1,28 @@
#include <qmultilineedit.h>
#include <qpopupmenu.h>
#include <qcombobox.h>
#include <qlineedit.h>
-#include <qtoolbar.h>
#include <qlayout.h>
#include <qaction.h>
#include <qlabel.h>
#include <qvbox.h>
+#include <qpe/qpetoolbar.h>
#include <qpe/resource.h>
#include "listviewplus.h"
#include "composerbase.h"
ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
: QMainWindow(parent, name, fl)
{
setCaption(tr("Compose Message"));
setToolBarsMovable(false);
- toolbar = new QToolBar(this);
+ toolbar = new QPEToolBar(this);
addToolBar(toolbar);
toolbar->setHorizontalStretchable(true);
sendmail = new QAction(tr("Send the mail"), QIconSet(Resource::loadPixmap("mail/sendmail")), 0, 0, this);
sendmail->addTo(toolbar);
@@ -113,13 +113,13 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
attachWindow = new QMainWindow(view, 0, 0);
attachWindow->setMinimumHeight(100);
attachWindow->setMaximumHeight(100);
attachWindow->setToolBarsMovable(false);
attachWindow->hide();
- attachToolbar = new QToolBar(attachWindow);
+ attachToolbar = new QPEToolBar(attachWindow);
attachToolbar->setVerticalStretchable(true);
addattach = new QAction(tr("Add an Attachement"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this);
addattach->addTo(attachToolbar);
delattach = new QAction(tr("Remove Attachement"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this);
diff --git a/noncore/unsupported/mail2/composerbase.h b/noncore/unsupported/mail2/composerbase.h
index e5fab67..75b77f4 100644
--- a/noncore/unsupported/mail2/composerbase.h
+++ b/noncore/unsupported/mail2/composerbase.h
@@ -3,15 +3,15 @@
#include <qmainwindow.h>
class QMultiLineEdit;
class ListViewPlus;
class QPopupMenu;
+class QPEToolBar;
class QComboBox;
class QLineEdit;
-class QToolBar;
class QAction;
class QLabel;
class ComposerBase : public QMainWindow
{
Q_OBJECT
@@ -35,15 +35,15 @@ protected:
static const int POPUP_ATTACH_REMOVE = 2;
QMultiLineEdit *message;
ListViewPlus *attachView;
QMainWindow *attachWindow;
QPopupMenu *attachPopup;
+ QPEToolBar *toolbar, *attachToolbar;
QComboBox *fromBox, *from, *receiversBox, *subjectBox, *priority;
QLineEdit *replyto, *to, *cc, *bcc, *subject;
- QToolBar *toolbar, *attachToolbar;
QAction *sendmail, *attachfile, *addressbook, *abort, *addattach, *delattach;
QLabel *fromLabel, *status;
protected slots:
void slotAttachfileChanged(bool toggled);
void slotFromMenuChanged(int id);
diff --git a/noncore/unsupported/mail2/mainwindowbase.cpp b/noncore/unsupported/mail2/mainwindowbase.cpp
index 4054af6..c55bd90 100644
--- a/noncore/unsupported/mail2/mainwindowbase.cpp
+++ b/noncore/unsupported/mail2/mainwindowbase.cpp
@@ -1,28 +1,28 @@
#include <qprogressbar.h>
#include <qtoolbutton.h>
#include <qpopupmenu.h>
-#include <qtoolbar.h>
#include <qaction.h>
#include <qheader.h>
#include <qlabel.h>
#include <qvbox.h>
+#include <qpe/qpetoolbar.h>
#include <qpe/resource.h>
#include "mainwindowbase.h"
#include "folderwidget.h"
#include "mailtable.h"
MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
: QMainWindow(parent, name, fl)
{
setCaption(tr("E-Mail"));
setToolBarsMovable(false);
- toolbar = new QToolBar(this);
+ toolbar = new QPEToolBar(this);
addToolBar(toolbar);
toolbar->setHorizontalStretchable(true);
compose = new QAction(tr("Compose new mail"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this);
compose->addTo(toolbar);
diff --git a/noncore/unsupported/mail2/mainwindowbase.h b/noncore/unsupported/mail2/mainwindowbase.h
index cf23f4f..0776f02 100644
--- a/noncore/unsupported/mail2/mainwindowbase.h
+++ b/noncore/unsupported/mail2/mainwindowbase.h
@@ -3,14 +3,14 @@
#include <qmainwindow.h>
class ServerConnection;
class QProgressBar;
class FolderWidget;
+class QPEToolBar;
class MailTable;
-class QToolBar;
class QAction;
class QLabel;
class MainWindowBase : public QMainWindow
{
Q_OBJECT
@@ -22,14 +22,14 @@ protected slots:
void slotFoldersToggled(bool toggled);
protected:
ServerConnection *serverConnection;
QProgressBar *statusProgress;
FolderWidget *folderView;
+ QPEToolBar *toolbar;
MailTable *mailView;
- QToolBar *toolbar;
QAction *compose, *folders, *findmails, *configure, *stop;
QLabel *statusLabel;
};
#endif
diff --git a/noncore/unsupported/mail2/viewmailbase.cpp b/noncore/unsupported/mail2/viewmailbase.cpp
index 134e5cb..b650c88 100644
--- a/noncore/unsupported/mail2/viewmailbase.cpp
+++ b/noncore/unsupported/mail2/viewmailbase.cpp
@@ -1,25 +1,25 @@
#include <qtextbrowser.h>
#include <qlistview.h>
-#include <qtoolbar.h>
#include <qaction.h>
#include <qlabel.h>
#include <qvbox.h>
+#include <qpe/qpetoolbar.h>
#include <qpe/resource.h>
#include "viewmailbase.h"
#include "opendiag.h"
ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
: QMainWindow(parent, name, fl)
{
setCaption(tr("E-Mail by %1"));
setToolBarsMovable(false);
- toolbar = new QToolBar(this);
+ toolbar = new QPEToolBar(this);
toolbar->setHorizontalStretchable(true);
addToolBar(toolbar);
reply = new QAction(tr("Reply"), QIconSet(Resource::loadPixmap("mail/reply")), 0, 0, this);
reply->addTo(toolbar);
diff --git a/noncore/unsupported/mail2/viewmailbase.h b/noncore/unsupported/mail2/viewmailbase.h
index 183bb04..9ddf2aa 100644
--- a/noncore/unsupported/mail2/viewmailbase.h
+++ b/noncore/unsupported/mail2/viewmailbase.h
@@ -2,27 +2,27 @@
#define VIEWMAILBASE_H
#include <qmainwindow.h>
class QAction;
class OpenDiag;
-class QToolBar;
class QListView;
+class QPEToolBar;
class QTextBrowser;
class ViewMailBase : public QMainWindow
{
Q_OBJECT
public:
ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
protected:
QAction *reply, *forward, *attachbutton, *deleteMail;
QListView *attachments;
- QToolBar *toolbar;
+ QPEToolBar *toolbar;
QTextBrowser *browser;
OpenDiag *openDiag;
protected slots:
void slotChangeAttachview(bool state);