Removed unneeded code
This commit is contained in:
2
main.cpp
2
main.cpp
@@ -14,7 +14,6 @@
|
|||||||
#include "viewmodels/settingsviewmodel.h"
|
#include "viewmodels/settingsviewmodel.h"
|
||||||
|
|
||||||
#include "services/beerservice.h"
|
#include "services/beerservice.h"
|
||||||
#include "services/settingsservice.h"
|
|
||||||
#include "services/modelsregister.h"
|
#include "services/modelsregister.h"
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
@@ -47,7 +46,6 @@ int main(int argc, char *argv[])
|
|||||||
ModelsRegister::registerModel(new UsersModel());
|
ModelsRegister::registerModel(new UsersModel());
|
||||||
|
|
||||||
engine.rootContext()->setContextProperty("beerService", BeerService::instance());
|
engine.rootContext()->setContextProperty("beerService", BeerService::instance());
|
||||||
engine.rootContext()->setContextProperty("settingsService", SettingsService::instance());
|
|
||||||
|
|
||||||
qmlRegisterType<UsersViewModel>("ru.ded.beerlog", 1, 0, "UsersViewModel");
|
qmlRegisterType<UsersViewModel>("ru.ded.beerlog", 1, 0, "UsersViewModel");
|
||||||
qmlRegisterType<ProductsViewModel>("ru.ded.beerlog", 1, 0, "ProductsViewModel");
|
qmlRegisterType<ProductsViewModel>("ru.ded.beerlog", 1, 0, "ProductsViewModel");
|
||||||
|
|||||||
@@ -19,8 +19,3 @@ void UsersModel::disconnected(const QVariant &data)
|
|||||||
{
|
{
|
||||||
qInfo() << data.toMap().value(Keys::Name).toString() << "disconnected";
|
qInfo() << data.toMap().value(Keys::Name).toString() << "disconnected";
|
||||||
}
|
}
|
||||||
|
|
||||||
QVariantList UsersModel::users() const
|
|
||||||
{
|
|
||||||
return items();
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -13,8 +13,6 @@ class UsersModel : public BaseModel
|
|||||||
public:
|
public:
|
||||||
explicit UsersModel(QObject *parent = nullptr);
|
explicit UsersModel(QObject *parent = nullptr);
|
||||||
|
|
||||||
QVariantList users() const;
|
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void connected(const QVariant &data);
|
void connected(const QVariant &data);
|
||||||
void disconnected(const QVariant &data);
|
void disconnected(const QVariant &data);
|
||||||
|
|||||||
@@ -11,16 +11,6 @@ SettingsViewModel::SettingsViewModel(QObject *parent)
|
|||||||
m_items << SettingItem { tr("BeerLog service address"), "serverAddress", "text" }
|
m_items << SettingItem { tr("BeerLog service address"), "serverAddress", "text" }
|
||||||
<< SettingItem { tr("Selected user id"), "selectedUserId", "choice", "users" }
|
<< SettingItem { tr("Selected user id"), "selectedUserId", "choice", "users" }
|
||||||
<< SettingItem { tr("Selected store"), "selectedStoreId", "choice", "stores" };
|
<< 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
|
int SettingsViewModel::rowCount(const QModelIndex &) const
|
||||||
|
|||||||
Reference in New Issue
Block a user