@@ -9,7 +9,8 @@
 #include <QApplication>
 
 DbStructureModel::DbStructureModel(QObject* parent)
-    : QAbstractItemModel(parent)
+    : QAbstractItemModel(parent),
+      m_db(0)
 {
     // Create root item and use its columns to store the header strings
     QStringList header;
 
@@ -82,7 +82,7 @@ void rollback(
 class CSVImportProgress : public CSVProgress
 {
 public:
-    CSVImportProgress(size_t filesize)
+    explicit CSVImportProgress(size_t filesize)
     {
         m_pProgressDlg = new QProgressDialog(
                     QObject::tr("Decoding CSV file..."),
 
@@ -27,7 +27,7 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    MainWindow(QWidget* parent = 0);
+    explicit MainWindow(QWidget* parent = 0);
     ~MainWindow();
 
     DBBrowserDB* getDb() { return &db; }
 
@@ -8,6 +8,7 @@ CSVParser::CSVParser(bool trimfields, const QChar& fieldseparator, const QChar&
     , m_cFieldSeparator(fieldseparator)
     , m_cQuoteChar(quotechar)
     , m_pCSVProgress(0)
+    , m_nColumns(0)
     , m_nBufferSize(4096)
 {
 }
 
@@ -1015,20 +1015,6 @@ bool DBBrowserDB::renameTable(const QString& from_table, const QString& to_table
     }
 }
 
-QStringList DBBrowserDB::getBrowsableObjectNames() const
-{
-    objectMap::ConstIterator it;
-    QStringList res;
-
-    for(it=objMap.begin();it!=objMap.end();++it)
-    {
-        if(it.key() == "table" || it.key() == "view")
-            res.append(it.value().getname());
-    }
-
-    return res;
-}
-
 objectMap DBBrowserDB::getBrowsableObjects() const
 {
     objectMap::ConstIterator it;
 
@@ -43,7 +43,7 @@ class DBBrowserDB : public QObject
     Q_OBJECT
 
 public:
-    explicit DBBrowserDB () : _db( 0 ) {}
+    explicit DBBrowserDB () : _db(0), isEncrypted(false) {}
     virtual ~DBBrowserDB (){}
     bool open ( const QString & db);
     bool attach(const QString& filename, QString attach_as = "");
@@ -102,7 +102,6 @@ class DBBrowserDB : public QObject
      */
     bool renameColumn(const QString& tablename, const QString& name, sqlb::FieldPtr to, int move = 0);
 
-    QStringList getBrowsableObjectNames() const;
     objectMap getBrowsableObjects() const;
     DBBrowserObject getObjectByName(const QString& name) const;
     bool isOpen() const;
 
@@ -510,7 +510,7 @@ QStringList SqliteTableModel::getColumns(const QString& sQuery, QVector<int>& fi
     QStringList listColumns;
     if(SQLITE_OK == status)
     {
-        status = sqlite3_step(stmt);
+        sqlite3_step(stmt);
         int columns = sqlite3_data_count(stmt);
         for(int i = 0; i < columns; ++i)
         {
 
@@ -107,7 +107,7 @@ typedef QVector< FieldPtr > FieldVector;
 class Table
 {
 public:
-    Table(const QString& name): m_name(name), m_rowidColumn("_rowid_") {}
+    explicit Table(const QString& name): m_name(name), m_rowidColumn("_rowid_") {}
     virtual ~Table();
 
     void setName(const QString& name) { m_name = name; }
@@ -167,7 +167,7 @@ class Table
 class CreateTableWalker
 {
 public:
-    CreateTableWalker(antlr::RefAST r)
+    explicit CreateTableWalker(antlr::RefAST r)
         : m_root(r)
         , m_bModifySupported(true)
     {}
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@`
`9`	`9`	`#include <QApplication>`
`10`	`10`
`11`	`11`	`DbStructureModel::DbStructureModel(QObject* parent)`
`12`		`- : QAbstractItemModel(parent)`
	`12`	`+ : QAbstractItemModel(parent),`
	`13`	`+ m_db(0)`
`13`	`14`	`{`
`14`	`15`	`// Create root item and use its columns to store the header strings`
`15`	`16`	`QStringList header;`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ void rollback(`
`82`	`82`	`class CSVImportProgress : public CSVProgress`
`83`	`83`	`{`
`84`	`84`	`public:`
`85`		`- CSVImportProgress(size_t filesize)`
	`85`	`+ explicit CSVImportProgress(size_t filesize)`
`86`	`86`	`{`
`87`	`87`	`m_pProgressDlg = new QProgressDialog(`
`88`	`88`	`QObject::tr("Decoding CSV file..."),`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ CSVParser::CSVParser(bool trimfields, const QChar& fieldseparator, const QChar&`
`8`	`8`	`, m_cFieldSeparator(fieldseparator)`
`9`	`9`	`, m_cQuoteChar(quotechar)`
`10`	`10`	`, m_pCSVProgress(0)`
	`11`	`+ , m_nColumns(0)`
`11`	`12`	`, m_nBufferSize(4096)`
`12`	`13`	`{`
`13`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ QStringList SqliteTableModel::getColumns(const QString& sQuery, QVector<int>& fi`
`510`	`510`	`QStringList listColumns;`
`511`	`511`	`if(SQLITE_OK == status)`
`512`	`512`	`{`
`513`		`- status = sqlite3_step(stmt);`
	`513`	`+ sqlite3_step(stmt);`
`514`	`514`	`int columns = sqlite3_data_count(stmt);`
`515`	`515`	`for(int i = 0; i < columns; ++i)`
`516`	`516`	`{`