[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/kalarm
From:       Adriaan de Groot <groot () kde ! org>
Date:       2005-04-11 20:34:17
Message-ID: 20050411203417.38815633 () office ! kde ! org
[Download RAW message or body]

CVS commit by adridg: 

(semi-)pong: it's productId() in recent libkcals, per Allen's (discussed-on-list) \
changes of a few weeks ago, and loadedProductId() for older ones. I hope I got the \
versions right (and that the VERSION gets bumped on incompatible API changes).


  M +10 -0     alarmcalendar.cpp   1.50


--- kdepim/kalarm/alarmcalendar.cpp  #1.49:1.50
@@ -44,4 +44,5 @@ extern "C" {
 }
 
+#include <libkcal/kcalversion.h>
 #include <libkcal/vcaldrag.h>
 #include <libkcal/vcalformat.h>
@@ -754,5 +755,14 @@ void AlarmCalendar::getKAlarmVersion() c
         if (mCalendar)
         {
+#if defined(LIBKCAL_IS_VERSION)
+#if LIBKCAL_IS_VERSION(1,2,0)
+                const QString& prodid = mCalendar->productId();
+#else
                 const QString& prodid = mCalendar->loadedProductId();
+#endif
+#else
+                // Stone age?
+                const QString& prodid = mCalendar->loadedProductId();
+#endif
                 QString progname = QString(" ") + kapp->aboutData()->programName() + \
" ";  int i = prodid.find(progname, 0, false);


[prev in list] [next in list] [prev in thread] [next in thread]