diff --git a/cli.cpp b/cli.cpp index 6a23559..3a6023c 100644 --- a/cli.cpp +++ b/cli.cpp @@ -54,7 +54,7 @@ std::pair CLIHandler::user_add(const std::vector return {true, ""}; } -std::pair CLIHandler::user_change_pw(const std::vector &args) +std::pair CLIHandler::user_change_pw([[maybe_unused]] const std::vector &args) { std::string username = args.at(0); std::string password = args.at(1); @@ -81,13 +81,13 @@ std::pair CLIHandler::user_change_pw(const std::vector CLIHandler::user_rename(const std::vector &args) +std::pair CLIHandler::user_rename([[maybe_unused]] const std::vector &args) { return {true, ""}; } -std::pair CLIHandler::user_set_perms(const std::vector &args) +std::pair CLIHandler::user_set_perms([[maybe_unused]] const std::vector &args) { auto userDao = this->db->createUserDao(); std::string username = args.at(0); @@ -107,7 +107,7 @@ std::pair CLIHandler::user_set_perms(const std::vector CLIHandler::user_list(const std::vector &args) +std::pair CLIHandler::user_list([[maybe_unused]] const std::vector &args) { auto userDao = this->db->createUserDao(); QueryOption o; @@ -138,7 +138,7 @@ std::pair CLIHandler::user_show(const std::vector CLIHandler::page_list(const std::vector &args) +std::pair CLIHandler::page_list([[maybe_unused]] const std::vector &args) { auto pageDao = this->db->createPageDao(); QueryOption o; @@ -163,7 +163,7 @@ std::pair CLIHandler::pageperms_set_permissions(const std::ve return {true, ""}; } -std::pair CLIHandler::attach(const std::vector &args) +std::pair CLIHandler::attach([[maybe_unused]] const std::vector &args) { /* TODO: consider authentication */ pid_t pid = getpid(); @@ -245,12 +245,12 @@ std::pair> CLIHandler::splitCommand(std::s return {cmd, splitted}; } -std::pair CLIHandler::version(const std::vector &args) +std::pair CLIHandler::version([[maybe_unused]] const std::vector &args) { return {true, get_version_string()}; } -std::pair CLIHandler::category_list(const std::vector &args) +std::pair CLIHandler::category_list([[maybe_unused]] const std::vector &args) { auto categoryDao = this->db->createCategoryDao(); auto categories = categoryDao->fetchList(QueryOption{}); diff --git a/cli.h b/cli.h index 9826002..18d0419 100644 --- a/cli.h +++ b/cli.h @@ -22,20 +22,20 @@ class CLIHandler Config *conf; protected: - std::pair attach(const std::vector &args); - std::pair cli_help(const std::vector &args); - std::pair user_add(const std::vector &args); - std::pair user_change_pw(const std::vector &args); - std::pair user_rename(const std::vector &args); - std::pair user_set_perms(const std::vector &args); - std::pair user_list(const std::vector &args); - std::pair user_show(const std::vector &args); - std::pair page_list(const std::vector &args); - std::pair pageperms_set_permissions(const std::vector &args); - std::pair version(const std::vector &args); - std::pair category_list(const std::vector &args); - std::pair category_delete(const std::vector &args); - std::pair category_show(const std::vector &args); + std::pair attach([[maybe_unused]] const std::vector &args); + std::pair cli_help([[maybe_unused]] const std::vector &args); + std::pair user_add([[maybe_unused]] const std::vector &args); + std::pair user_change_pw([[maybe_unused]] const std::vector &args); + std::pair user_rename([[maybe_unused]] const std::vector &args); + std::pair user_set_perms([[maybe_unused]] const std::vector &args); + std::pair user_list([[maybe_unused]] const std::vector &args); + std::pair user_show([[maybe_unused]] const std::vector &args); + std::pair page_list([[maybe_unused]] const std::vector &args); + std::pair pageperms_set_permissions([[maybe_unused]] const std::vector &args); + std::pair version([[maybe_unused]] const std::vector &args); + std::pair category_list([[maybe_unused]] const std::vector &args); + std::pair category_delete([[maybe_unused]] const std::vector &args); + std::pair category_show([[maybe_unused]] const std::vector &args); std::vector cmds{ {{"user", @@ -73,7 +73,7 @@ class CLIHandler "exit cli", 0, {}, - [](CLIHandler *, const std::vector &args) -> std::pair + [](CLIHandler *, [[maybe_unused]] const std::vector &args) -> std::pair { exit(EXIT_SUCCESS); return {true, ""}; diff --git a/database/userdaosqlite.cpp b/database/userdaosqlite.cpp index b9b1264..b6918a8 100644 --- a/database/userdaosqlite.cpp +++ b/database/userdaosqlite.cpp @@ -116,7 +116,7 @@ std::vector UserDaoSqlite::list(QueryOption o) return result; } -void UserDaoSqlite::deleteUser(std::string username) +void UserDaoSqlite::deleteUser([[maybe_unused]] std::string username) { // What to do with the contributions of the user? } diff --git a/handlers/handler.h b/handlers/handler.h index 8569c0e..48ed491 100644 --- a/handlers/handler.h +++ b/handlers/handler.h @@ -36,12 +36,12 @@ class Handler } virtual Response handle(const Request &r); - virtual Response handleRequest(const Request &r) + virtual Response handleRequest([[maybe_unused]] const Request &r) { return this->errorResponse("Invalid action", "This action is not implemented yet"); } - virtual bool canAccess(const Permissions &perms) + virtual bool canAccess([[maybe_unused]] const Permissions &perms) { return false; } diff --git a/handlers/handlerdefault.cpp b/handlers/handlerdefault.cpp index ac55c25..52a9a38 100644 --- a/handlers/handlerdefault.cpp +++ b/handlers/handlerdefault.cpp @@ -20,7 +20,7 @@ SOFTWARE. */ #include "handlerdefault.h" -Response HandlerDefault::handleRequest(const Request &r) +Response HandlerDefault::handleRequest([[maybe_unused]] const Request &r) { return Response::redirectTemporarily(this->urlProvider->index()); } @@ -29,7 +29,7 @@ HandlerDefault::~HandlerDefault() { } -bool HandlerDefault::canAccess(const Permissions &perms) +bool HandlerDefault::canAccess([[maybe_unused]] const Permissions &perms) { return true; } diff --git a/handlers/handlerhistory.cpp b/handlers/handlerhistory.cpp index 4ef6666..c51bf74 100644 --- a/handlers/handlerhistory.cpp +++ b/handlers/handlerhistory.cpp @@ -50,7 +50,8 @@ Response HandlerHistory::handleRequest(const Request &r) std::vector resultList; auto revisionDao = this->database->createRevisionDao(); - auto makeSortedLink = [&](unsigned int limit, unsigned int offset, unsigned int order) { + auto makeSortedLink = [&](unsigned int limit, unsigned int offset, unsigned int order) + { if(!page.empty()) { return this->urlProvider->pageHistorySort(page, limit, offset, order); @@ -122,7 +123,7 @@ Response HandlerHistory::handleRequest(const Request &r) return response; } -bool HandlerHistory::canAccess(const Permissions &perms) +bool HandlerHistory::canAccess([[maybe_unused]] const Permissions &perms) { return true; // This is a lie but we need to this a little more fine grained here, which we do in the handleRequest } diff --git a/handlers/handlerinvalidaction.cpp b/handlers/handlerinvalidaction.cpp index a96880b..860ce29 100644 --- a/handlers/handlerinvalidaction.cpp +++ b/handlers/handlerinvalidaction.cpp @@ -20,12 +20,12 @@ SOFTWARE. */ #include "handlerinvalidaction.h" -Response HandlerInvalidAction::handleRequest(const Request &r) +Response HandlerInvalidAction::handleRequest([[maybe_unused]] const Request &r) { return errorResponse("Invalid action", "No action defined for this action"); } -bool HandlerInvalidAction::canAccess(const Permissions &perms) +bool HandlerInvalidAction::canAccess([[maybe_unused]] const Permissions &perms) { return true; } diff --git a/handlers/handlerlogin.cpp b/handlers/handlerlogin.cpp index 8333c84..3905631 100644 --- a/handlers/handlerlogin.cpp +++ b/handlers/handlerlogin.cpp @@ -66,7 +66,7 @@ Response HandlerLogin::handleRequest(const Request &r) return result; } -bool HandlerLogin::canAccess(const Permissions &perms) +bool HandlerLogin::canAccess([[maybe_unused]] const Permissions &perms) { return true; } diff --git a/handlers/handlerpageedit.cpp b/handlers/handlerpageedit.cpp index b244592..085ebc4 100644 --- a/handlers/handlerpageedit.cpp +++ b/handlers/handlerpageedit.cpp @@ -23,7 +23,7 @@ SOFTWARE. #include "../request.h" #include "../parser.h" -bool HandlerPageEdit::canAccess(std::string page) +bool HandlerPageEdit::canAccess([[maybe_unused]] std::string page) { return this->userSession->user.permissions.canEdit(); } diff --git a/handlers/handlerusersettings.cpp b/handlers/handlerusersettings.cpp index 77b4a9f..94c8d78 100644 --- a/handlers/handlerusersettings.cpp +++ b/handlers/handlerusersettings.cpp @@ -62,7 +62,7 @@ Response HandlerUserSettings::handleRequest(const Request &r) return result; } -bool HandlerUserSettings::canAccess(const Permissions &perms) +bool HandlerUserSettings::canAccess([[maybe_unused]] const Permissions &perms) { return this->userSession->loggedIn; } diff --git a/handlers/handlerversion.cpp b/handlers/handlerversion.cpp index 5e58b3b..351f8b3 100644 --- a/handlers/handlerversion.cpp +++ b/handlers/handlerversion.cpp @@ -1,6 +1,6 @@ #include "handlerversion.h" #include "../version.h" -Response HandlerVersion::handleRequest(const Request &r) +Response HandlerVersion::handleRequest([[maybe_unused]] const Request &r) { Response response; response.setContentType("text/plain"); diff --git a/handlers/handlerversion.h b/handlers/handlerversion.h index 160931c..c6209ae 100644 --- a/handlers/handlerversion.h +++ b/handlers/handlerversion.h @@ -9,7 +9,7 @@ class HandlerVersion : public Handler public: Response handleRequest(const Request &r) override; - bool canAccess(const Permissions &perms) override + bool canAccess([[maybe_unused]] const Permissions &perms) override { return true; } diff --git a/qswiki.cpp b/qswiki.cpp index aa946bf..4e98669 100644 --- a/qswiki.cpp +++ b/qswiki.cpp @@ -43,7 +43,7 @@ SOFTWARE. #include "cliserver.h" #include "version.h" -void sigterm_handler(int arg) +void sigterm_handler([[maybe_unused]] int arg) { // TODO: proper shutdown. exit(EXIT_SUCCESS);