projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #155 from TheOneRing/improve_connect
[quassel.git]
/
src
/
qtui
/
chatmonitorview.cpp
diff --git
a/src/qtui/chatmonitorview.cpp
b/src/qtui/chatmonitorview.cpp
index
efa6c49
..
a844e73
100644
(file)
--- a/
src/qtui/chatmonitorview.cpp
+++ b/
src/qtui/chatmonitorview.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 "chatmonitorview.h"
#include <QAction>
#include "chatmonitorview.h"
#include <QAction>
+#include <QIcon>
#include <QMenu>
#include <QContextMenuEvent>
#include <QMenu>
#include <QContextMenuEvent>
@@
-29,7
+30,6
@@
#include "chatitem.h"
#include "chatscene.h"
#include "client.h"
#include "chatitem.h"
#include "chatscene.h"
#include "client.h"
-#include "iconloader.h"
#include "networkmodel.h"
#include "buffermodel.h"
#include "messagemodel.h"
#include "networkmodel.h"
#include "buffermodel.h"
#include "messagemodel.h"
@@
-70,7
+70,7
@@
void ChatMonitorView::addActionsToMenu(QMenu *menu, const QPointF &pos)
}
menu->addSeparator();
}
menu->addSeparator();
- menu->addAction(
SmallIcon
("configure"), tr("Configure..."), this, SLOT(showSettingsPage()));
+ menu->addAction(
QIcon::fromTheme
("configure"), tr("Configure..."), this, SLOT(showSettingsPage()));
}
}