medvedych/harbour-books
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

[fbreader] Fixed a few compilation warnings

Browse source
This commit is contained in:
Slava Monich 2021-11-01 01:33:32 +02:00
parent 2d6ff29452
commit 73523c041c
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fbreader/fbreader/fbreader/src/formats/oeb/OCFContainerReader.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2015 Slava Monich <slava.monich@jolla.com> * Copyright (C) 2015-2021 Slava Monich <slava.monich@jolla.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -50,7 +50,7 @@ void OCFContainerReader::startElementHandler(const char *tag, const char **attr)
} }
} }
} }
/* no break */ /* fallthrough */
default: default:
myStateStack.push(STATE_IGNORE); myStateStack.push(STATE_IGNORE);
break; break;

8
fbreader/fbreader/zlibrary/text/src/hyphenation/ZLTextHyphenator.h
View file

@ -1,5 +1,6 @@
/* /*
* Copyright (C) 2004-2010 Geometer Plus <contact@geometerplus.com> * Copyright (C) 2004-2010 Geometer Plus <contact@geometerplus.com>
* Copyright (C) 2021 Slava Monich <slava.monich@jolla.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -30,11 +31,12 @@ class ZLTextHyphenationInfo {
private: private:
ZLTextHyphenationInfo(int length); ZLTextHyphenationInfo(int length);
const ZLTextHyphenationInfo &operator = (ZLTextHyphenationInfo &info); const ZLTextHyphenationInfo &operator = (const ZLTextHyphenationInfo &info);
public: public:
ZLTextHyphenationInfo(const ZLTextHyphenationInfo &info) : myMask(info.myMask) { }
~ZLTextHyphenationInfo() {} ~ZLTextHyphenationInfo() {}
bool isHyphenationPossible(size_t position); bool isHyphenationPossible(size_t position) const;
private: private:
std::vector<unsigned char> myMask; std::vector<unsigned char> myMask;
@ -70,7 +72,7 @@ protected:
inline ZLTextHyphenationInfo::ZLTextHyphenationInfo(int length) : myMask(length - 1, false) { inline ZLTextHyphenationInfo::ZLTextHyphenationInfo(int length) : myMask(length - 1, false) {
} }
inline bool ZLTextHyphenationInfo::isHyphenationPossible(size_t position) { inline bool ZLTextHyphenationInfo::isHyphenationPossible(size_t position) const {
return (position < myMask.size()) && myMask[position]; return (position < myMask.size()) && myMask[position];
} }