diff --git a/src/DbStructureModel.cpp b/src/DbStructureModel.cpp index ddf4671f..7d4e6f55 100644 --- a/src/DbStructureModel.cpp +++ b/src/DbStructureModel.cpp @@ -9,7 +9,8 @@ #include 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; diff --git a/src/ImportCsvDialog.cpp b/src/ImportCsvDialog.cpp index 1ec5fe75..2f3b75fe 100644 --- a/src/ImportCsvDialog.cpp +++ b/src/ImportCsvDialog.cpp @@ -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..."), diff --git a/src/MainWindow.h b/src/MainWindow.h index d2bab34c..3e97d696 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -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; } diff --git a/src/csvparser.cpp b/src/csvparser.cpp index 80605261..414da0ab 100644 --- a/src/csvparser.cpp +++ b/src/csvparser.cpp @@ -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) { } diff --git a/src/sqlitedb.cpp b/src/sqlitedb.cpp index 1e73861b..3394864b 100644 --- a/src/sqlitedb.cpp +++ b/src/sqlitedb.cpp @@ -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; diff --git a/src/sqlitedb.h b/src/sqlitedb.h index 0bd01923..e40d8a63 100644 --- a/src/sqlitedb.h +++ b/src/sqlitedb.h @@ -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 @@ public: */ 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; diff --git a/src/sqlitetablemodel.cpp b/src/sqlitetablemodel.cpp index 7aa2227d..9abdc824 100644 --- a/src/sqlitetablemodel.cpp +++ b/src/sqlitetablemodel.cpp @@ -510,7 +510,7 @@ QStringList SqliteTableModel::getColumns(const QString& sQuery, QVector& 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) { diff --git a/src/sqlitetypes.h b/src/sqlitetypes.h index c33f443d..b3269efd 100644 --- a/src/sqlitetypes.h +++ b/src/sqlitetypes.h @@ -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 @@ private: class CreateTableWalker { public: - CreateTableWalker(antlr::RefAST r) + explicit CreateTableWalker(antlr::RefAST r) : m_root(r) , m_bModifySupported(true) {}