Skip to content

Commit 2b58df4

Browse files
jef-njef-n
committedJan 16, 2015
add missed files (followup 313f2c8)
·
ltr-3_40archive/master_2
1 parent 3d9adfe commit 2b58df4

File tree

69 files changed

+257
-257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+257
-257
lines changed
 

‎src/app/composer/qgsattributeselectiondialog.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ class QgsComposerColumnAlignmentDelegate : public QItemDelegate
4444

4545
public:
4646
QgsComposerColumnAlignmentDelegate( QObject *parent = 0 );
47-
QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;
48-
void setEditorData( QWidget *editor, const QModelIndex &index ) const OVERRIDE;
49-
void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const OVERRIDE;
50-
void updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;
47+
QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const override;
48+
void setEditorData( QWidget *editor, const QModelIndex &index ) const override;
49+
void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const override;
50+
void updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const override;
5151

5252
};
5353

@@ -61,10 +61,10 @@ class QgsComposerColumnSourceDelegate : public QItemDelegate
6161

6262
public:
6363
QgsComposerColumnSourceDelegate( QgsVectorLayer* vlayer, QObject *parent = 0 );
64-
QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;
65-
void setEditorData( QWidget *editor, const QModelIndex &index ) const OVERRIDE;
66-
void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const OVERRIDE;
67-
void updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;
64+
QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const override;
65+
void setEditorData( QWidget *editor, const QModelIndex &index ) const override;
66+
void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const override;
67+
void updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const override;
6868
public slots:
6969
void commitAndCloseEditor();
7070
private:
@@ -80,10 +80,10 @@ class QgsComposerColumnWidthDelegate : public QItemDelegate
8080

8181
public:
8282
QgsComposerColumnWidthDelegate( QObject *parent = 0 );
83-
QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;
84-
void setEditorData( QWidget *editor, const QModelIndex &index ) const OVERRIDE;
85-
void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const OVERRIDE;
86-
void updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;
83+
QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const override;
84+
void setEditorData( QWidget *editor, const QModelIndex &index ) const override;
85+
void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const override;
86+
void updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const override;
8787

8888
};
8989

@@ -97,10 +97,10 @@ class QgsComposerColumnSortOrderDelegate : public QItemDelegate
9797

9898
public:
9999
QgsComposerColumnSortOrderDelegate( QObject *parent = 0 );
100-
QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;
101-
void setEditorData( QWidget *editor, const QModelIndex &index ) const OVERRIDE;
102-
void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const OVERRIDE;
103-
void updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const OVERRIDE;
100+
QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const override;
101+
void setEditorData( QWidget *editor, const QModelIndex &index ) const override;
102+
void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const override;
103+
void updateEditorGeometry( QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index ) const override;
104104

105105
};
106106

‎src/app/composer/qgscomposerattributetablewidget.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class QgsComposerAttributeTableWidget: public QgsComposerItemBaseWidget, private
3232
~QgsComposerAttributeTableWidget();
3333

3434
protected:
35-
void showEvent( QShowEvent * event ) OVERRIDE;
35+
void showEvent( QShowEvent * event ) override;
3636

3737
private:
3838
QgsComposerAttributeTableV2* mComposerTable;

0 commit comments

Comments
 (0)
Failed to load comments.