Browse Source

Using boost::program_options instead of libconfig

Aqua-sama 10 months ago
parent
commit
fcf3870b7c
Signed by: Aqua-sama <aqua@iserlohn-fortress.net> GPG Key ID: 5378B8349C1D5ADA

+ 2
- 4
CMakeLists.txt View File

@@ -5,14 +5,13 @@ project(smolbote)
5 5
 option(CompilerWarnings "Compiler warnings" ON)
6 6
 option(QtDeprecatedWarnings "Qt deprecated warnings" ON)
7 7
 option(UseLibCpp "Use libc++ over stdlibc++ (requires clang)" OFF)
8
-option(CLikeConfig "Use a C-like style for the config" ON)
9 8
 
10 9
 # Libraries
11 10
 find_package(Qt5Core REQUIRED)
12 11
 find_package(Qt5Widgets REQUIRED)
13 12
 find_package(Qt5Concurrent REQUIRED)
14 13
 find_package(Qt5WebEngineWidgets REQUIRED)
15
-find_package(libconfig++ REQUIRED)
14
+find_package(Boost COMPONENTS program_options REQUIRED)
16 15
 
17 16
 # Find includes in corresponding build directories
18 17
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -43,7 +42,6 @@ if (UseLibCpp)
43 42
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
44 43
 endif (UseLibCpp)
45 44
 
46
-add_subdirectory(lib/settings)
47 45
 add_subdirectory(lib/bookmarks)
48 46
 add_subdirectory(lib/downloads)
49 47
 
@@ -123,7 +121,7 @@ target_include_directories(poi
123 121
         PRIVATE plugins)
124 122
 
125 123
 target_link_libraries(poi Qt5::Core Qt5::Widgets Qt5::Concurrent Qt5::WebEngineWidgets)
126
-target_link_libraries(poi configuration)
124
+target_link_libraries(poi ${Boost_LIBRARIES})
127 125
 target_link_libraries(poi bookmarks downloads)
128 126
 
129 127
 install(TARGETS poi RUNTIME DESTINATION bin CONFIGURATIONS Release)

+ 6
- 7
LICENSE.md View File

@@ -1,6 +1,6 @@
1 1
 # smolbote
2 2
 
3
-Copyright (C) 2017 - 2018 xiannox
3
+Copyright (C) 2017 - 2018 aqua
4 4
 
5 5
 This program is free software: you can redistribute it and/or modify
6 6
 it under the terms of the GNU General Public License version 3 as
@@ -19,9 +19,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
19 19
 - license: LGPL-3.0
20 20
 - source code: http://code.qt.io/cgit/
21 21
 
22
-## libconfig
23
-
24
-- url: https://hyperrealm.github.io/libconfig/
25
-- license: LGPL-2.1
26
-- source code: https://github.com/hyperrealm/libconfig
27
-
22
+## boost
23
+- components: program_options
24
+- url: http://www.boost.org/
25
+- license: BSL-1.0
26
+- source code: http://www.boost.org/users/download/

+ 23
- 0
LICENSES/bsl-1.0.txt View File

@@ -0,0 +1,23 @@
1
+Boost Software License - Version 1.0 - August 17th, 2003
2
+
3
+Permission is hereby granted, free of charge, to any person or organization
4
+obtaining a copy of the software and accompanying documentation covered by
5
+this license (the "Software") to use, reproduce, display, distribute,
6
+execute, and transmit the Software, and to prepare derivative works of the
7
+Software, and to permit third-parties to whom the Software is furnished to
8
+do so, all subject to the following:
9
+
10
+The copyright notices in the Software and this entire statement, including
11
+the above license grant, this restriction and the following disclaimer,
12
+must be included in all copies of the Software, in whole or in part, and
13
+all derivative works of the Software, unless such copies or derivative
14
+works are solely in the form of machine-executable object code generated by
15
+a source language processor.
16
+
17
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
20
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
21
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
22
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23
+DEALINGS IN THE SOFTWARE.

+ 0
- 502
LICENSES/lgpl-2.1.txt View File

@@ -1,502 +0,0 @@
1
-                  GNU LESSER GENERAL PUBLIC LICENSE
2
-                       Version 2.1, February 1999
3
-
4
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
5
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
6
- Everyone is permitted to copy and distribute verbatim copies
7
- of this license document, but changing it is not allowed.
8
-
9
-[This is the first released version of the Lesser GPL.  It also counts
10
- as the successor of the GNU Library Public License, version 2, hence
11
- the version number 2.1.]
12
-
13
-                            Preamble
14
-
15
-  The licenses for most software are designed to take away your
16
-freedom to share and change it.  By contrast, the GNU General Public
17
-Licenses are intended to guarantee your freedom to share and change
18
-free software--to make sure the software is free for all its users.
19
-
20
-  This license, the Lesser General Public License, applies to some
21
-specially designated software packages--typically libraries--of the
22
-Free Software Foundation and other authors who decide to use it.  You
23
-can use it too, but we suggest you first think carefully about whether
24
-this license or the ordinary General Public License is the better
25
-strategy to use in any particular case, based on the explanations below.
26
-
27
-  When we speak of free software, we are referring to freedom of use,
28
-not price.  Our General Public Licenses are designed to make sure that
29
-you have the freedom to distribute copies of free software (and charge
30
-for this service if you wish); that you receive source code or can get
31
-it if you want it; that you can change the software and use pieces of
32
-it in new free programs; and that you are informed that you can do
33
-these things.
34
-
35
-  To protect your rights, we need to make restrictions that forbid
36
-distributors to deny you these rights or to ask you to surrender these
37
-rights.  These restrictions translate to certain responsibilities for
38
-you if you distribute copies of the library or if you modify it.
39
-
40
-  For example, if you distribute copies of the library, whether gratis
41
-or for a fee, you must give the recipients all the rights that we gave
42
-you.  You must make sure that they, too, receive or can get the source
43
-code.  If you link other code with the library, you must provide
44
-complete object files to the recipients, so that they can relink them
45
-with the library after making changes to the library and recompiling
46
-it.  And you must show them these terms so they know their rights.
47
-
48
-  We protect your rights with a two-step method: (1) we copyright the
49
-library, and (2) we offer you this license, which gives you legal
50
-permission to copy, distribute and/or modify the library.
51
-
52
-  To protect each distributor, we want to make it very clear that
53
-there is no warranty for the free library.  Also, if the library is
54
-modified by someone else and passed on, the recipients should know
55
-that what they have is not the original version, so that the original
56
-author's reputation will not be affected by problems that might be
57
-introduced by others.
58
-
59
-  Finally, software patents pose a constant threat to the existence of
60
-any free program.  We wish to make sure that a company cannot
61
-effectively restrict the users of a free program by obtaining a
62
-restrictive license from a patent holder.  Therefore, we insist that
63
-any patent license obtained for a version of the library must be
64
-consistent with the full freedom of use specified in this license.
65
-
66
-  Most GNU software, including some libraries, is covered by the
67
-ordinary GNU General Public License.  This license, the GNU Lesser
68
-General Public License, applies to certain designated libraries, and
69
-is quite different from the ordinary General Public License.  We use
70
-this license for certain libraries in order to permit linking those
71
-libraries into non-free programs.
72
-
73
-  When a program is linked with a library, whether statically or using
74
-a shared library, the combination of the two is legally speaking a
75
-combined work, a derivative of the original library.  The ordinary
76
-General Public License therefore permits such linking only if the
77
-entire combination fits its criteria of freedom.  The Lesser General
78
-Public License permits more lax criteria for linking other code with
79
-the library.
80
-
81
-  We call this license the "Lesser" General Public License because it
82
-does Less to protect the user's freedom than the ordinary General
83
-Public License.  It also provides other free software developers Less
84
-of an advantage over competing non-free programs.  These disadvantages
85
-are the reason we use the ordinary General Public License for many
86
-libraries.  However, the Lesser license provides advantages in certain
87
-special circumstances.
88
-
89
-  For example, on rare occasions, there may be a special need to
90
-encourage the widest possible use of a certain library, so that it becomes
91
-a de-facto standard.  To achieve this, non-free programs must be
92
-allowed to use the library.  A more frequent case is that a free
93
-library does the same job as widely used non-free libraries.  In this
94
-case, there is little to gain by limiting the free library to free
95
-software only, so we use the Lesser General Public License.
96
-
97
-  In other cases, permission to use a particular library in non-free
98
-programs enables a greater number of people to use a large body of
99
-free software.  For example, permission to use the GNU C Library in
100
-non-free programs enables many more people to use the whole GNU
101
-operating system, as well as its variant, the GNU/Linux operating
102
-system.
103
-
104
-  Although the Lesser General Public License is Less protective of the
105
-users' freedom, it does ensure that the user of a program that is
106
-linked with the Library has the freedom and the wherewithal to run
107
-that program using a modified version of the Library.
108
-
109
-  The precise terms and conditions for copying, distribution and
110
-modification follow.  Pay close attention to the difference between a
111
-"work based on the library" and a "work that uses the library".  The
112
-former contains code derived from the library, whereas the latter must
113
-be combined with the library in order to run.
114
-
115
-                  GNU LESSER GENERAL PUBLIC LICENSE
116
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
117
-
118
-  0. This License Agreement applies to any software library or other
119
-program which contains a notice placed by the copyright holder or
120
-other authorized party saying it may be distributed under the terms of
121
-this Lesser General Public License (also called "this License").
122
-Each licensee is addressed as "you".
123
-
124
-  A "library" means a collection of software functions and/or data
125
-prepared so as to be conveniently linked with application programs
126
-(which use some of those functions and data) to form executables.
127
-
128
-  The "Library", below, refers to any such software library or work
129
-which has been distributed under these terms.  A "work based on the
130
-Library" means either the Library or any derivative work under
131
-copyright law: that is to say, a work containing the Library or a
132
-portion of it, either verbatim or with modifications and/or translated
133
-straightforwardly into another language.  (Hereinafter, translation is
134
-included without limitation in the term "modification".)
135
-
136
-  "Source code" for a work means the preferred form of the work for
137
-making modifications to it.  For a library, complete source code means
138
-all the source code for all modules it contains, plus any associated
139
-interface definition files, plus the scripts used to control compilation
140
-and installation of the library.
141
-
142
-  Activities other than copying, distribution and modification are not
143
-covered by this License; they are outside its scope.  The act of
144
-running a program using the Library is not restricted, and output from
145
-such a program is covered only if its contents constitute a work based
146
-on the Library (independent of the use of the Library in a tool for
147
-writing it).  Whether that is true depends on what the Library does
148
-and what the program that uses the Library does.
149
-
150
-  1. You may copy and distribute verbatim copies of the Library's
151
-complete source code as you receive it, in any medium, provided that
152
-you conspicuously and appropriately publish on each copy an
153
-appropriate copyright notice and disclaimer of warranty; keep intact
154
-all the notices that refer to this License and to the absence of any
155
-warranty; and distribute a copy of this License along with the
156
-Library.
157
-
158
-  You may charge a fee for the physical act of transferring a copy,
159
-and you may at your option offer warranty protection in exchange for a
160
-fee.
161
-
162
-  2. You may modify your copy or copies of the Library or any portion
163
-of it, thus forming a work based on the Library, and copy and
164
-distribute such modifications or work under the terms of Section 1
165
-above, provided that you also meet all of these conditions:
166
-
167
-    a) The modified work must itself be a software library.
168
-
169
-    b) You must cause the files modified to carry prominent notices
170
-    stating that you changed the files and the date of any change.
171
-
172
-    c) You must cause the whole of the work to be licensed at no
173
-    charge to all third parties under the terms of this License.
174
-
175
-    d) If a facility in the modified Library refers to a function or a
176
-    table of data to be supplied by an application program that uses
177
-    the facility, other than as an argument passed when the facility
178
-    is invoked, then you must make a good faith effort to ensure that,
179
-    in the event an application does not supply such function or
180
-    table, the facility still operates, and performs whatever part of
181
-    its purpose remains meaningful.
182
-
183
-    (For example, a function in a library to compute square roots has
184
-    a purpose that is entirely well-defined independent of the
185
-    application.  Therefore, Subsection 2d requires that any
186
-    application-supplied function or table used by this function must
187
-    be optional: if the application does not supply it, the square
188
-    root function must still compute square roots.)
189
-
190
-These requirements apply to the modified work as a whole.  If
191
-identifiable sections of that work are not derived from the Library,
192
-and can be reasonably considered independent and separate works in
193
-themselves, then this License, and its terms, do not apply to those
194
-sections when you distribute them as separate works.  But when you
195
-distribute the same sections as part of a whole which is a work based
196
-on the Library, the distribution of the whole must be on the terms of
197
-this License, whose permissions for other licensees extend to the
198
-entire whole, and thus to each and every part regardless of who wrote
199
-it.
200
-
201
-Thus, it is not the intent of this section to claim rights or contest
202
-your rights to work written entirely by you; rather, the intent is to
203
-exercise the right to control the distribution of derivative or
204
-collective works based on the Library.
205
-
206
-In addition, mere aggregation of another work not based on the Library
207
-with the Library (or with a work based on the Library) on a volume of
208
-a storage or distribution medium does not bring the other work under
209
-the scope of this License.
210
-
211
-  3. You may opt to apply the terms of the ordinary GNU General Public
212
-License instead of this License to a given copy of the Library.  To do
213
-this, you must alter all the notices that refer to this License, so
214
-that they refer to the ordinary GNU General Public License, version 2,
215
-instead of to this License.  (If a newer version than version 2 of the
216
-ordinary GNU General Public License has appeared, then you can specify
217
-that version instead if you wish.)  Do not make any other change in
218
-these notices.
219
-
220
-  Once this change is made in a given copy, it is irreversible for
221
-that copy, so the ordinary GNU General Public License applies to all
222
-subsequent copies and derivative works made from that copy.
223
-
224
-  This option is useful when you wish to copy part of the code of
225
-the Library into a program that is not a library.
226
-
227
-  4. You may copy and distribute the Library (or a portion or
228
-derivative of it, under Section 2) in object code or executable form
229
-under the terms of Sections 1 and 2 above provided that you accompany
230
-it with the complete corresponding machine-readable source code, which
231
-must be distributed under the terms of Sections 1 and 2 above on a
232
-medium customarily used for software interchange.
233
-
234
-  If distribution of object code is made by offering access to copy
235
-from a designated place, then offering equivalent access to copy the
236
-source code from the same place satisfies the requirement to
237
-distribute the source code, even though third parties are not
238
-compelled to copy the source along with the object code.
239
-
240
-  5. A program that contains no derivative of any portion of the
241
-Library, but is designed to work with the Library by being compiled or
242
-linked with it, is called a "work that uses the Library".  Such a
243
-work, in isolation, is not a derivative work of the Library, and
244
-therefore falls outside the scope of this License.
245
-
246
-  However, linking a "work that uses the Library" with the Library
247
-creates an executable that is a derivative of the Library (because it
248
-contains portions of the Library), rather than a "work that uses the
249
-library".  The executable is therefore covered by this License.
250
-Section 6 states terms for distribution of such executables.
251
-
252
-  When a "work that uses the Library" uses material from a header file
253
-that is part of the Library, the object code for the work may be a
254
-derivative work of the Library even though the source code is not.
255
-Whether this is true is especially significant if the work can be
256
-linked without the Library, or if the work is itself a library.  The
257
-threshold for this to be true is not precisely defined by law.
258
-
259
-  If such an object file uses only numerical parameters, data
260
-structure layouts and accessors, and small macros and small inline
261
-functions (ten lines or less in length), then the use of the object
262
-file is unrestricted, regardless of whether it is legally a derivative
263
-work.  (Executables containing this object code plus portions of the
264
-Library will still fall under Section 6.)
265
-
266
-  Otherwise, if the work is a derivative of the Library, you may
267
-distribute the object code for the work under the terms of Section 6.
268
-Any executables containing that work also fall under Section 6,
269
-whether or not they are linked directly with the Library itself.
270
-
271
-  6. As an exception to the Sections above, you may also combine or
272
-link a "work that uses the Library" with the Library to produce a
273
-work containing portions of the Library, and distribute that work
274
-under terms of your choice, provided that the terms permit
275
-modification of the work for the customer's own use and reverse
276
-engineering for debugging such modifications.
277
-
278
-  You must give prominent notice with each copy of the work that the
279
-Library is used in it and that the Library and its use are covered by
280
-this License.  You must supply a copy of this License.  If the work
281
-during execution displays copyright notices, you must include the
282
-copyright notice for the Library among them, as well as a reference
283
-directing the user to the copy of this License.  Also, you must do one
284
-of these things:
285
-
286
-    a) Accompany the work with the complete corresponding
287
-    machine-readable source code for the Library including whatever
288
-    changes were used in the work (which must be distributed under
289
-    Sections 1 and 2 above); and, if the work is an executable linked
290
-    with the Library, with the complete machine-readable "work that
291
-    uses the Library", as object code and/or source code, so that the
292
-    user can modify the Library and then relink to produce a modified
293
-    executable containing the modified Library.  (It is understood
294
-    that the user who changes the contents of definitions files in the
295
-    Library will not necessarily be able to recompile the application
296
-    to use the modified definitions.)
297
-
298
-    b) Use a suitable shared library mechanism for linking with the
299
-    Library.  A suitable mechanism is one that (1) uses at run time a
300
-    copy of the library already present on the user's computer system,
301
-    rather than copying library functions into the executable, and (2)
302
-    will operate properly with a modified version of the library, if
303
-    the user installs one, as long as the modified version is
304
-    interface-compatible with the version that the work was made with.
305
-
306
-    c) Accompany the work with a written offer, valid for at
307
-    least three years, to give the same user the materials
308
-    specified in Subsection 6a, above, for a charge no more
309
-    than the cost of performing this distribution.
310
-
311
-    d) If distribution of the work is made by offering access to copy
312
-    from a designated place, offer equivalent access to copy the above
313
-    specified materials from the same place.
314
-
315
-    e) Verify that the user has already received a copy of these
316
-    materials or that you have already sent this user a copy.
317
-
318
-  For an executable, the required form of the "work that uses the
319
-Library" must include any data and utility programs needed for
320
-reproducing the executable from it.  However, as a special exception,
321
-the materials to be distributed need not include anything that is
322
-normally distributed (in either source or binary form) with the major
323
-components (compiler, kernel, and so on) of the operating system on
324
-which the executable runs, unless that component itself accompanies
325
-the executable.
326
-
327
-  It may happen that this requirement contradicts the license
328
-restrictions of other proprietary libraries that do not normally
329
-accompany the operating system.  Such a contradiction means you cannot
330
-use both them and the Library together in an executable that you
331
-distribute.
332
-
333
-  7. You may place library facilities that are a work based on the
334
-Library side-by-side in a single library together with other library
335
-facilities not covered by this License, and distribute such a combined
336
-library, provided that the separate distribution of the work based on
337
-the Library and of the other library facilities is otherwise
338
-permitted, and provided that you do these two things:
339
-
340
-    a) Accompany the combined library with a copy of the same work
341
-    based on the Library, uncombined with any other library
342
-    facilities.  This must be distributed under the terms of the
343
-    Sections above.
344
-
345
-    b) Give prominent notice with the combined library of the fact
346
-    that part of it is a work based on the Library, and explaining
347
-    where to find the accompanying uncombined form of the same work.
348
-
349
-  8. You may not copy, modify, sublicense, link with, or distribute
350
-the Library except as expressly provided under this License.  Any
351
-attempt otherwise to copy, modify, sublicense, link with, or
352
-distribute the Library is void, and will automatically terminate your
353
-rights under this License.  However, parties who have received copies,
354
-or rights, from you under this License will not have their licenses
355
-terminated so long as such parties remain in full compliance.
356
-
357
-  9. You are not required to accept this License, since you have not
358
-signed it.  However, nothing else grants you permission to modify or
359
-distribute the Library or its derivative works.  These actions are
360
-prohibited by law if you do not accept this License.  Therefore, by
361
-modifying or distributing the Library (or any work based on the
362
-Library), you indicate your acceptance of this License to do so, and
363
-all its terms and conditions for copying, distributing or modifying
364
-the Library or works based on it.
365
-
366
-  10. Each time you redistribute the Library (or any work based on the
367
-Library), the recipient automatically receives a license from the
368
-original licensor to copy, distribute, link with or modify the Library
369
-subject to these terms and conditions.  You may not impose any further
370
-restrictions on the recipients' exercise of the rights granted herein.
371
-You are not responsible for enforcing compliance by third parties with
372
-this License.
373
-
374
-  11. If, as a consequence of a court judgment or allegation of patent
375
-infringement or for any other reason (not limited to patent issues),
376
-conditions are imposed on you (whether by court order, agreement or
377
-otherwise) that contradict the conditions of this License, they do not
378
-excuse you from the conditions of this License.  If you cannot
379
-distribute so as to satisfy simultaneously your obligations under this
380
-License and any other pertinent obligations, then as a consequence you
381
-may not distribute the Library at all.  For example, if a patent
382
-license would not permit royalty-free redistribution of the Library by
383
-all those who receive copies directly or indirectly through you, then
384
-the only way you could satisfy both it and this License would be to
385
-refrain entirely from distribution of the Library.
386
-
387
-If any portion of this section is held invalid or unenforceable under any
388
-particular circumstance, the balance of the section is intended to apply,
389
-and the section as a whole is intended to apply in other circumstances.
390
-
391
-It is not the purpose of this section to induce you to infringe any
392
-patents or other property right claims or to contest validity of any
393
-such claims; this section has the sole purpose of protecting the
394
-integrity of the free software distribution system which is
395
-implemented by public license practices.  Many people have made
396
-generous contributions to the wide range of software distributed
397
-through that system in reliance on consistent application of that
398
-system; it is up to the author/donor to decide if he or she is willing
399
-to distribute software through any other system and a licensee cannot
400
-impose that choice.
401
-
402
-This section is intended to make thoroughly clear what is believed to
403
-be a consequence of the rest of this License.
404
-
405
-  12. If the distribution and/or use of the Library is restricted in
406
-certain countries either by patents or by copyrighted interfaces, the
407
-original copyright holder who places the Library under this License may add
408
-an explicit geographical distribution limitation excluding those countries,
409
-so that distribution is permitted only in or among countries not thus
410
-excluded.  In such case, this License incorporates the limitation as if
411
-written in the body of this License.
412
-
413
-  13. The Free Software Foundation may publish revised and/or new
414
-versions of the Lesser General Public License from time to time.
415
-Such new versions will be similar in spirit to the present version,
416
-but may differ in detail to address new problems or concerns.
417
-
418
-Each version is given a distinguishing version number.  If the Library
419
-specifies a version number of this License which applies to it and
420
-"any later version", you have the option of following the terms and
421
-conditions either of that version or of any later version published by
422
-the Free Software Foundation.  If the Library does not specify a
423
-license version number, you may choose any version ever published by
424
-the Free Software Foundation.
425
-
426
-  14. If you wish to incorporate parts of the Library into other free
427
-programs whose distribution conditions are incompatible with these,
428
-write to the author to ask for permission.  For software which is
429
-copyrighted by the Free Software Foundation, write to the Free
430
-Software Foundation; we sometimes make exceptions for this.  Our
431
-decision will be guided by the two goals of preserving the free status
432
-of all derivatives of our free software and of promoting the sharing
433
-and reuse of software generally.
434
-
435
-                            NO WARRANTY
436
-
437
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
438
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
439
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
440
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
441
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
442
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
443
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
444
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
445
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
446
-
447
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
448
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
449
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
450
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
451
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
452
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
453
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
454
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
455
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
456
-DAMAGES.
457
-
458
-                     END OF TERMS AND CONDITIONS
459
-
460
-           How to Apply These Terms to Your New Libraries
461
-
462
-  If you develop a new library, and you want it to be of the greatest
463
-possible use to the public, we recommend making it free software that
464
-everyone can redistribute and change.  You can do so by permitting
465
-redistribution under these terms (or, alternatively, under the terms of the
466
-ordinary General Public License).
467
-
468
-  To apply these terms, attach the following notices to the library.  It is
469
-safest to attach them to the start of each source file to most effectively
470
-convey the exclusion of warranty; and each file should have at least the
471
-"copyright" line and a pointer to where the full notice is found.
472
-
473
-    <one line to give the library's name and a brief idea of what it does.>
474
-    Copyright (C) <year>  <name of author>
475
-
476
-    This library is free software; you can redistribute it and/or
477
-    modify it under the terms of the GNU Lesser General Public
478
-    License as published by the Free Software Foundation; either
479
-    version 2.1 of the License, or (at your option) any later version.
480
-
481
-    This library is distributed in the hope that it will be useful,
482
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
483
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
484
-    Lesser General Public License for more details.
485
-
486
-    You should have received a copy of the GNU Lesser General Public
487
-    License along with this library; if not, write to the Free Software
488
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
489
-
490
-Also add information on how to contact you by electronic and paper mail.
491
-
492
-You should also get your employer (if you work as a programmer) or your
493
-school, if any, to sign a "copyright disclaimer" for the library, if
494
-necessary.  Here is a sample; alter the names:
495
-
496
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
497
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
498
-
499
-  <signature of Ty Coon>, 1 April 1990
500
-  Ty Coon, President of Vice
501
-
502
-That's all there is to it!

+ 0
- 1
data/resources.qrc View File

@@ -1,6 +1,5 @@
1 1
 <RCC>
2 2
     <qresource prefix="/">
3 3
         <file alias="icon.svg">poi.svg</file>
4
-        <file>poi.cfg</file>
5 4
     </qresource>
6 5
 </RCC>

+ 2
- 2
linux/makepkg/PKGBUILD View File

@@ -12,8 +12,8 @@ license=('GPL3')
12 12
 # -hg replace the old -git package
13 13
 replaces=('smolbote-git')
14 14
 
15
-depends=('qt5-webengine' 'libconfig')
16
-makedepends=('mercurial' 'cmake' 'pkg-config' 'ninja' 'qt5-webengine' 'libconfig')
15
+depends=('qt5-webengine' 'boost-libs')
16
+makedepends=('mercurial' 'cmake' 'pkg-config' 'ninja' 'qt5-webengine' 'boost')
17 17
 
18 18
 # this is the central repository
19 19
 source=("smolbote-hg::hg+https://neueland.iserlohn-fortress.net/smolbote.hg")

+ 3
- 0
src/browser.cpp View File

@@ -24,12 +24,15 @@ Browser::Browser(int &argc, char *argv[])
24 24
 
25 25
 Browser::~Browser()
26 26
 {
27
+    /* We can't modify config, so no point in saving it
27 28
     if(m_config) {
28 29
         //QtConcurrent::run(QThreadPool::globalInstance(), m_config.get(), &Configuration::writeIfNeeded);
29 30
         QtConcurrent::run([c = m_config.get()]() {
30 31
             qDebug("Writing configuration: %s", c->writeIfNeeded() ? "ok" : "failed");
31 32
         });
32 33
     }
34
+    */
35
+
33 36
     if(m_bookmarksManager) {
34 37
         QtConcurrent::run(QThreadPool::globalInstance(), m_bookmarksManager.get(), &BookmarksWidget::save);
35 38
     }

+ 82
- 146
src/configuration.cpp View File

@@ -7,163 +7,99 @@
7 7
  */
8 8
 
9 9
 #include "configuration.h"
10
-#include <QtCore/QStandardPaths>
11
-#include <QFile>
12
-#include <sstream>
10
+#include <QStandardPaths>
11
+#include <fstream>
13 12
 
14
-using namespace libconfig;
13
+namespace po = boost::program_options;
15 14
 
16
-Configuration::Configuration(const std::string &path, const std::string &home)
15
+Configuration::Configuration(const QStringList &options)
17 16
 {
18
-    m_userCfg = new Config();
19
-    // prettier output
20
-    m_userCfg->setOption(Config::OptionSemicolonSeparators, true);
21
-    m_userCfg->setOption(Config::OptionColonAssignmentForGroups, false);
22
-    m_userCfg->setOption(Config::OptionColonAssignmentForNonGroups, false);
23
-    m_userCfg->setOption(Config::OptionOpenBraceOnSeparateLine, false);
24
-    m_userCfg->setOption(Config::OptionFsync, true);
25
-
26
-    m_userCfgPath = path;
27
-    m_homePath = home;
28
-}
29
-
30
-Configuration::~Configuration()
31
-{
32
-    delete m_userCfg;
33
-}
34
-
35
-bool Configuration::read(const QString &path)
36
-{
37
-    QFile conf(path);
38
-
39
-    if(!conf.open(QIODevice::ReadOnly)) {
40
-        return false;
41
-    }
42
-
43
-    try {
44
-        m_userCfg->readString(conf.readAll().toStdString());
45
-        conf.close();
46
-    } catch(const ParseException &e) {
47
-        return false;
48
-    }
49
-
50
-    return true;
51
-}
52
-
53
-bool Configuration::writeIfNeeded(const std::string &path)
54
-{
55
-    if(!path.empty())
56
-        m_userCfgPath = path;
57
-
58
-    if(!changed)
59
-        return true;
60
-
61
-    try {
62
-        m_userCfg->writeFile(m_userCfgPath.c_str());
63
-    } catch(const FileIOException &e) {
64
-        return false;
65
-    }
66
-
67
-    changed = false;
68
-    return true;
69
-}
70
-
71
-std::vector<std::string> Configuration::childrenSettings(const char *name)
72
-{
73
-    std::vector<std::string> groupNames;
74
-    const Setting &root = m_userCfg->lookup(name);
75
-
76
-    for(const Setting &setting : root) {
77
-        if(setting.getType() != Setting::TypeGroup) {
78
-            groupNames.emplace_back(setting.getName());
79
-            //groupNames.push_back(setting.getName());
17
+    m_homePath = QStandardPaths::writableLocation(QStandardPaths::HomeLocation).toStdString();
18
+
19
+    // create description
20
+    desc.add_options()
21
+
22
+        // Browser default settings
23
+        // default profile name the browser should use; "" is off-the-record
24
+        ("browser.profile", po::value<std::string>()->default_value(""))
25
+
26
+        // default window size
27
+        ("browser.window.height", po::value<int>()->default_value(720))
28
+        ("browser.window.width", po::value<int>()->default_value(1280))
29
+        ("browser.window.maximized", po::value<bool>()->default_value(true))
30
+        ("browser.window.title", po::value<std::string>()->default_value("title — smolbote [profile]"))
31
+
32
+        // window ui
33
+        ("browser.ui.navtoolbarMovable", po::value<bool>()->default_value(false))
34
+        ("browser.ui.tabtoolbarMovable", po::value<bool>()->default_value(false))
35
+
36
+        // browser shortcuts
37
+
38
+        // browser menu
39
+        ("browser.shortcuts.newWindow", po::value<std::string>()->default_value("Ctrl+N"))
40
+        ("browser.shortcuts.newTab", po::value<std::string>()->default_value("Ctrl+T"))
41
+        ("browser.shortcuts.about", po::value<std::string>()->default_value("F1"))
42
+        ("browser.shortcuts.quit", po::value<std::string>()->default_value("Ctrl+Q"))
43
+
44
+        // navigation
45
+        ("browser.shortcuts.back", po::value<std::string>()->default_value("Ctrl+Left"))
46
+        ("browser.shortcuts.forward", po::value<std::string>()->default_value("Ctrl+Right"))
47
+        ("browser.shortcuts.refresh", po::value<std::string>()->default_value("F5"))
48
+        ("browser.shortcuts.reload", po::value<std::string>()->default_value("Ctrl+F5"))
49
+        ("browser.shortcuts.home", po::value<std::string>()->default_value("Ctrl+Home"))
50
+
51
+        // tabs
52
+        ("browser.shortcuts.tabClose", po::value<std::string>()->default_value("Ctrl+X"))
53
+        ("browser.shortcuts.tabLeft", po::value<std::string>()->default_value("Ctrl+O"))
54
+        ("browser.shortcuts.tabRight", po::value<std::string>()->default_value("Ctrl+P"))
55
+
56
+        // page
57
+        ("browser.shortcuts.toggleSearchBox", po::value<std::string>()->default_value("F3"))
58
+        ("browser.shortcuts.focusAddress", po::value<std::string>()->default_value("F4"))
59
+        ("browser.shortcuts.fullscreen", po::value<std::string>()->default_value("F11"))
60
+
61
+        // Filter settings
62
+        ("filter.path", po::value<std::string>()->default_value("~/.config/smolbote/hosts.d"))
63
+
64
+        // Plugin settings
65
+        ("plugins.path", po::value<std::string>()->default_value("~/.config/smolbote/plugins.d"))
66
+
67
+        // Profile settings
68
+        ("profile.path", po::value<std::string>()->default_value("~/.config/smolbote/profiles.d"))
69
+        ("profile.search", po::value<std::string>()->default_value("https://duckduckgo.com/?q=$term&ia=web"))
70
+        ("profile.homepage", po::value<std::string>()->default_value("about:blank"))
71
+        ("profile.newtab", po::value<std::string>()->default_value("about:blank"))
72
+
73
+        // Bookmark settings
74
+        ("bookmarks.path", po::value<std::string>()->default_value("~/.config/smolbote/bookmarks.xbel"))
75
+        ("bookmarks.shortcut", po::value<std::string>()->default_value("Ctrl+B"))
76
+
77
+        // Downloads settings
78
+        ("downloads.path", po::value<std::string>()->default_value("~/Downloads"))
79
+        ("downloads.shortcut", po::value<std::string>()->default_value("Ctrl+D"))
80
+        ;
81
+
82
+    // store the defaults into the vm
83
+    {
84
+        int argc = options.length();
85
+        const char* argv[argc];
86
+        for(int i = 0; i < argc; ++i) {
87
+            argv[i] = qUtf8Printable(options.at(i));
80 88
         }
89
+
90
+        po::store(po::parse_command_line(argc, argv, desc), vm);
81 91
     }
82 92
 
83
-    return groupNames;
84 93
 }
85 94
 
86
-std::vector<std::string> Configuration::childrenGroups(const char *name)
95
+Configuration::~Configuration()
87 96
 {
88
-    std::vector<std::string> groupNames;
89
-    const Setting &root = m_userCfg->lookup(name);
90
-
91
-    for(const Setting &setting : root) {
92
-        if(setting.getType() == Setting::TypeGroup) {
93
-            groupNames.emplace_back(setting.getName());
94
-            //groupNames.push_back(setting.getName());
95
-        }
96
-    }
97
-    return groupNames;
98 97
 }
99 98
 
100
-std::string castToString(const libconfig::Setting &v)
99
+bool Configuration::read(const QString &path)
101 100
 {
102
-    // cast depending on type
103
-    // type checks are done during compile time
104
-    switch(v.getType()) {
105
-    case Setting::TypeNone:
106
-        return std::string();
107
-
108
-    case Setting::TypeInt:
109
-        // int, unsigned int, long, unsigned long
110
-        return std::to_string(static_cast<int32_t>(v));
111
-
112
-    case Setting::TypeInt64:
113
-        // int, unsigned int; long long, unsigned long long
114
-        return std::to_string(static_cast<int64_t>(v));
115
-
116
-    case Setting::TypeFloat:
117
-        // float, double
118
-        return std::to_string(static_cast<double>(v));
119
-
120
-    case Setting::TypeString:
121
-        // const char*, std::string
122
-        return std::string(static_cast<const char *>(v));
123
-
124
-    case Setting::TypeBoolean:
125
-        // bool
126
-        return std::string(static_cast<bool>(v) ? "true" : "false");
127
-
128
-    case Setting::TypeGroup:
129
-    case Setting::TypeArray:
130
-    case Setting::TypeList:
131
-        return std::string();
132
-    }
101
+    std::ifstream f(path.toStdString(), std::ifstream::in);
102
+    po::store(po::parse_config_file(f, desc, false), vm);
103
+    return true;
133 104
 }
134 105
 
135
-void setFromString(libconfig::Setting &setting, const std::string &value)
136
-{
137
-    switch(setting.getType()) {
138
-        case libconfig::Setting::TypeNone:
139
-            break;
140
-
141
-        case libconfig::Setting::TypeInt:
142
-        case libconfig::Setting::TypeInt64:
143
-            setting = std::stoi(value);
144
-            break;
145
-
146
-        case libconfig::Setting::TypeFloat:
147
-            setting = std::stod(value);
148
-            break;
149
-
150
-        case libconfig::Setting::TypeString:
151
-            setting = value.c_str();
152
-            break;
153
-
154
-        case libconfig::Setting::TypeBoolean:
155
-            if(value == "true") {
156
-                setting = true;
157
-            } else if(value == "false") {
158
-                setting = false;
159
-            }
160
-            break;
161
-
162
-        case libconfig::Setting::TypeGroup:
163
-            break;
164
-        case libconfig::Setting::TypeArray:
165
-            break;
166
-        case libconfig::Setting::TypeList:
167
-            break;
168
-    }
169
-}

+ 14
- 40
src/configuration.h View File

@@ -9,39 +9,34 @@
9 9
 #ifndef CONFIGURATION_H
10 10
 #define CONFIGURATION_H
11 11
 
12
-#include <libconfig.h++>
13 12
 #include <optional>
14 13
 #include <string>
15 14
 #include <vector>
16 15
 #include <QString>
17
-
18
-std::string castToString(const libconfig::Setting &v);
19
-void setFromString(libconfig::Setting &setting, const std::string &value);
16
+#include <boost/program_options.hpp>
17
+#include <QStringList>
20 18
 
21 19
 class Configuration
22 20
 {
23 21
 public:
24
-    explicit Configuration(const std::string &path, const std::string &home);
22
+    explicit Configuration(const QStringList &options = QStringList());
25 23
     ~Configuration();
26 24
 
27 25
     bool read(const QString &path);
28
-    bool writeIfNeeded(const std::string &path = std::string());
29
-
30
-    std::vector<std::string> childrenSettings(const char *name = "");
31
-    std::vector<std::string> childrenGroups(const char *name = "");
32 26
 
33 27
     template <typename T>
34 28
     std::optional<T> value(const char *path) const
35 29
     {
36
-        // if setting doesn't exist, give back a nullopt
37
-        if(!m_userCfg->exists(path)) {
38
-            qWarning("Requesting non-existent option %s", path);
39
-            return std::nullopt;
30
+        // if setting doesn't exist, we crash
31
+        // in debug builds, check if setting exists
32
+#ifdef QT_DEBUG
33
+        if(vm.count(path) == 0) {
34
+            qWarning("value(%s) does not exist, probably crashing now", path);
40 35
         }
36
+#endif
41 37
 
42
-        const libconfig::Setting &v = m_userCfg->lookup(path);
43 38
         if constexpr(std::is_same_v<T, std::string>) {
44
-            std::string r = castToString(v);
39
+            std::string r = vm[path].as<std::string>();
45 40
 
46 41
             // check if it's a path
47 42
             if(r.front() == '~') {
@@ -50,35 +45,14 @@ public:
50 45
 
51 46
             return std::optional<std::string>(r);
52 47
         } else
53
-            return std::optional<T>(static_cast<T>(v));
54
-    }
55
-
56
-    template <typename T>
57
-    bool setValue(std::string path, const T &val)
58
-    {
59
-        if(!m_userCfg->exists(path)) {
60
-            return false;
61
-        }
62
-
63
-        libconfig::Setting &setting = m_userCfg->lookup(path);
64
-        // compiler complained about operator= not taking unsinged ints, longs and long longs
65
-        if constexpr(std::is_unsigned_v<T> && !std::is_same_v<T, bool>) {
66
-            setting = static_cast<typename std::make_signed_t<T>>(val);
67
-        } else if constexpr(std::is_same_v<T, std::string>) {
68
-            setFromString(setting, val);
69
-        } else {
70
-            setting = val;
71
-        }
72
-
73
-        changed = true;
74
-        return true;
48
+            return std::optional<T>(vm[path].as<T>());
75 49
     }
76 50
 
77 51
 private:
78
-    bool changed = false;
52
+    boost::program_options::options_description desc;
53
+    boost::program_options::variables_map vm;
54
+
79 55
     std::string m_homePath;
80
-    std::string m_userCfgPath;
81
-    libconfig::Config *m_userCfg;
82 56
 };
83 57
 
84 58
 #endif // CONFIGURATION_H

+ 4
- 7
src/forms/aboutdialog.cpp View File

@@ -9,11 +9,11 @@
9 9
 #include "aboutdialog.h"
10 10
 #include "ui_aboutdialog.h"
11 11
 #include "version.h"
12
-#include <libconfig.h++>
12
+#include <boost/version.hpp>
13 13
 
14 14
 // The extra level of indirection will allow the preprocessor to expand the macros before they are converted to strings.
15
-#define STR_HELPER(x) #x
16
-#define STR(x) STR_HELPER(x)
15
+#define STRINGIFY(x) #x
16
+#define STR(x) STRINGIFY(x)
17 17
 
18 18
 // compiler
19 19
 // clang also defines __GNUC__, so we need to check for clang first
@@ -25,9 +25,6 @@
25 25
 #define compiler "unknown compiler";
26 26
 #endif
27 27
 
28
-// libconfig
29
-#define LIBCONFIG_VERSION_STR STR(LIBCONFIGXX_VER_MAJOR) "." STR(LIBCONFIGXX_VER_MINOR) "." STR(LIBCONFIGXX_VER_REVISION)
30
-
31 28
 AboutDialog::AboutDialog(QWidget *parent)
32 29
     : QDialog(parent)
33 30
     , ui(new Ui::AboutDialog)
@@ -64,7 +61,7 @@ AboutDialog::AboutDialog(QWidget *parent)
64 61
                           "Compiled with " compiler "</p>"
65 62
                           "<p><ul>"
66 63
                           "<li>Qt " QT_VERSION_STR "</li>"
67
-                          "<li>libconfig " LIBCONFIG_VERSION_STR "</li>"
64
+                          "<li>Boost " BOOST_LIB_VERSION " </li>"
68 65
                           "</ul></p>"));
69 66
     ui->toolBox->addItem(libsLabel, tr("Details"));
70 67
 }

+ 11
- 6
src/main.cpp View File

@@ -51,7 +51,6 @@ int main(int argc, char **argv)
51 51
 
52 52
     // default config, :/poi.cfg
53 53
     QCommandLineOption defaultConfigOption("default-config", "Set the default configuration file.", "path");
54
-    defaultConfigOption.setDefaultValue(":/poi.cfg");
55 54
     parser.addOption(defaultConfigOption);
56 55
 
57 56
     QCommandLineOption profileOption({ "p", "profile" }, "Use this profile.", "PROFILE");
@@ -76,14 +75,20 @@ int main(int argc, char **argv)
76 75
     qDebug("profile=%s", qUtf8Printable(parser.value(profileOption)));
77 76
 #endif
78 77
 
79
-    std::shared_ptr<Configuration> config = std::make_shared<Configuration>(
80
-        parser.value(configOption).toStdString(),
81
-        QStandardPaths::writableLocation(QStandardPaths::HomeLocation).toStdString());
78
+    std::shared_ptr<Configuration> config = std::make_shared<Configuration>();
82 79
 
83 80
     // first load the default configuration
84
-    config->read(parser.value(defaultConfigOption));
81
+    if(parser.isSet(defaultConfigOption)) {
82
+        qDebug("Reading default configuration [%s]: %s",
83
+            qUtf8Printable(parser.value(defaultConfigOption)),
84
+            config->read(parser.value(defaultConfigOption)) ? "ok" : "failed");
85
+    }
85 86
     // then load in the user configuration, which will overwrite it
86
-    config->read(parser.value(configOption));
87
+    if(parser.isSet(configOption)) {
88
+        qDebug("Reading configuration [%s]: %s",
89
+            qUtf8Printable(parser.value(configOption)),
90
+            config->read(parser.value(configOption)) ? "ok" : "failed");
91
+    }
87 92
 
88 93
     // check for other instances
89 94
     // if we socket hasn't been disabled (socket is not none)

+ 3
- 3
src/mainwindow/mainwindow.cpp View File

@@ -16,7 +16,7 @@
16 16
 #include <bookmarks/bookmarkswidget.h>
17 17
 #include <downloads/downloadswidget.h>
18 18
 #include <src/addressbar/urllineedit.h>
19
-#include <settings/settingsdialog.h>
19
+//#include <settings/settingsdialog.h>
20 20
 
21 21
 MainWindow::MainWindow(std::shared_ptr<Configuration> config, QWidget *parent)
22 22
     : QMainWindow(parent)
@@ -201,8 +201,8 @@ void MainWindow::about()
201 201
 
202 202
 void MainWindow::showSettingsDialog()
203 203
 {
204
-    SettingsDialog *dlg = new SettingsDialog(m_config, this);
205
-    dlg->exec();
204
+    //SettingsDialog *dlg = new SettingsDialog(m_config, this);
205
+    //dlg->exec();
206 206
 }
207 207
 
208 208
 void MainWindow::setProfile(std::shared_ptr<WebEngineProfile> profile)

Loading…
Cancel
Save