Adapt to changes in c++utilities

io/entry.cpp

@@ -9,8 +9,7 @@
 #include <sstream>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
-using namespace ConversionUtilities;
 
 namespace Io {
 

io/field.cpp

@@ -5,8 +5,7 @@
 #include <c++utilities/io/binarywriter.h>
 
 using namespace std;
-using namespace IoUtilities;
+using namespace CppUtilities;
-using namespace ConversionUtilities;
 
 namespace Io {
 

io/passwordfile.cpp

@@ -24,8 +24,7 @@
 #include <streambuf>
 
 using namespace std;
-using namespace ConversionUtilities;
+using namespace CppUtilities;
-using namespace IoUtilities;
 
 namespace Io {
 
@@ -321,7 +320,7 @@ void PasswordFile::load()
         if (remainingSize > numeric_limits<uLongf>::max()) {
             throw CryptoException("Size exceeds limit.");
         }
-        const auto rawDecompressedSize = ConversionUtilities::LE::toUInt64(decryptedData.data());
+        const auto rawDecompressedSize = LE::toUInt64(decryptedData.data());
         if (rawDecompressedSize > numeric_limits<uLongf>::max()) {
             throw ParsingException("Decompressed size exceeds limit.");
         }
@@ -477,7 +476,7 @@ void PasswordFile::write(PasswordFileSaveFlags options)
     if (options & PasswordFileSaveFlags::Compression) {
         uLongf compressedSize = compressBound(size);
         encryptedData.resize(8 + compressedSize);
-        ConversionUtilities::LE::getBytes(static_cast<std::uint64_t>(size), encryptedData.data());
+        LE::getBytes(static_cast<std::uint64_t>(size), encryptedData.data());
         switch (
             compress(reinterpret_cast<Bytef *>(encryptedData.data() + 8), &compressedSize, reinterpret_cast<Bytef *>(decryptedData.data()), size)) {
         case Z_MEM_ERROR:
@@ -685,7 +684,7 @@ void PasswordFile::setPath(const string &value)
     m_path = value;
 
     // support "file://" protocol
-    if (ConversionUtilities::startsWith(m_path, "file:")) {
+    if (startsWith(m_path, "file:")) {
         m_path = m_path.substr(5);
     }
 }

io/passwordfile.h

@@ -78,7 +78,7 @@ public:
     PasswordFile(const PasswordFile &other);
     PasswordFile(PasswordFile &&other);
     ~PasswordFile();
-    IoUtilities::NativeFileStream &fileStream();
+    CppUtilities::NativeFileStream &fileStream();
     void open(PasswordFileOpenFlags options = PasswordFileOpenFlags::Default);
     void opened();
     void generateRootEntry();
@@ -120,9 +120,9 @@ private:
     std::unique_ptr<NodeEntry> m_rootEntry;
     std::string m_extendedHeader;
     std::string m_encryptedExtendedHeader;
-    IoUtilities::NativeFileStream m_file;
+    CppUtilities::NativeFileStream m_file;
-    IoUtilities::BinaryReader m_freader;
+    CppUtilities::BinaryReader m_freader;
-    IoUtilities::BinaryWriter m_fwriter;
+    CppUtilities::BinaryWriter m_fwriter;
     std::uint32_t m_version;
     PasswordFileOpenFlags m_openOptions;
     PasswordFileSaveFlags m_saveOptions;
@@ -131,7 +131,7 @@ private:
 /*!
  * \brief Returns the underlying file stream.
  */
-inline IoUtilities::NativeFileStream &PasswordFile::fileStream()
+inline CppUtilities::NativeFileStream &PasswordFile::fileStream()
 {
     return m_file;
 }

tests/entrytests.cpp

@@ -3,14 +3,14 @@
 #include "./utils.h"
 
 #include <c++utilities/tests/testutils.h>
-using namespace TestUtilities;
+using namespace CppUtilities;
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;
 using namespace Io;
-using namespace TestUtilities::Literals;
+using namespace CppUtilities::Literals;
 
 using namespace CPPUNIT_NS;
 

tests/fieldtests.cpp

@@ -4,14 +4,14 @@
 #include "./utils.h"
 
 #include <c++utilities/tests/testutils.h>
-using namespace TestUtilities;
+using namespace CppUtilities;
 
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;
 using namespace Io;
-using namespace TestUtilities::Literals;
+using namespace CppUtilities::Literals;
 
 using namespace CPPUNIT_NS;
 

tests/opensslrandomdevice.cpp

@@ -9,7 +9,7 @@
 
 using namespace std;
 using namespace Util;
-using namespace TestUtilities::Literals;
+using namespace CppUtilities::Literals;
 
 using namespace CPPUNIT_NS;
 

tests/opensslutils.cpp

@@ -10,8 +10,8 @@
 
 using namespace std;
 using namespace Util::OpenSsl;
-using namespace ConversionUtilities;
+using namespace CppUtilities;
-using namespace TestUtilities::Literals;
+using namespace CppUtilities::Literals;
 
 using namespace CPPUNIT_NS;
 

tests/passwordfiletests.cpp

@@ -9,8 +9,8 @@
 
 using namespace std;
 using namespace Io;
-using namespace TestUtilities::Literals;
+using namespace CppUtilities;
-
+using namespace CppUtilities::Literals;
 using namespace CPPUNIT_NS;
 
 /*!
@@ -49,8 +49,7 @@ void PasswordFileTests::tearDown()
  */
 void PasswordFileTests::testReading()
 {
-    testReading(
+    testReading("read", testFilePath("testfile1.pwmgr"), "123456", testFilePath("testfile2.pwmgr"), string(), false, false);
-        "read", TestUtilities::testFilePath("testfile1.pwmgr"), "123456", TestUtilities::testFilePath("testfile2.pwmgr"), string(), false, false);
 }
 
 void PasswordFileTests::testReading(const string &context, const string &testfile1path, const string &testfile1password, const string &testfile2,
@@ -153,8 +152,8 @@ void PasswordFileTests::testReading(const string &context, const string &testfil
  */
 void PasswordFileTests::testBasicWriting()
 {
-    const string testfile1 = TestUtilities::workingCopyPath("testfile1.pwmgr");
+    const string testfile1 = workingCopyPath("testfile1.pwmgr");
-    const string testfile2 = TestUtilities::workingCopyPath("testfile2.pwmgr");
+    const string testfile2 = workingCopyPath("testfile2.pwmgr");
     PasswordFile file;
 
     // resave testfile 1
@@ -187,8 +186,8 @@ void PasswordFileTests::testBasicWriting()
  */
 void PasswordFileTests::testExtendedWriting()
 {
-    const string testfile1 = TestUtilities::workingCopyPath("testfile1.pwmgr");
+    const string testfile1 = workingCopyPath("testfile1.pwmgr");
-    const string testfile2 = TestUtilities::workingCopyPath("testfile2.pwmgr");
+    const string testfile2 = workingCopyPath("testfile2.pwmgr");
     PasswordFile file;
 
     // resave testfile 1

tests/utils.h

@@ -9,11 +9,11 @@
 
 #include <ostream>
 
-namespace TestUtilities {
+namespace CppUtilities {
 
 inline std::ostream &operator<<(std::ostream &out, const Io::Entry *entry)
 {
-    return out << ConversionUtilities::joinStrings(entry->path(), "/");
+    return out << joinStrings(entry->path(), "/");
 }
 
 inline std::ostream &operator<<(std::ostream &out, const Io::Field *field)
@@ -21,6 +21,6 @@ inline std::ostream &operator<<(std::ostream &out, const Io::Field *field)
     return out << field->name() << '=' << field->value();
 }
 
-} // namespace TestUtilities
+} // namespace CppUtilities
 
 #endif // PASSWORDFILE_TESTS_UTILS_H

util/opensslrandomdevice.cpp

@@ -10,6 +10,7 @@
 #include <string>
 
 using namespace std;
+using namespace CppUtilities;
 
 namespace Util {
 
@@ -32,7 +33,7 @@ OpenSslRandomDevice::result_type OpenSslRandomDevice::operator()() const
 {
     unsigned char buf[4];
     if (RAND_bytes(buf, sizeof(buf))) {
-        return ConversionUtilities::LE::toUInt32(reinterpret_cast<char *>(buf));
+        return LE::toUInt32(reinterpret_cast<char *>(buf));
     }
 
     // handle error case