4 files changed, 22 insertions, 27 deletions
diff --git a/lib/bookmarks/CMakeLists.txt b/lib/bookmarks/CMakeLists.txt
new file mode 100644
index 0000000..d4bd3c7
--- /dev/null
+++ b/lib/bookmarks/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_library(bookmarks STATIC
+    bookmarkformat.cpp bookmarkformat.h
+    bookmarkitem.cpp bookmarkitem.h
+    bookmarkmodel.cpp bookmarkmodel.h
+    formats/xbel.cpp formats/xbel.h
+    formats/ffjson.cpp formats/ffjson.h
+)
+target_link_libraries(bookmarks PUBLIC Qt6::Widgets)
+target_include_directories(bookmarks PUBLIC ${CMAKE_CURRENT_LIST_DIR})
diff --git a/lib/bookmarks/formats/ffjson.cpp b/lib/bookmarks/formats/ffjson.cpp
index f9e0866..f95d0d8 100644
--- a/lib/bookmarks/formats/ffjson.cpp
+++ b/lib/bookmarks/formats/ffjson.cpp
@@ -8,11 +8,12 @@
 
 #include "ffjson.h"
 #include "bookmarkitem.h"
+#include <QDateTime>
+#include <QDebug>
+#include <QIODevice>
+#include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonArray>
-#include <QDebug>
-#include <QDateTime>
 
 inline auto asDate(const QJsonValue &v)
 {
diff --git a/lib/bookmarks/formats/xbel.cpp b/lib/bookmarks/formats/xbel.cpp
index 7ff79a9..a0a553f 100644
--- a/lib/bookmarks/formats/xbel.cpp
+++ b/lib/bookmarks/formats/xbel.cpp
@@ -15,28 +15,28 @@
 inline void readChildElements(QXmlStreamReader &reader, BookmarkItem *parent)
 {
     while(reader.readNextStartElement()) {
-        if(reader.name() == "title") {
+        if(reader.name() == QLatin1String("title")) {
             parent->setData(BookmarkItem::Title, reader.readElementText());
 
-        } else if(reader.name() == "dateAdded") {
+        } else if(reader.name() == QLatin1String("dateAdded")) {
             parent->setData(BookmarkItem::DateAdded, QDateTime::fromString(reader.readElementText(), Qt::RFC2822Date));
 
-        } else if(reader.name() == "lastModified") {
+        } else if(reader.name() == QLatin1String("lastModified")) {
             parent->setData(BookmarkItem::LastModified, QDateTime::fromString(reader.readElementText(), Qt::RFC2822Date));
 
-        } else if(reader.name() == "tags") {
+        } else if(reader.name() == QLatin1String("tags")) {
             parent->setData(BookmarkItem::Tags, reader.readElementText().split(";"));
 
-        } else if(reader.name() == "description") {
+        } else if(reader.name() == QLatin1String("description")) {
             parent->setData(BookmarkItem::Description, reader.readElementText());
 
-        } else if(reader.name() == "folder") {
+        } else if(reader.name() == QLatin1String("folder")) {
             auto *item = new BookmarkItem({}, BookmarkItem::Folder, parent);
             item->setExpanded(!(reader.attributes().value("folded") == QLatin1String("yes")));
             parent->appendChild(item);
             readChildElements(reader, item);
 
-        } else if(reader.name() == "bookmark") {
+        } else if(reader.name() == QLatin1String("bookmark")) {
             auto *item = new BookmarkItem({}, BookmarkItem::Bookmark, parent);
             item->setData(BookmarkItem::Href, reader.attributes().value("href").toString());
             parent->appendChild(item);
@@ -53,7 +53,8 @@ void Xbel::read(QIODevice *device, BookmarkItem *item)
     QXmlStreamReader qXmlStreamReader(device);
 
     if(qXmlStreamReader.readNextStartElement()) {
-        if(!(qXmlStreamReader.name() == "xbel" && qXmlStreamReader.attributes().value("version") == "1.0")) {
+        if(!(qXmlStreamReader.name() == QLatin1String("xbel")
+               && qXmlStreamReader.attributes().value("version") == QLatin1String("1.0"))) {
             return;
         }
 
diff --git a/lib/bookmarks/meson.build b/lib/bookmarks/meson.build
deleted file mode 100644
index 81c1ece..0000000
--- a/lib/bookmarks/meson.build
+++ /dev/null
@@ -1,16 +0,0 @@
-bookmarks_moc = mod_qt5.preprocess(
-    moc_headers: [ 'bookmarkmodel.h' ],
-    dependencies: dep_qt5
-)
-
-bookmarks_lib = static_library('bookmarks', 
-    [ bookmarks_moc,
-    'bookmarkformat.cpp', 'formats/xbel.cpp', 'formats/ffjson.cpp',
-    'bookmarkitem.cpp', 'bookmarkmodel.cpp' ],
-    dependencies: dep_qt5
-)
-
-dep_bookmarks = declare_dependency(
-    include_directories: include_directories('.'),
-    link_with: bookmarks_lib
-)