New upstream version 3.3.3+dfsg1.upstream/3.3.3+dfsg1

1 files changed, 24 insertions, 12 deletions

diff --git a/Plugins/DbAndroid/dbandroidshellconnection.cpp b/Plugins/DbAndroid/dbandroidshellconnection.cpp
index e48416d..6ead847 100644
--- a/Plugins/DbAndroid/dbandroidshellconnection.cpp
+++ b/Plugins/DbAndroid/dbandroidshellconnection.cpp
@@ -129,7 +129,13 @@ QStringList DbAndroidShellConnection::getDbList()
     }
 
     QStringList finalList;
-    for (const QString& dbName : out.trimmed().split("\n", QString::SkipEmptyParts))
+    for (const QString& dbName : out.trimmed().split("\n",
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+                                                    Qt::SkipEmptyParts
+#else
+                                                    QString::SkipEmptyParts
+#endif
+                                                     ))
     {
         if (dbName.trimmed().endsWith("-journal"))
             continue;
@@ -148,7 +154,13 @@ QStringList DbAndroidShellConnection::getAppList()
         return QStringList();
 
     QStringList appList;
-    for (const QString& line : out.trimmed().split("\n", QString::SkipEmptyParts))
+    for (const QString& line : out.trimmed().split("\n",
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+                                                  Qt::SkipEmptyParts
+#else
+                                                  QString::SkipEmptyParts
+#endif
+                                                   ))
     {
         if (!line.startsWith("package:"))
             continue; // some other message
@@ -182,7 +194,7 @@ DbAndroidConnection::ExecutionResult DbAndroidShellConnection::executeQuery(cons
 
     // In case of SELECT we want to union typeof() for all columns first, then original query
     bool isSelect = false;
-    getQueryAccessMode(query, Dialect::Sqlite3, &isSelect);
+    getQueryAccessMode(query, &isSelect);
     QStringList columnNames;
     bool firstHalfForTypes = false;
     if (isSelect)
@@ -272,7 +284,7 @@ QString DbAndroidShellConnection::appendTypeQueryPart(const QString& query, cons
     QString wrappedCol;
     for (const QString& colName : columnNames)
     {
-        wrappedCol = wrapObjIfNeeded(colName, Dialect::Sqlite3);
+        wrappedCol = wrapObjIfNeeded(colName);
         typeColumns << typeTpl.arg(wrappedCol);
         hexColumns << hexTpl.arg(wrappedCol);
     }
@@ -337,25 +349,25 @@ QVariant DbAndroidShellConnection::valueFromString(const QByteArray& bytes, cons
 {
     static const QStringList types = QStringList({"null", "integer", "real", "text", "blob"});
 
-    DataType dataType = static_cast<DataType>(types.indexOf(AdbManager::decode(type).trimmed()));
+    SqliteDataType dataType = static_cast<SqliteDataType>(types.indexOf(AdbManager::decode(type).trimmed()));
     QByteArray decodedBytes = QByteArray::fromHex(bytes);
     switch (dataType)
     {
-        case DataType::BLOB:
+        case SqliteDataType::BLOB:
             return decodedBytes;
-        case DataType::INTEGER:
+        case SqliteDataType::INTEGER:
             return QString::fromLatin1(decodedBytes).toLongLong();
-        case DataType::REAL:
+        case SqliteDataType::REAL:
             return QString::fromLatin1(decodedBytes).toDouble();
-        case DataType::TEXT:
+        case SqliteDataType::TEXT:
             return QString::fromUtf8(decodedBytes);
-        case DataType::_NULL:
+        case SqliteDataType::_NULL:
             break;
-        case DataType::UNKNOWN:
+        case SqliteDataType::UNKNOWN:
             qCritical() << "Unknown type passed to DbAndroidShellConnection::valueFromString():" << type;
             break;
     }
-    return QVariant(QString::null);
+    return QVariant(QString());
 }
 
 void DbAndroidShellConnection::checkForDisconnection(const QStringList& devices)