r19103 - gnucash/trunk/src/gnc - Remove QSF references from cutecash

Geert Janssens gjanssens at code.gnucash.org
Tue May 4 19:03:15 EDT 2010


Author: gjanssens
Date: 2010-05-04 19:03:15 -0400 (Tue, 04 May 2010)
New Revision: 19103
Trac: http://svn.gnucash.org/trac/changeset/19103

Modified:
   gnucash/trunk/src/gnc/Session.cpp
   gnucash/trunk/src/gnc/mainwindow-file.cpp
Log:
Remove QSF references from cutecash

Modified: gnucash/trunk/src/gnc/Session.cpp
===================================================================
--- gnucash/trunk/src/gnc/Session.cpp	2010-05-04 22:51:54 UTC (rev 19102)
+++ gnucash/trunk/src/gnc/Session.cpp	2010-05-04 23:03:15 UTC (rev 19103)
@@ -60,16 +60,7 @@
     case TYPE_TO_STR(ERR_BACKEND_MODIFIED, "commit of object update failed because another user has modified the object");
     case TYPE_TO_STR(ERR_BACKEND_MOD_DESTROY, "commit of object update failed because another user has deleted the object");
     case TYPE_TO_STR(ERR_BACKEND_MISC, "undetermined error");
-    case TYPE_TO_STR(ERR_QSF_INVALID_OBJ, "The QSF object failed to validate against the QSF object schema");
-    case TYPE_TO_STR(ERR_QSF_INVALID_MAP, "The QSF map failed to validate against the QSF map schema");
-    case TYPE_TO_STR(ERR_QSF_BAD_OBJ_GUID, "The QSF object contains one or more invalid GUIDs.");
-    case TYPE_TO_STR(ERR_QSF_BAD_QOF_VERSION, "QSF map or object doesn't match the current QOF_OBJECT_VERSION.");
-    case TYPE_TO_STR(ERR_QSF_BAD_MAP, "The selected map validates but is unusable.");
-    case TYPE_TO_STR(ERR_QSF_NO_MAP, "The QSF object file was loaded without a map");
-    case TYPE_TO_STR(ERR_QSF_WRONG_MAP, "The selected map validates but is for different objects.");
-    case TYPE_TO_STR(ERR_QSF_MAP_NOT_OBJ, "Selected file is a QSF map and cannot be opened as a QSF object");
-    case TYPE_TO_STR(ERR_QSF_OVERFLOW, "EOVERFLOW - generated by strtol or strtoll.");
-    case TYPE_TO_STR(ERR_QSF_OPEN_NOT_MERGE, "QSF files cannot be opened alone. The data must be merged.");
+    case TYPE_TO_STR(ERR_QOF_OVERFLOW, "EOVERFLOW - generated by strtol or strtoll.");
     case TYPE_TO_STR(ERR_FILEIO_FILE_BAD_READ, "read failed or file prematurely truncated");
     case TYPE_TO_STR(ERR_FILEIO_FILE_EMPTY, "file exists, is readable, but is empty");
     case TYPE_TO_STR(ERR_FILEIO_FILE_LOCKERR, "mangled locks (unspecified error)");

Modified: gnucash/trunk/src/gnc/mainwindow-file.cpp
===================================================================
--- gnucash/trunk/src/gnc/mainwindow-file.cpp	2010-05-04 22:51:54 UTC (rev 19102)
+++ gnucash/trunk/src/gnc/mainwindow-file.cpp	2010-05-04 23:03:15 UTC (rev 19103)
@@ -425,10 +425,6 @@
         }
     }
 
-    if (ERR_QSF_OPEN_NOT_MERGE == io_err)
-    {
-        we_are_in_error = true;
-    }
     /* if the database doesn't exist, ask the user ... */
     else if ((ERR_BACKEND_NO_SUCH_DB == io_err) ||
              (ERR_SQL_DB_TOO_OLD == io_err))



More information about the gnucash-changes mailing list