From 6115845fee75f3d21ca5c32d68be3fc36ce32ac7 Mon Sep 17 00:00:00 2001
From: Markus Brueffer <markus@FreeBSD.org>
Date: Sun, 15 Aug 2004 18:18:41 +0000
Subject: [PATCH] Fix build with gcc 3.4

Noticed by:	pointyhat
---
 .../files/patch-src-dialogs-kickpimcard.cpp   | 20 ++++++++
 .../files/patch-src-kickpimcontactview.cpp    | 29 +++++++++++
 .../files/patch-src-kpcontactevent.cpp        | 11 ++++
 .../kickpim/files/patch-src-kpkabcontact.cpp  | 50 +++++++++++++++++++
 4 files changed, 110 insertions(+)
 create mode 100644 deskutils/kickpim/files/patch-src-dialogs-kickpimcard.cpp
 create mode 100644 deskutils/kickpim/files/patch-src-kickpimcontactview.cpp
 create mode 100644 deskutils/kickpim/files/patch-src-kpcontactevent.cpp
 create mode 100644 deskutils/kickpim/files/patch-src-kpkabcontact.cpp

diff --git a/deskutils/kickpim/files/patch-src-dialogs-kickpimcard.cpp b/deskutils/kickpim/files/patch-src-dialogs-kickpimcard.cpp
new file mode 100644
index 000000000000..d22e2d14adfd
--- /dev/null
+++ b/deskutils/kickpim/files/patch-src-dialogs-kickpimcard.cpp
@@ -0,0 +1,20 @@
+--- src/dialogs/kickpimcard.cpp.orig	Sun Aug 15 19:54:43 2004
++++ src/dialogs/kickpimcard.cpp	Sun Aug 15 19:55:32 2004
+@@ -309,7 +309,7 @@
+   if (prefFound)      m_content[PHONE]->selectContent( i18n("Preferred Number") );
+   else if (homeFound) m_content[PHONE]->selectContent( i18n("home phone") );
+   else                m_content[PHONE]->selectContent( i18n(phoneMap.begin().key()) );
+-};
++}
+ 
+ 
+ void KickPimCard::setAddressContent()
+@@ -352,7 +352,7 @@
+   if (type && KABC::Address::Pref)   text+="Pref<br>";
+ */
+   return text;
+-};
++}
+ 
+ void KickPimCard::setBirthdayContent ()
+ {
diff --git a/deskutils/kickpim/files/patch-src-kickpimcontactview.cpp b/deskutils/kickpim/files/patch-src-kickpimcontactview.cpp
new file mode 100644
index 000000000000..17a335a26151
--- /dev/null
+++ b/deskutils/kickpim/files/patch-src-kickpimcontactview.cpp
@@ -0,0 +1,29 @@
+--- src/kickpimcontactview.cpp.orig	Sun Aug 15 20:02:20 2004
++++ src/kickpimcontactview.cpp	Sun Aug 15 20:02:52 2004
+@@ -111,7 +111,7 @@
+   setSorting(0);
+   sort();
+   setSorting(-1);
+-};
++}
+ 
+ void KickPimContactView::onContactsDoubleClick(QListViewItem* qitem)
+ {
+@@ -129,7 +129,7 @@
+   KickPimContactViewItem* item = 0;
+   item = new KickPimContactViewItem( this, 0, KickPIM::rep()->displayName(contact) );
+   item->setContact(contact);
+-};
++}
+ 
+ void KickPimContactView::addDistributionList(DistributionList* distList)
+ {
+@@ -137,7 +137,7 @@
+   KickPimContactViewItem* item = 0;
+   item = new KickPimContactViewItem( this, lastItem(), "["+distList->name()+"]" );
+   item->setDistributionList(distList);
+-};
++}
+ 
+ int KickPimContactView::preferredHeight()
+ {
diff --git a/deskutils/kickpim/files/patch-src-kpcontactevent.cpp b/deskutils/kickpim/files/patch-src-kpcontactevent.cpp
new file mode 100644
index 000000000000..402f131c9ae5
--- /dev/null
+++ b/deskutils/kickpim/files/patch-src-kpcontactevent.cpp
@@ -0,0 +1,11 @@
+--- src/kpcontactevent.cpp.orig	Sun Aug 15 20:05:05 2004
++++ src/kpcontactevent.cpp	Sun Aug 15 20:05:18 2004
+@@ -24,7 +24,7 @@
+   m_text    = "";
+   m_date    = QDate(25,61,61); // invalid
+   m_contact = 0;
+-};
++}
+ 
+ KPContactEvent::~KPContactEvent()
+ {
diff --git a/deskutils/kickpim/files/patch-src-kpkabcontact.cpp b/deskutils/kickpim/files/patch-src-kpkabcontact.cpp
new file mode 100644
index 000000000000..db295811ecf9
--- /dev/null
+++ b/deskutils/kickpim/files/patch-src-kpkabcontact.cpp
@@ -0,0 +1,50 @@
+--- src/kpkabcontact.cpp.orig	Sun Aug 15 20:07:22 2004
++++ src/kpkabcontact.cpp	Sun Aug 15 20:09:00 2004
+@@ -240,7 +240,7 @@
+   {
+     m_addr->insertEmail(emailAddr, preferred);
+   }
+-};
++}
+ 
+ 
+ 
+@@ -255,7 +255,7 @@
+     ++itor;
+   }
+ 
+-};
++}
+ 
+ void KPKabContact::addPhoneNumber(QString number, QString key)
+ {
+@@ -270,20 +270,20 @@
+       }
+     }
+   }
+-};
++}
+ 
+ void KPKabContact::setBirthday    ( QDate date )
+ {
+   if (!m_addr) return;
+   m_addr->setBirthday(date);
+-};
++}
+ 
+ void KPKabContact::setAnniversary ( QDate date )
+ {
+   if (!m_addr) return;
+   QString dateStr = date.toString( Qt::ISODate );
+   m_addr->insertCustom( "KADDRESSBOOK", "X-Anniversary" , dateStr );
+-};
++}
+ 
+ 
+ bool KPKabContact::edit()
+@@ -322,4 +322,4 @@
+     }
+   }
+   KABC::StdAddressBook::save();
+-};
++}