Use std::swap instead of temporary values

[geeqie.git] / src / filedata.cc

diff --git a/src/filedata.cc b/src/filedata.cc
index 1cb707c..c0a04ab 100644 (file)
--- a/src/filedata.cc
+++ b/src/filedata.cc
@@ -19,22 +19,40 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "main.h"
 #include "filedata.h"
 
-#include "filefilter.h"
-#include "cache.h"
-#include "thumb-standard.h"
-#include "ui-fileops.h"
-#include "metadata.h"
-#include "trash.h"
-#include "histogram.h"
-#include "secure-save.h"
+#include <dirent.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
-#include "exif.h"
-#include "misc.h"
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
+#include <utility>
 
+#include <glib-object.h>
 #include <grp.h>
+#include <pwd.h>
+
+#include <config.h>
+
+#include "cache.h"
+#include "debug.h"
+#include "exif.h"
+#include "filefilter.h"
+#include "histogram.h"
+#include "intl.h"
+#include "main-defines.h"
+#include "main.h"
+#include "metadata.h"
+#include "misc.h"
+#include "options.h"
+#include "secure-save.h"
+#include "thumb-standard.h"
+#include "trash.h"
+#include "ui-fileops.h"
 
 #ifdef DEBUG_FILEDATA
 gint global_file_data_count = 0;
@@ -1154,9 +1172,7 @@ gint filelist_sort_compare_filedata(FileData *fa, FileData *fb)
        gint ret;
        if (!filelist_sort_ascend)
                {
-               FileData *tmp = fa;
-               fa = fb;
-               fb = tmp;
+               std::swap(fa, fb);
                }
 
        switch (filelist_sort_method)
@@ -2646,7 +2662,7 @@ gint file_data_verify_ci(FileData *fd, GList *list)
                         * it's location regardless of the user's preference.
                         */
                        gchar *metadata_path = nullptr;
-#ifdef HAVE_EXIV2
+#if HAVE_EXIV2
                        /* but ignore XMP if we are not able to write it */
                        metadata_path = cache_find_location(CACHE_TYPE_XMP_METADATA, fd->path);
 #endif