From f12861c744aff474afdaa457781008cbb995113f Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Sun, 23 Oct 2011 02:03:12 -0700
Subject: Cleanup constructors and initialization. Removed unused macro.

(bzr r10693)
---
 src/version.cpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'src/version.cpp')

diff --git a/src/version.cpp b/src/version.cpp
index edaa600db..1baf9d8d9 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -1,10 +1,9 @@
-#define __VERSION_C__
-
 /*
  * Versions
  *
  * Authors:
  *   MenTaLguY <mental@rydia.net>
+ *   Jon A. Cruz <jon@joncruz.org>
  *
  * Copyright (C) 2003 MenTaLguY
  *
@@ -21,31 +20,31 @@ gboolean sp_version_from_string(const gchar *string, Inkscape::Version *version)
         return FALSE;
     }
 
-    version->major = 0;
-    version->minor = 0;
+    version->_major = 0;
+    version->_minor = 0;
 
     return sscanf((const char *)string, "%u.%u",
-                  &version->major, &version->minor) ||
-        sscanf((const char *)string, "%u", &version->major);
+                  &version->_major, &version->_minor) ||
+        sscanf((const char *)string, "%u", &version->_major);
 }
 
 gchar *sp_version_to_string(Inkscape::Version version)
 {
-    return g_strdup_printf("%u.%u", version.major, version.minor);
+    return g_strdup_printf("%u.%u", version._major, version._minor);
 }
 
 gboolean sp_version_inside_range(Inkscape::Version version,
                                  unsigned major_min, unsigned minor_min,
                                  unsigned major_max, unsigned minor_max)
 {
-    if ( version.major < major_min || version.major > major_max ) {
+    if ( version._major < major_min || version._major > major_max ) {
         return FALSE;
-    } else if ( version.major == major_min &&
-                version.minor <= minor_min )
+    } else if ( version._major == major_min &&
+                version._minor <= minor_min )
     {
         return FALSE;
-    } else if ( version.major == major_max &&
-                version.minor >= minor_max )
+    } else if ( version._major == major_max &&
+                version._minor >= minor_max )
     {
         return FALSE;
     } else {
-- 
cgit v1.2.3


From 4e51446f417ad82d2cdac758d0c5ce908ff88038 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Thu, 8 Dec 2011 11:53:54 +0000
Subject: Switch to top-level glib headers.  Thanks to DimStar for patch

Fixed bugs:
  - https://launchpad.net/bugs/898538

(bzr r10762)
---
 src/version.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/version.cpp')

diff --git a/src/version.cpp b/src/version.cpp
index 1baf9d8d9..438e47da9 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -11,7 +11,7 @@
  */
 
 #include <stdio.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include "version.h"
 
 gboolean sp_version_from_string(const gchar *string, Inkscape::Version *version)
-- 
cgit v1.2.3