@@ -1,6 +1,5 @@
 #include "sqlitedb.h"
 #include "sqlitetablemodel.h"
-#include "sqlite.h"
 #include "CipherDialog.h"
 
 #include <QFile>
@@ -578,7 +577,7 @@ bool DBBrowserDB::executeMultiSQL(const QString& statement, bool dirty, bool log
     return true;
 }
 
-bool DBBrowserDB::getRow(const QString& sTableName, long rowid, QList<QByteArray>& rowdata)
+bool DBBrowserDB::getRow(const QString& sTableName, sqlite3_int64 rowid, QList<QByteArray>& rowdata)
 {
     QString sQuery = QString("SELECT * FROM `%1` WHERE `%2`=%3;").arg(sTableName).arg(getObjectByName(sTableName).table.rowidColumn()).arg(rowid);
     QByteArray utf8Query = sQuery.toUtf8();
@@ -625,7 +624,7 @@ int64_t DBBrowserDB::max(const sqlb::Table& t, sqlb::FieldPtr field) const
     return ret;
 }
 
-QString DBBrowserDB::emptyInsertStmt(const sqlb::Table& t, long pk_value) const
+QString DBBrowserDB::emptyInsertStmt(const sqlb::Table& t, sqlite3_int64 pk_value) const
 {
     QString stmt = QString("INSERT INTO `%1`").arg(t.name());
 
@@ -727,7 +726,7 @@ long DBBrowserDB::addRecord(const QString& sTableName)
     }
 }
 
-bool DBBrowserDB::deleteRecord(const QString& table, long rowid)
+bool DBBrowserDB::deleteRecord(const QString& table, sqlite3_int64 rowid)
 {
     char * errmsg;
     if (!isOpen()) return false;
@@ -750,7 +749,7 @@ bool DBBrowserDB::deleteRecord(const QString& table, long rowid)
     return ok;
 }
 
-bool DBBrowserDB::updateRecord(const QString& table, const QString& column, long row, const QByteArray& value)
+bool DBBrowserDB::updateRecord(const QString& table, const QString& column, sqlite3_int64 row, const QByteArray& value)
 {
     if (!isOpen()) return false;
 
 
@@ -2,13 +2,13 @@
 #define SQLITEDB_H
 
 #include "sqlitetypes.h"
+#include "sqlite.h"
 
 #include <QStringList>
 #include <QMultiMap>
 #include <QByteArray>
 
 class CipherDialog;
-class sqlite3;
 
 enum
 {
@@ -66,7 +66,7 @@ class DBBrowserDB : public QObject
      * @param rowdata A list of QByteArray containing the row data.
      * @return true if statement execution was ok, else false.
      */
-    bool getRow(const QString& sTableName, long rowid, QList<QByteArray>& rowdata);
+    bool getRow(const QString& sTableName, sqlite3_int64 rowid, QList<QByteArray>& rowdata);
 
     /**
      * @brief max Queries the table t for the max value of field.
@@ -84,9 +84,9 @@ class DBBrowserDB : public QObject
      * @param pk_value This optional parameter can be used to manually set a specific value for the primary key column
      * @return An sqlite conform INSERT INTO statement with empty values. (NULL,'',0)
      */
-    QString emptyInsertStmt(const sqlb::Table& t, long pk_value = -1) const;
-    bool deleteRecord(const QString& table, long rowid);
-    bool updateRecord(const QString& table, const QString& column, long row, const QByteArray& value);
+    QString emptyInsertStmt(const sqlb::Table& t, sqlite3_int64 pk_value = -1) const;
+    bool deleteRecord(const QString& table, sqlite3_int64 rowid);
+    bool updateRecord(const QString& table, const QString& column, sqlite3_int64 row, const QByteArray& value);
 
     bool createTable(const QString& name, const sqlb::FieldVector& structure);
     bool renameTable(const QString& from_table, const QString& to_table);
 
@@ -256,7 +256,7 @@ bool SqliteTableModel::setData(const QModelIndex& index, const QVariant& value,
         if(m_data.at(index.row()).at(index.column()) == value)
             return true;
 
-        if(m_db->updateRecord(m_sTable, m_headers.at(index.column()), m_data[index.row()].at(0).toLong(), value.toByteArray()))
+        if(m_db->updateRecord(m_sTable, m_headers.at(index.column()), m_data[index.row()].at(0).toLongLong(), value.toByteArray()))
         {
             // Only update the cache if this row has already been read, if not there's no need to do any changes to the cache
             if(index.row() < m_data.size())
@@ -351,7 +351,7 @@ bool SqliteTableModel::removeRows(int row, int count, const QModelIndex& parent)
 
     for(int i=count-1;i>=0;i--)
     {
-        m_db->deleteRecord(m_sTable, m_data.at(row + i).at(0).toLong());
+        m_db->deleteRecord(m_sTable, m_data.at(row + i).at(0).toLongLong());
         m_data.removeAt(row + i);
     }
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`#include "sqlitedb.h"`
`2`	`2`	`#include "sqlitetablemodel.h"`
`3`		`-#include "sqlite.h"`
`4`	`3`	`#include "CipherDialog.h"`
`5`	`4`
`6`	`5`	`#include <QFile>`
`@@ -578,7 +577,7 @@ bool DBBrowserDB::executeMultiSQL(const QString& statement, bool dirty, bool log`
`578`	`577`	`return true;`
`579`	`578`	`}`
`580`	`579`
`581`		`-bool DBBrowserDB::getRow(const QString& sTableName, long rowid, QList<QByteArray>& rowdata)`
	`580`	`+bool DBBrowserDB::getRow(const QString& sTableName, sqlite3_int64 rowid, QList<QByteArray>& rowdata)`
`582`	`581`	`{`
`583`	`582`	QString sQuery = QString("SELECT * FROM `%1` WHERE `%2`=%3;").arg(sTableName).arg(getObjectByName(sTableName).table.rowidColumn()).arg(rowid);
`584`	`583`	`QByteArray utf8Query = sQuery.toUtf8();`
`@@ -625,7 +624,7 @@ int64_t DBBrowserDB::max(const sqlb::Table& t, sqlb::FieldPtr field) const`
`625`	`624`	`return ret;`
`626`	`625`	`}`
`627`	`626`
`628`		`-QString DBBrowserDB::emptyInsertStmt(const sqlb::Table& t, long pk_value) const`
	`627`	`+QString DBBrowserDB::emptyInsertStmt(const sqlb::Table& t, sqlite3_int64 pk_value) const`
`629`	`628`	`{`
`630`	`629`	QString stmt = QString("INSERT INTO `%1`").arg(t.name());
`631`	`630`
`@@ -727,7 +726,7 @@ long DBBrowserDB::addRecord(const QString& sTableName)`
`727`	`726`	`}`
`728`	`727`	`}`
`729`	`728`
`730`		`-bool DBBrowserDB::deleteRecord(const QString& table, long rowid)`
	`729`	`+bool DBBrowserDB::deleteRecord(const QString& table, sqlite3_int64 rowid)`
`731`	`730`	`{`
`732`	`731`	`char * errmsg;`
`733`	`732`	`if (!isOpen()) return false;`
`@@ -750,7 +749,7 @@ bool DBBrowserDB::deleteRecord(const QString& table, long rowid)`
`750`	`749`	`return ok;`
`751`	`750`	`}`
`752`	`751`
`753`		`-bool DBBrowserDB::updateRecord(const QString& table, const QString& column, long row, const QByteArray& value)`
	`752`	`+bool DBBrowserDB::updateRecord(const QString& table, const QString& column, sqlite3_int64 row, const QByteArray& value)`
`754`	`753`	`{`
`755`	`754`	`if (!isOpen()) return false;`
`756`	`755`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ bool SqliteTableModel::setData(const QModelIndex& index, const QVariant& value,`
`256`	`256`	`if(m_data.at(index.row()).at(index.column()) == value)`
`257`	`257`	`return true;`
`258`	`258`
`259`		`- if(m_db->updateRecord(m_sTable, m_headers.at(index.column()), m_data[index.row()].at(0).toLong(), value.toByteArray()))`
	`259`	`+ if(m_db->updateRecord(m_sTable, m_headers.at(index.column()), m_data[index.row()].at(0).toLongLong(), value.toByteArray()))`
`260`	`260`	`{`
`261`	`261`	`// Only update the cache if this row has already been read, if not there's no need to do any changes to the cache`
`262`	`262`	`if(index.row() < m_data.size())`
`@@ -351,7 +351,7 @@ bool SqliteTableModel::removeRows(int row, int count, const QModelIndex& parent)`
`351`	`351`
`352`	`352`	`for(int i=count-1;i>=0;i--)`
`353`	`353`	`{`
`354`		`- m_db->deleteRecord(m_sTable, m_data.at(row + i).at(0).toLong());`
	`354`	`+ m_db->deleteRecord(m_sTable, m_data.at(row + i).at(0).toLongLong());`
`355`	`355`	`m_data.removeAt(row + i);`
`356`	`356`	`}`
`357`	`357`