From 549a512732f65dc0bbb0770bd72782eb2802a4d4 Mon Sep 17 00:00:00 2001 From: Roker Date: Tue, 23 Apr 2019 16:25:00 +0200 Subject: [PATCH] rename all "pep" in file names etc. into "pEp" as required by pEp branding rules. --- html/index.html | 4 ++-- html/interactive.js | 14 +++++++------- server/ev_server.cc | 6 +++--- server/json-adapter.cc | 6 +++--- server/{pep-types.cc => pEp-types.cc} | 6 +++--- server/{pep-types.hh => pEp-types.hh} | 0 server/{pep-utils-json.hh => pEp-utils-json.hh} | 0 server/{pep-utils.cc => pEp-utils.cc} | 2 +- server/{pep-utils.hh => pEp-utils.hh} | 0 server/security-token.cc | 8 ++++---- server/server_version.cc | 2 +- server/servertest.cc | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) rename server/{pep-types.cc => pEp-types.cc} (99%) rename server/{pep-types.hh => pEp-types.hh} (100%) rename server/{pep-utils-json.hh => pEp-utils-json.hh} (100%) rename server/{pep-utils.cc => pEp-utils.cc} (89%) rename server/{pep-utils.hh => pEp-utils.hh} (100%) diff --git a/html/index.html b/html/index.html index 72712c3..db6c6f7 100644 --- a/html/index.html +++ b/html/index.html @@ -17,7 +17,7 @@ pre.red {white-space:pre; background-color:#d99; } - + @@ -67,7 +67,7 @@
diff --git a/html/interactive.js b/html/interactive.js index ea4d85d..77e52b3 100644 --- a/html/interactive.js +++ b/html/interactive.js @@ -542,9 +542,9 @@ function prepare_call(f) function on_select_change() { var fn = $( "#fn_name" ).val(); - for(var i=0, len=pep_functions.length; i —— ':'>') + f.name + "\n"; } document.getElementById("fn_name").innerHTML = optionList; @@ -623,9 +623,9 @@ function create_doc() var fd = format_def[format_name]; var output = ""; - for(var i=0, len=pep_functions.length; i 0) diff --git a/server/ev_server.cc b/server/ev_server.cc index 3d0d690..ead3fe9 100644 --- a/server/ev_server.cc +++ b/server/ev_server.cc @@ -5,9 +5,9 @@ #include "prefix-config.hh" #include "json-adapter.hh" #include "function_map.hh" -#include "pep-types.hh" +#include "pEp-types.hh" #include "json_rpc.hh" -#include "pep-utils.hh" +#include "pEp-utils.hh" #include "logger.hh" #include "server_version.hh" @@ -278,7 +278,7 @@ void ev_server::OnGetFunctions(evhttp_request* req, void*) "var server_version_name = \"" + version.name + "\";\n" "var server_version = \"" + version.major_minor_patch() + "\";\n" "var add_sharks = " + (add_sharks?"true":"false") + ";\n" - "var pep_functions = "; + "var pEp_functions = "; js::Array jsonfunctions; for(const auto& f : functions) diff --git a/server/json-adapter.cc b/server/json-adapter.cc index 3d8f82a..a047581 100644 --- a/server/json-adapter.cc +++ b/server/json-adapter.cc @@ -17,10 +17,10 @@ #include "json-adapter.hh" #include "daemonize.hh" -#include "pep-types.hh" +#include "pEp-types.hh" #include "json_rpc.hh" #include "security-token.hh" -#include "pep-utils.hh" +#include "pEp-utils.hh" #include "ev_server.hh" #include "logger.hh" #include "server_version.hh" @@ -632,7 +632,7 @@ void JsonAdapter::threadFunc() if(i->deliver_html) { - evhttp_set_cb(evHttp.get(), "/pep_functions.js" , ev_server::OnGetFunctions , this); + evhttp_set_cb(evHttp.get(), "/pEp_functions.js" , ev_server::OnGetFunctions , this); evhttp_set_gencb(evHttp.get(), ev_server::OnOtherRequest, nullptr); } diff --git a/server/pep-types.cc b/server/pEp-types.cc similarity index 99% rename from server/pep-types.cc rename to server/pEp-types.cc index 43e25dc..df8d62e 100644 --- a/server/pep-types.cc +++ b/server/pEp-types.cc @@ -1,6 +1,6 @@ -#include "pep-types.hh" -#include "pep-utils.hh" -#include "pep-utils-json.hh" +#include "pEp-types.hh" +#include "pEp-utils.hh" +#include "pEp-utils-json.hh" #include "json-adapter.hh" #include diff --git a/server/pep-types.hh b/server/pEp-types.hh similarity index 100% rename from server/pep-types.hh rename to server/pEp-types.hh diff --git a/server/pep-utils-json.hh b/server/pEp-utils-json.hh similarity index 100% rename from server/pep-utils-json.hh rename to server/pEp-utils-json.hh diff --git a/server/pep-utils.cc b/server/pEp-utils.cc similarity index 89% rename from server/pep-utils.cc rename to server/pEp-utils.cc index 3316486..9e7e538 100644 --- a/server/pep-utils.cc +++ b/server/pEp-utils.cc @@ -1,4 +1,4 @@ -#include "pep-utils.hh" +#include "pEp-utils.hh" #include #include #include diff --git a/server/pep-utils.hh b/server/pEp-utils.hh similarity index 100% rename from server/pep-utils.hh rename to server/pEp-utils.hh diff --git a/server/security-token.cc b/server/security-token.cc index 53dbd28..c62bf8e 100644 --- a/server/security-token.cc +++ b/server/security-token.cc @@ -67,21 +67,21 @@ fs::path get_token_filename() throw std::runtime_error("Cannot get home directory. $HOME environment variable is not set."); } - const fs::path pep_dir = fs::path(home_dir) / ".pEp"; + const fs::path pEp_dir = fs::path(home_dir) / ".pEp"; boost::system::error_code ec; - fs::create_directory( pep_dir, ec ); + fs::create_directory( pEp_dir, ec ); if(ec) { throw boost::system::system_error(ec, "Cannot create pEp home directory" ); } - fs::permissions( pep_dir, fs::perms(0700), ec); + fs::permissions( pEp_dir, fs::perms(0700), ec); if(ec) { throw boost::system::system_error(ec, "Cannot change permissions of pEp home directory to 0700 "); } - return pep_dir / "json-token"; + return pEp_dir / "json-token"; } diff --git a/server/server_version.cc b/server/server_version.cc index 0969769..a3bb430 100644 --- a/server/server_version.cc +++ b/server/server_version.cc @@ -3,7 +3,7 @@ #include #include #include "logger.hh" -#include "pep-utils-json.hh" +#include "pEp-utils-json.hh" #include // for PEP_VERSION and get_engine_version() #include #include "json_spirit/json_spirit_reader.h" diff --git a/server/servertest.cc b/server/servertest.cc index 2a0f942..10828da 100644 --- a/server/servertest.cc +++ b/server/servertest.cc @@ -1,4 +1,4 @@ -#include +#include #include #include #include