[libvtemm] Tweaked includes, so only needed parts of gtkmm are included.



commit 1906a663c09384b1f463e3e8057a3201c66a4ca1
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Fri Aug 21 20:39:01 2009 +0200

    Tweaked includes, so only needed parts of gtkmm are included.
    
    * libvte/libvtemm.h:
    * libvte/libvtemm/shared.h: Separated non-libvtemm includes from
    libvtemm ones. That's pretty fancy description for adding just
    a newline.
    * libvte/libvtemm/init.cc:
    * libvte/libvtemm/match.h:
    * libvte/src/charattributes.hg:
    * libvte/src/terminal.hg: Changed includes from general to specific
    ones.

 libvte/libvtemm.h            |    1 +
 libvte/libvtemm/init.cc      |    2 +-
 libvte/libvtemm/match.h      |    3 ++-
 libvte/libvtemm/shared.h     |    1 +
 libvte/src/charattributes.hg |    5 ++---
 libvte/src/terminal.hg       |   14 +++++++++-----
 6 files changed, 16 insertions(+), 10 deletions(-)
---
diff --git a/libvte/libvtemm.h b/libvte/libvtemm.h
index 7ab7990..b358de8 100644
--- a/libvte/libvtemm.h
+++ b/libvte/libvtemm.h
@@ -22,6 +22,7 @@
 #define _LIBVTEMM_H_
 
 #include <gtkmm.h>
+
 #include <libvtemm/charattributes.h>
 #include <libvtemm/cursorposition.h>
 #include <libvtemm/init.h>
diff --git a/libvte/libvtemm/init.cc b/libvte/libvtemm/init.cc
index 100f4eb..411bbd5 100644
--- a/libvte/libvtemm/init.cc
+++ b/libvte/libvtemm/init.cc
@@ -20,7 +20,7 @@
 
 #include <libvtemm/init.h>
 #include <libvtemm/wrap_init.h>
-#include <gtkmm.h>
+#include <gtkmm/main.h>
 
 namespace Gnome
 {
diff --git a/libvte/libvtemm/match.h b/libvte/libvtemm/match.h
index 2bebd7b..e76ec92 100644
--- a/libvte/libvtemm/match.h
+++ b/libvte/libvtemm/match.h
@@ -21,7 +21,8 @@
 #ifndef _LIBVTEMM_MATCH_H_
 #define _LIBVTEMM_MATCH_H_
 
-#include <glibmm.h>
+#include <glibmm/regex.h>
+#include <glibmm/ustring.h>
 
 namespace Gnome
 {
diff --git a/libvte/libvtemm/shared.h b/libvte/libvtemm/shared.h
index b215c3d..5626775 100644
--- a/libvte/libvtemm/shared.h
+++ b/libvte/libvtemm/shared.h
@@ -22,6 +22,7 @@
 #define _LIBVTEMM_SHARED_H_
 
 #include <glibmm/arrayhandle.h>
+
 #include <string>
 
 namespace Gnome
diff --git a/libvte/src/charattributes.hg b/libvte/src/charattributes.hg
index 005b257..6590812 100644
--- a/libvte/src/charattributes.hg
+++ b/libvte/src/charattributes.hg
@@ -20,9 +20,8 @@
 
 _DEFS(libvtemm,libvte)
 
-#include <gdkmm.h>
-// only in vte/vte.h is a declaration of VteCharAttributes.
-// extern VteCharAttributes?
+#include <gdkmm/color.h>
+/* for VteCharAttributes - needed in CharAttributesTraits. */
 #include <vte/vte.h>
 
 namespace Gnome
diff --git a/libvte/src/terminal.hg b/libvte/src/terminal.hg
index 2efd384..f407f3e 100644
--- a/libvte/src/terminal.hg
+++ b/libvte/src/terminal.hg
@@ -23,16 +23,20 @@ _CONFIGINCLUDE(libvtemmconfig.h)
 _DEFS(libvtemm,libvte)
 _PINCLUDE(gtkmm/private/widget_p.h)
 
-#include <gdkmm.h>
-#include <glibmm.h>
-#include <gtkmm.h>
+#include <sigc++/slot.h>
+#include <gdkmm/color.h>
+#include <gdkmm/pixbuf.h>
+#include <gdkmm/cursor.h>
+#include <pangomm/fontdescription.h>
+#include <gtkmm/widget.h>
+#include <gtkmm/menushell.h>
+#include <gtkmm/adjustment.h>
 #include <libvtemm/cursorposition.h>
 #include <libvtemm/match.h>
 #include <libvtemm/padding.h>
 #include <libvtemm/shared.h>
 #include <libvtemm/textandcharattrs.h>
-#include <pangomm.h>
-#include <sigc++/sigc++.h>
+
 #include <string>
 
 namespace Gnome



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]