summaryrefslogtreecommitdiffabout
path: root/korganizer/mainwindow.cpp
Side-by-side diff
Diffstat (limited to 'korganizer/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp316
1 files changed, 163 insertions, 153 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 69ccde1..2004939 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -3,5 +3,6 @@
#include <qaction.h>
-#include <qpopupmenu.h>
+#include <Q3Action>
+#include <q3popupmenu.h>
#include <qpainter.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
#include <qpushbutton.h>
@@ -12,3 +13,3 @@
#include <qdir.h>
-#include <qapp.h>
+#include <qapplication.h>
#include <qfileinfo.h>
@@ -18,5 +19,5 @@
#include <qmap.h>
-#include <qwmatrix.h>
-#include <qtextbrowser.h>
-#include <qtextstream.h>
+#include <qmatrix.h>
+#include <q3textbrowser.h>
+#include <q3textstream.h>
#ifndef DESKTOP_VERSION
@@ -30,4 +31,13 @@
#else
-#include <qtoolbar.h>
+#include <q3toolbar.h>
#include <qapplication.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QPixmap>
+#include <QCloseEvent>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
+#include <QHideEvent>
+#include <Q3CString>
+#include <Q3PtrList>
//#include <resource.h>
@@ -82,3 +92,3 @@ class KOex2phonePrefs : public QDialog
setCaption( i18n("Export to phone options") );
- QVBoxLayout* lay = new QVBoxLayout( this );
+ Q3VBoxLayout* lay = new Q3VBoxLayout( this );
lay->setSpacing( 3 );
@@ -87,5 +97,5 @@ class KOex2phonePrefs : public QDialog
lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) );
- lab->setAlignment (AlignHCenter );
- QHBox* temphb;
- temphb = new QHBox( this );
+ lab->setAlignment (Qt::AlignHCenter );
+ Q3HBox* temphb;
+ temphb = new Q3HBox( this );
new QLabel( i18n("I/O device: "), temphb );
@@ -93,3 +103,3 @@ class KOex2phonePrefs : public QDialog
lay->addWidget( temphb );
- temphb = new QHBox( this );
+ temphb = new Q3HBox( this );
new QLabel( i18n("Connection: "), temphb );
@@ -97,3 +107,3 @@ class KOex2phonePrefs : public QDialog
lay->addWidget( temphb );
- temphb = new QHBox( this );
+ temphb = new Q3HBox( this );
new QLabel( i18n("Model(opt.): "), temphb );
@@ -104,3 +114,3 @@ class KOex2phonePrefs : public QDialog
lay->addWidget( mWriteBackFuture );
- temphb = new QHBox( this );
+ temphb = new Q3HBox( this );
new QLabel( i18n("Max. weeks in future: ") , temphb );
@@ -110,3 +120,3 @@ class KOex2phonePrefs : public QDialog
lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ntodo/calendar data on phone!"), this ) );
- lab->setAlignment (AlignHCenter );
+ lab->setAlignment (Qt::AlignHCenter );
QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this );
@@ -136,3 +146,3 @@ int globalFlagBlockStartup;
MainWindow::MainWindow( QWidget *parent, const char *name ) :
- QMainWindow( parent, name )
+ Q3MainWindow( parent, name )
{
@@ -187,8 +197,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
p->mHourSize = 22;
- QMainWindow::ToolBarDock tbd;
+ Qt::ToolBarDock tbd;
if ( p->mToolBarHor ) {
if ( p->mToolBarUp )
- tbd = Bottom;
+ tbd = Qt::Bottom;
else
- tbd = Top;
+ tbd = Qt::Top;
}
@@ -196,5 +206,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
if ( p->mToolBarUp )
- tbd = Right;
+ tbd = Qt::Right;
else
- tbd = Left;
+ tbd = Qt::Left;
}
@@ -215,5 +225,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
if ( p->mToolBarUpF )
- tbd = Bottom;
+ tbd = Qt::Bottom;
else
- tbd = Top;
+ tbd = Qt::Top;
}
@@ -221,5 +231,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
if ( p->mToolBarUpF )
- tbd = Right;
+ tbd = Qt::Right;
else
- tbd = Left;
+ tbd = Qt::Left;
}
@@ -232,3 +242,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
#endif
- filterPopupMenu = new QPopupMenu( this );
+ filterPopupMenu = new Q3PopupMenu( this );
filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0 );
@@ -261,5 +271,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
if ( p->mToolBarUpV )
- tbd = Bottom;
+ tbd = Qt::Bottom;
else
- tbd = Top;
+ tbd = Qt::Top;
}
@@ -267,5 +277,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
if ( p->mToolBarUpV )
- tbd = Right;
+ tbd = Qt::Right;
else
- tbd = Left;
+ tbd = Qt::Left;
}
@@ -275,5 +285,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
if ( p->mToolBarUpN )
- tbd = Bottom;
+ tbd = Qt::Bottom;
else
- tbd = Top;
+ tbd = Qt::Top;
}
@@ -281,5 +291,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
if ( p->mToolBarUpN )
- tbd = Right;
+ tbd = Qt::Right;
else
- tbd = Left;
+ tbd = Qt::Left;
}
@@ -442,5 +452,5 @@ void MainWindow::loadDataAfterStart()
#ifndef DESKTOP_VERSION
- connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
- connect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(recieve( const QCString&, const QByteArray& )));
- disconnect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(receiveStart( const QCString&, const QByteArray& )));
+ connect(qApp, SIGNAL (appMessage ( const Q3CString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const Q3CString &, const QByteArray & )));
+ connect( qApp, SIGNAL (appMessage ( const Q3CString &, const QByteArray & )), this, SLOT(recieve( const Q3CString&, const QByteArray& )));
+ disconnect( qApp, SIGNAL (appMessage ( const Q3CString &, const QByteArray & )), this, SLOT(receiveStart( const Q3CString&, const QByteArray& )));
if ( !mCStringMess.isEmpty() )
@@ -511,3 +521,3 @@ void MainWindow::toggleBeamReceive()
infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ;
- QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve( const QCString&, const QByteArray& )));
+ QObject::connect( infrared, SIGNAL (received ( const Q3CString &, const QByteArray & )),this, SLOT(recieve( const Q3CString&, const QByteArray& )));
#endif
@@ -602,3 +612,3 @@ void MainWindow::closeEvent( QCloseEvent* ce )
}
-void MainWindow::receiveStart( const QCString& cmsg, const QByteArray& data )
+void MainWindow::receiveStart( const Q3CString& cmsg, const QByteArray& data )
{
@@ -608,5 +618,5 @@ void MainWindow::receiveStart( const QCString& cmsg, const QByteArray& data )
}
-void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
+void MainWindow::recieve( const Q3CString& cmsg, const QByteArray& data )
{
- QDataStream stream( data, IO_ReadOnly );
+ QDataStream stream( const_cast<QByteArray*>(&data), QIODevice::ReadOnly );
// QMessageBox::about( this, "About KOrganizer/Pi", "*" +msg +"*" );
@@ -617,3 +627,3 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
if ( cmsg == "setDocument(QString)" ) {
- QDataStream stream( data, IO_ReadOnly );
+ QDataStream stream( const_cast<QByteArray*>(&data), QIODevice::ReadOnly );
QString fileName;
@@ -746,17 +756,17 @@ void MainWindow::initActions()
- QPopupMenu *viewMenu = new QPopupMenu( this );
- QPopupMenu *actionMenu = new QPopupMenu( this );
- mCurrentItemMenu = new QPopupMenu ( this );
- QPopupMenu *nextConflictMenu = new QPopupMenu ( this );
- QPopupMenu *importMenu = new QPopupMenu( this );
- QPopupMenu *importMenu_X = new QPopupMenu( this );
- QPopupMenu *exportMenu_X = new QPopupMenu( this );
- QPopupMenu *beamMenu_X = new QPopupMenu( this );
- selectFilterMenu = new QPopupMenu( this );
+ Q3PopupMenu *viewMenu = new Q3PopupMenu( this );
+ Q3PopupMenu *actionMenu = new Q3PopupMenu( this );
+ mCurrentItemMenu = new Q3PopupMenu ( this );
+ Q3PopupMenu *nextConflictMenu = new Q3PopupMenu ( this );
+ Q3PopupMenu *importMenu = new Q3PopupMenu( this );
+ Q3PopupMenu *importMenu_X = new Q3PopupMenu( this );
+ Q3PopupMenu *exportMenu_X = new Q3PopupMenu( this );
+ Q3PopupMenu *beamMenu_X = new Q3PopupMenu( this );
+ selectFilterMenu = new Q3PopupMenu( this );
selectFilterMenu->setCheckable( true );
- syncMenu = new QPopupMenu( this );
- configureAgendaMenu = new QPopupMenu( this );
- configureToolBarMenu = new QPopupMenu( this );
- QPopupMenu *helpMenu = new QPopupMenu( this );
- QIconSet icon;
+ syncMenu = new Q3PopupMenu( this );
+ configureAgendaMenu = new Q3PopupMenu( this );
+ configureToolBarMenu = new Q3PopupMenu( this );
+ Q3PopupMenu *helpMenu = new Q3PopupMenu( this );
+ QIcon icon;
int pixWid = 22, pixHei = 22;
@@ -793,3 +803,3 @@ void MainWindow::initActions()
menuBar1 = new KMenuBar( iconToolBar );
- QPopupMenu *menuBar = new QPopupMenu( this );
+ Q3PopupMenu *menuBar = new Q3PopupMenu( this );
icon = loadPixmap( pathString + "z_menu" );
@@ -820,3 +830,3 @@ void MainWindow::initActions()
icon = mWeekPixmap;
- mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this );
+ mWeekAction = new Q3Action( i18n("Select week number"),icon, i18n("Select week number"), 0, this );
if ( p-> mShowIconWeekNum )
@@ -842,3 +852,3 @@ void MainWindow::initActions()
icon = loadPixmap( pathString + "filter" );
- actionFilterMenuTB = new QAction( i18n("Filter selector"), icon, i18n("Filter selector"), 0, this );
+ actionFilterMenuTB = new Q3Action( i18n("Filter selector"), icon, i18n("Filter selector"), 0, this );
connect( actionFilterMenuTB, SIGNAL( activated() ),
@@ -846,3 +856,3 @@ void MainWindow::initActions()
actionFilterMenuTB->addTo( iconToolBar );
- selectFilterMenuTB = new QPopupMenu( this );
+ selectFilterMenuTB = new Q3PopupMenu( this );
selectFilterMenuTB->setCheckable( true );
@@ -853,3 +863,3 @@ void MainWindow::initActions()
// ******************
- QAction *action;
+ Q3Action *action;
// QPopupMenu *configureMenu= new QPopupMenu( menuBar );
@@ -868,3 +878,3 @@ void MainWindow::initActions()
icon = loadPixmap( pathString + "today" );
- QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
+ Q3Action* today_action = new Q3Action( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
today_action->addTo( actionMenu );
@@ -874,3 +884,3 @@ void MainWindow::initActions()
icon = loadPixmap( pathString + "picker" );
- QAction* dPickerAction = new QAction( i18n("Select Date..."), icon, i18n("Select Date..."), 0, this );
+ Q3Action* dPickerAction = new Q3Action( i18n("Select Date..."), icon, i18n("Select Date..."), 0, this );
dPickerAction->addTo( actionMenu );
@@ -880,3 +890,3 @@ void MainWindow::initActions()
icon = loadPixmap( pathString + "search" );
- QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
+ Q3Action* search_action = new Q3Action( i18n("Search"), icon, i18n("Search..."), 0, this );
search_action->addTo( actionMenu );
@@ -886,3 +896,3 @@ void MainWindow::initActions()
- action = new QAction( "Undo Delete", i18n("All events"), 0, this );
+ action = new Q3Action( "Undo Delete", i18n("All events"), 0, this );
action->addTo( nextConflictMenu );
@@ -891,3 +901,3 @@ void MainWindow::initActions()
- action = new QAction( "Undo Delete", i18n("Allday events"), 0, this );
+ action = new Q3Action( "Undo Delete", i18n("Allday events"), 0, this );
action->addTo( nextConflictMenu );
@@ -896,3 +906,3 @@ void MainWindow::initActions()
- action = new QAction( "Undo Delete", i18n("Events with time"), 0, this );
+ action = new Q3Action( "Undo Delete", i18n("Events with time"), 0, this );
action->addTo( nextConflictMenu );
@@ -904,3 +914,3 @@ void MainWindow::initActions()
icon = loadPixmap( pathString + "newevent" );
- QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
+ Q3Action* ne_action = new Q3Action( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
ne_action->addTo( mCurrentItemMenu );
@@ -909,3 +919,3 @@ void MainWindow::initActions()
icon = loadPixmap( pathString + "newtodo" );
- QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
+ Q3Action* nt_action = new Q3Action( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
nt_action->addTo( mCurrentItemMenu );
@@ -913,3 +923,3 @@ void MainWindow::initActions()
mView, SLOT( newTodo() ) );
- mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0,
+ mNewSubTodoAction = new Q3Action( "new_subtodo", i18n("New Sub-Todo..."), 0,
this );
@@ -932,3 +942,3 @@ void MainWindow::initActions()
//actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu);
- mShowAction = new QAction( "show_incidence", i18n("Show"), 0, this );
+ mShowAction = new Q3Action( "show_incidence", i18n("Show"), 0, this );
mShowAction->addTo( mCurrentItemMenu );
@@ -937,3 +947,3 @@ void MainWindow::initActions()
- mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
+ mEditAction = new Q3Action( "edit_incidence", i18n("Edit..."), 0, this );
mEditAction->addTo( mCurrentItemMenu );
@@ -942,3 +952,3 @@ void MainWindow::initActions()
- mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
+ mDeleteAction = new Q3Action( "delete_incidence", i18n("Delete..."), 0, this );
mDeleteAction->addTo( mCurrentItemMenu );
@@ -948,3 +958,3 @@ void MainWindow::initActions()
- mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this );
+ mCloneAction = new Q3Action( "clone_incidence", i18n("Clone..."), 0, this );
mCloneAction->addTo( mCurrentItemMenu );
@@ -952,3 +962,3 @@ void MainWindow::initActions()
mView, SLOT( cloneIncidence() ) );
- mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this );
+ mMoveAction = new Q3Action( "Move_incidence", i18n("Move..."), 0, this );
mMoveAction->addTo( mCurrentItemMenu );
@@ -957,3 +967,3 @@ void MainWindow::initActions()
#ifndef DESKTOP_VERSION
- mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
+ mBeamAction = new Q3Action( "Beam_incidence", i18n("Beam..."), 0, this );
mBeamAction->addTo(mCurrentItemMenu );
@@ -962,3 +972,3 @@ void MainWindow::initActions()
#endif
- mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
+ mCancelAction = new Q3Action( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
mCancelAction->addTo( mCurrentItemMenu );
@@ -969,3 +979,3 @@ void MainWindow::initActions()
mCurrentItemMenu->insertSeparator();
- action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
+ action = new Q3Action( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
action->addTo( mCurrentItemMenu );
@@ -981,3 +991,3 @@ void MainWindow::initActions()
configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 );
- QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this );
+ Q3Action* FSaction = new Q3Action( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this );
FSaction->addTo( viewMenu );
@@ -989,3 +999,3 @@ void MainWindow::initActions()
icon = loadPixmap( pathString + "configure" );
- action = new QAction( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this );
+ action = new Q3Action( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this );
action->addTo( viewMenu );
@@ -996,3 +1006,3 @@ void MainWindow::initActions()
configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 );
- action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
+ action = new Q3Action( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
action->addTo( viewMenu );
@@ -1003,3 +1013,3 @@ void MainWindow::initActions()
configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 );
- action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
+ action = new Q3Action( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
action->addTo( viewMenu );
@@ -1033,3 +1043,3 @@ void MainWindow::initActions()
configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 );
- QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
+ Q3Action* whatsnext_action = new Q3Action( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
whatsnext_action->addTo( viewMenu );
@@ -1040,3 +1050,3 @@ void MainWindow::initActions()
configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 );
- QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this );
+ Q3Action* xdays_action = new Q3Action( i18n("Next days"), icon, i18n("Next days"), 0, this );
xdays_action->addTo( viewMenu );
@@ -1048,3 +1058,3 @@ void MainWindow::initActions()
configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 );
- QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this );
+ Q3Action* viewjournal_action = new Q3Action( i18n("Journal"), icon, i18n("Journal"), 0, this );
viewjournal_action->addTo( viewMenu );
@@ -1056,3 +1066,3 @@ void MainWindow::initActions()
configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 );
- QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this );
+ Q3Action* day1_action = new Q3Action( i18n("Day View"), icon, i18n("Day View"), 0, this );
day1_action->addTo( viewMenu );
@@ -1064,3 +1074,3 @@ void MainWindow::initActions()
configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 );
- QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this );
+ Q3Action* day5_action = new Q3Action( i18n("Work Week"), icon, i18n("Work Week"), 0, this );
day5_action->addTo( viewMenu );
@@ -1071,3 +1081,3 @@ void MainWindow::initActions()
configureToolBarMenu->insertItem(icon, i18n("Week"), 60 );
- QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this );
+ Q3Action* day7_action = new Q3Action( i18n("Week"), icon, i18n("Week"), 0, this );
day7_action->addTo( viewMenu );
@@ -1078,3 +1088,3 @@ void MainWindow::initActions()
configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 );
- QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this );
+ Q3Action* day6_action = new Q3Action( i18n("List week"), icon, i18n("List week"), 0, this );
day6_action->addTo( viewMenu );
@@ -1085,3 +1095,3 @@ void MainWindow::initActions()
configureToolBarMenu->insertItem(icon, i18n("Month"), 70 );
- QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this );
+ Q3Action* month_action = new Q3Action( i18n("Month"), icon, i18n("Month"), 0, this );
month_action->addTo( viewMenu );
@@ -1092,3 +1102,3 @@ void MainWindow::initActions()
configureToolBarMenu->insertItem(icon, i18n("List View"), 30 );
- QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this );
+ Q3Action* showlist_action = new Q3Action( i18n("List View"), icon, i18n("List View"), 0, this );
showlist_action->addTo( viewMenu );
@@ -1099,3 +1109,3 @@ void MainWindow::initActions()
configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 );
- QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this );
+ Q3Action* todoview_action = new Q3Action( i18n("Todo View"), icon, i18n("Todo View"), 0, this );
todoview_action->addTo( viewMenu );
@@ -1107,3 +1117,3 @@ void MainWindow::initActions()
#if 0
- action = new QAction( "view_timespan", "Time Span", 0, this );
+ action = new Q3Action( "view_timespan", "Time Span", 0, this );
action->addTo( viewMenu );
@@ -1115,3 +1125,3 @@ void MainWindow::initActions()
- action = new QAction( "purge_completed", i18n("Purge Completed..."), 0,
+ action = new Q3Action( "purge_completed", i18n("Purge Completed..."), 0,
this );
@@ -1127,3 +1137,3 @@ void MainWindow::initActions()
actionMenu->insertSeparator();
- action = new QAction( "manage cat", i18n("Edit category list..."), 0,
+ action = new Q3Action( "manage cat", i18n("Edit category list..."), 0,
this );
@@ -1132,3 +1142,3 @@ void MainWindow::initActions()
- action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
+ action = new Q3Action( "manage cat", i18n("Manage new categories..."), 0,
this );
@@ -1140,3 +1150,3 @@ void MainWindow::initActions()
icon = loadPixmap( pathString + "configure" );
- action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this );
+ action = new Q3Action( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this );
action->addTo( actionMenu );
@@ -1144,3 +1154,3 @@ void MainWindow::initActions()
mView, SLOT( edit_options() ) );
- action = new QAction( i18n("Configure"),icon, i18n("Configure Calendar Files..."), 0, this );
+ action = new Q3Action( i18n("Configure"),icon, i18n("Configure Calendar Files..."), 0, this );
action->addTo( actionMenu );
@@ -1148,3 +1158,3 @@ void MainWindow::initActions()
this, SLOT( calHint() ) );
- action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
+ action = new Q3Action( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
action->addTo( actionMenu );
@@ -1157,3 +1167,3 @@ void MainWindow::initActions()
// actionMenu->insertSeparator();
- action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0,
+ action = new Q3Action( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0,
this );
@@ -1161,3 +1171,3 @@ void MainWindow::initActions()
connect( action, SIGNAL( activated() ), SLOT( importIcal() ) );
- action = new QAction( "import_quick", i18n("Import last file"), 0,
+ action = new Q3Action( "import_quick", i18n("Import last file"), 0,
this );
@@ -1166,3 +1176,3 @@ void MainWindow::initActions()
importMenu_X->insertSeparator();
- action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0,
+ action = new Q3Action( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0,
this );
@@ -1172,3 +1182,3 @@ void MainWindow::initActions()
importMenu_X->insertSeparator();
- action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
+ action = new Q3Action( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
this );
@@ -1179,3 +1189,3 @@ void MainWindow::initActions()
importMenu_X->insertSeparator();
- action = new QAction( "import_ol", i18n("Import from OL"), 0,
+ action = new Q3Action( "import_ol", i18n("Import from OL"), 0,
this );
@@ -1188,3 +1198,3 @@ void MainWindow::initActions()
#if 0
- action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0,
+ action = new Q3Action( "load_cal", i18n("Load Calendar Backup"), 0,
this );
@@ -1193,3 +1203,3 @@ void MainWindow::initActions()
#endif
- action = new QAction( "save_cal", i18n("Save Backup..."), 0,
+ action = new Q3Action( "save_cal", i18n("Save Backup..."), 0,
this );
@@ -1200,3 +1210,3 @@ void MainWindow::initActions()
//importMenu->insertSeparator();
- action = new QAction( "export ical", i18n("Export All Data"), 0,
+ action = new Q3Action( "export ical", i18n("Export All Data"), 0,
this );
@@ -1204,3 +1214,3 @@ void MainWindow::initActions()
connect( action, SIGNAL( activated() ), SLOT( exportICalendar() ) );
- action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0,
+ action = new Q3Action( "import_qtopia", i18n("Export VCalendar"), 0,
this );
@@ -1211,3 +1221,3 @@ void MainWindow::initActions()
//LR
- QPopupMenu *ex2phone = new QPopupMenu( this );
+ Q3PopupMenu *ex2phone = new Q3PopupMenu( this );
ex2phone->insertItem(i18n("Complete calendar..."), 1 );
@@ -1221,3 +1231,3 @@ void MainWindow::initActions()
//importMenu->insertSeparator();
- brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0,
+ brAction = new Q3Action( "beam toggle", i18n("Beam receive enabled"), 0,
this );
@@ -1227,3 +1237,3 @@ void MainWindow::initActions()
- action = new QAction( "beam all", i18n("Beam complete calendar..."), 0,
+ action = new Q3Action( "beam all", i18n("Beam complete calendar..."), 0,
this );
@@ -1232,3 +1242,3 @@ void MainWindow::initActions()
- action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0,
+ action = new Q3Action( "beam all", i18n("Beam filtered calendar..."), 0,
this );
@@ -1240,3 +1250,3 @@ void MainWindow::initActions()
icon = loadPixmap( pathString + "print" );
- action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this );
+ action = new Q3Action( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this );
action->addTo( beamMenu_X );
@@ -1246,3 +1256,3 @@ void MainWindow::initActions()
icon = loadPixmap( pathString + "week" );
- action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
+ action = new Q3Action( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
action->addTo( beamMenu_X );
@@ -1251,3 +1261,3 @@ void MainWindow::initActions()
icon = loadPixmap( pathString + "whatsnext" );
- action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this );
+ action = new Q3Action( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this );
action->addTo( beamMenu_X );
@@ -1258,3 +1268,3 @@ void MainWindow::initActions()
icon = loadPixmap( pathString + "list" );
- action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this );
+ action = new Q3Action( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this );
action->addTo( beamMenu_X );
@@ -1264,3 +1274,3 @@ void MainWindow::initActions()
icon = loadPixmap( pathString + "newevent" );
- action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this );
+ action = new Q3Action( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this );
action->addTo( beamMenu_X );
@@ -1273,3 +1283,3 @@ void MainWindow::initActions()
importMenu->insertSeparator();
- action = new QAction( "beam all", i18n("Save"), 0,
+ action = new Q3Action( "beam all", i18n("Save"), 0,
this );
@@ -1277,3 +1287,3 @@ void MainWindow::initActions()
connect( action, SIGNAL( activated() ), this, SLOT( save() ) );
- action = new QAction( "beam all", i18n("Exit (+save)"), 0,
+ action = new Q3Action( "beam all", i18n("Exit (+save)"), 0,
this );
@@ -1286,3 +1296,3 @@ void MainWindow::initActions()
- action = new QAction( "Whats New", i18n("What's new?"), 0,this );
+ action = new Q3Action( "Whats New", i18n("What's new?"), 0,this );
action->addTo( helpMenu );
@@ -1290,3 +1300,3 @@ void MainWindow::initActions()
SLOT( whatsNew() ) );
- action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this );
+ action = new Q3Action( "featureHowto", i18n("Features + hints..."), 0,this );
action->addTo( helpMenu );
@@ -1294,3 +1304,3 @@ void MainWindow::initActions()
SLOT( features() ) );
- action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this );
+ action = new Q3Action( "Keys + Colors", i18n("Keys + Colors..."), 0, this );
action->addTo( helpMenu );
@@ -1298,3 +1308,3 @@ void MainWindow::initActions()
SLOT( keyBindings() ) );
- action = new QAction( "Storage Howto", i18n("Storage HowTo..."), 0,this );
+ action = new Q3Action( "Storage Howto", i18n("Storage HowTo..."), 0,this );
action->addTo( helpMenu );
@@ -1302,3 +1312,3 @@ void MainWindow::initActions()
SLOT( storagehowto() ) );
- action = new QAction( "Timetracking Howto", i18n("Timetracking HowTo..."), 0,this );
+ action = new Q3Action( "Timetracking Howto", i18n("Timetracking HowTo..."), 0,this );
action->addTo( helpMenu );
@@ -1306,3 +1316,3 @@ void MainWindow::initActions()
SLOT( timetrackinghowto() ) );
- action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this );
+ action = new Q3Action( "Sync Howto", i18n("Sync HowTo..."), 0,this );
action->addTo( helpMenu );
@@ -1310,3 +1320,3 @@ void MainWindow::initActions()
SLOT( synchowto() ) );
- action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this );
+ action = new Q3Action( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this );
action->addTo( helpMenu );
@@ -1314,3 +1324,3 @@ void MainWindow::initActions()
SLOT( kdesynchowto() ) );
- action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this );
+ action = new Q3Action( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this );
action->addTo( helpMenu );
@@ -1318,3 +1328,3 @@ void MainWindow::initActions()
SLOT( multisynchowto() ) );
- action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this );
+ action = new Q3Action( "Auto saving", i18n("Auto saving..."), 0, this );
action->addTo( helpMenu );
@@ -1322,3 +1332,3 @@ void MainWindow::initActions()
SLOT( aboutAutoSaving() ) );
- action = new QAction( "Problemd", i18n("Known Problems..."), 0,this );
+ action = new Q3Action( "Problemd", i18n("Known Problems..."), 0,this );
action->addTo( helpMenu );
@@ -1326,3 +1336,3 @@ void MainWindow::initActions()
SLOT( aboutKnownBugs() ) );
- action = new QAction( "Translate Howto", i18n("User translation..."), 0,this );
+ action = new Q3Action( "Translate Howto", i18n("User translation..."), 0,this );
action->addTo( helpMenu );
@@ -1330,3 +1340,3 @@ void MainWindow::initActions()
SLOT( usertrans() ) );
- action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this );
+ action = new Q3Action( "Frequently asked questions", i18n("FAQ..."), 0,this );
action->addTo( helpMenu );
@@ -1334,3 +1344,3 @@ void MainWindow::initActions()
SLOT( faq() ) );
- action = new QAction( "licence", i18n("Licence..."), 0, this );
+ action = new Q3Action( "licence", i18n("Licence..."), 0, this );
action->addTo( helpMenu );
@@ -1338,3 +1348,3 @@ void MainWindow::initActions()
SLOT( licence() ) );
- action = new QAction( "about", i18n("About..."), 0, this );
+ action = new Q3Action( "about", i18n("About..."), 0, this );
action->addTo( helpMenu );
@@ -1358,3 +1368,3 @@ void MainWindow::initActions()
if (p-> mShowIconWhatsThis)
- QWhatsThis::whatsThisButton ( iconToolBar );
+ Q3WhatsThis::whatsThisButton ( iconToolBar );
if (p-> mShowIconNext)
@@ -1383,3 +1393,3 @@ void MainWindow::initActions()
if (p-> mShowIconBackFast) {
- action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this );
+ action = new Q3Action( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this );
connect( action, SIGNAL( activated() ),
@@ -1391,3 +1401,3 @@ void MainWindow::initActions()
if (p-> mShowIconBack) {
- action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this );
+ action = new Q3Action( i18n("Go backward"), icon, i18n("Go backward"),0 , this );
connect( action, SIGNAL( activated() ),
@@ -1403,3 +1413,3 @@ void MainWindow::initActions()
if (p-> mShowIconForward) {
- action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this );
+ action = new Q3Action( i18n("Go forward"), icon, i18n("Go forward"),0 , this );
connect( action, SIGNAL( activated() ),
@@ -1411,3 +1421,3 @@ void MainWindow::initActions()
if (p-> mShowIconForwardFast) {
- action = new QAction( i18n("Next month"), icon, i18n("Next month"),0 , this );
+ action = new Q3Action( i18n("Next month"), icon, i18n("Next month"),0 , this );
connect( action, SIGNAL( activated() ),
@@ -1526,3 +1536,3 @@ void MainWindow::exportToPhone( int mode )
inFuture = ex2phone.mWriteBackFutureWeeks->value();
- QPtrList<Incidence> delSel;
+ Q3PtrList<Incidence> delSel;
if ( mode == 1 )
@@ -1597,6 +1607,6 @@ void MainWindow::displayText( QString text ,QString cap )
dia.setCaption( cap );
- QVBoxLayout* lay = new QVBoxLayout( &dia );
+ Q3VBoxLayout* lay = new Q3VBoxLayout( &dia );
lay->setSpacing( 3 );
lay->setMargin( 3 );
- QTextBrowser tb ( &dia );
+ Q3TextBrowser tb ( &dia );
lay->addWidget( &tb );
@@ -1779,5 +1789,5 @@ void MainWindow::updateWeek(QDate seda)
p.setFont( mWeekFont );
- p.drawText( 0,0,mWeekPixmap.width(), mWeekPixmap.height(),AlignCenter, QString::number( weekNum) );
+ p.drawText( 0,0,mWeekPixmap.width(), mWeekPixmap.height(),Qt::AlignCenter, QString::number( weekNum) );
p.end();
- QIconSet icon3 ( mWeekPixmap );
+ QIcon icon3 ( mWeekPixmap );
mWeekAction->setIconSet ( icon3 );
@@ -1814,3 +1824,3 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
bool ok;
- QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok );
+ QDateTime noc = incidence->getNextOccurence( (QDateTime)mView->startDate().addDays(-1), &ok );
if ( ok ) {
@@ -1848,9 +1858,9 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
static QPixmap tP = SmallIcon( "newtodo" );
- QIconSet icon;
+ QIcon icon;
if ( incidence->typeID() == todoID )
- icon = QIconSet ( tP );
+ icon = QIcon ( tP );
else if ( incidence->typeID() == eventID )
- icon = QIconSet ( eP );
+ icon = QIcon ( eP );
else if ( incidence->typeID() == journalID )
- icon = QIconSet ( jP );
+ icon = QIcon ( jP );
mPrintSelAction->setIconSet ( icon );
@@ -2047,3 +2057,3 @@ void MainWindow::backupAllFiles()
// backup ok
- QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+ Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
KopiCalendarFile * cal = calendars.first();
@@ -2343,3 +2353,3 @@ void MainWindow::fillFilterMenuTB()
selectFilterMenuTB->insertSeparator();
- QPtrList<CalFilter> fili = mView->filters();
+ Q3PtrList<CalFilter> fili = mView->filters();
CalFilter *curfilter = mView->filterView()->selectedFilter();
@@ -2388,3 +2398,3 @@ void MainWindow::fillFilterMenu()
selectFilterMenu->insertSeparator();
- QPtrList<CalFilter> fili = mView->filters();
+ Q3PtrList<CalFilter> fili = mView->filters();
CalFilter *curfilter = mView->filterView()->selectedFilter();
@@ -2409,3 +2419,3 @@ void MainWindow::fillFilterMenuPopup()
filterPopupMenu->insertSeparator();
- QPtrList<CalFilter> fili = mView->filters();
+ Q3PtrList<CalFilter> fili = mView->filters();
CalFilter *curfilter = mView->filterView()->selectedFilter();
@@ -2821,3 +2831,3 @@ void MainWindow::resizeEvent( QResizeEvent* e)
#endif
- QMainWindow::resizeEvent( e);
+ Q3MainWindow::resizeEvent( e);
}