Add wextra level warnings.

This commit is contained in:
James Grogan 2023-01-23 11:55:58 +00:00
parent e559f9674d
commit 119ea6f2cc
62 changed files with 235 additions and 231 deletions

View file

@ -113,7 +113,7 @@ const std::string& TemplateExpression::getContent() const
return mContent;
}
std::string TemplateExpression::render(TemplateSubstitutionContext* substitutions, TemplateNode* parentContext)
std::string TemplateExpression::render(TemplateSubstitutionContext* substitutions, TemplateNode*)
{
if (substitutions && substitutions->hasSubstitution(mContent))
{
@ -143,7 +143,7 @@ bool TemplateTextBody::hasContent() const
return !mContent.empty();
}
std::string TemplateTextBody::render(TemplateSubstitutionContext* substitutions, TemplateNode* parentContext)
std::string TemplateTextBody::render(TemplateSubstitutionContext*, TemplateNode*)
{
std::string content;
for(unsigned idx=0; idx<mContent.size(); idx++)

View file

@ -191,7 +191,7 @@ void TemplateFile::onFoundBlock(const std::vector<std::string> args)
mWorkingNode = temp;
}
void TemplateFile::onFoundEndBlock(const std::vector<std::string> args)
void TemplateFile::onFoundEndBlock(const std::vector<std::string>)
{
mWorkingNode = mWorkingNode->getParent();
}

View file

@ -107,7 +107,7 @@ void HuffmanEncoder::setUseFixedCode(bool useFixed)
mUseFixedCode = useFixed;
}
uint32_t HuffmanEncoder::getLengthValue(unsigned length)
uint32_t HuffmanEncoder::getLengthValue(unsigned)
{
return 0;
}

View file

@ -77,7 +77,7 @@ bool HuffmanStream::readNextDistanceSymbol(unsigned& buffer)
return true;
}
void HuffmanStream::addValue(unsigned value, unsigned& count, unsigned& lastValue, std::vector<unsigned char>& literals, unsigned numLiterals, std::vector<unsigned char>& distances)
void HuffmanStream::addValue(unsigned value, unsigned& count, unsigned& lastValue, std::vector<unsigned char>& literals, unsigned, std::vector<unsigned char>& distances)
{
if (count < mNumLiterals)
{

View file

@ -29,6 +29,8 @@ void CommandLineArgs::initialize(CommandLineArgs* args)
::LocalFree(szArglist);
args->process(windowsArgs);
#else
(void)args;
#endif
}

View file

@ -36,7 +36,7 @@ std::string File::dumpBinary()
const unsigned char val = static_cast<unsigned char>(mInHandle->get());
const unsigned char ascii_val = std::isalpha(val) ? val : '.';
sstr << count << " | " << ByteUtils::toString(val) << " | " << static_cast<int>(val) << " | " << ascii_val << '\n';
if (count < 0 && count % 10 == 0)
if (count % 10 == 0)
{
sstr << "\n";
}

View file

@ -62,7 +62,7 @@ void FileLogger::LogLine(const std::string& logType, const std::ostringstream& l
std::time_t t = std::time(nullptr);
const std::string cleanedFileName = fileName.substr(fileName.find_last_of("/\\") + 1);
std::tm time_buf = { 0 };
std::tm time_buf{ };
#ifdef WIN32
gmtime_s(&time_buf, &t);
#else

View file

@ -16,7 +16,7 @@ class InputBitStream : public BitStream
void writeByte(unsigned char data, bool checkOverflow = true) override;
void writeBytes(const std::vector<unsigned char> data) override
void writeBytes(const std::vector<unsigned char>) override
{
}

View file

@ -29,7 +29,7 @@ void SqliteInterface::open(Database* db)
}
}
static int callback(void *NotUsed, int argc, char **argv, char **azColName)
static int callback(void *, int argc, char **, char **)
{
for(int i=0; i<argc; i++)
{

View file

@ -64,7 +64,7 @@ const Point& Arc::getLocation() const
return mStartPoint;
}
void Arc::sample(SparseGrid<bool>* grid) const
void Arc::sample(SparseGrid<bool>*) const
{
}
@ -77,4 +77,4 @@ Arc::Type Arc::getType() const
Arc::CurveType Arc::getCurveType() const
{
return CurveType::ARC;
}
}

View file

@ -20,7 +20,7 @@ public:
CurveType getCurveType() const override;
void sample(SparseGrid<bool>* grid) const override;
void sample(SparseGrid<bool>*) const override;
std::string toPostScriptString(std::size_t precision = 0) const override;
@ -32,4 +32,4 @@ private:
double mRotation{ 0 };
bool mLargeArc{ false };
bool mSweep{ false };
};
};

View file

@ -49,7 +49,7 @@ const Point& CubicBezierCurve::getLocation() const
return mStartPoint;
}
void CubicBezierCurve::sample(SparseGrid<bool>* grid) const
void CubicBezierCurve::sample(SparseGrid<bool>*) const
{
}
@ -62,4 +62,4 @@ CubicBezierCurve::Type CubicBezierCurve::getType() const
CubicBezierCurve::CurveType CubicBezierCurve::getCurveType() const
{
return CurveType::CUBIC_BEZIER;
}
}

View file

@ -20,7 +20,7 @@ public:
CurveType getCurveType() const override;
void sample(SparseGrid<bool>* grid) const override;
void sample(SparseGrid<bool>*) const override;
std::string toPostScriptString(std::size_t precision = 0) const override;
@ -29,4 +29,4 @@ private:
Point mEndPoint;
Point mStartControlPoint;
Point mEndControlPoint;
};
};

View file

@ -5,13 +5,13 @@
class Curve : public PathElement
{
public:
enum class CurveType
{
ARC,
QUADRATIC_BEZIER,
CUBIC_BEZIER,
UNKNOWN
};
enum class CurveType
{
ARC,
QUADRATIC_BEZIER,
CUBIC_BEZIER,
UNKNOWN
};
virtual CurveType getCurveType() const = 0;
};
virtual CurveType getCurveType() const = 0;
};

View file

@ -9,37 +9,37 @@
class Line : public PathElement
{
public:
enum class InputBufferType
{
HORIZONTAL_REL,
HORIZONTAL_ABS,
VERTICAL_REL,
VERTICAL_ABS,
XY_REL,
XY_ABS
};
enum class InputBufferType
{
HORIZONTAL_REL,
HORIZONTAL_ABS,
VERTICAL_REL,
VERTICAL_ABS,
XY_REL,
XY_ABS
};
Line(const Point& start, const PointCollection& points);
Line(const Point& start, const PointCollection& points);
Line(const Point& start, InputBufferType bufferType, const std::vector<double>& buffer);
Line(const Point& start, InputBufferType bufferType, const std::vector<double>& buffer);
const PointCollection& getPoints() const;
const PointCollection& getPoints() const;
Line::Type getType() const override;
Line::Type getType() const override;
const Point& getLocation() const override;
const Point& getLocation() const override;
Bounds getBounds() const override;
Bounds getBounds() const override;
Point getFirstPoint() const override;
Point getFirstPoint() const override;
Point getEndPoint() const override;
Point getEndPoint() const override;
void sample(SparseGrid<bool>* grid) const override {};
void sample(SparseGrid<bool>*) const override {};
std::string toPostScriptString(std::size_t precision = 0) const override;
std::string toPostScriptString(std::size_t precision = 0) const override;
private:
Point mStartPoint;
PointCollection mPoints;
};
Point mStartPoint;
PointCollection mPoints;
};

View file

@ -29,7 +29,7 @@ const Point& LineSegment::getPoint1() const
return mP1;
}
void LineSegment::sample(SparseGrid<bool>* grid) const
void LineSegment::sample(SparseGrid<bool>*) const
{
}

View file

@ -31,7 +31,7 @@ public:
bool isVertical() const;
void sample(SparseGrid<bool>* grid) const override;
void sample(SparseGrid<bool>*) const override;
std::string toPostScriptString(std::size_t precision = 0) const override;

View file

@ -43,7 +43,7 @@ GeometryPath::Type GeometryPath::getType() const
return GeometryPath::Type::PATH;
}
void GeometryPath::sample(SparseGrid<bool>* grid) const
void GeometryPath::sample(SparseGrid<bool>*) const
{
}
@ -52,4 +52,4 @@ std::string GeometryPath::getAsPostScript() const
{
PathPostScriptConverter converter;
return converter.toPostScript(this);
}
}

View file

@ -11,53 +11,53 @@ using PathElementPtr = std::unique_ptr<PathElement>;
class GeometryPathFeature
{
public:
void addElement(PathElementPtr element)
{
if (mElements.empty())
{
mLocation = element->getFirstPoint();
}
mElements.push_back(std::move(element));
}
void addElement(PathElementPtr element)
{
if (mElements.empty())
{
mLocation = element->getFirstPoint();
}
mElements.push_back(std::move(element));
}
const Point& getLocation() const
{
return mLocation;
}
const Point& getLocation() const
{
return mLocation;
}
const std::vector<PathElementPtr>& getElements() const
{
return mElements;
}
const std::vector<PathElementPtr>& getElements() const
{
return mElements;
}
private:
Point mLocation;
std::vector<PathElementPtr> mElements;
Point mLocation;
std::vector<PathElementPtr> mElements;
};
using GeometryPathFeaturePtr = std::unique_ptr<GeometryPathFeature>;
class GeometryPath : public AbstractGeometricItem
{
public:
~GeometryPath();
~GeometryPath();
void addFeature(GeometryPathFeaturePtr feature);
void addFeature(GeometryPathFeaturePtr feature);
void buildFromPostscript(const std::string& psString);
void buildFromPostscript(const std::string& psString);
std::string getAsPostScript() const;
std::string getAsPostScript() const;
const Point& getLocation() const override;
const Point& getLocation() const override;
Bounds getBounds() const override;
Bounds getBounds() const override;
Type getType() const override;
Type getType() const override;
const std::vector<GeometryPathFeaturePtr>& getFeatures() const;
const std::vector<GeometryPathFeaturePtr>& getFeatures() const;
void sample(SparseGrid<bool>* grid) const override;
void sample(SparseGrid<bool>*) const override;
private:
Point mLocation;
std::vector<GeometryPathFeaturePtr> mFeatures;
};
Point mLocation;
std::vector<GeometryPathFeaturePtr> mFeatures;
};

View file

@ -7,25 +7,25 @@
class PathElement : public AbstractGeometricItem
{
public:
enum class PostscriptPositioning
{
RELATIVE_TO,
ABSOLUTE_TO
};
enum class PostscriptPositioning
{
RELATIVE_TO,
ABSOLUTE_TO
};
~PathElement();
~PathElement();
virtual Point getFirstPoint() const = 0;
virtual Point getFirstPoint() const = 0;
virtual Point getEndPoint() const = 0;
virtual Point getEndPoint() const = 0;
void setPostscriptPositioning(PostscriptPositioning positioning)
{
mPostscriptPositioning = positioning;
}
void setPostscriptPositioning(PostscriptPositioning positioning)
{
mPostscriptPositioning = positioning;
}
virtual std::string toPostScriptString(std::size_t precision = 0) const = 0;
virtual std::string toPostScriptString(std::size_t precision = 0) const = 0;
protected:
PostscriptPositioning mPostscriptPositioning{ PostscriptPositioning::RELATIVE_TO};
};
PostscriptPositioning mPostscriptPositioning{ PostscriptPositioning::RELATIVE_TO};
};

View file

@ -42,7 +42,7 @@ const Point& QuadraticBezierCurve::getLocation() const
return mStartPoint;
}
void QuadraticBezierCurve::sample(SparseGrid<bool>* grid) const
void QuadraticBezierCurve::sample(SparseGrid<bool>*) const
{
}
@ -55,4 +55,4 @@ QuadraticBezierCurve::Type QuadraticBezierCurve::getType() const
QuadraticBezierCurve::CurveType QuadraticBezierCurve::getCurveType() const
{
return CurveType::QUADRATIC_BEZIER;
}
}

View file

@ -6,26 +6,26 @@
class QuadraticBezierCurve : public Curve
{
public:
QuadraticBezierCurve(const Point& startPoint, const Point& endPoint, const Point& controlPoint);
QuadraticBezierCurve(const Point& startPoint, const Point& endPoint, const Point& controlPoint);
Point getFirstPoint() const override;
Point getFirstPoint() const override;
Point getEndPoint() const override;
Point getEndPoint() const override;
Bounds getBounds() const override;
Bounds getBounds() const override;
const Point& getLocation() const override;
const Point& getLocation() const override;
Type getType() const override;
Type getType() const override;
CurveType getCurveType() const override;
CurveType getCurveType() const override;
void sample(SparseGrid<bool>* grid) const override;
void sample(SparseGrid<bool>*) const override;
std::string toPostScriptString(std::size_t precision = 0) const override;
std::string toPostScriptString(std::size_t precision = 0) const override;
private:
Point mStartPoint;
Point mEndPoint;
Point mControlPoint;
};
Point mStartPoint;
Point mEndPoint;
Point mControlPoint;
};

View file

@ -28,7 +28,7 @@ void Circle::setMinorRadius(double radius)
mMinorRadius = radius;
}
void Circle::sample(SparseGrid<bool>* grid) const
void Circle::sample(SparseGrid<bool>*) const
{
}

View file

@ -22,7 +22,7 @@ public:
void setMinorRadius(double radius);
void sample(SparseGrid<bool>* grid) const override;
void sample(SparseGrid<bool>*) const override;
private:
double mMinorRadius{ 0.5 };

View file

@ -32,7 +32,7 @@ namespace ntk {
return { minX , maxX , minY , maxY };
}
void Rectangle::sample(SparseGrid<bool>* grid) const
void Rectangle::sample(SparseGrid<bool>*) const
{
}

View file

@ -23,7 +23,7 @@ public:
void setRadius(double radius);
void sample(SparseGrid<bool>* grid) const override;
void sample(SparseGrid<bool>*) const override;
private:
Point mBottomLeft;

View file

@ -37,6 +37,8 @@ void NetworkManager::runHttpServer(AbstractWebApp* webApp)
server.initialize();
server.run();
#else
(void)webApp;
if (!mSocketInterface)
{
initialize();