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

List:       kde-commits
Subject:    [digikam] utilities/maintenance: fix warnings under MSVC about multiple contructor with same default
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2014-02-28 21:33:21
Message-ID: E1WJV3Z-0001yr-TB () scm ! kde ! org
[Download RAW message or body]

Git commit 4839a90054737f9daa2fc20124fa46b6ba75cee9 by Gilles Caulier.
Committed on 28/02/2014 at 21:32.
Pushed by cgilles into branch 'master'.

fix warnings under MSVC about multiple contructor with same default arguments

M  +2    -3    utilities/maintenance/thumbsgenerator.cpp
M  +3    -3    utilities/maintenance/thumbsgenerator.h

http://commits.kde.org/digikam/4839a90054737f9daa2fc20124fa46b6ba75cee9

diff --git a/utilities/maintenance/thumbsgenerator.cpp \
b/utilities/maintenance/thumbsgenerator.cpp index 5b0f55e..ddfdb34 100644
--- a/utilities/maintenance/thumbsgenerator.cpp
+++ b/utilities/maintenance/thumbsgenerator.cpp
@@ -6,7 +6,7 @@
  * Date        : 2006-30-08
  * Description : batch thumbnails generator
  *
- * Copyright (C) 2006-2013 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2006-2014 by Gilles Caulier <caulier dot gilles at gmail dot com>
  * Copyright (C) 2012      by Andi Clemens <andi dot clemens at gmail dot com>
  *
  * This program is free software; you can redistribute it
@@ -144,8 +144,7 @@ void ThumbsGenerator::slotStart()
     if (!d->rebuildAll)
     {
         QHash<QString, int> filePaths = \
                ThumbnailDatabaseAccess().db()->getFilePathsWithThumbnail();
-
-        QStringList::iterator it = d->allPicturesPath.begin();
+        QStringList::iterator it      = d->allPicturesPath.begin();
 
         while (it != d->allPicturesPath.end())
         {
diff --git a/utilities/maintenance/thumbsgenerator.h \
b/utilities/maintenance/thumbsgenerator.h index f99ba33..141d9eb 100644
--- a/utilities/maintenance/thumbsgenerator.h
+++ b/utilities/maintenance/thumbsgenerator.h
@@ -6,7 +6,7 @@
  * Date        : 2006-30-08
  * Description : batch thumbnails generator
  *
- * Copyright (C) 2006-2013 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2006-2014 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
@@ -44,11 +44,11 @@ public:
 
     /** Constructor using Album Id as argument. If Id = -1, whole Albums collection \
                is processed.
      */
-    explicit ThumbsGenerator(const bool rebuildAll = true, int albumId=-1, \
ProgressItem* const parent = 0); +    explicit ThumbsGenerator(const bool rebuildAll, \
int albumId, ProgressItem* const parent = 0);  
     /** Constructor using AlbumList as argument. If list is empty, whole Albums \
                collection is processed.
      */
-    ThumbsGenerator(const bool rebuildAll = true, const AlbumList& list=AlbumList(), \
ProgressItem* const parent = 0); +    ThumbsGenerator(const bool rebuildAll, const \
AlbumList& list, ProgressItem* const parent = 0);  ~ThumbsGenerator();
 
     void setUseMultiCoreCPU(bool b);


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