projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Fix build with Qt4 and/or MSVC
[quassel.git]
/
src
/
qtui
/
coreconnectionstatuswidget.cpp
diff --git
a/src/qtui/coreconnectionstatuswidget.cpp
b/src/qtui/coreconnectionstatuswidget.cpp
index
ac4642e
..
ffe262e
100644
(file)
--- a/
src/qtui/coreconnectionstatuswidget.cpp
+++ b/
src/qtui/coreconnectionstatuswidget.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
6
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-20,8
+20,9
@@
#include "coreconnectionstatuswidget.h"
#include "coreconnectionstatuswidget.h"
+#include <QIcon>
+
#include "client.h"
#include "client.h"
-#include "iconloader.h"
#include "signalproxy.h"
CoreConnectionStatusWidget::CoreConnectionStatusWidget(CoreConnection *connection, QWidget *parent)
#include "signalproxy.h"
CoreConnectionStatusWidget::CoreConnectionStatusWidget(CoreConnection *connection, QWidget *parent)
@@
-79,11
+80,11
@@
void CoreConnectionStatusWidget::connectionStateChanged(CoreConnection::Connecti
{
if (state >= CoreConnection::Connected) {
if (coreConnection()->isEncrypted()) {
{
if (state >= CoreConnection::Connected) {
if (coreConnection()->isEncrypted()) {
- ui.sslLabel->setPixmap(
SmallIcon("security-high"
));
+ ui.sslLabel->setPixmap(
QIcon::fromTheme("security-high").pixmap(16
));
ui.sslLabel->setToolTip(tr("The connection to your core is encrypted with SSL."));
}
else {
ui.sslLabel->setToolTip(tr("The connection to your core is encrypted with SSL."));
}
else {
- ui.sslLabel->setPixmap(
SmallIcon("security-low"
));
+ ui.sslLabel->setPixmap(
QIcon::fromTheme("security-low").pixmap(16
));
ui.sslLabel->setToolTip(tr("The connection to your core is not encrypted."));
}
ui.sslLabel->show();
ui.sslLabel->setToolTip(tr("The connection to your core is not encrypted."));
}
ui.sslLabel->show();