diff --git a/src/imageformats/eps_p.h b/src/imageformats/eps_p.h index 6b4b493..529207e 100644 --- a/src/imageformats/eps_p.h +++ b/src/imageformats/eps_p.h @@ -4,8 +4,8 @@ * * This library is distributed under the conditions of the GNU LGPL. */ -#ifndef KIMG_EPS_H -#define KIMG_EPS_H +#ifndef KIMG_EPS_P_H +#define KIMG_EPS_P_H #include #include @@ -34,5 +34,5 @@ public: Q_DECLARE_LOGGING_CATEGORY(EPSPLUGIN) -#endif // KIMG_EPS_H +#endif // KIMG_EPS_P_H diff --git a/src/imageformats/exr_p.h b/src/imageformats/exr_p.h index 0dcbb7c..9ea4b1a 100644 --- a/src/imageformats/exr_p.h +++ b/src/imageformats/exr_p.h @@ -8,8 +8,8 @@ * */ -#ifndef KIMG_EXR_H -#define KIMG_EXR_H +#ifndef KIMG_EXR_P_H +#define KIMG_EXR_P_H #include @@ -34,4 +34,4 @@ public: QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override; }; -#endif // KIMG_EXR_H +#endif // KIMG_EXR_P_H diff --git a/src/imageformats/hdr_p.h b/src/imageformats/hdr_p.h index 1b948de..50700c6 100644 --- a/src/imageformats/hdr_p.h +++ b/src/imageformats/hdr_p.h @@ -7,8 +7,8 @@ version 2 of the License, or (at your option) any later version. */ -#ifndef KIMG_HDR_H -#define KIMG_HDR_H +#ifndef KIMG_HDR_P_H +#define KIMG_HDR_P_H class QImageIO; diff --git a/src/imageformats/pcx_p.h b/src/imageformats/pcx_p.h index af9cb94..7655874 100644 --- a/src/imageformats/pcx_p.h +++ b/src/imageformats/pcx_p.h @@ -7,8 +7,8 @@ version 2 of the License, or (at your option) any later version. */ -#ifndef KIMG_PCX_H -#define KIMG_PCX_H +#ifndef KIMG_PCX_P_H +#define KIMG_PCX_P_H #include @@ -34,4 +34,4 @@ public: QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override; }; -#endif // KIMG_PCX_H +#endif // KIMG_PCX_P_H diff --git a/src/imageformats/pic.cpp b/src/imageformats/pic.cpp index 781237d..89ab51e 100644 --- a/src/imageformats/pic.cpp +++ b/src/imageformats/pic.cpp @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ---------------------------------------------------------------------------- */ diff --git a/src/imageformats/pic_p.h b/src/imageformats/pic_p.h index 8de1c39..b8ea054 100644 --- a/src/imageformats/pic_p.h +++ b/src/imageformats/pic_p.h @@ -14,12 +14,12 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ---------------------------------------------------------------------------- */ -#ifndef KIMG_PIC_H -#define KIMG_PIC_H +#ifndef KIMG_PIC_P_H +#define KIMG_PIC_P_H #include #include @@ -199,4 +199,4 @@ public: QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override; }; -#endif // KIMG_PIC_H +#endif // KIMG_PIC_P_H diff --git a/src/imageformats/psd.cpp b/src/imageformats/psd.cpp index 2b507a9..2eac3a4 100644 --- a/src/imageformats/psd.cpp +++ b/src/imageformats/psd.cpp @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /* diff --git a/src/imageformats/psd_p.h b/src/imageformats/psd_p.h index 1083576..fbe7f41 100644 --- a/src/imageformats/psd_p.h +++ b/src/imageformats/psd_p.h @@ -7,8 +7,8 @@ version 2 of the License, or (at your option) any later version. */ -#ifndef KIMG_PSD_H -#define KIMG_PSD_H +#ifndef KIMG_PSD_P_H +#define KIMG_PSD_P_H #include @@ -33,5 +33,5 @@ public: QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override; }; -#endif // KIMG_PSD_H +#endif // KIMG_PSD_P_H diff --git a/src/imageformats/ras_p.h b/src/imageformats/ras_p.h index 728161f..b5d8cbc 100644 --- a/src/imageformats/ras_p.h +++ b/src/imageformats/ras_p.h @@ -8,8 +8,8 @@ version 2 of the License, or (at your option) any later version. */ -#ifndef KIMG_RAS_H -#define KIMG_RAS_H +#ifndef KIMG_RAS_P_H +#define KIMG_RAS_P_H #include @@ -34,5 +34,5 @@ public: QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override; }; -#endif // KIMG_RAS_H +#endif // KIMG_RAS_P_H diff --git a/src/imageformats/rgb_p.h b/src/imageformats/rgb_p.h index 6ff2a49..b5bd97b 100644 --- a/src/imageformats/rgb_p.h +++ b/src/imageformats/rgb_p.h @@ -7,8 +7,8 @@ // published by the Free Software Foundation; either version 2 of the // License, or (at your option) any later version. -#ifndef KIMG_RGB_H -#define KIMG_RGB_H +#ifndef KIMG_RGB_P_H +#define KIMG_RGB_P_H #include @@ -34,5 +34,5 @@ public: QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override; }; -#endif // KIMG_RGB_H +#endif // KIMG_RGB_P_H diff --git a/src/imageformats/rle_p.h b/src/imageformats/rle_p.h index 202636e..4991c2f 100644 --- a/src/imageformats/rle_p.h +++ b/src/imageformats/rle_p.h @@ -14,12 +14,12 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ---------------------------------------------------------------------------- */ -#ifndef KIMAGEFORMATS_RLE_H -#define KIMAGEFORMATS_RLE_H +#ifndef KIMAGEFORMATS_RLE_P_H +#define KIMAGEFORMATS_RLE_P_H #include #include @@ -220,4 +220,4 @@ static inline void encodeRLEData(RLEVariant variant, } } -#endif // KIMAGEFORMATS_RLE_H +#endif // KIMAGEFORMATS_RLE_P_H diff --git a/src/imageformats/tga_p.h b/src/imageformats/tga_p.h index 28fe2fd..6f4da68 100644 --- a/src/imageformats/tga_p.h +++ b/src/imageformats/tga_p.h @@ -7,8 +7,8 @@ version 2 of the License, or (at your option) any later version. */ -#ifndef KIMG_TGA_H -#define KIMG_TGA_H +#ifndef KIMG_TGA_P_H +#define KIMG_TGA_P_H #include @@ -34,4 +34,4 @@ public: QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override; }; -#endif // KIMG_TGA_H +#endif // KIMG_TGA_P_H diff --git a/src/imageformats/xcf_p.h b/src/imageformats/xcf_p.h index aa9cc16..a45eb56 100644 --- a/src/imageformats/xcf_p.h +++ b/src/imageformats/xcf_p.h @@ -19,8 +19,8 @@ * */ -#ifndef KIMG_XCF_H -#define KIMG_XCF_H +#ifndef KIMG_XCF_P_H +#define KIMG_XCF_P_H #include @@ -46,4 +46,4 @@ public: QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override; }; -#endif // KIMG_XCF_H +#endif // KIMG_XCF_P_H diff --git a/tests/format-enum.h b/tests/format-enum.h index 1a87230..c0672fc 100644 --- a/tests/format-enum.h +++ b/tests/format-enum.h @@ -19,6 +19,9 @@ * . */ +#ifndef FORMAT_ENUM_H +#define FORMAT_ENUM_H + #include // Generated from QImage::Format enum @@ -71,3 +74,4 @@ QString formatToString(QImage::Format format) QLatin1String(">"); } +#endif