diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-20 08:22:15 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-20 10:36:50 (GMT) |
| commit | 5fa19cbf945f43146f2b0e0f93da53fec27fd543 (patch) | |
| tree | 9906406fc967f9510d647415ab7d4dbd24b67e1e /src/gui/image | |
| parent | c7c7b364d9816d03c7475d6592d50dec5401c151 (diff) | |
| download | Qt-5fa19cbf945f43146f2b0e0f93da53fec27fd543.zip Qt-5fa19cbf945f43146f2b0e0f93da53fec27fd543.tar.gz Qt-5fa19cbf945f43146f2b0e0f93da53fec27fd543.tar.bz2 | |
Remove a few warnings when compiling Qt and unexport some functions.
Make some functions static that are not used anywhere but in the
current file. Others that are used, add the declaration to the _p.h to
ensure we don't forget about them.
Finally, there's no need to enable debugging code if it's not used
anywhere.
Reviewed-by: TrustMe
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qbmphandler.cpp | 8 | ||||
| -rw-r--r-- | src/gui/image/qiconloader_p.h | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp index ccf8457..19701b4 100644 --- a/src/gui/image/qbmphandler.cpp +++ b/src/gui/image/qbmphandler.cpp @@ -81,14 +81,14 @@ static void swapPixel01(QImage *image) // 1-bpp: swap 0 and 1 pixels const int BMP_FILEHDR_SIZE = 14; // size of BMP_FILEHDR data -QDataStream &operator>>(QDataStream &s, BMP_FILEHDR &bf) +static QDataStream &operator>>(QDataStream &s, BMP_FILEHDR &bf) { // read file header s.readRawData(bf.bfType, 2); s >> bf.bfSize >> bf.bfReserved1 >> bf.bfReserved2 >> bf.bfOffBits; return s; } -QDataStream &operator<<(QDataStream &s, const BMP_FILEHDR &bf) +static QDataStream &operator<<(QDataStream &s, const BMP_FILEHDR &bf) { // write file header s.writeRawData(bf.bfType, 2); s << bf.bfSize << bf.bfReserved1 << bf.bfReserved2 << bf.bfOffBits; @@ -106,7 +106,7 @@ const int BMP_RLE4 = 2; // run-length encoded, 4 const int BMP_BITFIELDS = 3; // RGB values encoded in data as bit-fields -QDataStream &operator>>(QDataStream &s, BMP_INFOHDR &bi) +static QDataStream &operator>>(QDataStream &s, BMP_INFOHDR &bi) { s >> bi.biSize; if (bi.biSize == BMP_WIN || bi.biSize == BMP_OS2) { @@ -128,7 +128,7 @@ QDataStream &operator>>(QDataStream &s, BMP_INFOHDR &bi) return s; } -QDataStream &operator<<(QDataStream &s, const BMP_INFOHDR &bi) +static QDataStream &operator<<(QDataStream &s, const BMP_INFOHDR &bi) { s << bi.biSize; s << bi.biWidth << bi.biHeight; diff --git a/src/gui/image/qiconloader_p.h b/src/gui/image/qiconloader_p.h index b2944ef..5d5c211 100644 --- a/src/gui/image/qiconloader_p.h +++ b/src/gui/image/qiconloader_p.h @@ -85,6 +85,7 @@ struct QIconDirInfo class QIconLoaderEngineEntry { public: + virtual ~QIconLoaderEngineEntry() {} virtual QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) = 0; |