[poppler] poppler/FlateStream.h poppler/JPXStream.h qt5/src

[GitLab Mirror]

 poppler/FlateStream.h     |   16 ++++++++--------
 poppler/JPXStream.h       |   16 ++++++++--------
 qt5/src/ArthurOutputDev.h |    6 +++---
 3 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 73ddac6662bec52c08f06c739c623a868df5da68
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sun Nov 24 10:37:25 2019 +0100

    Remove useless virtual markers on override functions

diff --git a/poppler/FlateStream.h b/poppler/FlateStream.h
index 6902595d..330e63c8 100644
--- a/poppler/FlateStream.h
+++ b/poppler/FlateStream.h
@@ -37,14 +37,14 @@ public:
 
   FlateStream(Stream *strA, int predictor, int columns, int colors, int bits);
   virtual ~FlateStream();
-  virtual StreamKind getKind() const override { return strFlate; }
-  virtual void reset() override;
-  virtual int getChar() override;
-  virtual int lookChar() override;
-  virtual int getRawChar() override;
-  virtual void getRawChars(int nChars, int *buffer) override;
-  virtual GooString *getPSFilter(int psLevel, const char *indent) override;
-  virtual bool isBinary(bool last = true) override;
+  StreamKind getKind() const override { return strFlate; }
+  void reset() override;
+  int getChar() override;
+  int lookChar() override;
+  int getRawChar() override;
+  void getRawChars(int nChars, int *buffer) override;
+  GooString *getPSFilter(int psLevel, const char *indent) override;
+  bool isBinary(bool last = true) override;
 
 private:
   inline int doGetRawChar() {
diff --git a/poppler/JPXStream.h b/poppler/JPXStream.h
index 45fdc666..047579e4 100644
--- a/poppler/JPXStream.h
+++ b/poppler/JPXStream.h
@@ -271,14 +271,14 @@ public:
 
   JPXStream(Stream *strA);
   virtual ~JPXStream();
-  virtual StreamKind getKind() const override { return strJPX; }
-  virtual void reset() override;
-  virtual void close() override;
-  virtual int getChar() override;
-  virtual int lookChar() override;
-  virtual GooString *getPSFilter(int psLevel, const char *indent) override;
-  virtual bool isBinary(bool last = true) override;
-  virtual void getImageParams(int *bitsPerComponent,
+  StreamKind getKind() const override { return strJPX; }
+  void reset() override;
+  void close() override;
+  int getChar() override;
+  int lookChar() override;
+  GooString *getPSFilter(int psLevel, const char *indent) override;
+  bool isBinary(bool last = true) override;
+  void getImageParams(int *bitsPerComponent,
 			      StreamColorSpaceMode *csMode) override;
 
 private:
diff --git a/qt5/src/ArthurOutputDev.h b/qt5/src/ArthurOutputDev.h
index fa36e8cd..39228024 100644
--- a/qt5/src/ArthurOutputDev.h
+++ b/qt5/src/ArthurOutputDev.h
@@ -167,12 +167,12 @@ public:
 	       double llx, double lly, double urx, double ury) override;
 
   //----- transparency groups and soft masks
-  virtual void beginTransparencyGroup(GfxState *state, const double *bbox,
+  void beginTransparencyGroup(GfxState *state, const double *bbox,
                                       GfxColorSpace *blendingColorSpace,
                                       bool isolated, bool knockout,
                                       bool forSoftMask) override;
-  virtual void endTransparencyGroup(GfxState *state) override;
-  virtual void paintTransparencyGroup(GfxState *state, const double *bbox) override;
+  void endTransparencyGroup(GfxState *state) override;
+  void paintTransparencyGroup(GfxState *state, const double *bbox) override;
 
   //----- special access