Git commit e2502afa2a4104b5fc264491e8d62b601abd9bb0 by Gilles Caulier.
Committed on 22/02/2012 at 16:10.
Pushed by cgilles into branch 'master'.

use KPMetadata

M +7 -10 dngconverter/dngwriter/dngwriter.cpp
M +3 -8 dngconverter/plugin/dngconverter.cpp

http://commits.kde.org/kipi-plugins/e2502afa2a4104b5fc264491e8d62b601abd9bb0

diff --git a/dngconverter/dngwriter/dngwriter.cpp
b/dngconverter/dngwriter/dngwriter.cpp
index e57b948..b0ad6fc 100644
--- a/dngconverter/dngwriter/dngwriter.cpp
+++ b/dngconverter/dngwriter/dngwriter.cpp
@@ -67,18 +67,15 @@ extern "C"

#include <libkdcraw/version.h>

-// Libkexiv2 includes
-
-#include <libkexiv2/kexiv2.h>
-
// Local includes

#include "dngwriter_p.h"
#include "dngwriterhost.h"
+#include "kpmetadata.h"

#define CHUNK 65536

-using namespace KExiv2Iface;
+using namespace KIPIPlugins;

namespace DNGIface
{
@@ -105,7 +102,7 @@ dng_date_time dngDateTime(QDateTime qDT)
}

DNGWriter::DNGWriter()
- : d(new DNGWriterPrivate)
+ : d(new DNGWriterPrivate)
{
}

@@ -690,10 +687,10 @@ int DNGWriter::convert()
exif->fModel.Set_ASCII(identify.model.toAscii());
exif->fMake.Set_ASCII(identify.make.toAscii());

- long int num, den;
- long val;
- QString str;
- KExiv2 meta;
+ long int num, den;
+ long val;
+ QString str;
+ KPMetadata meta;
if (meta.load(inputFile()))
{
// Time from original shot
diff --git a/dngconverter/plugin/dngconverter.cpp
b/dngconverter/plugin/dngconverter.cpp
index 6541413..c189706 100644
--- a/dngconverter/plugin/dngconverter.cpp
+++ b/dngconverter/plugin/dngconverter.cpp
@@ -31,11 +31,6 @@
#include <kconfig.h>
#include <kglobal.h>

-// Libkexiv2 includes
-
-#include <libkexiv2/version.h>
-#include <libkexiv2/kexiv2.h>
-
// Local includes

#include "aboutdata.h"
@@ -43,7 +38,7 @@
#include "batchdialog.h"

using namespace KIPIDNGConverterPlugin;
-using namespace KExiv2Iface;
+using namespace KIPIPlugins;

int main(int argc, char* argv[])
{
@@ -57,7 +52,7 @@ int main(int argc, char* argv[])
options.add("+[file(s)]", ki18n("File(s) to convert"));
KCmdLineArgs::addCmdLineOptions(options);

- KExiv2::initializeExiv2();
+ KPMetadata::initializeExiv2();

KApplication app;

@@ -79,7 +74,7 @@ int main(int argc, char* argv[])

int ret = app.exec();

- KExiv2::cleanupExiv2();
+ KPMetadata::cleanupExiv2();

return ret;
}