Move all public *Tools.h in src.

This by definition remove all the tool functions from the public API.
This commit is contained in:
Matthieu Gautier 2021-06-30 11:50:51 +02:00
parent 967eb10cbf
commit fa83a61a54
21 changed files with 19 additions and 31 deletions

View File

@ -17,15 +17,3 @@ headers = [
] ]
install_headers(headers, subdir:'kiwix') install_headers(headers, subdir:'kiwix')
install_headers(
'tools/base64.h',
'tools/networkTools.h',
'tools/otherTools.h',
'tools/pathTools.h',
'tools/regexTools.h',
'tools/stringTools.h',
'tools/archiveTools.h',
subdir:'kiwix/tools'
)

View File

@ -26,9 +26,6 @@
#include <pugixml.hpp> #include <pugixml.hpp>
#include "tools/base64.h"
#include "tools/pathTools.h"
#include "tools/regexTools.h"
#include "library.h" #include "library.h"
#include "reader.h" #include "reader.h"

View File

@ -29,8 +29,6 @@
#include <string> #include <string>
#include "common.h" #include "common.h"
#include "entry.h" #include "entry.h"
#include "tools/pathTools.h"
#include "tools/stringTools.h"
using namespace std; using namespace std;

View File

@ -29,8 +29,6 @@
#include <string> #include <string>
#include <memory> #include <memory>
#include <vector> #include <vector>
#include "tools/pathTools.h"
#include "tools/stringTools.h"
#include <zim/search.h> #include <zim/search.h>

View File

@ -24,6 +24,8 @@
#include "tools/regexTools.h" #include "tools/regexTools.h"
#include "tools/networkTools.h" #include "tools/networkTools.h"
#include "tools/otherTools.h" #include "tools/otherTools.h"
#include "tools/stringTools.h"
#include "tools/pathTools.h"
#include <pugixml.hpp> #include <pugixml.hpp>

View File

@ -20,11 +20,12 @@
#include "opds_dumper.h" #include "opds_dumper.h"
#include "book.h" #include "book.h"
#include "tools/otherTools.h"
#include "kiwixlib-resources.h" #include "kiwixlib-resources.h"
#include <mustache.hpp> #include <mustache.hpp>
#include "tools/stringTools.h"
#include "tools/otherTools.h"
namespace kiwix namespace kiwix
{ {

View File

@ -24,6 +24,8 @@
#include <zim/item.h> #include <zim/item.h>
#include <zim/error.h> #include <zim/error.h>
#include "tools/stringTools.h"
#include "tools/pathTools.h"
#include "tools/otherTools.h" #include "tools/otherTools.h"
#include "tools/archiveTools.h" #include "tools/archiveTools.h"

View File

@ -30,7 +30,7 @@
#include <mustache.hpp> #include <mustache.hpp>
#include "kiwixlib-resources.h" #include "kiwixlib-resources.h"
#include "tools/stringTools.h"
namespace kiwix namespace kiwix
{ {

View File

@ -18,7 +18,6 @@
*/ */
#include <cmath>
#include "searcher.h" #include "searcher.h"
#include "reader.h" #include "reader.h"
@ -26,6 +25,8 @@
#include <zim/search.h> #include <zim/search.h>
#include <mustache.hpp> #include <mustache.hpp>
#include <cmath>
#include "tools/stringTools.h"
#include "kiwixlib-resources.h" #include "kiwixlib-resources.h"
#define MAX_SEARCH_LEN 140 #define MAX_SEARCH_LEN 140

View File

@ -17,10 +17,10 @@
* MA 02110-1301, USA. * MA 02110-1301, USA.
*/ */
#include <tools/archiveTools.h> #include "archiveTools.h"
#include <tools/pathTools.h> #include "pathTools.h"
#include <tools/otherTools.h> #include "otherTools.h"
#include <tools/stringTools.h> #include "stringTools.h"
#include <zim/error.h> #include <zim/error.h>
#include <zim/item.h> #include <zim/item.h>

View File

@ -2,6 +2,7 @@
#include "../include/manager.h" #include "../include/manager.h"
#include "../include/library.h" #include "../include/library.h"
#include "../include/book.h" #include "../include/book.h"
#include "../src/tools/pathTools.h"
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>

View File

@ -20,7 +20,7 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include <string> #include <string>
#include <vector> #include <vector>
#include "../include/tools/pathTools.h" #include "../src/tools/pathTools.h"
#ifdef _WIN32 #ifdef _WIN32
# define S "\\" # define S "\\"

View File

@ -21,7 +21,7 @@
#include <string> #include <string>
#include "../include/tools/regexTools.h" #include "../src/tools/regexTools.h"
namespace namespace
{ {

View File

@ -5,7 +5,7 @@
#include "../include/manager.h" #include "../include/manager.h"
#include "../include/server.h" #include "../include/server.h"
#include "../include/name_mapper.h" #include "../include/name_mapper.h"
#include "../src/tools/pathTools.h"
using TestContextImpl = std::vector<std::pair<std::string, std::string> >; using TestContextImpl = std::vector<std::pair<std::string, std::string> >;
struct TestContext : TestContextImpl { struct TestContext : TestContextImpl {