office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-10-05 23:49:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added missing overrides found by clang-tidy

Browse source
This commit is contained in:
Albert Vaca 2016-10-29 16:38:19 +02:00
parent 109c4a4090
commit 3c93b2523e
14 changed files with 103 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
autotests/parttest.cpp
View file

@ -56,7 +56,7 @@ class PartThatHijacksQueryClose : public Okular::Part
behavior = new_behavior;
}
bool queryClose()
bool queryClose() override
{
if (behavior == PassThru)
return Okular::Part::queryClose();

2
core/action.cpp
View file

@ -300,7 +300,7 @@ class Okular::SoundActionPrivate : public Okular::ActionPrivate
{
}
~SoundActionPrivate()
~SoundActionPrivate() override
{
delete m_sound;
}

102
core/annotations.cpp
View file

@ -981,13 +981,13 @@ class Okular::TextAnnotationPrivate : public Okular::AnnotationPrivate
{
}
virtual void transform( const QTransform &matrix );
virtual void baseTransform( const QTransform &matrix );
virtual void resetTransformation();
virtual void translate( const NormalizedPoint &coord );
virtual bool openDialogAfterCreation() const;
virtual void setAnnotationProperties( const QDomNode& node );
virtual AnnotationPrivate* getNewAnnotationPrivate();
void transform( const QTransform &matrix ) override;
void baseTransform( const QTransform &matrix ) override;
void resetTransformation() override;
void translate( const NormalizedPoint &coord ) override;
bool openDialogAfterCreation() const override;
void setAnnotationProperties( const QDomNode& node ) override;
AnnotationPrivate* getNewAnnotationPrivate() override;
TextAnnotation::TextType m_textType;
QString m_textIcon;
@ -1263,13 +1263,13 @@ class Okular::LineAnnotationPrivate : public Okular::AnnotationPrivate
{
}
virtual void transform( const QTransform &matrix );
virtual void baseTransform( const QTransform &matrix );
virtual void resetTransformation();
virtual void translate( const NormalizedPoint &coord );
virtual double distanceSqr( double x, double y, double xScale, double yScale );
virtual void setAnnotationProperties( const QDomNode& node );
virtual AnnotationPrivate* getNewAnnotationPrivate();
void transform( const QTransform &matrix ) override;
void baseTransform( const QTransform &matrix ) override;
void resetTransformation() override;
void translate( const NormalizedPoint &coord ) override;
double distanceSqr( double x, double y, double xScale, double yScale ) override;
void setAnnotationProperties( const QDomNode& node ) override;
AnnotationPrivate* getNewAnnotationPrivate() override;
QLinkedList<NormalizedPoint> m_linePoints;
QLinkedList<NormalizedPoint> m_transformedLinePoints;
@ -1588,9 +1588,9 @@ class Okular::GeomAnnotationPrivate : public Okular::AnnotationPrivate
: AnnotationPrivate(), m_geomType( GeomAnnotation::InscribedSquare )
{
}
virtual void setAnnotationProperties( const QDomNode& node );
virtual AnnotationPrivate* getNewAnnotationPrivate();
virtual double distanceSqr( double x, double y, double xScale, double yScale );
void setAnnotationProperties( const QDomNode& node ) override;
AnnotationPrivate* getNewAnnotationPrivate() override;
double distanceSqr( double x, double y, double xScale, double yScale ) override;
GeomAnnotation::GeomType m_geomType;
QColor m_geomInnerColor;
@ -1867,11 +1867,11 @@ class Okular::HighlightAnnotationPrivate : public Okular::AnnotationPrivate
{
}
virtual void transform( const QTransform &matrix );
virtual void baseTransform( const QTransform &matrix );
virtual double distanceSqr( double x, double y, double xScale, double yScale );
virtual void setAnnotationProperties( const QDomNode& node );
virtual AnnotationPrivate* getNewAnnotationPrivate();
void transform( const QTransform &matrix ) override;
void baseTransform( const QTransform &matrix ) override;
double distanceSqr( double x, double y, double xScale, double yScale ) override;
void setAnnotationProperties( const QDomNode& node ) override;
AnnotationPrivate* getNewAnnotationPrivate() override;
HighlightAnnotation::HighlightType m_highlightType;
QList< HighlightAnnotation::Quad > m_highlightQuads;
@ -2060,8 +2060,8 @@ class Okular::StampAnnotationPrivate : public Okular::AnnotationPrivate
: AnnotationPrivate(), m_stampIconName( QStringLiteral("Draft") )
{
}
virtual void setAnnotationProperties( const QDomNode& node );
virtual AnnotationPrivate* getNewAnnotationPrivate();
void setAnnotationProperties( const QDomNode& node ) override;
AnnotationPrivate* getNewAnnotationPrivate() override;
QString m_stampIconName;
};
@ -2149,13 +2149,13 @@ class Okular::InkAnnotationPrivate : public Okular::AnnotationPrivate
{
}
virtual void transform( const QTransform &matrix );
virtual void baseTransform( const QTransform &matrix );
virtual void resetTransformation();
virtual double distanceSqr( double x, double y, double xScale, double yScale );
virtual void translate( const NormalizedPoint &coord );
virtual void setAnnotationProperties( const QDomNode& node );
virtual AnnotationPrivate* getNewAnnotationPrivate();
void transform( const QTransform &matrix ) override;
void baseTransform( const QTransform &matrix ) override;
void resetTransformation() override;
double distanceSqr( double x, double y, double xScale, double yScale ) override;
void translate( const NormalizedPoint &coord ) override;
void setAnnotationProperties( const QDomNode& node ) override;
AnnotationPrivate* getNewAnnotationPrivate() override;
QList< QLinkedList<NormalizedPoint> > m_inkPaths;
QList< QLinkedList<NormalizedPoint> > m_transformedInkPaths;
@ -2357,8 +2357,8 @@ class Okular::CaretAnnotationPrivate : public Okular::AnnotationPrivate
{
}
virtual void setAnnotationProperties( const QDomNode& node );
virtual AnnotationPrivate* getNewAnnotationPrivate();
void setAnnotationProperties( const QDomNode& node ) override;
AnnotationPrivate* getNewAnnotationPrivate() override;
CaretAnnotation::CaretSymbol m_symbol;
};
@ -2466,13 +2466,13 @@ class Okular::FileAttachmentAnnotationPrivate : public Okular::AnnotationPrivate
: AnnotationPrivate(), icon( QStringLiteral("PushPin") ), embfile( 0 )
{
}
~FileAttachmentAnnotationPrivate()
~FileAttachmentAnnotationPrivate() override
{
delete embfile;
}
virtual void setAnnotationProperties( const QDomNode& node );
virtual AnnotationPrivate* getNewAnnotationPrivate();
void setAnnotationProperties( const QDomNode& node ) override;
AnnotationPrivate* getNewAnnotationPrivate() override;
// data fields
QString icon;
@ -2565,13 +2565,13 @@ class Okular::SoundAnnotationPrivate : public Okular::AnnotationPrivate
: AnnotationPrivate(), icon( QStringLiteral("Speaker") ), sound( 0 )
{
}
~SoundAnnotationPrivate()
~SoundAnnotationPrivate() override
{
delete sound;
}
virtual void setAnnotationProperties( const QDomNode& node );
virtual AnnotationPrivate* getNewAnnotationPrivate();
void setAnnotationProperties( const QDomNode& node ) override;
AnnotationPrivate* getNewAnnotationPrivate() override;
// data fields
QString icon;
@ -2663,13 +2663,13 @@ class Okular::MovieAnnotationPrivate : public Okular::AnnotationPrivate
: AnnotationPrivate(), movie( 0 )
{
}
~MovieAnnotationPrivate()
~MovieAnnotationPrivate() override
{
delete movie;
}
virtual void setAnnotationProperties( const QDomNode& node );
virtual AnnotationPrivate* getNewAnnotationPrivate();
void setAnnotationProperties( const QDomNode& node ) override;
AnnotationPrivate* getNewAnnotationPrivate() override;
// data fields
Movie *movie;
@ -2745,10 +2745,10 @@ class Okular::ScreenAnnotationPrivate : public Okular::AnnotationPrivate
{
public:
ScreenAnnotationPrivate();
~ScreenAnnotationPrivate();
~ScreenAnnotationPrivate() override;
virtual void setAnnotationProperties( const QDomNode& node );
virtual AnnotationPrivate* getNewAnnotationPrivate();
void setAnnotationProperties( const QDomNode& node ) override;
AnnotationPrivate* getNewAnnotationPrivate() override;
Okular::Action* m_action;
QMap< Okular::Annotation::AdditionalActionType, Okular::Action* > m_additionalActions;
@ -2854,9 +2854,9 @@ Action* ScreenAnnotation::action() const
class Okular::WidgetAnnotationPrivate : public Okular::AnnotationPrivate
{
public:
~WidgetAnnotationPrivate();
virtual void setAnnotationProperties( const QDomNode& node );
virtual AnnotationPrivate* getNewAnnotationPrivate();
~WidgetAnnotationPrivate() override;
void setAnnotationProperties( const QDomNode& node ) override;
AnnotationPrivate* getNewAnnotationPrivate() override;
QMap< Okular::Annotation::AdditionalActionType, Okular::Action* > m_additionalActions;
};
@ -2942,9 +2942,9 @@ class Okular::RichMediaAnnotationPrivate : public Okular::AnnotationPrivate
{
public:
RichMediaAnnotationPrivate();
~RichMediaAnnotationPrivate();
virtual void setAnnotationProperties( const QDomNode& node );
virtual AnnotationPrivate* getNewAnnotationPrivate();
~RichMediaAnnotationPrivate() override;
void setAnnotationProperties( const QDomNode& node ) override;
AnnotationPrivate* getNewAnnotationPrivate() override;
// data fields
Movie *movie;

10
core/bookmarkmanager.cpp
View file

@ -99,17 +99,17 @@ class BookmarkManager::Private : public KBookmarkOwner
{
}
~Private()
~Private() override
{
knownFiles.clear();
// no need to delete the manager, it's automatically done by KBookmarkManager
// delete manager;
}
virtual QUrl currentUrl() const;
virtual QString currentTitle() const;
virtual bool enableOption(BookmarkOption option) const;
virtual void openBookmark( const KBookmark & bm, Qt::MouseButtons, Qt::KeyboardModifiers );
QUrl currentUrl() const override;
QString currentTitle() const override;
bool enableOption(BookmarkOption option) const override;
void openBookmark( const KBookmark & bm, Qt::MouseButtons, Qt::KeyboardModifiers ) override;
QHash<QUrl, QString>::iterator bookmarkFind( const QUrl& url, bool doCreate, KBookmarkGroup *result = 0);

12
core/form.cpp
View file

@ -84,13 +84,13 @@ class Okular::FormFieldButtonPrivate : public Okular::FormFieldPrivate
Q_DECLARE_PUBLIC( FormFieldButton )
void setValue( const QString& v )
void setValue( const QString& v ) override
{
Q_Q( FormFieldButton );
q->setState( QVariant( v ).toBool() );
}
QString value() const
QString value() const override
{
Q_Q( const FormFieldButton );
return qVariantFromValue<bool>( q->state() ).toString();
@ -122,13 +122,13 @@ class Okular::FormFieldTextPrivate : public Okular::FormFieldPrivate
Q_DECLARE_PUBLIC( FormFieldText )
void setValue( const QString& v )
void setValue( const QString& v ) override
{
Q_Q( FormFieldText );
q->setText( v );
}
QString value() const
QString value() const override
{
Q_Q( const FormFieldText );
return q->text();
@ -185,7 +185,7 @@ class Okular::FormFieldChoicePrivate : public Okular::FormFieldPrivate
Q_DECLARE_PUBLIC( FormFieldChoice )
void setValue( const QString& v )
void setValue( const QString& v ) override
{
Q_Q( FormFieldChoice );
QStringList choices = v.split( QLatin1Char (';'), QString::SkipEmptyParts );
@ -201,7 +201,7 @@ class Okular::FormFieldChoicePrivate : public Okular::FormFieldPrivate
q->setCurrentChoices( newchoices );
}
QString value() const
QString value() const override
{
Q_Q( const FormFieldChoice );
QList<int> choices = q->currentChoices();

6
ui/annotationmodel.cpp
View file

@ -55,10 +55,10 @@ class AnnotationModelPrivate : public Okular::DocumentObserver
{
public:
AnnotationModelPrivate( AnnotationModel *qq );
virtual ~AnnotationModelPrivate();
~AnnotationModelPrivate() override;
virtual void notifySetup( const QVector< Okular::Page * > &pages, int setupFlags );
virtual void notifyPageChanged( int page, int flags );
void notifySetup( const QVector< Okular::Page * > &pages, int setupFlags ) override;
void notifyPageChanged( int page, int flags ) override;
QModelIndex indexForItem( AnnItem *item ) const;
void rebuildTree( const QVector< Okular::Page * > &pages );

2
ui/annotwindow.cpp
View file

@ -126,7 +126,7 @@ public:
authorLabel->installEventFilter( this );
}
virtual bool eventFilter( QObject * obj, QEvent * e )
bool eventFilter( QObject * obj, QEvent * e ) override
{
if ( obj != titleLabel && obj != authorLabel && obj != dateLabel )
return false;

6
ui/bookmarklist.cpp
View file

@ -47,7 +47,7 @@ class BookmarkItem : public QTreeWidgetItem
setData( 0, PageItemDelegate::PageRole, QString::number( m_viewport.pageNumber + 1 ) );
}
virtual QVariant data( int column, int role ) const
QVariant data( int column, int role ) const override
{
switch ( role )
{
@ -57,7 +57,7 @@ class BookmarkItem : public QTreeWidgetItem
return QTreeWidgetItem::data( column, role );
}
virtual bool operator<( const QTreeWidgetItem& other ) const
bool operator<( const QTreeWidgetItem& other ) const override
{
if ( other.type() == BookmarkItemType )
{
@ -101,7 +101,7 @@ class FileItem : public QTreeWidgetItem
setData( 0, UrlRole, qVariantFromValue( url ) );
}
virtual QVariant data( int column, int role ) const
QVariant data( int column, int role ) const override
{
switch ( role )
{

24
ui/pageviewannotator.cpp
View file

@ -67,12 +67,12 @@ class PickPointEngine : public AnnotatorEngine
pixmap = new QPixmap( GuiUtils::loadStamp( hoverIconName, QSize( size, size ) ) );
}
~PickPointEngine()
~PickPointEngine() override
{
delete pixmap;
}
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 ) override
{
xscale=xScale;
yscale=yScale;
@ -125,7 +125,7 @@ class PickPointEngine : public AnnotatorEngine
return boundrect;
}
void paint( QPainter * painter, double xScale, double yScale, const QRect & /*clipRect*/ )
void paint( QPainter * painter, double xScale, double yScale, const QRect & /*clipRect*/ ) override
{
if ( clicked )
{
@ -145,7 +145,7 @@ class PickPointEngine : public AnnotatorEngine
}
}
QList< Okular::Annotation* > end()
QList< Okular::Annotation* > end() override
{
// find out annotation's description node
if ( m_annotElement.isNull() )
@ -334,7 +334,7 @@ class PolyLineEngine : public AnnotatorEngine
numofpoints = -1;
}
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*/ ) override
{
// only proceed if pressing left button
// if ( button != Left )
@ -384,7 +384,7 @@ class PolyLineEngine : public AnnotatorEngine
return rect;
}
void paint( QPainter * painter, double xScale, double yScale, const QRect & /*clipRect*/ )
void paint( QPainter * painter, double xScale, double yScale, const QRect & /*clipRect*/ ) override
{
if ( points.count() < 1 )
return;
@ -411,7 +411,7 @@ class PolyLineEngine : public AnnotatorEngine
}
}
QList< Okular::Annotation* > end()
QList< Okular::Annotation* > end() override
{
m_creationCompleted = false;
@ -496,12 +496,12 @@ class TextSelectorEngine : public AnnotatorEngine
// parse engine specific attributes
}
~TextSelectorEngine()
~TextSelectorEngine() override
{
delete selection;
}
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*/ ) override
{
// only proceed if pressing left button
if ( button != Left )
@ -551,7 +551,7 @@ class TextSelectorEngine : public AnnotatorEngine
return rect;
}
void paint( QPainter * painter, double xScale, double yScale, const QRect & /*clipRect*/ )
void paint( QPainter * painter, double xScale, double yScale, const QRect & /*clipRect*/ ) override
{
if ( selection )
{
@ -566,7 +566,7 @@ class TextSelectorEngine : public AnnotatorEngine
}
}
QList< Okular::Annotation* > end()
QList< Okular::Annotation* > end() override
{
m_creationCompleted = false;
@ -638,7 +638,7 @@ class TextSelectorEngine : public AnnotatorEngine
return QList< Okular::Annotation* >() << ann;
}
QCursor cursor() const
QCursor cursor() const override
{
return Qt::IBeamCursor;
}

2
ui/presentationsearchbar.cpp
View file

@ -38,7 +38,7 @@ class HandleDrag
installEventFilter( parent );
}
void paintEvent( QPaintEvent * )
void paintEvent( QPaintEvent * ) override
{
QStyleOption opt;
opt.initFrom( this );

4
ui/presentationwidget.cpp
View file

@ -123,13 +123,13 @@ class PresentationToolBar : public QToolBar
{}
protected:
void mousePressEvent( QMouseEvent * e )
void mousePressEvent( QMouseEvent * e ) override
{
QToolBar::mousePressEvent( e );
e->accept();
}
void mouseReleaseEvent( QMouseEvent * e )
void mouseReleaseEvent( QMouseEvent * e ) override
{
QToolBar::mouseReleaseEvent( e );
e->accept();

2
ui/side_reviews.cpp
View file

@ -46,7 +46,7 @@ class TreeView : public QTreeView
}
protected:
virtual void paintEvent( QPaintEvent *event )
void paintEvent( QPaintEvent *event ) override
{
bool hasAnnotations = false;
for ( uint i = 0; i < m_document->pages(); ++i )

18
ui/sidebar.cpp
View file

@ -73,15 +73,15 @@ class SidebarDelegate : public QAbstractItemDelegate
public:
SidebarDelegate( QObject *parent = Q_NULLPTR );
~SidebarDelegate();
~SidebarDelegate() override;
void setShowText( bool show );
bool isTextShown() const;
// from QAbstractItemDelegate
void paint( QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const;
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;
private slots:
void updateBrushCache();
@ -215,7 +215,7 @@ class SidebarListWidget : public QListWidget
{
public:
SidebarListWidget( QWidget *parent = Q_NULLPTR );
~SidebarListWidget();
~SidebarListWidget() override;
int countVisible() const {
int ret = 0;
@ -227,12 +227,12 @@ class SidebarListWidget : public QListWidget
protected:
// from QListWidget
void mouseDoubleClickEvent( QMouseEvent *event );
void mouseMoveEvent( QMouseEvent *event );
void mousePressEvent( QMouseEvent *event );
void mouseReleaseEvent( QMouseEvent *event );
void mouseDoubleClickEvent( QMouseEvent *event ) override;
void mouseMoveEvent( QMouseEvent *event ) override;
void mousePressEvent( QMouseEvent *event ) override;
void mouseReleaseEvent( QMouseEvent *event ) override;
QModelIndex moveCursor( QAbstractItemView::CursorAction cursorAction, Qt::KeyboardModifiers modifiers );
QModelIndex moveCursor( QAbstractItemView::CursorAction cursorAction, Qt::KeyboardModifiers modifiers ) override;
private:
// These two are used to keep track of the row an initial mousePress-

14
ui/thumbnaillist.cpp
View file

@ -41,7 +41,7 @@ class ThumbnailListPrivate : public QWidget
{
public:
ThumbnailListPrivate( ThumbnailList *qq, Okular::Document *document );
~ThumbnailListPrivate();
~ThumbnailListPrivate() override;
enum ChangePageDirection
{
@ -85,12 +85,12 @@ class ThumbnailListPrivate : public QWidget
ThumbnailWidget *getThumbnailbyOffset( int current, int offset ) const;
protected:
void mousePressEvent( QMouseEvent * e );
void mouseReleaseEvent( QMouseEvent * e );
void mouseMoveEvent( QMouseEvent * e );
void wheelEvent( QWheelEvent * e );
void contextMenuEvent( QContextMenuEvent * e );
void paintEvent( QPaintEvent * e );
void mousePressEvent( QMouseEvent * e ) override;
void mouseReleaseEvent( QMouseEvent * e ) override;
void mouseMoveEvent( QMouseEvent * e ) override;
void wheelEvent( QWheelEvent * e ) override;
void contextMenuEvent( QContextMenuEvent * e ) override;
void paintEvent( QPaintEvent * e ) override;
};