initial public commit of qt4 portp1

1 files changed, 6 insertions, 4 deletions

diff --git a/libkcal/kincidenceformatter.cpp b/libkcal/kincidenceformatter.cpp
index 733b897..bce68b0 100644
--- a/libkcal/kincidenceformatter.cpp
+++ b/libkcal/kincidenceformatter.cpp
@@ -6,2 +6,4 @@
 #include <kabc/stdaddressbook.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 #define size count
@@ -312,3 +314,3 @@ void KIncidenceFormatter::addTag(const QString & tag,const QString & text)
 {
-  int number=text.contains("\n");
+  int number=text.count("\n");
     QString str = "<" + tag + ">";
@@ -341,3 +343,3 @@ void KIncidenceFormatter::formatAttendees(Incidence *event)
 {
- QPtrList<Attendee> attendees = event->attendees();
+ Q3PtrList<Attendee> attendees = event->attendees();
     if (attendees.count()) {
@@ -364,3 +366,3 @@ void KIncidenceFormatter::formatAttendees(Incidence *event)
 #endif
-        if (iconPath) {
+        if (!iconPath.isEmpty()) {
             mText += " <a href=\"mailto:" + event->organizer() + "\">";
@@ -404,3 +406,3 @@ void KIncidenceFormatter::formatAttendees(Incidence *event)
             if (!a->email().isEmpty()) {
-                if (iconPath) {
+                if (!iconPath.isEmpty()) {
                     mText += "<a href=\"mailto:" + a->name() +" "+ "<" + a->email() + ">" + "\">";