Update upstream source from tag 'upstream/3.2.1+dfsg1'

Update to upstream version '3.2.1+dfsg1'
with Debian dir 5ea0333565de4dc898c062cc0ff4ba1153e2c1e4

9 files changed, 40 insertions, 40 deletions

diff --git a/SQLiteStudio3/sqlitestudiocli/commands/clicommand.cpp b/SQLiteStudio3/sqlitestudiocli/commands/clicommand.cpp
index 3002ee5..20f180e 100644
--- a/SQLiteStudio3/sqlitestudiocli/commands/clicommand.cpp
+++ b/SQLiteStudio3/sqlitestudiocli/commands/clicommand.cpp
@@ -64,7 +64,7 @@ QStringList CliCommand::complete(const QStringList& args)
 
     QStringList results;
     results += syntax.getStrictArgumentCandidates();
-    foreach (int id, syntax.getRegularArgumentCandidates())
+    for (int id : syntax.getRegularArgumentCandidates())
         results += getCompletionValuesFor(id, args.last());
 
     return results;
@@ -93,9 +93,9 @@ void CliCommand::printBox(const QString& str)
 
     QStringList lines = str.split("\n");
     println(".---------------------------");
-    foreach (const QString& line, lines)
+    for (const QString& line : lines)
     {
-        foreach (const QString& lineWithMargin, applyMargin(line, cols - 3)) // 2 for "| " and 1 for final new line character
+        for (const QString& lineWithMargin : applyMargin(line, cols - 3)) // 2 for "| " and 1 for final new line character
             println("| " + lineWithMargin);
     }
 
@@ -153,7 +153,7 @@ QStringList CliCommand::getCompletionTables()
     resolver.setIgnoreSystemObjects(true);
     results += wrapObjNamesIfNeeded(resolver.getTables(), dialect);
     results += prefixEach("temp.", wrapObjNamesIfNeeded(resolver.getTables("temp"), dialect));
-    foreach (const QString& database, resolver.getDatabases())
+    for (const QString& database : resolver.getDatabases())
         results += prefixEach(wrapObjIfNeeded(database, Dialect::Sqlite3)+".", wrapObjNamesIfNeeded(resolver.getTables(database), dialect));
 
     return results;
@@ -171,7 +171,7 @@ QStringList CliCommand::getCompletionIndexes()
     resolver.setIgnoreSystemObjects(true);
     results += wrapObjNamesIfNeeded(resolver.getIndexes(), dialect);
     results += prefixEach("temp.", wrapObjNamesIfNeeded(resolver.getIndexes("temp"), dialect));
-    foreach (const QString& database, resolver.getDatabases())
+    for (const QString& database : resolver.getDatabases())
         results += prefixEach(wrapObjIfNeeded(database, Dialect::Sqlite3)+".", wrapObjNamesIfNeeded(resolver.getIndexes(database), dialect));
 
     return results;
@@ -189,7 +189,7 @@ QStringList CliCommand::getCompletionTriggers()
     resolver.setIgnoreSystemObjects(true);
     results += wrapObjNamesIfNeeded(resolver.getTriggers(), dialect);
     results += prefixEach("temp.", wrapObjNamesIfNeeded(resolver.getTriggers("temp"), dialect));
-    foreach (const QString& database, resolver.getDatabases())
+    for (const QString& database : resolver.getDatabases())
         results += prefixEach(wrapObjIfNeeded(database, Dialect::Sqlite3)+".", wrapObjNamesIfNeeded(resolver.getTriggers(database), dialect));
 
     return results;
@@ -207,7 +207,7 @@ QStringList CliCommand::getCompletionViews()
     resolver.setIgnoreSystemObjects(true);
     results += wrapObjNamesIfNeeded(resolver.getViews(), dialect);
     results += prefixEach("temp.", wrapObjNamesIfNeeded(resolver.getViews("temp"), dialect));
-    foreach (const QString& database, resolver.getDatabases())
+    for (const QString& database : resolver.getDatabases())
         results += prefixEach(wrapObjIfNeeded(database, Dialect::Sqlite3)+".", wrapObjNamesIfNeeded(resolver.getViews(database), dialect));
 
     return results;
@@ -228,7 +228,7 @@ QStringList CliCommand::getCompletionFiles(const QString& partialValue)
 
     QStringList results;
     QString name;
-    foreach (const QFileInfo& entry, entries)
+    for (const QFileInfo& entry : entries)
     {
         name = entry.fileName();
         if (dir != QDir::current())
@@ -248,7 +248,7 @@ QStringList CliCommand::getCompletionDirs(const QString& partialValue)
 
     QStringList results;
     QString name;
-    foreach (const QFileInfo& entry, entries)
+    for (const QFileInfo& entry : entries)
     {
         name = entry.fileName();
         if (dir != QDir::current())
diff --git a/SQLiteStudio3/sqlitestudiocli/commands/clicommanddblist.cpp b/SQLiteStudio3/sqlitestudiocli/commands/clicommanddblist.cpp
index 35f9c47..271a44f 100644
--- a/SQLiteStudio3/sqlitestudiocli/commands/clicommanddblist.cpp
+++ b/SQLiteStudio3/sqlitestudiocli/commands/clicommanddblist.cpp
@@ -22,7 +22,7 @@ void CliCommandDbList::execute()
 
     int maxNameLength = tr("Name", "CLI db name column").length();
     int lgt = 0;
-    foreach (Db* db, dbList)
+    for (Db* db : dbList)
     {
         lgt = db->getName().length() + 1;
         maxNameLength = qMax(maxNameLength, lgt);
@@ -46,7 +46,7 @@ void CliCommandDbList::execute()
     println(msg);
 
     QString name;
-    foreach (Db* db, dbList)
+    for (Db* db : dbList)
     {
         bool open = db->isOpen();
         path = db->getPath();
diff --git a/SQLiteStudio3/sqlitestudiocli/commands/clicommanddir.cpp b/SQLiteStudio3/sqlitestudiocli/commands/clicommanddir.cpp
index c61f503..8410cba 100644
--- a/SQLiteStudio3/sqlitestudiocli/commands/clicommanddir.cpp
+++ b/SQLiteStudio3/sqlitestudiocli/commands/clicommanddir.cpp
@@ -15,7 +15,7 @@ void CliCommandDir::execute()
         entries = dir.entryInfoList(QDir::AllEntries|QDir::NoDotAndDotDot, QDir::DirsFirst|QDir::LocaleAware|QDir::Name);

 

     QString name;

-    foreach (const QFileInfo& entry, entries)

+    for (const QFileInfo& entry : entries)

     {

         name = entry.fileName();

         if (entry.isDir())

diff --git a/SQLiteStudio3/sqlitestudiocli/commands/clicommandfactory.cpp b/SQLiteStudio3/sqlitestudiocli/commands/clicommandfactory.cpp
index 742709b..32f972f 100644
--- a/SQLiteStudio3/sqlitestudiocli/commands/clicommandfactory.cpp
+++ b/SQLiteStudio3/sqlitestudiocli/commands/clicommandfactory.cpp
@@ -78,7 +78,7 @@ void CliCommandFactory::registerCommand(CliCommandCreatorFunc func)
     cmd->defineSyntax();
 
     mapping[cmd->getName()] = func;
-    foreach (const QString& alias, cmd->aliases())
+    for (const QString& alias : cmd->aliases())
         mapping[alias] = func;
 
     delete cmd;
diff --git a/SQLiteStudio3/sqlitestudiocli/commands/clicommandhelp.cpp b/SQLiteStudio3/sqlitestudiocli/commands/clicommandhelp.cpp
index 7a957c3..5f92fd4 100644
--- a/SQLiteStudio3/sqlitestudiocli/commands/clicommandhelp.cpp
+++ b/SQLiteStudio3/sqlitestudiocli/commands/clicommandhelp.cpp
@@ -77,7 +77,7 @@ void CliCommandHelp::printHelp()
 

     names.sort();

     QStringList msgList;

-    foreach (const QString& cmd, names)

+    for (const QString& cmd : names)

     {

         msgList << (CFG_CLI.Console.CommandPrefixChar.get() + pad(cmd, width, ' ') + " - " + allCommands[cmd]->shortHelp());

         delete allCommands[cmd];

diff --git a/SQLiteStudio3/sqlitestudiocli/commands/clicommandhistory.cpp b/SQLiteStudio3/sqlitestudiocli/commands/clicommandhistory.cpp
index 7d08846..c7b16f8 100644
--- a/SQLiteStudio3/sqlitestudiocli/commands/clicommandhistory.cpp
+++ b/SQLiteStudio3/sqlitestudiocli/commands/clicommandhistory.cpp
@@ -26,7 +26,7 @@ void CliCommandHistory::execute()
 

     int cols = getCliColumns();

     QString hline = pad("", cols, '-');

-    foreach (const QString& line, cli->getHistory())

+    for (const QString& line : cli->getHistory())

     {

         print(hline);

         println(line);

diff --git a/SQLiteStudio3/sqlitestudiocli/commands/clicommandsql.cpp b/SQLiteStudio3/sqlitestudiocli/commands/clicommandsql.cpp
index 7ae78e5..4b66592 100644
--- a/SQLiteStudio3/sqlitestudiocli/commands/clicommandsql.cpp
+++ b/SQLiteStudio3/sqlitestudiocli/commands/clicommandsql.cpp
@@ -91,7 +91,7 @@ void CliCommandSql::printResultsClassic(QueryExecutor* executor, SqlQueryPtr res
     int resultColumnCount = executor->getResultColumns().size();
 
     // Columns
-    foreach (const QueryExecutor::ResultColumnPtr& resCol, executor->getResultColumns())
+    for (const QueryExecutor::ResultColumnPtr& resCol : executor->getResultColumns())
         qOut << resCol->displayName << "|";
 
     qOut << "\n";
@@ -105,7 +105,7 @@ void CliCommandSql::printResultsClassic(QueryExecutor* executor, SqlQueryPtr res
         row = results->next();
         i = 0;
         values = row->valueList().mid(0, resultColumnCount);
-        foreach (QVariant value, values)
+        for (QVariant value : values)
         {
             qOut << getValueString(value);
             if ((i + 1) < resultColumnCount)
@@ -148,7 +148,7 @@ void CliCommandSql::printResultsFixed(QueryExecutor* executor, SqlQueryPtr resul
 
     // Columns
     QStringList columns;
-    foreach (const QueryExecutor::ResultColumnPtr& resCol, executor->getResultColumns())
+    for (const QueryExecutor::ResultColumnPtr& resCol : executor->getResultColumns())
         columns << resCol->displayName;
 
     printColumnHeader(widths, columns);
@@ -183,7 +183,7 @@ void CliCommandSql::printResultsColumns(QueryExecutor* executor, SqlQueryPtr res
     // Get widths of each column in every data row, remember the longest ones
     QList<SortedColumnWidth*> columnWidths;
     SortedColumnWidth* colWidth = nullptr;
-    foreach (const QueryExecutor::ResultColumnPtr& resCol, resultColumns)
+    for (const QueryExecutor::ResultColumnPtr& resCol : resultColumns)
     {
         colWidth = new SortedColumnWidth();
         colWidth->setHeaderWidth(resCol->displayName.length());
@@ -192,7 +192,7 @@ void CliCommandSql::printResultsColumns(QueryExecutor* executor, SqlQueryPtr res
     }
 
     int dataLength;
-    foreach (const SqlResultsRowPtr& row, allRows)
+    for (const SqlResultsRowPtr& row : allRows)
     {
         for (int i = 0; i < resultColumnsCount; i++)
         {
@@ -203,8 +203,8 @@ void CliCommandSql::printResultsColumns(QueryExecutor* executor, SqlQueryPtr res
 
     // Calculate width as it would be required to display entire rows
     int totalWidth = 0;
-    foreach (colWidth, columnWidths)
-        totalWidth += colWidth->getWidth();
+    for (SortedColumnWidth* colWd : columnWidths)
+        totalWidth += colWd->getWidth();
 
     totalWidth += (resultColumnsCount - 1); // column separators
 
@@ -223,12 +223,12 @@ void CliCommandSql::printResultsColumns(QueryExecutor* executor, SqlQueryPtr res
 
     // Printing
     QList<int> finalWidths;
-    foreach (colWidth, columnWidths)
-        finalWidths << colWidth->getWidth();
+    for (SortedColumnWidth* colWd : columnWidths)
+        finalWidths << colWd->getWidth();
 
     printColumnHeader(finalWidths, headerNames);
 
-    foreach (SqlResultsRowPtr row, allRows)
+    for (SqlResultsRowPtr row : allRows)
         printColumnDataRow(finalWidths, row, resultColumnsCount);
 
     qOut.flush();
@@ -239,14 +239,14 @@ void CliCommandSql::printResultsRowByRow(QueryExecutor* executor, SqlQueryPtr re
     // Columns
     int resultColumnCount = executor->getResultColumns().size();
     int colWidth = 0;
-    foreach (const QueryExecutor::ResultColumnPtr& resCol, executor->getResultColumns())
+    for (const QueryExecutor::ResultColumnPtr& resCol : executor->getResultColumns())
     {
         if (resCol->displayName.length() > colWidth)
             colWidth = resCol->displayName.length();
     }
 
     QStringList columns;
-    foreach (const QueryExecutor::ResultColumnPtr& resCol, executor->getResultColumns())
+    for (const QueryExecutor::ResultColumnPtr& resCol : executor->getResultColumns())
         columns << pad(resCol->displayName, -colWidth, ' ');
 
     // Data
@@ -262,7 +262,7 @@ void CliCommandSql::printResultsRowByRow(QueryExecutor* executor, SqlQueryPtr re
         i = 0;
         rowCntString = " " + rowCntTemplate.arg(rowCnt) + " ";
         qOut << center(rowCntString, termWidth - 1, '-') << "\n";
-        foreach (QVariant value, row->valueList().mid(0, resultColumnCount))
+        for (QVariant value : row->valueList().mid(0, resultColumnCount))
         {
             qOut << columns[i] + ": " + getValueString(value) << "\n";
             i++;
@@ -293,7 +293,7 @@ void CliCommandSql::shrinkColumns(QList<CliCommandSql::SortedColumnWidth*>& colu
         qSort(columnWidths);
 
         // See if we can shrink headers only, or we already need to shrink the data
-        foreach (SortedColumnWidth* colWidth, columnWidths)
+        for (SortedColumnWidth* colWidth : columnWidths)
         {
             if (colWidth->isHeaderLonger())
             {
@@ -360,7 +360,7 @@ void CliCommandSql::printColumnHeader(const QList<int>& widths, const QStringLis
 {
     QStringList line;
     int i = 0;
-    foreach (const QString& col, columns)
+    for (const QString& col : columns)
     {
         line << pad(col.left(widths[i]), widths[i], ' ');
         i++;
@@ -380,7 +380,7 @@ void CliCommandSql::printColumnDataRow(const QList<int>& widths, const SqlResult
 {
     int i = 0;
     QStringList line;
-    foreach (const QVariant& value, row->valueList().mid(0, resultColumnCount))
+    for (const QVariant& value : row->valueList().mid(0, resultColumnCount))
     {
         line << pad(getValueString(value).left(widths[i]), widths[i], ' ');
         i++;
diff --git a/SQLiteStudio3/sqlitestudiocli/commands/clicommandtables.cpp b/SQLiteStudio3/sqlitestudiocli/commands/clicommandtables.cpp
index f5a9708..8a8f5dc 100644
--- a/SQLiteStudio3/sqlitestudiocli/commands/clicommandtables.cpp
+++ b/SQLiteStudio3/sqlitestudiocli/commands/clicommandtables.cpp
@@ -47,9 +47,9 @@ void CliCommandTables::execute()
     println(pad(tr("Database"), width, ' ') + " " + tr("Table"));

     println(pad("", width, '-') + "-------------------");

 

-    foreach (const QString& dbName, dbList)

+    for (const QString& dbName : dbList)

     {

-        foreach (const QString& table, resolver.getTables(dbName))

+        for (const QString& table : resolver.getTables(dbName))

             println(pad(dbName, width, ' ') + " " + table);

     }

 

diff --git a/SQLiteStudio3/sqlitestudiocli/commands/clicommandtree.cpp b/SQLiteStudio3/sqlitestudiocli/commands/clicommandtree.cpp
index cbd57c6..c99fe66 100644
--- a/SQLiteStudio3/sqlitestudiocli/commands/clicommandtree.cpp
+++ b/SQLiteStudio3/sqlitestudiocli/commands/clicommandtree.cpp
@@ -32,7 +32,7 @@ void CliCommandTree::execute()
 

     AsciiTree tree;

     tree.label = cli->getCurrentDb()->getName();

-    foreach (const QString& database, databases)

+    for (const QString& database : databases)

     {

         tree.childs << getDatabaseTree(database, resolver, printColumns);

     }

@@ -52,11 +52,11 @@ AsciiTree CliCommandTree::getDatabaseTree(const QString& database, SchemaResolve
     AsciiTree viewsTree;

 

     tablesTree.label = metaNodeNameTemplate.arg(tr("Tables"));

-    foreach (const QString& table, tables)

+    for (const QString& table : tables)

         tablesTree.childs << getTableTree(database, table, resolver, printColumns);

 

     viewsTree.label = metaNodeNameTemplate.arg(tr("Views"));

-    foreach (const QString& view, views)

+    for (const QString& view : views)

         viewsTree.childs << getViewTree(database, view, resolver);

 

     tree.label = database;

@@ -81,16 +81,16 @@ AsciiTree CliCommandTree::getTableTree(const QString& database, const QString& t
     if (printColumns)

     {

         columnsTree.label = metaNodeNameTemplate.arg(tr("Columns"));

-        foreach (const QString& column, columns)

+        for (const QString& column : columns)

             columnsTree.childs << getTreeLeaf(column);

     }

 

     indexesTree.label = metaNodeNameTemplate.arg(tr("Indexes"));

-    foreach (const QString& index, indexes)

+    for (const QString& index : indexes)

         indexesTree.childs << getTreeLeaf(index);

 

     triggersTree.label = metaNodeNameTemplate.arg(tr("Triggers"));

-    foreach (const QString& trig, triggers)

+    for (const QString& trig : triggers)

         triggersTree.childs << getTreeLeaf(trig);

 

     if (printColumns)

@@ -111,7 +111,7 @@ AsciiTree CliCommandTree::getViewTree(const QString& database, const QString& vi
     AsciiTree triggersTree;

 

     triggersTree.label = metaNodeNameTemplate.arg(tr("Triggers"));

-    foreach (const QString& trig, triggers)

+    for (const QString& trig : triggers)

         triggersTree.childs << getTreeLeaf(trig);

 

     tree.label = view;