Commit 71551682 authored by Camilo Higuita's avatar Camilo Higuita

fix merge conflicts

parents d6ec6c3d 59c2c8ad
......@@ -18,11 +18,11 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_definitions( -Wall -O2 -fexceptions -std=c99)
#add_definitions( -Wall -O2 -fexceptions -std=c99)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/QGumboParser
${CMAKE_CURRENT_BINARY_DIR}/QGumboParser
# ${CMAKE_CURRENT_SOURCE_DIR}/QGumboParser
# ${CMAKE_CURRENT_BINARY_DIR}/QGumboParser
${CMAKE_CURRENT_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}/src
......@@ -69,64 +69,65 @@ set(buho_HDRS
set(buho_ASSETS
qml.qrc
assets/assets.qrc
assets/icon-theme.qrc
)
set(qgumbo_SRCS
QGumboParser/qgumbodocument.cpp
QGumboParser/qgumbonode.cpp
QGumboParser/qgumboattribute.cpp
QGumboParser/gumbo-parser/src/attribute.c
QGumboParser/gumbo-parser/src/char_ref.c
QGumboParser/gumbo-parser/src/error.c
QGumboParser/gumbo-parser/src/parser.c
QGumboParser/gumbo-parser/src/string_buffer.c
QGumboParser/gumbo-parser/src/string_piece.c
QGumboParser/gumbo-parser/src/tag.c
QGumboParser/gumbo-parser/src/tokenizer.c
QGumboParser/gumbo-parser/src/utf8.c
QGumboParser/gumbo-parser/src/util.c
QGumboParser/gumbo-parser/src/vector.c
)
set(qgumbo_HDRS
QGumboParser/qgumboattribute.h
QGumboParser/qgumbodocument.h
QGumboParser/HtmlTag.h
QGumboParser/qgumbonode.h
QGumboParser/gumbo-parser/src/attribute.h
QGumboParser/gumbo-parser/src/char_ref.h
QGumboParser/gumbo-parser/src/char_ref.rl
QGumboParser/gumbo-parser/src/error.h
QGumboParser/gumbo-parser/src/gumbo.h
QGumboParser/gumbo-parser/src/insertion_mode.h
QGumboParser/gumbo-parser/src/parser.h
QGumboParser/gumbo-parser/src/string_buffer.h
QGumboParser/gumbo-parser/src/string_piece.h
QGumboParser/gumbo-parser/src/tag_enum.h
QGumboParser/gumbo-parser/src/tag_gperf.h
QGumboParser/gumbo-parser/src/tag_sizes.h
QGumboParser/gumbo-parser/src/tag_strings.h
QGumboParser/gumbo-parser/src/token_type.h
QGumboParser/gumbo-parser/src/tokenizer_states.h
QGumboParser/gumbo-parser/src/tokenizer.h
QGumboParser/gumbo-parser/src/utf8.h
QGumboParser/gumbo-parser/src/util.h
QGumboParser/gumbo-parser/src/vector.h
)
#set(qgumbo_SRCS
# QGumboParser/qgumbodocument.cpp
# QGumboParser/qgumbonode.cpp
# QGumboParser/qgumboattribute.cpp
# QGumboParser/gumbo-parser/src/attribute.c
# QGumboParser/gumbo-parser/src/char_ref.c
# QGumboParser/gumbo-parser/src/error.c
# QGumboParser/gumbo-parser/src/parser.c
# QGumboParser/gumbo-parser/src/string_buffer.c
# QGumboParser/gumbo-parser/src/string_piece.c
# QGumboParser/gumbo-parser/src/tag.c
# QGumboParser/gumbo-parser/src/tokenizer.c
# QGumboParser/gumbo-parser/src/utf8.c
# QGumboParser/gumbo-parser/src/util.c
# QGumboParser/gumbo-parser/src/vector.c
# )
#set(qgumbo_HDRS
# QGumboParser/qgumboattribute.h
# QGumboParser/qgumbodocument.h
# QGumboParser/HtmlTag.h
# QGumboParser/qgumbonode.h
# QGumboParser/gumbo-parser/src/attribute.h
# QGumboParser/gumbo-parser/src/char_ref.h
# QGumboParser/gumbo-parser/src/char_ref.rl
# QGumboParser/gumbo-parser/src/error.h
# QGumboParser/gumbo-parser/src/gumbo.h
# QGumboParser/gumbo-parser/src/insertion_mode.h
# QGumboParser/gumbo-parser/src/parser.h
# QGumboParser/gumbo-parser/src/string_buffer.h
# QGumboParser/gumbo-parser/src/string_piece.h
# QGumboParser/gumbo-parser/src/tag_enum.h
# QGumboParser/gumbo-parser/src/tag_gperf.h
# QGumboParser/gumbo-parser/src/tag_sizes.h
# QGumboParser/gumbo-parser/src/tag_strings.h
# QGumboParser/gumbo-parser/src/token_type.h
# QGumboParser/gumbo-parser/src/tokenizer_states.h
# QGumboParser/gumbo-parser/src/tokenizer.h
# QGumboParser/gumbo-parser/src/utf8.h
# QGumboParser/gumbo-parser/src/util.h
# QGumboParser/gumbo-parser/src/vector.h
# )
add_executable(buho
${buho_SRCS}
${buho_HDRS}
${buho_ASSETS}
${qgumbo_SRCS}
${qgumbo_HDRS}
# ${qgumbo_SRCS}
# ${qgumbo_HDRS}
)
if (ANDROID)
find_package(Qt5 REQUIRED COMPONENTS AndroidExtras)
target_link_libraries(vvave Qt5::AndroidExtras)
target_link_libraries(buho Qt5::AndroidExtras)
kde_source_files_enable_exceptions(buho src/buho.cpp)
else()
find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Notifications Config KIO Attica SyntaxHighlighting)
......@@ -148,4 +149,4 @@ install(FILES org.kde.buho.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
install(FILES assets/buho.svg DESTINATION ${KDE_INSTALL_ICONDIR}/hicolor/scalable/apps)
#install(FILES org.kde.buho.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
......@@ -207,7 +207,7 @@ GumboTag gumbo_tagn_enum(const char* tagname, unsigned int length);
/**
* Attribute namespaces.
* HTML includes special handling for XLink, XML, and XMLNS namespaces on
* attributes. Everything else goes in the generic "NONE" namespace.
* attributes. Everything else goes in the generic "NONE" nameMaui.Style.space.
*/
typedef enum {
GUMBO_ATTR_NAMESPACE_NONE,
......@@ -299,7 +299,7 @@ typedef enum {
GUMBO_NODE_CDATA,
/** Comment node. v will be a GumboText, excluding comment delimiters. */
GUMBO_NODE_COMMENT,
/** Text node, where all contents is whitespace. v will be a GumboText. */
/** Text node, where all contents is whiteMaui.Style.space. v will be a GumboText. */
GUMBO_NODE_WHITESPACE,
/** Template node. This is separate from GUMBO_NODE_ELEMENT because many
* client libraries will want to ignore the contents of template nodes, as
......@@ -329,7 +329,7 @@ typedef enum {
* Unlike in X(HT)ML, namespaces in HTML5 are not denoted by a prefix. Rather,
* anything inside an <svg> tag is in the SVG namespace, anything inside the
* <math> tag is in the MathML namespace, and anything else is inside the HTML
* namespace. No other namespaces are supported, so this can be an enum only.
* nameMaui.Style.space. No other namespaces are supported, so this can be an enum only.
*/
typedef enum {
GUMBO_NAMESPACE_HTML,
......
......@@ -48,7 +48,7 @@ typedef struct {
void gumbo_string_buffer_init(
struct GumboInternalParser* parser, GumboStringBuffer* output);
// Ensures that the buffer contains at least a certain amount of space. Most
// Ensures that the buffer contains at least a certain amount of Maui.Style.space. Most
// useful with snprintf and the other length-delimited string functions, which
// may want to write directly into the buffer.
void gumbo_string_buffer_reserve(struct GumboInternalParser* parser,
......
This diff is collapsed.
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
height="16"
viewBox="0 0 16 16"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="view-refresh.svg">
<defs
id="defs3051">
<style
type="text/css"
id="current-color-scheme">
.ColorScheme-Text {
color:#4d4d4d;
}
</style>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="64"
inkscape:cx="6.4989867"
inkscape:cy="10.154087"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
units="px"
inkscape:showpageshadow="false"
borderlayer="true"
showguides="true"
inkscape:guide-bbox="true"
inkscape:window-width="2560"
inkscape:window-height="1050"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0">
<inkscape:grid
type="xygrid"
id="grid4136"
empspacing="2"
originx="-3"
originy="-3.0000174" />
<sodipodi:guide
position="0,14.999983"
orientation="0,1"
id="guide4140"
inkscape:label="Icon Max Height"
inkscape:color="rgb(233,30,99)" />
<sodipodi:guide
position="0,0.9999826"
orientation="0,1"
id="guide4142"
inkscape:label="Icon Baseline"
inkscape:color="rgb(233,30,99)" />
<sodipodi:guide
position="8,-1.74e-05"
orientation="1,0"
id="guide4144"
inkscape:label="Center Vertical"
inkscape:color="rgb(221,44,0)" />
<sodipodi:guide
position="16,7.9999826"
orientation="0,1"
id="guide4146"
inkscape:label="Center Horizontal"
inkscape:color="rgb(221,44,0)" />
</sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Capa 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-3,-1033.3622)">
<path
style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Text"
d="M 12.035156 1.5429688 C 11.904645 1.5499438 11.775597 1.6077562 11.679688 1.7226562 L 10.84375 2.7226562 A 6 6 0 0 0 8 2 A 6 6 0 0 0 2 8 A 6 6 0 0 0 8 14 A 6 6 0 0 0 12.458984 12.001953 A 0.5 0.5 0 0 0 12.625 11.628906 A 0.5 0.5 0 0 0 12.125 11.128906 A 0.5 0.5 0 0 0 11.759766 11.289062 A 0.5 0.5 0 0 0 11.740234 11.308594 A 5 5 0 0 1 8 13 A 5 5 0 0 1 3 8 A 5 5 0 0 1 8 3 A 5 5 0 0 1 10.185547 3.5117188 L 10.078125 3.6386719 L 9.7578125 4.0234375 L 9.1152344 4.7929688 C 8.9354424 5.0098687 8.9697702 5.3303062 9.1914062 5.5039062 C 9.2627862 5.5639062 9.3528295 5.598575 9.4453125 5.609375 L 13.029297 5.9980469 C 13.383882 6.0360469 13.663328 5.701575 13.5625 5.359375 L 12.542969 1.8984375 C 12.514679 1.8024375 12.46286 1.7264687 12.396484 1.6679688 L 12.396484 1.6660156 C 12.296925 1.5782156 12.165667 1.5359937 12.035156 1.5429688 z "
transform="translate(3,1033.3622)"
id="path4164" />
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
height="16"
viewBox="0 0 16 16"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="application-exit.svg">
<defs
id="defs3051">
<style
type="text/css"
id="current-color-scheme">
.ColorScheme-Text {
color:#4d4d4d;
}
</style>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="45.254834"
inkscape:cx="7.5421971"
inkscape:cy="9.6393657"
inkscape:document-units="px"
inkscape:current-layer="layer1"