*** empty log message ***

diff --git a/src/CppSQLite3.cpp b/src/CppSQLite3.cpp
index 5d82661eb62e49e2fdce0f76ea6954d63bf62177..165f9110bebc1ed0baab8e592fc5e6d09ebebb9a 100644 (file)
--- a/src/CppSQLite3.cpp
+++ b/src/CppSQLite3.cpp
@@ -45,21 +45,37 @@ int sqlite3_decode_binary(const unsigned char *in, unsigned char *out);
 ////////////////////////////////////////////////////////////////////////////////\r
 \r
 CppSQLite3Exception::CppSQLite3Exception(const int nErrCode,\r
-                                                                       char* szErrMess,\r
-                                                                       bool bDeleteMsg/*=true*/) :\r
-                                                                       mnErrCode(nErrCode)\r
-{\r
-       mpszErrMess = sqlite3_mprintf("%s[%d]: %s",\r
-                                                               errorCodeAsString(nErrCode),\r
-                                                               nErrCode,\r
-                                                               szErrMess ? szErrMess : "");\r
-\r
-       if (bDeleteMsg && szErrMess)\r
-       {\r
-               sqlite3_free(szErrMess);\r
-       }\r
+                                        const char* szErrMess,\r
+                                        bool bDeleteMsg/*=true*/) :\r
+  mnErrCode(nErrCode)\r
+{\r
+  mpszErrMess = sqlite3_mprintf("%s[%d]: %s",\r
+                               errorCodeAsString(nErrCode),\r
+                               nErrCode,\r
+                               szErrMess ? szErrMess : "");\r
+  /*\r
+  if (bDeleteMsg && szErrMess)\r
+    {\r
+      sqlite3_free(szErrMess);\r
+    }\r
+  */\r
 }\r
 \r
+CppSQLite3Exception::CppSQLite3Exception(const int nErrCode,\r
+                                        char* szErrMess,\r
+                                        bool bDeleteMsg/*=true*/) :\r
+  mnErrCode(nErrCode)\r
+{\r
+  mpszErrMess = sqlite3_mprintf("%s[%d]: %s",\r
+                               errorCodeAsString(nErrCode),\r
+                               nErrCode,\r
+                               szErrMess ? szErrMess : "");\r
+  \r
+  if (bDeleteMsg && szErrMess)\r
+    {\r
+      sqlite3_free(szErrMess);\r
+    }\r
+}\r
                                                                        \r
 CppSQLite3Exception::CppSQLite3Exception(const CppSQLite3Exception&  e) :\r
                                                                        mnErrCode(e.mnErrCode)\r
@@ -1310,7 +1326,7 @@ sqlite3_stmt* CppSQLite3DB::compile(const char* szSQL)
 ** data in an SQLite database.  The code in this file is not used by any other\r
 ** part of the SQLite library.\r
 **\r
-** $Id: CppSQLite3.cpp,v 1.1 2008/09/26 14:15:48 guigues Exp $\r
+** $Id: CppSQLite3.cpp,v 1.2 2008/12/15 12:54:44 guigues Exp $\r
 */\r
 \r
 /*\r

diff --git a/src/CppSQLite3.h b/src/CppSQLite3.h
index 891170b0694470dd2fb57318c06a3e8ef812edd5..c45c9cb81ee30eedd8d001cab8dec3ad1997142f 100644 (file)
--- a/src/CppSQLite3.h
+++ b/src/CppSQLite3.h
@@ -39,9 +39,12 @@ class CppSQLite3Exception
 public:\r
 \r
     CppSQLite3Exception(const int nErrCode,\r
-                    char* szErrMess,\r
-                    bool bDeleteMsg=true);\r
-\r
+                       char* szErrMess,\r
+                       bool bDeleteMsg=true);\r
+  CppSQLite3Exception(const int nErrCode,\r
+                     const char* szErrMess,\r
+                     bool bDeleteMsg=true);\r
+  \r
     CppSQLite3Exception(const CppSQLite3Exception&  e);\r
 \r
     virtual ~CppSQLite3Exception();\r

diff --git a/src/icons/database.xpm b/src/icons/database.xpm
index f6620843d227987716a9000f934848b2e45d3353..8dc871e6d08deeac77205180ef21d0a98c3c6c78 100644 (file)
--- a/src/icons/database.xpm
+++ b/src/icons/database.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * database_xpm[] = {
+static const char * database_xpm[] = {
 "48 48 293 2",
 "      c None",
 ".     c #9E9FA2",

diff --git a/src/icons/dicomdir.xpm b/src/icons/dicomdir.xpm
index 5f0718391fcfda76ab8b6d7e5b22280ae8d9c70f..036df73c39a49d8b5450f8262a20bb52ccd2348f 100644 (file)
--- a/src/icons/dicomdir.xpm
+++ b/src/icons/dicomdir.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * dicomdir_xpm[] = {
+static const char * dicomdir_xpm[] = {
 "48 48 725 2",
 "      c None",
 ".     c #B48400",

diff --git a/src/icons/folder.xpm b/src/icons/folder.xpm
index f3d5c4e7692d316a006e88c7b1f6d47ed37fded6..c126c5de2c3b3955d442f26d94fbb4dbf3664a87 100644 (file)
--- a/src/icons/folder.xpm
+++ b/src/icons/folder.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * folder_xpm[] = {
+static const char * folder_xpm[] = {
 "48 48 465 2",
 "      c None",
 ".     c #BF8F00",

diff --git a/src/icons/image.xpm b/src/icons/image.xpm
index e2b7d1a49b1a51cee7c7cbbf83cecc0b6910db9b..c4fde0c88ef5e76137b275fd1ac940d0794fb82b 100644 (file)
--- a/src/icons/image.xpm
+++ b/src/icons/image.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * image_xpm[] = {
+static const char * image_xpm[] = {
 "48 48 571 2",
 "      c None",
 ".     c #BC8B00",

diff --git a/src/icons/patient.xpm b/src/icons/patient.xpm
index 030074e4f2fa5e62fd1619185dd79f3d5f7c6dc6..fdaf6c1610e3883eb8bde8b3b13764086e86c3b9 100644 (file)
--- a/src/icons/patient.xpm
+++ b/src/icons/patient.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * patient_xpm[] = {
+static const char * patient_xpm[] = {
 "48 48 687 2",
 "      c None",
 ".     c #E7903C",

diff --git a/src/icons/root.xpm b/src/icons/root.xpm
index 751f8ceb69df3e5e50ff37ae1c44e0a241207194..3b6641984970ffd01b054e12fc419ee1eea09ae5 100644 (file)
--- a/src/icons/root.xpm
+++ b/src/icons/root.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * root_xpm[] = {
+static const char * root_xpm[] = {
 "48 48 833 2",
 "      c None",
 ".     c #B10505",

diff --git a/src/icons/series.xpm b/src/icons/series.xpm
index 1a94d6a4d71b54e48b69ca6fe47e87b1e8ad4d43..749ceee184c61e4334567055d4f138f69db46498 100644 (file)
--- a/src/icons/series.xpm
+++ b/src/icons/series.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * series_xpm[] = {
+static const char * series_xpm[] = {
 "48 48 886 2",
 "      c None",
 ".     c #007CBA",

diff --git a/src/icons/study.xpm b/src/icons/study.xpm
index 0a29012aaddda089e7e34a1d84757278ecf1b1ee..d16c3d1e7b7ab3cee75851f38207419e2fcd2f36 100644 (file)
--- a/src/icons/study.xpm
+++ b/src/icons/study.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static char * study_xpm[] = {
+static const char * study_xpm[] = {
 "48 48 536 2",
 "      c None",
 ".     c #9D9EA1",