aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2020-01-15 13:19:46 +0200
committerAqua-sama <aqua@iserlohn-fortress.net>2020-01-15 13:19:46 +0200
commit9643e146c35a3a3e9abf0bf332c7c1efd00be9c2 (patch)
treee69c2d5ce92786a566c5e2c997f4ce516c35d238
parentMove/rename files for readability (diff)
downloadsmolbote-9643e146c35a3a3e9abf0bf332c7c1efd00be9c2.tar.xz
Move BookmarksWidget out of libbookmarks
-rw-r--r--lib/bookmarks/meson.build13
-rw-r--r--src/bookmarks/bookmarksform.ui (renamed from lib/bookmarks/bookmarksform.ui)0
-rw-r--r--src/bookmarks/bookmarkswidget.cpp (renamed from lib/bookmarks/bookmarkswidget.cpp)2
-rw-r--r--src/bookmarks/bookmarkswidget.h (renamed from lib/bookmarks/bookmarkswidget.h)0
-rw-r--r--src/bookmarks/editbookmarkdialog.cpp (renamed from lib/bookmarks/forms/editbookmarkdialog.cpp)0
-rw-r--r--src/bookmarks/editbookmarkdialog.h (renamed from lib/bookmarks/forms/editbookmarkdialog.h)0
-rw-r--r--src/bookmarks/editbookmarkdialog.ui (renamed from lib/bookmarks/forms/editbookmarkdialog.ui)0
-rw-r--r--src/browser.cpp2
-rw-r--r--src/mainwindow/menubar.cpp2
-rw-r--r--src/meson.build8
10 files changed, 15 insertions, 12 deletions
diff --git a/lib/bookmarks/meson.build b/lib/bookmarks/meson.build
index 78d0510..a7f603b 100644
--- a/lib/bookmarks/meson.build
+++ b/lib/bookmarks/meson.build
@@ -1,19 +1,16 @@
-bookmarks_inc = include_directories('.')
bookmarks_moc = mod_qt5.preprocess(
- moc_headers: ['bookmarkswidget.h', 'bookmarkmodel.h', 'forms/editbookmarkdialog.h'],
- ui_files: ['bookmarksform.ui', 'forms/editbookmarkdialog.ui'],
+ moc_headers: [ 'bookmarkmodel.h' ],
dependencies: dep_qt5
)
bookmarks_lib = static_library('bookmarks',
- ['bookmarkswidget.cpp', bookmarks_moc,
- 'bookmarksloader.cpp', 'formats/xbel.cpp',
- 'bookmarkitem.cpp', 'bookmarkmodel.cpp',
- 'forms/editbookmarkdialog.cpp'],
+ [ bookmarks_moc,
+ 'bookmarkformat.cpp', 'formats/xbel.cpp',
+ 'bookmarkitem.cpp', 'bookmarkmodel.cpp' ],
dependencies: dep_qt5
)
dep_bookmarks = declare_dependency(
- include_directories: bookmarks_inc,
+ include_directories: include_directories('.'),
link_with: bookmarks_lib
)
diff --git a/lib/bookmarks/bookmarksform.ui b/src/bookmarks/bookmarksform.ui
index a003e53..a003e53 100644
--- a/lib/bookmarks/bookmarksform.ui
+++ b/src/bookmarks/bookmarksform.ui
diff --git a/lib/bookmarks/bookmarkswidget.cpp b/src/bookmarks/bookmarkswidget.cpp
index 29e388c..26fdddf 100644
--- a/lib/bookmarks/bookmarkswidget.cpp
+++ b/src/bookmarks/bookmarkswidget.cpp
@@ -7,7 +7,7 @@
*/
#include "bookmarkswidget.h"
-#include "forms/editbookmarkdialog.h"
+#include "editbookmarkdialog.h"
#include "ui_bookmarksform.h"
#include "bookmarkformat.h"
#include <QTreeView>
diff --git a/lib/bookmarks/bookmarkswidget.h b/src/bookmarks/bookmarkswidget.h
index 149d2a6..149d2a6 100644
--- a/lib/bookmarks/bookmarkswidget.h
+++ b/src/bookmarks/bookmarkswidget.h
diff --git a/lib/bookmarks/forms/editbookmarkdialog.cpp b/src/bookmarks/editbookmarkdialog.cpp
index 7df90b8..7df90b8 100644
--- a/lib/bookmarks/forms/editbookmarkdialog.cpp
+++ b/src/bookmarks/editbookmarkdialog.cpp
diff --git a/lib/bookmarks/forms/editbookmarkdialog.h b/src/bookmarks/editbookmarkdialog.h
index fb53239..fb53239 100644
--- a/lib/bookmarks/forms/editbookmarkdialog.h
+++ b/src/bookmarks/editbookmarkdialog.h
diff --git a/lib/bookmarks/forms/editbookmarkdialog.ui b/src/bookmarks/editbookmarkdialog.ui
index b988394..b988394 100644
--- a/lib/bookmarks/forms/editbookmarkdialog.ui
+++ b/src/bookmarks/editbookmarkdialog.ui
diff --git a/src/browser.cpp b/src/browser.cpp
index 09fc2c8..e518a81 100644
--- a/src/browser.cpp
+++ b/src/browser.cpp
@@ -10,7 +10,7 @@
#include "aboutdialog.h"
#include "aboutplugin.h"
#include "adblock/adblocklist.h"
-#include "bookmarkswidget.h"
+#include "bookmarks/bookmarkswidget.h"
#include "configuration.h"
#include "downloadswidget.h"
#include "hostlist/hostlist.h"
diff --git a/src/mainwindow/menubar.cpp b/src/mainwindow/menubar.cpp
index 7fdad24..a8d0590 100644
--- a/src/mainwindow/menubar.cpp
+++ b/src/mainwindow/menubar.cpp
@@ -7,7 +7,7 @@
*/
#include "menubar.h"
-#include "bookmarkswidget.h"
+#include "bookmarks/bookmarkswidget.h"
#include "browser.h"
#include "configuration.h"
#include "downloadswidget.h"
diff --git a/src/meson.build b/src/meson.build
index 6d6a1aa..1783455 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -10,10 +10,14 @@ poi_settings_h = custom_target('default_config_value',
poi_sourceset.add(mod_qt5.preprocess(
moc_headers: ['browser.h',
'mainwindow/mainwindow.h', 'mainwindow/addressbar.h', 'mainwindow/menubar.h', 'mainwindow/widgets/completer.h', 'mainwindow/widgets/urllineedit.h', 'mainwindow/widgets/dockwidget.h', 'mainwindow/widgets/menusearch.h', 'mainwindow/widgets/navigationbar.h', 'mainwindow/widgets/searchform.h',
+ 'bookmarks/bookmarkswidget.h', 'bookmarks/editbookmarkdialog.h',
'session/savesessiondialog.h', 'session/sessiondialog.h', 'session/sessionform.h',
'subwindow/subwindow.h', 'subwindow/tabwidget.h',
'webengine/urlinterceptor.h', 'webengine/webpage.h', 'webengine/webview.h', 'webengine/webprofilemanager.h', 'webengine/webprofile.h'],
- ui_files: ['mainwindow/addressbar.ui', 'mainwindow/widgets/searchform.ui', 'session/savesessiondialog.ui', 'session/sessiondialog.ui', 'session/sessionform.ui'],
+ ui_files: [
+ 'mainwindow/addressbar.ui', 'mainwindow/widgets/searchform.ui',
+ 'bookmarks/bookmarksform.ui', 'bookmarks/editbookmarkdialog.ui',
+ 'session/savesessiondialog.ui', 'session/sessiondialog.ui', 'session/sessionform.ui'],
qresources: '../data/resources.qrc',
rcc_extra_arguments: ['--format-version=1'],
dependencies: dep_qt5
@@ -34,6 +38,8 @@ poi_sourceset.add(files(
'mainwindow/widgets/navigationbar.cpp',
'mainwindow/widgets/searchform.cpp',
+ 'bookmarks/bookmarkswidget.cpp', 'bookmarks/editbookmarkdialog.cpp',
+
'session/session.cpp',
'session/savesessiondialog.cpp',
'session/sessiondialog.cpp',