X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fcoreconnectdlg.cpp;h=4a749a7d5491522048c5a0044a494e2159639228;hp=9cc342773303d2d3e26c02e3ef0fcd8d47e26dcb;hb=673ded0d543cbdc2cf6e746b6bee7c1d21af8f90;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce

diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp
index 9cc34277..4a749a7d 100644
--- a/src/qtui/coreconnectdlg.cpp
+++ b/src/qtui/coreconnectdlg.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 by the Quassel Project                             *
+ *   Copyright (C) 2005-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,19 +15,20 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
+#include "coreconnectdlg.h"
+
 #include <QDialogButtonBox>
 #include <QVBoxLayout>
 
-#include "coreconnectdlg.h"
-
-#include "iconloader.h"
 #include "clientsettings.h"
 #include "coreaccountsettingspage.h"
+#include "icon.h"
 
-CoreConnectDlg::CoreConnectDlg(QWidget *parent) : QDialog(parent)
+CoreConnectDlg::CoreConnectDlg(QWidget* parent)
+    : QDialog(parent)
 {
     _settingsPage = new CoreAccountSettingsPage(this);
     _settingsPage->setStandAlone(true);
@@ -39,44 +40,41 @@ CoreConnectDlg::CoreConnectDlg(QWidget *parent) : QDialog(parent)
         _settingsPage->setSelectedAccount(lastAccount);
 
     setWindowTitle(tr("Connect to Core"));
-    setWindowIcon(SmallIcon("network-disconnect"));
+    setWindowIcon(icon::get("network-disconnect"));
 
-    QVBoxLayout *layout = new QVBoxLayout(this);
+    auto* layout = new QVBoxLayout(this);
     layout->addWidget(_settingsPage);
 
-    QDialogButtonBox *buttonBox = new QDialogButtonBox(this);
-    buttonBox->setStandardButtons(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
+    auto* buttonBox = new QDialogButtonBox(this);
+    buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     layout->addWidget(buttonBox);
 
-    connect(_settingsPage, SIGNAL(connectToCore(AccountId)), SLOT(accept()));
-    connect(buttonBox, SIGNAL(accepted()), SLOT(accept()));
-    connect(buttonBox, SIGNAL(rejected()), SLOT(reject()));
+    connect(_settingsPage, &CoreAccountSettingsPage::connectToCore, this, &QDialog::accept);
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
 }
 
-
 AccountId CoreConnectDlg::selectedAccount() const
 {
     return _settingsPage->selectedAccount();
 }
 
-
 void CoreConnectDlg::accept()
 {
     _settingsPage->save();
     QDialog::accept();
 }
 
-
 /******** CoreConnectAuthDlg ****************************************************************/
 
-CoreConnectAuthDlg::CoreConnectAuthDlg(CoreAccount *account, QWidget *parent)
-    : QDialog(parent),
-    _account(account)
+CoreConnectAuthDlg::CoreConnectAuthDlg(CoreAccount* account, QWidget* parent)
+    : QDialog(parent)
+    , _account(account)
 {
     ui.setupUi(this);
 
-    connect(ui.user, SIGNAL(textChanged(QString)), SLOT(setButtonStates()));
-    connect(ui.password, SIGNAL(textChanged(QString)), SLOT(setButtonStates()));
+    connect(ui.user, &QLineEdit::textChanged, this, &CoreConnectAuthDlg::setButtonStates);
+    connect(ui.password, &QLineEdit::textChanged, this, &CoreConnectAuthDlg::setButtonStates);
 
     ui.label->setText(tr("Please enter your credentials for %1:").arg(account->accountName()));
     ui.user->setText(account->user());
@@ -89,7 +87,6 @@ CoreConnectAuthDlg::CoreConnectAuthDlg(CoreAccount *account, QWidget *parent)
         ui.password->setFocus();
 }
 
-
 void CoreConnectAuthDlg::accept()
 {
     _account->setUser(ui.user->text());
@@ -99,7 +96,6 @@ void CoreConnectAuthDlg::accept()
     QDialog::accept();
 }
 
-
 void CoreConnectAuthDlg::setButtonStates()
 {
     bool valid = !(ui.user->text().isEmpty() || ui.password->text().isEmpty());