1 files changed, 21 insertions, 16 deletions

diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index c0acf34..4df26a9 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -19,8 +19,13 @@
 
-#include <qcstring.h>
-#include <qwhatsthis.h>
+#include <q3cstring.h>
+#include <q3whatsthis.h>
 #include <qdialog.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 #include <qlabel.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <QKeyEvent>
+#include <Q3PtrList>
+#include <Q3VBoxLayout>
 
@@ -57,3 +62,3 @@
 #include <qpainter.h>
-#include <qpaintdevicemetrics.h>
+#include <q3paintdevicemetrics.h>
 #else //DESKTOP_VERSION
@@ -64,3 +69,3 @@
 KOEventViewer::KOEventViewer(QWidget *parent,const char *name)
-  : QTextBrowser(parent,name)
+  : Q3TextBrowser(parent,name)
 {
@@ -88,3 +93,3 @@ void KOEventViewer::printMe()
     p.begin ( &printer  );
-    QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
+    Q3PaintDeviceMetrics m = Q3PaintDeviceMetrics ( &printer );
     float dx, dy;
@@ -136,3 +141,3 @@ void KOEventViewer::setSource(const QString& n)
                 dia.setCaption( i18n("Details of attendee") );
-                QVBoxLayout lay ( &dia );
+                Q3VBoxLayout lay ( &dia );
                 KABC::AddresseeView av ( &dia );
@@ -157,3 +162,3 @@ void KOEventViewer::setSource(const QString& n)
         } 
-        QPtrList<Attendee> attendees = mCurrentIncidence->attendees();
+        Q3PtrList<Attendee> attendees = mCurrentIncidence->attendees();
         if (attendees.count()) {  
@@ -202,3 +207,3 @@ void KOEventViewer::setSource(const QString& n)
         QByteArray replyData;
-        QCString replyTypeStr;
+        Q3CString replyTypeStr;
 #define PING_ABBROWSER (client->call("kaddressbook", "KAddressBookIface", "interfaces()",  noParamData, replyTypeStr, replyData))
@@ -209,3 +214,3 @@ void KOEventViewer::setSource(const QString& n)
             //client->send("kaddressbook","KAddressBookIface",
-            QDataStream arg(paramData, IO_WriteOnly);
+            QDataStream arg(paramData, QIODevice::WriteOnly);
             arg << n.mid(6);
@@ -233,3 +238,3 @@ void KOEventViewer::mailToAttendees( bool all )
 {
-    QPtrList<Attendee> attendees = mCurrentIncidence->attendees();
+    Q3PtrList<Attendee> attendees = mCurrentIncidence->attendees();
     if (attendees.count() == 0) return;
@@ -262,3 +267,3 @@ void KOEventViewer::addTag(const QString & tag,const QString & text)
 {
-    int number=text.contains("\n");
+    int number=text.count("\n");
     QString str = "<" + tag + ">";
@@ -589,3 +594,3 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
     }
-    QPtrList<Incidence> Relations = event->relations();
+    Q3PtrList<Incidence> Relations = event->relations();
     Incidence *to;
@@ -623,3 +628,3 @@ void KOEventViewer::formatAttendees(Incidence *event)
 {
-    QPtrList<Attendee> attendees = event->attendees();
+    Q3PtrList<Attendee> attendees = event->attendees();
     if (attendees.count()) {
@@ -656,3 +661,3 @@ void KOEventViewer::formatAttendees(Incidence *event)
        
-        if (iconPath) {
+        if (!iconPath.isEmpty()) {
             mText += " <a href=\"mailto:" + event->organizer() + "\">";
@@ -706,3 +711,3 @@ void KOEventViewer::formatAttendees(Incidence *event)
             if (!a->email().isEmpty()) {
-                if (iconPath) {
+                if (!iconPath.isEmpty()) {
                     mText += "<a href=\"mailto:" + a->realName() +" <" + a->email() + ">:" + mMailSubject + "\">";
@@ -864,3 +869,3 @@ void KOEventViewer::keyPressEvent ( QKeyEvent * e )
     default:
-        QTextBrowser::keyPressEvent ( e );
+        Q3TextBrowser::keyPressEvent ( e );
         break;