Mercurial > hg > syntilista

changeset 202:4e25db3327a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use QStringLiteral() some more.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 15 Nov 2017 10:34:55 +0200
parents ea0247fab5a4
children 5c3e3967bdf3
files src/main.cpp
diffstat 1 files changed, 21 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/src/main.cpp	Wed Nov 15 10:34:24 2017 +0200
+++ b/src/main.cpp	Wed Nov 15 10:34:55 2017 +0200
@@ -188,10 +188,10 @@
 bool slGetPersonInfo(qint64 id, SLPersonInfo &info)
 {
     QSqlQuery query;
-    query.prepare(
+    query.prepare(QStringLiteral(
         "SELECT id,first_name,last_name,extra_info,added,updated, "
         "(SELECT TOTAL(value) FROM transactions WHERE transactions.person=people.id) AS balance "
-        "FROM people WHERE id=?");
+        "FROM people WHERE id=?"));
 
     query.addBindValue(id);
     query.exec();
@@ -510,7 +510,7 @@
 void SyntilistaMainWindow::backupSuccess()
 {
     QSettings tmpst(APP_VENDOR, APP_ID);
-    slLog("INFO", "Backup successful.");
+    slLog("INFO", QStringLiteral("Backup successful."));
 
     tmpst.setValue("dbLastBackup", QDateTime::currentDateTimeUtc());
 }
@@ -682,7 +682,8 @@
                     break;
 
                 case 403:
-                    slLog("ERROR", "Backup server authentication failed. Wrong secret or other invalid settings.");
+                    slLog("ERROR",
+                        QStringLiteral("Backup server authentication failed. Wrong secret or other invalid settings."));
                     break;
 
                 default:
@@ -695,7 +696,8 @@
     }
     else
     {
-        slLog("WARNING", "Backup finished prematurely (failed).");
+        slLog("WARNING",
+            QStringLiteral("Backup finished prematurely (failed)."));
     }
 
     backupDialog->close();
@@ -780,7 +782,7 @@
             ui->button_PayFullDebt->setEnabled(currPerson.balance < 0);
 
             QSqlQuery query;
-            query.prepare("SELECT id,value,added FROM transactions WHERE person=? ORDER BY added DESC LIMIT 5");
+            query.prepare(QStringLiteral("SELECT id,value,added FROM transactions WHERE person=? ORDER BY added DESC LIMIT 5"));
             query.addBindValue(id);
             query.exec();
             slCheckAndReportSQLError("SELECT transactions for tableview_Latest", query.lastError());
@@ -970,9 +972,9 @@
 void SyntilistaMainWindow::updatePersonList()
 {
     static const QString queryBase =
-        "SELECT id,last_name,first_name,"
+        QStringLiteral("SELECT id,last_name,first_name,"
         "(SELECT TOTAL(value) FROM transactions WHERE transactions.person=people.id) AS balance,"
-        "updated FROM people";
+        "updated FROM people");
 
     QString queryOrderDir, queryOrderBy;
 
@@ -1012,7 +1014,7 @@
     {
         // Filter by name(s)
         QString tmp = "%"+ peopleFilter +"%";
-        query.prepare(queryBase +" WHERE first_name LIKE ? OR last_name LIKE ?" + queryOrderBy);
+        query.prepare(queryBase + QStringLiteral(" WHERE first_name LIKE ? OR last_name LIKE ?") + queryOrderBy);
 
         query.addBindValue(tmp);
         query.addBindValue(tmp);
@@ -1093,7 +1095,7 @@
 
     // Add transaction entry
     QSqlQuery query;
-    query.prepare("INSERT INTO transactions (person,value,added) VALUES (?,?,?)");
+    query.prepare(QStringLiteral("INSERT INTO transactions (person,value,added) VALUES (?,?,?)"));
     query.addBindValue(id);
     query.addBindValue(value);
     query.addBindValue(QDateTime::currentDateTimeUtc());
@@ -1105,7 +1107,7 @@
     }
 
     // Update person record timestamp
-    query.prepare("UPDATE people SET updated=? WHERE id=?");
+    query.prepare(QStringLiteral("UPDATE people SET updated=? WHERE id=?"));
     query.addBindValue(QDateTime::currentDateTimeUtc());
     query.addBindValue(id);
     query.exec();
@@ -1134,8 +1136,8 @@
     // Check value
     if (value == 0)
     {
-        QString tmp = (debt ? "lisätty" : "vähennetty");
-        statusMsg("Velkaa ei "+ tmp +" koska summaa ei määritetty.");
+        QString tmp = debt ? tr("lisätty") : tr("vähennetty");
+        statusMsg(tr("Velkaa ei %1 koska summaa ei määritetty.").arg(tmp));
         return 1;
     }
 
@@ -1335,7 +1337,7 @@
         // different ID and same names.
         //
         QSqlQuery person;
-        person.prepare("SELECT * FROM people WHERE id <> ? AND first_name=? AND last_name=?");
+        person.prepare(QStringLiteral("SELECT * FROM people WHERE id <> ? AND first_name=? AND last_name=?"));
         person.addBindValue(selPerson.id);
         person.addBindValue(selPerson.firstName);
         person.addBindValue(selPerson.lastName);
@@ -1461,7 +1463,7 @@
             ui->label_AddedValue->setText(slDateTimeToStr(pinfo.added));
 
             QSqlQuery query;
-            query.prepare("SELECT id,value,added FROM transactions WHERE person=? ORDER BY added DESC");
+            query.prepare(QStringLiteral("SELECT id,value,added FROM transactions WHERE person=? ORDER BY added DESC"));
             query.addBindValue(pinfo.id);
             query.exec();
             slCheckAndReportSQLError("SELECT transactions for tableview_Transactions", query.lastError());
@@ -1528,7 +1530,7 @@
 {
     QSqlQuery np;
 
-    np.prepare("UPDATE people SET first_name=?,last_name=?,extra_info=?,updated=? WHERE id=?");
+    np.prepare(QStringLiteral("UPDATE people SET first_name=?,last_name=?,extra_info=?,updated=? WHERE id=?"));
     np.addBindValue(info.firstName);
     np.addBindValue(info.lastName);
     np.addBindValue(info.extraInfo);
@@ -1550,7 +1552,7 @@
 //    beginInsertRows(QModelIndex(), rowCount(), rowCount());
 
     QSqlQuery np;
-    np.prepare("INSERT INTO people (first_name,last_name,extra_info,added,updated) VALUES (?,?,?,?,?)");
+    np.prepare(QStringLiteral("INSERT INTO people (first_name,last_name,extra_info,added,updated) VALUES (?,?,?,?,?)"));
     np.addBindValue(info.firstName);
     np.addBindValue(info.lastName);
     np.addBindValue(info.extraInfo);
@@ -1576,7 +1578,7 @@
     QSqlDatabase::database().transaction();
     QSqlQuery del;
 
-    del.prepare("DELETE FROM people WHERE id=?");
+    del.prepare(QStringLiteral("DELETE FROM people WHERE id=?"));
     del.addBindValue(id);
     del.exec();
 
@@ -1586,7 +1588,7 @@
         return -1;
     }
 
-    del.prepare("DELETE FROM transactions WHERE person=?");
+    del.prepare(QStringLiteral("DELETE FROM transactions WHERE person=?"));
     del.addBindValue(id);
     del.exec();