From 5a93ba5d7aae586252ce232d6c7d379dce9f4773 Mon Sep 17 00:00:00 2001
From: Allan CORNET <nelson.numerical.computation@gmail.com>
Date: Wed, 28 Aug 2024 21:26:53 +0200
Subject: [PATCH] snapcraft packaging

---
 modules/gui/src/cpp/QtTerminal.cpp          | 4 ++--
 modules/terminal/src/cpp/WindowsConsole.cpp | 4 ++--
 snap/readme.md                              | 4 ++--
 snap/snapcraft.yaml                         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/gui/src/cpp/QtTerminal.cpp b/modules/gui/src/cpp/QtTerminal.cpp
index 8dfc1beff7..0c4d2b2c14 100644
--- a/modules/gui/src/cpp/QtTerminal.cpp
+++ b/modules/gui/src/cpp/QtTerminal.cpp
@@ -261,7 +261,7 @@ QtTerminal::getLine(const std::wstring& prompt)
         return L"\n";
     }
     eval->commandQueue.clear();
-    CallbackQueue::getInstance()->clear();
+    Nelson::CallbackQueue::getInstance()->clear();
 
     bool wasInterruptedByAction = false;
 
@@ -275,7 +275,7 @@ QtTerminal::getLine(const std::wstring& prompt)
             break;
         }
 
-        if (!eval->commandQueue.isEmpty() || !CallbackQueue::getInstance()->isEmpty()) {
+        if (!eval->commandQueue.isEmpty() || !Nelson::CallbackQueue::getInstance()->isEmpty()) {
             wasInterruptedByAction = true;
             break;
         }
diff --git a/modules/terminal/src/cpp/WindowsConsole.cpp b/modules/terminal/src/cpp/WindowsConsole.cpp
index 06c8ae27d8..86b7db8ab0 100644
--- a/modules/terminal/src/cpp/WindowsConsole.cpp
+++ b/modules/terminal/src/cpp/WindowsConsole.cpp
@@ -441,7 +441,7 @@ WindowsConsole::getCharacter(bool& bIsAction)
         void* veval = NelsonConfiguration::getInstance()->getMainEvaluator();
         Nelson::Evaluator* eval = (Nelson::Evaluator*)veval;
         eval->commandQueue.clear();
-        CallbackQueue::getInstance()->clear();
+        Nelson::CallbackQueue::getInstance()->clear();
         while (TRUE) {
             ::WaitForSingleObject(Win32InputStream, 30);
             DWORD nbEventsAvailable = 0;
@@ -457,7 +457,7 @@ WindowsConsole::getCharacter(bool& bIsAction)
                     bInterruptGetChar = true;
                 }
             }
-            if (!eval->commandQueue.isEmpty() || !CallbackQueue::getInstance()->isEmpty()
+            if (!eval->commandQueue.isEmpty() || !Nelson::CallbackQueue::getInstance()->isEmpty()
                 || bInterruptGetChar) {
                 bIsAction = true;
                 bInterruptGetChar = false;
diff --git a/snap/readme.md b/snap/readme.md
index c2b783c56c..378767c03b 100644
--- a/snap/readme.md
+++ b/snap/readme.md
@@ -15,7 +15,7 @@ sudo snapcraft --destructive-mode  --verbose
 # Test locally
 
 ```
-sudo snap install nelson_1.6.0.0_amd64.snap --dangerous
+sudo snap install nelson_1.7.0.0_amd64.snap --dangerous
 ```
 
 Debug:
@@ -27,7 +27,7 @@ snap run --shell nelson.nelson
 # Push
 
 ```
-snapcraft upload nelson_1.6.0.0_amd64.snap
+snapcraft upload nelson_1.7.0.0_amd64.snap
 ```
 
 # Connection
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index a47032b04b..f65127453a 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -74,7 +74,7 @@ parts:
       DESTDIR=$CRAFT_PART_INSTALL cmake --build . -- install
 
       craftctl set grade=stable
-      craftctl set version=1.6.0.0
+      craftctl set version=1.7.0.0
       rm -rf $CRAFT_PART_INSTALL/usr/share/perl5/XML/
       rm -rf $CRAFT_PART_INSTALL/usr/share/texmf