Commit 4fe0d4bb authored by jan.koester's avatar jan.koester
Browse files

Merge branch 'main' of git.tuxist.de:jan.koester/libhtmlpp

parents ec1b6b12 eac9904a

src/cmake/libhtmlppConfig.cmake

+3 −3
Original line number Diff line number Diff line 
include(CMakeFindDependencyMacro)

# find_dependency(xx 2.0)

include("@CMAKE_INSTALL_PREFIX@/libhtmlpp/@ConfigPackageLocation@/libhtmlppTargets.cmake")

include("@CMAKE_INSTALL_PREFIX@/libhtmlpp/@ConfigPackageLocation@/libhtmlppConfigVersion.cmake")

include("@CMAKE_INSTALL_PREFIX@/@ConfigPackageLocation@/libhtmlppTargets.cmake")

include("@CMAKE_INSTALL_PREFIX@/@ConfigPackageLocation@/libhtmlppConfigVersion.cmake")



set(HTMLPP_INCLUDE_DIR   "@CMAKE_INSTALL_PREFIX@/libhtmlpp/include")

set(HTMLPP_CONFIG_DIR    "@CMAKE_INSTALL_PREFIX@/libhtmlpp/@ConfigPackageLocation@")

src/html.cpp

+3 −3
Original line number Diff line number Diff line
@@ -582,14 +582,14 @@ void libhtmlpp::HtmlString::_serialelize(std::vector<char> in, libhtmlpp::HtmlEl 
    }

}



void libhtmlpp::HtmlEncode(const char* input, std::string &output){

void libhtmlpp::HtmlEncode(const std::string &input, std::string &output){

    HtmlString tmp(output);

    HtmlEncode(input,&tmp);

    output=tmp.c_str();

}



void libhtmlpp::HtmlEncode(const char* input, HtmlString* output){

    size_t ilen=strlen(input);

void libhtmlpp::HtmlEncode(const std::string &input, HtmlString* output){

    size_t ilen=input.length();

    for(size_t i=0; i<ilen; ++i){

        size_t ii=0;

        bool changed=false;

src/html.h

+3 −3
Original line number Diff line number Diff line
@@ -275,12 +275,12 @@ namespace libhtmlpp { 
        std::vector<char>    _Data;

        std::vector<char>    _CStr;

        std::stack<Element*> _Childs;

        friend void HtmlEncode(const char *input,HtmlString *output);

        friend void HtmlEncode(const std::string &input,HtmlString *output);

        friend class HtmlPage;

    };



    void HtmlEncode(const char *input,HtmlString *output);

    void HtmlEncode(const char *input,std::string &output);

    void HtmlEncode(const std::string &input,HtmlString *output);

    void HtmlEncode(const std::string &input,std::string &output);



    class HtmlPage {

    public: