Skip to content

Commit 429c6a1

Browse files
u-235u-235
committed
Tools: apply IWYU
1 parent d860aa4 commit 429c6a1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+800
-676
lines changed

‎lib/libebook/ebook.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
1818

19-
#include <QString>
19+
#include <QString> // for QString
2020

21-
#include "ebook.h" // EBook
22-
#include "ebook_chm.h" // EBook_CHM
23-
#include "ebook_epub.h" // EBook_EPUB
21+
#include "ebook.h"
22+
#include "ebook_chm.h" // for EBook_CHM
23+
#include "ebook_epub.h" // for EBook_EPUB
2424

2525

2626
EBook::EBook()

‎lib/libebook/ebook.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
#ifndef INCLUDE_EBOOK_H
2020
#define INCLUDE_EBOOK_H
2121

22-
#include <QList>
23-
#include <QString>
24-
#include <QUrl>
22+
#include <QList> // for QList
23+
#include <QString> // for QString
24+
#include <QUrl> // for QUrl
2525

2626
class QByteArray;
2727

‎lib/libebook/ebook_chm.cpp‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,26 @@
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
1818

19-
#include <cstddef> // size_t
20-
#include <cstdio> // fprintf
21-
22-
#include <QByteArray>
23-
#include <QFile>
24-
#include <QList>
25-
#include <QString>
26-
#include <Qt> // CaseInsensitive
27-
#include <QtGlobal> // qPrintable, qDebug, qFatal, qWarning
28-
#include <QTextCodec>
29-
#include <QVector>
30-
#include <QUrl>
31-
32-
#include "bitfiddle.h" // UINT16ARRAY, UINT32ARRAY, get_int32_le
33-
// ebook.h -> EBook, EBookIndexEntry, EBookTocEntry
34-
// chm_lib.h -> chmUnitInfo, LONGUINT64, EBook_CHM, ParsedEntry
19+
#include <cstddef> // for NULL, size_t
20+
#include <cstdlib> // for getenv
21+
#include <new> // for operator new
22+
#include <utility> // for move
23+
24+
#include <QByteArray> // for QByteArray, operator+, operator==, QByteRef
25+
#include <QChar> // for operator==, QChar, operator!=
26+
#include <QFile> // for QFile
27+
#include <QList> // for QList
28+
#include <QString> // for QString, QCharRef, operator+, operator!=
29+
#include <QTextCodec> // for QTextCodec
30+
#include <QUrl> // for QUrl
31+
#include <QVector> // for QVector
32+
#include <Qt> // for CaseInsensitive
33+
#include <QtGlobal> // for qWarning, qPrintable, qMakeForeachContainer, qFatal, Q_FOREACH, qMin
34+
35+
#include "bitfiddle.h" // for get_int32_le, UINT32ARRAY, UINT16ARRAY
3536
#include "ebook_chm.h"
36-
#include "ebook_chm_encoding.h" // Ebook_CHM_Encoding
37-
#include "helper_entitydecoder.h" // HelperEntityDecoder
37+
#include "ebook_chm_encoding.h" // for Ebook_CHM_Encoding
38+
#include "helper_entitydecoder.h" // for HelperEntityDecoder
3839

3940

4041
// Big-enough buffer size for use with various routines.

‎lib/libebook/ebook_chm.h‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,24 @@
2121

2222
#include <cstddef> // size_t
2323

24-
#include <QByteArray>
25-
#include <QList>
26-
#include <QMap>
27-
#include <QString>
28-
#include <QTextCodec>
29-
#include <QtGlobal> // qPrintable
30-
#include <QUrl>
24+
#include <QByteArray> // for QByteArray
25+
#include <QList> // for QList
26+
#include <QMap> // for QMap
27+
#include <QString> // for QString
28+
#include <QTextCodec> // for QTextCodec
29+
#include <QUrl> // for QUrl
30+
#include <QtGlobal> // for qPrintable
3131

3232
// Enable Unicode use in libchm
3333
#if defined (WIN32)
3434
#define PPC_BSTR
3535
#endif
3636

37-
#include "ebook.h" // EBook
38-
#include <chm_lib.h> // chmUnitInfo, LONGUINT64
39-
#include "helper_entitydecoder.h" // HelperEntityDecoder
37+
#include "ebook.h" // for EBookTocEntry (ptr only), EBook, EBook::Feature, EBookIndexEntry (ptr only)
38+
#include <chm_lib.h> // for chmUnitInfo, LONGINT64, LONGUINT64
39+
#include "helper_entitydecoder.h" // for HelperEntityDecoder
40+
41+
struct chmFile;
4042

4143

4244
class EBook_CHM : public EBook

‎lib/libebook/ebook_chm_encoding.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
1818

19-
#include <QString>
19+
#include <QString> // for QString
2020

2121
#include "ebook_chm_encoding.h"
2222

‎lib/libebook/ebook_epub.cpp‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,25 @@
2323
#include <unistd.h>
2424
#endif
2525

26-
#include <QByteArray>
27-
#include <QIODevice>
28-
#include <QList>
29-
#include <QMessageBox>
30-
#include <QString>
31-
#include <QtGlobal> // qPrintable, qDebug, qWarning
32-
#include <QUrl>
33-
#include <QXmlDefaultHandler>
34-
#include <QXmlSimpleReader>
35-
#include <QXmlInputSource>
36-
37-
#include "zip.h"
38-
39-
// ebook.h -> EBook, EBookIndexEntry, EBookTocEntry, EBook_EPUB
26+
#include <QByteArray> // for QByteArray
27+
#include <QChar> // for operator==, QChar
28+
#include <QIODevice> // for QIODevice, QIODevice::ReadOnly
29+
#include <QList> // for QList
30+
#include <QMessageBox> // for QMessageBox
31+
#include <QString> // for QString, operator+, operator<
32+
#include <QUrl> // for QUrl
33+
#include <QXmlDefaultHandler> // for QXmlDefaultHandler
34+
#include <QXmlInputSource> // for QXmlInputSource
35+
#include <QXmlSimpleReader> // for QXmlSimpleReader
36+
#include <QtGlobal> // for qMakeForeachContainer, qPrintable, Q_FOREACH, qWarning, qDebug
37+
38+
#include <zip.h> // for zip_stat, zip_fclose, zip_close, zip_fdopen, zip_fopen_index, zip_fread, ZIP_STAT_INDEX, ZIP_STAT_SIZE
39+
4040
#include "ebook_epub.h"
41-
#include "helperxmlhandler_epubcontainer.h" // HelperXmlHandler_EpubContainer
42-
#include "helperxmlhandler_epubcontent.h" // HelperXmlHandler_EpubContent
43-
#include "helperxmlhandler_epubtoc.h" // HelperXmlHandler_EpubTOC
41+
#include "helperxmlhandler_epubcontainer.h" // for HelperXmlHandler_EpubContainer
42+
#include "helperxmlhandler_epubcontent.h" // for HelperXmlHandler_EpubContent
43+
#include "helperxmlhandler_epubtoc.h" // for HelperXmlHandler_EpubTOC
44+
4445

4546
const char* EBook_EPUB::URL_SCHEME_EPUB = "epub";
4647

‎lib/libebook/ebook_epub.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919
#ifndef EBOOK_EPUB_H
2020
#define EBOOK_EPUB_H
2121

22-
#include <QFile>
23-
#include <QList>
24-
#include <QMap>
25-
#include <QString>
26-
#include <QUrl>
22+
#include <QFile> // for QFile
23+
#include <QList> // for QList
24+
#include <QMap> // for QMap
25+
#include <QString> // for QString
26+
#include <QUrl> // for QUrl
2727

28-
#include "ebook.h"
28+
#include "ebook.h" // for EBookTocEntry, EBook, EBook::Feature, EBookIndexEntry (ptr only)
2929

30+
class QByteArray;
3031
class QXmlDefaultHandler;
31-
struct zip;
3232

3333

3434
class EBook_EPUB : public EBook

‎lib/libebook/ebook_search.cpp‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,19 @@
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
1818

19-
#include <QApplication>
20-
#include <QChar>
21-
#include <QDataStream>
22-
#include <QEventLoop> // QEventLoop::ExcludeUserInputEvents
23-
#include <QList>
24-
#include <QObject> // QObject::connect
25-
#include <Qt> // Qt::CaseInsensitive
26-
#include <QString>
27-
#include <QStringList>
28-
#include <QUrl>
29-
30-
#include "ebook.h" // EBook
19+
#include <QApplication> // for QApplication, qApp
20+
#include <QChar> // for QChar, operator==
21+
#include <QEventLoop> // for QEventLoop, QEventLoop::ExcludeUserInputEvents
22+
#include <QList> // for QList, QList<>::iterator
23+
#include <QObject> // for emit, SIGNAL, SLOT
24+
#include <QString> // for QString
25+
#include <QStringList> // for QStringList
26+
#include <QUrl> // for QUrl
27+
#include <Qt> // for CaseInsensitive
28+
29+
#include "ebook.h" // for EBook
3130
#include "ebook_search.h"
32-
#include "helper_search_index.h" // QtAs::Index
31+
#include "helper_search_index.h" // for Index
3332

3433

3534
// Helper class to simplity state management and data keeping

‎lib/libebook/ebook_search.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
#ifndef EBookSearch_H
2020
#define EBookSearch_H
2121

22-
#include <QStringList>
23-
#include <QObject>
22+
#include <QObject> // for slots, QObject, Q_OBJECT, signals
23+
#include <QString> // for QString
24+
#include <QStringList> // for QStringList
2425

2526
class QDataStream;
2627
template<typename T> class QList;
@@ -31,6 +32,7 @@ namespace QtAs {
3132
class Index;
3233
}
3334

35+
3436
class EBookSearch : public QObject
3537
{
3638
Q_OBJECT

‎lib/libebook/helper_entitydecoder.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
1818

19-
#include <QChar>
20-
#include <QByteArray>
21-
#include <QString>
22-
#include <QTextCodec>
23-
#include <QtGlobal> // qPrintable, qWarning
19+
#include <utility> // for move
20+
21+
#include <QByteArray> // for QByteArray
22+
#include <QChar> // for QChar, operator==
23+
#include <QString> // for QString, operator<
24+
#include <QTextCodec> // for QTextCodec
25+
#include <QtGlobal> // for qPrintable, qWarning
2426

2527
#include "helper_entitydecoder.h"
2628

0 commit comments

Comments
 (0)