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

use KPMetadata

M +5 -4 acquireimages/scangui.cpp
M +5 -9 expoblending/plugin/expoblending.cpp
M +5 -9 panorama/plugin/panorama.cpp

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

diff --git a/acquireimages/scangui.cpp b/acquireimages/scangui.cpp
index 2bda1dc..3dd7777 100644
--- a/acquireimages/scangui.cpp
+++ b/acquireimages/scangui.cpp
@@ -6,7 +6,7 @@
* Date : 2008-09-30
* Description : stand alone Scanner interface.
*
- * Copyright (C) 2008-2011 by Gilles Caulier <caulier dot gilles at gmail dot
com>
+ * Copyright (C) 2008-2012 by Gilles Caulier <caulier dot gilles at gmail dot
com>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -43,11 +43,12 @@
// Local includes

#include "aboutdata.h"
+#include "kpmetadata.h"
#include "kpversion.h"
#include "scandialog.h"

using namespace KIPIAcquireImagesPlugin;
-using namespace KExiv2Iface;
+using namespace KIPIPlugins;
using namespace KSaneIface;

int main(int argc, char* argv[])
@@ -57,7 +58,7 @@ int main(int argc, char* argv[])
aboutData->setCatalogName("kipiplugin_acquireimages");
KCmdLineArgs::init(argc, argv, aboutData);

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

KApplication app;
aboutData->setProgramLogo(KIcon("scanner"));
@@ -83,7 +84,7 @@ int main(int argc, char* argv[])

int ret = app.exec();

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

return ret;
}
diff --git a/expoblending/plugin/expoblending.cpp
b/expoblending/plugin/expoblending.cpp
index dafdda8..6fe5d15 100644
--- a/expoblending/plugin/expoblending.cpp
+++ b/expoblending/plugin/expoblending.cpp
@@ -6,7 +6,7 @@
* Date : 2009-12-13
* Description : stand alone Expo Blending.
*
- * Copyright (C) 2009-2011 by Gilles Caulier <caulier dot gilles at gmail dot
com>
+ * Copyright (C) 2009-2012 by Gilles Caulier <caulier dot gilles at gmail dot
com>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -32,19 +32,15 @@
#include <kconfig.h>
#include <kglobal.h>

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

#include "aboutdata.h"
+#include "kpmetadata.h"
#include "kpversion.h"
#include "manager.h"

using namespace KIPIExpoBlendingPlugin;
-using namespace KExiv2Iface;
+using namespace KIPIPlugins;

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

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

KApplication app;
aboutData->setProgramLogo(KIcon("expoblending"));
@@ -79,7 +75,7 @@ int main(int argc, char* argv[])
mngr.run();

app.exec();
- KExiv2::cleanupExiv2();
+ KPMetadata::cleanupExiv2();

return 0;
}
diff --git a/panorama/plugin/panorama.cpp b/panorama/plugin/panorama.cpp
index 21bf5e1..406f914 100644
--- a/panorama/plugin/panorama.cpp
+++ b/panorama/plugin/panorama.cpp
@@ -8,7 +8,7 @@
* Acknowledge : based on the expoblending plugin
*
* Copyright (C) 2011 by Benjamin Girault <benjamin dot girault at gmail dot
com>
- * Copyright (C) 2009-2011 by Gilles Caulier <caulier dot gilles at gmail dot
com>
+ * Copyright (C) 2009-2012 by Gilles Caulier <caulier dot gilles at gmail dot
com>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -34,19 +34,15 @@
#include <kconfig.h>
#include <kglobal.h>

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

#include "kpversion.h"
+#include "kpmetadata.h"
#include "aboutdata.h"
#include "manager/manager.h"

using namespace KIPIPanoramaPlugin;
-using namespace KExiv2Iface;
+using namespace KIPIPlugins;

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

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

KApplication app;
aboutData->setProgramLogo(KIcon("layer-visible-on"));
@@ -81,7 +77,7 @@ int main(int argc, char* argv[])
mngr.run();

app.exec();
- KExiv2::cleanupExiv2();
+ KPMetadata::cleanupExiv2();

return 0;
}