From 82d68cebf870ac97fd27b626a08c3fb4dd94ea3e Mon Sep 17 00:00:00 2001 From: Albert Astals Cid <aacid@kde.org> Date: Thu, 25 Oct 2018 23:06:34 +0200 Subject: GBool -> bool It was just a typedef in poppler and it'll die in next versions --- filters/karbon/pdf/SvgOutputDev.cpp | 12 ++++++------ filters/karbon/pdf/SvgOutputDev.h | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp index 1d07f16..870a940 100644 --- a/filters/karbon/pdf/SvgOutputDev.cpp +++ b/filters/karbon/pdf/SvgOutputDev.cpp @@ -52,7 +52,7 @@ public: QString defsData; QTextStream * defs; QTextStream * body; - GBool state; + bool state; QSizeF pageSize; QPen pen; QBrush brush; @@ -75,22 +75,22 @@ SvgOutputDev::~SvgOutputDev() delete d; } -GBool SvgOutputDev::isOk() +bool SvgOutputDev::isOk() { return d->state; } -GBool SvgOutputDev::upsideDown() +bool SvgOutputDev::upsideDown() { return gTrue; } -GBool SvgOutputDev::useDrawChar() +bool SvgOutputDev::useDrawChar() { return gFalse; } -GBool SvgOutputDev::interpretType3Chars() +bool SvgOutputDev::interpretType3Chars() { return gFalse; } @@ -480,7 +480,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, - GBool /*interpolate*/, int *maskColors, GBool inlineImg) + bool /*interpolate*/, int *maskColors, bool inlineImg) { ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); imgStr->reset(); diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h index 422027c..df2805c 100644 --- a/filters/karbon/pdf/SvgOutputDev.h +++ b/filters/karbon/pdf/SvgOutputDev.h @@ -44,11 +44,11 @@ public: explicit SvgOutputDev(const QString &fileName); virtual ~SvgOutputDev(); - GBool isOk(); + bool isOk(); - GBool upsideDown() override; - GBool useDrawChar() override; - GBool interpretType3Chars() override; + bool upsideDown() override; + bool useDrawChar() override; + bool interpretType3Chars() override; void startPage(int pageNum, GfxState *state, XRef *xref) override; void endPage() override; @@ -63,7 +63,7 @@ public: // images void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, - GBool interpolate, int *maskColors, GBool inlineImg) override; + bool interpolate, int *maskColors, bool inlineImg) override; // styles void updateAll(GfxState *state) override; -- cgit v1.1