From efcc6659afa5df87c9b908f2e3b93b0278ae5504 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 6 Feb 2012 17:32:11 +0100 Subject: [PATCH] removing warning act 3 before changing Wsing-compare errors --- src/frameworks/UBFileSystemUtils.cpp | 4 +++- src/pdf-merger/LZWDecode.cpp | 7 +++++-- src/pdf-merger/LZWDecode.h | 2 +- src/pdf-merger/OverlayDocumentParser.cpp | 7 ++++++- src/pdf-merger/OverlayDocumentParser.h | 2 +- src/pdf-merger/Page.cpp | 2 +- src/pdf-merger/Rectangle.cpp | 6 +++--- src/pdf-merger/Rectangle.h | 2 +- src/pdf-merger/RotationHandler.h | 4 +++- src/pdf-merger/Utils.cpp | 3 +++ 10 files changed, 27 insertions(+), 12 deletions(-) diff --git a/src/frameworks/UBFileSystemUtils.cpp b/src/frameworks/UBFileSystemUtils.cpp index 5be2c1f8..97a7d157 100644 --- a/src/frameworks/UBFileSystemUtils.cpp +++ b/src/frameworks/UBFileSystemUtils.cpp @@ -16,10 +16,12 @@ #include "UBFileSystemUtils.h" #include +#include "globals/UBGlobals.h" +THIRD_PARTY_WARNINGS_DISABLE #include "quazipfile.h" - #include +THIRD_PARTY_WARNINGS_ENABLE #include "core/memcheck.h" diff --git a/src/pdf-merger/LZWDecode.cpp b/src/pdf-merger/LZWDecode.cpp index c1b5a21a..0669dd7b 100644 --- a/src/pdf-merger/LZWDecode.cpp +++ b/src/pdf-merger/LZWDecode.cpp @@ -13,6 +13,7 @@ * along with this program. If not, see . */ #include +#include #include "LZWDecode.h" #include "FilterPredictor.h" @@ -31,8 +32,9 @@ LZWDecode::LZWDecode(): _readBits(0), _nextCode(0), _bitsToRead(0), - _curSequenceLength(0), - _first(true) + _first(true), + _curSequenceLength(0) + { clearTable(); } @@ -46,6 +48,7 @@ LZWDecode::~LZWDecode() bool LZWDecode::encode(std::string & decoded) { + Q_UNUSED(decoded); return true; } diff --git a/src/pdf-merger/LZWDecode.h b/src/pdf-merger/LZWDecode.h index e76d2b65..6d3d3cf8 100644 --- a/src/pdf-merger/LZWDecode.h +++ b/src/pdf-merger/LZWDecode.h @@ -37,8 +37,8 @@ namespace merge_lib void clearTable(); int getCode(); - std::string &_encoded; std::string _dummy; + std::string &_encoded; size_t _curSymbolIndex; int _earlyChange; // early parameter diff --git a/src/pdf-merger/OverlayDocumentParser.cpp b/src/pdf-merger/OverlayDocumentParser.cpp index 379b63cd..91bf4293 100644 --- a/src/pdf-merger/OverlayDocumentParser.cpp +++ b/src/pdf-merger/OverlayDocumentParser.cpp @@ -15,6 +15,7 @@ #include "OverlayDocumentParser.h" #include #include +#include #include "Exception.h" #include "Object.h" @@ -74,7 +75,6 @@ void OverlayDocumentParser::_readXRefAndCreateObjects() notEndOfFile = false; } - unsigned long toReadAgain = 0; for(objIter = objectsAndPositions.begin(); objIter != objectsAndPositions.end(); ) { if((objectsAndSizes[objIter->first] + objIter->second <= nextPartStart) && (objIter->second >= partStart) && ((objIter->second < nextPartStart))) @@ -100,6 +100,11 @@ void OverlayDocumentParser::_readXRefAndCreateObjects() while(notEndOfFile); } +void OverlayDocumentParser::_getFileContent(const char * fileName) +{ + Q_UNUSED(fileName); +} + void OverlayDocumentParser::_getPartOfFileContent(long startOfPart, unsigned int length) { ifstream pdfFile; diff --git a/src/pdf-merger/OverlayDocumentParser.h b/src/pdf-merger/OverlayDocumentParser.h index fbba57da..d2fa7aec 100644 --- a/src/pdf-merger/OverlayDocumentParser.h +++ b/src/pdf-merger/OverlayDocumentParser.h @@ -38,7 +38,7 @@ namespace merge_lib private: //methods - void _getFileContent(const char * fileName){}; + void _getFileContent(const char * fileName); void _readXRefAndCreateObjects(); void _readXref(std::map & objectsAndSizes); void _getPartOfFileContent(long startOfPart, unsigned int length); diff --git a/src/pdf-merger/Page.cpp b/src/pdf-merger/Page.cpp index 6f3de10f..3cb7c18b 100644 --- a/src/pdf-merger/Page.cpp +++ b/src/pdf-merger/Page.cpp @@ -37,7 +37,7 @@ using namespace merge_lib; -Page::Page(unsigned int pageNumber): _pageNumber(pageNumber),_root(NULL), _rotation(0) +Page::Page(unsigned int pageNumber): _root(NULL),_pageNumber(pageNumber), _rotation(0) { } diff --git a/src/pdf-merger/Rectangle.cpp b/src/pdf-merger/Rectangle.cpp index be7c02b5..7fe82696 100644 --- a/src/pdf-merger/Rectangle.cpp +++ b/src/pdf-merger/Rectangle.cpp @@ -24,21 +24,21 @@ using namespace merge_lib; Rectangle::Rectangle(const char * rectangleName): -_rectangleName(rectangleName), x1(0), y1(0), x2(0), y2(0), +_rectangleName(rectangleName), _tm() {} Rectangle::Rectangle(const char * rectangleName, const std::string content): -_rectangleName(rectangleName), x1(0), y1(0), x2(0), -y2(0) +y2(0), +_rectangleName(rectangleName) { unsigned int rectanglePosition = Parser::findToken(content,rectangleName); diff --git a/src/pdf-merger/Rectangle.h b/src/pdf-merger/Rectangle.h index d0484a1d..8941333a 100644 --- a/src/pdf-merger/Rectangle.h +++ b/src/pdf-merger/Rectangle.h @@ -40,7 +40,7 @@ namespace merge_lib double getHeight(); //members - double x1, x2, y1, y2; + double x1, y1, x2, y2; private: //methods const std::string _getRectangleAsString(const char * delimeter); diff --git a/src/pdf-merger/RotationHandler.h b/src/pdf-merger/RotationHandler.h index 285063c9..7b06ae0c 100644 --- a/src/pdf-merger/RotationHandler.h +++ b/src/pdf-merger/RotationHandler.h @@ -15,6 +15,8 @@ #if !defined RotationHandler_h #define RotationHandler_h +#include + #include "PageElementHandler.h" #include "Page.h" @@ -55,7 +57,7 @@ namespace merge_lib strin>>rotation; _basePage.setRotation(rotation); } - virtual void _changeObjectContent(unsigned int startOfPageElement) {}; + virtual void _changeObjectContent(unsigned int startOfPageElement) {Q_UNUSED(startOfPageElement);}; //members Page & _basePage; diff --git a/src/pdf-merger/Utils.cpp b/src/pdf-merger/Utils.cpp index 74b056a4..7f117af8 100644 --- a/src/pdf-merger/Utils.cpp +++ b/src/pdf-merger/Utils.cpp @@ -12,6 +12,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + +#include #include "Config.h" #include "Utils.h" #include "Exception.h" @@ -101,6 +103,7 @@ bool Utils::doubleEquals(const double left, const double right, const double eps double Utils::normalizeValue(double &val, const double epsilon ) { + Q_UNUSED(epsilon); if( Utils::doubleEquals(val,0)) { val = 0;