[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/graphics/digikam/libs
From:       Marcel Wiesweg <marcel.wiesweg () gmx ! de>
Date:       2010-06-20 19:29:02
Message-ID: 20100620192902.A9B22AC8E1 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1140466 by mwiesweg:

compile

 M  +6 -1      dimg/dimg.h  
 M  +1 -1      dimg/dimg_p.h  
 M  +1 -5      dmetadata/dmetadata.h  


--- trunk/extragear/graphics/digikam/libs/dimg/dimg.h #1140465:1140466
@@ -26,6 +26,10 @@
 #ifndef DIMG_H
 #define DIMG_H
 
+// KExiv2 includes
+
+#include <libkexiv2/kexiv2data.h>
+
 // Qt includes
 
 #include <QtCore/QByteArray>
@@ -38,7 +42,6 @@
 // Local includes
 
 #include "digikam_export.h"
-#include "dmetadatadata.h"
 #include "dshareddata.h"
 #include "drawdecoding.h"
 #include "dcolor.h"
@@ -50,6 +53,8 @@
 namespace Digikam
 {
 
+typedef KExiv2Iface::KExiv2Data KExiv2Data;
+
 class ExposureSettingsContainer;
 class DImgPrivate;
 class IccTransform;
--- trunk/extragear/graphics/digikam/libs/dimg/dimg_p.h #1140465:1140466
@@ -35,7 +35,7 @@
 // Local includes
 
 #include "digikam_export.h"
-#include "dmetadatadata.h"
+#include "dmetadata.h"
 #include "dshareddata.h"
 #include "iccprofile.h"
 
--- trunk/extragear/graphics/digikam/libs/dmetadata/dmetadata.h #1140465:1140466
@@ -43,17 +43,13 @@
 #include "metadatainfo.h"
 #include "digikam_export.h"
 
-using namespace KExiv2Iface;
-
 namespace Digikam
 {
 
 class Template;
 class IccProfile;
 
-typedef KExiv2Iface::KExiv2Data KExiv2Data;
-
-class DIGIKAM_EXPORT DMetadata : public KExiv2
+class DIGIKAM_EXPORT DMetadata : public KExiv2Iface::KExiv2
 {
 
 public:
[prev in list] [next in list] [prev in thread] [next in thread]