1 files changed, 15 insertions, 11 deletions

diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp
index 18ce9da..467fef7 100644
--- a/kalarmd/alarmdialog.cpp
+++ b/kalarmd/alarmdialog.cpp
@@ -20,15 +20,16 @@
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 // $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>
 #include <qtimer.h>
 #include <qsound.h>
 #include <qpushbutton.h>
@@ -36,12 +37,15 @@
 #ifndef DESKTOP_VERSION
 #define protected public
 #include <qspinbox.h>
 #undef protected 
 #else
 #include <qspinbox.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
 #endif
 #include <stdlib.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #include <sys/ioctl.h>
 #endif
@@ -59,16 +63,16 @@
 
 
 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;
   int baseSize = 6;
   if ( QApplication::desktop()->width() < 480 ) {
       fs2 = 10;
@@ -80,16 +84,16 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
   QFont fo = QApplication::font();
   fo.setBold( true );
   fo.setPointSize( fs2 );
   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() ) );
 
   playSoundTimer->stop();
   
@@ -100,13 +104,13 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
   QLabel* labb = new QLabel("Suspend\nduration\n(minutes):",this);
 #ifdef DESKTOP_VERSION
   fo = font();
   fo.setPointSize( 12 );
   labb->setFont ( fo );
 #endif
-  labb->setAlignment(AlignCenter);
+  labb->setAlignment(Qt::AlignCenter);
   //layout->addWidget ( labb );
   fo = font();
   int pointSize = 36;
   if ( QApplication::desktop()->width() <= 320 )
       pointSize = 18;
   fo.setPointSize( pointSize );
@@ -119,23 +123,23 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
 #if QT_VERSION < 0x030000
   mSuspendSpin->upButton ()->setFixedSize( QSize( 8*baseSize, 5*baseSize ));
   mSuspendSpin->downButton ()->setFixedSize( QSize( 8*baseSize, 5*baseSize ));
 #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); 
   mSuspendButton->setFont( fo );
   silen->setFont( fo );
   okbut->setFont( fo );