From ab18a046b3061ec9a2d6c3987f2e345ee1a82785 Mon Sep 17 00:00:00 2001
From: Elliu <goyard.louis@gmail.com>
Date: Wed, 18 Aug 2021 20:01:50 +0200
Subject: [PATCH] Replacing getCurrentVivyDocument by getCurrentDocument
And some macros to get the current VivyDocument or current
ScriptDocument
---
src/VivyApplication.cc | 9 +++------
src/VivyApplication.hh | 5 ++++-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/VivyApplication.cc b/src/VivyApplication.cc
index 0cce1bc7..f3e17144 100644
--- a/src/VivyApplication.cc
+++ b/src/VivyApplication.cc
@@ -92,13 +92,10 @@ VivyApplication::getMainWindow() const
return mainWindowPtr.get();
}
-/*
- * @return the current VivyDocument, or null if there isn't one or if the current document is not a VivyDocument
- */
-VivyDocument *
-VivyApplication::getCurrentVivyDocument() const
+AbstractDocument *
+VivyApplication::getCurrentDocument() const
{
if (!mainWindowPtr)
throw std::logic_error("No main window in the graphic VivyApplication");
- return dynamic_cast<VivyDocument*>(mainWindowPtr.get()->getCurrentDocument());
+ return mainWindowPtr.get()->getCurrentDocument();
}
diff --git a/src/VivyApplication.hh b/src/VivyApplication.hh
index d992f5e1..757dcff1 100644
--- a/src/VivyApplication.hh
+++ b/src/VivyApplication.hh
@@ -6,6 +6,9 @@
#define vivyApp static_cast<VivyApplication *>(QApplication::instance())
+#define currentVivyDocument() dynamic_cast<VivyDocument*>(vivyApp->getCurrentDocument())
+#define currentScriptDocument dynamic_cast<ScriptDocument*>(vivyApp->getCurrentDocument())
+
// Only support dark theme for now
#define VIVY_ICON_APP ":icons/vivy.png"
#define VIVY_ICON_SCRIPT ":icons/lua.png"
@@ -71,7 +74,7 @@ public:
QFont getApplicationFont(Font) const noexcept;
[[nodiscard("handle-it")]] MainWindow *getMainWindow() const;
- [[nodiscard("handle-it")]] VivyDocument *getCurrentVivyDocument() const;
+ [[nodiscard("handle-it")]] AbstractDocument *getCurrentDocument() const;
void setTheme(Theme) noexcept;
};
--
GitLab