mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-20 02:50:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Simplify code and fix useless-conversion warnings

Browse Source
This commit is contained in:
Martin Kleusberg
2018-11-15 14:15:36 +01:00
parent 81b39ccdaa
commit b63f1520bc
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/EditIndexDialog.cpp
View File

@@ -74,7 +74,7 @@ EditIndexDialog::EditIndexDialog(DBBrowserDB& db, const sqlb::ObjectIdentifier&
}
// Add event handler for index column name changes. These are only allowed for expression columns, though.
connect(ui->tableIndexColumns, static_cast<void(QTableWidget::*)(QTableWidgetItem*)>(&QTableWidget::itemChanged),
connect(ui->tableIndexColumns, &QTableWidget::itemChanged,
[=](QTableWidgetItem* item)
{
index.fields[item->row()].setName(item->text());
@@ -165,7 +165,7 @@ void EditIndexDialog::updateColumnLists()
order->addItem("DESC");
order->setCurrentText(indexFields.at(i).order().toUpper());
ui->tableIndexColumns->setCellWidget(i, 1, order);
connect(order, static_cast<void(QComboBox::*)(const QString&)>(&QComboBox::currentTextChanged),
connect(order, &QComboBox::currentTextChanged,
[=](QString new_order)
{
auto colnum = sqlb::findField(index, indexFields.at(i).name());

8
src/sqlitedb.cpp
View File

@@ -116,7 +116,7 @@ bool DBBrowserDB::open(const QString& db, bool readOnly)
// Open database file
if(sqlite3_open_v2(db.toUtf8(), &_db, readOnly ? SQLITE_OPEN_READONLY : SQLITE_OPEN_READWRITE, nullptr) != SQLITE_OK)
{
lastErrorMessage = QString::fromUtf8((const char*)sqlite3_errmsg(_db));
lastErrorMessage = QString::fromUtf8(sqlite3_errmsg(_db));
return false;
}
@@ -282,7 +282,7 @@ bool DBBrowserDB::tryEncryptionSettings(const QString& filePath, bool* encrypted
int err = sqlite3_prepare_v2(dbHandle, utf8Statement, utf8Statement.length(), &vm, &tail);
if(err == SQLITE_BUSY || err == SQLITE_PERM || err == SQLITE_NOMEM || err == SQLITE_IOERR || err == SQLITE_CORRUPT || err == SQLITE_CANTOPEN)
{
lastErrorMessage = QString::fromUtf8((const char*)sqlite3_errmsg(dbHandle));
lastErrorMessage = QString::fromUtf8(sqlite3_errmsg(dbHandle));
sqlite3_close(dbHandle);
return false;
}
@@ -367,7 +367,7 @@ bool DBBrowserDB::tryEncryptionSettings(const QString& filePath, bool* encrypted
*encrypted = true;
#else
lastErrorMessage = QString::fromUtf8((const char*)sqlite3_errmsg(dbHandle));
lastErrorMessage = QString::fromUtf8(sqlite3_errmsg(dbHandle));
sqlite3_close(dbHandle);
return false;
#endif
@@ -508,7 +508,7 @@ bool DBBrowserDB::create ( const QString & db)
openresult = sqlite3_open16(db.utf16(), &_db);
if( openresult != SQLITE_OK ){
lastErrorMessage = QString::fromUtf8((const char*)sqlite3_errmsg(_db));
lastErrorMessage = QString::fromUtf8(sqlite3_errmsg(_db));
sqlite3_close(_db);
_db = nullptr;
return false;

2
src/sqlitetablemodel.cpp
View File

@@ -672,7 +672,7 @@ QStringList SqliteTableModel::getColumns(std::shared_ptr<sqlite3> pDb, const QSt
int columns = sqlite3_data_count(stmt);
for(int i = 0; i < columns; ++i)
{
listColumns.append(QString::fromUtf8((const char*)sqlite3_column_name(stmt, i)));
listColumns.append(QString::fromUtf8(sqlite3_column_name(stmt, i)));
fieldsTypes.push_back(sqlite3_column_type(stmt, i));
}
}