initial public commit of qt4 portp1

1 files changed, 24 insertions, 19 deletions

diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp
index 3e87197..62ad250 100644
--- a/korganizer/koeventeditor.cpp
+++ b/korganizer/koeventeditor.cpp
@@ -22,14 +22,19 @@
 */
 
 #include <qtooltip.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qpixmap.h>
-#include <qhbox.h>
+#include <q3hbox.h>
 #include <qtimer.h>
 #include <qdir.h>
 #include <qlayout.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3PtrList>
+#include <Q3VBoxLayout>
 
 #include <kiconloader.h>
 #include <kstandarddirs.h>
@@ -105,8 +110,8 @@ void KOEventEditor::setupGeneral()
   connect ( mGeneral, SIGNAL ( allAccepted() ), this, SLOT ( slotOk () ) );
 
   if( KOPrefs::instance()->mCompactDialogs ) {
-    QFrame *topFrame = addPage(i18n("General"));
-    QBoxLayout *topLayout = new QVBoxLayout(topFrame);
+    Q3Frame *topFrame = addPage(i18n("General"));
+    Q3BoxLayout *topLayout = new Q3VBoxLayout(topFrame);
     topLayout->setSpacing(spacingHint()-1);
     topLayout->setMargin(marginHint()-1);
     topLayout->addStretch ( 1 );
@@ -119,13 +124,13 @@ void KOEventEditor::setupGeneral()
     topLayout->addStretch ( 1 );
     mGeneral->enableAlarm( false );
 
-    QBoxLayout *buttonLayout;
+    Q3BoxLayout *buttonLayout;
     if ( QApplication::desktop()->width() < 500 && QApplication::desktop()->height() > 240 ) 
-        buttonLayout = new QVBoxLayout( topLayout );
+        buttonLayout = new Q3VBoxLayout( topLayout );
     else
-        buttonLayout = new QHBoxLayout( topLayout );
-    QHBox* buttonWidget = new QHBox (topFrame);
-    QIconSet icon;
+        buttonLayout = new Q3HBoxLayout( topLayout );
+    Q3HBox* buttonWidget = new Q3HBox (topFrame);
+    QIcon icon;
     if ( QApplication::desktop()->width() < 321 ) 
         icon = SmallIcon("fileexport16");
     else
@@ -146,9 +151,9 @@ void KOEventEditor::setupGeneral()
 
     topLayout->addStretch( 1 );
 
-    QFrame *topFrame2 = addPage(i18n("Details"));
+    Q3Frame *topFrame2 = addPage(i18n("Details"));
 
-    QBoxLayout *topLayout2 = new QVBoxLayout(topFrame2);
+    Q3BoxLayout *topLayout2 = new Q3VBoxLayout(topFrame2);
     topLayout2->setSpacing(spacingHint()-1);
     topLayout2->setMargin(marginHint()-1);
     topLayout2->setSpacing(spacingHint());
@@ -160,18 +165,18 @@ void KOEventEditor::setupGeneral()
     connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) );
     connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) );
   } else {
-    QFrame *topFrame = addPage(i18n("General"));
+    Q3Frame *topFrame = addPage(i18n("General"));
 
-    QBoxLayout *topLayout = new QVBoxLayout(topFrame);
+    Q3BoxLayout *topLayout = new Q3VBoxLayout(topFrame);
     topLayout->setSpacing(spacingHint());
 
     mGeneral->initHeader(topFrame,topLayout);
     mGeneral->initTime(topFrame,topLayout);
-    QBoxLayout *alarmLineLayout = new QHBoxLayout(topLayout);
+    Q3BoxLayout *alarmLineLayout = new Q3HBoxLayout(topLayout);
     mGeneral->initAlarm(topFrame,alarmLineLayout);
     mGeneral->initClass(topFrame,alarmLineLayout);
     mGeneral->initDescription(topFrame,topLayout);
-    QBoxLayout *detailsLayout = new QHBoxLayout(topLayout);
+    Q3BoxLayout *detailsLayout = new Q3HBoxLayout(topLayout);
     mGeneral->initCategories( topFrame, detailsLayout );
     mGeneral->initSecrecy( topFrame, detailsLayout );
   }
@@ -182,8 +187,8 @@ void KOEventEditor::setupGeneral()
 
 void KOEventEditor::setupRecurrence()
 {
-  QFrame *topFrame = addPage( i18n("Recurrence") );
-  QBoxLayout *topLayout = new QVBoxLayout( topFrame );
+  Q3Frame *topFrame = addPage( i18n("Recurrence") );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( topFrame );
 
   mRecurrence = new KOEditorRecurrence( topFrame );
   topLayout->addWidget( mRecurrence );
@@ -356,7 +361,7 @@ void KOEventEditor::slotLoadTemplate()
                             .arg( fileName ) );
         return ;
     }
-    QPtrList<Event> events = cal.events();
+    Q3PtrList<Event> events = cal.events();
     Event* event = events.first();
     if ( !event ) {
         KMessageBox::error( this,