From 3d96ea9419b3f6bfcdef9cee486ec1b88f47528d Mon Sep 17 00:00:00 2001
From: "[CST] Bas" <bas@coolstreamtech.com>
Date: Sun, 4 Mar 2012 15:50:56 +0800
Subject: [PATCH] gui: fix compile after include change.

---
 src/gui/Makefile.am                        | 7 ++++---
 src/gui/bedit/Makefile.am                  | 7 ++++---
 src/gui/bedit/bouqueteditor_bouquets.cpp   | 7 +++----
 src/gui/bedit/bouqueteditor_channels.cpp   | 4 ++--
 src/gui/bedit/bouqueteditor_chanselect.cpp | 4 ++--
 src/gui/pluginlist.cpp                     | 3 ++-
 src/gui/plugins.cpp                        | 3 +--
 src/gui/widget/Makefile.am                 | 3 ++-
 8 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 1527aa0d9..0854a655b 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -15,17 +15,18 @@ noinst_HEADERS = svn_version.h
 SUBDIRS = widget bedit
 
 INCLUDES = \
-	-I$(top_srcdir)/daemons \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/zapit/include \
+	-I$(top_srcdir)/daemons \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/libeventserver \
 	-I$(top_srcdir)/lib/libnet \
 	-I$(top_srcdir)/lib/libconfigfile \
 	-I$(top_srcdir)/lib/xmltree \
 	-I$(top_srcdir)/lib/libupnpclient \
 	@CURL_CFLAGS@ \
-	@FREETYPE_CFLAGS@ \
-	-I$(top_srcdir)/lib 
+	@FREETYPE_CFLAGS@
 
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
diff --git a/src/gui/bedit/Makefile.am b/src/gui/bedit/Makefile.am
index b12653cba..13c96305d 100644
--- a/src/gui/bedit/Makefile.am
+++ b/src/gui/bedit/Makefile.am
@@ -1,15 +1,16 @@
 AM_CPPFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
-	-I$(top_srcdir)/daemons \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/daemons \
 	-I$(top_srcdir)/src/zapit/include \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/libeventserver \
 	-I$(top_srcdir)/lib/libconfigfile \
 	-I$(top_srcdir)/lib/libcoolstream \
 	-I$(top_srcdir)/lib/xmltree \
-	@FREETYPE_CFLAGS@ \
-	-I$(top_srcdir)/lib
+	@FREETYPE_CFLAGS@
 
 
 noinst_LIBRARIES = libneutrino_gui_bedit.a
diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp
index f14466807..dfab14c1f 100644
--- a/src/gui/bedit/bouqueteditor_bouquets.cpp
+++ b/src/gui/bedit/bouqueteditor_bouquets.cpp
@@ -33,22 +33,21 @@
 #include <config.h>
 #endif
 
-#include <gui/bedit/bouqueteditor_bouquets.h>
-
 #include <global.h>
 #include <neutrino.h>
 
 #include <driver/fontrenderer.h>
 #include <driver/screen_max.h>
-#include <gui/bedit/bouqueteditor_channels.h>
 #include <gui/widget/buttons.h>
 #include <gui/widget/hintbox.h>
 #include <gui/widget/icons.h>
 #include <gui/widget/messagebox.h>
 #include <gui/widget/stringinput.h>
-
 #include <zapit/client/zapitclient.h>
 #include <zapit/client/zapittools.h>
+
+#include "bouqueteditor_channels.h"
+#include "bouqueteditor_bouquets.h"
 extern CBouquetManager *g_bouquetManager;
 
 CBEBouquetWidget::CBEBouquetWidget()
diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp
index 9c9452fdf..33bc503c0 100644
--- a/src/gui/bedit/bouqueteditor_channels.cpp
+++ b/src/gui/bedit/bouqueteditor_channels.cpp
@@ -37,14 +37,14 @@
 #include <gui/widget/icons.h>
 #include <gui/widget/messagebox.h>
 
-#include <gui/bedit/bouqueteditor_channels.h>
+#include "bouqueteditor_channels.h"
 
 #include <global.h>
 #include <neutrino.h>
 
 #include <driver/fontrenderer.h>
 #include <driver/screen_max.h>
-#include <gui/bedit/bouqueteditor_chanselect.h>
+#include "bouqueteditor_chanselect.h"
 #include <gui/widget/buttons.h>
 #include <gui/widget/icons.h>
 
diff --git a/src/gui/bedit/bouqueteditor_chanselect.cpp b/src/gui/bedit/bouqueteditor_chanselect.cpp
index 7f0bad20f..87d718d17 100644
--- a/src/gui/bedit/bouqueteditor_chanselect.cpp
+++ b/src/gui/bedit/bouqueteditor_chanselect.cpp
@@ -33,8 +33,6 @@
 #include <config.h>
 #endif
 
-#include <gui/bedit/bouqueteditor_chanselect.h>
-
 #include <global.h>
 #include <neutrino.h>
 
@@ -47,6 +45,8 @@
 #include <zapit/zapit.h>
 #include <zapit/getservices.h>
 
+#include "bouqueteditor_chanselect.h"
+
 extern CBouquetManager *g_bouquetManager;
 
 CBEChannelSelectWidget::CBEChannelSelectWidget(const std::string & Caption, unsigned int Bouquet, CZapitClient::channelsMode Mode)
diff --git a/src/gui/pluginlist.cpp b/src/gui/pluginlist.cpp
index da3ea9124..862888241 100644
--- a/src/gui/pluginlist.cpp
+++ b/src/gui/pluginlist.cpp
@@ -52,13 +52,14 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <plugins.h>
 #include <driver/encoding.h>
 #include <driver/screen_max.h>
 #include <driver/fade.h>
 
 #include <zapit/client/zapittools.h>
 
+#include "plugins.h"
+
 /* for alexW images with old drivers:
  * #define USE_VBI_INTERFACE 1
  */
diff --git a/src/gui/plugins.cpp b/src/gui/plugins.cpp
index 427fef33a..f190c620b 100644
--- a/src/gui/plugins.cpp
+++ b/src/gui/plugins.cpp
@@ -33,8 +33,6 @@
 #include <config.h>
 #endif
 
-#include <gui/plugins.h>
-
 #include <sstream>
 #include <fstream>
 #include <iostream>
@@ -52,6 +50,7 @@
 
 #include <zapit/client/zapittools.h>
 
+#include "plugins.h"
 /* for alexW images with old drivers:
  * #define USE_VBI_INTERFACE 1
  */
diff --git a/src/gui/widget/Makefile.am b/src/gui/widget/Makefile.am
index 8d92eb76c..956821205 100644
--- a/src/gui/widget/Makefile.am
+++ b/src/gui/widget/Makefile.am
@@ -1,9 +1,10 @@
 AM_CPPFLAGS = -fno-rtti -fno-exceptions
 
 INCLUDES = \
-	-I$(top_srcdir)/lib \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/zapit/include \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/libnet \
 	-I$(top_srcdir)/lib/libconfigfile \
 	@FREETYPE_CFLAGS@