Revert "show the current journal mode in the statusbar"

This reverts commit bc2956a484.

src/mainwindow.cpp

@@ -42,11 +42,7 @@ MainWindow::MainWindow(QWidget* parent)
     setupUi();
     setAcceptDrops(true);
 
-    m_ToolButtonWAL = new QToolButton(statusBar());
-    m_ToolButtonWAL->setDisabled(true);
-    m_ToolButtonWAL->setToolTip(QObject::tr("Journal mode"));
-    m_ToolButtonWAL->setText("");
-    statusBar()->addPermanentWidget(m_ToolButtonWAL);
+    (void)statusBar();
     init();
 }
 
@@ -260,7 +256,6 @@ void MainWindow::fileOpen(const QString & fileName)
             err.append(db.lastErrorMessage);
             QMessageBox::information( this, QApplication::applicationName() ,err);
         }
-        updateDBInfo();
         populateStructure();
         resetBrowser();
     }
@@ -383,23 +378,6 @@ void MainWindow::populateTable( const QString & tablename, bool keepColumnWidths
     QApplication::restoreOverrideCursor();
 }
 
-void MainWindow::updateDBInfo()
-{
-    if(db.isOpen())
-    {
-        JournalMode::journalmode mode = db.journalMode();
-        if( mode != JournalMode::journalmode_wal )
-        {
-            m_ToolButtonWAL->setEnabled(true);
-        }
-        m_ToolButtonWAL->setText(JournalMode::toString(db.journalMode()));
-    }
-    else
-    {
-        m_ToolButtonWAL->setEnabled(false);
-    }
-}
-
 void MainWindow::resetBrowser()
 {
     recAtTop = 0;

src/mainwindow.h

@@ -8,7 +8,6 @@
 
 #include <QtGui/QAction>
 #include <QtGui/QMenu>
-#include <QtGui/QToolButton>
 
 #include <QDragEnterEvent>
 
@@ -53,8 +52,6 @@ private:
     QTreeWidget *dbTreeWidget;
     QStandardItemModel *queryResultListModel;
 
-    QToolButton* m_ToolButtonWAL;
-
     SQLiteSyntaxHighlighter* sqliteHighlighter;
 
     int curBrowseOrderByIndex;
@@ -95,7 +92,6 @@ public slots:
     virtual void populateStructure();
     virtual void populateTable(const QString & tablename , bool keepColumnWidths = false);
     virtual void resetBrowser();
-    virtual void updateDBInfo();
     virtual void fileClose();
     virtual void fileExit();
     virtual void addRecord();

src/sqlitedb.cpp

@@ -776,26 +776,7 @@ QStringList DBBrowserDB::decodeCSV(const QString & csvfilename, char sep, char q
     return result;
 }
 
-JournalMode::journalmode DBBrowserDB::journalMode() const
-{
-    JournalMode::journalmode mode = JournalMode::journalmode_unknown;
-    sqlite3_stmt* vm;
-    QString query = "PRAGMA journal_mode;";
-    int s3status = sqlite3_prepare_v2(
-                _db,
-                query.toUtf8(),
-                query.length(),
-                &vm,
-                NULL);
-    if(s3status == SQLITE_OK)
-    {
-        if(sqlite3_step(vm) == SQLITE_ROW)
-        {
-            QString result = QString::fromUtf8(
-                        (const char*)sqlite3_column_text(vm, 0)).toLower();
-            mode = JournalMode::fromString(result);
-        }
-    }
-    sqlite3_finalize(vm);
-    return mode;
-}
+
+
+
+

src/sqlitedb.h

@@ -81,52 +81,6 @@ private:
     QString sql;
 };
 
-class JournalMode
-{
-public:
-    enum journalmode {
-        journalmode_unknown,
-        journalmode_delete,
-        journalmode_truncate,
-        journalmode_persist,
-        journalmode_memory,
-        journalmode_wal,
-        journalmode_off
-    };
-
-    static const char* toString(journalmode mode)
-    {
-        switch(mode)
-        {
-        case journalmode_delete: return "DELETE";
-        case journalmode_truncate: return "TRUNCATE";
-        case journalmode_persist: return "PERSIST";
-        case journalmode_memory: return "MEMORY";
-        case journalmode_wal: return "WAL";
-        case journalmode_off: return "OFF";
-        case journalmode_unknown:
-        default: return "UNKNOWN";
-        }
-    }
-
-    static journalmode fromString(QString smode)
-    {
-        if(smode == "delete")
-            return journalmode_delete;
-        else if(smode == "truncate")
-            return journalmode_truncate;
-        else if(smode == "persist")
-            return journalmode_persist;
-        else if(smode == "memory")
-            return journalmode_memory;
-        else if(smode == "wal")
-            return journalmode_wal;
-        else if(smode == "off")
-            return journalmode_off;
-        else
-            return journalmode_unknown;
-    }
-};
 
 class DBBrowserDB
 {
@@ -151,7 +105,6 @@ public:
 
     bool renameTable(QString from_table, QString to_table);
     bool createColumn(QString table, QString field, QString type);
-    JournalMode::journalmode journalMode() const;
 
     QStringList getTableFields(const QString & tablename);
     QStringList getTableTypes(const QString & tablename);