ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the Controller a singleton

Browse Source
This commit is contained in:
Tobias Fella
2020-11-04 01:43:13 +00:00
committed by Nicolas Fella
parent 1739a454da
commit 2d1a7d6500
13 changed files with 42 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/accountlistmodel.cpp
View File

@@ -10,21 +10,10 @@
AccountListModel::AccountListModel(QObject *parent)
: QAbstractListModel(parent)
{
}
void AccountListModel::setController(Controller *value)
{
if (m_controller == value) {
return;
}
beginResetModel();
m_connections.clear();
m_controller = value;
m_connections += m_controller->connections();
m_connections += Controller::instance().connections();
connect(m_controller, &Controller::connectionAdded, this, [=](Connection *conn) {
connect(&Controller::instance(), &Controller::connectionAdded, this, [=](Connection *conn) {
if (!conn) {
return;
}
@@ -32,7 +21,7 @@ void AccountListModel::setController(Controller *value)
m_connections.append(conn);
endInsertRows();
});
connect(m_controller, &Controller::connectionDropped, this, [=](Connection *conn) {
connect(&Controller::instance(), &Controller::connectionDropped, this, [=](Connection *conn) {
qDebug() << "Dropping connection" << conn->userId();
if (!conn) {
qDebug() << "Trying to remove null connection";
@@ -47,7 +36,6 @@ void AccountListModel::setController(Controller *value)
m_connections.erase(it);
endRemoveRows();
});
Q_EMIT controllerChanged();
}
QVariant AccountListModel::data(const QModelIndex &index, int role) const