mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-02-09 21:28:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Clean up the code and make some more minor optimisations

Browse Source 
This also includes replacing some more Qt containers by their STL
counterparts.
This commit is contained in:
Martin Kleusberg
2019-10-17 14:34:51 +02:00
parent b3b1ac6946
commit ba1270cedb
66 changed files with 673 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/AddRecordDialog.cpp
View File

@@ -228,7 +228,6 @@ void AddRecordDialog::populateFields()
else
tbitem->setIcon(kName, QIcon(":/icons/field"));
QString defaultValue = QString::fromStdString(f.defaultValue());
QString toolTip;
if (auto_increment && contains(pk, f.name()))
@@ -248,9 +247,10 @@ void AddRecordDialog::populateFields()
// Display Role is used for displaying the default values.
// Only when they are changed, the User Role is updated and then used in the INSERT query.
if (!defaultValue.isEmpty()) {
tbitem->setData(kValue, Qt::DisplayRole, QString::fromStdString(f.defaultValue()));
toolTip.append(tr("Default value:\t %1\n").arg (defaultValue));
if (!f.defaultValue().empty()) {
QString defaultValue = QString::fromStdString(f.defaultValue());
tbitem->setData(kValue, Qt::DisplayRole, defaultValue);
toolTip.append(tr("Default value:\t %1\n").arg(defaultValue));
} else
tbitem->setData(kValue, Qt::DisplayRole, Settings::getValue("databrowser", "null_text"));
@@ -271,7 +271,7 @@ void AddRecordDialog::populateFields()
void AddRecordDialog::accept()
{
if(!pdb.executeSQL(ui->sqlTextEdit->text()))
if(!pdb.executeSQL(ui->sqlTextEdit->text().toStdString()))
{
QMessageBox::warning(
this,
@@ -306,7 +306,7 @@ void AddRecordDialog::updateSqlText()
if (isNumeric && item->data(kType, Qt::UserRole).toInt() != sqlb::Field::TextAffinity)
vals << value.toString();
else
vals << QString("'%1'").arg(value.toString().replace("'", "''"));
vals << sqlb::escapeString(value.toString());
}
}