--- s10k/CommonUtils/util.h	2017/10/05 17:48:32	1073
+++ s10k/CommonUtils/util.h	2017/12/30 14:30:28	1095
@@ -1,186 +1,186 @@
-/**
- * Copyright (C) 2017 - Fábio Bento (random-guy)
- *
- * This library is distributed under the MIT License. See notice at the end
- * of this file.
- *
- */
-
-#ifndef UTIL_H
-#define UTIL_H
-
-#include <QtGlobal> // for debug macros
-#ifdef QT_DEBUG
-#include <QDebug>
-#endif
-#include <QRegularExpression>
-#include <QString>
-#include <QUrl>
-#include <QCoreApplication>
-#include <QSettings>
-#include <QXmlStreamReader>
-#include <memory>
-#include <QDirIterator>
-#include <QCryptographicHash>
-#include <string.h>
-
-#ifdef QT_GUI_LIB
-#include <QMessageBox>
-#include <QFileDialog>
-#include <QListView>
-#include <QTreeView>
-#include <QDesktopServices>
-#include <QDesktopWidget>
-#include <QStatusBar>
-#include <QTableWidget>
-#include <QCheckBox>
-#include <QHBoxLayout>
-#endif
-
-/**
-  Utilities functions (global)
-  **/
-namespace Util{
-
-namespace FileSystem {
-
-QString normalizePath(QString path);
-
-QString cutName(QString path);
-
-QString cutNameWithoutBackSlash(QString path);
-
-QString normalizeAndQuote(QString path);
-
-bool copyDir(const QString &fromPath, QString toPath, const bool isRecursive = false);
-
-bool rmDir(const QString &dirPath);
-
-QStringList getFolderFilesByWildcard(const QString &entryFolder, const QString &wildcard, bool isRecursive = false);
-
-QStringList filterFilesByWildcard(const QStringList &filePaths, const QString &wildcard);
-
-QString fileHash(const QString &fileName, QCryptographicHash::Algorithm hashAlgorithm);
-
-QString getAppPath();
-
-bool backupFile(QString file);
-
-}
-
-namespace String {
-
-// Not using a function because we need to have this as inline function (in both debug and release mods)
-// QString(string).toUtf8().constData() -> since this creates a temporary it needs to be inline
-#ifndef QSTR_TO_CSTR
-#  define QSTR_TO_CSTR qUtf8Printable
-#endif
-
-QString insertApostrophes(const QString &currString);
-
-QString insertQuotes(const QString &currString);
-
-QString fullTrim(QString str);
-
-QStringList substring(QString myString, QString separator, Qt::CaseSensitivity cs = Qt::CaseSensitive);
-
-QString normalizeDecimalSeparator(QString value);
-
-// no problem here with "temporary" cstr
-// https://stackoverflow.com/questions/1971183/when-does-c-allocate-deallocate-string-literals
-const char* boolToCstr(bool currentBoolean);
-
-}
-
-#ifdef QT_GUI_LIB
-namespace Dialogs {
-
-void showInfo(const QString &message);
-
-void showRichInfo(const QString &message);
-
-void showWarning(const QString &message);
-
-void showError(const QString &message);
-
-void showRichError(const QString &message);
-
-bool showQuestion(QWidget * parent, QString message, QMessageBox::StandardButton standardButton=QMessageBox::NoButton);
-
-QMessageBox::StandardButton showQuestionWithCancel(QWidget * parent, QString message, QMessageBox::StandardButton standardButton=QMessageBox::NoButton);
-
-QStringList multipleDirSelection(const QString &title);
-
-}
-#endif
-
-namespace Validation {
-
-bool checkEmptySpaces(QStringList toCheck);
-bool checkIfIntegers(QStringList toCheck);
-bool checkIfDoubles(QStringList toCheck);
-bool isStringInteger(QString myString);
-bool isStringDouble(QString myString);
-
-}
-
-#ifdef QT_GUI_LIB
-namespace TableWidget {
-
-void addRow(QTableWidget *myTable, QStringList &columns);
-QModelIndexList getSelectedRows(QTableWidget *myTable);
-QModelIndexList getCurrentRows(QTableWidget *myTable);
-int getNumberSelectedRows(QTableWidget *myTable);
-void clearContents(QTableWidget *myTable, const QString &nothingToClearMessage, const QString &questionToClear);
-void clearContentsNoPrompt(QTableWidget *myTable);
-void addCheckBox(QTableWidget *myTable, int row, int column, QCheckBox *checkbox = nullptr);
-QCheckBox* getCheckBoxFromCell(QTableWidget *myTable, int row, int column);
-void swapRows(QTableWidget *myTable, const int indexSourceRow, const int indexDestinationRow, bool selectSwappedRow);
-void deleteSelectedRows(QTableWidget *myTable);
-
-}
-#endif
-
-namespace System {
-#ifdef QT_GUI_LIB
-QRect getScreenResolution();
-#endif
-}
-
-#ifdef QT_GUI_LIB
-namespace StatusBar {
-
-void showError(QStatusBar * const statusBar, const QString &message);
-void showSuccess(QStatusBar * const  statusBar,const QString &message);
-
-}
-#endif
-
-
-}
-#endif // UTIL_H
-
-/**
- * Copyright (c) 2017 - Fábio Bento (random-guy)
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
+/**
+ * Copyright (C) 2017 - Fábio Bento (random-guy)
+ *
+ * This library is distributed under the MIT License. See notice at the end
+ * of this file.
+ *
+ */
+
+#ifndef UTIL_H
+#define UTIL_H
+
+#include <QtGlobal> // for debug macros
+#ifdef QT_DEBUG
+#include <QDebug>
+#endif
+#include <QRegularExpression>
+#include <QString>
+#include <QUrl>
+#include <QCoreApplication>
+#include <QSettings>
+#include <QXmlStreamReader>
+#include <memory>
+#include <QDirIterator>
+#include <QCryptographicHash>
+#include <string.h>
+
+#ifdef QT_GUI_LIB
+#include <QMessageBox>
+#include <QFileDialog>
+#include <QListView>
+#include <QTreeView>
+#include <QDesktopServices>
+#include <QDesktopWidget>
+#include <QStatusBar>
+#include <QTableWidget>
+#include <QCheckBox>
+#include <QHBoxLayout>
+#endif
+
+/**
+  Utilities functions (global)
+  **/
+namespace Util{
+
+namespace FileSystem {
+
+QString normalizePath(QString path);
+
+QString cutName(QString path);
+
+QString cutNameWithoutBackSlash(QString path);
+
+QString normalizeAndQuote(QString path);
+
+bool copyDir(const QString &fromPath, QString toPath, const bool isRecursive = false);
+
+bool rmDir(const QString &dirPath);
+
+QStringList getFolderFilesByWildcard(const QString &entryFolder, const QString &wildcard, bool isRecursive = false);
+
+QStringList filterFilesByWildcard(const QStringList &filePaths, const QString &wildcard);
+
+QString fileHash(const QString &fileName, QCryptographicHash::Algorithm hashAlgorithm);
+
+QString getAppPath();
+
+bool backupFile(const QString &file, QString newFilename="");
+
+}
+
+namespace String {
+
+// Not using a function because we need to have this as inline function (in both debug and release mods)
+// QString(string).toUtf8().constData() -> since this creates a temporary it needs to be inline
+#ifndef QSTR_TO_CSTR
+#  define QSTR_TO_CSTR qUtf8Printable
+#endif
+
+QString insertApostrophes(const QString &currString);
+
+QString insertQuotes(const QString &currString);
+
+QString fullTrim(QString str);
+
+QStringList substring(QString myString, QString separator, Qt::CaseSensitivity cs = Qt::CaseSensitive);
+
+QString normalizeDecimalSeparator(QString value);
+
+// no problem here with "temporary" cstr
+// https://stackoverflow.com/questions/1971183/when-does-c-allocate-deallocate-string-literals
+const char* boolToCstr(bool currentBoolean);
+
+}
+
+#ifdef QT_GUI_LIB
+namespace Dialogs {
+
+void showInfo(const QString &message);
+
+void showRichInfo(const QString &message);
+
+void showWarning(const QString &message);
+
+void showError(const QString &message);
+
+void showRichError(const QString &message);
+
+bool showQuestion(QWidget * parent, QString message, QMessageBox::StandardButton standardButton=QMessageBox::NoButton);
+
+QMessageBox::StandardButton showQuestionWithCancel(QWidget * parent, QString message, QMessageBox::StandardButton standardButton=QMessageBox::NoButton);
+
+QStringList multipleDirSelection(const QString &title);
+
+}
+#endif
+
+namespace Validation {
+
+bool checkEmptySpaces(QStringList toCheck);
+bool checkIfIntegers(QStringList toCheck);
+bool checkIfDoubles(QStringList toCheck);
+bool isStringInteger(QString myString);
+bool isStringDouble(QString myString);
+
+}
+
+#ifdef QT_GUI_LIB
+namespace TableWidget {
+
+void addRow(QTableWidget *myTable, QStringList &columns);
+QModelIndexList getSelectedRows(QTableWidget *myTable);
+QModelIndexList getCurrentRows(QTableWidget *myTable);
+int getNumberSelectedRows(QTableWidget *myTable);
+void clearContents(QTableWidget *myTable, const QString &nothingToClearMessage, const QString &questionToClear);
+void clearContentsNoPrompt(QTableWidget *myTable);
+void addCheckBox(QTableWidget *myTable, int row, int column, QCheckBox *checkbox = nullptr);
+QCheckBox* getCheckBoxFromCell(QTableWidget *myTable, int row, int column);
+void swapRows(QTableWidget *myTable, const int indexSourceRow, const int indexDestinationRow, bool selectSwappedRow);
+void deleteSelectedRows(QTableWidget *myTable);
+
+}
+#endif
+
+namespace System {
+#ifdef QT_GUI_LIB
+QRect getScreenResolution();
+#endif
+}
+
+#ifdef QT_GUI_LIB
+namespace StatusBar {
+
+void showError(QStatusBar * const statusBar, const QString &message);
+void showSuccess(QStatusBar * const  statusBar,const QString &message);
+
+}
+#endif
+
+
+}
+#endif // UTIL_H
+
+/**
+ * Copyright (c) 2017 - Fábio Bento (random-guy)
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */