[gtk+] Clean up includes in gtk/deprecated/
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Clean up includes in gtk/deprecated/
- Date: Sat, 20 Jul 2013 02:49:44 +0000 (UTC)
commit b49f966e1f327135b5e02f9bdc3d0488121821b8
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Jul 19 22:48:12 2013 -0400
Clean up includes in gtk/deprecated/
Purely cosmetic.
gtk/deprecated/gtkaction.c | 2 +-
gtk/deprecated/gtkactivatable.c | 2 ++
gtk/deprecated/gtkcolorseldialog.c | 1 -
gtk/deprecated/gtkfontsel.c | 3 ---
gtk/deprecated/gtkgradient.c | 1 -
gtk/deprecated/gtkiconfactory.c | 2 +-
gtk/deprecated/gtkuimanager.c | 2 +-
7 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/gtk/deprecated/gtkaction.c b/gtk/deprecated/gtkaction.c
index 1aaddf0..af8bb1e 100644
--- a/gtk/deprecated/gtkaction.c
+++ b/gtk/deprecated/gtkaction.c
@@ -86,7 +86,7 @@
#include "gtkmarshalers.h"
#include "gtkmenuitem.h"
#include "gtkstock.h"
-#include "deprecated/gtktearoffmenuitem.h"
+#include "gtktearoffmenuitem.h"
#include "gtktoolbutton.h"
#include "gtktoolbar.h"
#include "gtkprivate.h"
diff --git a/gtk/deprecated/gtkactivatable.c b/gtk/deprecated/gtkactivatable.c
index 6539792..072b2cc 100644
--- a/gtk/deprecated/gtkactivatable.c
+++ b/gtk/deprecated/gtkactivatable.c
@@ -259,7 +259,9 @@
*/
#include "config.h"
+
#define GDK_DISABLE_DEPRECATION_WARNINGS
+
#include "gtkactivatable.h"
#include "gtkactiongroup.h"
#include "gtkprivate.h"
diff --git a/gtk/deprecated/gtkcolorseldialog.c b/gtk/deprecated/gtkcolorseldialog.c
index 7710c33..87408f7 100644
--- a/gtk/deprecated/gtkcolorseldialog.c
+++ b/gtk/deprecated/gtkcolorseldialog.c
@@ -25,7 +25,6 @@
#define GDK_DISABLE_DEPRECATION_WARNINGS
-
#include <string.h>
#include <glib.h>
#include "gtkcolorseldialog.h"
diff --git a/gtk/deprecated/gtkfontsel.c b/gtk/deprecated/gtkfontsel.c
index 9badb42..9440c42 100644
--- a/gtk/deprecated/gtkfontsel.c
+++ b/gtk/deprecated/gtkfontsel.c
@@ -53,9 +53,6 @@
#include "gtkbuildable.h"
#include "gtkorientable.h"
#include "gtkprivate.h"
-
-#define GDK_DISABLE_DEPRECATION_WARNINGS
-
#include "gtkfontsel.h"
/**
diff --git a/gtk/deprecated/gtkgradient.c b/gtk/deprecated/gtkgradient.c
index 9a0dd64..11cde72 100644
--- a/gtk/deprecated/gtkgradient.c
+++ b/gtk/deprecated/gtkgradient.c
@@ -20,7 +20,6 @@
#define GDK_DISABLE_DEPRECATION_WARNINGS
#include "gtkgradientprivate.h"
-
#include "gtkcsscolorvalueprivate.h"
#include "gtkcssrgbavalueprivate.h"
#include "gtkstylecontextprivate.h"
diff --git a/gtk/deprecated/gtkiconfactory.c b/gtk/deprecated/gtkiconfactory.c
index eb3a205..a3427ae 100644
--- a/gtk/deprecated/gtkiconfactory.c
+++ b/gtk/deprecated/gtkiconfactory.c
@@ -41,7 +41,7 @@
#include "gtkbuildable.h"
#include "gtkbuilderprivate.h"
#include "gtktypebuiltins.h"
-#include "deprecated/gtkstyle.h"
+#include "gtkstyle.h"
/**
* SECTION:gtkiconfactory
diff --git a/gtk/deprecated/gtkuimanager.c b/gtk/deprecated/gtkuimanager.c
index 37e4ef7..df84510 100644
--- a/gtk/deprecated/gtkuimanager.c
+++ b/gtk/deprecated/gtkuimanager.c
@@ -48,7 +48,7 @@
#include "gtkprivate.h"
#include "gtkuimanager.h"
-#include "deprecated/gtktearoffmenuitem.h"
+#include "gtktearoffmenuitem.h"
/**
* SECTION:gtkuimanager
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]