digikam/digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch

60 lines
2.0 KiB
Diff

From f6945f23e0ed1e11f26e2c7e62b02baa8cfa640e Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@kde.org>
Date: Tue, 14 Oct 2014 22:26:19 +0200
Subject: [PATCH] fix libkexiv2 version for AltLangStrEdit::textEdit()
it is part of current libkexiv2/master only (i.e. post 4.14.x, which
is 2.3.x)
---
libs/imageproperties/captionedit.cpp | 2 +-
libs/imageproperties/imagedescedittab.cpp | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libs/imageproperties/captionedit.cpp b/libs/imageproperties/captionedit.cpp
index 88413fc..70bdb6d 100644
--- a/libs/imageproperties/captionedit.cpp
+++ b/libs/imageproperties/captionedit.cpp
@@ -202,7 +202,7 @@ void CaptionEdit::slotAuthorChanged(const QString& text)
MsgTextEdit* CaptionEdit::textEdit() const
{
-#if KEXIV2_VERSION >= 0x020302
+#if KEXIV2_VERSION >= 0x020400
return d->altLangStrEdit->textEdit();
#else
return 0;
diff --git a/libs/imageproperties/imagedescedittab.cpp b/libs/imageproperties/imagedescedittab.cpp
index ebfbae1..3d12777 100644
--- a/libs/imageproperties/imagedescedittab.cpp
+++ b/libs/imageproperties/imagedescedittab.cpp
@@ -429,7 +429,7 @@ ImageDescEditTab::ImageDescEditTab(QWidget* const parent)
// Initialize ---------------------------------------------
-#if KEXIV2_VERSION >= 0x020302
+#if KEXIV2_VERSION >= 0x020400
d->titleEdit->textEdit()->installEventFilter(this);
d->captionsEdit->textEdit()->installEventFilter(this);
#endif
@@ -532,7 +532,7 @@ void ImageDescEditTab::setFocusToNewTagEdit()
void ImageDescEditTab::setFocusToTitlesEdit()
{
d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS);
-#if KEXIV2_VERSION >= 0x020302
+#if KEXIV2_VERSION >= 0x020400
d->titleEdit->textEdit()->setFocus();
#endif
}
@@ -540,7 +540,7 @@ void ImageDescEditTab::setFocusToTitlesEdit()
void ImageDescEditTab::setFocusToCommentsEdit()
{
d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS);
-#if KEXIV2_VERSION >= 0x020302
+#if KEXIV2_VERSION >= 0x020400
d->captionsEdit->textEdit()->setFocus();
#endif
}
--
1.8.4.5