wilderjds
/
okular
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Q_DECL_OVERRIDE

Browse Source
frameworks
Montel Laurent 11 years ago
parent 26e4f8de60
commit a8c13a9e1d
16 changed files with 52 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      ui/annotationmodel.h
  2. 2
      ui/annotationproxymodels.h
  3. 4
      ui/annotationtools.h
  4. 4
      ui/annotwindow.h
  5. 2
      ui/embeddedfilesdialog.h
  6. 4
      ui/fileprinterpreview.h
  7. 8
      ui/magnifierview.h
  8. 4
      ui/pageitemdelegate.h
  9. 2
      ui/pagesizelabel.h
  10. 10
      ui/presentationwidget.h
  11. 8
      ui/propertiesdialog.h
  12. 2
      ui/side_reviews.h
  13. 4
      ui/sidebar.h
  14. 18
      ui/thumbnaillist.h
  15. 4
      ui/toc.h
  16. 14
      ui/tocmodel.h

14
ui/annotationmodel.h
Unescape View File

@ -33,13 +33,13 @@ class AnnotationModel : public QAbstractItemModel
virtual ~AnnotationModel();
// reimplementations from QAbstractItemModel
virtual int columnCount( const QModelIndex &parent = QModelIndex() ) const;
virtual QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const;
virtual bool hasChildren( const QModelIndex &parent = QModelIndex() ) const;
virtual QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const;
virtual QModelIndex index( int row, int column, const QModelIndex &parent = QModelIndex() ) const;
virtual QModelIndex parent( const QModelIndex &index ) const;
virtual int rowCount( const QModelIndex &parent = QModelIndex() ) const;
int columnCount( const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE;
QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE;
bool hasChildren( const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE;
QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE;
QModelIndex index( int row, int column, const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE;
QModelIndex parent( const QModelIndex &index ) const Q_DECL_OVERRIDE;
int rowCount( const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE;
bool isAnnotation( const QModelIndex &index ) const;
Okular::Annotation* annotationForIndex( const QModelIndex &index ) const;

2
ui/annotationproxymodels.h
Unescape View File

@ -32,7 +32,7 @@ class PageFilterProxyModel : public QSortFilterProxyModel
/**
* Reimplemented from QSortFilterProxy.
*/
virtual bool filterAcceptsRow( int, const QModelIndex& ) const;
bool filterAcceptsRow( int, const QModelIndex& ) const Q_DECL_OVERRIDE;
public Q_SLOTS:
/**

4
ui/annotationtools.h
Unescape View File

@ -87,9 +87,9 @@ class SmoothPathEngine
public:
SmoothPathEngine( const QDomElement & engineElement );
QRect event( EventType type, Button button, double nX, double nY, double xScale, double yScale, const Okular::Page * /*page*/ );
QRect event( EventType type, Button button, double nX, double nY, double xScale, double yScale, const Okular::Page * /*page*/ ) Q_DECL_OVERRIDE;
void paint( QPainter * painter, double xScale, double yScale, const QRect & /*clipRect*/ );
void paint( QPainter * painter, double xScale, double yScale, const QRect & /*clipRect*/ ) Q_DECL_OVERRIDE;
// These are two alternative ways to get the resulting path. Don't call them both!
QList< Okular::Annotation* > end();

4
ui/annotwindow.h
Unescape View File

@ -48,8 +48,8 @@ class AnnotWindow : public QFrame
int m_prevAnchorPos;
protected:
virtual void showEvent( QShowEvent * event );
virtual bool eventFilter( QObject * obj, QEvent * event );
void showEvent( QShowEvent * event ) Q_DECL_OVERRIDE;
bool eventFilter( QObject * obj, QEvent * event ) Q_DECL_OVERRIDE;
private slots:
void slotUpdateUndoAndRedoInContextMenu(QMenu *menu);

2
ui/embeddedfilesdialog.h
Unescape View File

@ -34,7 +34,7 @@ Q_OBJECT
void saveFile( Okular::EmbeddedFile* );
QTreeWidget *m_tw;
QPushButton *mUser1Button;
QPushButton *mUser1Button;
};
#endif

4
ui/fileprinterpreview.h
Unescape View File

@ -35,10 +35,10 @@ public:
explicit FilePrinterPreview( const QString &filename, QWidget *parent = 0 );
virtual ~FilePrinterPreview();
QSize sizeHint() const;
QSize sizeHint() const Q_DECL_OVERRIDE;
protected:
void showEvent( QShowEvent *event );
void showEvent( QShowEvent *event ) Q_DECL_OVERRIDE;
private:
FilePrinterPreviewPrivate * const d;

8
ui/magnifierview.h
Unescape View File

@ -32,10 +32,10 @@ class MagnifierView : public QWidget, public Okular::DocumentObserver
MagnifierView( Okular::Document *document, QWidget *parent = 0 );
~MagnifierView();
void notifySetup( const QVector< Okular::Page * > & pages, int setupFlags );
void notifyPageChanged( int page, int flags );
void notifyCurrentPageChanged( int previous, int current );
bool canUnloadPixmap( int page ) const;
void notifySetup( const QVector< Okular::Page * > & pages, int setupFlags ) Q_DECL_OVERRIDE;
void notifyPageChanged( int page, int flags ) Q_DECL_OVERRIDE;
void notifyCurrentPageChanged( int previous, int current ) Q_DECL_OVERRIDE;
bool canUnloadPixmap( int page ) const Q_DECL_OVERRIDE;
void updateView( const Okular::NormalizedPoint &p, const Okular::Page * page );
void move( int x, int y );

4
ui/pageitemdelegate.h
Unescape View File

@ -23,10 +23,10 @@ class PageItemDelegate : public QItemDelegate
static const int PageRole = 0x000f0001;
static const int PageLabelRole = 0x000f0002;
virtual void paint( QPainter *painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const;
void paint( QPainter *painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const Q_DECL_OVERRIDE;
protected:
virtual void drawDisplay( QPainter *painter, const QStyleOptionViewItem & option, const QRect & rect, const QString & text ) const;
void drawDisplay( QPainter *painter, const QStyleOptionViewItem & option, const QRect & rect, const QString & text ) const Q_DECL_OVERRIDE;
private:
class Private;

2
ui/pagesizelabel.h
Unescape View File

@ -30,7 +30,7 @@ class PageSizeLabel : public KSqueezedTextLabel, public Okular::DocumentObserver
~PageSizeLabel();
// [INHERITED] from DocumentObserver
void notifyCurrentPageChanged( int previous, int current );
void notifyCurrentPageChanged( int previous, int current ) Q_DECL_OVERRIDE;
private:
Okular::Document * m_document;

10
ui/presentationwidget.h
Unescape View File

@ -49,11 +49,11 @@ class PresentationWidget : public QWidget, public Okular::DocumentObserver
~PresentationWidget();
// inherited from DocumentObserver
void notifySetup( const QVector< Okular::Page * > & pages, int setupFlags );
void notifyViewportChanged( bool smoothMove );
void notifyPageChanged( int pageNumber, int changedFlags );
bool canUnloadPixmap( int pageNumber ) const;
void notifyCurrentPageChanged( int previous, int current );
void notifySetup( const QVector< Okular::Page * > & pages, int setupFlags ) Q_DECL_OVERRIDE;
void notifyViewportChanged( bool smoothMove ) Q_DECL_OVERRIDE;
void notifyPageChanged( int pageNumber, int changedFlags ) Q_DECL_OVERRIDE;
bool canUnloadPixmap( int pageNumber ) const Q_DECL_OVERRIDE;
void notifyCurrentPageChanged( int previous, int current ) Q_DECL_OVERRIDE;
public slots:
void slotFind();

8
ui/propertiesdialog.h
Unescape View File

@ -60,10 +60,10 @@ class FontsListModel
virtual ~FontsListModel();
// reimplementations from QAbstractTableModel
virtual int columnCount( const QModelIndex &parent = QModelIndex() ) const;
virtual QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const;
virtual QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const;
virtual int rowCount( const QModelIndex &parent = QModelIndex() ) const;
int columnCount( const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE;
QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE;
QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE;
int rowCount( const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE;
public slots:
void addFont( const Okular::FontInfo &fi );

2
ui/side_reviews.h
Unescape View File

@ -41,7 +41,7 @@ class Reviews : public QWidget, public Okular::DocumentObserver
~Reviews();
// [INHERITED] from DocumentObserver
void notifyCurrentPageChanged( int previous, int current );
void notifyCurrentPageChanged( int previous, int current ) Q_DECL_OVERRIDE;
void reparseConfig();

4
ui/sidebar.h
Unescape View File

@ -47,8 +47,8 @@ class Sidebar : public QWidget
void urlsDropped( const QList<QUrl>& urls );
protected:
void dragEnterEvent( QDragEnterEvent* event );
void dropEvent( QDropEvent* event );
void dragEnterEvent( QDragEnterEvent* event ) Q_DECL_OVERRIDE;
void dropEvent( QDropEvent* event ) Q_DECL_OVERRIDE;
private slots:
void itemClicked( QListWidgetItem *item );

18
ui/thumbnaillist.h
Unescape View File

@ -35,17 +35,17 @@ Q_OBJECT
~ThumbnailList();
// inherited: create thumbnails ( inherited as a DocumentObserver )
void notifySetup( const QVector< Okular::Page * > & pages, int setupFlags );
void notifySetup( const QVector< Okular::Page * > & pages, int setupFlags ) Q_DECL_OVERRIDE;
// inherited: hilihght current thumbnail ( inherited as DocumentObserver )
void notifyCurrentPageChanged( int previous, int current );
void notifyCurrentPageChanged( int previous, int current ) Q_DECL_OVERRIDE;
// inherited: redraw thumbnail ( inherited as DocumentObserver )
void notifyPageChanged( int pageNumber, int changedFlags );
void notifyPageChanged( int pageNumber, int changedFlags ) Q_DECL_OVERRIDE;
// inherited: request all visible pixmap (due to a global shange or so..)
void notifyContentsCleared( int changedFlags );
void notifyContentsCleared( int changedFlags ) Q_DECL_OVERRIDE;
// inherited: the visible areas of the page have changed
void notifyVisibleRectsChanged();
void notifyVisibleRectsChanged() Q_DECL_OVERRIDE;
// inherited: tell if pixmap is hidden and can be unloaded
bool canUnloadPixmap( int pageNumber ) const;
bool canUnloadPixmap( int pageNumber ) const Q_DECL_OVERRIDE;
// redraw visible widgets (useful for refreshing contents...)
void updateWidgets();
@ -56,10 +56,10 @@ Q_OBJECT
protected:
// scroll up/down the view
void keyPressEvent( QKeyEvent * e );
void keyPressEvent( QKeyEvent * e ) Q_DECL_OVERRIDE;
// catch the viewport event and filter them if necessary
bool viewportEvent( QEvent * );
bool viewportEvent( QEvent * ) Q_DECL_OVERRIDE;
signals:
void rightClick( const Okular::Page *, const QPoint & );
@ -79,7 +79,7 @@ class ThumbnailsBox : public QWidget
{
public:
ThumbnailsBox( QWidget * parent ) : QWidget( parent ) { QVBoxLayout *vbox = new QVBoxLayout(this); vbox->setMargin(0); vbox->setSpacing(0);}
QSize sizeHint() const { return QSize(); }
QSize sizeHint() const Q_DECL_OVERRIDE { return QSize(); }
};
/**

4
ui/toc.h
Unescape View File

@ -37,8 +37,8 @@ Q_OBJECT
~TOC();
// inherited from DocumentObserver
void notifySetup( const QVector< Okular::Page * > & pages, int setupFlags );
void notifyCurrentPageChanged( int previous, int current );
void notifySetup( const QVector< Okular::Page * > & pages, int setupFlags ) Q_DECL_OVERRIDE;
void notifyCurrentPageChanged( int previous, int current ) Q_DECL_OVERRIDE;
void reparseConfig();

14
ui/tocmodel.h
Unescape View File

@ -30,13 +30,13 @@ class TOCModel : public QAbstractItemModel
virtual ~TOCModel();
// reimplementations from QAbstractItemModel
virtual int columnCount( const QModelIndex &parent = QModelIndex() ) const;
virtual QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const;
virtual bool hasChildren( const QModelIndex &parent = QModelIndex() ) const;
virtual QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const;
virtual QModelIndex index( int row, int column, const QModelIndex &parent = QModelIndex() ) const;
virtual QModelIndex parent( const QModelIndex &index ) const;
virtual int rowCount( const QModelIndex &parent = QModelIndex() ) const;
int columnCount( const QModelIndex &parent = QModelIndex() ) const;
QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE;
bool hasChildren( const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE;
QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const Q_DECL_OVERRIDE;
QModelIndex index( int row, int column, const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE;
QModelIndex parent( const QModelIndex &index ) const Q_DECL_OVERRIDE;
int rowCount( const QModelIndex &parent = QModelIndex() ) const Q_DECL_OVERRIDE;
void fill( const Okular::DocumentSynopsis *toc );
void clear();

Write Preview
Loading…
Cancel
Save