Use empty qstring instead of nullptr

#356 (review)
ubports · Jan 21, 2021 · ac69b16 · ac69b16
1 parent 5bed8a1
commit ac69b16
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/plugins/Utils/windowstatestorage.cpp b/plugins/Utils/windowstatestorage.cpp
@@ -275,7 +275,7 @@ WindowStateStorage::WindowStateStorage(const QString &dbName, QObject *parent):
 {
     qRegisterMetaType<WindowStateStorage::WindowState>("WindowStateStorage::WindowState");
     QString dbFile;
-    if (dbName == nullptr) {
+    if (dbName.isEmpty()) {
         const QString dbPath = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QStringLiteral("/unity8/");
         QDir dir;
         dir.mkpath(dbPath);

diff --git a/plugins/Utils/windowstatestorage.h b/plugins/Utils/windowstatestorage.h
@@ -50,7 +50,7 @@ class WindowStateStorage: public QObject
     Q_DECLARE_FLAGS(WindowStates, WindowState)
     Q_FLAG(WindowStates)
 
-    WindowStateStorage(const QString &dbName = nullptr, QObject *parent = nullptr);
+    WindowStateStorage(const QString &dbName = QString(), QObject *parent = nullptr);
     virtual ~WindowStateStorage();
 
     Q_INVOKABLE WindowState getState(const QString &windowId, WindowState defaultValue) const;

diff --git a/tests/plugins/Utils/WindowStateStorageTest.cpp b/tests/plugins/Utils/WindowStateStorageTest.cpp
@@ -46,7 +46,7 @@ private Q_SLOTS:
     // copy the old database or risk the wrath of long-time users.
     void testDbNameDefault() {
         delete storage;
-        storage = new WindowStateStorage(nullptr, this);
+        storage = new WindowStateStorage(QString(), this);
         QCOMPARE(storage->getDbName(), QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QStringLiteral("/unity8/windowstatestorage.sqlite"));
     }