X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Faliasesmodel.cpp;h=47a701eacde5ad7efe9e6d491cbf097c56306f01;hp=569f56c6ba81700931556f510198d59ce468171a;hb=fcacaaf16551524c7ebb6114254d005274cc3d63;hpb=71f48abcf1e4f9f852a2087bb30a2f187172c910 diff --git a/src/qtui/settingspages/aliasesmodel.cpp b/src/qtui/settingspages/aliasesmodel.cpp index 569f56c6..47a701ea 100644 --- a/src/qtui/settingspages/aliasesmodel.cpp +++ b/src/qtui/settingspages/aliasesmodel.cpp @@ -27,13 +27,11 @@ #include "signalproxy.h" AliasesModel::AliasesModel(QObject *parent) - : QAbstractItemModel(parent), - _configChanged(false), - _modelReady(false) + : QAbstractItemModel(parent) { // we need this signal for future connects to reset the data; - connect(Client::instance(), SIGNAL(connected()), this, SLOT(clientConnected())); - connect(Client::instance(), SIGNAL(disconnected()), this, SLOT(clientDisconnected())); + connect(Client::instance(), &Client::connected, this, &AliasesModel::clientConnected); + connect(Client::instance(), &Client::disconnected, this, &AliasesModel::clientDisconnected); if (Client::isConnected()) clientConnected(); @@ -257,7 +255,7 @@ QModelIndex AliasesModel::index(int row, int column, const QModelIndex &parent) { Q_UNUSED(parent); if (row >= rowCount() || column >= columnCount()) - return QModelIndex(); + return {}; return createIndex(row, column); } @@ -329,7 +327,7 @@ void AliasesModel::clientConnected() if (Client::aliasManager()->isInitialized()) initDone(); else - connect(Client::aliasManager(), SIGNAL(initDone()), SLOT(initDone())); + connect(Client::aliasManager(), &SyncableObject::initDone, this, &AliasesModel::initDone); }