# HG changeset patch # User Matti Hamalainen # Date 1497350480 -10800 # Node ID 7b87558011112a42281e692eba946e3434f95ac5 # Parent 3baea5b17dc971833a66d4afec32c1bcf09d24fa Rename some utility functions. diff -r 3baea5b17dc9 -r 7b8755801111 src/main.cpp --- a/src/main.cpp Tue Jun 13 10:56:31 2017 +0300 +++ b/src/main.cpp Tue Jun 13 13:41:20 2017 +0300 @@ -21,7 +21,7 @@ // // Display an error dialog with given title and message // -int errorMsg(QString title, QString msg) +int slErrorMsg(QString title, QString msg) { QMessageBox dlg; @@ -39,7 +39,7 @@ // // Convert QString to a double value, replacing comma // -double moneyStrToValue(const QString &str) +double slMoneyStrToValue(const QString &str) { QString str2 = str; return str2.replace(",", ".").toDouble(); @@ -49,7 +49,7 @@ // // Convert double value to formatted QString // -QString moneyValueToStr(double val) +QString slMoneyValueToStr(double val) { return QStringLiteral("%1").arg(val, 1, 'f', 2); } @@ -58,7 +58,7 @@ // // Trim and cleanup given QString (removing double whitespace etc.) // -QString cleanupStr(const QString &str) +QString slCleanupStr(const QString &str) { return str.simplified().trimmed(); } @@ -68,7 +68,7 @@ // Manipulate given QDateTime value to get desired // correct timestamp. // -const QDateTime dateTimeToLocal(const QDateTime &val) +const QDateTime slDateTimeToLocal(const QDateTime &val) { QDateTime tmp = val; tmp.setOffsetFromUtc(0); @@ -80,9 +80,9 @@ // Return a string representation of given QDateTime // converted to local time. // -const QString dateTimeToStr(const QDateTime &val) +const QString slDateTimeToStr(const QDateTime &val) { - return dateTimeToLocal(val).toString(QStringLiteral("yyyy-MM-dd hh:mm")); + return slDateTimeToLocal(val).toString(QStringLiteral("yyyy-MM-dd hh:mm")); } @@ -91,7 +91,7 @@ // report it to stdout if so. Return "false" if error has occured, // true otherwise. // -bool checkAndReportSQLError(const QString where, const QSqlError &err) +bool slCheckAndReportSQLError(const QString where, const QSqlError &err) { if (err.isValid()) { @@ -111,8 +111,8 @@ id, firstName.toUtf8().constData(), lastName.toUtf8().constData(), - dateTimeToStr(added).toUtf8().constData(), - dateTimeToStr(updated).toUtf8().constData(), + slDateTimeToStr(added).toUtf8().constData(), + slDateTimeToStr(updated).toUtf8().constData(), balance, extraInfo.toUtf8().constData()); } @@ -196,7 +196,7 @@ if (!db.open()) { - errorMsg( + slErrorMsg( QObject::tr("Tietokantaa ei voitu avata"), QObject::tr("Yhteyttä SQL-tietokantaan ei saatu.

Virhe: %1

"). arg(db.lastError().text()) @@ -215,7 +215,7 @@ "added DATETIME NOT NULL, " "updated DATETIME NOT NULL)")); - checkAndReportSQLError("CREATE TABLE people", query.lastError()); + slCheckAndReportSQLError("CREATE TABLE people", query.lastError()); } if (!db.tables().contains("transactions")) @@ -227,7 +227,7 @@ "value REAL, " "added DATETIME NOT NULL)")); - checkAndReportSQLError("CREATE TABLE transactions", query.lastError()); + slCheckAndReportSQLError("CREATE TABLE transactions", query.lastError()); } SyntilistaMainWindow swin; @@ -434,7 +434,7 @@ ui->personGB->setEnabled(true); ui->label_PersonName->setText(currPerson.lastName +", "+ currPerson.firstName); - ui->label_BalanceValue->setText(moneyValueToStr(currPerson.balance)); + ui->label_BalanceValue->setText(slMoneyValueToStr(currPerson.balance)); ui->label_BalanceValue->setStyleSheet(currPerson.balance < 0 ? "color: red;" : "color: green;"); ui->button_PayFullDebt->setEnabled(currPerson.balance < 0); @@ -442,7 +442,7 @@ query.prepare("SELECT id,value,added FROM transactions WHERE person=? ORDER BY added DESC LIMIT 5"); query.addBindValue(id); query.exec(); - checkAndReportSQLError("SELECT transactions for tableview_Latest", query.lastError()); + slCheckAndReportSQLError("SELECT transactions for tableview_Latest", query.lastError()); model_Latest->setQuery(query); @@ -534,7 +534,7 @@ setActivePerson(-1); if (rv != 0) { - errorMsg(tr("SQL-tietokantavirhe"), + slErrorMsg(tr("SQL-tietokantavirhe"), tr("Henkilön tietoja poistettaessa tapahtui virhe #%1."). arg(rv)); } @@ -676,9 +676,9 @@ } // Execute the query and update model - checkAndReportSQLError("updatePersonList() before exec", query.lastError()); + slCheckAndReportSQLError("updatePersonList() before exec", query.lastError()); query.exec(); - checkAndReportSQLError("updatePersonList() after exec", query.lastError()); + slCheckAndReportSQLError("updatePersonList() after exec", query.lastError()); model_People->setQuery(query); @@ -695,7 +695,7 @@ // void SyntilistaMainWindow::on_edit_PersonFilter_textChanged(const QString &str) { - peopleFilter = cleanupStr(str); + peopleFilter = slCleanupStr(str); updatePersonList(); } @@ -716,7 +716,7 @@ query.addBindValue(value); query.addBindValue(QDateTime::currentDateTimeUtc()); query.exec(); - if (!checkAndReportSQLError("addTransaction()", query.lastError())) + if (!slCheckAndReportSQLError("addTransaction()", query.lastError())) { QSqlDatabase::database().rollback(); return -2; @@ -726,7 +726,7 @@ query.addBindValue(QDateTime::currentDateTimeUtc()); query.addBindValue(id); query.exec(); - if (!checkAndReportSQLError("addTransaction update timestamp", query.lastError())) + if (!slCheckAndReportSQLError("addTransaction update timestamp", query.lastError())) { QSqlDatabase::database().rollback(); return -3; @@ -769,7 +769,7 @@ if (debt) { str = tr("Lisättiin velkaa %1 EUR henkilölle '%2 %3' (#%4)."). - arg(moneyValueToStr(value)). + arg(slMoneyValueToStr(value)). arg(info.firstName). arg(info.lastName). arg(info.id); @@ -777,7 +777,7 @@ else { str = tr("Vähennettiin velkaa %1 EUR henkilöltä '%2 %3' (#%4)."). - arg(moneyValueToStr(value)). + arg(slMoneyValueToStr(value)). arg(info.firstName). arg(info.lastName). arg(info.id); @@ -786,7 +786,7 @@ } else { - errorMsg( + slErrorMsg( tr("SQL-tietokantavirhe"), tr("Tietokantaan tapahtumaa lisättäessa tapahtui virhe #%1."). arg(ret)); @@ -798,13 +798,13 @@ void SyntilistaMainWindow::on_button_AddDebt_clicked() { - addTransactionGUI(currPerson.id, true, moneyStrToValue(ui->edit_Amount->text())); + addTransactionGUI(currPerson.id, true, slMoneyStrToValue(ui->edit_Amount->text())); } void SyntilistaMainWindow::on_button_PayDebt_clicked() { - addTransactionGUI(currPerson.id, false, moneyStrToValue(ui->edit_Amount->text())); + addTransactionGUI(currPerson.id, false, slMoneyStrToValue(ui->edit_Amount->text())); } @@ -865,8 +865,8 @@ bool EditPerson::validateForm() { - selPerson.firstName = cleanupStr(ui->edit_FirstName->text()); - selPerson.lastName = cleanupStr(ui->edit_LastName->text()); + selPerson.firstName = slCleanupStr(ui->edit_FirstName->text()); + selPerson.lastName = slCleanupStr(ui->edit_LastName->text()); selPerson.extraInfo = ui->textedit_ExtraInfo->document()->toPlainText(); ui->edit_FirstName->setStyleSheet(selPerson.firstName == "" ? "background-color: red;" : NULL); @@ -886,7 +886,7 @@ { if (!validateForm()) { - errorMsg( + slErrorMsg( tr("Virhe!"), tr("Vaaditut kentät (etunimi, sukunimi) eivät ole täytetty.")); @@ -902,11 +902,11 @@ person.addBindValue(selPerson.lastName); person.exec(); - checkAndReportSQLError("SELECT check for existing person by same name (UPDATE)", person.lastError()); + slCheckAndReportSQLError("SELECT check for existing person by same name (UPDATE)", person.lastError()); if (person.next()) { - errorMsg( + slErrorMsg( tr("Virhe!"), tr("Ei pysty! Samalla nimellä '%1 %2' on olemassa jo henkilö!"). arg(selPerson.firstName).arg(selPerson.lastName)); @@ -927,11 +927,11 @@ person.addBindValue(selPerson.lastName); person.exec(); - checkAndReportSQLError("SELECT check for existing person by same name (ADD)", person.lastError()); + slCheckAndReportSQLError("SELECT check for existing person by same name (ADD)", person.lastError()); if (person.next()) { - errorMsg( + slErrorMsg( tr("Virhe!"), tr("Ei pysty! Samalla nimellä '%1 %2' on olemassa jo henkilö!"). arg(selPerson.firstName).arg(selPerson.lastName)); @@ -994,7 +994,7 @@ query.prepare("SELECT id,value,added FROM transactions WHERE person=? ORDER BY added DESC"); query.addBindValue(pinfo.id); query.exec(); - checkAndReportSQLError("SELECT transactions for tableview_Transactions", query.lastError()); + slCheckAndReportSQLError("SELECT transactions for tableview_Transactions", query.lastError()); model_Transactions->setQuery(query); @@ -1032,10 +1032,10 @@ switch (index.column()) { case 3: - return moneyValueToStr(value.toDouble()); + return slMoneyValueToStr(value.toDouble()); case 4: - return dateTimeToStr(value.toDateTime()); + return slDateTimeToStr(value.toDateTime()); } } @@ -1064,7 +1064,7 @@ np.addBindValue(info.id); np.exec(); - if (!checkAndReportSQLError("PersonSQLModel::updatePerson()", np.lastError())) + if (!slCheckAndReportSQLError("PersonSQLModel::updatePerson()", np.lastError())) return -1; QSqlDatabase::database().commit(); @@ -1087,7 +1087,7 @@ np.addBindValue(QDateTime::currentDateTimeUtc()); np.exec(); - if (!checkAndReportSQLError("PersonSQLModel::addPerson()", np.lastError())) + if (!slCheckAndReportSQLError("PersonSQLModel::addPerson()", np.lastError())) return -1; QSqlDatabase::database().commit(); @@ -1107,7 +1107,7 @@ del.addBindValue(id); del.exec(); - if (!checkAndReportSQLError("delete user", del.lastError())) + if (!slCheckAndReportSQLError("delete user", del.lastError())) { QSqlDatabase::database().rollback(); return -1; @@ -1117,7 +1117,7 @@ del.addBindValue(id); del.exec(); - if (!checkAndReportSQLError("delete user transactions", del.lastError())) + if (!slCheckAndReportSQLError("delete user transactions", del.lastError())) { QSqlDatabase::database().rollback(); return -2; @@ -1150,10 +1150,10 @@ switch (index.column()) { case 1: - return moneyValueToStr(value.toDouble()); + return slMoneyValueToStr(value.toDouble()); case 2: - return dateTimeToStr(value.toDateTime()); + return slDateTimeToStr(value.toDateTime()); } }