Merge remote-tracking branch 'origin/master' into dont-use-docdata-for-annots-and-forms

generators/mobipocket/converter.h

@@ -23,7 +23,7 @@ namespace Mobi {
       Converter();
       ~Converter();
       
-      virtual QTextDocument *convert( const QString &fileName );
+      QTextDocument *convert( const QString &fileName ) override;
     private:
       void handleMetadata(const QMap<Mobipocket::Document::MetaKey, QString> metadata);
     };

generators/mobipocket/generator_mobi.h

@@ -20,7 +20,7 @@ class MobiGenerator : public Okular::TextDocumentGenerator
   ~MobiGenerator() {}
   
   // [INHERITED] reparse configuration
-  void addPages( KConfigDialog* dlg );
+  void addPages( KConfigDialog* dlg ) override;
 };
 
 #endif

generators/mobipocket/mobidocument.h

@@ -30,7 +30,7 @@ namespace Mobi {
     Mobipocket::Document* mobi() const { return doc; }
     
   protected:
-    virtual QVariant loadResource(int type, const QUrl &name);
+    QVariant loadResource(int type, const QUrl &name) override;
     
   private:
     QString fixMobiMarkup(const QString& data);