diff --git a/loggingwindow.cpp b/loggingwindow.cpp index 7c7f45a..709db1b 100644 --- a/loggingwindow.cpp +++ b/loggingwindow.cpp @@ -2,9 +2,9 @@ #include "ui_loggingwindow.h" loggingWindow::loggingWindow(QString logFilename, QWidget *parent) : - logFilename(logFilename), QWidget(parent), - ui(new Ui::loggingWindow) + ui(new Ui::loggingWindow), + logFilename(logFilename) { ui->setupUi(this); this->setWindowTitle("Log"); diff --git a/loggingwindow.h b/loggingwindow.h index 60ab3ff..d453eb7 100644 --- a/loggingwindow.h +++ b/loggingwindow.h @@ -25,7 +25,7 @@ class loggingWindow : public QWidget Q_OBJECT public: - explicit loggingWindow(QString logFilename, QWidget *parent = NULL); + explicit loggingWindow(QString logFilename, QWidget *parent = 0); ~loggingWindow(); void acceptLogText(QString text); diff --git a/wfmain.cpp b/wfmain.cpp index b814bb8..dc459e8 100644 --- a/wfmain.cpp +++ b/wfmain.cpp @@ -21,9 +21,9 @@ bool debugModeLogging = false; #endif wfmain::wfmain(const QString serialPortCL, const QString hostCL, const QString settingsFile, const QString logFile, bool debugMode, QWidget *parent ) : - logFilename(logFile), QMainWindow(parent), - ui(new Ui::wfmain) + ui(new Ui::wfmain), + logFilename(logFile) { QGuiApplication::setApplicationDisplayName("wfview"); QGuiApplication::setApplicationName(QString("wfview"));