Skip to content

Commit

Permalink
refactor: renamed log into logs namespace (builtin function collision).
Browse files Browse the repository at this point in the history
Signed-off-by: Bartłomiej Burdukiewicz <[email protected]>
  • Loading branch information
dev-0x7C6 committed May 26, 2021
1 parent a5872e6 commit 00da4f7
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/log/model.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "model.h"

using namespace log;
using namespace logs;

namespace {
constexpr auto MAXIMUM_MESSAGE_COUNT = 32;
Expand Down
4 changes: 2 additions & 2 deletions src/log/model.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <QList>
#include <QDateTime>

namespace log {
namespace logs {

struct message {
QString text;
Expand All @@ -24,4 +24,4 @@ class model : public QAbstractListModel {
QList<message> m_logs;
};

} // namespace log
} // namespace logs
2 changes: 1 addition & 1 deletion src/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ constexpr auto scale_zoom_out_step = 1.00 - scale_zoom_step;
MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent)
, m_ui(std::make_unique<Ui::MainWindow>())
, m_log(std::make_unique<log::model>())
, m_log(std::make_unique<logs::model>())
, m_settings("Laser", "Engraver")
, m_spindle(m_connection)
, m_engraverManager(m_settings, this)
Expand Down
2 changes: 1 addition & 1 deletion src/mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class MainWindow final : public QMainWindow {

private:
std::unique_ptr<Ui::MainWindow> m_ui;
std::unique_ptr<log::model> m_log;
std::unique_ptr<logs::model> m_log;
QSettings m_settings;
std::unique_ptr<GuiSettings> m_guiSettings;
std::unique_ptr<EngraverConnection> m_connection;
Expand Down

0 comments on commit 00da4f7

Please sign in to comment.