diff --git a/src/database/database_utils.h b/src/database/database_utils.h index 67bcb6e..5dccabe 100644 --- a/src/database/database_utils.h +++ b/src/database/database_utils.h @@ -28,11 +28,11 @@ using oDBase = odb::sqlite::database; using uDBase = U; -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include void DATABASE_EXPORT addBook(oDBase& db, const QString title, const QVector& authors); diff --git a/src/model/author_book_s.h b/src/model/books/author_book_s.h similarity index 96% rename from src/model/author_book_s.h rename to src/model/books/author_book_s.h index 32a90ae..a098dcc 100644 --- a/src/model/author_book_s.h +++ b/src/model/books/author_book_s.h @@ -1,7 +1,7 @@ #ifndef AUTHOR_BOOK_H #define AUTHOR_BOOK_H -#include "model_global.h" +#include #include "author_s.h" #include "book_s.h" diff --git a/src/model/author_s.h b/src/model/books/author_s.h similarity index 96% rename from src/model/author_s.h rename to src/model/books/author_s.h index bef4022..e8d6355 100644 --- a/src/model/author_s.h +++ b/src/model/books/author_s.h @@ -1,7 +1,7 @@ #ifndef AUTHOR_S_H #define AUTHOR_S_H -#include "model_global.h" +#include // @JsonSerializer class Author_S; diff --git a/src/model/book_s.h b/src/model/books/book_s.h similarity index 98% rename from src/model/book_s.h rename to src/model/books/book_s.h index 3a09af6..ee83309 100644 --- a/src/model/book_s.h +++ b/src/model/books/book_s.h @@ -1,7 +1,7 @@ #ifndef BOOK_S_H #define BOOK_S_H -#include "model_global.h" +#include #include diff --git a/src/model/genre_s.h b/src/model/books/genre_s.h similarity index 93% rename from src/model/genre_s.h rename to src/model/books/genre_s.h index a577c15..9b6651f 100644 --- a/src/model/genre_s.h +++ b/src/model/books/genre_s.h @@ -1,7 +1,7 @@ #ifndef GENRE_H #define GENRE_H -#include "model_global.h" +#include #pragma db object class MODEL_EXPORT Genre_S diff --git a/src/model/series_s.h b/src/model/books/series_s.h similarity index 93% rename from src/model/series_s.h rename to src/model/books/series_s.h index 59ac95f..62b2c91 100644 --- a/src/model/series_s.h +++ b/src/model/books/series_s.h @@ -1,7 +1,7 @@ #ifndef SERIES_H #define SERIES_H -#include "model_global.h" +#include #pragma db object class MODEL_EXPORT Series_S diff --git a/src/model/model.qbs b/src/model/model.qbs index 9e0d2ab..40e34f2 100644 --- a/src/model/model.qbs +++ b/src/model/model.qbs @@ -26,12 +26,21 @@ PSLibrary { odb.gen.databases: "sqlite" cpp.cxxLanguageVersion: "c++17" + Group { + id: headers + name: "headers" + files: [ + "model_global.h", + ] + } + Group { id: odbs name: "odb" files: [ "**/*.h", ] + excludeFiles: headers.files fileTags: ["hpp", "odbxx", "rgen"] } diff --git a/src/model/settings/settings.h b/src/model/settings/settings.h new file mode 100644 index 0000000..3ab49e5 --- /dev/null +++ b/src/model/settings/settings.h @@ -0,0 +1,23 @@ +#ifndef SETTINGS_S_H +#define SETTINGS_S_H + +#include + +#pragma db object +class MODEL_EXPORT Settings_S +{ +public: + Settings_S() = default; + + quint64 id() const { return m_id; } + void setId(const quint64& newId) { m_id = newId; } + +private: + friend class odb::access; + +private: +#pragma db id auto + quint64 m_id; +}; + +#endif // SETTINGS_S_H diff --git a/src/restapi/restapiserver.cpp b/src/restapi/restapiserver.cpp index 59a11bc..7d11978 100644 --- a/src/restapi/restapiserver.cpp +++ b/src/restapi/restapiserver.cpp @@ -5,10 +5,10 @@ #include #include -#include // Должен быть здесь -#include -#include // Должен быть здесь -#include +#include // Должен быть здесь +#include +#include // Должен быть здесь +#include #include #include