X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fcoreconnectionstatuswidget.cpp;h=cce95520c9c53969c989c94c70990e21ae9a769d;hp=ac4642ee25ff23db008ad16b45ed2b4555d5e159;hb=1f21c1f9613031ae263eeed0c4883bfcd5488343;hpb=04315f46a16fc3627218377071e008b6b9744992

diff --git a/src/qtui/coreconnectionstatuswidget.cpp b/src/qtui/coreconnectionstatuswidget.cpp
index ac4642ee..cce95520 100644
--- a/src/qtui/coreconnectionstatuswidget.cpp
+++ b/src/qtui/coreconnectionstatuswidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,32 +21,31 @@
 #include "coreconnectionstatuswidget.h"
 
 #include "client.h"
-#include "iconloader.h"
+#include "icon.h"
 #include "signalproxy.h"
 
-CoreConnectionStatusWidget::CoreConnectionStatusWidget(CoreConnection *connection, QWidget *parent)
-    : QWidget(parent),
-    _coreConnection(connection)
+CoreConnectionStatusWidget::CoreConnectionStatusWidget(CoreConnection* connection, QWidget* parent)
+    : QWidget(parent)
+    , _coreConnection(connection)
 {
     ui.setupUi(this);
     ui.lagLabel->hide();
     ui.sslLabel->hide();
     update();
 
-    connect(coreConnection(), SIGNAL(progressTextChanged(QString)), ui.messageLabel, SLOT(setText(QString)));
-    connect(coreConnection(), SIGNAL(progressValueChanged(int)), ui.progressBar, SLOT(setValue(int)));
-    connect(coreConnection(), SIGNAL(progressRangeChanged(int, int)), ui.progressBar, SLOT(setRange(int, int)));
-    connect(coreConnection(), SIGNAL(progressRangeChanged(int, int)), this, SLOT(progressRangeChanged(int, int)));
+    connect(coreConnection(), &CoreConnection::progressTextChanged, ui.messageLabel, &QLabel::setText);
+    connect(coreConnection(), &CoreConnection::progressValueChanged, ui.progressBar, &QProgressBar::setValue);
+    connect(coreConnection(), &CoreConnection::progressRangeChanged, ui.progressBar, &QProgressBar::setRange);
+    connect(coreConnection(), &CoreConnection::progressRangeChanged, this, &CoreConnectionStatusWidget::progressRangeChanged);
 
-    connect(coreConnection(), SIGNAL(stateChanged(CoreConnection::ConnectionState)), SLOT(connectionStateChanged(CoreConnection::ConnectionState)));
-    connect(coreConnection(), SIGNAL(connectionError(QString)), ui.messageLabel, SLOT(setText(QString)));
-    connect(coreConnection(), SIGNAL(lagUpdated(int)), SLOT(updateLag(int)));
+    connect(coreConnection(), &CoreConnection::stateChanged, this, &CoreConnectionStatusWidget::connectionStateChanged);
+    connect(coreConnection(), &CoreConnection::connectionError, ui.messageLabel, &QLabel::setText);
+    connect(coreConnection(), &CoreConnection::lagUpdated, this, &CoreConnectionStatusWidget::updateLag);
 }
 
-
 void CoreConnectionStatusWidget::update()
 {
-    CoreConnection *conn = coreConnection();
+    CoreConnection* conn = coreConnection();
     if (conn->progressMaximum() >= 0) {
         ui.progressBar->setMinimum(conn->progressMinimum());
         ui.progressBar->setMaximum(conn->progressMaximum());
@@ -59,7 +58,6 @@ void CoreConnectionStatusWidget::update()
     ui.messageLabel->setText(conn->progressText());
 }
 
-
 void CoreConnectionStatusWidget::updateLag(int msecs)
 {
     if (msecs >= 0) {
@@ -74,16 +72,15 @@ void CoreConnectionStatusWidget::updateLag(int msecs)
     }
 }
 
-
 void CoreConnectionStatusWidget::connectionStateChanged(CoreConnection::ConnectionState state)
 {
     if (state >= CoreConnection::Connected) {
         if (coreConnection()->isEncrypted()) {
-            ui.sslLabel->setPixmap(SmallIcon("security-high"));
+            ui.sslLabel->setPixmap(icon::get("security-high").pixmap(16));
             ui.sslLabel->setToolTip(tr("The connection to your core is encrypted with SSL."));
         }
         else {
-            ui.sslLabel->setPixmap(SmallIcon("security-low"));
+            ui.sslLabel->setPixmap(icon::get("security-low").pixmap(16));
             ui.sslLabel->setToolTip(tr("The connection to your core is not encrypted."));
         }
         ui.sslLabel->show();
@@ -92,7 +89,6 @@ void CoreConnectionStatusWidget::connectionStateChanged(CoreConnection::Connecti
         ui.sslLabel->hide();
 }
 
-
 void CoreConnectionStatusWidget::progressRangeChanged(int min, int max)
 {
     Q_UNUSED(min)