From b6bc2b4aee10e0e9e146524053ba9dd549c87fbc Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Tue, 4 May 2010 23:03:15 +0000 Subject: [PATCH] Remove QSF references from cutecash git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19103 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/gnc/Session.cpp | 11 +---------- src/gnc/mainwindow-file.cpp | 4 ---- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/gnc/Session.cpp b/src/gnc/Session.cpp index 94b232be9c..9b8894642b 100644 --- a/src/gnc/Session.cpp +++ b/src/gnc/Session.cpp @@ -60,16 +60,7 @@ std::pair errorToStringPair(QofBackendError err) 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)"); diff --git a/src/gnc/mainwindow-file.cpp b/src/gnc/mainwindow-file.cpp index 70ea31629c..58b26a2cb0 100644 --- a/src/gnc/mainwindow-file.cpp +++ b/src/gnc/mainwindow-file.cpp @@ -425,10 +425,6 @@ void MainWindow::loadFile(const QString &fileName) } } - 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))