From 2abe09473a3fe46dd11b7037f5a0b1f2388af395 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Sat, 1 Mar 2014 17:39:23 +0400 Subject: [PATCH] small fixes --- sources/gui/src/errorwindow.cpp | 2 +- sources/gui/src/errorwindow.h | 2 +- sources/gui/src/generalwidget.cpp | 2 +- sources/gui/src/generalwidget.h | 2 +- sources/gui/src/mainwindow.h | 2 +- sources/gui/src/netctlinteract.cpp | 2 +- sources/gui/src/netctlinteract.h | 2 +- sources/gui/src/netctlprofile.cpp | 2 +- sources/gui/src/netctlprofile.h | 2 +- sources/gui/src/settingswindow.cpp | 2 +- sources/gui/src/settingswindow.h | 2 +- sources/gui/src/wirelesswidget.cpp | 2 +- sources/gui/src/wirelesswidget.h | 2 +- sources/gui/src/wpasupinteract.cpp | 2 +- sources/gui/src/wpasupinteract.h | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sources/gui/src/errorwindow.cpp b/sources/gui/src/errorwindow.cpp index e40425f..24fc0ea 100644 --- a/sources/gui/src/errorwindow.cpp +++ b/sources/gui/src/errorwindow.cpp @@ -19,7 +19,7 @@ #include "ui_errorwindow.h" -ErrorWindow::ErrorWindow(QWidget *parent, int messageNumber) +ErrorWindow::ErrorWindow(QWidget *parent, const int messageNumber) : QMainWindow(parent), ui(new Ui::ErrorWindow) { diff --git a/sources/gui/src/errorwindow.h b/sources/gui/src/errorwindow.h index 883a041..25dab46 100644 --- a/sources/gui/src/errorwindow.h +++ b/sources/gui/src/errorwindow.h @@ -31,7 +31,7 @@ class ErrorWindow : public QMainWindow public: explicit ErrorWindow(QWidget *parent = 0, - int messageNumber = 0); + const int messageNumber = 0); ~ErrorWindow(); private: diff --git a/sources/gui/src/generalwidget.cpp b/sources/gui/src/generalwidget.cpp index aae8cc0..566a681 100644 --- a/sources/gui/src/generalwidget.cpp +++ b/sources/gui/src/generalwidget.cpp @@ -21,7 +21,7 @@ #include -GeneralWidget::GeneralWidget(QWidget *parent, QMap settings) +GeneralWidget::GeneralWidget(QWidget *parent, const QMap settings) : QWidget(parent), ui(new Ui::GeneralWidget) { diff --git a/sources/gui/src/generalwidget.h b/sources/gui/src/generalwidget.h index 70e6fbe..800801d 100644 --- a/sources/gui/src/generalwidget.h +++ b/sources/gui/src/generalwidget.h @@ -34,7 +34,7 @@ class GeneralWidget : public QWidget public: explicit GeneralWidget(QWidget *parent = 0, - QMap settings = QMap()); + const QMap settings = QMap()); ~GeneralWidget(); QComboBox *connectionType; QMap getSettings(); diff --git a/sources/gui/src/mainwindow.h b/sources/gui/src/mainwindow.h index 556836d..db74f59 100644 --- a/sources/gui/src/mainwindow.h +++ b/sources/gui/src/mainwindow.h @@ -51,7 +51,7 @@ class MainWindow : public QMainWindow public: explicit MainWindow(QWidget *parent = 0, const bool defaultSettings = false, - const int tabNum = 0); + const int tabNum = 1); ~MainWindow(); Netctl *netctlCommand; NetctlProfile *netctlProfile; diff --git a/sources/gui/src/netctlinteract.cpp b/sources/gui/src/netctlinteract.cpp index 297a016..53acedf 100644 --- a/sources/gui/src/netctlinteract.cpp +++ b/sources/gui/src/netctlinteract.cpp @@ -23,7 +23,7 @@ #include "mainwindow.h" -Netctl::Netctl(MainWindow *wid, QMap settings) +Netctl::Netctl(MainWindow *wid, const QMap settings) : parent(wid) { netctlCommand = settings[QString("NETCTL_PATH")]; diff --git a/sources/gui/src/netctlinteract.h b/sources/gui/src/netctlinteract.h index 8b2c1cd..1499775 100644 --- a/sources/gui/src/netctlinteract.h +++ b/sources/gui/src/netctlinteract.h @@ -31,7 +31,7 @@ class Netctl : public QObject public: explicit Netctl(MainWindow *wid = 0, - QMap settings = QMap()); + const QMap settings = QMap()); ~Netctl(); // general information QList getProfileList(); diff --git a/sources/gui/src/netctlprofile.cpp b/sources/gui/src/netctlprofile.cpp index 548ebdc..5bc0e6a 100644 --- a/sources/gui/src/netctlprofile.cpp +++ b/sources/gui/src/netctlprofile.cpp @@ -25,7 +25,7 @@ #include "mainwindow.h" -NetctlProfile::NetctlProfile(MainWindow *wid, QMap settings) +NetctlProfile::NetctlProfile(MainWindow *wid, const QMap settings) : parent(wid) { profileDirectory = new QDir(settings[QString("PROFILE_DIR")]); diff --git a/sources/gui/src/netctlprofile.h b/sources/gui/src/netctlprofile.h index af057a2..393de25 100644 --- a/sources/gui/src/netctlprofile.h +++ b/sources/gui/src/netctlprofile.h @@ -31,7 +31,7 @@ class NetctlProfile : public QObject public: explicit NetctlProfile(MainWindow *wid = 0, - QMap settings = QMap()); + const QMap settings = QMap()); ~NetctlProfile(); bool copyProfile(const QString oldPath); QString createProfile(const QString profile, const QMap settings); diff --git a/sources/gui/src/settingswindow.cpp b/sources/gui/src/settingswindow.cpp index ca3ef86..3166708 100644 --- a/sources/gui/src/settingswindow.cpp +++ b/sources/gui/src/settingswindow.cpp @@ -25,7 +25,7 @@ #include "mainwindow.h" -SettingsWindow::SettingsWindow(MainWindow *wid, QString configFile) +SettingsWindow::SettingsWindow(MainWindow *wid, const QString configFile) : QMainWindow(wid), parent(wid), file(configFile), diff --git a/sources/gui/src/settingswindow.h b/sources/gui/src/settingswindow.h index a2d954d..8a86e31 100644 --- a/sources/gui/src/settingswindow.h +++ b/sources/gui/src/settingswindow.h @@ -34,7 +34,7 @@ class SettingsWindow : public QMainWindow public: explicit SettingsWindow(MainWindow *wid = 0, - QString configFile = QString("")); + const QString configFile = QString("")); ~SettingsWindow(); QMap getDefault(); QMap getSettings(); diff --git a/sources/gui/src/wirelesswidget.cpp b/sources/gui/src/wirelesswidget.cpp index b941774..a77181d 100644 --- a/sources/gui/src/wirelesswidget.cpp +++ b/sources/gui/src/wirelesswidget.cpp @@ -23,7 +23,7 @@ #include -WirelessWidget::WirelessWidget(QWidget *parent, QMap settings) +WirelessWidget::WirelessWidget(QWidget *parent, const QMap settings) : QWidget(parent), ui(new Ui::WirelessWidget) { diff --git a/sources/gui/src/wirelesswidget.h b/sources/gui/src/wirelesswidget.h index 93aa561..31fa450 100644 --- a/sources/gui/src/wirelesswidget.h +++ b/sources/gui/src/wirelesswidget.h @@ -33,7 +33,7 @@ class WirelessWidget : public QWidget public: explicit WirelessWidget(QWidget *parent = 0, - QMap settings = QMap()); + const QMap settings = QMap()); ~WirelessWidget(); QMap getSettings(); int isOk(); diff --git a/sources/gui/src/wpasupinteract.cpp b/sources/gui/src/wpasupinteract.cpp index 4fa1e66..50fab11 100644 --- a/sources/gui/src/wpasupinteract.cpp +++ b/sources/gui/src/wpasupinteract.cpp @@ -24,7 +24,7 @@ #include "sleepthread.h" -WpaSup::WpaSup(MainWindow *wid, QMap settings) +WpaSup::WpaSup(MainWindow *wid, const QMap settings) : parent(wid) { ctrlDir = settings[QString("CTRL_DIR")]; diff --git a/sources/gui/src/wpasupinteract.h b/sources/gui/src/wpasupinteract.h index e281a9c..3ba4424 100644 --- a/sources/gui/src/wpasupinteract.h +++ b/sources/gui/src/wpasupinteract.h @@ -31,7 +31,7 @@ class WpaSup : public QObject public: explicit WpaSup(MainWindow *wid = 0, - QMap settings = QMap()); + const QMap settings = QMap()); ~WpaSup(); // general information QStringList getInterfaceList();