diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2013-08-05 21:54:06 +0400 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2013-08-05 21:54:06 +0400 |
| commit | 0932ee60516f3e8ce7d964de4cee79b96c4e344b (patch) | |
| tree | 89c16924ca4239d87c6efdfc8da9a08229f13134 /src/mirall/folderstatusmodel.cpp | |
| parent | 26bd164168e7282fdf5da7aa2d7dd5620cbb01c9 (diff) | |
| parent | ee1b8465a3f08d39e8c71b9aa53401fde17c88ac (diff) | |
Merge branch 'shibboleth'
Conflicts:
src/CMakeLists.txt
src/mirall/application.h
Diffstat (limited to 'src/mirall/folderstatusmodel.cpp')
| -rw-r--r-- | src/mirall/folderstatusmodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mirall/folderstatusmodel.cpp b/src/mirall/folderstatusmodel.cpp index 3c9188097..bc2403c96 100644 --- a/src/mirall/folderstatusmodel.cpp +++ b/src/mirall/folderstatusmodel.cpp @@ -26,9 +26,9 @@ FolderStatusModel::FolderStatusModel() } -Qt::ItemFlags FolderStatusModel::flags ( const QModelIndex& ) +Qt::ItemFlags FolderStatusModel::flags ( const QModelIndex& ) const { - return Qt::ItemIsSelectable; + return Qt::ItemIsSelectable | Qt::ItemIsEnabled; } QVariant FolderStatusModel::data(const QModelIndex &index, int role) const @@ -296,7 +296,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem & painter->restore(); } -bool FolderStatusDelegate::editorEvent ( QEvent * event, QAbstractItemModel * model, const QStyleOptionViewItem & option, const QModelIndex & index ) +bool FolderStatusDelegate::editorEvent ( QEvent * /*event*/, QAbstractItemModel * /*model*/, const QStyleOptionViewItem & /*option*/, const QModelIndex & /*index*/ ) { return false; } |