1 files changed, 47 insertions, 70 deletions

diff --git a/sources/shiboken6/tests/libsample/bytearray.cpp b/sources/shiboken6/tests/libsample/bytearray.cpp
index 40f1ebc84..78d5162b0 100644
--- a/sources/shiboken6/tests/libsample/bytearray.cpp
+++ b/sources/shiboken6/tests/libsample/bytearray.cpp
@@ -1,13 +1,14 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include <cstring>
 #include "bytearray.h"
 
-ByteArray::ByteArray()
+#include <algorithm>
+#include <iterator>
+#include <cstring>
+
+ByteArray::ByteArray() : m_data(1, '\0')
 {
-    m_data = std::vector<char>(1);
-    m_data[0] = '\0';
 }
 
 ByteArray::ByteArray(char c)
@@ -17,48 +18,37 @@ ByteArray::ByteArray(char c)
     m_data[1] = '\0';
 }
 
-ByteArray::ByteArray(const char* data)
+ByteArray::ByteArray(const char *data)
 {
-    size_t len = strlen(data);
+    size_t len = std::strlen(data);
     m_data = std::vector<char>(len + 1);
     memcpy(&m_data[0], data, len);
     m_data[len] = '\0';
 }
 
-ByteArray::ByteArray(const char* data, int len)
+ByteArray::ByteArray(const char *data, int len)
 {
     m_data = std::vector<char>(len + 1);
     memcpy(&m_data[0], data, len);
     m_data[len] = '\0';
 }
 
-ByteArray::ByteArray(const ByteArray& other)
-{
-    m_data = std::vector<char>(other.size() + 1);
-    memcpy(&m_data[0], &other.m_data[0], other.size());
-    m_data[other.size()] = '\0';
-}
-
-int
-ByteArray::size() const
+int ByteArray::size() const
 {
     return m_data.size() - 1;
 }
 
-char
-ByteArray::at(int pos) const
+char ByteArray::at(int pos) const
 {
     return m_data[pos];
 }
 
-const char*
-ByteArray::data() const
+const char *ByteArray::data() const
 {
     return &(m_data[0]);
 }
 
-ByteArray&
-ByteArray::append(char c)
+ByteArray &ByteArray::append(char c)
 {
     m_data.pop_back();
     m_data.push_back(c);
@@ -66,37 +56,30 @@ ByteArray::append(char c)
     return *this;
 }
 
-ByteArray&
-ByteArray::append(const char* data)
+ByteArray &ByteArray::append(const char *data)
 {
     m_data.pop_back();
-    for (int i = 0; i < (int)strlen(data); ++i)
-        m_data.push_back(data[i]);
+    std::copy(data, data + strlen(data), std::back_inserter(m_data));
     m_data.push_back('\0');
     return *this;
 }
 
-ByteArray&
-ByteArray::append(const char* data, int len)
+ByteArray &ByteArray::append(const char *data, int len)
 {
     m_data.pop_back();
-    for (int i = 0; i < len; ++i)
-        m_data.push_back(data[i]);
+    std::copy(data, data + len, std::back_inserter(m_data));
     m_data.push_back('\0');
     return *this;
 }
 
-ByteArray&
-ByteArray::append(const ByteArray& other)
+ByteArray &ByteArray::append(const ByteArray &other)
 {
     m_data.pop_back();
-    for (int i = 0; i < (int)other.m_data.size(); ++i)
-        m_data.push_back(other.m_data[i]);
-    m_data.push_back('\0');
+    std::copy(other.m_data.begin(), other.m_data.end(), std::back_inserter(m_data));
     return *this;
 }
 
-static bool compare(const std::vector<char>& mine, const char* other)
+static bool compare(const std::vector<char> &mine, const char *other)
 {
     for (int i = 0; i < (int)mine.size() - 1; ++i) {
         if (mine[i] != other[i])
@@ -105,85 +88,79 @@ static bool compare(const std::vector<char>& mine, const char* other)
     return true;
 }
 
-bool
-ByteArray::operator==(const ByteArray& other) const
+bool ByteArray::operator==(const ByteArray &other) const
 {
-    return compare(m_data, &other.m_data[0]);
+    return m_data == other.m_data;
 }
-bool
-operator==(const ByteArray& ba1, const char* ba2)
+bool operator==(const ByteArray &ba1, const char *ba2)
 {
     return compare(ba1.m_data, ba2);
 }
-bool
-operator==(const char* ba1, const ByteArray& ba2)
+
+bool operator==(const char *ba1, const ByteArray &ba2)
 {
     return compare(ba2.m_data, ba1);
 }
 
-bool
-ByteArray::operator!=(const ByteArray& other) const
+bool ByteArray::operator!=(const ByteArray &other) const
 {
-    return !(m_data == other.m_data);
+    return m_data != other.m_data;
 }
-bool
-operator!=(const ByteArray& ba1, const char* ba2)
+
+bool operator!=(const ByteArray &ba1, const char *ba2)
 {
     return !(ba1 == ba2);
 }
-bool
-operator!=(const char* ba1, const ByteArray& ba2)
+
+bool operator!=(const char *ba1, const ByteArray &ba2)
 {
     return !(ba1 == ba2);
 }
 
-ByteArray&
-ByteArray::operator+=(char c)
+ByteArray &ByteArray::operator+=(char c)
 {
     return append(c);
 }
-ByteArray&
-ByteArray::operator+=(const char* data)
+
+ByteArray &ByteArray::operator+=(const char *data)
 {
     return append(data);
 }
-ByteArray&
-ByteArray::operator+=(const ByteArray& other)
+
+ByteArray &ByteArray::operator+=(const ByteArray &other)
 {
     return append(other);
 }
 
-ByteArray
-operator+(const ByteArray& ba1, const ByteArray& ba2)
+ByteArray operator+(const ByteArray &ba1, const ByteArray &ba2)
 {
     return ByteArray(ba1) += ba2;
 }
-ByteArray
-operator+(const ByteArray& ba1, const char* ba2)
+
+ByteArray operator+(const ByteArray &ba1, const char *ba2)
 {
     return ByteArray(ba1) += ByteArray(ba2);
 }
-ByteArray
-operator+(const char* ba1, const ByteArray& ba2)
+
+ByteArray operator+(const char *ba1, const ByteArray &ba2)
 {
     return ByteArray(ba1) += ba2;
 }
-ByteArray
-operator+(const ByteArray& ba1, char ba2)
+
+ByteArray operator+(const ByteArray &ba1, char ba2)
 {
     return ByteArray(ba1) += ByteArray(ba2);
 }
-ByteArray
-operator+(char ba1, const ByteArray& ba2)
+
+ByteArray operator+(char ba1, const ByteArray &ba2)
 {
     return ByteArray(ba1) += ba2;
 }
 
-unsigned int
-ByteArray::hash(const ByteArray& byteArray)
+unsigned int ByteArray::hash(const ByteArray &byteArray)
 {
     unsigned int result = 0;
-    for (int i = 0; i < (int)byteArray.m_data.size(); ++i)
-        result = 5 * result + byteArray.m_data[i];
+    for (char c : byteArray.m_data)
+        result = 5U * result + unsigned(c);
     return result;
 }