From 2527588b9ff255734de675760d77eec2f42d992f Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Wed, 25 Aug 2021 14:21:23 +0200
Subject: [PATCH] UI & MISC: Place the 'using' on FakeVim internal types inside
the proxy editor to not poluate the Vivy namespace
---
src/UI/ScriptViews/EditorProxy.hh | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/UI/ScriptViews/EditorProxy.hh b/src/UI/ScriptViews/EditorProxy.hh
index 97be1793..1c2e4bda 100644
--- a/src/UI/ScriptViews/EditorProxy.hh
+++ b/src/UI/ScriptViews/EditorProxy.hh
@@ -19,14 +19,14 @@ struct ExCommand;
namespace Vivy
{
class EditorProxy;
-using FakeVimHandler = FakeVim::Internal::FakeVimHandler;
-using ExCommand = FakeVim::Internal::ExCommand;
class EditorProxy final : public QObject {
Q_OBJECT
VIVY_UNMOVABLE_OBJECT(EditorProxy)
explicit EditorProxy(QPlainTextEdit *widget) noexcept;
+ using FakeVimHandler = FakeVim::Internal::FakeVimHandler;
+ using ExCommand = FakeVim::Internal::ExCommand;
public:
~EditorProxy() override;
@@ -44,7 +44,7 @@ public slots:
void changeStatusMessage(const QString &contents, int cursorPos) noexcept;
void changeExtraInformation(const QString &info) noexcept;
void updateStatusBar() noexcept;
- void handleExCommand(bool *handled, const FakeVim::Internal::ExCommand &cmd) noexcept;
+ void handleExCommand(bool *handled, const ExCommand &cmd) noexcept;
void requestSetBlockSelection(const QTextCursor &tc) noexcept;
void requestDisableBlockSelection() noexcept;
void updateBlockSelection() noexcept;
@@ -56,10 +56,10 @@ private:
static int firstNonSpace(const QString &text) noexcept;
void updateExtraSelections() noexcept;
- bool wantSaveAndQuit(const FakeVim::Internal::ExCommand &cmd) noexcept;
- bool wantSave(const FakeVim::Internal::ExCommand &cmd) noexcept;
- bool wantQuit(const FakeVim::Internal::ExCommand &cmd) noexcept;
- bool wantRun(const FakeVim::Internal::ExCommand &cmd) noexcept;
+ bool wantSaveAndQuit(const ExCommand &cmd) noexcept;
+ bool wantSave(const ExCommand &cmd) noexcept;
+ bool wantQuit(const ExCommand &cmd) noexcept;
+ bool wantRun(const ExCommand &cmd) noexcept;
QPlainTextEdit *widget;
QString statusMessage;
--
GitLab