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

Use Q_DECL_OVERRIDE

Browse Source
frameworks
Montel Laurent 11 years ago
parent a8c13a9e1d
commit e03e6f6863
11 changed files with 50 additions and 50 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. 16
      generators/chm/generator_chm.h
  2. 8
      generators/comicbook/generator_comicbook.h
  3. 12
      generators/djvu/generator_djvu.h
  4. 2
      generators/epub/converter.h
  5. 8
      generators/fax/generator_fax.h
  6. 8
      generators/poppler/formfields.h
  7. 16
      generators/poppler/generator_pdf.h
  8. 8
      generators/tiff/generator_tiff.h
  9. 2
      generators/txt/converter.h
  10. 12
      shell/main.cpp
  11. 8
      shell/shell.h

16
generators/chm/generator_chm.h
Unescape View File

@ -35,22 +35,22 @@ class CHMGenerator : public Okular::Generator
public:
CHMGenerator( QObject *parent, const QVariantList &args );
~CHMGenerator();
bool loadDocument( const QString & fileName, QVector< Okular::Page * > & pagesVector );
bool loadDocument( const QString & fileName, QVector< Okular::Page * > & pagesVector ) Q_DECL_OVERRIDE;
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const;
const Okular::DocumentSynopsis * generateDocumentSynopsis();
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const Q_DECL_OVERRIDE;
const Okular::DocumentSynopsis * generateDocumentSynopsis() Q_DECL_OVERRIDE;
bool canGeneratePixmap() const;
void generatePixmap( Okular::PixmapRequest * request );
bool canGeneratePixmap() const Q_DECL_OVERRIDE;
void generatePixmap( Okular::PixmapRequest * request ) Q_DECL_OVERRIDE;
QVariant metaData( const QString & key, const QVariant & option ) const;
QVariant metaData( const QString & key, const QVariant & option ) const Q_DECL_OVERRIDE;
public slots:
void slotCompleted();
protected:
bool doCloseDocument();
Okular::TextPage* textPage( Okular::Page *page );
bool doCloseDocument() Q_DECL_OVERRIDE;
Okular::TextPage* textPage( Okular::Page *page ) Q_DECL_OVERRIDE;
private:
void additionalRequestData();

8
generators/comicbook/generator_comicbook.h
Unescape View File

@ -24,14 +24,14 @@ class ComicBookGenerator : public Okular::Generator
virtual ~ComicBookGenerator();
// [INHERITED] load a document and fill up the pagesVector
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector );
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector ) Q_DECL_OVERRIDE;
// [INHERITED] print document using already configured kprinter
bool print( QPrinter& printer );
bool print( QPrinter& printer ) Q_DECL_OVERRIDE;
protected:
bool doCloseDocument();
QImage image( Okular::PixmapRequest * request );
bool doCloseDocument() Q_DECL_OVERRIDE;
QImage image( Okular::PixmapRequest * request ) Q_DECL_OVERRIDE;
private:
ComicBook::Document mDocument;

12
generators/djvu/generator_djvu.h
Unescape View File

@ -28,21 +28,21 @@ class DjVuGenerator : public Okular::Generator
public:
DjVuGenerator( QObject *parent, const QVariantList &args );
~DjVuGenerator();
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector );
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector ) Q_DECL_OVERRIDE;
// document information
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const;
const Okular::DocumentSynopsis * generateDocumentSynopsis();
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const Q_DECL_OVERRIDE;
const Okular::DocumentSynopsis * generateDocumentSynopsis() Q_DECL_OVERRIDE;
// printing
bool print( QPrinter& printer );
bool print( QPrinter& printer ) Q_DECL_OVERRIDE;
QVariant metaData( const QString & key, const QVariant & option ) const;
QVariant metaData( const QString & key, const QVariant & option ) const Q_DECL_OVERRIDE;
protected:
bool doCloseDocument();
// pixmap generation
QImage image( Okular::PixmapRequest *request );
QImage image( Okular::PixmapRequest *request ) Q_DECL_OVERRIDE;
Okular::TextPage* textPage( Okular::Page *page );
private:

2
generators/epub/converter.h
Unescape View File

@ -24,7 +24,7 @@ namespace Epub {
Converter();
~Converter();
virtual QTextDocument *convert( const QString &fileName );
QTextDocument *convert( const QString &fileName ) Q_DECL_OVERRIDE;
private:

8
generators/fax/generator_fax.h
Unescape View File

@ -25,15 +25,15 @@ class FaxGenerator : public Okular::Generator
FaxGenerator( QObject *parent, const QVariantList &args );
virtual ~FaxGenerator();
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector );
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector ) Q_DECL_OVERRIDE;
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const;
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const Q_DECL_OVERRIDE;
bool print( QPrinter& printer );
bool print( QPrinter& printer ) Q_DECL_OVERRIDE;
protected:
bool doCloseDocument();
QImage image( Okular::PixmapRequest * request );
QImage image( Okular::PixmapRequest * request ) Q_DECL_OVERRIDE;
private:
QImage m_img;

8
generators/poppler/formfields.h
Unescape View File

@ -20,10 +20,10 @@ class PopplerFormFieldButton : public Okular::FormFieldButton
virtual ~PopplerFormFieldButton();
// inherited from Okular::FormField
virtual Okular::NormalizedRect rect() const;
virtual int id() const;
virtual QString name() const;
virtual QString uiName() const;
Okular::NormalizedRect rect() const Q_DECL_OVERRIDE;
int id() const Q_DECL_OVERRIDE;
QString name() const Q_DECL_OVERRIDE;
QString uiName() const Q_DECL_OVERRIDE;
virtual bool isReadOnly() const;
virtual bool isVisible() const;

16
generators/poppler/generator_pdf.h
Unescape View File

@ -62,20 +62,20 @@ class PDFGenerator : public Okular::Generator, public Okular::ConfigInterface, p
Okular::Document::OpenResult loadDocumentFromDataWithPassword( const QByteArray & fileData, QVector<Okular::Page*> & pagesVector, const QString & password );
void loadPages(QVector<Okular::Page*> &pagesVector, int rotation=-1, bool clear=false);
// [INHERITED] document information
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const;
const Okular::DocumentSynopsis * generateDocumentSynopsis();
Okular::FontInfo::List fontsForPage( int page );
const QList<Okular::EmbeddedFile*> * embeddedFiles() const;
PageSizeMetric pagesSizeMetric() const { return Pixels; }
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const Q_DECL_OVERRIDE;
const Okular::DocumentSynopsis * generateDocumentSynopsis() Q_DECL_OVERRIDE;
Okular::FontInfo::List fontsForPage( int page ) Q_DECL_OVERRIDE;
const QList<Okular::EmbeddedFile*> * embeddedFiles() const Q_DECL_OVERRIDE;
PageSizeMetric pagesSizeMetric() const Q_DECL_OVERRIDE{ return Pixels; }
// [INHERITED] document information
bool isAllowed( Okular::Permission permission ) const;
bool isAllowed( Okular::Permission permission ) const Q_DECL_OVERRIDE;
// [INHERITED] perform actions on document / pages
QImage image( Okular::PixmapRequest *page );
QImage image( Okular::PixmapRequest *page ) Q_DECL_OVERRIDE;
// [INHERITED] print page using an already configured kprinter
bool print( QPrinter& printer );
bool print( QPrinter& printer ) Q_DECL_OVERRIDE;
// [INHERITED] reply to some metadata requests
QVariant metaData( const QString & key, const QVariant & option ) const;

8
generators/tiff/generator_tiff.h
Unescape View File

@ -23,12 +23,12 @@ class TIFFGenerator : public Okular::Generator
TIFFGenerator( QObject *parent, const QVariantList &args );
virtual ~TIFFGenerator();
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector );
bool loadDocumentFromData( const QByteArray & fileData, QVector< Okular::Page * > & pagesVector );
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector ) Q_DECL_OVERRIDE;
bool loadDocumentFromData( const QByteArray & fileData, QVector< Okular::Page * > & pagesVector ) Q_DECL_OVERRIDE;
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const;
Okular::DocumentInfo generateDocumentInfo( const QSet<Okular::DocumentInfo::Key> &keys ) const Q_DECL_OVERRIDE;
bool print( QPrinter& printer );
bool print( QPrinter& printer ) Q_DECL_OVERRIDE;
protected:
bool doCloseDocument();

2
generators/txt/converter.h
Unescape View File

@ -21,7 +21,7 @@ namespace Txt
Converter();
~Converter();
virtual QTextDocument *convert( const QString &fileName );
QTextDocument *convert( const QString &fileName ) Q_DECL_OVERRIDE;
};
}

12
shell/main.cpp
Unescape View File

@ -36,7 +36,7 @@ int main(int argc, char** argv)
app.setApplicationName(aboutData.applicationData().componentName());
app.setApplicationDisplayName(aboutData.applicationData().displayName());
app.setApplicationVersion(aboutData.version());
app.setOrganizationDomain("kde.org");
app.setOrganizationDomain(QStringLiteral("kde.org"));
QCommandLineParser parser;
KAboutData::setApplicationData(aboutData);
@ -44,11 +44,11 @@ int main(int argc, char** argv)
parser.addHelpOption();
aboutData.setupCommandLine(&parser);
parser.addOption(QCommandLineOption(QStringList() << QLatin1String("p") << QLatin1String("page"), i18n("Page of the document to be shown"), QLatin1String("number")));
parser.addOption(QCommandLineOption(QStringList() << QLatin1String("presentation"), i18n("Start the document in presentation mode")));
parser.addOption(QCommandLineOption(QStringList() << QLatin1String("print"), i18n("Start with print dialog")));
parser.addOption(QCommandLineOption(QStringList() << QLatin1String("unique"), i18n("\"Unique instance\" control")));
parser.addOption(QCommandLineOption(QStringList() << QLatin1String("noraise"), i18n("Not raise window")));
parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("p") << QStringLiteral("page"), i18n("Page of the document to be shown"), QStringLiteral("number")));
parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("presentation"), i18n("Start the document in presentation mode")));
parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("print"), i18n("Start with print dialog")));
parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("unique"), i18n("\"Unique instance\" control")));
parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("noraise"), i18n("Not raise window")));
parser.addPositionalArgument(QStringLiteral("urls"), i18n("Documents to open. Specify '-' to read from stdin."));
parser.process(app);

8
shell/shell.h
Unescape View File

@ -77,14 +77,14 @@ protected:
* This method is called when it is time for the app to save its
* properties for session management purposes.
*/
void saveProperties(KConfigGroup&);
void saveProperties(KConfigGroup&) Q_DECL_OVERRIDE;
/**
* This method is called when this app is restored. The KConfig
* object points to the session management config file that was saved
* with @ref saveProperties
*/
void readProperties(const KConfigGroup&);
void readProperties(const KConfigGroup&) Q_DECL_OVERRIDE;
/**
* Expose internal functions for session restore testing
@ -95,9 +95,9 @@ protected:
void readSettings();
void writeSettings();
void setFullScreen( bool );
bool queryClose();
bool queryClose() Q_DECL_OVERRIDE;
void showEvent(QShowEvent *event);
void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
private slots:
void fileOpen();

Write Preview
Loading…
Cancel
Save