From f7b1d75bab44d4f3918e4befb60cf0a42e0c24ea Mon Sep 17 00:00:00 2001 From: TolaMironcenko Date: Sun, 15 Dec 2024 02:37:29 +0700 Subject: [PATCH] src is includedir --- CMakeLists.txt | 2 +- src/OpenRouter/OpenRouter.cpp | 8 ++++---- src/auth/auth.cpp | 6 +++--- src/openrouter.cpp | 2 +- src/security/cors.cpp | 2 +- src/settings/dns/enabled.cpp | 8 ++++---- src/settings/dns/local_domains.cpp | 8 ++++---- src/settings/dns/servers.cpp | 8 ++++---- src/settings/ftp/ftp.cpp | 8 ++++---- src/settings/settings.hpp | 10 +++++----- src/settings/ssh/keys.cpp | 8 ++++---- src/settings/ssh/port.cpp | 8 ++++---- src/settings/ssh/status.cpp | 8 ++++---- src/settings/telnet/enabled.cpp | 8 ++++---- src/settings/telnet/port.cpp | 8 ++++---- src/settings/wifi/channel.cpp | 8 ++++---- src/settings/wifi/name.cpp | 8 ++++---- src/settings/wifi/password.cpp | 8 ++++---- src/settings/wifi/qr.cpp | 8 ++++---- src/settings/wifi/status.cpp | 8 ++++---- src/system/reboot/reboot.cpp | 6 +++--- src/system/syslog/syslog.cpp | 4 ++-- src/system/system.hpp | 6 +++--- src/system/uptime/uptime.cpp | 4 ++-- 24 files changed, 81 insertions(+), 81 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 59291c0..44d9782 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 2.6) project(openrouter) set(CMAKE_CXX_STANDARD 20) -include_directories(./src/libs/) +include_directories(./src/libs/ ./src) add_executable( openrouter diff --git a/src/OpenRouter/OpenRouter.cpp b/src/OpenRouter/OpenRouter.cpp index 6c8c625..37063a3 100644 --- a/src/OpenRouter/OpenRouter.cpp +++ b/src/OpenRouter/OpenRouter.cpp @@ -1,9 +1,9 @@ -#include "OpenRouter.hpp" +#include #include -#include "../settings/settings.hpp" -#include "../system/system.hpp" +#include +#include #include -#include "../security/cors.hpp" +#include OpenRouter::OpenRouter() { diff --git a/src/auth/auth.cpp b/src/auth/auth.cpp index d57408d..b8bcb56 100644 --- a/src/auth/auth.cpp +++ b/src/auth/auth.cpp @@ -1,9 +1,9 @@ -#include "auth.hpp" +#include #include #include -#include "../routes.hpp" +#include #include -#include "../types.hpp" +#include bool authenticate(const std::string &token) { diff --git a/src/openrouter.cpp b/src/openrouter.cpp index 7f2530b..8bbc1c0 100644 --- a/src/openrouter.cpp +++ b/src/openrouter.cpp @@ -1,4 +1,4 @@ -#include "OpenRouter/OpenRouter.hpp" +#include int main() { diff --git a/src/security/cors.cpp b/src/security/cors.cpp index 0c9b0ca..e439393 100755 --- a/src/security/cors.cpp +++ b/src/security/cors.cpp @@ -1,4 +1,4 @@ -#include "cors.hpp" +#include #include namespace api diff --git a/src/settings/dns/enabled.cpp b/src/settings/dns/enabled.cpp index 6434629..50fa7a3 100644 --- a/src/settings/dns/enabled.cpp +++ b/src/settings/dns/enabled.cpp @@ -1,10 +1,10 @@ -#include "dns.hpp" +#include #include #include -#include "../../types.hpp" +#include #include -#include "../../auth/auth.hpp" -#include "../../helpers.hpp" +#include +#include #define DNS_REQUIRED_STRING R"({"required":"[token,enabled]"})" diff --git a/src/settings/dns/local_domains.cpp b/src/settings/dns/local_domains.cpp index b1286fd..8a86c65 100644 --- a/src/settings/dns/local_domains.cpp +++ b/src/settings/dns/local_domains.cpp @@ -1,10 +1,10 @@ -#include "dns.hpp" +#include #include #include -#include "../../types.hpp" +#include #include -#include "../../auth/auth.hpp" -#include "../../helpers.hpp" +#include +#include namespace api { diff --git a/src/settings/dns/servers.cpp b/src/settings/dns/servers.cpp index b014224..d356fa3 100644 --- a/src/settings/dns/servers.cpp +++ b/src/settings/dns/servers.cpp @@ -1,10 +1,10 @@ -#include "dns.hpp" +#include #include #include -#include "../../types.hpp" +#include #include -#include "../../auth/auth.hpp" -#include "../../helpers.hpp" +#include +#include namespace api { diff --git a/src/settings/ftp/ftp.cpp b/src/settings/ftp/ftp.cpp index ec5b408..4733a2e 100644 --- a/src/settings/ftp/ftp.cpp +++ b/src/settings/ftp/ftp.cpp @@ -1,10 +1,10 @@ -#include "ftp.hpp" +#include #include #include -#include "../../types.hpp" +#include #include -#include "../../auth/auth.hpp" -#include "../../helpers.hpp" +#include +#include #define FTP_REQUIRED_STRING R"({"required":"[token,enabled]"})" diff --git a/src/settings/settings.hpp b/src/settings/settings.hpp index fe0c231..0e5b26c 100644 --- a/src/settings/settings.hpp +++ b/src/settings/settings.hpp @@ -1,10 +1,10 @@ #ifndef SETTINGS_HPP #define SETTINGS_HPP -#include "wifi/wifi.hpp" -#include "telnet/telnet.hpp" -#include "ssh/ssh.hpp" -#include "ftp/ftp.hpp" -#include "dns/dns.hpp" +#include +#include +#include +#include +#include #endif // SETTINGS_HPP \ No newline at end of file diff --git a/src/settings/ssh/keys.cpp b/src/settings/ssh/keys.cpp index 68d9896..3724f76 100644 --- a/src/settings/ssh/keys.cpp +++ b/src/settings/ssh/keys.cpp @@ -1,10 +1,10 @@ -#include "ssh.hpp" +#include #include #include -#include "../../types.hpp" +#include #include -#include "../../auth/auth.hpp" -#include "../../helpers.hpp" +#include +#include #define KEYS_PATH "/root/.ssh/authorized_keys" diff --git a/src/settings/ssh/port.cpp b/src/settings/ssh/port.cpp index f832736..b8c7a93 100644 --- a/src/settings/ssh/port.cpp +++ b/src/settings/ssh/port.cpp @@ -1,14 +1,14 @@ -#include "ssh.hpp" +#include #include -#include "../../types.hpp" +#include #include #include #include #include #include #include -#include "../../auth/auth.hpp" -#include "../../helpers.hpp" +#include +#include #define SSH_PORT_REQUIRED_STRING R"({"required":"[token,port]"})" #define SSH_PORT_PATH "/etc/openrouter/ssh/port" diff --git a/src/settings/ssh/status.cpp b/src/settings/ssh/status.cpp index bef3970..a54a71a 100644 --- a/src/settings/ssh/status.cpp +++ b/src/settings/ssh/status.cpp @@ -1,10 +1,10 @@ -#include "ssh.hpp" +#include #include #include -#include "../../types.hpp" +#include #include -#include "../../auth/auth.hpp" -#include "../../helpers.hpp" +#include +#include #define SSH_REQUIRED_STRING R"({"required":"[token,status]"})" diff --git a/src/settings/telnet/enabled.cpp b/src/settings/telnet/enabled.cpp index 880bd75..94a48f5 100644 --- a/src/settings/telnet/enabled.cpp +++ b/src/settings/telnet/enabled.cpp @@ -1,14 +1,14 @@ -#include "telnet.hpp" +#include #include -#include "../../types.hpp" +#include #include #include #include #include #include #include -#include "../../auth/auth.hpp" -#include "../../helpers.hpp" +#include +#include #define TELNET_REQUIRED_STRING R"({"required":"[token,enabled]"})" diff --git a/src/settings/telnet/port.cpp b/src/settings/telnet/port.cpp index c0b0364..06c1516 100644 --- a/src/settings/telnet/port.cpp +++ b/src/settings/telnet/port.cpp @@ -1,14 +1,14 @@ -#include "telnet.hpp" +#include #include -#include "../../types.hpp" +#include #include #include #include #include #include #include -#include "../../auth/auth.hpp" -#include "../../helpers.hpp" +#include +#include #define TELNET_PORT_REQUIRED_STRING R"({"required":"[token,port]"})" diff --git a/src/settings/wifi/channel.cpp b/src/settings/wifi/channel.cpp index 172da2c..04cd10b 100644 --- a/src/settings/wifi/channel.cpp +++ b/src/settings/wifi/channel.cpp @@ -1,14 +1,14 @@ -#include "wifi.hpp" +#include #include -#include "../../types.hpp" +#include #include #include #include #include #include #include -#include "../../auth/auth.hpp" -#include "../../helpers.hpp" +#include +#include #define WIFI_CHANNEL_REQUIRED_STRING R"({"required":"[token,channel]"})" diff --git a/src/settings/wifi/name.cpp b/src/settings/wifi/name.cpp index 77d03f4..17299ad 100644 --- a/src/settings/wifi/name.cpp +++ b/src/settings/wifi/name.cpp @@ -1,14 +1,14 @@ -#include "wifi.hpp" +#include #include -#include "../../types.hpp" +#include #include #include #include #include #include #include -#include "../../auth/auth.hpp" -#include "../../helpers.hpp" +#include +#include #define WIFI_NAME_REQUIRED_STRING R"({"required":"[token,name]"})" diff --git a/src/settings/wifi/password.cpp b/src/settings/wifi/password.cpp index 214cc70..6ece31b 100644 --- a/src/settings/wifi/password.cpp +++ b/src/settings/wifi/password.cpp @@ -1,14 +1,14 @@ -#include "wifi.hpp" +#include #include -#include "../../types.hpp" +#include #include #include #include #include #include #include -#include "../../auth/auth.hpp" -#include "../../helpers.hpp" +#include +#include #define WIFI_PASSWORD_REQUIRED_STRING R"({"required":"[token,password,newpassword]"})" diff --git a/src/settings/wifi/qr.cpp b/src/settings/wifi/qr.cpp index c61413e..828bfe9 100644 --- a/src/settings/wifi/qr.cpp +++ b/src/settings/wifi/qr.cpp @@ -1,11 +1,11 @@ -#include "wifi.hpp" +#include #include #include -#include "../../types.hpp" +#include #include #include -#include "../../auth/auth.hpp" -#include "../../helpers.hpp" +#include +#include namespace api { diff --git a/src/settings/wifi/status.cpp b/src/settings/wifi/status.cpp index 4f0d6cb..17c1797 100644 --- a/src/settings/wifi/status.cpp +++ b/src/settings/wifi/status.cpp @@ -1,10 +1,10 @@ -#include "wifi.hpp" +#include #include #include -#include "../../types.hpp" +#include #include -#include "../../auth/auth.hpp" -#include "../../helpers.hpp" +#include +#include #define WIFI_REQUIRED_STRING R"({"required":"[token,status]"})" diff --git a/src/system/reboot/reboot.cpp b/src/system/reboot/reboot.cpp index 1ec887d..c8eec78 100644 --- a/src/system/reboot/reboot.cpp +++ b/src/system/reboot/reboot.cpp @@ -1,8 +1,8 @@ -#include "reboot.hpp" +#include #include #include -#include "../types.hpp" -#include "../../auth/auth.hpp" +#include +#include namespace api { diff --git a/src/system/syslog/syslog.cpp b/src/system/syslog/syslog.cpp index 6dd006a..03c41fa 100644 --- a/src/system/syslog/syslog.cpp +++ b/src/system/syslog/syslog.cpp @@ -1,5 +1,5 @@ -#include "syslog.hpp" -#include "../types.hpp" +#include +#include #include #include #include diff --git a/src/system/system.hpp b/src/system/system.hpp index cc8c7e4..e8024f0 100644 --- a/src/system/system.hpp +++ b/src/system/system.hpp @@ -2,9 +2,9 @@ #define SYSTEM_HPP #ifdef __linux__ -#include "uptime/uptime.hpp" +#include #endif // __linux__ -#include "syslog/syslog.hpp" -#include "reboot/reboot.hpp" +#include +#include #endif // SYSTEM_HPP \ No newline at end of file diff --git a/src/system/uptime/uptime.cpp b/src/system/uptime/uptime.cpp index ee0a5c6..32f645e 100644 --- a/src/system/uptime/uptime.cpp +++ b/src/system/uptime/uptime.cpp @@ -1,9 +1,9 @@ -#include "uptime.hpp" +#include #ifdef __linux__ #include #endif // __linux__ #include -#include "../types.hpp" +#include namespace api {