Minor fixes for RenameParser functions.

diff --git a/renameparser/functions.cpp b/renameparser/functions.cpp
index 2516876b5374784f44766e9fba0c4d1cc7f438b2..67206128cadd9a6a31263e98f5c313cfeb8c6e26 100644 (file)
--- a/renameparser/functions.cpp
+++ b/renameparser/functions.cpp
@@ -161,7 +161,7 @@ QString div(const QStringList &args)
 QString substr(const QStringList &args)
 {
        if (args.count() < 2)
-               return;
+               return "";
 
        int startpos = args.at(1).toInt();
        int endpos = -1;

diff --git a/renameparser/functions.h b/renameparser/functions.h
index 76e003f5cb46e62068ffcbb1299aeacb366bd03c..cbf14e58c0558ce32e18e1569fc885d640c6e58b 100644 (file)
--- a/renameparser/functions.h
+++ b/renameparser/functions.h
@@ -10,6 +10,9 @@ namespace RenameFunctions
 {
 #ifdef max
 #undef max
+#endif
+#ifdef min
+#undef min
 #endif
        QString max(const QStringList &args);
        QString min(const QStringList &args);