[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kronometer] src: clazy: fix unneeded qstring heap allocations
From:       Elvis Angelaccio <elvis.angelaccio () kdemail ! net>
Date:       2015-12-31 15:46:54
Message-ID: E1aEfRG-0001n4-TI () scm ! kde ! org
[Download RAW message or body]

Git commit cb879425d8e331b1d08dab88c73c76b38bd3cd8c by Elvis Angelaccio.
Committed on 31/12/2015 at 14:24.
Pushed by elvisangelaccio into branch 'master'.

clazy: fix unneeded qstring heap allocations

M  +8    -8    src/lap.cpp
M  +2    -2    src/mainwindow.cpp
M  +10   -10   src/session.cpp
M  +2    -2    src/sessionmodel.cpp

http://commits.kde.org/kronometer/cb879425d8e331b1d08dab88c73c76b38bd3cd8c

diff --git a/src/lap.cpp b/src/lap.cpp
index 79e3f43..0acc0eb 100644
--- a/src/lap.cpp
+++ b/src/lap.cpp
@@ -79,18 +79,18 @@ int Lap::raw() const
 
 void Lap::write(QJsonObject& json) const
 {
-    json[QLatin1String("time")] = raw();
-    json[QLatin1String("reltime")] = m_relativeTime;
-    json[QLatin1String("abstime")] = m_absoluteTime;
-    json[QLatin1String("note")] = m_note;
+    json[QStringLiteral("time")] = raw();
+    json[QStringLiteral("reltime")] = m_relativeTime;
+    json[QStringLiteral("abstime")] = m_absoluteTime;
+    json[QStringLiteral("note")] = m_note;
 }
 
 Lap Lap::fromJson(const QJsonObject& json)
 {
-    Lap lap = fromRawData(json[QLatin1String("time")].toInt());
-    lap.m_relativeTime = json[QLatin1String("reltime")].toString();
-    lap.m_absoluteTime = json[QLatin1String("abstime")].toString();
-    lap.m_note = json[QLatin1String("note")].toString();
+    Lap lap = fromRawData(json[QStringLiteral("time")].toInt());
+    lap.m_relativeTime = json[QStringLiteral("reltime")].toString();
+    lap.m_absoluteTime = json[QStringLiteral("abstime")].toString();
+    lap.m_note = json[QStringLiteral("note")].toString();
 
     return lap;
 }
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 34730a7..3d20789 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -187,11 +187,11 @@ void MainWindow::slotPrepareForSleep(bool beforeSleep)
 
 void MainWindow::slotShowSettings()
 {
-    if (KConfigDialog::showDialog(QLatin1String("settings"))) {
+    if (KConfigDialog::showDialog(QStringLiteral("settings"))) {
         return;
     }
 
-    auto dialog = new KConfigDialog(this, QLatin1String("settings"), \
KronometerConfig::self()); +    auto dialog = new KConfigDialog(this, \
QStringLiteral("settings"), KronometerConfig::self());  
     auto generalPage = dialog->addPage(new GeneralSettings(this), i18n("General \
                settings"));
     generalPage->setIcon(QIcon::fromTheme(QApplication::windowIcon().name()));
diff --git a/src/session.cpp b/src/session.cpp
index be13e45..acb9203 100644
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -101,10 +101,10 @@ void Session::clear()
 
 void Session::write(QJsonObject& json) const
 {
-    json[QLatin1String("name")] = m_name;
-    json[QLatin1String("note")] = m_note;
-    json[QLatin1String("time")] = m_time;
-    json[QLatin1String("date")] = m_date.toString(Qt::ISODate);
+    json[QStringLiteral("name")] = m_name;
+    json[QStringLiteral("note")] = m_note;
+    json[QStringLiteral("time")] = m_time;
+    json[QStringLiteral("date")] = m_date.toString(Qt::ISODate);
 
     QJsonArray laps;
 
@@ -114,19 +114,19 @@ void Session::write(QJsonObject& json) const
         laps.append(object);
     }
 
-    json[QLatin1String("laps")] = laps;
+    json[QStringLiteral("laps")] = laps;
 }
 
 Session Session::fromJson(const QJsonObject& json)
 {
     Session session;
 
-    session.m_name = json[QLatin1String("name")].toString();
-    session.m_note = json[QLatin1String("note")].toString();
-    session.m_time = json[QLatin1String("time")].toInt();
-    session.m_date = QDateTime::fromString(json[QLatin1String("date")].toString(), \
Qt::ISODate); +    session.m_name = json[QStringLiteral("name")].toString();
+    session.m_note = json[QStringLiteral("note")].toString();
+    session.m_time = json[QStringLiteral("time")].toInt();
+    session.m_date = QDateTime::fromString(json[QStringLiteral("date")].toString(), \
Qt::ISODate);  
-    auto laps = json[QLatin1String("laps")].toArray();
+    auto laps = json[QStringLiteral("laps")].toArray();
 
     for (int i = 0; i < laps.size(); i++) {
         session.addLap(Lap::fromJson(laps[i].toObject()));
diff --git a/src/sessionmodel.cpp b/src/sessionmodel.cpp
index b927d1a..c7c49cb 100644
--- a/src/sessionmodel.cpp
+++ b/src/sessionmodel.cpp
@@ -205,7 +205,7 @@ bool SessionModel::isEditable(const QModelIndex& index) const
 
 void SessionModel::read(const QJsonObject& json)
 {
-    auto sessions = json[QLatin1String("sessions")].toArray();
+    auto sessions = json[QStringLiteral("sessions")].toArray();
 
     for (int i = 0; i < sessions.size(); i++) {
         append(Session::fromJson(sessions[i].toObject()));
@@ -223,7 +223,7 @@ void SessionModel::slotWrite()
         sessions.append(object);
     }
 
-    json[QLatin1String("sessions")] = sessions;
+    json[QStringLiteral("sessions")] = sessions;
 
     QFile saveFile {QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) \
+ QLatin1String("/sessions.json")};  saveFile.open(QIODevice::WriteOnly | \
QIODevice::Truncate);


[prev in list] [next in list] [prev in thread] [next in thread]