Move code for opening and saving SQL files to the SqlExecutionArea

Move the code for opening and saving SQL files in the Execute SQL tab
from the main window to the SqlExecutionAtra class.

Also fix some warnings in the code for opening new SQL tabs.

src/MainWindow.cpp

@@ -2246,9 +2246,9 @@ void MainWindow::closeSqlTab(int index, bool force)
     delete w;
 }
 
-unsigned int MainWindow::openSqlTab(bool resetCounter)
+int MainWindow::openSqlTab(bool resetCounter)
 {
-    static unsigned int tabNumber = 0;
+    static int tabNumber = 0;
 
     if(resetCounter)
         tabNumber = 0;
@@ -2297,16 +2297,8 @@ void MainWindow::openSqlFile()
 
     if(QFile::exists(file))
     {
-        QFile f(file);
-        f.open(QIODevice::ReadOnly);
-        if(!f.isOpen())
-        {
-            QMessageBox::warning(this, qApp->applicationName(), tr("Couldn't read file: %1.").arg(f.errorString()));
-            return;
-        }
-
         // Decide whether to open a new tab or take the current one
-        unsigned int index;
+        int index;
         SqlExecutionArea* current_tab = qobject_cast<SqlExecutionArea*>(ui->tabSqlAreas->currentWidget());
         if(current_tab && current_tab->getSql().isEmpty() && current_tab->getModel()->rowCount() == 0)
             index = ui->tabSqlAreas->currentIndex();
@@ -2314,9 +2306,8 @@ void MainWindow::openSqlFile()
             index = openSqlTab();
 
         SqlExecutionArea* sqlarea = qobject_cast<SqlExecutionArea*>(ui->tabSqlAreas->widget(index));
-        sqlarea->getEditor()->setText(f.readAll());
-        sqlarea->getEditor()->setModified(false);
-        sqlarea->setFileName(file);
+        sqlarea->openFile(file);
+
         QFileInfo fileinfo(file);
         ui->tabSqlAreas->setTabText(index, fileinfo.fileName());
     }
@@ -2333,17 +2324,7 @@ void MainWindow::saveSqlFile(int tabIndex)
     {
         saveSqlFileAs();
     } else {
-        QFile f(sqlarea->fileName());
-        f.open(QIODevice::WriteOnly);
-        if(f.isOpen() && f.write(sqlarea->getSql().toUtf8()) != -1)
-        {
-            QFileInfo fileinfo(sqlarea->fileName());
-            ui->tabSqlAreas->setTabText(ui->tabSqlAreas->currentIndex(), fileinfo.fileName());
-            // Set modified to false so we can get control of unsaved changes when closing.
-            sqlarea->getEditor()->setModified(false);
-        } else {
-            QMessageBox::warning(this, qApp->applicationName(), tr("Couldn't save file: %1.").arg(f.errorString()));
-        }
+        sqlarea->saveFile(sqlarea->fileName());
     }
 }
 
@@ -2366,9 +2347,10 @@ void MainWindow::saveSqlFileAs()
 
     if(!file.isEmpty())
     {
-        // Just set the selected file name and call the standard save action which is going to use it
-        qobject_cast<SqlExecutionArea*>(ui->tabSqlAreas->currentWidget())->setFileName(file);
-        saveSqlFile();
+        sqlarea->saveFile(file);
+
+        QFileInfo fileinfo(file);
+        ui->tabSqlAreas->setTabText(ui->tabSqlAreas->currentIndex(), fileinfo.fileName());
     }
 }
 

src/MainWindow.h

@@ -251,7 +251,7 @@ private slots:
     void savePragmas();
     void mainTabSelected( int tabindex );
     void browseTableHeaderClicked(int logicalindex);
-    unsigned int openSqlTab(bool resetCounter = false);
+    int openSqlTab(bool resetCounter = false);
     void closeSqlTab(int index, bool force = false);
     void changeSqlTab(int index);
     void openSqlFile();

src/SqlExecutionArea.cpp

@@ -9,6 +9,7 @@
 #include <QInputDialog>
 #include <QMessageBox>
 #include <QShortcut>
+#include <QFile>
 
 SqlExecutionArea::SqlExecutionArea(DBBrowserDB& _db, QWidget* parent) :
     QWidget(parent),
@@ -207,3 +208,49 @@ void SqlExecutionArea::setFindFrameVisibility(bool show)
         hideFindFrame();
     }
 }
+
+void SqlExecutionArea::openFile(const QString& filename)
+{
+    // Open file for reading
+    QFile f(filename);
+    f.open(QIODevice::ReadOnly);
+    if(!f.isOpen())
+    {
+        QMessageBox::warning(this, qApp->applicationName(), tr("Couldn't read file: %1.").arg(f.errorString()));
+        return;
+    }
+
+    // Read in the entire file
+    ui->editEditor->setText(f.readAll());
+
+    // No modifications yet
+    ui->editEditor->setModified(false);
+
+    // Remember file name
+    sqlFileName = filename;
+}
+
+void SqlExecutionArea::saveFile(const QString& filename)
+{
+    // Open file for writing
+    QFile f(filename);
+    f.open(QIODevice::WriteOnly);
+    if(!f.isOpen())
+    {
+        QMessageBox::warning(this, qApp->applicationName(), tr("Couldn't save file: %1.").arg(f.errorString()));
+        return;
+    }
+
+    // Write to the file
+    if(f.write(getSql().toUtf8()) != -1)
+    {
+        // Set modified to false so we can get control of unsaved changes when closing.
+        ui->editEditor->setModified(false);
+
+        // Remember file name
+        sqlFileName = filename;
+    } else {
+        QMessageBox::warning(this, qApp->applicationName(), tr("Couldn't save file: %1.").arg(f.errorString()));
+        return;
+    }
+}

src/SqlExecutionArea.h

@@ -25,6 +25,9 @@ public:
     QString getSql() const;
     QString getSelectedSql() const;
 
+    void openFile(const QString& filename);
+    void saveFile(const QString& filename);
+
     QString fileName() const { return sqlFileName; }
     void setFileName(const QString& filename) { sqlFileName = filename; }