From b63f1520bce326b3a960410d67a471aa4c9c320e Mon Sep 17 00:00:00 2001 From: Martin Kleusberg Date: Thu, 15 Nov 2018 14:15:36 +0100 Subject: [PATCH] Simplify code and fix useless-conversion warnings --- src/EditIndexDialog.cpp | 4 ++-- src/sqlitedb.cpp | 8 ++++---- src/sqlitetablemodel.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/EditIndexDialog.cpp b/src/EditIndexDialog.cpp index 3a980954..d24aa464 100644 --- a/src/EditIndexDialog.cpp +++ b/src/EditIndexDialog.cpp @@ -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(&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(&QComboBox::currentTextChanged), + connect(order, &QComboBox::currentTextChanged, [=](QString new_order) { auto colnum = sqlb::findField(index, indexFields.at(i).name()); diff --git a/src/sqlitedb.cpp b/src/sqlitedb.cpp index 5fb7f4b0..42104f29 100644 --- a/src/sqlitedb.cpp +++ b/src/sqlitedb.cpp @@ -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; diff --git a/src/sqlitetablemodel.cpp b/src/sqlitetablemodel.cpp index 660ca2e3..4384c78c 100644 --- a/src/sqlitetablemodel.cpp +++ b/src/sqlitetablemodel.cpp @@ -672,7 +672,7 @@ QStringList SqliteTableModel::getColumns(std::shared_ptr 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)); } }