TextInput: cleanup unneeded includes in header file

(bzr r3844.10.17)

2 files changed, 26 insertions, 23 deletions

diff --git a/unity-shared/TextInput.cpp b/unity-shared/TextInput.cpp
index 23a4e3196..c73adc543 100644
--- a/unity-shared/TextInput.cpp
+++ b/unity-shared/TextInput.cpp
@@ -17,11 +17,24 @@
 * Authored by: Manuel de la Pena <manuel.delapena@canonical.com>
 */
 
+#include "config.h"
 #include "TextInput.h"
-#include "unity-shared/IconTexture.h"
-#include "unity-shared/DashStyle.h"
-#include "unity-shared/RawPixel.h"
-#include "unity-shared/PreviewStyle.h"
+
+#include <gtk/gtk.h>
+#include <glib/gi18n-lib.h>
+
+#include <Nux/LayeredLayout.h>
+#include <Nux/HLayout.h>
+#include <Nux/VLayout.h>
+#include <NuxCore/Logger.h>
+
+#include "CairoTexture.h"
+#include "StaticCairoText.h"
+#include "IconTexture.h"
+#include "IMTextEntry.h"
+#include "DashStyle.h"
+#include "PreviewStyle.h"
+#include "RawPixel.h"
 
 #include <X11/XKBlib.h>
 
diff --git a/unity-shared/TextInput.h b/unity-shared/TextInput.h
index 1e708511e..5a312ccc3 100644
--- a/unity-shared/TextInput.h
+++ b/unity-shared/TextInput.h
@@ -20,36 +20,26 @@
 #ifndef TEXTINPUT_H
 #define TEXTINPUT_H
 
-#include "config.h"
-
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
 #include <Nux/Nux.h>
-#include <Nux/HLayout.h>
-#include <Nux/LayeredLayout.h>
-#include <Nux/VLayout.h>
-#include <Nux/TextEntry.h>
-#include <NuxCore/Logger.h>
-#include <NuxCore/Property.h>
 #include <UnityCore/GLibSignal.h>
-#include <UnityCore/GLibSource.h>
 
-#include "CairoTexture.h"
-#include "unity-shared/IconTexture.h"
-#include "unity-shared/IMTextEntry.h"
-#include "unity-shared/Introspectable.h"
-#include "unity-shared/SearchBarSpinner.h"
-#include "unity-shared/StaticCairoText.h"
+#include "Introspectable.h"
+#include "IMTextEntry.h"
+#include "SearchBarSpinner.h"
 
 namespace nux
 {
 class AbstractPaintLayer;
+class LayeredLayout;
 class LinearLayout;
+class HLayout;
 }
 
 namespace unity
 {
+class IconTexture;
+class StaticCairoText;
+class SearchBarSpinner;
 
 class TextInput : public unity::debug::Introspectable, public nux::View
 {
@@ -75,7 +65,7 @@ public:
 nux::Property<bool> show_caps_lock;
 
 private:
- void OnFontChanged(GtkSettings* settings, GParamSpec* pspec=NULL);
+ void OnFontChanged();
 void UpdateHintFont();
 void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
 void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);