From bedcc675be75f3c7a5ebc8cae604d64debda7056 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 24 May 2016 00:15:11 +0200 Subject: [PATCH] refs #649, refs #656, register metadata for value objects and further adjustments * .pro files for new subdirs * property index --- src/blackcore/blackcore.pro | 6 +++-- src/blackcore/registermetadata.cpp | 4 ++++ src/blackmisc/blackmisc.pro | 30 +++++++++++++------------ src/blackmisc/db/db.h | 25 +++++++++++++++++++++ src/blackmisc/db/registermetadatadb.cpp | 24 ++++++++++++++++++++ src/blackmisc/db/registermetadatadb.h | 26 +++++++++++++++++++++ src/blackmisc/propertyindex.h | 1 + src/blackmisc/registermetadata.cpp | 2 ++ 8 files changed, 102 insertions(+), 16 deletions(-) create mode 100644 src/blackmisc/db/db.h create mode 100644 src/blackmisc/db/registermetadatadb.cpp create mode 100644 src/blackmisc/db/registermetadatadb.h diff --git a/src/blackcore/blackcore.pro b/src/blackcore/blackcore.pro index d0fab91ef..f19d91941 100644 --- a/src/blackcore/blackcore.pro +++ b/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 diff --git a/src/blackcore/registermetadata.cpp b/src/blackcore/registermetadata.cpp index e68d1d5f3..175cde116 100644 --- a/src/blackcore/registermetadata.cpp +++ b/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(); qRegisterMetaType(); + BlackCore::Db::CDatabaseReaderConfig::registerMetadata(); + BlackCore::Db::CDatabaseReaderConfigList::registerMetadata(); + BlackCore::Data::CGlobalSetup::registerMetadata(); BlackCore::Data::CUpdateInfo::registerMetadata(); BlackCore::Data::CVatsimSetup::registerMetadata(); diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro index 7dc437e78..499522bbd 100644 --- a/src/blackmisc/blackmisc.pro +++ b/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 { diff --git a/src/blackmisc/db/db.h b/src/blackmisc/db/db.h new file mode 100644 index 000000000..4f718a891 --- /dev/null +++ b/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 diff --git a/src/blackmisc/db/registermetadatadb.cpp b/src/blackmisc/db/registermetadatadb.cpp new file mode 100644 index 000000000..d1dc8e98c --- /dev/null +++ b/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 diff --git a/src/blackmisc/db/registermetadatadb.h b/src/blackmisc/db/registermetadatadb.h new file mode 100644 index 000000000..9d143e2a5 --- /dev/null +++ b/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 diff --git a/src/blackmisc/propertyindex.h b/src/blackmisc/propertyindex.h index 7c37e17e6..be9e08554 100644 --- a/src/blackmisc/propertyindex.h +++ b/src/blackmisc/propertyindex.h @@ -98,6 +98,7 @@ namespace BlackMisc GlobalIndexCSettingKeyboardHotkey = 10000, GlobalIndexIDatastoreInteger = 11000, GlobalIndexIDatastoreString = 11100, + GlobalIndexCDbInfo = 11200, GlobalIndexCGlobalSetup = 12000, GlobalIndexCUpdateInfo = 12100, GlobalIndexCVatsimSetup = 12200, diff --git a/src/blackmisc/registermetadata.cpp b/src/blackmisc/registermetadata.cpp index c5f35980a..ee5eec55a 100644 --- a/src/blackmisc/registermetadata.cpp +++ b/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();