diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-07-04 09:24:25 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-07-04 09:26:35 (GMT) |
commit | 4cdd831191a22604486fa895c57532f319a56b96 (patch) | |
tree | cd451d1b5b40b47b21fd78bab940ce538736e5d4 /src/gui/image | |
parent | 306db146152c7b01b86fa7588be9941c47daead3 (diff) | |
download | Qt-4cdd831191a22604486fa895c57532f319a56b96.zip Qt-4cdd831191a22604486fa895c57532f319a56b96.tar.gz Qt-4cdd831191a22604486fa895c57532f319a56b96.tar.bz2 |
make image handler includes private
now that they live in gui/image/ instead of plugins/imageformats/, the
handlers need to get the usual _p suffix.
Diffstat (limited to 'src/gui/image')
-rw-r--r-- | src/gui/image/qgifhandler.cpp | 2 | ||||
-rw-r--r-- | src/gui/image/qgifhandler.pri | 2 | ||||
-rw-r--r-- | src/gui/image/qgifhandler_p.h (renamed from src/gui/image/qgifhandler.h) | 6 | ||||
-rw-r--r-- | src/gui/image/qimagereader.cpp | 8 | ||||
-rw-r--r-- | src/gui/image/qimagewriter.cpp | 8 | ||||
-rw-r--r-- | src/gui/image/qjpeghandler.cpp | 2 | ||||
-rw-r--r-- | src/gui/image/qjpeghandler.pri | 2 | ||||
-rw-r--r-- | src/gui/image/qjpeghandler_p.h (renamed from src/gui/image/qjpeghandler.h) | 6 | ||||
-rw-r--r-- | src/gui/image/qmnghandler.cpp | 2 | ||||
-rw-r--r-- | src/gui/image/qmnghandler.pri | 2 | ||||
-rw-r--r-- | src/gui/image/qmnghandler_p.h (renamed from src/gui/image/qmnghandler.h) | 6 | ||||
-rw-r--r-- | src/gui/image/qtiffhandler.cpp | 2 | ||||
-rw-r--r-- | src/gui/image/qtiffhandler.pri | 2 | ||||
-rw-r--r-- | src/gui/image/qtiffhandler_p.h (renamed from src/gui/image/qtiffhandler.h) | 6 |
14 files changed, 28 insertions, 28 deletions
diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp index 129a11b..124d27b 100644 --- a/src/gui/image/qgifhandler.cpp +++ b/src/gui/image/qgifhandler.cpp @@ -44,7 +44,7 @@ ** ****************************************************************************/ -#include "qgifhandler.h" +#include "qgifhandler_p.h" #include <qimage.h> #include <qiodevice.h> diff --git a/src/gui/image/qgifhandler.pri b/src/gui/image/qgifhandler.pri index 003476a..6eb0751 100644 --- a/src/gui/image/qgifhandler.pri +++ b/src/gui/image/qgifhandler.pri @@ -1,4 +1,4 @@ # common to plugin and built-in forms INCLUDEPATH *= $$PWD -HEADERS += $$PWD/qgifhandler.h +HEADERS += $$PWD/qgifhandler_p.h SOURCES += $$PWD/qgifhandler.cpp diff --git a/src/gui/image/qgifhandler.h b/src/gui/image/qgifhandler_p.h index 8e07aff..b2a9725 100644 --- a/src/gui/image/qgifhandler.h +++ b/src/gui/image/qgifhandler_p.h @@ -44,8 +44,8 @@ ** ****************************************************************************/ -#ifndef QGIFHANDLER_H -#define QGIFHANDLER_H +#ifndef QGIFHANDLER_P_H +#define QGIFHANDLER_P_H #include <QtGui/qimageiohandler.h> #include <QtGui/qimage.h> @@ -93,4 +93,4 @@ private: QT_END_NAMESPACE -#endif // QGIFHANDLER_H +#endif // QGIFHANDLER_P_H diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp index 55c9341..ec56af2 100644 --- a/src/gui/image/qimagereader.cpp +++ b/src/gui/image/qimagereader.cpp @@ -142,16 +142,16 @@ #include <private/qpnghandler_p.h> #endif #ifndef QT_NO_IMAGEFORMAT_JPEG -#include <qjpeghandler.h> +#include <private/qjpeghandler_p.h> #endif #ifndef QT_NO_IMAGEFORMAT_MNG -#include <qmnghandler.h> +#include <private/qmnghandler_p.h> #endif #ifndef QT_NO_IMAGEFORMAT_TIFF -#include <qtiffhandler.h> +#include <private/qtiffhandler_p.h> #endif #ifdef QT_BUILTIN_GIF_READER -#include <qgifhandler.h> +#include <private/qgifhandler_p.h> #endif QT_BEGIN_NAMESPACE diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp index a46fc48..b995914 100644 --- a/src/gui/image/qimagewriter.cpp +++ b/src/gui/image/qimagewriter.cpp @@ -115,16 +115,16 @@ #include <private/qpnghandler_p.h> #endif #ifndef QT_NO_IMAGEFORMAT_JPEG -#include <qjpeghandler.h> +#include <private/qjpeghandler_p.h> #endif #ifndef QT_NO_IMAGEFORMAT_MNG -#include <qmnghandler.h> +#include <private/qmnghandler_p.h> #endif #ifndef QT_NO_IMAGEFORMAT_TIFF -#include <qtiffhandler.h> +#include <private/qtiffhandler_p.h> #endif #ifdef QT_BUILTIN_GIF_READER -#include <qgifhandler.h> +#include <private/qgifhandler_p.h> #endif QT_BEGIN_NAMESPACE diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp index 60e7cce..972dd65 100644 --- a/src/gui/image/qjpeghandler.cpp +++ b/src/gui/image/qjpeghandler.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qjpeghandler.h" +#include "qjpeghandler_p.h" #include <qimage.h> #include <qvariant.h> diff --git a/src/gui/image/qjpeghandler.pri b/src/gui/image/qjpeghandler.pri index 28ec7dc..3cb35c9 100644 --- a/src/gui/image/qjpeghandler.pri +++ b/src/gui/image/qjpeghandler.pri @@ -1,6 +1,6 @@ # common to plugin and built-in forms INCLUDEPATH *= $$PWD -HEADERS += $$PWD/qjpeghandler.h +HEADERS += $$PWD/qjpeghandler_p.h SOURCES += $$PWD/qjpeghandler.cpp contains(QT_CONFIG, system-jpeg) { if(unix|win32-g++*): LIBS += -ljpeg diff --git a/src/gui/image/qjpeghandler.h b/src/gui/image/qjpeghandler_p.h index c879f21..5320a5e 100644 --- a/src/gui/image/qjpeghandler.h +++ b/src/gui/image/qjpeghandler_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QJPEGHANDLER_H -#define QJPEGHANDLER_H +#ifndef QJPEGHANDLER_P_H +#define QJPEGHANDLER_P_H #include <QtGui/qimageiohandler.h> #include <QtCore/QSize> @@ -73,4 +73,4 @@ private: QT_END_NAMESPACE -#endif // QJPEGHANDLER_H +#endif // QJPEGHANDLER_P_H diff --git a/src/gui/image/qmnghandler.cpp b/src/gui/image/qmnghandler.cpp index ec442a1..cf53af0 100644 --- a/src/gui/image/qmnghandler.cpp +++ b/src/gui/image/qmnghandler.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qmnghandler.h" +#include "qmnghandler_p.h" #include "qimage.h" #include "qvariant.h" diff --git a/src/gui/image/qmnghandler.pri b/src/gui/image/qmnghandler.pri index ec1c19e..ffb98de 100644 --- a/src/gui/image/qmnghandler.pri +++ b/src/gui/image/qmnghandler.pri @@ -1,6 +1,6 @@ # common to plugin and built-in forms INCLUDEPATH *= $$PWD -HEADERS += $$PWD/qmnghandler.h +HEADERS += $$PWD/qmnghandler_p.h SOURCES += $$PWD/qmnghandler.cpp contains(QT_CONFIG, system-mng) { if(unix|win32-g++*):LIBS += -lmng diff --git a/src/gui/image/qmnghandler.h b/src/gui/image/qmnghandler_p.h index 65243be..c39d0a6 100644 --- a/src/gui/image/qmnghandler.h +++ b/src/gui/image/qmnghandler_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QMNGHANDLER_H -#define QMNGHANDLER_H +#ifndef QMNGHANDLER_P_H +#define QMNGHANDLER_P_H #include <QtCore/qscopedpointer.h> #include <QtGui/qimageiohandler.h> @@ -80,4 +80,4 @@ class QMngHandler : public QImageIOHandler QT_END_NAMESPACE -#endif // QMNGHANDLER_H +#endif // QMNGHANDLER_P_H diff --git a/src/gui/image/qtiffhandler.cpp b/src/gui/image/qtiffhandler.cpp index 619aa4e..de4f680 100644 --- a/src/gui/image/qtiffhandler.cpp +++ b/src/gui/image/qtiffhandler.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qtiffhandler.h" +#include "qtiffhandler_p.h" #include <qvariant.h> #include <qdebug.h> #include <qimage.h> diff --git a/src/gui/image/qtiffhandler.pri b/src/gui/image/qtiffhandler.pri index 8ac70d9..e1cc3ee 100644 --- a/src/gui/image/qtiffhandler.pri +++ b/src/gui/image/qtiffhandler.pri @@ -1,6 +1,6 @@ # common to plugin and built-in forms INCLUDEPATH *= $$PWD -HEADERS += $$PWD/qtiffhandler.h +HEADERS += $$PWD/qtiffhandler_p.h SOURCES += $$PWD/qtiffhandler.cpp contains(QT_CONFIG, system-tiff) { if(unix|win32-g++*):LIBS += -ltiff diff --git a/src/gui/image/qtiffhandler.h b/src/gui/image/qtiffhandler_p.h index 4534ed5..da7d7ed 100644 --- a/src/gui/image/qtiffhandler.h +++ b/src/gui/image/qtiffhandler_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QTIFFHANDLER_H -#define QTIFFHANDLER_H +#ifndef QTIFFHANDLER_P_H +#define QTIFFHANDLER_P_H #include <QtGui/qimageiohandler.h> @@ -75,4 +75,4 @@ private: QT_END_NAMESPACE -#endif // QTIFFHANDLER_H +#endif // QTIFFHANDLER_P_H |