projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix more of the merge fallout.
[quassel.git]
/
src
/
qtui
/
chatscene.cpp
diff --git
a/src/qtui/chatscene.cpp
b/src/qtui/chatscene.cpp
index
24394b9
..
f85e344
100644
(file)
--- a/
src/qtui/chatscene.cpp
+++ b/
src/qtui/chatscene.cpp
@@
-110,10
+110,6
@@
ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w
_clickTimer.setSingleShot(true);
connect(&_clickTimer, SIGNAL(timeout()), SLOT(clickTimeout()));
_clickTimer.setSingleShot(true);
connect(&_clickTimer, SIGNAL(timeout()), SLOT(clickTimeout()));
- _clickTimer.setInterval(QApplication::doubleClickInterval());
- _clickTimer.setSingleShot(true);
- connect(&_clickTimer, SIGNAL(timeout()), SLOT(clickTimeout()));
-
setItemIndexMethod(QGraphicsScene::NoIndex);
}
setItemIndexMethod(QGraphicsScene::NoIndex);
}
@@
-671,7
+667,7
@@
void ChatScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
}
void ChatScene::clickTimeout() {
}
void ChatScene::clickTimeout() {
- if(!_leftButtonPressed && _clickMode == SingleClick
&& !_clickHandled
)
+ if(!_leftButtonPressed && _clickMode == SingleClick)
handleClick(Qt::LeftButton, _clickPos);
}
handleClick(Qt::LeftButton, _clickPos);
}