summaryrefslogtreecommitdiff
path: root/core/pim/datebook2
Side-by-side diff
Diffstat (limited to 'core/pim/datebook2') (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook2/mainwindow.cpp4
-rw-r--r--core/pim/datebook2/mainwindow.h6
2 files changed, 5 insertions, 5 deletions
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
@@ -1,24 +1,24 @@
#include <qcopchannel_qws.h>
#include <qwidgetstack.h>
#include <qlabel.h>
#include <qaction.h>
#include <qpopupmenu.h>
#include <qtimer.h>
#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>
#include "editor.h"
#include "show.h"
#include "templatemanager.h"
#include "bookmanager.h"
#include "mainwindow.h"
using namespace Datebook;
@@ -81,25 +81,25 @@ void MainWindow::edit() {
void MainWindow::edit( int uid ) {
}
/*
* init tool bars layout and so on
*/
void MainWindow::initUI() {
setToolBarsMovable( false );
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 );
m_popView = new QPopupMenu( this );
m_popSetting = new QPopupMenu( this );
mb->insertItem( tr("View"), m_popView );
mb->insertItem( tr("Settings" ), m_popSetting );
m_popTemplate = new QPopupMenu( this );
m_popTemplate->setCheckable( 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
@@ -4,25 +4,25 @@
#include <qlist.h>
#include <opie/opimmainwindow.h>
#include "descriptionmanager.h"
#include "locationmanager.h"
#include "templatemanager.h"
#include "view.h"
class QAction;
class QWidgetStack;
class QPopupMenu;
-class QPEToolBar;
+class QToolBar;
namespace Datebook {
class BookManager;
class Show;
class Editor;
class MainWindow : public OPimMainWindow {
Q_OBJECT
friend class Show; // to avoid QObject
friend class View; // to avoid QObject
friend class Editor;
public:
MainWindow();
~MainWindow();
@@ -53,25 +53,25 @@ namespace Datebook {
void doSetDocument( const QString& str );
void flush();
void reload();
int create();
bool remove( int uid );
void beam( int uid );
void show( int uid );
void edit( int uid );
void edit();
void add( const OPimRecord& );
private:
- QPEToolBar* toolbar();
+ QToolBar* toolbar();
QPopupMenu* viewMenu();
QPopupMenu* settingsMenu();
QPopupMenu* templateMenu();
View* currentView();
BookManager* manager();
TemplateManager templateManager();
LocationManager locationManager();
DescriptionManager descriptionManager();
void setLocationManager( const LocationManager& );
void setDescriptionManager( const DescriptionManager& );
Show* eventShow();
Editor* editor();
@@ -82,25 +82,25 @@ namespace Datebook {
// friend of the view
private:
void viewPopup( int );
void viewAdd( const QDate& date );
void viewAdd( const QDateTime&, const QDateTime& );
bool viewAP()const;
bool viewStartMonday()const;
// off view show
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;
BookManager* m_manager;
TemplateManager m_tempMan;
DescriptionManager m_descMan;
LocationManager m_locMan;
Show* m_show;
Editor* m_edit;
};
}