projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Qt-based connection detection
[quassel.git]
/
src
/
uisupport
/
networkmodelcontroller.cpp
diff --git
a/src/uisupport/networkmodelcontroller.cpp
b/src/uisupport/networkmodelcontroller.cpp
index
7eb6c53
..
e447238
100644
(file)
--- a/
src/uisupport/networkmodelcontroller.cpp
+++ b/
src/uisupport/networkmodelcontroller.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
2
by the Quassel Project *
+ * Copyright (C) 2005-201
5
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 *
@@
-21,6
+21,7
@@
#include <QComboBox>
#include <QDialogButtonBox>
#include <QGridLayout>
#include <QComboBox>
#include <QDialogButtonBox>
#include <QGridLayout>
+#include <QIcon>
#include <QLabel>
#include <QLineEdit>
#include <QInputDialog>
#include <QLabel>
#include <QLineEdit>
#include <QInputDialog>
@@
-31,7
+32,6
@@
#include "buffermodel.h"
#include "buffersettings.h"
#include "buffermodel.h"
#include "buffersettings.h"
-#include "iconloader.h"
#include "clientidentity.h"
#include "network.h"
#include "util.h"
#include "clientidentity.h"
#include "network.h"
#include "util.h"
@@
-59,7
+59,7
@@
Action *NetworkModelController::registerAction(ActionType type, const QString &t
}
}
-Action *NetworkModelController::registerAction(ActionType type, const Q
Pixmap
&icon, const QString &text, bool checkable)
+Action *NetworkModelController::registerAction(ActionType type, const Q
Icon
&icon, const QString &text, bool checkable)
{
Action *act;
if (icon.isNull())
{
Action *act;
if (icon.isNull())
@@
-526,7
+526,7
@@
void NetworkModelController::handleNickAction(ActionType type, QAction *action)
NetworkModelController::JoinDlg::JoinDlg(const QModelIndex &index, QWidget *parent) : QDialog(parent)
{
NetworkModelController::JoinDlg::JoinDlg(const QModelIndex &index, QWidget *parent) : QDialog(parent)
{
- setWindowIcon(
SmallIcon
("irc-join-channel"));
+ setWindowIcon(
QIcon::fromTheme
("irc-join-channel"));
setWindowTitle(tr("Join Channel"));
QGridLayout *layout = new QGridLayout(this);
setWindowTitle(tr("Join Channel"));
QGridLayout *layout = new QGridLayout(this);