gwenview: fix build against recent Exiv2 versions

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/gwenview/lib/CMakeLists.txt b/gwenview/lib/CMakeLists.txt
index e09b5df..e92b130 100644 (file)
--- a/gwenview/lib/CMakeLists.txt
+++ b/gwenview/lib/CMakeLists.txt
@@ -10,10 +10,6 @@ include_directories(
     ${JPEG_INCLUDE_DIR}
     ${PNG_INCLUDE_DIRS}
 )
-add_definitions(
-    ${EXIV2_DEFINITIONS}
-    ${KDE4_ENABLE_EXCEPTIONS}
-)
 
 set(gwenviewlib_SRCS
     contextmanager.cpp

diff --git a/gwenview/lib/exiv2imageloader.cpp b/gwenview/lib/exiv2imageloader.cpp
index 37ac9fa..9b12db5 100644 (file)
--- a/gwenview/lib/exiv2imageloader.cpp
+++ b/gwenview/lib/exiv2imageloader.cpp
@@ -28,8 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 // KDE
 
 // Exiv2
-#include <exiv2/error.hpp>
-#include <exiv2/types.hpp>
+#include <exiv2/exiv2.hpp>
 
 // Local
 

diff --git a/gwenview/lib/exiv2imageloader.h b/gwenview/lib/exiv2imageloader.h
index 2f1ced0..da75f8b 100644 (file)
--- a/gwenview/lib/exiv2imageloader.h
+++ b/gwenview/lib/exiv2imageloader.h
@@ -29,12 +29,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 // Exiv2
 #include <string.h>
-#include <exiv2/image.hpp>
+#include <exiv2/exiv2.hpp>
 
 // Local
 
-class QByteArray;
-class QString;
+#include <QByteArray>
+#include <QString>
 
 namespace Gwenview
 {

diff --git a/gwenview/lib/imagemetainfomodel.cpp b/gwenview/lib/imagemetainfomodel.cpp
index caf6855..bd30eb0 100644 (file)
--- a/gwenview/lib/imagemetainfomodel.cpp
+++ b/gwenview/lib/imagemetainfomodel.cpp
@@ -30,9 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #include <KLocale>
 
 // Exiv2
-#include <exiv2/exif.hpp>
-#include <exiv2/image.hpp>
-#include <exiv2/iptc.hpp>
+#include <exiv2/exiv2.hpp>
 
 // Local