New upstream version 3.2.1+dfsg1upstream/3.2.1+dfsg1

6 files changed, 9 insertions, 9 deletions

diff --git a/SQLiteStudio3/coreSQLiteStudio/plugins/plugin.h b/SQLiteStudio3/coreSQLiteStudio/plugins/plugin.h
index 183adf7..8cbbe78 100644
--- a/SQLiteStudio3/coreSQLiteStudio/plugins/plugin.h
+++ b/SQLiteStudio3/coreSQLiteStudio/plugins/plugin.h
@@ -34,7 +34,7 @@ class CfgMain;
  * };
  * @endcode
  *
- * Full tutorial for writting plugins is at: http://wiki.sqlitestudio.pl/index.php/Writting_plugins
+ * Full tutorial for writting plugins is at: https://github.com/pawelsalawa/sqlitestudio/wiki/Writting_plugins
  *
  * SQLiteStudio looks for plugins in following directories:
  * <ul>
diff --git a/SQLiteStudio3/coreSQLiteStudio/plugins/pluginsymbolresolver.cpp b/SQLiteStudio3/coreSQLiteStudio/plugins/pluginsymbolresolver.cpp
index 39988bd..43540b0 100644
--- a/SQLiteStudio3/coreSQLiteStudio/plugins/pluginsymbolresolver.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/plugins/pluginsymbolresolver.cpp
@@ -19,14 +19,14 @@ void PluginSymbolResolver::addLookupSubFolder(const QString &name)
 bool PluginSymbolResolver::load()
 {
     QStringList paths = qApp->libraryPaths();
-    foreach (QString path, paths)
-        foreach (QString subFolder, subFolders)
+    for (QString path : paths)
+        for (QString subFolder : subFolders)
             paths << path + "/" + subFolder;
 
-    foreach (QString path, paths)
+    for (QString path : paths)
     {
         QDir dir(path);
-        foreach (QString file, dir.entryList(nameFilters))
+        for (QString file : dir.entryList(nameFilters))
         {
             lib.setFileName(path+"/"+file);
             if (lib.load())
diff --git a/SQLiteStudio3/coreSQLiteStudio/plugins/populatedictionary.cpp b/SQLiteStudio3/coreSQLiteStudio/plugins/populatedictionary.cpp
index 3d78de5..fd654ad 100644
--- a/SQLiteStudio3/coreSQLiteStudio/plugins/populatedictionary.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/plugins/populatedictionary.cpp
@@ -35,7 +35,7 @@ bool PopulateDictionaryEngine::beforePopulating(Db* db, const QString& table)
     file.close();
 
     if (cfg.PopulateDictionary.Lines.get())
-        dictionary = dataStr.split("\n");
+        dictionary = dataStr.split(QRegExp("(\r\n|\n|\r)"));
     else
         dictionary = dataStr.split(QRegExp("\\s+"));
 
diff --git a/SQLiteStudio3/coreSQLiteStudio/plugins/scriptingqt.cpp b/SQLiteStudio3/coreSQLiteStudio/plugins/scriptingqt.cpp
index 334c0cc..79824dc 100644
--- a/SQLiteStudio3/coreSQLiteStudio/plugins/scriptingqt.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/plugins/scriptingqt.cpp
@@ -221,7 +221,7 @@ bool ScriptingQt::init()
 
 void ScriptingQt::deinit()
 {
-    foreach (Context* ctx, contexts)
+    for (Context* ctx : contexts)
         delete ctx;
 
     contexts.clear();
diff --git a/SQLiteStudio3/coreSQLiteStudio/plugins/sqlformatterplugin.cpp b/SQLiteStudio3/coreSQLiteStudio/plugins/sqlformatterplugin.cpp
index 5e1d610..350c024 100644
--- a/SQLiteStudio3/coreSQLiteStudio/plugins/sqlformatterplugin.cpp
+++ b/SQLiteStudio3/coreSQLiteStudio/plugins/sqlformatterplugin.cpp
@@ -17,7 +17,7 @@ QString SqlFormatterPlugin::format(const QString& code, Db* contextDb)
     }
 
     QStringList formattedQueries;
-    foreach (SqliteQueryPtr query, parser.getQueries())
+    for (SqliteQueryPtr query : parser.getQueries())
         formattedQueries << format(query);
 
     return formattedQueries.join("\n");
diff --git a/SQLiteStudio3/coreSQLiteStudio/plugins/uiconfiguredplugin.h b/SQLiteStudio3/coreSQLiteStudio/plugins/uiconfiguredplugin.h
index 1426117..b2a0b8d 100644
--- a/SQLiteStudio3/coreSQLiteStudio/plugins/uiconfiguredplugin.h
+++ b/SQLiteStudio3/coreSQLiteStudio/plugins/uiconfiguredplugin.h
@@ -15,7 +15,7 @@ class API_EXPORT UiConfiguredPlugin
          *
          * This method should return the object name of the top-most widget found in the provided *.ui file.
          *
-         * For more details see: http://wiki.sqlitestudio.pl/index.php/Plugin_UI_forms
+         * For more details see: https://github.com/pawelsalawa/sqlitestudio/wiki/Plugin_UI_forms
          */
         virtual QString getConfigUiForm() const = 0;