From 6eeadea52f992f08eaace57ff1f1cf9f1b177767 Mon Sep 17 00:00:00 2001 From: zawz Date: Thu, 15 Aug 2019 15:03:17 +0200 Subject: [PATCH] Changed names --- include/{zcolor.hpp => color.hpp} | 8 ++++---- include/{zfiledat.hpp => filedat.hpp} | 8 ++++---- include/{zoptions.hpp => options.hpp} | 8 ++++---- include/{zshell.hpp => shell.hpp} | 8 ++++---- include/{zsocket.hpp => socket.hpp} | 2 +- include/{zthread.hpp => thread.hpp} | 8 ++++---- include/{ztime.hpp => time.hpp} | 8 ++++---- include/{zwait.hpp => wait.hpp} | 8 ++++---- src/{zcolor.cpp => color.cpp} | 2 +- src/{zfiledat.cpp => filedat.cpp} | 2 +- src/{zoptions.cpp => options.cpp} | 2 +- src/{zshell.cpp => shell.cpp} | 2 +- src/{zsocket.cpp => socket.cpp} | 2 +- src/{zthread.cpp => thread.cpp} | 2 +- src/{ztime.cpp => time.cpp} | 2 +- src/{zwait.cpp => wait.cpp} | 2 +- 16 files changed, 37 insertions(+), 37 deletions(-) rename include/{zcolor.hpp => color.hpp} (97%) rename include/{zfiledat.hpp => filedat.hpp} (99%) rename include/{zoptions.hpp => options.hpp} (98%) rename include/{zshell.hpp => shell.hpp} (92%) rename include/{zsocket.hpp => socket.hpp} (99%) rename include/{zthread.hpp => thread.hpp} (88%) rename include/{ztime.hpp => time.hpp} (92%) rename include/{zwait.hpp => wait.hpp} (86%) rename src/{zcolor.cpp => color.cpp} (98%) rename src/{zfiledat.cpp => filedat.cpp} (99%) rename src/{zoptions.cpp => options.cpp} (99%) rename src/{zshell.cpp => shell.cpp} (98%) rename src/{zsocket.cpp => socket.cpp} (99%) rename src/{zthread.cpp => thread.cpp} (94%) rename src/{ztime.cpp => time.cpp} (96%) rename src/{zwait.cpp => wait.cpp} (91%) diff --git a/include/zcolor.hpp b/include/color.hpp similarity index 97% rename from include/zcolor.hpp rename to include/color.hpp index ab7de0e..caa6778 100644 --- a/include/zcolor.hpp +++ b/include/color.hpp @@ -1,5 +1,5 @@ -#ifndef ZCOLOR_HPP -#define ZCOLOR_HPP +#ifndef COLOR_HPP +#define COLOR_HPP #include @@ -19,7 +19,7 @@ //! Number of predefined colors #define COLOR_COUNT 19 -/*! @file zcolor.hpp +/*! @file color.hpp * @brief Color management */ @@ -117,4 +117,4 @@ namespace ztd inline std::ostream& operator<<(std::ostream& st, const color& c) { return st << c.code(); } } -#endif //ZCOLOR_HPP +#endif //COLOR_HPP diff --git a/include/zfiledat.hpp b/include/filedat.hpp similarity index 99% rename from include/zfiledat.hpp rename to include/filedat.hpp index d10eb19..a7d5799 100644 --- a/include/zfiledat.hpp +++ b/include/filedat.hpp @@ -1,5 +1,5 @@ -#ifndef ZFILEDAT_HPP -#define ZFILEDAT_HPP +#ifndef FILEDAT_HPP +#define FILEDAT_HPP #include #include @@ -11,7 +11,7 @@ #include -/*! @file zfiledat.hpp +/*! @file filedat.hpp * @brief Storing and reading data * * Easily organize data in a JSON-like file format @@ -391,4 +391,4 @@ namespace ztd } -#endif //ZFILEDAT_HPP +#endif //FILEDAT_HPP diff --git a/include/zoptions.hpp b/include/options.hpp similarity index 98% rename from include/zoptions.hpp rename to include/options.hpp index e99a013..b27fae3 100644 --- a/include/zoptions.hpp +++ b/include/options.hpp @@ -1,5 +1,5 @@ -#ifndef ZOPTIONS_H -#define ZOPTIONS_H +#ifndef OPTIONS_H +#define OPTIONS_H //DUPLICATES NOT HANDLED: takes last one //NO ORDER: no way to know options order @@ -11,7 +11,7 @@ #include -/*! @file zoptions.hpp +/*! @file options.hpp * @brief CLI option reading and processing * * Easy managing of POSIX/GNU style options @@ -143,4 +143,4 @@ namespace ztd } //ztd -#endif //ZOPTIONS_H +#endif //OPTIONS_H diff --git a/include/zshell.hpp b/include/shell.hpp similarity index 92% rename from include/zshell.hpp rename to include/shell.hpp index 5d1ab2e..9b40448 100644 --- a/include/zshell.hpp +++ b/include/shell.hpp @@ -1,10 +1,10 @@ -#ifndef ZSHELL_HPP -#define ZSHELL_HPP +#ifndef SHELL_HPP +#define SHELL_HPP #include #include -/*! \file zshell.hpp +/*! \file shell.hpp * @brief Shell functionality and interaction */ @@ -39,4 +39,4 @@ namespace ztd // }; } -#endif //ZSHELL_HPP +#endif //SHELL_HPP diff --git a/include/zsocket.hpp b/include/socket.hpp similarity index 99% rename from include/zsocket.hpp rename to include/socket.hpp index 81fd8bd..29f16b7 100644 --- a/include/zsocket.hpp +++ b/include/socket.hpp @@ -13,7 +13,7 @@ #include // std::condition_variable -/*! @file zsocket.hpp +/*! @file socket.hpp * @brief Manage network sockets */ diff --git a/include/zthread.hpp b/include/thread.hpp similarity index 88% rename from include/zthread.hpp rename to include/thread.hpp index 14add7a..58b31c9 100644 --- a/include/zthread.hpp +++ b/include/thread.hpp @@ -1,10 +1,10 @@ -#ifndef ZTHREAD_HPP -#define ZTHREAD_HPP +#ifndef THREAD_HPP +#define THREAD_HPP #include #include -/*! \file zthread.hpp +/*! \file thread.hpp * @brief Thread management */ @@ -37,4 +37,4 @@ namespace ztd } -#endif //ZTHREAD_HPP +#endif //THREAD_HPP diff --git a/include/ztime.hpp b/include/time.hpp similarity index 92% rename from include/ztime.hpp rename to include/time.hpp index b05f6ad..9863e05 100644 --- a/include/ztime.hpp +++ b/include/time.hpp @@ -1,9 +1,9 @@ -#ifndef ZTIME_HPP -#define ZTIME_HPP +#ifndef TIME_HPP +#define TIME_HPP #include -/*! @file ztime.hpp +/*! @file time.hpp * @brief Time measuring and managing */ @@ -50,4 +50,4 @@ namespace ztd } -#endif //ZTIME_HPP +#endif //TIME_HPP diff --git a/include/zwait.hpp b/include/wait.hpp similarity index 86% rename from include/zwait.hpp rename to include/wait.hpp index 866b8d6..82dcf8a 100644 --- a/include/zwait.hpp +++ b/include/wait.hpp @@ -1,10 +1,10 @@ -#ifndef ZWAIT_HPP -#define ZWAIT_HPP +#ifndef WAIT_HPP +#define WAIT_HPP #include // std::mutex, std::unique_lock #include // std::condition_variable -/*! \file zwait.hpp +/*! \file wait.hpp * @brief Thread stalling and waiting */ @@ -30,4 +30,4 @@ namespace ztd }; } -#endif //ZWAIT_HPP +#endif //WAIT_HPP diff --git a/src/zcolor.cpp b/src/color.cpp similarity index 98% rename from src/zcolor.cpp rename to src/color.cpp index 97a761a..5852684 100644 --- a/src/zcolor.cpp +++ b/src/color.cpp @@ -1,4 +1,4 @@ -#include "zcolor.hpp" +#include "color.hpp" const char* ztd::color::color_name_index[COLOR_COUNT] = { "none", diff --git a/src/zfiledat.cpp b/src/filedat.cpp similarity index 99% rename from src/zfiledat.cpp rename to src/filedat.cpp index 463eb7e..e0ac972 100644 --- a/src/zfiledat.cpp +++ b/src/filedat.cpp @@ -1,4 +1,4 @@ -#include "zfiledat.hpp" +#include "filedat.hpp" // Function code bool ztd::filedat::isRead(char in) diff --git a/src/zoptions.cpp b/src/options.cpp similarity index 99% rename from src/zoptions.cpp rename to src/options.cpp index 5293598..6052a3a 100644 --- a/src/zoptions.cpp +++ b/src/options.cpp @@ -1,4 +1,4 @@ -#include "zoptions.hpp" +#include "options.hpp" #include #include diff --git a/src/zshell.cpp b/src/shell.cpp similarity index 98% rename from src/zshell.cpp rename to src/shell.cpp index be0409c..8b2bd31 100644 --- a/src/zshell.cpp +++ b/src/shell.cpp @@ -1,4 +1,4 @@ -#include "zshell.hpp" +#include "shell.hpp" #include #include diff --git a/src/zsocket.cpp b/src/socket.cpp similarity index 99% rename from src/zsocket.cpp rename to src/socket.cpp index e8ca2c5..5c9840c 100644 --- a/src/zsocket.cpp +++ b/src/socket.cpp @@ -1,4 +1,4 @@ -#include "zsocket.hpp" +#include "socket.hpp" #include #include diff --git a/src/zthread.cpp b/src/thread.cpp similarity index 94% rename from src/zthread.cpp rename to src/thread.cpp index a9100fd..af3c0c2 100644 --- a/src/zthread.cpp +++ b/src/thread.cpp @@ -1,4 +1,4 @@ -#include "zthread.hpp" +#include "thread.hpp" ztd::thread_pool::~thread_pool() { diff --git a/src/ztime.cpp b/src/time.cpp similarity index 96% rename from src/ztime.cpp rename to src/time.cpp index acbbef1..12fd2fd 100644 --- a/src/ztime.cpp +++ b/src/time.cpp @@ -1,4 +1,4 @@ -#include "ztime.hpp" +#include "time.hpp" #include diff --git a/src/zwait.cpp b/src/wait.cpp similarity index 91% rename from src/zwait.cpp rename to src/wait.cpp index 1fd85ec..375fed9 100644 --- a/src/zwait.cpp +++ b/src/wait.cpp @@ -1,4 +1,4 @@ -#include "zwait.hpp" +#include "wait.hpp" void ztd::wait_pool::wait() {