From f0b38d8fda7f56bf1ce3f3e0605295d979939920 Mon Sep 17 00:00:00 2001 From: "Denis V. Dedkov" Date: Thu, 13 Apr 2023 14:38:26 +0200 Subject: [PATCH] Removed unneeded code --- main.cpp | 2 -- models/usersmodel.cpp | 5 ----- models/usersmodel.h | 2 -- viewmodels/settingsviewmodel.cpp | 10 ---------- 4 files changed, 19 deletions(-) diff --git a/main.cpp b/main.cpp index e576729..f5342f2 100644 --- a/main.cpp +++ b/main.cpp @@ -14,7 +14,6 @@ #include "viewmodels/settingsviewmodel.h" #include "services/beerservice.h" -#include "services/settingsservice.h" #include "services/modelsregister.h" int main(int argc, char *argv[]) @@ -47,7 +46,6 @@ int main(int argc, char *argv[]) ModelsRegister::registerModel(new UsersModel()); engine.rootContext()->setContextProperty("beerService", BeerService::instance()); - engine.rootContext()->setContextProperty("settingsService", SettingsService::instance()); qmlRegisterType("ru.ded.beerlog", 1, 0, "UsersViewModel"); qmlRegisterType("ru.ded.beerlog", 1, 0, "ProductsViewModel"); diff --git a/models/usersmodel.cpp b/models/usersmodel.cpp index f8f799e..d73b9d3 100644 --- a/models/usersmodel.cpp +++ b/models/usersmodel.cpp @@ -19,8 +19,3 @@ void UsersModel::disconnected(const QVariant &data) { qInfo() << data.toMap().value(Keys::Name).toString() << "disconnected"; } - -QVariantList UsersModel::users() const -{ - return items(); -} diff --git a/models/usersmodel.h b/models/usersmodel.h index 8c14b48..534a386 100644 --- a/models/usersmodel.h +++ b/models/usersmodel.h @@ -13,8 +13,6 @@ class UsersModel : public BaseModel public: explicit UsersModel(QObject *parent = nullptr); - QVariantList users() const; - public slots: void connected(const QVariant &data); void disconnected(const QVariant &data); diff --git a/viewmodels/settingsviewmodel.cpp b/viewmodels/settingsviewmodel.cpp index 9fbc7d8..81ed409 100644 --- a/viewmodels/settingsviewmodel.cpp +++ b/viewmodels/settingsviewmodel.cpp @@ -11,16 +11,6 @@ SettingsViewModel::SettingsViewModel(QObject *parent) m_items << SettingItem { tr("BeerLog service address"), "serverAddress", "text" } << SettingItem { tr("Selected user id"), "selectedUserId", "choice", "users" } << SettingItem { tr("Selected store"), "selectedStoreId", "choice", "stores" }; - - QModelIndex selectedUserIdIndex = index(1); - QModelIndex selectedStoreIdIndex = index(2); - - connect(settings(), &SettingsService::selectedUserIdChanged, this, [this, selectedUserIdIndex]() { - emit dataChanged(selectedUserIdIndex, selectedUserIdIndex); - }); - connect(settings(), &SettingsService::selectedStoreIdChanged, this, [this, selectedStoreIdIndex]() { - emit dataChanged(selectedStoreIdIndex, selectedStoreIdIndex); - }); } int SettingsViewModel::rowCount(const QModelIndex &) const