global.h: formatting code

Origin commit data
------------------
Branch: ni/coolstream
Commit: 4f18a6942d
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-07-05 (Mon, 05 Jul 2021)

Origin message was:
------------------
- global.h: formatting code

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2021-07-05 22:39:39 +02:00
parent a5a5026f25
commit 1f8083df75

View File

@@ -1,5 +1,3 @@
#ifndef __neutrino_global_h__
#define __neutrino_global_h__
/* /*
Neutrino-GUI - DBoxII-Project Neutrino-GUI - DBoxII-Project
@@ -19,14 +17,16 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program. If not, see <http://www.gnu.org/licenses/>.
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#ifndef __neutrino_global_h__
#define __neutrino_global_h__
#include <system/settings.h> #include <system/settings.h>
#ifndef NEUTRINO_CPP #ifndef NEUTRINO_CPP
#define NEUTRINO_CPP extern #define NEUTRINO_CPP extern
#endif #endif
#define IMAGE_VERSION_FILE "/.version" #define IMAGE_VERSION_FILE "/.version"
@@ -56,17 +56,6 @@
NEUTRINO_CPP SNeutrinoSettings g_settings; NEUTRINO_CPP SNeutrinoSettings g_settings;
NEUTRINO_CPP SglobalInfo g_info; NEUTRINO_CPP SglobalInfo g_info;
#ifdef HAVE_CONTROLD
class CControldClient;
NEUTRINO_CPP CControldClient *g_Controld;
#endif
class CZapitClient;
NEUTRINO_CPP CZapitClient *g_Zapit;
class CSectionsdClient;
NEUTRINO_CPP CSectionsdClient *g_Sectionsd;
class CTimerdClient;
NEUTRINO_CPP CTimerdClient *g_Timerd;
class FBFontRenderClass; class FBFontRenderClass;
NEUTRINO_CPP FBFontRenderClass *g_fontRenderer; NEUTRINO_CPP FBFontRenderClass *g_fontRenderer;
NEUTRINO_CPP FBFontRenderClass *g_fixedFontRenderer; NEUTRINO_CPP FBFontRenderClass *g_fixedFontRenderer;
@@ -74,27 +63,46 @@ NEUTRINO_CPP FBFontRenderClass *g_dynFontRenderer;
NEUTRINO_CPP FBFontRenderClass *g_shellFontRenderer; NEUTRINO_CPP FBFontRenderClass *g_shellFontRenderer;
class Font; class Font;
NEUTRINO_CPP Font * g_Font[SNeutrinoSettings::FONT_TYPE_COUNT]; NEUTRINO_CPP Font *g_Font[SNeutrinoSettings::FONT_TYPE_COUNT];
NEUTRINO_CPP Font * g_FixedFont[SNeutrinoSettings::FONT_TYPE_FIXED_COUNT]; NEUTRINO_CPP Font *g_FixedFont[SNeutrinoSettings::FONT_TYPE_FIXED_COUNT];
NEUTRINO_CPP Font * g_SignalFont; NEUTRINO_CPP Font *g_SignalFont;
NEUTRINO_CPP Font * g_ShellFont; NEUTRINO_CPP Font *g_ShellFont;
#ifdef HAVE_CONTROLD
class CControldClient;
NEUTRINO_CPP CControldClient *g_Controld;
#endif
class CZapitClient;
NEUTRINO_CPP CZapitClient *g_Zapit;
class CSectionsdClient;
NEUTRINO_CPP CSectionsdClient *g_Sectionsd;
class CTimerdClient;
NEUTRINO_CPP CTimerdClient *g_Timerd;
class CRCInput; class CRCInput;
NEUTRINO_CPP CRCInput *g_RCInput; NEUTRINO_CPP CRCInput *g_RCInput;
class CEpgData; class CEpgData;
NEUTRINO_CPP CEpgData *g_EpgData; NEUTRINO_CPP CEpgData *g_EpgData;
class CInfoViewer; class CInfoViewer;
NEUTRINO_CPP CInfoViewer *g_InfoViewer; NEUTRINO_CPP CInfoViewer *g_InfoViewer;
class CEventList; class CEventList;
NEUTRINO_CPP CEventList *g_EventList; NEUTRINO_CPP CEventList *g_EventList;
class CLocaleManager; class CLocaleManager;
NEUTRINO_CPP CLocaleManager *g_Locale; NEUTRINO_CPP CLocaleManager *g_Locale;
class CVideoSettings; class CVideoSettings;
NEUTRINO_CPP CVideoSettings *g_videoSettings; NEUTRINO_CPP CVideoSettings *g_videoSettings;
class CRadioText; class CRadioText;
NEUTRINO_CPP CRadioText *g_Radiotext; NEUTRINO_CPP CRadioText *g_Radiotext;
class CRadioTextGUI; class CRadioTextGUI;
NEUTRINO_CPP CRadioTextGUI *g_RadiotextWin; NEUTRINO_CPP CRadioTextGUI *g_RadiotextWin;