From 38d6b7de576d3dafbff343ed65804cfe9fcb6cc4 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 26 Oct 2014 19:53:23 +0100 Subject: [PATCH] C++11 style fixes --- src/libtomahawk/jobview/AclJobItem.cpp | 2 +- src/libtomahawk/jobview/AclJobItem.h | 32 +++++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/libtomahawk/jobview/AclJobItem.cpp b/src/libtomahawk/jobview/AclJobItem.cpp index 7ffdb58eb..f9b8cb489 100644 --- a/src/libtomahawk/jobview/AclJobItem.cpp +++ b/src/libtomahawk/jobview/AclJobItem.cpp @@ -158,7 +158,7 @@ ACLJobDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const QSt ACLJobItem::ACLJobItem( ACLRegistry::User user, const QString &username ) - : m_delegate( 0 ) + : m_delegate( nullptr ) , m_user( user ) , m_username( username ) { diff --git a/src/libtomahawk/jobview/AclJobItem.h b/src/libtomahawk/jobview/AclJobItem.h index 133d1fc14..f75d39f59 100644 --- a/src/libtomahawk/jobview/AclJobItem.h +++ b/src/libtomahawk/jobview/AclJobItem.h @@ -34,20 +34,20 @@ class DLLEXPORT ACLJobDelegate : public QStyledItemDelegate Q_OBJECT public: - explicit ACLJobDelegate ( QObject* parent = 0 ); + explicit ACLJobDelegate ( QObject* parent = nullptr ); virtual ~ACLJobDelegate(); - virtual void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const; - virtual QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const; + void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const override; + QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const override; - virtual void emitSizeHintChanged( const QModelIndex &index ); + void emitSizeHintChanged( const QModelIndex &index ); signals: void update( const QModelIndex& idx ); void aclResult( Tomahawk::ACLStatus::Type result ); protected: - virtual bool editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index ); + bool editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index ) override; private: void drawRoundedButton( QPainter* painter, const QRect& btnRect, bool red = false ) const; @@ -65,21 +65,21 @@ public: explicit ACLJobItem( ACLRegistry::User user, const QString &username ); virtual ~ACLJobItem(); - virtual int weight() const { return 99; } + int weight() const override { return 99; } - virtual QString rightColumnText() const { return QString(); } - virtual QString mainText() const { return QString(); } - virtual QPixmap icon() const { return QPixmap(); } - virtual QString type() const { return "acljob"; } + QString rightColumnText() const override { return QString(); } + QString mainText() const override { return QString(); } + QPixmap icon() const override { return QPixmap(); } + QString type() const override { return "acljob"; } - virtual int concurrentJobLimit() const { return 3; } + int concurrentJobLimit() const override { return 3; } - virtual bool hasCustomDelegate() const { return true; } - virtual void createDelegate( QObject* parent = 0 ); - virtual QStyledItemDelegate* customDelegate() const { return m_delegate; } + bool hasCustomDelegate() const override { return true; } + void createDelegate( QObject* parent = nullptr ) override; + QStyledItemDelegate* customDelegate() const override { return m_delegate; } - virtual ACLRegistry::User user() const { return m_user; } - virtual const QString& username() const { return m_username; } + ACLRegistry::User user() const { return m_user; } + const QString& username() const { return m_username; } signals: void userDecision( ACLRegistry::User user );