[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/graphics/digikam/libs
From: Andi Clemens <andi.clemens () gmx ! net>
Date: 2008-10-24 14:48:54
Message-ID: 1224859734.366861.8945.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 875469 by aclemens:
some more include fixes. still it is not possible to re-arrange the include \
statements in the jpeg loaders.
M +4 -5 database/albumdb_sqlite2.cpp
M +7 -0 database/albumdb_sqlite2.h
M +5 -5 database/haar/haar.cpp
M +1 -1 database/haar/haar.h
M +3 -3 dimg/exposurecontainer.h
M +4 -1 dimg/loaders/dimgloader.cpp
M +1 -1 dimg/loaders/dimgloader.h
M +6 -0 dimg/loaders/iccjpeg.h
M +5 -5 dimg/loaders/jp2ksettings.cpp
M +2 -2 dimg/loaders/jpegloader.h
M +5 -5 dimg/loaders/jpegsettings.cpp
M +5 -2 dimg/loaders/pngloader.cpp
M +5 -5 dimg/loaders/pngsettings.cpp
M +4 -1 dimg/loaders/ppmloader.cpp
M +4 -1 dimg/loaders/qimageloader.cpp
M +5 -2 dimg/loaders/rawloader.cpp
M +4 -1 dimg/loaders/tiffloader.cpp
M +5 -5 dimg/loaders/tiffsettings.cpp
M +1 -1 jpegutils/jpegutils.cpp
M +1 -9 jpegutils/transupp.cpp
M +8 -0 jpegutils/transupp.h
M +1 -1 threadimageio/thumbnailbasic.cpp
M +11 -11 threadimageio/thumbnailcreator.cpp
--- trunk/extragear/graphics/digikam/libs/database/albumdb_sqlite2.cpp #875468:875469
@@ -21,18 +21,17 @@
*
* ============================================================ */
+// Local includes.
+
+#include "albumdb_sqlite2.h"
+
// C ANSI includes.
extern "C"
{
-#include <sqlite.h>
#include <sys/time.h>
}
-// Local includes.
-
-#include "albumdb_sqlite2.h"
-
// C++ includes.
#include <ctime>
--- trunk/extragear/graphics/digikam/libs/database/albumdb_sqlite2.h #875468:875469
@@ -24,6 +24,13 @@
#ifndef ALBUMDB_SQLITE2_H
#define ALBUMDB_SQLITE2_H
+// C ANSI includes.
+
+extern "C"
+{
+#include <sqlite.h>
+}
+
// Qt includes.
#include <QString>
--- trunk/extragear/graphics/digikam/libs/database/haar/haar.cpp #875468:875469
@@ -27,16 +27,16 @@
*
* ============================================================ */
+// Local includes.
+
+#include "haar.h"
+
// C++ includes.
-#include <cstring>
#include <cstdlib>
#include <cmath>
+#include <queue>
-// Local includes.
-
-#include "haar.h"
-
// Qt includes.
#include <QImage>
--- trunk/extragear/graphics/digikam/libs/database/haar/haar.h #875468:875469
@@ -32,7 +32,7 @@
// C++ includes.
-#include <queue>
+#include <cstring>
// Qt includes.
--- trunk/extragear/graphics/digikam/libs/dimg/exposurecontainer.h #875468:875469
@@ -21,8 +21,8 @@
*
* ============================================================ */
-#ifndef EXPOSURESETTINGSCONTAINER_H
-#define EXPOSURESETTINGSCONTAINER_H
+#ifndef EXPOSURECONTAINER_H
+#define EXPOSURECONTAINER_H
// Qt includes.
@@ -62,4 +62,4 @@
} // namespace Digikam
-#endif // EXPOSURESETTINGSCONTAINER_H
+#endif // EXPOSURECONTAINER_H
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/dimgloader.cpp #875468:875469
@@ -22,6 +22,10 @@
*
* ============================================================ */
+// Local includes.
+
+#include "dimgloader.h"
+
// Qt includes.
#include <QFile>
@@ -37,7 +41,6 @@
#include "dimgprivate.h"
#include "dmetadata.h"
#include "dimgloaderobserver.h"
-#include "dimgloader.h"
namespace Digikam
{
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/dimgloader.h #875468:875469
@@ -34,8 +34,8 @@
// Digikam includes.
+#include "digikam_export.h"
#include "dimg.h"
-#include "digikam_export.h"
namespace Digikam
{
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/iccjpeg.h #875468:875469
@@ -39,6 +39,9 @@
* for details.
*/
+#ifndef ICCJPEG_H
+#define ICCJPEG_H
+
#include <stdio.h> /* needed to define "FILE", "NULL" */
#include <jpeglib.h>
@@ -94,3 +97,6 @@
extern boolean read_icc_profile JPP((j_decompress_ptr cinfo,
JOCTET **icc_data_ptr,
unsigned int *icc_data_len));
+
+#endif // ICCJPEG_H
+
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/jp2ksettings.cpp \
#875468:875469 @@ -21,6 +21,11 @@
*
* ============================================================ */
+// Local includes.
+
+#include "jp2ksettings.h"
+#include "jp2ksettings.moc"
+
// Qt includes.
#include <QString>
@@ -35,11 +40,6 @@
#include <kdialog.h>
#include <knuminput.h>
-// Digikam includes.
-
-#include "jp2ksettings.h"
-#include "jp2ksettings.moc"
-
namespace Digikam
{
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/jpegloader.h #875468:875469
@@ -52,8 +52,8 @@
bool load(const QString& filePath, DImgLoaderObserver *observer);
bool save(const QString& filePath, DImgLoaderObserver *observer);
- virtual bool hasAlpha() const { return false; }
- virtual bool sixteenBit() const { return false; }
+ virtual bool hasAlpha() const { return false; };
+ virtual bool sixteenBit() const { return false; };
virtual bool isReadOnly() const { return false; };
private:
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/jpegsettings.cpp \
#875468:875469 @@ -21,6 +21,11 @@
*
* ============================================================ */
+// Local includes.
+
+#include "jpegsettings.h"
+#include "jpegsettings.moc"
+
// Qt includes.
#include <QFrame>
@@ -36,11 +41,6 @@
#include <klocale.h>
#include <knuminput.h>
-// Digikam includes.
-
-#include "jpegsettings.h"
-#include "jpegsettings.moc"
-
namespace Digikam
{
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/pngloader.cpp #875468:875469
@@ -28,8 +28,12 @@
#define PNG_BYTES_TO_CHECK 4
-// C Ansi includes.
+// Local includes.
+#include "pngloader.h"
+
+// C ANSI includes.
+
extern "C"
{
#include <unistd.h>
@@ -55,7 +59,6 @@
#include "version.h"
#include "dimg.h"
#include "dimgloaderobserver.h"
-#include "pngloader.h"
namespace Digikam
{
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/pngsettings.cpp #875468:875469
@@ -21,6 +21,11 @@
*
* ============================================================ */
+// Local includes.
+
+#include "pngsettings.h"
+#include "pngsettings.moc"
+
// Qt includes.
#include <QString>
@@ -34,11 +39,6 @@
#include <kdialog.h>
#include <knuminput.h>
-// Digikam includes.
-
-#include "pngsettings.h"
-#include "pngsettings.moc"
-
namespace Digikam
{
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/ppmloader.cpp #875468:875469
@@ -28,6 +28,10 @@
// files io. Uncomment this line only for debugging.
//#define ENABLE_DEBUG_MESSAGES
+// Local includes.
+
+#include "ppmloader.h"
+
// C ANSI includes.
extern "C"
@@ -53,7 +57,6 @@
#include "dimg.h"
#include "dimgloaderobserver.h"
-#include "ppmloader.h"
namespace Digikam
{
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/qimageloader.cpp \
#875468:875469 @@ -22,6 +22,10 @@
*
* ============================================================ */
+// Local includes.
+
+#include "qimageloader.h"
+
// Qt includes.
#include <QImage>
@@ -35,7 +39,6 @@
#include "dimg.h"
#include "dimgloaderobserver.h"
-#include "qimageloader.h"
namespace Digikam
{
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/rawloader.cpp #875468:875469
@@ -23,6 +23,11 @@
*
* ============================================================ */
+// Local includes.
+
+#include "rawloader.h"
+#include "rawloader.moc"
+
// C++ includes.
#include <cmath>
@@ -45,8 +50,6 @@
#include "imagelevels.h"
#include "bcgmodifier.h"
#include "whitebalance.h"
-#include "rawloader.h"
-#include "rawloader.moc"
namespace Digikam
{
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/tiffloader.cpp #875468:875469
@@ -44,6 +44,10 @@
// files io. Uncomment this line only for debugging.
//#define ENABLE_DEBUG_MESSAGES
+// Local includes.
+
+#include "tiffloader.h"
+
// C ANSI includes.
extern "C"
@@ -70,7 +74,6 @@
#include "dimg.h"
#include "dimgloaderobserver.h"
#include "dmetadata.h"
-#include "tiffloader.h"
namespace Digikam
{
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/tiffsettings.cpp \
#875468:875469 @@ -21,6 +21,11 @@
*
* ============================================================ */
+// Local includes.
+
+#include "tiffsettings.h"
+#include "tiffsettings.moc"
+
// Qt includes.
#include <QString>
@@ -34,11 +39,6 @@
#include <klocale.h>
#include <kdialog.h>
-// Digikam includes.
-
-#include "tiffsettings.h"
-#include "tiffsettings.moc"
-
namespace Digikam
{
--- trunk/extragear/graphics/digikam/libs/jpegutils/jpegutils.cpp #875468:875469
@@ -36,7 +36,7 @@
#include <cstdio>
#include <cstdlib>
-// C Ansi includes.
+// C ANSI includes.
extern "C"
{
--- trunk/extragear/graphics/digikam/libs/jpegutils/transupp.cpp #875468:875469
@@ -17,17 +17,9 @@
*/
#define JPEG_INTERNALS
-// LibJPEG includes.
-
-extern "C"
-{
-#include "jinclude.h"
-#include "jpeglib.h"
-}
-
// Digikam includes.
-#include "transupp.h" /* My own external interface */
+#include "transupp.h"
namespace Digikam
{
--- trunk/extragear/graphics/digikam/libs/jpegutils/transupp.h #875468:875469
@@ -20,6 +20,14 @@
#ifndef TRANSUPP_H
#define TRANSUPP_H
+// LibJPEG includes.
+
+extern "C"
+{
+#include "jinclude.h"
+#include "jpeglib.h"
+}
+
namespace Digikam
{
--- trunk/extragear/graphics/digikam/libs/threadimageio/thumbnailbasic.cpp \
#875468:875469 @@ -40,7 +40,7 @@
#include <kurl.h>
#include <kstandarddirs.h>
-// C Ansi includes.
+// C ANSI includes.
extern "C"
{
--- trunk/extragear/graphics/digikam/libs/threadimageio/thumbnailcreator.cpp \
#875468:875469 @@ -26,6 +26,7 @@
// Local includes.
#include "thumbnailcreator.h"
+#include "thumbnailcreator_p.h"
// Qt includes.
@@ -35,32 +36,31 @@
// KDE includes.
+#include <kcodecs.h>
+#include <kcomponentdata.h>
#include <kdebug.h>
-#include <kurl.h>
-#include <kcomponentdata.h>
+#include <kglobal.h>
#include <kimageio.h>
+#include <kio/global.h>
+#include <kio/thumbcreator.h>
+#include <klibloader.h>
#include <klocale.h>
-#include <kglobal.h>
+#include <kmimetype.h>
+#include <kservicetypetrader.h>
#include <kstandarddirs.h>
-#include <kcodecs.h>
-#include <kservicetypetrader.h>
-#include <klibloader.h>
-#include <kmimetype.h>
-#include <kio/global.h>
-#include <kio/thumbcreator.h>
#include <ktemporaryfile.h>
+#include <kurl.h>
// LibKDcraw includes.
+#include <libkdcraw/kdcraw.h>
#include <libkdcraw/rawfiles.h>
-#include <libkdcraw/kdcraw.h>
// Digikam includes.
#include "dimg.h"
#include "dmetadata.h"
#include "jpegutils.h"
-#include "thumbnailcreator_p.h"
// Definitions
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic