mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-12-18 10:02:41 -05:00
Merge branch 'master' into v0.6-BugFixing_20
This commit is contained in:
commit
8f9d99a232
18 changed files with 186 additions and 52 deletions
|
|
@ -47,7 +47,7 @@ class ChannelPostFilesDelegate: public QStyledItemDelegate
|
|||
Q_OBJECT
|
||||
|
||||
public:
|
||||
ChannelPostFilesDelegate(QObject *parent=0) : QStyledItemDelegate(parent){}
|
||||
ChannelPostFilesDelegate(QObject *parent=0) : QStyledItemDelegate(parent){}
|
||||
virtual ~ChannelPostFilesDelegate(){}
|
||||
|
||||
void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const override;
|
||||
|
|
@ -160,6 +160,7 @@ private slots:
|
|||
void markMessageUnread();
|
||||
|
||||
public slots:
|
||||
void currentTabChanged(int t);
|
||||
void sortColumnFiles(int col,Qt::SortOrder so);
|
||||
void sortColumnPostFiles(int col,Qt::SortOrder so);
|
||||
void updateCommentsCount(int n);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue