New upstream version 3.4.4+dfsg.upstream/3.4.4+dfsg

1 files changed, 36 insertions, 1 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/common/utils.h b/SQLiteStudio3/coreSQLiteStudio/common/utils.h
index f7317e2..0ceecc5 100644
--- a/SQLiteStudio3/coreSQLiteStudio/common/utils.h
+++ b/SQLiteStudio3/coreSQLiteStudio/common/utils.h
@@ -2,6 +2,7 @@
 #define UTILS_H
 
 #include "coreSQLiteStudio_global.h"
+#include <functional>
 #include <QList>
 #include <QMutableListIterator>
 #include <QSet>
@@ -66,6 +67,7 @@ API_EXPORT QStringList tokenizeArgs(const QString& str);
 API_EXPORT QStringList prefixEach(const QString& prefix, const QStringList& list);
 API_EXPORT QByteArray hashToBytes(const QHash<QString,QVariant>& hash);
 API_EXPORT QHash<QString,QVariant> bytesToHash(const QByteArray& bytes);
+API_EXPORT QString indentMultiline(const QString& str);
 /**
   * @brief indexOf Extension to QStringList::indexOf().
   *
@@ -261,6 +263,7 @@ API_EXPORT QTextCodec* defaultCodec();
 API_EXPORT QTextCodec* codecForName(const QString& name);
 API_EXPORT QStringList splitByLines(const QString& str);
 API_EXPORT QString joinLines(const QStringList& lines);
+API_EXPORT QStringList sharedLibFileFilters();
 API_EXPORT int sum(const QList<int>& integers);
 API_EXPORT QString getOsString();
 API_EXPORT bool validateEmail(const QString& email);
@@ -289,7 +292,7 @@ API_EXPORT void sortWithReferenceList(QList<QString>& listToSort, const QList<QS
 enum class DistributionType
 {
     PORTABLE,
-    OSX_BOUNDLE,
+    OSX_BUNDLE,
     OS_MANAGED
 };
 
@@ -305,6 +308,36 @@ QList<T> reverse(const QList<T>& list)
     return result;
 }
 
+template <class S, class T>
+QList<T> map(const QList<S>& list, std::function<T(S)> transformer)
+{
+    QList<T> result;
+    for (const S& el : list)
+        result << transformer(el);
+
+    return result;
+}
+
+template <class S, class T>
+QHash<S, T> toHash(const QList<S>& list, std::function<T(S)> transformer)
+{
+    QHash<S, T> result;
+    for (const S& el : list)
+        result[el] = transformer(el);
+
+    return result;
+}
+
+template <class S, class T>
+QSet<T> map(const QSet<S>& set, std::function<T(S)> transformer)
+{
+    QSet<T> result;
+    for (const S& el : set)
+        result << transformer(el);
+
+    return result;
+}
+
 template <class T>
 void removeDuplicates(QList<T>& list)
 {
@@ -328,6 +361,8 @@ API_EXPORT QVariant deserializeFromBytes(const QByteArray& bytes);
 
 API_EXPORT QString readFileContents(const QString& path, QString* err);
 
+API_EXPORT QString toNativePath(const QString& path);
+
 Q_DECLARE_METATYPE(QList<int>)
 
 #endif // UTILS_H