From 6543a01418e5dd35e6bf6786c4654944f85fe2fc Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 30 Jul 2013 14:53:42 +0200 Subject: [PATCH] Fix warnings emitted by clang. --- src/mirall/csyncthread.h | 2 +- src/mirall/folderstatusmodel.cpp | 2 +- src/mirall/folderstatusmodel.h | 2 +- src/mirall/systray.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mirall/csyncthread.h b/src/mirall/csyncthread.h index c737908ee..14d8e0dd3 100644 --- a/src/mirall/csyncthread.h +++ b/src/mirall/csyncthread.h @@ -85,7 +85,7 @@ private: bool _hasFiles; // true if there is at least one file that is not ignored or removed - friend class CSyncRunScopeHelper; + friend struct CSyncRunScopeHelper; }; } diff --git a/src/mirall/folderstatusmodel.cpp b/src/mirall/folderstatusmodel.cpp index f10e8b0d1..80ef75ac5 100644 --- a/src/mirall/folderstatusmodel.cpp +++ b/src/mirall/folderstatusmodel.cpp @@ -26,7 +26,7 @@ FolderStatusModel::FolderStatusModel() } -Qt::ItemFlags FolderStatusModel::flags ( const QModelIndex& ) +Qt::ItemFlags FolderStatusModel::flags ( const QModelIndex& ) const { return Qt::ItemIsSelectable; } diff --git a/src/mirall/folderstatusmodel.h b/src/mirall/folderstatusmodel.h index de4923699..ec8537db2 100644 --- a/src/mirall/folderstatusmodel.h +++ b/src/mirall/folderstatusmodel.h @@ -24,7 +24,7 @@ class FolderStatusModel : public QStandardItemModel { public: FolderStatusModel(); - virtual Qt::ItemFlags flags( const QModelIndex& ); + virtual Qt::ItemFlags flags( const QModelIndex& ) const; QVariant data(const QModelIndex &index, int role) const; }; diff --git a/src/mirall/systray.h b/src/mirall/systray.h index a3aaefa03..85e2a86cb 100644 --- a/src/mirall/systray.h +++ b/src/mirall/systray.h @@ -26,4 +26,4 @@ public: void showMessage(const QString & title, const QString & message, MessageIcon icon = Information, int millisecondsTimeoutHint = 10000); }; -#endif //SYSTRAY_H \ No newline at end of file +#endif //SYSTRAY_H