initial public commit of qt4 portp1

1 files changed, 22 insertions, 16 deletions

diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index f88403c..bfe930f 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -19,5 +19,5 @@
 
 #include <qlayout.h>
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
 #include <qtextcodec.h>
 #include <qfileinfo.h>
@@ -25,6 +25,12 @@
 
 #include <qapplication.h>
+#include <QDesktopWidget>
 #ifdef DESKTOP_VERSION 
-#include <qpaintdevicemetrics.h>
+#include <q3paintdevicemetrics.h>
+//Added by qt3to4:
+#include <Q3PtrList>
+#include <QHideEvent>
+#include <Q3VBoxLayout>
+#include <QShowEvent>
 #endif
 #include <kglobal.h>
@@ -43,5 +49,5 @@
 #include "koeventviewerdialog.h"
 #include "koeventviewer.h"
-#include <qstylesheet.h> 
+#include <q3stylesheet.h> 
 #include "kowhatsnextview.h"
 using namespace KOrg;
@@ -57,5 +63,5 @@ void WhatsNextTextBrowser::setSource(const QString& n)
         return;
     } else {
-        QTextBrowser::setSource(n);
+        Q3TextBrowser::setSource(n);
     }
 }
@@ -73,5 +79,5 @@ void WhatsNextTextBrowser::printMe()
     QPainter p;
     p.begin ( &printer  );
-    QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
+    Q3PaintDeviceMetrics m = Q3PaintDeviceMetrics ( &printer );
     float dx, dy;
     int wid = (m.width() * 9)/10;
@@ -104,17 +110,17 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, QWidget *parent,
     mView = new WhatsNextTextBrowser(this);
     connect(mView,SIGNAL(showIncidence(const QString &)),SLOT(showIncidence(const QString &)));
-    QStyleSheet* stsh = mView->styleSheet();
-    QStyleSheetItem * style ;
+    Q3StyleSheet* stsh = mView->styleSheet();
+    Q3StyleSheetItem * style ;
     style   = stsh->item ("h2" );
     if ( style ) {
-        style->setMargin(QStyleSheetItem::MarginAll,0);  
+        style->setMargin(Q3StyleSheetItem::MarginAll,0);  
     }
     style   = stsh->item ("h3" );
     if ( style ) {
-        style->setMargin(QStyleSheetItem::MarginAll,0);  
+        style->setMargin(Q3StyleSheetItem::MarginAll,0);  
     }
     mEventViewer = 0;
 
-    QBoxLayout *topLayout = new QVBoxLayout(this);
+    Q3BoxLayout *topLayout = new Q3VBoxLayout(this);
     //  topLayout->addWidget(mDateLabel);
     topLayout->addWidget(mView);
@@ -145,7 +151,7 @@ void KOWhatsNextView::clearList()
     mView->setText(" ");
 }
-QPtrList<Incidence> KOWhatsNextView::selectedIncidences()
+Q3PtrList<Incidence> KOWhatsNextView::selectedIncidences()
 {
-    QPtrList<Incidence> eventList;
+    Q3PtrList<Incidence> eventList;
 
     return eventList;
@@ -220,6 +226,6 @@ void KOWhatsNextView::updateView()
     int iii;
     mTodos.clear();
-    QPtrList<Event> events;  
-    QPtrList<Todo> todos = calendar()->todos(); 
+    Q3PtrList<Event> events;  
+    Q3PtrList<Todo> todos = calendar()->todos(); 
     Todo * todo;
     //mText += "<h2>" + i18n("Events: ") + "</h2>\n";
@@ -455,5 +461,5 @@ void KOWhatsNextView::showDates(const QDate &, const QDate &)
 }
 
-void KOWhatsNextView::showEvents(QPtrList<Event>)
+void KOWhatsNextView::showEvents(Q3PtrList<Event>)
 {
 }
@@ -742,5 +748,5 @@ bool KOWhatsNextView::appendTodo(Incidence *ev, QString ind , bool isSub )
         mText += "</li>\n";
     }
-    QPtrList<Incidence> Relations = ev->relations();
+    Q3PtrList<Incidence> Relations = ev->relations();
     Incidence *to;
     for (to=Relations.first();to;to=Relations.next()) {