diff --git a/Doxyfile b/Doxyfile index 44f419e..43f38b4 100644 --- a/Doxyfile +++ b/Doxyfile @@ -2202,7 +2202,7 @@ PERL_PATH = /usr/bin/perl # powerful graphs. # The default value is: YES. -CLASS_DIAGRAMS = NO +CLASS_DIAGRAMS = YES # You can define message sequence charts within doxygen comments using the \msc # command. Doxygen will then run the mscgen tool (see: @@ -2411,7 +2411,7 @@ INTERACTIVE_SVG = NO # found. If left blank, it is assumed the dot tool can be found in the path. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_PATH = ../../../PortableApps/Graphviz/bin +DOT_PATH = # The DOTFILE_DIRS tag can be used to specify one or more directories that # contain dot files that are included in the documentation (see the \dotfile diff --git a/cstorybook.cpp b/cstorybook.cpp index a18125c..fb5f92e 100644 --- a/cstorybook.cpp +++ b/cstorybook.cpp @@ -432,11 +432,12 @@ bool cStoryBook::openDatabase() return(false); } - query.first(); + query.next(); if(query.value("version").toDouble() < 1.0) updateDatabase01(); else updateDatabase(query.value("version").toInt()); + query.finish(); } return(true); @@ -788,7 +789,6 @@ bool cStoryBook::updateDatabase01() { QSqlQuery query; - query.exec("DROP TABLE config_old;"); if(!query.exec("ALTER TABLE config RENAME TO config_old;")) { myDebug << query.lastError().text(); @@ -922,6 +922,8 @@ bool cStoryBook::updateDatabase01() return(false); } + m_db.close(); + m_db.open(); query.exec("DROP TABLE config_old;"); return(updateDatabase(1)); @@ -931,8 +933,6 @@ bool cStoryBook::updateDatabase1() { QSqlQuery query; - query.exec("DROP TABLE config_old;"); - if(!query.exec("ALTER TABLE scene ADD sceneDate DATETIME;")) { myDebug << query.lastError().text();