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 #104 from mamarley/disconnectdesyncfix
[quassel.git]
/
src
/
uisupport
/
bufferview.h
diff --git
a/src/uisupport/bufferview.h
b/src/uisupport/bufferview.h
index
ce7483e
..
a49ce15
100644
(file)
--- a/
src/uisupport/bufferview.h
+++ b/
src/uisupport/bufferview.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
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 *
@@
-76,12
+76,17
@@
protected:
virtual void keyPressEvent(QKeyEvent *);
virtual void dropEvent(QDropEvent *event);
virtual void rowsInserted(const QModelIndex &parent, int start, int end);
virtual void keyPressEvent(QKeyEvent *);
virtual void dropEvent(QDropEvent *event);
virtual void rowsInserted(const QModelIndex &parent, int start, int end);
- virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
virtual void wheelEvent(QWheelEvent *);
virtual QSize sizeHint() const;
virtual void focusInEvent(QFocusEvent *event) { QAbstractScrollArea::focusInEvent(event); }
virtual void contextMenuEvent(QContextMenuEvent *event);
virtual void wheelEvent(QWheelEvent *);
virtual QSize sizeHint() const;
virtual void focusInEvent(QFocusEvent *event) { QAbstractScrollArea::focusInEvent(event); }
virtual void contextMenuEvent(QContextMenuEvent *event);
+#if QT_VERSION < 0x050000
+ virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+#else
+ virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles);
+#endif
+
private slots:
void joinChannel(const QModelIndex &index);
void toggleHeader(bool checked);
private slots:
void joinChannel(const QModelIndex &index);
void toggleHeader(bool checked);