refs #649, refs #656, register metadata for value objects and further adjustments

* .pro files for new subdirs
* property index

src/blackcore/blackcore.pro

@@ -23,12 +23,14 @@ precompile_header:!isEmpty(PRECOMPILED_HEADER) {
 DEFINES += LOG_IN_FILE BUILD_BLACKCORE_LIB
 
 HEADERS += *.h
-HEADERS += $$PWD/settings/*.h
 HEADERS += $$PWD/data/*.h
+HEADERS += $$PWD/db/*.h
+HEADERS += $$PWD/settings/*.h
 
 SOURCES += *.cpp
-# SOURCES += $$PWD/settings/*.cpp
 SOURCES += $$PWD/data/*.cpp
+SOURCES += $$PWD/db/*.cpp
+# SOURCES += $$PWD/settings/*.cpp
 
 LIBS *= -lvatlib
 

src/blackcore/registermetadata.cpp

@@ -9,6 +9,7 @@
 
 #include "blackcore/registermetadata.h"
 #include "blackcore/contextapplication.h"
+#include "blackcore/db/databasereader.h"
 #include "blackcore/data/globalsetup.h"
 #include "blackcore/data/updateinfo.h"
 #include "blackcore/data/vatsimsetup.h"
@@ -36,6 +37,9 @@ namespace BlackCore
         qRegisterMetaType<BlackCore::CWebReaderFlags::WebReader>();
         qRegisterMetaType<BlackCore::CWebReaderFlags::WebReaderFlag>();
 
+        BlackCore::Db::CDatabaseReaderConfig::registerMetadata();
+        BlackCore::Db::CDatabaseReaderConfigList::registerMetadata();
+
         BlackCore::Data::CGlobalSetup::registerMetadata();
         BlackCore::Data::CUpdateInfo::registerMetadata();
         BlackCore::Data::CVatsimSetup::registerMetadata();

src/blackmisc/blackmisc.pro

@@ -27,35 +27,37 @@ TRANSLATIONS += translations/blackmisc_i18n_de.ts \
                 translations/blackmisc_i18n_en.ts
 
 HEADERS +=  *.h \
-            $$PWD/pq/*.h \
-            $$PWD/aviation/*.h \
-            $$PWD/math/*.h \
-            $$PWD/network/*.h \
-            $$PWD/geo/*.h \
-            $$PWD/input/*.h \
             $$PWD/audio/*.h \
             $$PWD/audio/settings/*.h \
+            $$PWD/aviation/*.h \
+            $$PWD/db/*.h \
+            $$PWD/geo/*.h \
+            $$PWD/input/*.h \
+            $$PWD/math/*.h \
+            $$PWD/network/*.h \
+            $$PWD/pq/*.h \
             $$PWD/simulation/*.h \
+            $$PWD/simulation/data/*.h \
             $$PWD/simulation/fscommon/*.h \
             $$PWD/simulation/fsx/*.h \
             $$PWD/simulation/xplane/*.h \
-            $$PWD/simulation/data/*.h \
             $$PWD/weather/*.h
 
 SOURCES +=  *.cpp \
-            $$PWD/pq/*.cpp \
-            $$PWD/aviation/*.cpp \
-            $$PWD/math/*.cpp \
-            $$PWD/network/*.cpp \
-            $$PWD/input/*.cpp \
-            $$PWD/geo/*.cpp \
             $$PWD/audio/*.cpp \
             $$PWD/audio/settings/*.cpp \
+            $$PWD/aviation/*.cpp \
+            $$PWD/db/*.cpp \
+            $$PWD/geo/*.cpp \
+            $$PWD/input/*.cpp \
+            $$PWD/math/*.cpp \
+            $$PWD/network/*.cpp \
+            $$PWD/pq/*.cpp \
             $$PWD/simulation/*.cpp \
+            $$PWD/simulation/data/*.cpp \
             $$PWD/simulation/fscommon/*.cpp \
             $$PWD/simulation/fsx/*.cpp \
             $$PWD/simulation/xplane/*.cpp \
-            $$PWD/simulation/data/*.cpp \
             $$PWD/weather/*.cpp
 
 win32 {

src/blackmisc/db/db.h

@@ -0,0 +1,25 @@
+/* Copyright (C) 2013
+ * swift Project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
+#ifndef BLACKMISC_DB_DB_H
+#define BLACKMISC_DB_DB_H
+
+/*!
+ * \namespace BlackMisc::Db
+ * \brief DB related classes for access to swift DB.
+ */
+
+#include "blackmisc/db/datastoreobjectlist.h"
+#include "blackmisc/db/datastore.h"
+#include "blackmisc/db/datastoreutility.h"
+#include "blackmisc/db/dbinfolist.h"
+#include "blackmisc/db/dbinfo.h"
+#include "blackmisc/db/dbflags.h"
+
+#endif // guard

src/blackmisc/db/registermetadatadb.cpp

@@ -0,0 +1,24 @@
+/* Copyright (C) 2016
+ * swift project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
+#include "registermetadatadb.h"
+#include "db.h"
+
+namespace BlackMisc
+{
+    namespace Db
+    {
+        void registerMetadata()
+        {
+            CDbInfo::registerMetadata();
+            CDbInfoList::registerMetadata();
+            CDbFlags::registerMetadata();
+        }
+    } // ns
+} // ns

src/blackmisc/db/registermetadatadb.h

@@ -0,0 +1,26 @@
+/* Copyright (C) 2016
+ * swift project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
+//! \file
+
+#ifndef BLACKMISC_DB_REGISTERMETADATADB_H
+#define BLACKMISC_DB_REGISTERMETADATADB_H
+
+#include "blackmisc/blackmiscexport.h"
+
+namespace BlackMisc
+{
+    namespace Db
+    {
+        //! Register metadata for DB related classes
+        BLACKMISC_EXPORT void registerMetadata();
+    } // ns
+} // ns
+
+#endif // guard

src/blackmisc/propertyindex.h

@@ -98,6 +98,7 @@ namespace BlackMisc
             GlobalIndexCSettingKeyboardHotkey           = 10000,
             GlobalIndexIDatastoreInteger                = 11000,
             GlobalIndexIDatastoreString                 = 11100,
+            GlobalIndexCDbInfo                          = 11200,
             GlobalIndexCGlobalSetup                     = 12000,
             GlobalIndexCUpdateInfo                      = 12100,
             GlobalIndexCVatsimSetup                     = 12200,

src/blackmisc/registermetadata.cpp

@@ -13,6 +13,7 @@
 #include "blackmisc/country.h"
 #include "blackmisc/countrylist.h"
 #include "blackmisc/dbus.h"
+#include "blackmisc/db/registermetadatadb.h"
 #include "blackmisc/geo/registermetadatageo.h"
 #include "blackmisc/icon.h"
 #include "blackmisc/iconlist.h"
@@ -85,6 +86,7 @@ namespace BlackMisc
         // sub namespaces
         Audio::registerMetadata();
         Aviation::registerMetadata();
+        Db::registerMetadata();
         Geo::registerMetadata();
         Input::registerMetadata();
         Network::registerMetadata();