From 5c79e7106f840ef217b9bf45ec5d3bd925825863 Mon Sep 17 00:00:00 2001 From: Koncord Date: Tue, 10 Oct 2017 07:17:41 +0800 Subject: [PATCH] [Browser] Minor improvements --- apps/browser/MainWindow.cpp | 2 +- apps/browser/MainWindow.hpp | 6 +++--- apps/browser/MySortFilterProxyModel.hpp | 2 +- apps/browser/PingHelper.cpp | 9 +-------- apps/browser/PingHelper.hpp | 7 +++---- apps/browser/PingUpdater.cpp | 2 +- apps/browser/PingUpdater.hpp | 2 +- apps/browser/QueryHelper.cpp | 8 ++++---- apps/browser/QueryHelper.hpp | 4 ++-- apps/browser/ServerInfoDialog.cpp | 10 +++------- apps/browser/ServerInfoDialog.hpp | 5 ++--- apps/browser/ServerModel.cpp | 6 ------ apps/browser/ServerModel.hpp | 3 +-- apps/browser/netutils/QueryClient.cpp | 4 ++-- apps/browser/netutils/QueryClient.hpp | 8 ++++---- apps/browser/netutils/Utils.cpp | 8 ++++---- components/openmw-mp/Master/MasterData.hpp | 15 ++++++++------- 17 files changed, 41 insertions(+), 60 deletions(-) diff --git a/apps/browser/MainWindow.cpp b/apps/browser/MainWindow.cpp index a2ac26898..a072f5cfd 100644 --- a/apps/browser/MainWindow.cpp +++ b/apps/browser/MainWindow.cpp @@ -65,7 +65,7 @@ MainWindow::~MainWindow() delete mGameInvoker; } -void MainWindow::addServerAndUpdate(QString addr) +void MainWindow::addServerAndUpdate(const QString &addr) { favorites->insertRow(0); QModelIndex mi = favorites->index(0, ServerData::ADDR); diff --git a/apps/browser/MainWindow.hpp b/apps/browser/MainWindow.hpp index cf047d84b..02a8fb74e 100644 --- a/apps/browser/MainWindow.hpp +++ b/apps/browser/MainWindow.hpp @@ -17,11 +17,11 @@ class MainWindow : public QMainWindow, private Ui::MainWindow { Q_OBJECT public: - explicit MainWindow(QWidget *parent = 0); - virtual ~MainWindow(); + explicit MainWindow(QWidget *parent = nullptr); + ~MainWindow() override; protected: void closeEvent(QCloseEvent * event) Q_DECL_OVERRIDE; - void addServerAndUpdate(QString addr); + void addServerAndUpdate(const QString &addr); protected slots: void tabSwitched(int index); void addServer(); diff --git a/apps/browser/MySortFilterProxyModel.hpp b/apps/browser/MySortFilterProxyModel.hpp index c53de3a90..169b68945 100644 --- a/apps/browser/MySortFilterProxyModel.hpp +++ b/apps/browser/MySortFilterProxyModel.hpp @@ -14,7 +14,7 @@ class MySortFilterProxyModel : public QSortFilterProxyModel protected: bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const Q_DECL_FINAL; public: - MySortFilterProxyModel(QObject *parent); + explicit MySortFilterProxyModel(QObject *parent); void filterFullServer(bool state); void filterEmptyServers(bool state); void pingLessThan(int maxPing); diff --git a/apps/browser/PingHelper.cpp b/apps/browser/PingHelper.cpp index 63cd79f40..cec25cfe5 100644 --- a/apps/browser/PingHelper.cpp +++ b/apps/browser/PingHelper.cpp @@ -7,7 +7,7 @@ #include #include "PingUpdater.hpp" -void PingHelper::Add(int row, AddrPair addrPair) +void PingHelper::Add(int row, const AddrPair &addrPair) { pingUpdater->addServer(row, addrPair); if (!pingThread->isRunning()) @@ -48,11 +48,4 @@ PingHelper::PingHelper() connect(this, SIGNAL(stop()), pingUpdater, SLOT(stop())); //connect(pingUpdater, SIGNAL(finished()), pingUpdater, SLOT(deleteLater())); connect(pingUpdater, SIGNAL(updateModel(int, unsigned)), this, SLOT(update(int, unsigned))); - - -} - -PingHelper::~PingHelper() -{ - } diff --git a/apps/browser/PingHelper.hpp b/apps/browser/PingHelper.hpp index bf7d438f8..7866d7bfc 100644 --- a/apps/browser/PingHelper.hpp +++ b/apps/browser/PingHelper.hpp @@ -17,17 +17,16 @@ class PingHelper : public QObject Q_OBJECT public: - void Add(int row, AddrPair addrPair); + void Add(int row, const AddrPair &addrPair); void Stop(); void SetModel(QAbstractTableModel *model); //void UpdateImmedialy(PingUpdater::AddrPair addrPair); static PingHelper &Get(); -private: - PingHelper(); - ~PingHelper(); PingHelper(const PingHelper&) = delete; PingHelper& operator=(const PingHelper&) = delete; +private: + PingHelper(); signals: void stop(); public slots: diff --git a/apps/browser/PingUpdater.cpp b/apps/browser/PingUpdater.cpp index 513930c0a..54122ffd8 100644 --- a/apps/browser/PingUpdater.cpp +++ b/apps/browser/PingUpdater.cpp @@ -14,7 +14,7 @@ void PingUpdater::stop() run = false; } -void PingUpdater::addServer(int row, AddrPair addr) +void PingUpdater::addServer(int row, const AddrPair &addr) { servers.push_back({row, addr}); run = true; diff --git a/apps/browser/PingUpdater.hpp b/apps/browser/PingUpdater.hpp index 8dd1111e3..61494a8ac 100644 --- a/apps/browser/PingUpdater.hpp +++ b/apps/browser/PingUpdater.hpp @@ -14,7 +14,7 @@ class PingUpdater : public QObject { Q_OBJECT public: - void addServer(int row, AddrPair addrPair); + void addServer(int row, const AddrPair &addrPair); public slots: void stop(); void process(); diff --git a/apps/browser/QueryHelper.cpp b/apps/browser/QueryHelper.cpp index 1307bd03b..2e1be8df2 100644 --- a/apps/browser/QueryHelper.cpp +++ b/apps/browser/QueryHelper.cpp @@ -19,8 +19,8 @@ QueryHelper::QueryHelper(QAbstractItemModel *model) connect(queryThread, SIGNAL(started()), queryUpdate, SLOT(process())); connect(queryUpdate, SIGNAL(finished()), queryThread, SLOT(quit())); connect(queryUpdate, &QueryUpdate::finished, [this](){emit finished();}); - connect(queryUpdate, SIGNAL(updateModel(QString, unsigned short, QueryData)), - this, SLOT(update(QString, unsigned short, QueryData))); + connect(queryUpdate, SIGNAL(updateModel(const QString&, unsigned short, const QueryData&)), + this, SLOT(update(const QString&, unsigned short, const QueryData&))); queryUpdate->moveToThread(queryThread); } @@ -39,7 +39,7 @@ void QueryHelper::terminate() queryThread->terminate(); } -void QueryHelper::update(QString addr, unsigned short port, QueryData data) +void QueryHelper::update(const QString &addr, unsigned short port, const QueryData& data) { ServerModel *model = ((ServerModel*)_model); model->insertRow(model->rowCount()); @@ -80,7 +80,7 @@ void QueryUpdate::process() return; } - for (auto server : data) + for (const auto &server : data) emit updateModel(server.first.ToString(false), server.first.GetPort(), server.second); emit finished(); } diff --git a/apps/browser/QueryHelper.hpp b/apps/browser/QueryHelper.hpp index 2584ab4f9..b34069ce4 100644 --- a/apps/browser/QueryHelper.hpp +++ b/apps/browser/QueryHelper.hpp @@ -23,7 +23,7 @@ public slots: void refresh(); void terminate(); private slots: - void update(QString addr, unsigned short port, QueryData data); + void update(const QString &addr, unsigned short port, const QueryData& data); signals: void finished(); void started(); @@ -38,7 +38,7 @@ class QueryUpdate : public QObject Q_OBJECT signals: void finished(); - void updateModel(QString addr, unsigned short port, QueryData data); + void updateModel(const QString &addr, unsigned short port, const QueryData& data); public slots: void process(); }; diff --git a/apps/browser/ServerInfoDialog.cpp b/apps/browser/ServerInfoDialog.cpp index c80386d4d..7a3809048 100644 --- a/apps/browser/ServerInfoDialog.cpp +++ b/apps/browser/ServerInfoDialog.cpp @@ -8,6 +8,7 @@ #include "ServerInfoDialog.hpp" #include #include +#include using namespace std; using namespace RakNet; @@ -18,12 +19,7 @@ ServerInfoDialog::ServerInfoDialog(QWidget *parent): QDialog(parent) connect(btnRefresh, SIGNAL(clicked()), this, SLOT(refresh())); } -ServerInfoDialog::~ServerInfoDialog() -{ - -} - -void ServerInfoDialog::Server(QString addr) +void ServerInfoDialog::Server(const QString &addr) { this->addr = addr; } @@ -42,7 +38,7 @@ bool ServerInfoDialog::refresh() listPlayers->clear(); - for (auto player : sd.second.players) + for (const auto &player : sd.second.players) listPlayers->addItem(QString::fromStdString(player)); listPlugins->clear(); diff --git a/apps/browser/ServerInfoDialog.hpp b/apps/browser/ServerInfoDialog.hpp index 33b802150..e6fedff6f 100644 --- a/apps/browser/ServerInfoDialog.hpp +++ b/apps/browser/ServerInfoDialog.hpp @@ -11,9 +11,8 @@ class ServerInfoDialog : public QDialog, public Ui::Dialog { Q_OBJECT public: - explicit ServerInfoDialog(QWidget *parent = 0); - virtual ~ServerInfoDialog(); - void Server(QString addr); + explicit ServerInfoDialog(QWidget *parent = nullptr); + void Server(const QString &addr); public slots: bool refresh(); private: diff --git a/apps/browser/ServerModel.cpp b/apps/browser/ServerModel.cpp index ed3e70ed2..9f728f7b3 100644 --- a/apps/browser/ServerModel.cpp +++ b/apps/browser/ServerModel.cpp @@ -5,12 +5,6 @@ ServerModel::ServerModel(QObject *parent) : QAbstractTableModel(parent) { } - -ServerModel::~ServerModel() -{ - -} - /*QHash ServerModel::roleNames() const { return roles; diff --git a/apps/browser/ServerModel.hpp b/apps/browser/ServerModel.hpp index 0e660633f..520113653 100644 --- a/apps/browser/ServerModel.hpp +++ b/apps/browser/ServerModel.hpp @@ -29,8 +29,7 @@ class ServerModel: public QAbstractTableModel { Q_OBJECT public: - explicit ServerModel(QObject *parent = 0); - ~ServerModel(); + explicit ServerModel(QObject *parent = nullptr); QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_FINAL; int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_FINAL; int columnCount(const QModelIndex &parent) const Q_DECL_FINAL; diff --git a/apps/browser/netutils/QueryClient.cpp b/apps/browser/netutils/QueryClient.cpp index 73d68ccf9..37536880f 100644 --- a/apps/browser/netutils/QueryClient.cpp +++ b/apps/browser/netutils/QueryClient.cpp @@ -30,7 +30,7 @@ QueryClient::~QueryClient() RakPeerInterface::DestroyInstance(peer); } -void QueryClient::SetServer(std::string addr, unsigned short port) +void QueryClient::SetServer(const string &addr, unsigned short port) { masterAddr = SystemAddress(addr.c_str(), port); } @@ -83,7 +83,7 @@ map QueryClient::Query() return query; } -pair QueryClient::Update(RakNet::SystemAddress addr) +pair QueryClient::Update(const RakNet::SystemAddress &addr) { qDebug() << "Locking mutex in QueryClient::Update(RakNet::SystemAddress addr)"; pair server; diff --git a/apps/browser/netutils/QueryClient.hpp b/apps/browser/netutils/QueryClient.hpp index 807cc8704..1e21e8dcf 100644 --- a/apps/browser/netutils/QueryClient.hpp +++ b/apps/browser/netutils/QueryClient.hpp @@ -14,16 +14,16 @@ class QueryClient { -private: +public: QueryClient(QueryClient const &) = delete; QueryClient(QueryClient &&) = delete; QueryClient &operator=(QueryClient const &) = delete; QueryClient &operator=(QueryClient &&) = delete; -public: + static QueryClient &Get(); - void SetServer(std::string addr, unsigned short port); + void SetServer(const std::string &addr, unsigned short port); std::map Query(); - std::pair Update(RakNet::SystemAddress addr); + std::pair Update(const RakNet::SystemAddress &addr); int Status(); private: RakNet::ConnectionState Connect(); diff --git a/apps/browser/netutils/Utils.cpp b/apps/browser/netutils/Utils.cpp index c18429063..920bad832 100644 --- a/apps/browser/netutils/Utils.cpp +++ b/apps/browser/netutils/Utils.cpp @@ -69,9 +69,9 @@ ServerExtendedData getExtendedData(const char *addr, unsigned short port) sstr << TES3MP_VERSION; sstr << TES3MP_PROTO_VERSION; - std::string msg = ""; + std::string msg; - if (peer->Connect(addr, port, sstr.str().c_str(), (int)(sstr.str().size()), 0, 0, 3, 500, 0) != RakNet::CONNECTION_ATTEMPT_STARTED) + if (peer->Connect(addr, port, sstr.str().c_str(), (int)(sstr.str().size()), nullptr, 0, 3, 500, 0) != RakNet::CONNECTION_ATTEMPT_STARTED) msg = "Connection attempt failed.\n"; @@ -142,14 +142,14 @@ ServerExtendedData getExtendedData(const char *addr, unsigned short port) { RakNet::RakString str; bs.Read(str); - data.players.push_back(str.C_String()); + data.players.emplace_back(str.C_String()); } bs.Read(length); for (size_t i = 0; i < length; i++) { RakNet::RakString str; bs.Read(str); - data.plugins.push_back(str.C_String()); + data.plugins.emplace_back(str.C_String()); } done = true; } diff --git a/components/openmw-mp/Master/MasterData.hpp b/components/openmw-mp/Master/MasterData.hpp index e553b3710..1adf2874e 100644 --- a/components/openmw-mp/Master/MasterData.hpp +++ b/components/openmw-mp/Master/MasterData.hpp @@ -6,6 +6,7 @@ #define NEWMASTERPROTO_MASTERDATA_HPP #include +#include #include #include #include @@ -30,7 +31,7 @@ struct Plugin { std::string name; unsigned hash; - Plugin(std::string name = "", unsigned hash = 0): name(name), hash(hash) {}; + explicit Plugin(std::string name = "", unsigned hash = 0): name(std::move(name)), hash(hash) {}; }; struct QueryData @@ -50,23 +51,23 @@ struct QueryData rules["passw"].type = 'v'; rules["passw"].val = 0; } - const char *GetName() { return rules["name"].str.c_str(); } + const char *GetName() const { return rules.at("name").str.c_str(); } void SetName(const char *name) { rules["name"].str = name; } - const char *GetVersion() { return rules["version"].str.c_str(); } + const char *GetVersion() const { return rules.at("version").str.c_str(); } void SetVersion(const char *version) { rules["version"].str = version; } - int GetPlayers() { return rules["players"].val; } + int GetPlayers() const { return rules.at("players").val; } void SetPlayers(int players) { rules["players"].val = players; } - int GetMaxPlayers() { return rules["maxPlayers"].val; } + int GetMaxPlayers() const { return rules.at("maxPlayers").val; } void SetMaxPlayers(int players) { rules["maxPlayers"].val = players; } - const char *GetGameMode() { return rules["gamemode"].str.c_str(); } + const char *GetGameMode() const { return rules.at("gamemode").str.c_str(); } void SetGameMode(const char *str) { rules["gamemode"].str = str; } void SetPassword(int value) { rules["passw"].val = value; }; - int GetPassword() { return rules["passw"].val; } + int GetPassword() const { return rules.at("passw").val; } std::vector players;