From cf31d171efc853469c3922f63f33cefcaccf6724 Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de> Date: Fri, 12 May 2023 09:43:19 +0200 Subject: [PATCH 1/4] merge namespaces --- QCR/engine/console.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/QCR/engine/console.h b/QCR/engine/console.h index ebe931d..de3e94d 100644 --- a/QCR/engine/console.h +++ b/QCR/engine/console.h @@ -22,11 +22,9 @@ QCR_DLL extern class QcrConsole* gConsole; //!< global handle that points to _the_ QcrConsole. -namespace qcr { -namespace cmd { +namespace qcr::cmd { class CommandRegistry; } -} //! Global singleton that executes commands from the QcrConsole or from a script. -- GitLab From 746f317e1facfe81593556cb47e0359ff1459f1c Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de> Date: Fri, 12 May 2023 09:47:23 +0200 Subject: [PATCH 2/4] rm outdated comm --- QCR/engine/logger.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QCR/engine/logger.h b/QCR/engine/logger.h index 6e17666..e135740 100644 --- a/QCR/engine/logger.h +++ b/QCR/engine/logger.h @@ -42,7 +42,7 @@ class QcrLogger : public QObject { void setCaller(const QString& caller); signals: - void sigLine(const QString&) const; // used in log panel of NSXTool + void sigLine(const QString&) const; private: QString level_{"main"}; -- GitLab From 0d4d9fffe2bb6510c8f828deaf46fda86c4cb024 Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de> Date: Fri, 12 May 2023 10:28:47 +0200 Subject: [PATCH 3/4] rm outcommented pragmas --- QCR/widgets/tables.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/QCR/widgets/tables.cpp b/QCR/widgets/tables.cpp index 801f0c0..67f5155 100644 --- a/QCR/widgets/tables.cpp +++ b/QCR/widgets/tables.cpp @@ -113,9 +113,6 @@ QVariant QcrCheckTableModel::data(const QModelIndex& index, int role) const // *********************************************************************************************** //! @class QcrTableView -//#pragma GCC diagnostic push -//#pragma GCC diagnostic ignored "-Woverloaded-virtual" // TODO try without - QcrTableView::QcrTableView(QcrTableModel* model) : QcrRegistered{model->name()} , model_{model} @@ -150,8 +147,6 @@ void QcrTableView::setFromCommand(const QString& arg) qcr::remakeAll(); } -//#pragma GCC diagnostic pop - //! Width of a digit int QcrTableView::dWidth() const { -- GitLab From f2a3e3a9f93dd72c764b64dbe9e79beea3666511 Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de> Date: Fri, 12 May 2023 11:03:00 +0200 Subject: [PATCH 4/4] rm unused include --- QCR/widgets/mainwindow.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/QCR/widgets/mainwindow.cpp b/QCR/widgets/mainwindow.cpp index 65a42e9..8bcc2fb 100644 --- a/QCR/widgets/mainwindow.cpp +++ b/QCR/widgets/mainwindow.cpp @@ -14,7 +14,6 @@ #include "QCR/widgets/mainwindow.h" #include "QCR/base/debug.h" -#include "QCR/engine/logger.h" // TEMP #include <QApplication> namespace { -- GitLab