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

List:       kde-commits
Subject:    kdepim/kpilot
From:       Adriaan de Groot <groot () kde ! org>
Date:       2004-05-13 11:58:44
Message-ID: 20040513115844.6F2042737 () office ! kde ! org
[Download RAW message or body]

CVS commit by adridg: 

Last round of version numbering updates, thanks Reinhold


  M +3 -7      kpilot/kpilotConfigDialog.cc   1.36
  M +5 -5      lib/kpilotlink.cc   1.58
  M +5 -1      lib/options.h   1.47
  M +1 -1      lib/pilotSysInfo.h   1.7


--- kdepim/kpilot/kpilot/kpilotConfigDialog.cc  #1.35:1.36
@@ -83,9 +83,7 @@ DeviceConfigPage::DeviceConfigPage(QWidg
         fWidget = fConfigWidget;
 
-#if defined(PILOT_LINK_VERSION) && defined(PILOT_LINK_MAJOR) && defined(PILOT_LINK_MINOR)
-#if (PILOT_LINK_VERSION * 100 + PILOT_LINK_MAJOR * 10 + PILOT_LINK_MINOR) < 100
+#if PILOT_LINK_NUMBER < PILOT_LINK_0_10_0
         fConfigWidget->fPilotDevice->setMaxLength(13);
 #endif
-#endif
 
 
@@ -120,6 +118,5 @@ void DeviceConfigPage::load()
         int r = KMessageBox::Yes;
 
-#if defined(PILOT_LINK_VERSION) && defined(PILOT_LINK_MAJOR) && defined(PILOT_LINK_MINOR)
-#if (PILOT_LINK_VERSION * 100 + PILOT_LINK_MAJOR * 10 + PILOT_LINK_MINOR) < 100
+#if PILOT_LINK_NUMBER < PILOT_LINK_0_10_0
         QString d = fConfigWidget->fPilotDevice->text();
 
@@ -137,5 +134,4 @@ void DeviceConfigPage::load()
         }
 #endif
-#endif
 
         return KMessageBox::Yes == r;

--- kdepim/kpilot/lib/kpilotlink.cc  #1.57:1.58
@@ -317,5 +317,5 @@ bool KPilotDeviceLink::open()
 #endif
 
-#if PILOT_LINK_NUMBER < 1000
+#if PILOT_LINK_NUMBER < PILOT_LINK_0_10_0
                 fPilotMasterSocket = pi_socket(PI_AF_SLP,
                         PI_SOCK_STREAM, PI_PF_PADP);
@@ -347,5 +347,5 @@ bool KPilotDeviceLink::open()
 #endif
 
-#if PILOT_LINK_NUMBER < 10
+#if PILOT_LINK_NUMBER < PILOT_LINK_0_10_0
         addr.pi_family = PI_AF_SLP;
 #else
@@ -545,5 +545,5 @@ void KPilotDeviceLink::acceptDevice()
                         << ": RomVersion=" << fPilotSysInfo->getRomVersion()
                         << " Locale=" << fPilotSysInfo->getLocale()
-#if PILOT_LINK_NUMBER < 10
+#if PILOT_LINK_NUMBER < PILOT_LINK_0_10_0
                         /* No prodID member */
 #else
@@ -677,5 +677,5 @@ void KPilotDeviceLink::addSyncLogEntry(c
         QString t(entry);
 
-#if PILOT_LINK_NUMBER < 1100
+#if PILOT_LINK_NUMBER < PILOT_LINK_0_11_0
         t.append("X");
 #endif

--- kdepim/kpilot/lib/options.h  #1.46:1.47
@@ -67,5 +67,9 @@
 #define PILOT_LINK_NUMBER       ((10000*PILOT_LINK_VERSION) + \
                                 (100*PILOT_LINK_MAJOR)+PILOT_LINK_MINOR)
-#if PILOT_LINK_NUMBER < 1200
+#define PILOT_LINK_0_10_0       (1000)
+#define PILOT_LINK_0_11_0       (1100)
+#define PILOT_LINK_0_12_0       (1200)
+
+#if PILOT_LINK_NUMBER < PILOT_LINK_0_12_0
 #define PI_SIZE_T int
 #else

--- kdepim/kpilot/lib/pilotSysInfo.h  #1.6:1.7
@@ -60,5 +60,5 @@ public:
         void setLocale(unsigned long newval)  {fSysInfo.locale=newval;}
 
-#if PILOT_LINK_NUMBER < 1100
+#if PILOT_LINK_NUMBER < PILOT_LINK_0_11_0
 // Older pilot-link versions < 0.11.x don't have prodID, but name instead,
 // and they also do not have the *Version members.


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