summaryrefslogtreecommitdiffabout
path: root/kalarmd
Side-by-side diff
Diffstat (limited to 'kalarmd') (more/less context) (ignore whitespace changes)
-rw-r--r--kalarmd/alarmdialog.cpp26
-rw-r--r--kalarmd/alarmdialog.h2
-rw-r--r--kalarmd/simplealarmdaemonimpl.cpp16
-rw-r--r--kalarmd/simplealarmdaemonimpl.h3
4 files changed, 26 insertions, 21 deletions
diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp
index 18ce9da..467fef7 100644
--- a/kalarmd/alarmdialog.cpp
+++ b/kalarmd/alarmdialog.cpp
@@ -23,9 +23,10 @@
// $Id$
-#include <qhbox.h>
-#include <qvbox.h>
-#include <qapp.h>
+#include <q3hbox.h>
+#include <q3vbox.h>
+#include <qapplication.h>
+#include <QDesktopWidget>
#include <qlabel.h>
#include <qlayout.h>
#include <qfile.h>
@@ -39,6 +40,9 @@
#undef protected
#else
#include <qspinbox.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
#endif
#include <stdlib.h>
#ifndef _WIN32_
@@ -62,10 +66,10 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
: QDialog (parent, name ,false, Qt::WStyle_StaysOnTop )
{
setCaption( "KO/Pi Alarm!" );
- QVBoxLayout* layout = new QVBoxLayout( this);
+ Q3VBoxLayout* layout = new Q3VBoxLayout( this);
QLabel* l = new QLabel("The following event triggered alarm:",this);
layout->addWidget ( l );
- l->setAlignment( AlignCenter);
+ l->setAlignment( Qt::AlignCenter);
mMessage = new QLabel ( " ", this );
int fs = 18;
int fs2 = 12;
@@ -83,10 +87,10 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
l->setFont( fo );
fo.setPointSize( fs );
mMessage->setFont(fo );
- mMessage->setAlignment( AlignCenter);
+ mMessage->setAlignment( Qt::AlignCenter);
layout->addWidget ( mMessage );
mMissedAlarms= new QLabel ( "(No missed Alarms)", this );
- mMissedAlarms->setAlignment( AlignCenter);
+ mMissedAlarms->setAlignment( Qt::AlignCenter);
playSoundTimer = new QTimer( this );
connect ( playSoundTimer, SIGNAL( timeout() ), this, SLOT (playSound() ) );
@@ -103,7 +107,7 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
fo.setPointSize( 12 );
labb->setFont ( fo );
#endif
- labb->setAlignment(AlignCenter);
+ labb->setAlignment(Qt::AlignCenter);
//layout->addWidget ( labb );
fo = font();
int pointSize = 36;
@@ -122,17 +126,17 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
#endif
mSuspendSpin->setFixedSize( 18*baseSize, 10*baseSize+2 );
mSuspendSpin->setButtonSymbols( QSpinBox::PlusMinus );
- QHBoxLayout* layoutSpin = new QHBoxLayout( layout );
+ Q3HBoxLayout* layoutSpin = new Q3HBoxLayout( layout );
layoutSpin->addStretch ();
layoutSpin->addWidget ( labb );
layoutSpin->addWidget ( mSuspendSpin );
layoutSpin->addStretch ();
- QVBox * bbox = new QVBox ( this );
+ Q3VBox * bbox = new Q3VBox ( this );
layout->addWidget ( bbox );
bbox->layout()->setSpacing( 2 );
labb = new QLabel("Press \"Cancel\" or \"Esc\" to suspend!",bbox);
- labb->setAlignment(AlignCenter);
+ labb->setAlignment(Qt::AlignCenter);
mSuspendButton = new QPushButton( "Suspend", bbox);
QPushButton* silen = new QPushButton( " Stop sound ", bbox);
okbut = new QPushButton( "Ok", bbox);
diff --git a/kalarmd/alarmdialog.h b/kalarmd/alarmdialog.h
index 52e681a..c3e0966 100644
--- a/kalarmd/alarmdialog.h
+++ b/kalarmd/alarmdialog.h
@@ -30,6 +30,8 @@
#include <qstring.h>
#include <qcombobox.h>
#include <qpushbutton.h>
+//Added by qt3to4:
+#include <QLabel>
#include "sharp_char.h"
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index 15eff28..74a53cb 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -52,7 +52,7 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
: QLabel( parent )
{
mAlarmDialog = new AlarmDialog( 0 );
- mPopUp = new QPopupMenu( this );
+ mPopUp = new Q3PopupMenu( this );
mPopUp->insertItem( "What's Next?", this, SLOT ( showWN() ) );
mPopUp->insertItem( "Next Days!", this, SLOT ( showKO() ) );
mPopUp->insertSeparator();
@@ -66,12 +66,12 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
mPopUp->insertItem( "New Mail", this, SLOT ( newMail() ) );
mPopUp->insertSeparator();
mPopUp->insertItem( "Multi Sync", this, SLOT ( ringSync() ) );
- mTimerPopUp = new QPopupMenu( this );
+ mTimerPopUp = new Q3PopupMenu( this );
- mBeepPopUp = new QPopupMenu( this );
- mSoundPopUp = new QPopupMenu( this );
- mPausePopUp = new QPopupMenu( this );
- mFontsizePopup = new QPopupMenu( this );
+ mBeepPopUp = new Q3PopupMenu( this );
+ mSoundPopUp = new Q3PopupMenu( this );
+ mPausePopUp = new Q3PopupMenu( this );
+ mFontsizePopup = new Q3PopupMenu( this );
mFontsizePopup->insertItem( "10", 10 );
mFontsizePopup->insertItem( "12", 12 );
mFontsizePopup->insertItem( "14", 14 );
@@ -85,7 +85,7 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
mFontsizePopup->insertItem( "30", 30 );
mFontsizePopup->insertItem( "32", 32 );
mFontsizePopup->insertItem( "36", 36 );
- QPopupMenu* savePopUp = new QPopupMenu( this );
+ QPopupMenu* savePopUp = new Q3PopupMenu( this );
savePopUp->insertItem( "Save", 0 );
savePopUp->insertItem( "Load", 1 );
mSoundPopUp->insertItem( "Buzzer", 0 );
@@ -99,7 +99,7 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
mPausePopUp->insertItem( "30 sec", 30 );
mPausePopUp->insertItem( " 1 min", 60 );
mPausePopUp->insertItem( " 5 min", 300 );
- mSuspendPopUp = new QPopupMenu( this );
+ mSuspendPopUp = new Q3PopupMenu( this );
mSuspendPopUp->insertItem( "Off", 0 );
mSuspendPopUp->insertItem( " 1x", 1 );
mSuspendPopUp->insertItem( " 2x", 2 );
diff --git a/kalarmd/simplealarmdaemonimpl.h b/kalarmd/simplealarmdaemonimpl.h
index 06ef91b..ac65797 100644
--- a/kalarmd/simplealarmdaemonimpl.h
+++ b/kalarmd/simplealarmdaemonimpl.h
@@ -30,7 +30,6 @@
class QLabel;
class QTimer;
-class QPopupMenu;
class AlarmDialog;
class SimpleAlarmDaemonImpl : public QLabel
{
@@ -76,7 +75,7 @@ class SimpleAlarmDaemonImpl : public QLabel
QString mAlarmMessage;
int mTimerTime;
int getFileNameLen( QString );
- QPopupMenu* mPopUp, *mBeepPopUp, *mTimerPopUp, *mSoundPopUp,*mPausePopUp,*mSuspendPopUp, *mFontsizePopup;
+ Q3PopupMenu* mPopUp, *mBeepPopUp, *mTimerPopUp, *mSoundPopUp,*mPausePopUp,*mSuspendPopUp, *mFontsizePopup;
QDateTime mRunningTimer;
void fillTimerPopUp();
QString timerMesssage;