Build system changed to Cmake, ORM changed to QxORM, Qt6 compatibility.
This commit is contained in:
+2
-8
@@ -11,12 +11,8 @@
|
||||
|
||||
#include "define.h"
|
||||
#include "core_global.h"
|
||||
#include "transaction.h"
|
||||
#include "data/core-data.h"
|
||||
|
||||
#include <odb/database.hxx>
|
||||
#include <odb/session.hxx>
|
||||
|
||||
class IPlugin;
|
||||
|
||||
class CORESHARED_EXPORT Context
|
||||
@@ -28,7 +24,7 @@ public:
|
||||
IPlugin *plugin(const QString &pluginId);
|
||||
void loadPlugins();
|
||||
void openDb(const QString &path);
|
||||
odb::database *db() { return m_db; }
|
||||
void* db() { return nullptr; }
|
||||
QSettings *settings() { return m_settings; }
|
||||
bool dbOpened() { return m_dbOpened; }
|
||||
void destroy();
|
||||
@@ -37,7 +33,7 @@ public:
|
||||
QSharedPointer<User> currentUser() const;
|
||||
void setCurrentUser(const QSharedPointer<User> ¤tUser);
|
||||
|
||||
odb::session &session();
|
||||
//odb::session &session();
|
||||
|
||||
SeasonPtr currentSeason() const;
|
||||
void setCurrentSeason(const SeasonPtr ¤tSeason);
|
||||
@@ -47,10 +43,8 @@ public:
|
||||
private:
|
||||
Context();
|
||||
QList<IPlugin*> m_plugins;
|
||||
odb::database *m_db;
|
||||
QSettings *m_settings;
|
||||
bool m_dbOpened;
|
||||
odb::session m_session;
|
||||
QSharedPointer<User> m_currentUser;
|
||||
SeasonPtr m_currentSeason;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user