diff --git a/libs/console/piscreendrawer.cpp b/libs/console/piscreendrawer.cpp index 43ed6a40..18d65d44 100644 --- a/libs/console/piscreendrawer.cpp +++ b/libs/console/piscreendrawer.cpp @@ -19,8 +19,6 @@ #include "piscreendrawer.h" - - // comment for use ascii instead of unicode symbols # define USE_UNICODE @@ -266,5 +264,3 @@ void PIScreenDrawer::drawText(int x, int y, const PIString & s, Color col_char, } } } - - diff --git a/libs/console/piscreentile.cpp b/libs/console/piscreentile.cpp index f5221b52..0a4561d8 100644 --- a/libs/console/piscreentile.cpp +++ b/libs/console/piscreentile.cpp @@ -22,8 +22,6 @@ #include "piscreendrawer.h" - - using namespace PIScreenTypes; @@ -257,5 +255,3 @@ void PIScreenTile::layout() { t->layout(); } } - - diff --git a/libs/console/piscreentiles.cpp b/libs/console/piscreentiles.cpp index 36d42443..afa10207 100644 --- a/libs/console/piscreentiles.cpp +++ b/libs/console/piscreentiles.cpp @@ -22,8 +22,6 @@ #include "piscreendrawer.h" - - using namespace PIScreenTypes; @@ -694,5 +692,3 @@ void TileInput::reserCursor() { tm_blink.reset(); inv = false; } - - diff --git a/libs/main/console/piscreen.h b/libs/main/console/piscreen.h index 5c84b463..f55a7a6c 100644 --- a/libs/main/console/piscreen.h +++ b/libs/main/console/piscreen.h @@ -34,7 +34,6 @@ //! \~\brief //! \~english Console screen manager with tile layout, drawing, and input routing. //! \~russian Менеджер консольного экрана с раскладкой тайлов, отрисовкой и маршрутизацией ввода. - class PIP_CONSOLE_EXPORT PIScreen : public PIThread , public PIScreenTypes::PIScreenBase { diff --git a/libs/main/console/piscreendrawer.h b/libs/main/console/piscreendrawer.h index ce607b8a..c5c14c44 100644 --- a/libs/main/console/piscreendrawer.h +++ b/libs/main/console/piscreendrawer.h @@ -25,7 +25,6 @@ #ifndef PISCREENDRAWER_H #define PISCREENDRAWER_H - #include "pip_console_export.h" #include "piscreentypes.h" #include "pistring.h" @@ -147,5 +146,4 @@ private: }; - #endif // PISCREENDRAWER_H diff --git a/libs/main/console/piscreentile.h b/libs/main/console/piscreentile.h index c28f59a2..235fb809 100644 --- a/libs/main/console/piscreentile.h +++ b/libs/main/console/piscreentile.h @@ -38,7 +38,6 @@ class PIScreenDrawer; //! \details //! \~english Base class for all screen tiles providing layout and event handling. //! \~russian Базовый класс для всех экранных тайлов, обеспечивающий компоновку и обработку событий. - class PIP_CONSOLE_EXPORT PIScreenTile: public PIObject { friend class PIScreen; PIOBJECT_SUBCLASS(PIScreenTile, PIObject); diff --git a/libs/main/console/piscreentiles.h b/libs/main/console/piscreentiles.h index 21672030..2bc31f8d 100644 --- a/libs/main/console/piscreentiles.h +++ b/libs/main/console/piscreentiles.h @@ -28,7 +28,6 @@ #ifndef PISCREENTILES_H #define PISCREENTILES_H - #include "pip_console_export.h" #include "piscreentile.h" @@ -445,5 +444,4 @@ protected: }; - #endif // PISCREENTILES_H diff --git a/libs/main/console/piscreentypes.h b/libs/main/console/piscreentypes.h index e27feb85..15c94fc7 100644 --- a/libs/main/console/piscreentypes.h +++ b/libs/main/console/piscreentypes.h @@ -28,7 +28,6 @@ #ifndef PISCREENTYPES_H #define PISCREENTYPES_H - #include "pip_console_export.h" #include "pivariant.h" #include "pivariantsimple.h" @@ -285,5 +284,4 @@ BINARY_STREAM_READ(PIScreenTypes::TileEvent) { REGISTER_PIVARIANTSIMPLE(PIScreenTypes::TileEvent) - #endif // PISCREENTYPES_H diff --git a/libs/main/console/piterminal.h b/libs/main/console/piterminal.h index 7fcb3aac..71aec0ca 100644 --- a/libs/main/console/piterminal.h +++ b/libs/main/console/piterminal.h @@ -25,7 +25,6 @@ #ifndef PITERMINAL_H #define PITERMINAL_H - #include "pikbdlistener.h" #include "pip_console_export.h" #include "piscreentypes.h" @@ -115,5 +114,4 @@ private: }; - #endif // PITERMINAL_H diff --git a/libs/main/core/piobject.h b/libs/main/core/piobject.h index efdd5d47..2c5c5979 100644 --- a/libs/main/core/piobject.h +++ b/libs/main/core/piobject.h @@ -834,7 +834,6 @@ private: PIVector<__QueuedEvent> events_queue; PIObject * emitter_; std::atomic_int in_event_cnt; - PIMutex mutex_, mutex_connect, mutex_queue; bool thread_safe_ = false, proc_event_queue = false; }; diff --git a/libs/main/io_devices/piethernet.h b/libs/main/io_devices/piethernet.h index ad55a0d7..1cdf3a8b 100644 --- a/libs/main/io_devices/piethernet.h +++ b/libs/main/io_devices/piethernet.h @@ -25,7 +25,6 @@ #ifndef PIETHERNET_H #define PIETHERNET_H - #include "piiodevice.h" #include "pinetworkaddress.h"