initial public commit of qt4 portp1

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
@@ -24,7 +24,8 @@
 // $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>
@@ -40,4 +41,7 @@
 #else
 #include <qspinbox.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
 #endif
 #include <stdlib.h>
@@ -63,8 +67,8 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
 {
     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;
@@ -84,8 +88,8 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
   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 );
@@ -104,5 +108,5 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
   labb->setFont ( fo );
 #endif
-  labb->setAlignment(AlignCenter);
+  labb->setAlignment(Qt::AlignCenter);
   //layout->addWidget ( labb );
   fo = font();
@@ -123,5 +127,5 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
   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 );
@@ -129,9 +133,9 @@ AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
   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);