diff --git a/QCR/engine/console.h b/QCR/engine/console.h index ebe931d14bdb8a8e100a60c5c4a78f73caa69f7d..de3e94d87a3bcd2c6b8165c4828c0b08c26acdd5 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. diff --git a/QCR/engine/logger.h b/QCR/engine/logger.h index 6e176660c54b74707c3594859ab17a006abbbbd2..e13574076a896caf83ac332daf9e9b4c863fe5a7 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"}; diff --git a/QCR/widgets/mainwindow.cpp b/QCR/widgets/mainwindow.cpp index 65a42e9183e31cca6ac21a7adc60f752b31525eb..8bcc2fb383ba594640ca49fd782a9e7b701ddb25 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 { diff --git a/QCR/widgets/tables.cpp b/QCR/widgets/tables.cpp index 801f0c037bb6a65e97b4fae22edb1b644c75414d..67f5155d14d72ad47086bfd7b32aa2b5da01064a 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 {