From 52b156d1d60ec4324efb2964d61975058200c6d9 Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Wed, 29 Mar 2023 19:16:17 +0200
Subject: [PATCH] MISC: Continue to delete references to the lua thing from the
main Vivy application
---
src/UI/MainWindow.cc | 4 ++--
src/UI/ScriptDocumentView.cc | 1 -
src/UI/ScriptDocumentView.hh | 3 ---
src/UI/ScriptViews/ScriptEditor.cc | 6 ------
src/UI/ScriptViews/ScriptEditor.hh | 3 ---
src/VivyApplication.cc | 3 ---
6 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/src/UI/MainWindow.cc b/src/UI/MainWindow.cc
index 6c564ae4..59d30f31 100644
--- a/src/UI/MainWindow.cc
+++ b/src/UI/MainWindow.cc
@@ -347,8 +347,8 @@ MainWindow::openDocument() noexcept
ScriptDocumentView *newView = new ScriptDocumentView(scriptDocument, documents);
if (!rc) {
- const auto &[line, desc] = std::tuple{ 0, vivyApp->scriptStore->getLastLuaError() };
- emit newView->luaErrorFound(line, desc);
+ logError() << "Failed to execute script document " << VIVY_LOG_QUOTED(filename)
+ << " with code: " << rc;
}
addTab(newView);
diff --git a/src/UI/ScriptDocumentView.cc b/src/UI/ScriptDocumentView.cc
index 9fabc4b3..2383f662 100644
--- a/src/UI/ScriptDocumentView.cc
+++ b/src/UI/ScriptDocumentView.cc
@@ -24,7 +24,6 @@ ScriptDocumentView::ScriptDocumentView(std::shared_ptr<ScriptDocument> ptr, QWid
setUseFakeVimEditor(vivyApp->getUseFakeVimEditor());
- connect(this, &ScriptDocumentView::luaErrorFound, editor, &ScriptEditor::updateLastLuaError);
connect(document.get(), &AbstractDocument::documentChanged, this,
[=, this]() noexcept -> void { emit documentPropertyChanged(); });
diff --git a/src/UI/ScriptDocumentView.hh b/src/UI/ScriptDocumentView.hh
index a348e317..8b087ea0 100644
--- a/src/UI/ScriptDocumentView.hh
+++ b/src/UI/ScriptDocumentView.hh
@@ -37,9 +37,6 @@ public:
void setUseFakeVimEditor(bool yes) noexcept;
-signals:
- void luaErrorFound(int, QString);
-
private:
ScriptEditor *editor{ nullptr };
EditorProxy *proxy{ nullptr };
diff --git a/src/UI/ScriptViews/ScriptEditor.cc b/src/UI/ScriptViews/ScriptEditor.cc
index 6f7de9cf..290e6cc7 100644
--- a/src/UI/ScriptViews/ScriptEditor.cc
+++ b/src/UI/ScriptViews/ScriptEditor.cc
@@ -165,9 +165,3 @@ ScriptEditor::lineNumberAreaPaintEvent(QPaintEvent *event) noexcept
++blockNumber;
}
}
-
-void
-ScriptEditor::updateLastLuaError(int line, QString desc)
-{
- logDebug() << "Update error on line " << line << " with description " << desc;
-}
diff --git a/src/UI/ScriptViews/ScriptEditor.hh b/src/UI/ScriptViews/ScriptEditor.hh
index f9afe789..23b748d9 100644
--- a/src/UI/ScriptViews/ScriptEditor.hh
+++ b/src/UI/ScriptViews/ScriptEditor.hh
@@ -41,9 +41,6 @@ public:
void lineNumberAreaPaintEvent(QPaintEvent *event) noexcept;
int lineNumberAreaWidth() noexcept;
-public slots:
- void updateLastLuaError(int, QString);
-
protected:
void resizeEvent(QResizeEvent *) noexcept override;
void keyPressEvent(QKeyEvent *) noexcept override;
diff --git a/src/VivyApplication.cc b/src/VivyApplication.cc
index 2944b089..18f0f14e 100644
--- a/src/VivyApplication.cc
+++ b/src/VivyApplication.cc
@@ -37,9 +37,6 @@ VivyApplication::VivyApplication(int &argc, char **argv)
logError() << "Unrecognized file type for file " << passedFileName;
}
}
-
- selectedType = ApplicationType::CLI;
- VIVY_LOG_CTOR() << "Select the ApplicationType::CLI";
}
}
--
GitLab