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

List:       kde-commits
Subject:    [digikam] core/utilities: fix redundant condition reported by cppcheck
From:       Maik Qualmann <null () kde ! org>
Date:       2018-09-22 10:43:52
Message-ID: E1g3fOC-00020N-U1 () code ! kde ! org
[Download RAW message or body]

Git commit a6df348ae4db8a5f2dc2d3a27c533705de2a786c by Maik Qualmann.
Committed on 22/09/2018 at 10:43.
Pushed by mqualmann into branch 'master'.

fix redundant condition reported by cppcheck

M  +32   -32   core/utilities/queuemanager/tools/metadata/timeadjust.cpp
M  +32   -32   core/utilities/timeadjust/timeadjusttask.cpp

https://commits.kde.org/digikam/a6df348ae4db8a5f2dc2d3a27c533705de2a786c

diff --git a/core/utilities/queuemanager/tools/metadata/timeadjust.cpp \
b/core/utilities/queuemanager/tools/metadata/timeadjust.cpp index \
                1e65cbecf4..fbae4197a2 100644
--- a/core/utilities/queuemanager/tools/metadata/timeadjust.cpp
+++ b/core/utilities/queuemanager/tools/metadata/timeadjust.cpp
@@ -287,8 +287,8 @@ bool TimeAdjust::toolOperations()
     {
         if (prm.updEXIFModDate)
         {
-            if (!prm.updIfAvailable || (prm.updIfAvailable &&
-                !meta.getExifTagString("Exif.Image.DateTime").isEmpty()))
+            if (!prm.updIfAvailable ||
+                !meta.getExifTagString("Exif.Image.DateTime").isEmpty())
             {
                 meta.setExifTagString("Exif.Image.DateTime",
                                       dt.toString(exifDateTimeFormat));
@@ -297,8 +297,8 @@ bool TimeAdjust::toolOperations()
 
         if (prm.updEXIFOriDate)
         {
-            if (!prm.updIfAvailable || (prm.updIfAvailable &&
-                !meta.getExifTagString("Exif.Photo.DateTimeOriginal").isEmpty()))
+            if (!prm.updIfAvailable ||
+                !meta.getExifTagString("Exif.Photo.DateTimeOriginal").isEmpty())
             {
                 meta.setExifTagString("Exif.Photo.DateTimeOriginal",
                                       dt.toString(exifDateTimeFormat));
@@ -307,8 +307,8 @@ bool TimeAdjust::toolOperations()
 
         if (prm.updEXIFDigDate)
         {
-            if (!prm.updIfAvailable || (prm.updIfAvailable &&
-                !meta.getExifTagString("Exif.Photo.DateTimeDigitized").isEmpty()))
+            if (!prm.updIfAvailable ||
+                !meta.getExifTagString("Exif.Photo.DateTimeDigitized").isEmpty())
             {
                 meta.setExifTagString("Exif.Photo.DateTimeDigitized",
                                       dt.toString(exifDateTimeFormat));
@@ -317,8 +317,8 @@ bool TimeAdjust::toolOperations()
 
         if (prm.updEXIFThmDate)
         {
-            if (!prm.updIfAvailable || (prm.updIfAvailable &&
-                !meta.getExifTagString("Exif.Image.PreviewDateTime").isEmpty()))
+            if (!prm.updIfAvailable ||
+                !meta.getExifTagString("Exif.Image.PreviewDateTime").isEmpty())
             {
                 meta.setExifTagString("Exif.Image.PreviewDateTime",
                                       dt.toString(exifDateTimeFormat));
@@ -327,15 +327,15 @@ bool TimeAdjust::toolOperations()
 
         if (prm.updIPTCDate)
         {
-            if (!prm.updIfAvailable || (prm.updIfAvailable &&
-                !meta.getIptcTagString("Iptc.Application2.DateCreated").isEmpty()))
+            if (!prm.updIfAvailable ||
+                !meta.getIptcTagString("Iptc.Application2.DateCreated").isEmpty())
             {
                 meta.setIptcTagString("Iptc.Application2.DateCreated",
                                       dt.date().toString(Qt::ISODate));
             }
 
-            if (!prm.updIfAvailable || (prm.updIfAvailable &&
-                !meta.getIptcTagString("Iptc.Application2.TimeCreated").isEmpty()))
+            if (!prm.updIfAvailable ||
+                !meta.getIptcTagString("Iptc.Application2.TimeCreated").isEmpty())
             {
                 meta.setIptcTagString("Iptc.Application2.TimeCreated",
                                       dt.time().toString(Qt::ISODate));
@@ -344,43 +344,43 @@ bool TimeAdjust::toolOperations()
 
         if (prm.updXMPDate && meta.supportXmp())
         {
-            if (!prm.updIfAvailable || (prm.updIfAvailable &&
-                !meta.getXmpTagString("Xmp.exif.DateTimeOriginal").isEmpty()))
+            if (!prm.updIfAvailable ||
+                !meta.getXmpTagString("Xmp.exif.DateTimeOriginal").isEmpty())
             {
                 meta.setXmpTagString("Xmp.exif.DateTimeOriginal",
                                      dt.toString(xmpDateTimeFormat));
             }
 
-            if (!prm.updIfAvailable || (prm.updIfAvailable &&
-                !meta.getXmpTagString("Xmp.photoshop.DateCreated").isEmpty()))
+            if (!prm.updIfAvailable ||
+                !meta.getXmpTagString("Xmp.photoshop.DateCreated").isEmpty())
             {
                 meta.setXmpTagString("Xmp.photoshop.DateCreated",
                                      dt.toString(xmpDateTimeFormat));
             }
 
-            if (!prm.updIfAvailable || (prm.updIfAvailable &&
-                !meta.getXmpTagString("Xmp.tiff.DateTime").isEmpty()))
+            if (!prm.updIfAvailable ||
+                !meta.getXmpTagString("Xmp.tiff.DateTime").isEmpty())
             {
                 meta.setXmpTagString("Xmp.tiff.DateTime",
                                      dt.toString(xmpDateTimeFormat));
             }
 
-            if (!prm.updIfAvailable || (prm.updIfAvailable &&
-                !meta.getXmpTagString("Xmp.xmp.CreateDate").isEmpty()))
+            if (!prm.updIfAvailable ||
+                !meta.getXmpTagString("Xmp.xmp.CreateDate").isEmpty())
             {
                 meta.setXmpTagString("Xmp.xmp.CreateDate",
                                      dt.toString(xmpDateTimeFormat));
             }
 
-            if (!prm.updIfAvailable || (prm.updIfAvailable &&
-                !meta.getXmpTagString("Xmp.xmp.MetadataDate").isEmpty()))
+            if (!prm.updIfAvailable ||
+                !meta.getXmpTagString("Xmp.xmp.MetadataDate").isEmpty())
             {
                 meta.setXmpTagString("Xmp.xmp.MetadataDate",
                                      dt.toString(xmpDateTimeFormat));
             }
 
-            if (!prm.updIfAvailable || (prm.updIfAvailable &&
-                !meta.getXmpTagString("Xmp.xmp.ModifyDate").isEmpty()))
+            if (!prm.updIfAvailable ||
+                !meta.getXmpTagString("Xmp.xmp.ModifyDate").isEmpty())
             {
                 meta.setXmpTagString("Xmp.xmp.ModifyDate",
                                      dt.toString(xmpDateTimeFormat));
@@ -389,29 +389,29 @@ bool TimeAdjust::toolOperations()
 
         if (prm.updXMPVideo && meta.supportXmp())
         {
-            if (!prm.updIfAvailable || (prm.updIfAvailable &&
-                !meta.getXmpTagString("Xmp.video.DateTimeOriginal").isEmpty()))
+            if (!prm.updIfAvailable ||
+                !meta.getXmpTagString("Xmp.video.DateTimeOriginal").isEmpty())
             {
                 meta.setXmpTagString("Xmp.video.DateTimeOriginal",
                                      dt.toString(xmpDateTimeFormat));
             }
 
-            if (!prm.updIfAvailable || (prm.updIfAvailable &&
-                !meta.getXmpTagString("Xmp.video.DateTimeDigitized").isEmpty()))
+            if (!prm.updIfAvailable ||
+                !meta.getXmpTagString("Xmp.video.DateTimeDigitized").isEmpty())
             {
                 meta.setXmpTagString("Xmp.video.DateTimeDigitized",
                                      dt.toString(xmpDateTimeFormat));
             }
 
-            if (!prm.updIfAvailable || (prm.updIfAvailable &&
-                !meta.getXmpTagString("Xmp.video.ModificationDate").isEmpty()))
+            if (!prm.updIfAvailable ||
+                !meta.getXmpTagString("Xmp.video.ModificationDate").isEmpty())
             {
                 meta.setXmpTagString("Xmp.video.ModificationDate",
                                      dt.toString(xmpDateTimeFormat));
             }
 
-            if (!prm.updIfAvailable || (prm.updIfAvailable &&
-                !meta.getXmpTagString("Xmp.video.DateUTC").isEmpty()))
+            if (!prm.updIfAvailable ||
+                !meta.getXmpTagString("Xmp.video.DateUTC").isEmpty())
             {
                 meta.setXmpTagString("Xmp.video.DateUTC",
                                      dt.toUTC().toString(xmpDateTimeFormat));
diff --git a/core/utilities/timeadjust/timeadjusttask.cpp \
b/core/utilities/timeadjust/timeadjusttask.cpp index 9761226df4..836d36059b 100644
--- a/core/utilities/timeadjust/timeadjusttask.cpp
+++ b/core/utilities/timeadjust/timeadjusttask.cpp
@@ -122,8 +122,8 @@ void TimeAdjustTask::run()
             {
                 if (d->settings.updEXIFModDate)
                 {
-                    if (!d->settings.updIfAvailable || (d->settings.updIfAvailable \
                &&
-                        !meta.getExifTagString("Exif.Image.DateTime").isEmpty()))
+                    if (!d->settings.updIfAvailable ||
+                        !meta.getExifTagString("Exif.Image.DateTime").isEmpty())
                     {
                         ret &= meta.setExifTagString("Exif.Image.DateTime",
                                                      \
dt.toString(exifDateTimeFormat)); @@ -132,8 +132,8 @@ void TimeAdjustTask::run()
 
                 if (d->settings.updEXIFOriDate)
                 {
-                    if (!d->settings.updIfAvailable || (d->settings.updIfAvailable \
                &&
-                        \
!meta.getExifTagString("Exif.Photo.DateTimeOriginal").isEmpty())) +                   \
if (!d->settings.updIfAvailable || +                        \
!meta.getExifTagString("Exif.Photo.DateTimeOriginal").isEmpty())  {
                         ret &= meta.setExifTagString("Exif.Photo.DateTimeOriginal",
                                                      \
dt.toString(exifDateTimeFormat)); @@ -142,8 +142,8 @@ void TimeAdjustTask::run()
 
                 if (d->settings.updEXIFDigDate)
                 {
-                    if (!d->settings.updIfAvailable || (d->settings.updIfAvailable \
                &&
-                        \
!meta.getExifTagString("Exif.Photo.DateTimeDigitized").isEmpty())) +                  \
if (!d->settings.updIfAvailable || +                        \
!meta.getExifTagString("Exif.Photo.DateTimeDigitized").isEmpty())  {
                         ret &= meta.setExifTagString("Exif.Photo.DateTimeDigitized",
                                                      \
dt.toString(exifDateTimeFormat)); @@ -152,8 +152,8 @@ void TimeAdjustTask::run()
 
                 if (d->settings.updEXIFThmDate)
                 {
-                   if (!d->settings.updIfAvailable || (d->settings.updIfAvailable &&
-                        \
!meta.getExifTagString("Exif.Image.PreviewDateTime").isEmpty())) +                   \
if (!d->settings.updIfAvailable || +                        \
!meta.getExifTagString("Exif.Image.PreviewDateTime").isEmpty())  {
                        ret &= meta.setExifTagString("Exif.Image.PreviewDateTime",
                                                     \
dt.toString(exifDateTimeFormat)); @@ -170,15 +170,15 @@ void TimeAdjustTask::run()
             {
                 if (meta.canWriteIptc(d->url.path()))
                 {
-                    if (!d->settings.updIfAvailable || (d->settings.updIfAvailable \
                &&
-                        \
!meta.getIptcTagString("Iptc.Application2.DateCreated").isEmpty())) +                 \
if (!d->settings.updIfAvailable || +                        \
!meta.getIptcTagString("Iptc.Application2.DateCreated").isEmpty())  {
                         ret &= \
                meta.setIptcTagString("Iptc.Application2.DateCreated",
                                                      \
dt.date().toString(Qt::ISODate));  }
 
-                    if (!d->settings.updIfAvailable || (d->settings.updIfAvailable \
                &&
-                        \
!meta.getIptcTagString("Iptc.Application2.TimeCreated").isEmpty())) +                 \
if (!d->settings.updIfAvailable || +                        \
!meta.getIptcTagString("Iptc.Application2.TimeCreated").isEmpty())  {
                         ret &= \
                meta.setIptcTagString("Iptc.Application2.TimeCreated",
                                                      \
dt.time().toString(Qt::ISODate)); @@ -194,43 +194,43 @@ void TimeAdjustTask::run()
             {
                 if (meta.supportXmp() && meta.canWriteXmp(d->url.path()))
                 {
-                    if (!d->settings.updIfAvailable || (d->settings.updIfAvailable \
                &&
-                        \
!meta.getXmpTagString("Xmp.exif.DateTimeOriginal").isEmpty())) +                    \
if (!d->settings.updIfAvailable || +                        \
!meta.getXmpTagString("Xmp.exif.DateTimeOriginal").isEmpty())  {
                         ret &= meta.setXmpTagString("Xmp.exif.DateTimeOriginal",
                                                     dt.toString(xmpDateTimeFormat));
                     }
 
-                    if (!d->settings.updIfAvailable || (d->settings.updIfAvailable \
                &&
-                        \
!meta.getXmpTagString("Xmp.photoshop.DateCreated").isEmpty())) +                    \
if (!d->settings.updIfAvailable || +                        \
!meta.getXmpTagString("Xmp.photoshop.DateCreated").isEmpty())  {
                         ret &= meta.setXmpTagString("Xmp.photoshop.DateCreated",
                                                     dt.toString(xmpDateTimeFormat));
                     }
 
-                    if (!d->settings.updIfAvailable || (d->settings.updIfAvailable \
                &&
-                        !meta.getXmpTagString("Xmp.tiff.DateTime").isEmpty()))
+                    if (!d->settings.updIfAvailable ||
+                        !meta.getXmpTagString("Xmp.tiff.DateTime").isEmpty())
                     {
                         ret &= meta.setXmpTagString("Xmp.tiff.DateTime",
                                                     dt.toString(xmpDateTimeFormat));
                     }
 
-                    if (!d->settings.updIfAvailable || (d->settings.updIfAvailable \
                &&
-                        !meta.getXmpTagString("Xmp.xmp.CreateDate").isEmpty()))
+                    if (!d->settings.updIfAvailable ||
+                        !meta.getXmpTagString("Xmp.xmp.CreateDate").isEmpty())
                     {
                         ret &= meta.setXmpTagString("Xmp.xmp.CreateDate",
                                                     dt.toString(xmpDateTimeFormat));
                     }
 
-                    if (!d->settings.updIfAvailable || (d->settings.updIfAvailable \
                &&
-                        !meta.getXmpTagString("Xmp.xmp.MetadataDate").isEmpty()))
+                    if (!d->settings.updIfAvailable ||
+                        !meta.getXmpTagString("Xmp.xmp.MetadataDate").isEmpty())
                     {
                         ret &= meta.setXmpTagString("Xmp.xmp.MetadataDate",
                                                     dt.toString(xmpDateTimeFormat));
                     }
 
-                    if (!d->settings.updIfAvailable || (d->settings.updIfAvailable \
                &&
-                        !meta.getXmpTagString("Xmp.xmp.ModifyDate").isEmpty()))
+                    if (!d->settings.updIfAvailable ||
+                        !meta.getXmpTagString("Xmp.xmp.ModifyDate").isEmpty())
                     {
                         ret &= meta.setXmpTagString("Xmp.xmp.ModifyDate",
                                                     dt.toString(xmpDateTimeFormat));
@@ -246,29 +246,29 @@ void TimeAdjustTask::run()
             {
                 if (meta.supportXmp() && meta.canWriteXmp(d->url.path()))
                 {
-                    if (!d->settings.updIfAvailable || (d->settings.updIfAvailable \
                &&
-                        \
!meta.getXmpTagString("Xmp.video.DateTimeOriginal").isEmpty())) +                    \
if (!d->settings.updIfAvailable || +                        \
!meta.getXmpTagString("Xmp.video.DateTimeOriginal").isEmpty())  {
                         ret &= meta.setXmpTagString("Xmp.video.DateTimeOriginal",
                                                     dt.toString(xmpDateTimeFormat));
                     }
 
-                    if (!d->settings.updIfAvailable || (d->settings.updIfAvailable \
                &&
-                        \
!meta.getXmpTagString("Xmp.video.DateTimeDigitized").isEmpty())) +                    \
if (!d->settings.updIfAvailable || +                        \
!meta.getXmpTagString("Xmp.video.DateTimeDigitized").isEmpty())  {
                         ret &= meta.setXmpTagString("Xmp.video.DateTimeDigitized",
                                                     dt.toString(xmpDateTimeFormat));
                     }
 
-                    if (!d->settings.updIfAvailable || (d->settings.updIfAvailable \
                &&
-                        \
!meta.getXmpTagString("Xmp.video.ModificationDate").isEmpty())) +                    \
if (!d->settings.updIfAvailable || +                        \
!meta.getXmpTagString("Xmp.video.ModificationDate").isEmpty())  {
                         ret &= meta.setXmpTagString("Xmp.video.ModificationDate",
                                                     dt.toString(xmpDateTimeFormat));
                     }
 
-                    if (!d->settings.updIfAvailable || (d->settings.updIfAvailable \
                &&
-                        !meta.getXmpTagString("Xmp.video.DateUTC").isEmpty()))
+                    if (!d->settings.updIfAvailable ||
+                        !meta.getXmpTagString("Xmp.video.DateUTC").isEmpty())
                     {
                         ret &= meta.setXmpTagString("Xmp.video.DateUTC",
                                                     \
dt.toUTC().toString(xmpDateTimeFormat));


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