From aa6e9df436eaac3d4a8dd8bd06e403056a20e2ba Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com> Date: Tue, 12 Dec 2017 20:17:32 +0100 Subject: [PATCH] Improved performance by using QStringLiteral everywhere --- dialogs/updatedialog.cpp | 6 ++-- main.cpp | 20 ++++++------- mainwindow.cpp | 4 +-- replies/getbookingsreply.cpp | 4 +-- replies/gettimeassignmentsreply.cpp | 4 +-- stripswidget.cpp | 22 +++++++------- zeiterfassungapi.cpp | 24 +++++++-------- zeiterfassungsettings.cpp | 46 ++++++++++++++--------------- zeiterfassungsettings.h | 2 +- 9 files changed, 66 insertions(+), 66 deletions(-) diff --git a/dialogs/updatedialog.cpp b/dialogs/updatedialog.cpp index 0236d0f..1a93045 100644 --- a/dialogs/updatedialog.cpp +++ b/dialogs/updatedialog.cpp @@ -71,12 +71,12 @@ void UpdateDialog::finished() for(const auto &releaseVal : array) { auto releaseObj = releaseVal.toObject(); - auto version = QVersionNumber::fromString(releaseObj.value("tag_name").toString()); + auto version = QVersionNumber::fromString(releaseObj.value(QStringLiteral("tag_name")).toString()); if(appVersion < version) { - m_url = QUrl(releaseObj.value("html_url").toString()); - ui->labelDescription->setText(releaseObj.value("body").toString()); + m_url = QUrl(releaseObj.value(QStringLiteral("html_url")).toString()); + ui->labelDescription->setText(releaseObj.value(QStringLiteral("body")).toString()); show(); return; diff --git a/main.cpp b/main.cpp index 775f9d7..43a5060 100755 --- a/main.cpp +++ b/main.cpp @@ -46,16 +46,16 @@ int main(int argc, char *argv[]) QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts); QApplication app(argc, argv); - qSetMessagePattern("%{time dd.MM.yyyy HH:mm:ss.zzz} " - "[" - "%{if-debug}D%{endif}" - "%{if-info}I%{endif}" - "%{if-warning}W%{endif}" - "%{if-critical}C%{endif}" - "%{if-fatal}F%{endif}" - "] " - "%{function}(): " - "%{message}"); + qSetMessagePattern(QStringLiteral("%{time dd.MM.yyyy HH:mm:ss.zzz} " + "[" + "%{if-debug}D%{endif}" + "%{if-info}I%{endif}" + "%{if-warning}W%{endif}" + "%{if-critical}C%{endif}" + "%{if-fatal}F%{endif}" + "] " + "%{function}(): " + "%{message}")); QCoreApplication::setOrganizationDomain(QStringLiteral("brunner.ninja")); QCoreApplication::setOrganizationName(QStringLiteral("db-software")); diff --git a/mainwindow.cpp b/mainwindow.cpp index 011f280..ae8740a 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -293,7 +293,7 @@ void MainWindow::contextMenuBooking(const QPoint &pos) else if(selectedAction == deleteAction) { QMessageBox msgBox; - msgBox.setText("Do you really want to delete the booking?"); + msgBox.setText(tr("Do you really want to delete the booking?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel); msgBox.setDefaultButton(QMessageBox::Cancel); if(msgBox.exec() == QMessageBox::Yes) @@ -413,7 +413,7 @@ void MainWindow::contextMenuTimeAssignment(const QPoint &pos) else if(selectedAction == deleteAction) { QMessageBox msgBox; - msgBox.setText("Do you really want to delete the time assignment?"); + msgBox.setText(tr("Do you really want to delete the time assignment?")); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel); msgBox.setDefaultButton(QMessageBox::Cancel); if(msgBox.exec() == QMessageBox::Yes) diff --git a/replies/getbookingsreply.cpp b/replies/getbookingsreply.cpp index 40ccf41..7bab592 100644 --- a/replies/getbookingsreply.cpp +++ b/replies/getbookingsreply.cpp @@ -56,8 +56,8 @@ void GetBookingsReply::requestFinished() m_bookings.append({ obj.value(QStringLiteral("bookingNr")).toInt(), QDate::fromString(QString::number(obj.value(QStringLiteral("bookingDate")).toInt()), QStringLiteral("yyyyMMdd")), - QTime::fromString(QString("%0").arg(obj.value(QStringLiteral("bookingTime")).toInt(), 6, 10, QChar('0')), QStringLiteral("HHmmss")), - QTime::fromString(QString("%0").arg(obj.value(QStringLiteral("bookingTimespan")).toInt(), 6, 10, QChar('0')), QStringLiteral("HHmmss")), + QTime::fromString(QStringLiteral("%0").arg(obj.value(QStringLiteral("bookingTime")).toInt(), 6, 10, QChar('0')), QStringLiteral("HHmmss")), + QTime::fromString(QStringLiteral("%0").arg(obj.value(QStringLiteral("bookingTimespan")).toInt(), 6, 10, QChar('0')), QStringLiteral("HHmmss")), obj.value(QStringLiteral("bookingType")).toString(), obj.value(QStringLiteral("text")).toString() }); diff --git a/replies/gettimeassignmentsreply.cpp b/replies/gettimeassignmentsreply.cpp index c7a9a8b..14bf9dc 100644 --- a/replies/gettimeassignmentsreply.cpp +++ b/replies/gettimeassignmentsreply.cpp @@ -58,8 +58,8 @@ void GetTimeAssignmentsReply::requestFinished() m_timeAssignments.append({ obj.value(QStringLiteral("bookingNr")).toInt(), QDate::fromString(QString::number(obj.value(QStringLiteral("bookingDate")).toInt()), QStringLiteral("yyyyMMdd")), - QTime::fromString(QString("%0").arg(obj.value(QStringLiteral("bookingTime")).toInt(), 6, 10, QChar('0')), QStringLiteral("HHmmss")), - QTime::fromString(QString("%0").arg(obj.value(QStringLiteral("bookingTimespan")).toInt(), 6, 10, QChar('0')), QStringLiteral("HHmmss")), + QTime::fromString(QStringLiteral("%0").arg(obj.value(QStringLiteral("bookingTime")).toInt(), 6, 10, QChar('0')), QStringLiteral("HHmmss")), + QTime::fromString(QStringLiteral("%0").arg(obj.value(QStringLiteral("bookingTimespan")).toInt(), 6, 10, QChar('0')), QStringLiteral("HHmmss")), obj.value(QStringLiteral("text")).toString(), koWertList.at(0).toObject().value(QStringLiteral("value")).toString(), koWertList.at(1).toObject().value(QStringLiteral("value")).toString(), diff --git a/stripswidget.cpp b/stripswidget.cpp index aa48fa5..7458473 100644 --- a/stripswidget.cpp +++ b/stripswidget.cpp @@ -427,7 +427,7 @@ bool StripsWidget::createStrips() QMessageBox::warning(this, tr("Illegal state!"), tr("Your bookings and time assignments for this day are in an illegal state!") % "\n\n" % - m_date.toString("dd.MM.yyyy") % "\n\n" % + m_date.toString(QStringLiteral("dd.MM.yyyy")) % "\n\n" % errorMessage); } @@ -546,12 +546,12 @@ QWidget *StripsWidget::appendBookingStartStrip(int id, const QTime &time) { auto widget = m_stripFactory.createBookingStartStrip(this); - if(auto labelTime = widget->findChild("labelTime")) + if(auto labelTime = widget->findChild(QStringLiteral("labelTime"))) labelTime->setProperty("text", time.toString(QStringLiteral("HH:mm"))); else qWarning() << "no labelTime found!"; - if(auto labelId = widget->findChild("labelId")) + if(auto labelId = widget->findChild(QStringLiteral("labelId"))) labelId->setProperty("text", QString::number(id)); else qWarning() << "no labelId found!"; @@ -565,12 +565,12 @@ QWidget *StripsWidget::appendBookingEndStrip(int id, const QTime &time) { auto widget = m_stripFactory.createBookingEndStrip(this); - if(auto labelTime = widget->findChild("labelTime")) + if(auto labelTime = widget->findChild(QStringLiteral("labelTime"))) labelTime->setProperty("text", time.toString(QStringLiteral("HH:mm"))); else qWarning() << "no labelTime found!"; - if(auto labelId = widget->findChild("labelId")) + if(auto labelId = widget->findChild(QStringLiteral("labelId"))) labelId->setProperty("text", QString::number(id)); else qWarning() << "no labelId found!"; @@ -584,32 +584,32 @@ QWidget *StripsWidget::appendTimeAssignmentStrip(int id, const QTime &duration, { auto widget = m_stripFactory.createTimeAssignmentStrip(this); - if(auto labelTime = widget->findChild("labelTime")) + if(auto labelTime = widget->findChild(QStringLiteral("labelTime"))) labelTime->setProperty("text", duration == QTime(0, 0) ? tr("Open") : duration.toString(QStringLiteral("HH:mm"))); else qWarning() << "no labelTime found!"; - if(auto labelProject = widget->findChild("labelProject")) + if(auto labelProject = widget->findChild(QStringLiteral("labelProject"))) labelProject->setProperty("text", project); else qWarning() << "no labelProject found!"; - if(auto labelId = widget->findChild("labelId")) + if(auto labelId = widget->findChild(QStringLiteral("labelId"))) labelId->setProperty("text", QString::number(id)); else qWarning() << "no labelId found!"; - if(auto labelSubproject = widget->findChild("labelSubproject")) + if(auto labelSubproject = widget->findChild(QStringLiteral("labelSubproject"))) labelSubproject->setProperty("text", subproject); else qWarning() << "no labelSubproject found!"; - if(auto labelWorkpackage = widget->findChild("labelWorkpackage")) + if(auto labelWorkpackage = widget->findChild(QStringLiteral("labelWorkpackage"))) labelWorkpackage->setProperty("text", workpackage); else qWarning() << "no labelWorkpackage found!"; - if(auto labelText = widget->findChild("labelText")) + if(auto labelText = widget->findChild(QStringLiteral("labelText"))) labelText->setProperty("text", text); else qWarning() << "no labelText found!"; diff --git a/zeiterfassungapi.cpp b/zeiterfassungapi.cpp index a7b5bcd..da1fbdf 100644 --- a/zeiterfassungapi.cpp +++ b/zeiterfassungapi.cpp @@ -99,9 +99,9 @@ CreateBookingReply *ZeiterfassungApi::doCreateBooking(int userId, const QDate &d QJsonObject obj; obj[QStringLiteral("persNr")] = userId; - obj[QStringLiteral("bookingDate")] = date.toString("yyyyMMdd").toInt(); - obj[QStringLiteral("bookingTime")] = time.toString("Hmmss").toInt(); - obj[QStringLiteral("bookingTimespan")] = timespan.toString("Hmmss").toInt(); + obj[QStringLiteral("bookingDate")] = date.toString(QStringLiteral("yyyyMMdd")).toInt(); + obj[QStringLiteral("bookingTime")] = time.toString(QStringLiteral("Hmmss")).toInt(); + obj[QStringLiteral("bookingTimespan")] = timespan.toString(QStringLiteral("Hmmss")).toInt(); obj[QStringLiteral("bookingType")] = type; obj[QStringLiteral("hourCategory")] = QStringLiteral(""); obj[QStringLiteral("empfEinh")] = QStringLiteral(""); @@ -122,9 +122,9 @@ UpdateBookingReply *ZeiterfassungApi::doUpdateBooking(int bookingId, int userId, QJsonObject obj; obj[QStringLiteral("bookingNr")] = bookingId; obj[QStringLiteral("persNr")] = userId; - obj[QStringLiteral("bookingDate")] = date.toString("yyyyMMdd").toInt(); - obj[QStringLiteral("bookingTime")] = time.toString("Hmmss").toInt(); - obj[QStringLiteral("bookingTimespan")] = timespan.toString("Hmmss").toInt(); + obj[QStringLiteral("bookingDate")] = date.toString(QStringLiteral("yyyyMMdd")).toInt(); + obj[QStringLiteral("bookingTime")] = time.toString(QStringLiteral("Hmmss")).toInt(); + obj[QStringLiteral("bookingTimespan")] = timespan.toString(QStringLiteral("Hmmss")).toInt(); obj[QStringLiteral("bookingType")] = type; obj[QStringLiteral("hourCategory")] = QStringLiteral(""); obj[QStringLiteral("empfEinh")] = QStringLiteral(""); @@ -175,9 +175,9 @@ CreateTimeAssignmentReply *ZeiterfassungApi::doCreateTimeAssignment(int userId, QJsonObject obj; obj[QStringLiteral("bookingNr")] = QJsonValue::Null; obj[QStringLiteral("persNr")] = userId; - obj[QStringLiteral("bookingDate")] = date.toString("yyyyMMdd").toInt(); - obj[QStringLiteral("bookingTime")] = time.toString("Hmmss").toInt(); - obj[QStringLiteral("bookingTimespan")] = timespan.toString("Hmmss").toInt(); + obj[QStringLiteral("bookingDate")] = date.toString(QStringLiteral("yyyyMMdd")).toInt(); + obj[QStringLiteral("bookingTime")] = time.toString(QStringLiteral("Hmmss")).toInt(); + obj[QStringLiteral("bookingTimespan")] = timespan.toString(QStringLiteral("Hmmss")).toInt(); obj[QStringLiteral("text")] = text; { QJsonArray koWertList; @@ -217,9 +217,9 @@ UpdateTimeAssignmentReply *ZeiterfassungApi::doUpdateTimeAssignment(int timeAssi QJsonObject obj; obj[QStringLiteral("bookingNr")] = timeAssignmentId; obj[QStringLiteral("persNr")] = userId; - obj[QStringLiteral("bookingDate")] = date.toString("yyyyMMdd").toInt(); - obj[QStringLiteral("bookingTime")] = time.toString("Hmmss").toInt(); - obj[QStringLiteral("bookingTimespan")] = timespan.toString("Hmmss").toInt(); + obj[QStringLiteral("bookingDate")] = date.toString(QStringLiteral("yyyyMMdd")).toInt(); + obj[QStringLiteral("bookingTime")] = time.toString(QStringLiteral("Hmmss")).toInt(); + obj[QStringLiteral("bookingTimespan")] = timespan.toString(QStringLiteral("Hmmss")).toInt(); obj[QStringLiteral("bookingType")] = QJsonValue::Null; obj[QStringLiteral("hourCategory")] = QJsonValue::Null; obj[QStringLiteral("bewEinh")] = QJsonValue::Null; diff --git a/zeiterfassungsettings.cpp b/zeiterfassungsettings.cpp index e12582c..c0cae7b 100644 --- a/zeiterfassungsettings.cpp +++ b/zeiterfassungsettings.cpp @@ -34,115 +34,115 @@ ZeiterfassungSettings::ZeiterfassungSettings(QObject *parent) : QLocale::Language ZeiterfassungSettings::language() const { - return value("language").value(); + return value(QStringLiteral("language")).value(); } void ZeiterfassungSettings::setLanguage(QLocale::Language language) { - setValue("language", language); + setValue(QStringLiteral("language"), language); } QString ZeiterfassungSettings::url() const { - return value("url", QStringLiteral("http://10.1.0.11:8080/evoApps/")).toString(); + return value(QStringLiteral("url"), QStringLiteral("http://10.1.0.11:8080/evoApps/")).toString(); } void ZeiterfassungSettings::setUrl(const QString &url) { - setValue("url", url); + setValue(QStringLiteral("url"), url); } QString ZeiterfassungSettings::username() const { - return value("username").toString(); + return value(QStringLiteral("username")).toString(); } void ZeiterfassungSettings::setUsername(const QString &username) { - setValue("username", username); + setValue(QStringLiteral("username"), username); } QString ZeiterfassungSettings::password() const { - return value("password").toString(); + return value(QStringLiteral("password")).toString(); } void ZeiterfassungSettings::setPassword(const QString &password) { - setValue("password", password); + setValue(QStringLiteral("password"), password); } QStringList ZeiterfassungSettings::projects() const { - return value("projects").toStringList(); + return value(QStringLiteral("projects")).toStringList(); } void ZeiterfassungSettings::setProjects(const QStringList &projects) { - setValue("projects", projects); + setValue(QStringLiteral("projects"), projects); } void ZeiterfassungSettings::prependProject(const QString &project) { - prepentItem("projects", project); + prependItem(QStringLiteral("projects"), project); } QStringList ZeiterfassungSettings::subprojects() const { - return value("subprojects").toStringList(); + return value(QStringLiteral("subprojects")).toStringList(); } void ZeiterfassungSettings::setSubprojects(const QStringList &subprojects) { - setValue("subprojects", subprojects); + setValue(QStringLiteral("subprojects"), subprojects); } void ZeiterfassungSettings::prependSubproject(const QString &subproject) { - prepentItem("subprojects", subproject); + prependItem(QStringLiteral("subprojects"), subproject); } QStringList ZeiterfassungSettings::workpackages() const { - return value("workpackages").toStringList(); + return value(QStringLiteral("workpackages")).toStringList(); } void ZeiterfassungSettings::setWorkpackages(const QStringList &workpackages) { - setValue("workpackages", workpackages); + setValue(QStringLiteral("workpackages"), workpackages); } void ZeiterfassungSettings::prependWorkpackage(const QString &workpackage) { - prepentItem("workpackages", workpackage); + prependItem(QStringLiteral("workpackages"), workpackage); } QStringList ZeiterfassungSettings::texte() const { - return value("texte").toStringList(); + return value(QStringLiteral("texte")).toStringList(); } void ZeiterfassungSettings::setTexte(const QStringList &texte) { - setValue("texte", texte); + setValue(QStringLiteral("texte"), texte); } void ZeiterfassungSettings::prependText(const QString &text) { - prepentItem("texte", text); + prependItem(QStringLiteral("texte"), text); } QDate ZeiterfassungSettings::lastUpdateCheck() const { - return value("lastUpdateCheck").toDate(); + return value(QStringLiteral("lastUpdateCheck")).toDate(); } void ZeiterfassungSettings::setLastUpdateCheck(const QDate &lastUpdateCheck) { - setValue("lastUpdateCheck", lastUpdateCheck); + setValue(QStringLiteral("lastUpdateCheck"), lastUpdateCheck); } -void ZeiterfassungSettings::prepentItem(const QString &name, const QString &item) +void ZeiterfassungSettings::prependItem(const QString &name, const QString &item) { if(item.trimmed().isEmpty()) return; diff --git a/zeiterfassungsettings.h b/zeiterfassungsettings.h index fbecfe0..4f901fb 100644 --- a/zeiterfassungsettings.h +++ b/zeiterfassungsettings.h @@ -53,7 +53,7 @@ public: void setLastUpdateCheck(const QDate &lastUpdateCheck); private: - void prepentItem(const QString &name, const QString &item); + void prependItem(const QString &name, const QString &item); }; #endif // ZEITERFASSUNGSETTINGS_H