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

1 files changed, 6 insertions, 4 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/exportdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/exportdialog.cpp
index 7b6a4d0..7dda03e 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/exportdialog.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/exportdialog.cpp
@@ -14,6 +14,7 @@
 #include "schemaresolver.h"
 #include "common/widgetcover.h"
 #include "services/notifymanager.h"
+#include "themetuner.h"
 #include "uiconfig.h"
 #include <QClipboard>
 #include <QDebug>
@@ -49,6 +50,7 @@ ExportDialog::~ExportDialog()
 void ExportDialog::init()
 {
     ui->setupUi(this);
+    THEME_TUNER->darkThemeFix(this);
     limitDialogWidth(this);
 
 #ifdef Q_OS_MACX
@@ -531,7 +533,7 @@ void ExportDialog::updateDbObjTree()
 
         ui->dbObjectsTree->expand(root);
         QModelIndex child;
-        for (int i = 0; (child = root.child(i, 0)).isValid(); i++)
+        for (int i = 0; (child = selectableDbListModel->index(i, 0, root)).isValid(); i++)
             ui->dbObjectsTree->expand(child);
     }
     dbObjectsSelectAll();
@@ -718,7 +720,7 @@ void ExportDialog::exportTable(const ExportManager::StandardExportConfig& stdCon
 
     EXPORT_MANAGER->configure(format, stdConfig);
     // TODO when dbnames are fully supported, pass the dbname below
-    EXPORT_MANAGER->exportTable(db, QString::null, ui->exportTableNameCombo->currentText());
+    EXPORT_MANAGER->exportTable(db, QString(), ui->exportTableNameCombo->currentText());
 }
 
 void ExportDialog::exportQuery(const ExportManager::StandardExportConfig& stdConfig, const QString& format)
@@ -741,7 +743,7 @@ ExportManager::StandardExportConfig ExportDialog::getExportConfig() const
     stdConfig.intoClipboard = clipboard;
 
     if (clipboard)
-        stdConfig.outputFileName = QString::null;
+        stdConfig.outputFileName = QString();
     else if (outputFileSupported)
         stdConfig.outputFileName = ui->exportFileEdit->text();
 
@@ -790,7 +792,7 @@ QModelIndex ExportDialog::setupNewDbObjTreeRoot(const QModelIndex& root)
         if (item->getType() == DbTreeItem::Type::DB)
             return newRoot;
 
-        newRoot = newRoot.child(0, 0);
+        newRoot = selectableDbListModel->index(0, 0, newRoot);
     }
     return newRoot;
 }