From e0e0d5be7ed9c6ff10f6e730f3f37dba9a991ff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Fischer?= <ondrej.fischer@spaceti.com>
Date: Wed, 23 Oct 2019 16:10:46 +0200
Subject: [PATCH] Another analyze changes

---
 src/colnod/entity.cpp          |  4 ++--
 src/colnod/entity.h            |  2 +-
 src/colnod/subject.cpp         |  4 ++--
 src/colnod/subject.h           |  2 +-
 src/colnod/token.cpp           | 10 +++++-----
 src/colnod/token.h             |  4 ++--
 test/unitTests/complextest.cpp |  3 ---
 7 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/colnod/entity.cpp b/src/colnod/entity.cpp
index f18bb48..d1d93cb 100644
--- a/src/colnod/entity.cpp
+++ b/src/colnod/entity.cpp
@@ -33,7 +33,7 @@ void Entity::setLastUpdate(quint64 lastUpdate) {
     this->lastUpdate = lastUpdate;
 }
 
-QString Entity::idToStringWithoutBraces()
+QString Entity::idToStringWithoutBraces() const
 {
     const qint8 lengthOfUuid = 36;
     return id.toString().mid(1, lengthOfUuid);
@@ -49,7 +49,7 @@ void Entity::fromJSON(const QJsonObject &json) {
 QJsonObject Entity::toJSON() const {
     QJsonObject json;
 
-    json.value("id") = id.toString().mid(1,36);
+    json.value("id") = this->idToStringWithoutBraces();
     json.value("name") = name;
     json.value("description") = description;
     json.value("lastUpdate") = lastUpdate;
diff --git a/src/colnod/entity.h b/src/colnod/entity.h
index d5fa1dc..ec71351 100644
--- a/src/colnod/entity.h
+++ b/src/colnod/entity.h
@@ -22,7 +22,7 @@ public:
     quint64 getLastUpdate() const;
     void setLastUpdate(quint64 lastUpdate);
 
-    QString idToStringWithoutBraces();
+    QString idToStringWithoutBraces() const;
 
     virtual void fromJSON(const QJsonObject &json);
     virtual QJsonObject toJSON() const;
diff --git a/src/colnod/subject.cpp b/src/colnod/subject.cpp
index 6556cf6..f92f113 100644
--- a/src/colnod/subject.cpp
+++ b/src/colnod/subject.cpp
@@ -4,9 +4,9 @@
 
 #include <QJsonArray>
 
-Subject::Subject(QString name)
+Subject::Subject(const QString& name)
 {
-    setName(std::move(name));
+    setName(name);
 }
 
 QString Subject::getEmail() const {
diff --git a/src/colnod/subject.h b/src/colnod/subject.h
index 0046e1a..ed7b213 100644
--- a/src/colnod/subject.h
+++ b/src/colnod/subject.h
@@ -12,7 +12,7 @@ class Subject : public Entity {
 public:
     using Entity::Entity;
     Subject() = default;
-    Subject(QString name);
+    Subject(const QString& name);
 
     QString getEmail() const;
 
diff --git a/src/colnod/token.cpp b/src/colnod/token.cpp
index 6f24b9b..7043c41 100644
--- a/src/colnod/token.cpp
+++ b/src/colnod/token.cpp
@@ -3,11 +3,11 @@
 #include <QJsonArray>
 #include <utility>
 
-Token::Token(QString name, QString tokenData, QString decription)
+Token::Token(const QString& name, QString tokenData, const QString& decription)
 {
-    this->setName(std::move(name));
+    this->setName(name);
     this->tokenData = std::move(tokenData);
-    this->setDescription(std::move(decription));
+    this->setDescription(decription);
     this->setId(QUuid::createUuid());
     this->tokenType = "Token";
     this->tokenBits = 32;
@@ -17,9 +17,9 @@ Token::Token(QString name, QString tokenData, QString decription)
 
 }
 
-Token::Token(QString name)
+Token::Token(const QString& name)
 {
-    this->setName(std::move(name));
+    this->setName(name);
 }
 
 
diff --git a/src/colnod/token.h b/src/colnod/token.h
index 287aadb..e98ef68 100644
--- a/src/colnod/token.h
+++ b/src/colnod/token.h
@@ -10,8 +10,8 @@ public:
    // using Entity::Entity;
 
     Token() = default;
-    Token(QString name, QString tokenData, QString decription = "mobile");
-    Token(QString name);
+    Token(const QString& name, QString tokenData, const QString& decription = "mobile");
+    Token(const QString& name);
 
     friend bool operator<(const Token &rToken, const Token &lToken){
         return rToken.getLastModified() < lToken.getLastUpdate();
diff --git a/test/unitTests/complextest.cpp b/test/unitTests/complextest.cpp
index 04c2e70..df99862 100644
--- a/test/unitTests/complextest.cpp
+++ b/test/unitTests/complextest.cpp
@@ -104,8 +104,6 @@ void ComplexTest::complexTest()
     QVERIFY(doc2.object()["items"].toArray().contains("582c982d-6fd7-4856-8548-7ce542791c7a"));
     // CHECK_DELETED_TOKENS_END
 
-
-
     // LAST_TESTS (for sure)
     QCOMPARE(loginSpy.count(), 1); // Checking multiple calls
     QCOMPARE(loginRespSpy.count(), 1);
@@ -113,7 +111,6 @@ void ComplexTest::complexTest()
     QCOMPARE(getNumOfTokens(), numOfTokens);
 }
 
-
 void ComplexTest::fullSync()
 {
     api->prepareDatabase();