diff --git a/ConsoleWindow.cpp b/ConsoleWindow.cpp index 69f2f20..e53d256 100644 --- a/ConsoleWindow.cpp +++ b/ConsoleWindow.cpp @@ -20,7 +20,7 @@ #include "ConsoleWindow.h" #include -ConsoleWindow* ConsoleWindow::_singleton = NULL; +ConsoleWindow* ConsoleWindow::instance = NULL; ConsoleWindow::ConsoleWindow(QWidget *parent) : QMainWindow(parent) { @@ -53,12 +53,12 @@ ConsoleWindow::ConsoleWindow(QWidget *parent) : QMainWindow(parent) setCentralWidget(_console); } -ConsoleWindow *ConsoleWindow::getInstance() +ConsoleWindow *ConsoleWindow::console() { - if (!_singleton) - _singleton = new ConsoleWindow; + if (!instance) + instance = new ConsoleWindow; - return _singleton; + return instance; } void ConsoleWindow::createActions() @@ -78,7 +78,7 @@ void ConsoleWindow::createMenu() fileMenu->addAction(quitAction); } -void ConsoleWindow::messageLog(QtMsgType type, const QMessageLogContext &context, const QString &msg) +void ConsoleWindow::printMessage(QtMsgType type, const QMessageLogContext &context, const QString &msg) { // Message QByteArray message = msg.toLocal8Bit(); @@ -86,8 +86,6 @@ void ConsoleWindow::messageLog(QtMsgType type, const QMessageLogContext &context QString contexts(QStringLiteral("%1:%2").arg(context.file).arg(context.line)), // Date and time time(QDateTime::currentDateTime().toString(tr("MMM dd yy HH:mm"))), - // Colorized time - timeHtml = "" + time + "", debug = "Debug:", info = "Info:", warning = "Warning:", @@ -128,9 +126,9 @@ void ConsoleWindow::closeEvent(QCloseEvent *event) void ConsoleWindow::kill() { - if (_singleton) { - delete _singleton; - _singleton = NULL; + if (instance) { + delete instance; + instance = NULL; } } diff --git a/ConsoleWindow.h b/ConsoleWindow.h index 01caf59..0ccfa7f 100644 --- a/ConsoleWindow.h +++ b/ConsoleWindow.h @@ -38,9 +38,9 @@ private: public: // Using a singleton instance - static ConsoleWindow *getInstance(); + static ConsoleWindow *console(); // Console log message handler - void messageLog(QtMsgType type, const QMessageLogContext &context, const QString &msg); + void printMessage(QtMsgType type, const QMessageLogContext &context, const QString &msg); // Destructor ~ConsoleWindow(); // This instance killer @@ -54,7 +54,7 @@ protected: private: // This instance - static ConsoleWindow *_singleton; + static ConsoleWindow *instance; // Console logger QPlainTextEdit *_console; diff --git a/MainWindow.cpp b/MainWindow.cpp index 9fd5e88..790fb78 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -1364,7 +1364,7 @@ void MainWindow::createLayout() // destinationCanvas, SLOT(updateCanvas())); // Create console logging output - consoleWindow = ConsoleWindow::getInstance(); + consoleWindow = ConsoleWindow::console(); consoleWindow->setVisible(false); // Create layout. diff --git a/main.cpp b/main.cpp index 491489e..4f6cbde 100644 --- a/main.cpp +++ b/main.cpp @@ -68,7 +68,7 @@ void initRegistry() // Intercept all logging message and display it in the console void logMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) { - ConsoleWindow::getInstance()->messageLog(type, context, msg); + ConsoleWindow::console()->printMessage(type, context, msg); } int main(int argc, char *argv[])