Skip to content
Extraits de code Groupes Projets
Valider 7b7df00f rédigé par Elliu's avatar Elliu
Parcourir les fichiers

Moving documentStore to VivyApplication

Adding vivyApp macro to access the application globally
parent 6372f711
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!3Add documents
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <QImage> #include <QImage>
#include <QToolBar> #include <QToolBar>
#include <QTabWidget> #include <QTabWidget>
#include "VivyApplication.hh"
MainWindow::MainWindow(QWidget * parent) noexcept MainWindow::MainWindow(QWidget * parent) noexcept
: QMainWindow(parent) : QMainWindow(parent)
...@@ -76,7 +77,7 @@ MainWindow::closeDocument(int index) noexcept ...@@ -76,7 +77,7 @@ MainWindow::closeDocument(int index) noexcept
if (auto doc = documentToClose->getDocument().lock()) { if (auto doc = documentToClose->getDocument().lock()) {
const QString documentName = doc->getName(); const QString documentName = doc->getName();
documentStore.closeDocument(documentName); vivyApp->documentStore.closeDocument(documentName);
qDebug() << "Request to close the document" << documentName << "with tab position" << index; qDebug() << "Request to close the document" << documentName << "with tab position" << index;
} else { } else {
qCritical() << "The document at index" << index << "was already deleted from the store"; qCritical() << "The document at index" << index << "was already deleted from the store";
...@@ -98,12 +99,12 @@ MainWindow::openDocument() noexcept ...@@ -98,12 +99,12 @@ MainWindow::openDocument() noexcept
QFileInfo fileInfo(filename); QFileInfo fileInfo(filename);
const QString baseName = fileInfo.baseName(); const QString baseName = fileInfo.baseName();
if (documentStore.isDocumentPresent(baseName)) { if (vivyApp->documentStore.isDocumentPresent(baseName)) {
qWarning() << "The document" << baseName << "is already loaded"; qWarning() << "The document" << baseName << "is already loaded";
return; return;
} }
std::weak_ptr<VivyDocument> document = documentStore.loadDocument(filename); std::weak_ptr<VivyDocument> document = vivyApp->documentStore.loadDocument(filename);
try { try {
VivyDocumentView *documentView = new VivyDocumentView(document); VivyDocumentView *documentView = new VivyDocumentView(document);
......
...@@ -17,11 +17,10 @@ class VivyApplication; ...@@ -17,11 +17,10 @@ class VivyApplication;
class MainWindow final : public QMainWindow { class MainWindow final : public QMainWindow {
Q_OBJECT Q_OBJECT
VivyDocumentStore documentStore{};
QTabWidget *documents{ nullptr }; QTabWidget *documents{ nullptr };
public: public:
explicit MainWindow(QWidget * paret = nullptr) noexcept; explicit MainWindow(QWidget * parent = nullptr) noexcept;
~MainWindow() noexcept = default; ~MainWindow() noexcept = default;
std::weak_ptr<VivyDocument> getCurrentDocument() const; std::weak_ptr<VivyDocument> getCurrentDocument() const;
......
...@@ -5,8 +5,11 @@ ...@@ -5,8 +5,11 @@
#error "This is a C++ header" #error "This is a C++ header"
#endif #endif
#define vivyApp static_cast<VivyApplication*>(QApplication::instance())
#include <QApplication> #include <QApplication>
#include <QPixmap> #include <QPixmap>
#include "Document/VivyDocumentStore.hh"
#include <memory> #include <memory>
class MainWindow; class MainWindow;
...@@ -14,6 +17,9 @@ class MainWindow; ...@@ -14,6 +17,9 @@ class MainWindow;
class VivyApplication : public QApplication { class VivyApplication : public QApplication {
Q_OBJECT Q_OBJECT
public:
VivyDocumentStore documentStore{};
private: private:
public: public:
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter