aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvetlana Abramenkova <sabramenkova@luxoft.com>2019-06-13 17:09:46 +0300
committerSvetlana Abramenkova <sabramenkova@luxoft.com>2019-06-17 12:39:46 +0000
commitaaaeeaefd4559c32bec487acafa638fcd4faf369 (patch)
treef35b03df02e63344142ee8f98ba75f3736ba4e14
parent3904a615557e2b73d5430e2487980e92091b6aaa (diff)
Fix compilation warnings
Change-Id: I7c1bd30909c81c698aa77ea4579c656138dde713 Fixes: AUTOSUITE-995 Reviewed-by: Nikolay Zamotaev <nzamotaev@luxoft.com> Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
-rw-r--r--src/bench/newprojectwizard.cpp2
-rw-r--r--src/bench/newprojectwizard.h2
-rw-r--r--src/bench/optionsdialog.cpp2
-rw-r--r--src/bench/runtimemanager.cpp2
-rw-r--r--src/bench/runtimemanager.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/bench/newprojectwizard.cpp b/src/bench/newprojectwizard.cpp
index 2089917..4ac3cdb 100644
--- a/src/bench/newprojectwizard.cpp
+++ b/src/bench/newprojectwizard.cpp
@@ -62,8 +62,8 @@ NewProjectWizard::NewProjectWizard(QWidget *parent)
MainDocumentPage::MainDocumentPage(QWidget *parent)
: QWizardPage (parent)
- , m_workspace(nullptr)
, m_mainDocumentField(new QLineEdit)
+ , m_workspace(nullptr)
, m_projectFileDir(nullptr)
{
setTitle("Main Document");
diff --git a/src/bench/newprojectwizard.h b/src/bench/newprojectwizard.h
index 486a392..90c024f 100644
--- a/src/bench/newprojectwizard.h
+++ b/src/bench/newprojectwizard.h
@@ -107,7 +107,7 @@ class NewProjectWizard : public QWizard
{
Q_OBJECT
public:
- explicit NewProjectWizard(QWidget *parent = 0);
+ explicit NewProjectWizard(QWidget *parent = nullptr);
QWizardPage* createMainDocumentPage();
QWizardPage* createWorkspacePage();
QWizardPage* createImportsPage();
diff --git a/src/bench/optionsdialog.cpp b/src/bench/optionsdialog.cpp
index 28fb5ae..e333e06 100644
--- a/src/bench/optionsdialog.cpp
+++ b/src/bench/optionsdialog.cpp
@@ -44,8 +44,8 @@ OptionsDialog::OptionsDialog(QWidget *parent)
, m_httpProxyForm(new HttpProxyOptionPage(this))
, m_importPathsForm(new ImportPathOptionPage(this))
, m_hostsForm(new HostsOptionsPage(this))
- , m_appearanceForm(new AppearanceOptionPage(this))
, m_runtimeForm(new RuntimeOptionPage(this))
+ , m_appearanceForm(new AppearanceOptionPage(this))
{
ui->setupUi(this);
diff --git a/src/bench/runtimemanager.cpp b/src/bench/runtimemanager.cpp
index 5a29298..c6614a1 100644
--- a/src/bench/runtimemanager.cpp
+++ b/src/bench/runtimemanager.cpp
@@ -133,7 +133,7 @@ void RuntimeManager::setPrimeCurrentFile(const LiveDocument &currentFile)
m_primeRuntime->setCurrentFile(currentFile);
}
-void RuntimeManager::initConnectToServer(const QString &document)
+void RuntimeManager::initConnectToServer()
{
if (m_curproc->state() == QProcess::Running) {
m_curproc->connectToServer();
diff --git a/src/bench/runtimemanager.h b/src/bench/runtimemanager.h
index d0cf393..63ab2e4 100644
--- a/src/bench/runtimemanager.h
+++ b/src/bench/runtimemanager.h
@@ -67,7 +67,7 @@ public slots:
void onPrimeRuntimeChanged();
void setPrimeCurrentFile(const LiveDocument &currentFile);
void newRuntimeWindow(const QString &document);
- void initConnectToServer(const QString &document);
+ void initConnectToServer();
void onConnected();
void onRuntimeStarted();
void updateRuntimePath(const QString& path);