From b1b79ecc383bc54729eb99f9e865d52c2a273ebb Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sun, 12 Aug 2018 16:42:38 +0200
Subject: [PATCH] Renamed Ui::GLScopeNGGUI to Ui::GLScopeGUI

---
 sdrgui/gui/glscopenggui.cpp |  8 ++++----
 sdrgui/gui/glscopenggui.h   | 16 ++++++++--------
 sdrgui/gui/glscopenggui.ui  |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sdrgui/gui/glscopenggui.cpp b/sdrgui/gui/glscopenggui.cpp
index 8ebdadc8d..a5d53a9b4 100644
--- a/sdrgui/gui/glscopenggui.cpp
+++ b/sdrgui/gui/glscopenggui.cpp
@@ -36,7 +36,7 @@ const double GLScopeNGGUI::amps[27] = {
 
 GLScopeNGGUI::GLScopeNGGUI(QWidget* parent) :
     QWidget(parent),
-    ui(new Ui::GLScopeNGGUI),
+    ui(new Ui::GLScopeGUI),
     m_messageQueue(0),
     m_scopeVis(0),
     m_glScope(0),
@@ -1350,7 +1350,7 @@ bool GLScopeNGGUI::handleMessage(Message* message __attribute__((unused)))
     return false;
 }
 
-GLScopeNGGUI::TrigUIBlocker::TrigUIBlocker(Ui::GLScopeNGGUI *ui) :
+GLScopeNGGUI::TrigUIBlocker::TrigUIBlocker(Ui::GLScopeGUI *ui) :
         m_ui(ui)
 {
     m_oldStateTrigMode        = ui->trigMode->blockSignals(true);
@@ -1382,7 +1382,7 @@ void GLScopeNGGUI::TrigUIBlocker::unBlock()
     m_ui->trigDelayFine->blockSignals(m_oldStateTrigDelayFine);
 }
 
-GLScopeNGGUI::TraceUIBlocker::TraceUIBlocker(Ui::GLScopeNGGUI* ui) :
+GLScopeNGGUI::TraceUIBlocker::TraceUIBlocker(Ui::GLScopeGUI* ui) :
         m_ui(ui)
 {
     m_oldStateTrace            = m_ui->trace->blockSignals(true);
@@ -1416,7 +1416,7 @@ void GLScopeNGGUI::TraceUIBlocker::unBlock()
     m_ui->traceColor->blockSignals(m_oldStateTraceColor);
 }
 
-GLScopeNGGUI::MainUIBlocker::MainUIBlocker(Ui::GLScopeNGGUI* ui) :
+GLScopeNGGUI::MainUIBlocker::MainUIBlocker(Ui::GLScopeGUI* ui) :
         m_ui(ui)
 {
     m_oldStateOnlyX        = m_ui->onlyX->blockSignals(true);
diff --git a/sdrgui/gui/glscopenggui.h b/sdrgui/gui/glscopenggui.h
index 3eae59aea..734a7f1ed 100644
--- a/sdrgui/gui/glscopenggui.h
+++ b/sdrgui/gui/glscopenggui.h
@@ -28,7 +28,7 @@
 #include "settings/serializable.h"
 
 namespace Ui {
-    class GLScopeNGGUI;
+    class GLScopeGUI;
 }
 
 class MessageQueue;
@@ -80,13 +80,13 @@ private:
     class TrigUIBlocker
     {
     public:
-        TrigUIBlocker(Ui::GLScopeNGGUI *ui);
+        TrigUIBlocker(Ui::GLScopeGUI *ui);
         ~TrigUIBlocker();
 
         void unBlock();
 
     private:
-        Ui::GLScopeNGGUI *m_ui;
+        Ui::GLScopeGUI *m_ui;
         bool m_oldStateTrigMode;
         bool m_oldStateTrigCount;
         bool m_oldStateTrigPos;
@@ -101,13 +101,13 @@ private:
     class TraceUIBlocker
     {
     public:
-        TraceUIBlocker(Ui::GLScopeNGGUI *ui);
+        TraceUIBlocker(Ui::GLScopeGUI *ui);
         ~TraceUIBlocker();
 
         void unBlock();
 
     private:
-        Ui::GLScopeNGGUI *m_ui;
+        Ui::GLScopeGUI *m_ui;
         bool m_oldStateTrace;
         bool m_oldStateTraceAdd;
         bool m_oldStateTraceDel;
@@ -123,13 +123,13 @@ private:
     class MainUIBlocker
     {
     public:
-        MainUIBlocker(Ui::GLScopeNGGUI *ui);
+        MainUIBlocker(Ui::GLScopeGUI *ui);
         ~MainUIBlocker();
 
         void unBlock();
 
     private:
-        Ui::GLScopeNGGUI *m_ui;
+        Ui::GLScopeGUI *m_ui;
         bool m_oldStateOnlyX;
         bool m_oldStateOnlyY;
         bool m_oldStateHorizontalXY;
@@ -140,7 +140,7 @@ private:
 //        bool m_oldStateTraceLen;
     };
 
-    Ui::GLScopeNGGUI* ui;
+    Ui::GLScopeGUI* ui;
 
     MessageQueue* m_messageQueue;
     ScopeVisNG* m_scopeVis;
diff --git a/sdrgui/gui/glscopenggui.ui b/sdrgui/gui/glscopenggui.ui
index a0e071382..e4da3f321 100644
--- a/sdrgui/gui/glscopenggui.ui
+++ b/sdrgui/gui/glscopenggui.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>GLScopeNGGUI</class>
- <widget class="QWidget" name="GLScopeNGGUI">
+ <class>GLScopeGUI</class>
+ <widget class="QWidget" name="GLScopeGUI">
   <property name="geometry">
    <rect>
     <x>0</x>