From 3fad11317810284883b5893d6a767b8db4b50728 Mon Sep 17 00:00:00 2001 From: James Grogan Date: Mon, 23 Jan 2023 11:06:30 +0000 Subject: [PATCH] Enable gcc wall and werror. --- CMakeLists.txt | 13 +- plugins/circuits/src/Terminal.cpp | 7 +- .../midi/reader/MidiChannelEventAdapter.cpp | 5 + .../src/midi/reader/MidiMetaEventAdapter.cpp | 3 + plugins/music/test/TestMidiReader.cpp | 1 + .../compression/CyclicRedundancyChecker.cpp | 2 +- src/base/compression/Lz77Encoder.cpp | 2 +- src/base/compression/ZlibEncoder.cpp | 1 + src/base/compression/deflate/DeflateBlock.cpp | 2 + .../huffman/HuffmanCodeLengthTable.cpp | 8 +- .../compression/huffman/HuffmanEncoder.cpp | 1 + .../compression/huffman/HuffmanStream.cpp | 14 +- src/base/core/http/HttpHeader.cpp | 4 +- src/base/core/streams/BufferBitStream.cpp | 20 +- src/base/core/streams/BufferBitStream.h | 20 +- src/base/core/xml/XmlParser.cpp | 4 +- src/base/geometry/primitives/Circle.cpp | 31 +-- src/base/geometry/primitives/Circle.h | 26 +-- src/base/geometry/primitives/Rectangle.cpp | 7 +- src/base/network/NetworkManager.cpp | 13 +- src/base/network/NetworkManager.h | 1 - src/base/network/sockets/Socket.cpp | 23 ++- src/base/network/sockets/Socket.h | 26 +-- src/base/network/sockets/SocketInterface.h | 9 +- .../network/sockets/UnixSocketInterface.cpp | 40 ++-- .../network/sockets/UnixSocketInterface.h | 11 +- src/console/MainApplication.cpp | 5 +- .../audio/audio_interfaces/AlsaInterface.cpp | 5 +- src/media/image/ImageBitStream.cpp | 2 +- src/media/image/png/BasicPngWriter.cpp | 5 +- src/media/image/png/PngReader.cpp | 4 +- src/rendering/fonts/FontGlyph.cpp | 5 +- src/rendering/fonts/FontItem.cpp | 7 +- src/rendering/graphics/DrawingContext.cpp | 8 +- src/rendering/mesh/Edge.cpp | 6 +- src/rendering/mesh/MeshPrimitives.cpp | 4 +- src/rendering/mesh/Node.cpp | 4 +- .../visual_elements/nodes/GridNode.cpp | 4 +- .../visual_elements/nodes/MeshNode.cpp | 2 +- src/rendering/visual_elements/scene/Scene.cpp | 7 +- src/rendering/visual_elements/svg/SvgNode.cpp | 188 +++++++++--------- .../visual_elements/svg/SvgPainter.cpp | 5 +- src/ui/client/TopBarMenu.h | 1 - src/ui/ui_controls/VerticalSpacer.cpp | 1 - .../style/MediaResourceManager.cpp | 4 +- src/ui/ui_elements/widgets/Widget.cpp | 2 +- src/ui/windows/managers/DesktopManager.cpp | 6 +- .../ui_interfaces/x11/XcbEventInterface.cpp | 4 +- .../x11/XcbGlWindowInterface.cpp | 2 +- .../ui_interfaces/x11/XcbInterface.cpp | 4 +- .../windows/ui_interfaces/x11/XcbScreen.cpp | 6 +- src/ui/windows/ui_interfaces/x11/XcbScreen.h | 9 +- .../windows/ui_interfaces/x11/XcbWindow.cpp | 14 +- src/web/markdown/MarkdownConverter.cpp | 2 +- src/web/markdown/MarkdownParser.cpp | 2 +- test/compression/TestHuffmanStream.cpp | 12 +- test/compression/TestLz77Encoder.cpp | 8 +- test/core/TestBitStream.cpp | 1 + test/core/TestByteUtils.cpp | 9 +- test/core/TestDataStructures.cpp | 3 + test/core/TestTomlReader.cpp | 6 +- test/test_runner.cpp | 2 +- test/test_utils/TestCase.h | 6 +- test/ui_test_runner.cpp | 2 +- 64 files changed, 347 insertions(+), 314 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 078c3dc..d49a34e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,12 +15,13 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) if(MSVC) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3") -elseif(FALSE) -set(GCC_COVERAGE_COMPILE_FLAGS "-fprofile-arcs -ftest-coverage") -set(GCC_COVERAGE_LINK_FLAGS "-lgcov") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}") -set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3") +elseif(CMAKE_COMPILER_IS_GNUCC) + #set(GCC_COVERAGE_COMPILE_FLAGS "-fprofile-arcs -ftest-coverage") + #set(GCC_COVERAGE_LINK_FLAGS "-lgcov") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall") + #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}") + #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}") endif() add_subdirectory(src) diff --git a/plugins/circuits/src/Terminal.cpp b/plugins/circuits/src/Terminal.cpp index 409c96b..c54a9a3 100644 --- a/plugins/circuits/src/Terminal.cpp +++ b/plugins/circuits/src/Terminal.cpp @@ -1,8 +1,9 @@ #include "Terminal.h" Terminal::Terminal(TerminalType type, const std::string& label) - : mType(type), - mLabel(label) + : mLabel(label), + mType(type) + { } @@ -15,4 +16,4 @@ Wire* Terminal::getConnection() const void Terminal::setConnection(Wire* connection) { mConnection = connection; -} \ No newline at end of file +} diff --git a/plugins/music/src/midi/reader/MidiChannelEventAdapter.cpp b/plugins/music/src/midi/reader/MidiChannelEventAdapter.cpp index e70ac22..f02217f 100644 --- a/plugins/music/src/midi/reader/MidiChannelEventAdapter.cpp +++ b/plugins/music/src/midi/reader/MidiChannelEventAdapter.cpp @@ -12,6 +12,10 @@ int MidiChannelEventAdapter::readEvent(std::ifstream* file, char firstByte, Midi int second_four_bits = 0xF; int event_type = (firstByte & first_four_bits) >> 4; int midi_channel = (firstByte & second_four_bits) >> 4; + + (void) event_type; + (void) midi_channel; + unsigned byteCount = 0; //std::cout << "Channel: " << midi_channel << std::endl; @@ -45,6 +49,7 @@ int MidiChannelEventAdapter::readEvent(std::ifstream* file, char firstByte, Midi case MidiChannelEvent::Type::PROGRAM: { int value0 = *BinaryStream::getNextByteAsInt(file); + (void) value0; byteCount ++; break; } diff --git a/plugins/music/src/midi/reader/MidiMetaEventAdapter.cpp b/plugins/music/src/midi/reader/MidiMetaEventAdapter.cpp index 077a951..79d2233 100644 --- a/plugins/music/src/midi/reader/MidiMetaEventAdapter.cpp +++ b/plugins/music/src/midi/reader/MidiMetaEventAdapter.cpp @@ -36,6 +36,7 @@ int MidiMetaEventAdapter::ReadEvent(std::ifstream* file, MetaMidiEvent* event, i case MetaMidiEvent::Type::END_TRACK: { int length = *BinaryStream::getNextByteAsInt(file); + (void) length; byteCount ++; break; } @@ -157,6 +158,7 @@ int MidiMetaEventAdapter::ReadKeySignatureEvent(std::ifstream* file, MetaMidiEve { unsigned byteCount = 0; int length = *BinaryStream::getNextByteAsInt(file); + (void)length; byteCount++; MidiKeySignature keySig; @@ -170,6 +172,7 @@ int MidiMetaEventAdapter::ReadTimeCodeEvent(std::ifstream* file, MetaMidiEvent* { unsigned byteCount = 0; int length = *BinaryStream::getNextByteAsInt(file); + (void)length; byteCount++; MidiSmtpeTimecode timeCode; diff --git a/plugins/music/test/TestMidiReader.cpp b/plugins/music/test/TestMidiReader.cpp index 6fd872c..f010243 100644 --- a/plugins/music/test/TestMidiReader.cpp +++ b/plugins/music/test/TestMidiReader.cpp @@ -9,4 +9,5 @@ TEST_CASE(TestReadMidi, "audio") reader.read(TestUtils::getTestDataDir() / "test.mid"); auto document = reader.getDocument(); + (void)document; }; diff --git a/src/base/compression/CyclicRedundancyChecker.cpp b/src/base/compression/CyclicRedundancyChecker.cpp index 5f7c1fd..97f518b 100644 --- a/src/base/compression/CyclicRedundancyChecker.cpp +++ b/src/base/compression/CyclicRedundancyChecker.cpp @@ -4,7 +4,7 @@ void CyclicRedundancyChecker::createTable() { mTable = std::vector(TABLE_SIZE, 0); unsigned long c{0}; - for (int n = 0; n < TABLE_SIZE; n++) + for (std::size_t n = 0; n < TABLE_SIZE; n++) { c = (unsigned long) n; for (int k = 0; k < 8; k++) diff --git a/src/base/compression/Lz77Encoder.cpp b/src/base/compression/Lz77Encoder.cpp index ff3ff85..e5f649b 100644 --- a/src/base/compression/Lz77Encoder.cpp +++ b/src/base/compression/Lz77Encoder.cpp @@ -77,7 +77,7 @@ unsigned Lz77Encoder::lookAheadForMatchingChars(unsigned distance) search_char = getSearchBufferItem(static_cast(search_offset)); } unsigned char lookahead_char = mLookaheadBuffer.getItem(idx); - if ((lookahead_char != search_char) || (idx == mMaxLookAheadBufferIndex)) + if ((lookahead_char != search_char) || (static_cast(idx) == mMaxLookAheadBufferIndex)) { if (idx + 1>= mMinLengthMatchSize) { diff --git a/src/base/compression/ZlibEncoder.cpp b/src/base/compression/ZlibEncoder.cpp index 057cb03..17af59e 100644 --- a/src/base/compression/ZlibEncoder.cpp +++ b/src/base/compression/ZlibEncoder.cpp @@ -164,6 +164,7 @@ bool ZlibEncoder::decode() unsigned char byte3 = *mInputStream->readNextByte(); uint32_t adler32 = (byte0 << 24) | (byte1 << 16) | (byte2 << 8) | byte3; + (void)adler32; //std::cout << "Got adler 32 checksum " << adler32 << std::endl; return valid; diff --git a/src/base/compression/deflate/DeflateBlock.cpp b/src/base/compression/deflate/DeflateBlock.cpp index f7f0a4b..6b2d4b2 100644 --- a/src/base/compression/deflate/DeflateBlock.cpp +++ b/src/base/compression/deflate/DeflateBlock.cpp @@ -38,6 +38,7 @@ bool DeflateBlock::isFinalBlock() const bool DeflateBlock::read() { auto working_byte = *mInputStream->readNextByte(); + (void)working_byte; //std::cout << mInputStream->logNextNBytes(60); //std::cout << "DeflateBlock::read location " << mInputStream->logLocation(); @@ -77,6 +78,7 @@ bool DeflateBlock::readUncompressedStream() auto byte2 = *mInputStream->readNextByte(); auto byte3 = *mInputStream->readNextByte(); uint16_t len_check = (byte2 << 8) | byte3; + (void) len_check; //std::cout << "Check block 2: " << ByteUtils::toString(byte2) << std::endl; //std::cout << "Check block 3: " << ByteUtils::toString(byte3) << std::endl; diff --git a/src/base/compression/huffman/HuffmanCodeLengthTable.cpp b/src/base/compression/huffman/HuffmanCodeLengthTable.cpp index e0f7511..d2c3ef3 100644 --- a/src/base/compression/huffman/HuffmanCodeLengthTable.cpp +++ b/src/base/compression/huffman/HuffmanCodeLengthTable.cpp @@ -13,10 +13,10 @@ void HuffmanCodeLengthTable::buildCompressedLengthSequence() RunLengthEncoder rl_encoder; auto rle_encoded = rl_encoder.encode(mInputLengthSequence); - for (const auto& entry : rle_encoded) - { + //for (const auto& entry : rle_encoded) + //{ //std::cout << "Got rle " << static_cast(entry.first) << " | " << entry.second << std::endl; - } + //} mCompressedLengthSequence.clear(); for (const auto& entry : rle_encoded) @@ -117,7 +117,7 @@ bool HuffmanCodeLengthTable::readNextSymbol(unsigned& result, BitStream* stream) while(!found) { - auto valid = stream->readNextNBits(delta, buffer); + stream->readNextNBits(delta, buffer); //std::cout << "Got buffer " << ByteUtils::toString(buffer) << std::endl;; unsigned hold = buffer; diff --git a/src/base/compression/huffman/HuffmanEncoder.cpp b/src/base/compression/huffman/HuffmanEncoder.cpp index aa1f481..023012f 100644 --- a/src/base/compression/huffman/HuffmanEncoder.cpp +++ b/src/base/compression/huffman/HuffmanEncoder.cpp @@ -17,6 +17,7 @@ void HuffmanEncoder::dumpNode(RawNode* node, unsigned depth) const } auto data = node->getData(); + (void)data; std::string prefix(depth, '_'); diff --git a/src/base/compression/huffman/HuffmanStream.cpp b/src/base/compression/huffman/HuffmanStream.cpp index e03e304..269fc85 100644 --- a/src/base/compression/huffman/HuffmanStream.cpp +++ b/src/base/compression/huffman/HuffmanStream.cpp @@ -211,7 +211,7 @@ void HuffmanStream::readSymbols() else if (symbol <= 264) { auto length = 3 + symbol - 257; - const auto valid_dist = readNextDistanceSymbol(distance); + readNextDistanceSymbol(distance); copyFromBuffer(length, distance); } else if (symbol <= 268) @@ -220,7 +220,7 @@ void HuffmanStream::readSymbols() mInputStream->readNextNBits(1, extra); auto length = 11 + 2*(symbol - 265) + extra; - const auto valid_dist = readNextDistanceSymbol(distance); + readNextDistanceSymbol(distance); copyFromBuffer(length, distance); } else if (symbol <= 272) @@ -229,7 +229,7 @@ void HuffmanStream::readSymbols() mInputStream->readNextNBits(2, extra); auto length = 19 + 4*(symbol - 269) + extra; - const auto valid_dist = readNextDistanceSymbol(distance); + readNextDistanceSymbol(distance); copyFromBuffer(length, distance); } else if (symbol <= 276) @@ -238,7 +238,7 @@ void HuffmanStream::readSymbols() mInputStream->readNextNBits(3, extra); auto length = 35 + 8*(symbol - 273) + extra; - const auto valid_dist = readNextDistanceSymbol(distance); + readNextDistanceSymbol(distance); copyFromBuffer(length, distance); } else if (symbol <= 280) @@ -247,7 +247,7 @@ void HuffmanStream::readSymbols() mInputStream->readNextNBits(4, extra); auto length = 67 + 16*(symbol - 277) + extra; - const auto valid_dist = readNextDistanceSymbol(distance); + readNextDistanceSymbol(distance); copyFromBuffer(length, distance); } else if (symbol <= 284) @@ -256,13 +256,13 @@ void HuffmanStream::readSymbols() mInputStream->readNextNBits(5, extra); auto length = 131 + 32*(symbol - 281) + extra; - const auto valid_dist = readNextDistanceSymbol(distance); + readNextDistanceSymbol(distance); copyFromBuffer(length, distance); } else if (symbol == 285) { auto length = 258; - const auto valid_dist = readNextDistanceSymbol(distance); + readNextDistanceSymbol(distance); copyFromBuffer(length, distance); } } diff --git a/src/base/core/http/HttpHeader.cpp b/src/base/core/http/HttpHeader.cpp index b273b8d..f4c84bc 100644 --- a/src/base/core/http/HttpHeader.cpp +++ b/src/base/core/http/HttpHeader.cpp @@ -3,8 +3,8 @@ HttpHeader::HttpHeader() - : mContentType("text / html"), - mHttpVersion("1.1") + : mHttpVersion("1.1"), + mContentType("text / html") { } diff --git a/src/base/core/streams/BufferBitStream.cpp b/src/base/core/streams/BufferBitStream.cpp index 5d0a15c..5f9d3f2 100644 --- a/src/base/core/streams/BufferBitStream.cpp +++ b/src/base/core/streams/BufferBitStream.cpp @@ -6,7 +6,7 @@ bool BufferBitStream::isFinished() const { - return mByteOffset == mBuffer.size() - 1; + return mByteOffset == static_cast(mBuffer.size()) - 1; } std::vector BufferBitStream::peekNextNBytes(unsigned n) const @@ -35,7 +35,7 @@ std::vector BufferBitStream::peekNextNBytes(unsigned n) const std::optional BufferBitStream::readNextByte() { - if (mByteOffset + 1 == mBuffer.size()) + if (mByteOffset + 1 == static_cast(mBuffer.size())) { return std::nullopt; } @@ -76,3 +76,19 @@ void BufferBitStream::writeByte(unsigned char data, bool checkOverflow) } +void BufferBitStream::writeBytes(const std::vector data) +{ + std::copy(data.begin(), data.end(), std::back_inserter(mBuffer)); +} + +const std::vector& BufferBitStream::getBuffer() const +{ + return mBuffer; +} + +void BufferBitStream::reset() +{ + BitStream::reset(); + mBuffer.clear(); +} + diff --git a/src/base/core/streams/BufferBitStream.h b/src/base/core/streams/BufferBitStream.h index b239d06..627ba52 100644 --- a/src/base/core/streams/BufferBitStream.h +++ b/src/base/core/streams/BufferBitStream.h @@ -8,31 +8,21 @@ class BufferBitStream : public BitStream { public: + const std::vector& getBuffer() const; + bool isFinished() const override; std::vector peekNextNBytes(unsigned n) const override; std::optional readNextByte() override; + void reset() override; + void setBuffer(const std::vector& data); void writeByte(unsigned char data, bool checkOverflow = true) override; - void writeBytes(const std::vector data) override - { - std::copy(data.begin(), data.end(), std::back_inserter(mBuffer)); - } - - const std::vector& getBuffer() const - { - return mBuffer; - } - - void reset() override - { - BitStream::reset(); - mBuffer.clear(); - } + void writeBytes(const std::vector data) override; private: unsigned mBufferSize{0}; diff --git a/src/base/core/xml/XmlParser.cpp b/src/base/core/xml/XmlParser.cpp index fc1cb8f..9760e86 100644 --- a/src/base/core/xml/XmlParser.cpp +++ b/src/base/core/xml/XmlParser.cpp @@ -12,9 +12,9 @@ using LS = XmlParser::LineState; using DS = XmlParser::DocumentState; XmlParser::XmlParser() - : mDocument(XmlDocument::Create()), - mDocumentState(XmlParser::DocumentState::Await_Prolog), + : mDocumentState(XmlParser::DocumentState::Await_Prolog), mLineState(XmlParser::LineState::Await_Tag_Open), + mDocument(XmlDocument::Create()), mWorkingElements() { diff --git a/src/base/geometry/primitives/Circle.cpp b/src/base/geometry/primitives/Circle.cpp index 8c302ea..bc60940 100644 --- a/src/base/geometry/primitives/Circle.cpp +++ b/src/base/geometry/primitives/Circle.cpp @@ -1,30 +1,31 @@ #include "Circle.h" Circle::Circle(const Point& centre, double radius) - : mCentre(centre), - mRadius(radius) + : mRadius(radius), + mCentre(centre) + { - mMinorRadius = mRadius; + mMinorRadius = mRadius; } const Point& Circle::getLocation() const { - return mCentre; + return mCentre; } double Circle::getRadius() const { - return mRadius; + return mRadius; } double Circle::getMinorRadius() const { - return mMinorRadius; + return mMinorRadius; } void Circle::setMinorRadius(double radius) { - mMinorRadius = radius; + mMinorRadius = radius; } void Circle::sample(SparseGrid* grid) const @@ -34,19 +35,19 @@ void Circle::sample(SparseGrid* grid) const bool Circle::isEllipse() const { - return mRadius != mMinorRadius; + return mRadius != mMinorRadius; } Bounds Circle::getBounds() const { - double minX = mCentre.getX() - mRadius; - double maxX = mCentre.getX() + mRadius; - double minY = mCentre.getY() - mMinorRadius; - double maxY = mCentre.getY() + mMinorRadius; - return { minX, maxX, minY, maxY }; + double minX = mCentre.getX() - mRadius; + double maxX = mCentre.getX() + mRadius; + double minY = mCentre.getY() - mMinorRadius; + double maxY = mCentre.getY() + mMinorRadius; + return { minX, maxX, minY, maxY }; } Circle::Type Circle::getType() const { - return Type::CIRCLE; -} \ No newline at end of file + return Type::CIRCLE; +} diff --git a/src/base/geometry/primitives/Circle.h b/src/base/geometry/primitives/Circle.h index 33dee45..088fd18 100644 --- a/src/base/geometry/primitives/Circle.h +++ b/src/base/geometry/primitives/Circle.h @@ -6,26 +6,26 @@ class Circle : public AbstractGeometricItem { public: - Circle(const Point& centre, double radius = 0.5); + Circle(const Point& centre, double radius = 0.5); - const Point& getLocation() const override; + const Point& getLocation() const override; - double getRadius() const; + double getRadius() const; - double getMinorRadius() const; + double getMinorRadius() const; - Bounds getBounds() const override; + Bounds getBounds() const override; - Type getType() const override; + Type getType() const override; - bool isEllipse() const; + bool isEllipse() const; - void setMinorRadius(double radius); + void setMinorRadius(double radius); - void sample(SparseGrid* grid) const override; + void sample(SparseGrid* grid) const override; private: - double mMinorRadius{ 0.5 }; - double mRadius{ 0.5 }; - Point mCentre; -}; \ No newline at end of file + double mMinorRadius{ 0.5 }; + double mRadius{ 0.5 }; + Point mCentre; +}; diff --git a/src/base/geometry/primitives/Rectangle.cpp b/src/base/geometry/primitives/Rectangle.cpp index 1122a8e..1f89f5e 100644 --- a/src/base/geometry/primitives/Rectangle.cpp +++ b/src/base/geometry/primitives/Rectangle.cpp @@ -9,9 +9,10 @@ namespace ntk { } Rectangle::Rectangle(const Point& bottomLeft, double width, double height) - : mBottomLeft(bottomLeft), - mHeight(height), - mWidth(width) + : mBottomLeft(bottomLeft), + mWidth(width), + mHeight(height) + { } diff --git a/src/base/network/NetworkManager.cpp b/src/base/network/NetworkManager.cpp index 6681974..052de40 100644 --- a/src/base/network/NetworkManager.cpp +++ b/src/base/network/NetworkManager.cpp @@ -1,12 +1,11 @@ #include "NetworkManager.h" + #ifdef __linux__ #include "UnixSocketInterface.h" #else #include "Win32WebServer.h" #endif -#include - NetworkManager::NetworkManager() : mActiveSockets(), mSocketInterface() @@ -44,9 +43,9 @@ void NetworkManager::runHttpServer(AbstractWebApp* webApp) } auto socket = Socket::Create(); - mSocketInterface->InitializeSocket(socket); - mSocketInterface->Listen(socket); - mSocketInterface->Run(socket); + mSocketInterface->initializeSocket(socket); + mSocketInterface->socketListen(socket); + mSocketInterface->run(socket); #endif } @@ -63,8 +62,8 @@ void NetworkManager::runHttpClient() } auto socket = Socket::Create(); - mSocketInterface->InitializeSocket(socket, "127.0.0.1"); - mSocketInterface->Write(socket, "Hello Friend"); + mSocketInterface->initializeSocket(socket, "127.0.0.1"); + mSocketInterface->socketWrite(socket, "Hello Friend"); } void NetworkManager::shutDown() diff --git a/src/base/network/NetworkManager.h b/src/base/network/NetworkManager.h index 33b8fef..c643e8b 100644 --- a/src/base/network/NetworkManager.h +++ b/src/base/network/NetworkManager.h @@ -11,7 +11,6 @@ class AbstractWebApp; class NetworkManager { public: - NetworkManager(); ~NetworkManager(); diff --git a/src/base/network/sockets/Socket.cpp b/src/base/network/sockets/Socket.cpp index d8f8e74..663a566 100644 --- a/src/base/network/sockets/Socket.cpp +++ b/src/base/network/sockets/Socket.cpp @@ -1,9 +1,10 @@ #include "Socket.h" Socket::Socket() - : mPort(8888), - mMessage(), - mHandle(-1) + : mHandle(-1), + mPort(8888), + mMessage() + { } @@ -13,12 +14,12 @@ Socket::~Socket() } -void Socket::SetHandle(SocketHandle handle) +void Socket::setHandle(SocketHandle handle) { mHandle = handle; } -Socket::SocketHandle Socket::GetHandle() const +Socket::SocketHandle Socket::getHandle() const { return mHandle; } @@ -28,33 +29,33 @@ std::unique_ptr Socket::Create() return std::make_unique(); } -std::string Socket::GetMessage() const +std::string Socket::getMessage() const { return mMessage; } -void Socket::SetMessage(const std::string& message) +void Socket::setMessage(const std::string& message) { mMessage = message; } -void Socket::SetPort(unsigned port) +void Socket::setPort(unsigned port) { mPort = port; } -unsigned Socket::GetPort() const +unsigned Socket::getPort() const { return mPort; } std::string Socket::getAddress() const { - return mAddress; + return mAddress; } void Socket::setAddress(const std::string& address) { - mAddress = address; + mAddress = address; } diff --git a/src/base/network/sockets/Socket.h b/src/base/network/sockets/Socket.h index 2e4e76d..51aeb04 100644 --- a/src/base/network/sockets/Socket.h +++ b/src/base/network/sockets/Socket.h @@ -14,23 +14,23 @@ public: static std::unique_ptr Create(); - void SetPort(unsigned port); - - void SetHandle(SocketHandle handle); - - SocketHandle GetHandle() const; - - unsigned GetPort() const; - - std::string GetMessage() const; - - void SetMessage(const std::string& message); - std::string getAddress() const; + + SocketHandle getHandle() const; + + unsigned getPort() const; + + std::string getMessage() const; + + void setPort(unsigned port); + + void setHandle(SocketHandle handle); + + void setMessage(const std::string& message); + void setAddress(const std::string& address); private: - SocketHandle mHandle; unsigned mPort{0}; std::string mMessage; diff --git a/src/base/network/sockets/SocketInterface.h b/src/base/network/sockets/SocketInterface.h index 6bd2d33..d945bc3 100644 --- a/src/base/network/sockets/SocketInterface.h +++ b/src/base/network/sockets/SocketInterface.h @@ -8,16 +8,15 @@ using SocketPtr = std::unique_ptr; class ISocketInterface { public: - ISocketInterface() = default; virtual ~ISocketInterface() = default; - virtual void InitializeSocket(const SocketPtr& socket, const std::string& address = {}) = 0; - virtual void Listen(const SocketPtr& socket) = 0; - virtual void Run(const SocketPtr& socket) = 0; + virtual void initializeSocket(const SocketPtr& socket, const std::string& address = {}) = 0; + virtual void socketListen(const SocketPtr& socket) = 0; + virtual void run(const SocketPtr& socket) = 0; - virtual void Write(const SocketPtr& socket, const std::string& message) = 0; + virtual void socketWrite(const SocketPtr& socket, const std::string& message) = 0; }; using ISocketInterfaceUPtr = std::unique_ptr; diff --git a/src/base/network/sockets/UnixSocketInterface.cpp b/src/base/network/sockets/UnixSocketInterface.cpp index 17ef367..3ac6492 100644 --- a/src/base/network/sockets/UnixSocketInterface.cpp +++ b/src/base/network/sockets/UnixSocketInterface.cpp @@ -16,7 +16,7 @@ UnixSocketInterface::UnixSocketInterface() : mBufferSize(1024) { - mMessageHandler = std::make_unique(); + mMessageHandler = std::make_unique(); } std::unique_ptr UnixSocketInterface::Create() @@ -29,26 +29,26 @@ UnixSocketInterface::~UnixSocketInterface() } -void UnixSocketInterface::InitializeSocket(const SocketPtr& socketPtr, const std::string& address) +void UnixSocketInterface::initializeSocket(const SocketPtr& socketPtr, const std::string& address) { auto handle = ::socket(AF_INET, SOCK_STREAM, 0); - socketPtr->SetHandle(handle); + socketPtr->setHandle(handle); if (!address.empty()) { - socketPtr->setAddress(address); + socketPtr->setAddress(address); } } -void UnixSocketInterface::Write(const SocketPtr& socket, const std::string& message) +void UnixSocketInterface::socketWrite(const SocketPtr& socket, const std::string& message) { - if(socket->GetHandle() < 0) + if(socket->getHandle() < 0) { MLOG_ERROR("Error opening socket" ); return; } - const auto port = static_cast(socket->GetPort()); + const auto port = static_cast(socket->getPort()); struct sockaddr_in serv_addr; memset(&serv_addr, 0, sizeof(serv_addr)); serv_addr.sin_family = AF_INET; @@ -56,14 +56,14 @@ void UnixSocketInterface::Write(const SocketPtr& socket, const std::string& mess inet_aton(socket->getAddress().c_str(), &serv_addr.sin_addr); serv_addr.sin_port = htons(port); - int result = connect(socket->GetHandle(), (struct sockaddr *)&serv_addr, sizeof(serv_addr)); + int result = connect(socket->getHandle(), (struct sockaddr *)&serv_addr, sizeof(serv_addr)); if(result< 0) { MLOG_ERROR("Error connecting to socket" ); return; } - auto n = write(socket->GetHandle(), message.c_str(), message.length()); + auto n = write(socket->getHandle(), message.c_str(), message.length()); if (n < 0) { std::cerr << "Error on write" << std::endl; @@ -71,44 +71,44 @@ void UnixSocketInterface::Write(const SocketPtr& socket, const std::string& mess } char buffer[BUFFER_SIZE] = {0}; - int res = read(socket->GetHandle(), buffer, BUFFER_SIZE); + int res = read(socket->getHandle(), buffer, BUFFER_SIZE); if (res < 0) { std::cerr << "Error on read" << std::endl; return; } - socket->SetMessage(buffer); + socket->setMessage(buffer); std::cout << "Here is the message: " << buffer << std::endl; } -void UnixSocketInterface::Listen(const SocketPtr& socket) +void UnixSocketInterface::socketListen(const SocketPtr& socket) { - if(socket->GetHandle() < 0) + if(socket->getHandle() < 0) { std::cerr << "Error opening socket" << std::endl; return; } - const auto port = static_cast(socket->GetPort()); + const auto port = static_cast(socket->getPort()); struct sockaddr_in serv_addr; memset(&serv_addr, 0, sizeof(serv_addr)); serv_addr.sin_family = AF_INET; serv_addr.sin_addr.s_addr = INADDR_ANY; serv_addr.sin_port = htons(port); - int result = bind(socket->GetHandle(), (struct sockaddr *)&serv_addr, sizeof(serv_addr)); + int result = bind(socket->getHandle(), (struct sockaddr *)&serv_addr, sizeof(serv_addr)); if(result< 0) { std::cerr << "Error binding socket" << std::endl; return; } - listen(socket->GetHandle(), 5); + listen(socket->getHandle(), 5); } -void UnixSocketInterface::Run(const SocketPtr& socket) +void UnixSocketInterface::run(const SocketPtr& socket) { - if(socket->GetHandle() < 0) + if(socket->getHandle() < 0) { std::cerr << "Error opening socket" << std::endl; return; @@ -118,7 +118,7 @@ void UnixSocketInterface::Run(const SocketPtr& socket) socklen_t clilen = sizeof(cli_addr); while(true) { - const auto new_socket_handle = accept(socket->GetHandle(), (struct sockaddr *) &cli_addr, &clilen); + const auto new_socket_handle = accept(socket->getHandle(), (struct sockaddr *) &cli_addr, &clilen); if (new_socket_handle < 0) { std::cerr << "Error on accept" << std::endl; @@ -132,7 +132,7 @@ void UnixSocketInterface::Run(const SocketPtr& socket) std::cerr << "Error on read" << std::endl; return; } - socket->SetMessage(buffer); + socket->setMessage(buffer); std::cout << "Here is the message: " << buffer << std::endl; const auto response = mMessageHandler->onMessage(buffer); diff --git a/src/base/network/sockets/UnixSocketInterface.h b/src/base/network/sockets/UnixSocketInterface.h index 0e887f9..d8f7c94 100644 --- a/src/base/network/sockets/UnixSocketInterface.h +++ b/src/base/network/sockets/UnixSocketInterface.h @@ -10,25 +10,22 @@ class ISocketMessageHandler; class UnixSocketInterface : public ISocketInterface { - public: - UnixSocketInterface(); virtual ~UnixSocketInterface(); static std::unique_ptr Create(); - void InitializeSocket(const SocketPtr& socket, const std::string& address = {}) override; + void initializeSocket(const SocketPtr& socket, const std::string& address = {}) override; - void Listen(const SocketPtr& socket) override; + void socketListen(const SocketPtr& socket) override; - void Write(const SocketPtr& socket, const std::string& message) override; + void socketWrite(const SocketPtr& socket, const std::string& message) override; - void Run(const SocketPtr& socket) override; + void run(const SocketPtr& socket) override; private: - static constexpr unsigned BUFFER_SIZE{1024}; std::size_t mBufferSize { 0 }; std::unique_ptr mMessageHandler; diff --git a/src/console/MainApplication.cpp b/src/console/MainApplication.cpp index ca3f465..2813735 100644 --- a/src/console/MainApplication.cpp +++ b/src/console/MainApplication.cpp @@ -18,8 +18,9 @@ #include MainApplication::MainApplication() - : mDatabaseManager(), - mCommandLineArgs() + : mCommandLineArgs(), + mDatabaseManager() + { } diff --git a/src/media/audio/audio_interfaces/AlsaInterface.cpp b/src/media/audio/audio_interfaces/AlsaInterface.cpp index 08e9a4a..a6a1b87 100644 --- a/src/media/audio/audio_interfaces/AlsaInterface.cpp +++ b/src/media/audio/audio_interfaces/AlsaInterface.cpp @@ -148,10 +148,11 @@ void AlsaInterface::play(AudioDevice* device, AudioSample* sample, unsigned dura const auto data = sample->getChannelData(0); int numFrames = mPeriodSize >> 2; - for(int count = 0; count < duration; count++) + for(unsigned count = 0; count < duration; count++) { const auto offset= count*4*numFrames; - unsigned char frame[4] = {data[offset], data[offset+1], data[offset+2], data[offset+3]}; + unsigned char frame[4] = {static_cast(data[offset]), + static_cast(data[offset+1]), static_cast(data[offset+2]), static_cast(data[offset+3])}; while ((snd_pcm_writei(mHandle, frame, numFrames)) < 0) { snd_pcm_prepare(mHandle); diff --git a/src/media/image/ImageBitStream.cpp b/src/media/image/ImageBitStream.cpp index 214ef72..eee5faa 100644 --- a/src/media/image/ImageBitStream.cpp +++ b/src/media/image/ImageBitStream.cpp @@ -11,7 +11,7 @@ ImageBitStream::ImageBitStream(Image* image) bool ImageBitStream::isFinished() const { - return mByteOffset == mImage->getGrid()->getDataSize(); + return mByteOffset == static_cast(mImage->getGrid()->getDataSize()); } std::vector ImageBitStream::peekNextNBytes(unsigned n) const diff --git a/src/media/image/png/BasicPngWriter.cpp b/src/media/image/png/BasicPngWriter.cpp index c891ddd..c98d300 100644 --- a/src/media/image/png/BasicPngWriter.cpp +++ b/src/media/image/png/BasicPngWriter.cpp @@ -118,7 +118,7 @@ void BasicPngWriter::writeDataChunks(const BufferBitStream& buffer) std::size_t max_bytes{ 32000 }; auto num_dat_chunks = num_bytes / max_bytes + 1; - std::size_t offset = 0; + //std::size_t offset = 0; for (std::size_t idx = 0; idx < num_dat_chunks; idx++) { auto length = max_bytes; @@ -126,6 +126,7 @@ void BasicPngWriter::writeDataChunks(const BufferBitStream& buffer) { length = num_bytes - num_dat_chunks * num_bytes; } + (void)length; //std::cout << "Writing idat length " << num_bytes << std::endl; mOutStream->write(static_cast(num_bytes)); @@ -213,4 +214,4 @@ void BasicPngWriter::write(const Path& path, Image* image) writeDataChunks(zlib_out_stream); writeEndChunk(); -} \ No newline at end of file +} diff --git a/src/media/image/png/PngReader.cpp b/src/media/image/png/PngReader.cpp index 0e824a4..b0753dc 100644 --- a/src/media/image/png/PngReader.cpp +++ b/src/media/image/png/PngReader.cpp @@ -74,6 +74,7 @@ bool PngReader::readChunk() decodeData(); } unsigned crcCheck = *BinaryStream::getNextDWord(mFile->getInHandle()); + (void) crcCheck; } else if(chunkType == "IDAT") { @@ -96,6 +97,7 @@ bool PngReader::readChunk() } unsigned crcCheck = *BinaryStream::getNextDWord(mFile->getInHandle()); + (void) crcCheck; } return !lastChunk; } @@ -193,7 +195,7 @@ std::unique_ptr PngReader::read() PngFilter filter(mOutputStream.get(), image_bit_stream.get()); filter.decode(); - return std::move(image); + return image; } void PngReader::decodeData() diff --git a/src/rendering/fonts/FontGlyph.cpp b/src/rendering/fonts/FontGlyph.cpp index a99f340..f1cd14f 100644 --- a/src/rendering/fonts/FontGlyph.cpp +++ b/src/rendering/fonts/FontGlyph.cpp @@ -56,12 +56,13 @@ std::string GlyphRunOutlines::toPostScriptPath() } FontGlyph::FontGlyph(unsigned width, unsigned height, int bearingX, int bearingY, int advanceX, std::unique_ptr image) - : mImage(std::move(image)), + : mWidth(width), mHeight(height), mBearingX(bearingX), mBearingY(bearingY), - mAdvanceX(advanceX) + mAdvanceX(advanceX), + mImage(std::move(image)) { } diff --git a/src/rendering/fonts/FontItem.cpp b/src/rendering/fonts/FontItem.cpp index 4a088eb..bbc8b30 100644 --- a/src/rendering/fonts/FontItem.cpp +++ b/src/rendering/fonts/FontItem.cpp @@ -1,8 +1,9 @@ #include "FontItem.h" FontItem::FontItem(const std::string& faceName, float size) - : mFaceName(faceName), - mSize(size) + : mSize(size), + mFaceName(faceName) + { } @@ -30,4 +31,4 @@ const std::string& FontItem::getFaceName() const float FontItem::getSize() const { return mSize; -} \ No newline at end of file +} diff --git a/src/rendering/graphics/DrawingContext.cpp b/src/rendering/graphics/DrawingContext.cpp index 69cf23e..1fae189 100644 --- a/src/rendering/graphics/DrawingContext.cpp +++ b/src/rendering/graphics/DrawingContext.cpp @@ -10,9 +10,9 @@ #include "Scene.h" DrawingContext::DrawingContext(DrawingSurface* surface, FontsManager* fontsManager, DrawingMode requestedDrawingMode) - : mSurface(surface), - mDrawingMode(requestedDrawingMode), - mFontsManager(fontsManager) + : mDrawingMode(requestedDrawingMode), + mFontsManager(fontsManager), + mSurface(surface) { mPainter = PainterFactory::Create(this, mDrawingMode); @@ -47,4 +47,4 @@ void DrawingContext::paint() AbstractPainter* DrawingContext::getPainter() const { return mPainter.get(); -} \ No newline at end of file +} diff --git a/src/rendering/mesh/Edge.cpp b/src/rendering/mesh/Edge.cpp index 8803de6..6e05a04 100644 --- a/src/rendering/mesh/Edge.cpp +++ b/src/rendering/mesh/Edge.cpp @@ -3,9 +3,9 @@ #include "Node.h" Edge::Edge(Node* node0, Node* node1, std::size_t id) - : mNode0(node0), - mNode1(node1), - mId(id) + : mId(id), + mNode0(node0), + mNode1(node1) { } diff --git a/src/rendering/mesh/MeshPrimitives.cpp b/src/rendering/mesh/MeshPrimitives.cpp index 31d8298..a8db7f8 100644 --- a/src/rendering/mesh/MeshPrimitives.cpp +++ b/src/rendering/mesh/MeshPrimitives.cpp @@ -79,7 +79,7 @@ std::unique_ptr MeshPrimitives::buildCircleAsTriMesh(std::size_t numSeg std::unique_ptr MeshPrimitives::buildCircleAsLineMesh(std::size_t numSegments) { VecPoints locations(numSegments); - const double delta_theta = (2.0*M_PI)/double(numSegments); + //const double delta_theta = (2.0*M_PI)/double(numSegments); double theta = 0.0; for(unsigned idx=0; idx MeshPrimitives::buildRoundedRectangleAsTriMesh(double r } // Inner rect edges - std::size_t edge_offset = num_edges_per_fan*num_fans; + // std::size_t edge_offset = num_edges_per_fan*num_fans; return nullptr; } diff --git a/src/rendering/mesh/Node.cpp b/src/rendering/mesh/Node.cpp index 8b1f6d9..435f82f 100644 --- a/src/rendering/mesh/Node.cpp +++ b/src/rendering/mesh/Node.cpp @@ -11,8 +11,8 @@ Node::~Node() } Node::Node(const Point& p, std::size_t index) - : mPoint(p), - mIndex(index) + : mIndex(index), + mPoint(p) { } diff --git a/src/rendering/visual_elements/nodes/GridNode.cpp b/src/rendering/visual_elements/nodes/GridNode.cpp index cb3b69f..03b9831 100644 --- a/src/rendering/visual_elements/nodes/GridNode.cpp +++ b/src/rendering/visual_elements/nodes/GridNode.cpp @@ -110,7 +110,7 @@ void GridNode::update(SceneInfo* sceneInfo) if (mDataDirty) { - auto difference = mNumberX*mNumberY - mData.size(); + //auto difference = mNumberX*mNumberY - mData.size(); mData.resize(mNumberX*mNumberY, {}); auto node_data = std::vector >(4*mNumberX*mNumberY); @@ -128,7 +128,7 @@ void GridNode::update(SceneInfo* sceneInfo) if (mTransformIsDirty) { - auto size = mHeight > mWidth ? mWidth : mHeight; + //auto size = mHeight > mWidth ? mWidth : mHeight; //mBackgroundModel->updateTransform({mLocation, static_cast(size), static_cast(size)}); //mOutlineModel->updateTransform({mLocation, static_cast(size), static_cast(size)}); diff --git a/src/rendering/visual_elements/nodes/MeshNode.cpp b/src/rendering/visual_elements/nodes/MeshNode.cpp index 3b16454..0b9924d 100644 --- a/src/rendering/visual_elements/nodes/MeshNode.cpp +++ b/src/rendering/visual_elements/nodes/MeshNode.cpp @@ -81,7 +81,7 @@ void MeshNode::update(SceneInfo* sceneInfo) if (mTransformIsDirty) { - auto size = mHeight > mWidth ? mWidth : mHeight; + //auto size = mHeight > mWidth ? mWidth : mHeight; //mModel->updateTransform({mLocation, static_cast(size), static_cast(size)}); mTransformIsDirty = false; } diff --git a/src/rendering/visual_elements/scene/Scene.cpp b/src/rendering/visual_elements/scene/Scene.cpp index 509700f..6fdeec5 100644 --- a/src/rendering/visual_elements/scene/Scene.cpp +++ b/src/rendering/visual_elements/scene/Scene.cpp @@ -7,9 +7,10 @@ #include Scene::Scene() - : mRootNode(std::make_unique()), - mSceneInfo(std::make_unique()), - mBackGroundColor(Color(255, 255, 255)) + : mBackGroundColor(Color(255, 255, 255)), + mRootNode(std::make_unique()), + mSceneInfo(std::make_unique()) + { mRootNode->setName("Scene_RootNode"); } diff --git a/src/rendering/visual_elements/svg/SvgNode.cpp b/src/rendering/visual_elements/svg/SvgNode.cpp index 0cb7774..c8bb98e 100644 --- a/src/rendering/visual_elements/svg/SvgNode.cpp +++ b/src/rendering/visual_elements/svg/SvgNode.cpp @@ -7,139 +7,139 @@ #include "SvgShapeElements.h" SvgNode::SvgNode(const Transform& transform) - : MaterialNode(transform) + : MaterialNode(transform) { } void SvgNode::setContent(std::unique_ptr doc) { - mContent = std::move(doc); - mContentDirty = true; + mContent = std::move(doc); + mContentDirty = true; - mChildren.clear(); - mGeometryNodes.clear(); + mChildren.clear(); + mGeometryNodes.clear(); } unsigned SvgNode::getContentWidth() const { - return mContentWidth; + return mContentWidth; } unsigned SvgNode::getContentHeight() const { - return mContentHeight; + return mContentHeight; } void SvgNode::createOrUpdateGeometry(SceneInfo* sceneInfo) { - if (!mContent->getRoot()) - { - return; - } + if (!mContent->getRoot()) + { + return; + } - auto viewbox = mContent->getViewBox(); + //auto viewbox = mContent->getViewBox(); - for (const auto& svg_element : mContent->getRoot()->getChildren()) - { - std::unique_ptr geom_node; + for (const auto& svg_element : mContent->getRoot()->getChildren()) + { + std::unique_ptr geom_node; - if (svg_element->getTagName() == "circle") - { - onCircle(svg_element.get(), geom_node); - } - else if (svg_element->getTagName() == "path") - { - onPath(svg_element.get(), geom_node); - } + if (svg_element->getTagName() == "circle") + { + onCircle(svg_element.get(), geom_node); + } + else if (svg_element->getTagName() == "path") + { + onPath(svg_element.get(), geom_node); + } - AbstractVisualNode* raw_node{ nullptr }; - if (geom_node) - { - raw_node = geom_node.get(); - mGeometryNodes.push_back(std::move(geom_node)); - } + AbstractVisualNode* raw_node{ nullptr }; + if (geom_node) + { + raw_node = geom_node.get(); + mGeometryNodes.push_back(std::move(geom_node)); + } - if (raw_node) - { - addChild(raw_node); - } - } + if (raw_node) + { + addChild(raw_node); + } + } } void SvgNode::update(SceneInfo* sceneInfo) { - if (mContent && mContentDirty) - { - createOrUpdateGeometry(sceneInfo); - mContentDirty = false; - } + if (mContent && mContentDirty) + { + createOrUpdateGeometry(sceneInfo); + mContentDirty = false; + } - if (mMaterialIsDirty) - { - if (mHasFillColor) - { - for (const auto& geom_node : mGeometryNodes) - { - geom_node->setFillColor(mFillColor); - } - } - else - { - for (const auto& geom_node : mGeometryNodes) - { - geom_node->setHasFillColor(false); - } - } + if (mMaterialIsDirty) + { + if (mHasFillColor) + { + for (const auto& geom_node : mGeometryNodes) + { + geom_node->setFillColor(mFillColor); + } + } + else + { + for (const auto& geom_node : mGeometryNodes) + { + geom_node->setHasFillColor(false); + } + } - if (mHasStrokeColor) - { - for (const auto& geom_node : mGeometryNodes) - { - geom_node->setStrokeColor(mStrokeColor); - } - } - else - { - for (const auto& geom_node : mGeometryNodes) - { - geom_node->setHasStrokeColor(false); - } - } - mMaterialIsDirty = false; - } + if (mHasStrokeColor) + { + for (const auto& geom_node : mGeometryNodes) + { + geom_node->setStrokeColor(mStrokeColor); + } + } + else + { + for (const auto& geom_node : mGeometryNodes) + { + geom_node->setHasStrokeColor(false); + } + } + mMaterialIsDirty = false; + } } void SvgNode::onCircle(XmlElement* element, std::unique_ptr& node) { - auto svg_circle = dynamic_cast(element); - auto loc = svg_circle->getLocation(); - auto radius = svg_circle->getRadius(); - auto minor_radius = radius; + auto svg_circle = dynamic_cast(element); + auto loc = svg_circle->getLocation(); + auto radius = svg_circle->getRadius(); + auto minor_radius = radius; - if (svg_circle->getType() == SvgCircle::Type::ELLIPSE) - { - minor_radius = svg_circle->getMinorRadius(); - } + if (svg_circle->getType() == SvgCircle::Type::ELLIPSE) + { + minor_radius = svg_circle->getMinorRadius(); + } - if (element->hasAttribute("transform")) - { - const auto transform = svg_circle->getTransform(); - loc.move(transform.getLocation().getX(), transform.getLocation().getY()); - radius *= transform.getScaleX(); - minor_radius *= transform.getScaleY(); - } + if (element->hasAttribute("transform")) + { + const auto transform = svg_circle->getTransform(); + loc.move(transform.getLocation().getX(), transform.getLocation().getY()); + radius *= transform.getScaleX(); + minor_radius *= transform.getScaleY(); + } - auto circle_node = std::make_unique(loc, radius); - circle_node->setMinorRadius(minor_radius); - node = std::move(circle_node); + auto circle_node = std::make_unique(loc, radius); + circle_node->setMinorRadius(minor_radius); + node = std::move(circle_node); } void SvgNode::onPath(XmlElement* element, std::unique_ptr& node) { - auto svg_path = dynamic_cast(element); + auto svg_path = dynamic_cast(element); - Point loc; - auto path_node = std::make_unique(loc, svg_path->getPath()); - node = std::move(path_node); -} \ No newline at end of file + Point loc; + auto path_node = std::make_unique(loc, svg_path->getPath()); + node = std::move(path_node); +} diff --git a/src/rendering/visual_elements/svg/SvgPainter.cpp b/src/rendering/visual_elements/svg/SvgPainter.cpp index 7a00294..b63beea 100644 --- a/src/rendering/visual_elements/svg/SvgPainter.cpp +++ b/src/rendering/visual_elements/svg/SvgPainter.cpp @@ -48,7 +48,7 @@ std::unique_ptr SvgPainter::paint(Scene* scene, double width, doubl } } - return std::move(doc); + return doc; } void SvgPainter::paintMesh(SvgDocument* document, SceneModel* model, bool showOutline) const @@ -161,7 +161,6 @@ void SvgPainter::paintCircle(SvgDocument* document, SceneModel* model) const { auto model_circle = dynamic_cast(model->getGeometry()); - auto is_ellipse = model_circle->getMinorRadius() != model_circle->getRadius(); auto circle = std::make_unique(model_circle->isEllipse() ? SvgCircle::Type::ELLIPSE : SvgCircle::Type::REGULAR); circle->setRadius(model_circle->getRadius()); if (model_circle->isEllipse()) @@ -223,5 +222,5 @@ std::unique_ptr SvgPainter::toTransform(const Transform& transform } svg_transform->setValue(ops); - return std::move(svg_transform); + return svg_transform; } diff --git a/src/ui/client/TopBarMenu.h b/src/ui/client/TopBarMenu.h index c0bd28d..c213069 100644 --- a/src/ui/client/TopBarMenu.h +++ b/src/ui/client/TopBarMenu.h @@ -9,7 +9,6 @@ class TopBarMenu : public Widget public: void popupFrom(Widget* parent) { - auto window = parent->getTopLevelWindow(); } diff --git a/src/ui/ui_controls/VerticalSpacer.cpp b/src/ui/ui_controls/VerticalSpacer.cpp index 5137f9b..9343f3a 100644 --- a/src/ui/ui_controls/VerticalSpacer.cpp +++ b/src/ui/ui_controls/VerticalSpacer.cpp @@ -30,7 +30,6 @@ void VerticalSpacer::updateChildLocations() { double scaleSum = std::accumulate(mScales.begin(), mScales.end(), 0.0); double offset = 0; - unsigned delta = mSize.mWidth / unsigned(mChildren.size()); for(std::size_t idx=0; idx MediaResourceManager::getSvgIconNode(Resource::Icon::Sv auto svg_node = std::make_unique(Point(0.0, 0.0)); svg_node->setContent(std::move(svg_doc)); - return std::move(svg_node); -} \ No newline at end of file + return svg_node; +} diff --git a/src/ui/ui_elements/widgets/Widget.cpp b/src/ui/ui_elements/widgets/Widget.cpp index 5196164..e717c0a 100644 --- a/src/ui/ui_elements/widgets/Widget.cpp +++ b/src/ui/ui_elements/widgets/Widget.cpp @@ -21,9 +21,9 @@ Widget::Widget() : BoxGeometry(), mRootNode(std::make_unique()), mChildren(), + mBorder(Theme::Sys::Color::Outline), mBorderThickness(0), mBackground(Theme::Sys::Color::Primary), - mBorder(Theme::Sys::Color::Outline), mVisible(true) { mName = "Widget"; diff --git a/src/ui/windows/managers/DesktopManager.cpp b/src/ui/windows/managers/DesktopManager.cpp index 7b2abb6..cc090e4 100644 --- a/src/ui/windows/managers/DesktopManager.cpp +++ b/src/ui/windows/managers/DesktopManager.cpp @@ -11,10 +11,10 @@ DesktopManager::DesktopManager(AbstractDesktopApp* application) : mScreens(), mKeyboard(Keyboard::Create()), - mUiApplication(application), - mEventManager(EventManager::Create()), mFontsManager(FontsManager::Create()), - mThemeManager(std::make_unique()) + mEventManager(EventManager::Create()), + mThemeManager(std::make_unique()), + mUiApplication(application) { mWindowManager = WindowManager::Create(this); } diff --git a/src/ui/windows/ui_interfaces/x11/XcbEventInterface.cpp b/src/ui/windows/ui_interfaces/x11/XcbEventInterface.cpp index a4e4136..0160682 100644 --- a/src/ui/windows/ui_interfaces/x11/XcbEventInterface.cpp +++ b/src/ui/windows/ui_interfaces/x11/XcbEventInterface.cpp @@ -54,7 +54,7 @@ std::unique_ptr XcbEventInterface::convertButtonPress(xcb_button_pre auto screen_x = static_cast(event->root_x); auto screen_y = static_cast(event->root_y); - ui_event->setScreenLocation(DiscretePoint(x, y)); + ui_event->setScreenLocation(DiscretePoint(screen_x, screen_y)); ui_event->setAction(MouseEvent::Action::Pressed); return ui_event; } @@ -68,7 +68,7 @@ std::unique_ptr XcbEventInterface::convertButtonRelease(xcb_button_p auto screen_x = static_cast(event->root_x); auto screen_y = static_cast(event->root_y); - ui_event->setScreenLocation(DiscretePoint(x, y)); + ui_event->setScreenLocation(DiscretePoint(screen_x, screen_y)); ui_event->setAction(MouseEvent::Action::Released); return ui_event; diff --git a/src/ui/windows/ui_interfaces/x11/XcbGlWindowInterface.cpp b/src/ui/windows/ui_interfaces/x11/XcbGlWindowInterface.cpp index f2d3cad..8e5ef02 100644 --- a/src/ui/windows/ui_interfaces/x11/XcbGlWindowInterface.cpp +++ b/src/ui/windows/ui_interfaces/x11/XcbGlWindowInterface.cpp @@ -55,7 +55,7 @@ bool XcbGlWindowInterface::initialize(xcb_window_t window) return false; } - if (auto context = glXGetCurrentContext()) + if (glXGetCurrentContext()) { MLOG_INFO("Has valid GL context"); } diff --git a/src/ui/windows/ui_interfaces/x11/XcbInterface.cpp b/src/ui/windows/ui_interfaces/x11/XcbInterface.cpp index d103d7e..e84b3aa 100644 --- a/src/ui/windows/ui_interfaces/x11/XcbInterface.cpp +++ b/src/ui/windows/ui_interfaces/x11/XcbInterface.cpp @@ -148,12 +148,12 @@ void XcbInterface::createGraphicsContext() } auto gc = xcb_generate_id(mConnection); - xcb_drawable_t window = xcb_screen->GetNativeScreen()->root; + xcb_drawable_t window = xcb_screen->getNativeScreen()->root; uint32_t mask = XCB_GC_FOREGROUND | XCB_GC_GRAPHICS_EXPOSURES; auto color = Color(240, 240, 240); uint32_t values[2] = {color.getAsUInt32(), 0}; xcb_create_gc(mConnection, gc, window, mask, values); - xcb_screen->SetGraphicsContext(gc); + xcb_screen->setGraphicsContext(gc); } void XcbInterface::mapWindow(mt::Window* window) diff --git a/src/ui/windows/ui_interfaces/x11/XcbScreen.cpp b/src/ui/windows/ui_interfaces/x11/XcbScreen.cpp index 162e30c..2646eaa 100644 --- a/src/ui/windows/ui_interfaces/x11/XcbScreen.cpp +++ b/src/ui/windows/ui_interfaces/x11/XcbScreen.cpp @@ -13,17 +13,17 @@ std::unique_ptr XcbScreen::Create(xcb_screen_t* screen) return std::make_unique(screen); } -xcb_screen_t* XcbScreen::GetNativeScreen() const +xcb_screen_t* XcbScreen::getNativeScreen() const { return mNativeScreen; } -void XcbScreen::SetGraphicsContext(unsigned gc) +void XcbScreen::setGraphicsContext(unsigned gc) { mGraphicsContext = gc; } -unsigned XcbScreen::GetGraphicsContext() const +unsigned XcbScreen::getGraphicsContext() const { return mGraphicsContext; } diff --git a/src/ui/windows/ui_interfaces/x11/XcbScreen.h b/src/ui/windows/ui_interfaces/x11/XcbScreen.h index 1e04d36..9bbc42c 100644 --- a/src/ui/windows/ui_interfaces/x11/XcbScreen.h +++ b/src/ui/windows/ui_interfaces/x11/XcbScreen.h @@ -1,4 +1,4 @@ -#pragma +#pragma once #include "IPlatformScreen.h" @@ -7,18 +7,17 @@ struct xcb_screen_t; class XcbScreen : public IPlatformScreen { public: - XcbScreen(xcb_screen_t* screen); virtual ~XcbScreen() = default; static std::unique_ptr Create(xcb_screen_t* screen); - xcb_screen_t* GetNativeScreen() const; + unsigned getGraphicsContext() const; - void SetGraphicsContext(unsigned gc); + xcb_screen_t* getNativeScreen() const; - unsigned GetGraphicsContext() const; + void setGraphicsContext(unsigned gc); private: unsigned mGraphicsContext {0}; diff --git a/src/ui/windows/ui_interfaces/x11/XcbWindow.cpp b/src/ui/windows/ui_interfaces/x11/XcbWindow.cpp index d2ffad5..66f1177 100644 --- a/src/ui/windows/ui_interfaces/x11/XcbWindow.cpp +++ b/src/ui/windows/ui_interfaces/x11/XcbWindow.cpp @@ -40,9 +40,9 @@ void XcbWindow::add(mt::Window* window, xcb_connection_t* connection, mt::Screen const auto hwnd = xcb_generate_id(connection); const uint32_t mask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK; - const uint32_t values[2] = {xcb_screen->GetNativeScreen()->white_pixel, eventMask}; + const uint32_t values[2] = {xcb_screen->getNativeScreen()->white_pixel, eventMask}; - xcb_window_t parent_hwnd = xcb_screen->GetNativeScreen()->root; + xcb_window_t parent_hwnd = xcb_screen->getNativeScreen()->root; if (auto parent = window->getParent()) { parent_hwnd = dynamic_cast(parent->getPlatformWindow())->getHandle(); @@ -56,7 +56,7 @@ void XcbWindow::add(mt::Window* window, xcb_connection_t* connection, mt::Screen window->getWidth(), window->getHeight(), /* width, height */ 10, /* border_width */ XCB_WINDOW_CLASS_INPUT_OUTPUT, /* class */ - xcb_screen->GetNativeScreen()->root_visual, /* visual */ + xcb_screen->getNativeScreen()->root_visual, /* visual */ mask, values ); /* masks */ if (!window->getTitle().empty()) @@ -68,7 +68,7 @@ void XcbWindow::add(mt::Window* window, xcb_connection_t* connection, mt::Screen auto xcb_window = std::make_unique(window, hwnd, connection, xcbGlInterface); - const auto drawing_mode = xcbGlInterface ? DrawingMode::GRAPH : DrawingMode::RASTER; + //const auto drawing_mode = xcbGlInterface ? DrawingMode::GRAPH : DrawingMode::RASTER; window->setPlatformWindow(std::move(xcb_window)); } @@ -98,7 +98,7 @@ void XcbWindow::beforePaint(mt::Screen* screen) auto xcb_screen = dynamic_cast(screen->GetPlatformScreen()); if (!mBackingImage) { - mBackingImage = std::make_unique(mConnection, mWindow, xcb_screen->GetNativeScreen()); + mBackingImage = std::make_unique(mConnection, mWindow, xcb_screen->getNativeScreen()); } } } @@ -112,9 +112,9 @@ void XcbWindow::afterPaint(mt::Screen* screen) else { auto xcb_screen = dynamic_cast(screen->GetPlatformScreen()); - mBackingImage->update(mWindow, xcb_screen->GetNativeScreen(), mConnection, xcb_screen->GetGraphicsContext()); + mBackingImage->update(mWindow, xcb_screen->getNativeScreen(), mConnection, xcb_screen->getGraphicsContext()); - xcb_copy_area(mConnection, mBackingImage->getPixMap(), mHandle, xcb_screen->GetGraphicsContext(), 0, 0 ,0 , 0, mWindow->getWidth(), mWindow->getHeight()); + xcb_copy_area(mConnection, mBackingImage->getPixMap(), mHandle, xcb_screen->getGraphicsContext(), 0, 0 ,0 , 0, mWindow->getWidth(), mWindow->getHeight()); } } diff --git a/src/web/markdown/MarkdownConverter.cpp b/src/web/markdown/MarkdownConverter.cpp index 89ac251..f596266 100644 --- a/src/web/markdown/MarkdownConverter.cpp +++ b/src/web/markdown/MarkdownConverter.cpp @@ -109,6 +109,6 @@ std::unique_ptr MarkdownConverter::convert(MarkdownDocument* markd auto body_element = html_doc->getBodyElement(); convert(markdownDoc, body_element); - return std::move(html_doc); + return html_doc; } diff --git a/src/web/markdown/MarkdownParser.cpp b/src/web/markdown/MarkdownParser.cpp index ff6ea16..3bed177 100644 --- a/src/web/markdown/MarkdownParser.cpp +++ b/src/web/markdown/MarkdownParser.cpp @@ -401,5 +401,5 @@ std::unique_ptr MarkdownParser::run(const std::string& content run(content, doc.get()); - return std::move(doc); + return doc; } diff --git a/test/compression/TestHuffmanStream.cpp b/test/compression/TestHuffmanStream.cpp index 1dffe8c..440282d 100644 --- a/test/compression/TestHuffmanStream.cpp +++ b/test/compression/TestHuffmanStream.cpp @@ -22,10 +22,10 @@ TEST_CASE(TestHuffmanCodeLengthTable, "compression") table.buildCompressedLengthSequence(); auto compressed_sequence = table.getCompressedLengthSequence(); - for (auto entry : compressed_sequence) - { + //for (auto entry : compressed_sequence) + //{ // std::cout << "Count " << entry.first << " extra bits " << entry.second << std::endl; - } + //} auto compressed_lengths = table.getCompressedLengthCounts(); for(unsigned idx = 0; idx(next_char) << std::endl; - } + //} HuffmanEncoder huffman_encoder; huffman_encoder.initializeTrees(hit_buffer); diff --git a/test/core/TestBitStream.cpp b/test/core/TestBitStream.cpp index 007f13f..a235dd7 100644 --- a/test/core/TestBitStream.cpp +++ b/test/core/TestBitStream.cpp @@ -37,6 +37,7 @@ TEST_CASE(TestReadBitStream, "core") valid = stream.readNextNBits(3, buffer); //std::cout << "Slice3 is " << ByteUtils::toString(buffer) << std::endl; + REQUIRE(valid); } TEST_CASE(TestWritingBitStream, "core") diff --git a/test/core/TestByteUtils.cpp b/test/core/TestByteUtils.cpp index da52cbf..8032c63 100644 --- a/test/core/TestByteUtils.cpp +++ b/test/core/TestByteUtils.cpp @@ -14,6 +14,7 @@ TEST_CASE(TestReadByteUtils, "core") auto slice = ByteUtils::getMBitsAtN(byte, 3, 3); //std::cout << "Slice is " << ByteUtils::toString(slice) << std::endl; + (void) slice; uint32_t input {12345678}; auto byte0 = ByteUtils::getByteN(input, 0); @@ -21,6 +22,11 @@ TEST_CASE(TestReadByteUtils, "core") auto byte2 = ByteUtils::getByteN(input, 2); auto byte3 = ByteUtils::getByteN(input, 3); + (void)byte0; + (void)byte1; + (void)byte2; + (void)byte3; + //std::cout << "Byte0 is " << ByteUtils::toString(byte0) << std::endl; //std::cout << "Byte1 is " << ByteUtils::toString(byte1) << std::endl; //std::cout << "Byte2 is " << ByteUtils::toString(byte2) << std::endl; @@ -28,10 +34,11 @@ TEST_CASE(TestReadByteUtils, "core") //std::cout << "Mirroring" << std::endl; - auto out = ByteUtils::mirror(byte); + //auto out = ByteUtils::mirror(byte); //std::cout << "Mirror is " << ByteUtils::toString(out) << std::endl; unsigned hold = byte; hold = (hold << 5) + 3; + (void)hold; //std::cout << "Big val is " << ByteUtils::toString(hold, 16) << std::endl; } diff --git a/test/core/TestDataStructures.cpp b/test/core/TestDataStructures.cpp index 8533081..d6720b8 100644 --- a/test/core/TestDataStructures.cpp +++ b/test/core/TestDataStructures.cpp @@ -18,17 +18,20 @@ TEST_CASE(TestCircleBuffer, "core") { auto item = buffer.getItem(idx); //std::cout << "Got item: " << idx << " " << item << std::endl; + (void)item; } for (auto item : {4, 5}) { //std::cout << "Add item: " << item << std::endl; //buffer.addItem(item); + (void)item; } for (std::size_t idx=0; idx<3; idx++) { auto item = buffer.getItem(idx); //std::cout << "Got item: " << idx << " " << item << std::endl; + (void)item; } } diff --git a/test/core/TestTomlReader.cpp b/test/core/TestTomlReader.cpp index e081e17..515dd81 100644 --- a/test/core/TestTomlReader.cpp +++ b/test/core/TestTomlReader.cpp @@ -12,8 +12,8 @@ TEST_CASE(TestTomlReader, "core") REQUIRE(themes_table); - for (const auto& items : themes_table->getKeyValuePairs()) - { + //for (const auto& items : themes_table->getKeyValuePairs()) + //{ //std::cout << "Got entry with key: " << items.first << " and val " << items.second << std::endl; - } + //} } diff --git a/test/test_runner.cpp b/test/test_runner.cpp index a039331..b2cb3f7 100644 --- a/test/test_runner.cpp +++ b/test/test_runner.cpp @@ -16,7 +16,7 @@ int main(int argc, char *argv[]) auto args = CommandLineArgs::Create(); args->process(argc, argv); - auto result = TestCaseRunner::getInstance().run(args->getUserArgs()); + TestCaseRunner::getInstance().run(args->getUserArgs()); #ifdef _WIN32 CoUninitialize(); diff --git a/test/test_utils/TestCase.h b/test/test_utils/TestCase.h index 84ad8be..1a01a45 100644 --- a/test/test_utils/TestCase.h +++ b/test/test_utils/TestCase.h @@ -10,9 +10,9 @@ public: using TestCaseFunction = std::function; TestCase(const std::string& name, const std::string& tags, TestCaseFunction func) - : mName(name), - mTags(tags), - mTestFunction(func) + : mTestFunction(func), + mName(name), + mTags(tags) { }; diff --git a/test/ui_test_runner.cpp b/test/ui_test_runner.cpp index 64961d3..5ea713d 100644 --- a/test/ui_test_runner.cpp +++ b/test/ui_test_runner.cpp @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) #endif TestCaseRunner::getInstance().setTestApplication(gui_app.get()); - auto result = TestCaseRunner::getInstance().run(user_args); + TestCaseRunner::getInstance().run(user_args); #ifdef _WIN32 CoUninitialize();