projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Use auto where the type is clear from context
[quassel.git]
/
src
/
uisupport
/
nickview.cpp
diff --git
a/src/uisupport/nickview.cpp
b/src/uisupport/nickview.cpp
index
31359c0
..
5adaf73
100644
(file)
--- a/
src/uisupport/nickview.cpp
+++ b/
src/uisupport/nickview.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
6
by the Quassel Project *
+ * Copyright (C) 2005-201
8
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 *
@@
-47,17
+47,15
@@
NickView::NickView(QWidget *parent)
setContextMenuPolicy(Qt::CustomContextMenu);
setSelectionMode(QAbstractItemView::ExtendedSelection);
setContextMenuPolicy(Qt::CustomContextMenu);
setSelectionMode(QAbstractItemView::ExtendedSelection);
-// // breaks with Qt 4.8
-// if(QString("4.8.0") > qVersion()) // FIXME breaks with Qt versions >= 4.10!
setAnimated(true);
connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), SLOT(showContextMenu(const QPoint &)));
setAnimated(true);
connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), SLOT(showContextMenu(const QPoint &)));
-#if defined Q_WS_QWS || defined Q_WS_X11
- connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(startQuery(QModelIndex)));
-#else
+#if defined Q_OS_MACOS || defined Q_OS_WIN
// afaik this is better on Mac and Windows
connect(this, SIGNAL(activated(QModelIndex)), SLOT(startQuery(QModelIndex)));
// afaik this is better on Mac and Windows
connect(this, SIGNAL(activated(QModelIndex)), SLOT(startQuery(QModelIndex)));
+#else
+ connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(startQuery(QModelIndex)));
#endif
}
#endif
}
@@
-78,7
+76,7
@@
void NickView::init()
void NickView::setModel(QAbstractItemModel *model_)
{
if (model())
void NickView::setModel(QAbstractItemModel *model_)
{
if (model())
- disconnect(model(),
0, this, 0
);
+ disconnect(model(),
nullptr, this, nullptr
);
TreeViewTouch::setModel(model_);
init();
TreeViewTouch::setModel(model_);
init();
@@
-143,7
+141,7
@@
void NickView::startQuery(const QModelIndex &index)
if (index.data(NetworkModel::ItemTypeRole) != NetworkModel::IrcUserItemType)
return;
if (index.data(NetworkModel::ItemTypeRole) != NetworkModel::IrcUserItemType)
return;
-
IrcUser
*ircUser = qobject_cast<IrcUser *>(index.data(NetworkModel::IrcUserRole).value<QObject *>());
+
auto
*ircUser = qobject_cast<IrcUser *>(index.data(NetworkModel::IrcUserRole).value<QObject *>());
NetworkId networkId = index.data(NetworkModel::NetworkIdRole).value<NetworkId>();
if (!ircUser || !networkId.isValid())
return;
NetworkId networkId = index.data(NetworkModel::NetworkIdRole).value<NetworkId>();
if (!ircUser || !networkId.isValid())
return;