| -rw-r--r-- | kaddressbook/kabcore.cpp | 4 | ||||
| -rw-r--r-- | kmicromail/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | kmicromail/mainwindow.h | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 2a2f904..bbf8e1b 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -94,7 +94,9 @@ $Id$ #ifndef DESKTOP_VERSION #include <qpe/ir.h> +#include <qpe/qpemenubar.h> #include <qtopia/qcopenvelope_qws.h> #else +#include <qmenubar.h> #endif @@ -1760,5 +1762,5 @@ void KABCore::addActionsManually() #else //US setup toolbar - QMenuBar *menuBarTB = new QMenuBar( tb ); + QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); QPopupMenu *popupBarTB = new QPopupMenu( this ); menuBarTB->insertItem( "ME", popupBarTB); diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index 6df95c6..5793a58 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp @@ -27,5 +27,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) //KABC::StdAddressBook::self(); toolBar = new QToolBar( this ); - menuBar = new QMenuBar( toolBar ); + menuBar = new QPEMenuBar( toolBar ); mailMenu = new QPopupMenu( menuBar ); menuBar->insertItem( tr( "Mail" ), mailMenu ); diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h index f5b81aa..680f0a9 100644 --- a/kmicromail/mainwindow.h +++ b/kmicromail/mainwindow.h @@ -9,5 +9,9 @@ #include <qtoolbar.h> +#ifdef DESKTOP_VERSION #include <qmenubar.h> +#else +#include <qpe/qpemenubar.h> +#endif #include "accountview.h" @@ -50,5 +54,5 @@ protected: QToolBar *toolBar; StatusWidget *statusWidget; - QMenuBar *menuBar; + QPEMenuBar *menuBar; QPopupMenu *mailMenu, *settingsMenu; QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails, |