From 4c71c8571ceb10b29e6550cd0d8eb928049e6851 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Tue, 14 Jan 2020 23:34:13 +0200
Subject: Move/rename files for readability

- add BookmarkFormat <<|>> BookmarkModel operators
---
 lib/bookmarks/bookmarkswidget.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'lib/bookmarks/bookmarkswidget.cpp')

diff --git a/lib/bookmarks/bookmarkswidget.cpp b/lib/bookmarks/bookmarkswidget.cpp
index aed7e97..29e388c 100644
--- a/lib/bookmarks/bookmarkswidget.cpp
+++ b/lib/bookmarks/bookmarkswidget.cpp
@@ -8,10 +8,8 @@
 
 #include "bookmarkswidget.h"
 #include "forms/editbookmarkdialog.h"
-#include "model/bookmarkitem.h"
-#include "model/bookmarkmodel.h"
 #include "ui_bookmarksform.h"
-#include "formats/format.h"
+#include "bookmarkformat.h"
 #include <QTreeView>
 #include <QUrl>
 
@@ -48,9 +46,7 @@ BookmarksWidget::BookmarksWidget(const QString &path, QWidget *parent)
     m_bookmarksPath = path;
     QFile bookmarksFile(m_bookmarksPath);
     if(bookmarksFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        BookmarksFormat<XbelFormat> format(&bookmarksFile);
-        format.read(model->root());
-        bookmarksFile.close();
+        BookmarkFormat<XbelFormat>(&bookmarksFile) >> model;
     }
     model->resetModified();
 
@@ -124,11 +120,9 @@ void BookmarksWidget::save()
 
     QFile bookmarksFile(m_bookmarksPath);
     if(bookmarksFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-        BookmarksFormat<XbelFormat> format(&bookmarksFile);
-        format.write(model->root());
+        BookmarkFormat<XbelFormat> f(&bookmarksFile);
+        model >> f;
         bookmarksFile.flush();
-        bookmarksFile.close();
-        model->resetModified();
     }
 }
 
-- 
cgit v1.2.1