浏览代码

Removed unneeded code

Denis V. Dedkov 2 年之前
父节点
当前提交
f0b38d8fda
共有 4 个文件被更改,包括 0 次插入19 次删除
  1. 0 2
      main.cpp
  2. 0 5
      models/usersmodel.cpp
  3. 0 2
      models/usersmodel.h
  4. 0 10
      viewmodels/settingsviewmodel.cpp

+ 0 - 2
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<UsersViewModel>("ru.ded.beerlog", 1, 0, "UsersViewModel");
     qmlRegisterType<ProductsViewModel>("ru.ded.beerlog", 1, 0, "ProductsViewModel");

+ 0 - 5
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();
-}

+ 0 - 2
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);

+ 0 - 10
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