Skip to content
Extraits de code Groupes Projets
Vérifiée Valider a67b15d3 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

BUILD: Should fix the problems with the include order of things

parent 66c5f4d5
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!21Add clean logs support + dependent MR
#ifndef VIVY_ABSTRACT_DOCUMENT_H #pragma once
#define VIVY_ABSTRACT_DOCUMENT_H
#ifndef __cplusplus #ifndef __cplusplus
#error "This is a C++ header" #error "This is a C++ header"
...@@ -101,5 +100,3 @@ signals: ...@@ -101,5 +100,3 @@ signals:
} }
bool operator==(const Vivy::AbstractDocument &a, const Vivy::AbstractDocument &b) noexcept; bool operator==(const Vivy::AbstractDocument &a, const Vivy::AbstractDocument &b) noexcept;
#endif // VIVY_ABSTRACT_DOCUMENT_H
#include "ScriptDocumentView.hh" #include "ScriptDocumentView.hh"
#include "MainWindow.hh"
#include "ScriptViews/ScriptEditor.hh" #include "ScriptViews/ScriptEditor.hh"
#include "ScriptViews/ScriptHighlighter.hh" #include "ScriptViews/ScriptHighlighter.hh"
#include "../VivyApplication.hh" #include "../VivyApplication.hh"
......
#include "EditorProxy.hh" #include "EditorProxy.hh"
#include "../MainWindow.hh"
#include "../FakeVim/FakeVimHandler.hh" #include "../FakeVim/FakeVimHandler.hh"
#include "../FakeVim/FakeVimActions.hh" #include "../FakeVim/FakeVimActions.hh"
#include "../../VivyApplication.hh" #include "../../VivyApplication.hh"
......
...@@ -59,7 +59,7 @@ VivyApplication::exec() noexcept ...@@ -59,7 +59,7 @@ VivyApplication::exec() noexcept
setCursorFlashTime(0); setCursorFlashTime(0);
// Show the main window // Show the main window
mainWindowPtr = std::make_unique<MainWindow>(); mainWindowPtr = std::make_shared<MainWindow>();
mainWindowPtr->show(); mainWindowPtr->show();
logInfo() << "Entering the main event loop"; logInfo() << "Entering the main event loop";
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#error "This is a C++ header" #error "This is a C++ header"
#endif #endif
#define vivyApp (dynamic_cast<::Vivy::VivyApplication *>(VivyApplication::instance())) #define vivyApp (static_cast<::Vivy::VivyApplication *>(VivyApplication::instance()))
#define currentVivyDocument() dynamic_cast<::Vivy::VivyDocument *>(vivyApp->getCurrentDocument()) #define currentVivyDocument() dynamic_cast<::Vivy::VivyDocument *>(vivyApp->getCurrentDocument())
#define currentScriptDocument dynamic_cast<::Vivy::ScriptDocument *>(vivyApp->getCurrentDocument()) #define currentScriptDocument dynamic_cast<::Vivy::ScriptDocument *>(vivyApp->getCurrentDocument())
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include "Lib/Script/ScriptStore.hh" #include "Lib/Script/ScriptStore.hh"
#include "Lib/Document/VivyDocumentStore.hh" #include "Lib/Document/VivyDocumentStore.hh"
#include "Lib/Log.hh" #include "Lib/Log.hh"
#include "UI/MainWindow.hh"
namespace Vivy namespace Vivy
{ {
...@@ -68,7 +67,7 @@ private: ...@@ -68,7 +67,7 @@ private:
int fontIdBold; int fontIdBold;
int fontIdBoldItalic; int fontIdBoldItalic;
std::unique_ptr<MainWindow> mainWindowPtr{ nullptr }; std::shared_ptr<MainWindow> mainWindowPtr{ nullptr };
bool useFakeVim{ false }; bool useFakeVim{ false };
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