From 5cc48eb30a87904931cfcbe0eee942bb1a45799c Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 12 Feb 2017 14:09:40 +0100 Subject: [PATCH] cc: reduce impact of cc_draw header from 161 to 4 files Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/58c6dbf4694fd3e8fa8c1d03c052a4207491ba51 Author: Stefan Seyfried Date: 2017-02-12 (Sun, 12 Feb 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/components/cc_draw.cpp | 3 ++- src/gui/components/cc_draw.h | 2 +- src/gui/components/cc_frm_clock.cpp | 1 + src/gui/components/cc_frm_clock.h | 2 +- src/gui/widget/hintbox.cpp | 1 + 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gui/components/cc_draw.cpp b/src/gui/components/cc_draw.cpp index b9035e8db..cedebc332 100644 --- a/src/gui/components/cc_draw.cpp +++ b/src/gui/components/cc_draw.cpp @@ -25,6 +25,7 @@ #include #include #include "cc_draw.h" +#include "cc_timer.h" #include #include @@ -794,4 +795,4 @@ bool CCDraw::cancelBlink(bool keep_on_screen) return res; -} \ No newline at end of file +} diff --git a/src/gui/components/cc_draw.h b/src/gui/components/cc_draw.h index a144433ec..50be8a71d 100644 --- a/src/gui/components/cc_draw.h +++ b/src/gui/components/cc_draw.h @@ -27,7 +27,6 @@ #include "cc_types.h" #include "cc_signals.h" -#include "cc_timer.h" #include #include #include @@ -38,6 +37,7 @@ Basic paint attributes and member functions for component classes */ +class CComponentsTimer; class CCDraw : public COSDFader, public CComponentsSignals { protected: diff --git a/src/gui/components/cc_frm_clock.cpp b/src/gui/components/cc_frm_clock.cpp index b52180456..531c1af89 100644 --- a/src/gui/components/cc_frm_clock.cpp +++ b/src/gui/components/cc_frm_clock.cpp @@ -29,6 +29,7 @@ #include #include "cc_frm_clock.h" +#include "cc_timer.h" #include #include diff --git a/src/gui/components/cc_frm_clock.h b/src/gui/components/cc_frm_clock.h index 22da0af26..23eb726ce 100644 --- a/src/gui/components/cc_frm_clock.h +++ b/src/gui/components/cc_frm_clock.h @@ -34,13 +34,13 @@ #include #include "cc_base.h" #include "cc_frm.h" -#include "cc_timer.h" #include "cc_text_screen.h" //! Sub class of CComponents. Show clock with digits on screen. /*! Usable as simple fixed display or as ticking clock. */ +class CComponentsTimer; class CComponentsFrmClock : public CComponentsForm, public CCTextScreen { private: diff --git a/src/gui/widget/hintbox.cpp b/src/gui/widget/hintbox.cpp index 9e367f4d2..4b61201ce 100644 --- a/src/gui/widget/hintbox.cpp +++ b/src/gui/widget/hintbox.cpp @@ -34,6 +34,7 @@ #include #include #include "hintbox.h" +#include #include #include