Removed unnecessary inclusion of glibmm/threads.h

(bzr r14059.1.14)

10 files changed, 13 insertions, 67 deletions

diff --git a/src/ui/widget/color-entry.cpp b/src/ui/widget/color-entry.cpp
index e26cb4ade..89a63c6d0 100644
--- a/src/ui/widget/color-entry.cpp
+++ b/src/ui/widget/color-entry.cpp
@@ -7,17 +7,9 @@
  * Copyright (C) 2014 Authors
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
-#include <iomanip>
+#include <glibmm.h>
 #include <glibmm/i18n.h>
+#include <iomanip>
 
 #include "color-entry.h"
 
diff --git a/src/ui/widget/color-entry.h b/src/ui/widget/color-entry.h
index 148b5dfe9..ecb0518b1 100644
--- a/src/ui/widget/color-entry.h
+++ b/src/ui/widget/color-entry.h
@@ -11,14 +11,6 @@
 #ifndef SEEN_COLOR_ENTRY_H
 #define SEEN_COLOR_ENTRY_H_
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
 #include <gtkmm/entry.h>
 #include "ui/selected-color.h"
 
diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index db73c9111..e8d5be8a7 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -2,14 +2,11 @@
 # include "config.h"
 #endif
 
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
 #include <math.h>
-#include <gtk/gtk.h>
-#include <glibmm/i18n.h>
 #include <gtkmm/adjustment.h>
+#include <glibmm/i18n.h>
+
+#include <gtk/gtk.h>
 #include <map>
 #include <set>
 #include <vector>
diff --git a/src/ui/widget/color-icc-selector.h b/src/ui/widget/color-icc-selector.h
index b917066dd..6066586f5 100644
--- a/src/ui/widget/color-icc-selector.h
+++ b/src/ui/widget/color-icc-selector.h
@@ -5,12 +5,8 @@
 # include <config.h>
 #endif
 
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
 #include <gtkmm/widget.h>
-#if GTK_CHECK_VERSION(3,0,0)
+#if WITH_GTKMM_3_0
 #include <gtkmm/grid.h>
 #else
 #include <gtkmm/table.h>
diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp
index 0a4473a3b..ddffb0246 100644
--- a/src/ui/widget/color-notebook.cpp
+++ b/src/ui/widget/color-notebook.cpp
@@ -19,16 +19,11 @@
 # include "config.h"
 #endif
 
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
 #include "widgets/icon.h"
 #include <cstring>
 #include <string>
 #include <cstdlib>
 #include <cstddef>
-#include <gtk/gtk.h>
 #include <glibmm/i18n.h>
 #include <gtkmm/label.h>
 #include <gtkmm/notebook.h>
diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp
index 1771644d1..e9931e938 100644
--- a/src/ui/widget/color-scales.cpp
+++ b/src/ui/widget/color-scales.cpp
@@ -6,14 +6,10 @@
 # include "config.h"
 #endif
 
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
 #include <math.h>
-#include <gtk/gtk.h>
-#include <glibmm/i18n.h>
 #include <gtkmm/adjustment.h>
+#include <glibmm/i18n.h>
+#include <gtk/gtk.h>
 
 #include "svg/svg-icc-color.h"
 #include "ui/dialog-events.h"
diff --git a/src/ui/widget/color-scales.h b/src/ui/widget/color-scales.h
index 0f0c4f90e..af7f726f1 100644
--- a/src/ui/widget/color-scales.h
+++ b/src/ui/widget/color-scales.h
@@ -5,14 +5,7 @@
 # include <config.h>
 #endif
 
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
-#include <color.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-#if GTK_CHECK_VERSION(3,0,0)
+#if WITH_GTKMM_3_0
 #include <gtkmm/grid.h>
 #else
 #include <gtkmm/table.h>
diff --git a/src/ui/widget/color-slider.cpp b/src/ui/widget/color-slider.cpp
index ad9662c6c..bf8b85dbd 100644
--- a/src/ui/widget/color-slider.cpp
+++ b/src/ui/widget/color-slider.cpp
@@ -15,20 +15,19 @@
 # include "config.h"
 #endif
 
-#include "color-slider.h"
-
-#include <gtk/gtk.h>
 #include <gdkmm/cursor.h>
 #include <gdkmm/screen.h>
 #include <gdkmm/general.h>
 #include <gtkmm/adjustment.h>
-#if GTK_CHECK_VERSION(3,0,0)
+#if WITH_GTKMM_3_0
 #include <gtkmm/stylecontext.h>
 #else
 #include <gtkmm/style.h>
 #endif
+#include <gtk/gtk.h>
 
 #include "ui/widget/color-scales.h"
+#include "ui/widget/color-slider.h"
 #include "preferences.h"
 
 static const gint SLIDER_WIDTH = 96;
diff --git a/src/ui/widget/color-slider.h b/src/ui/widget/color-slider.h
index 48d067bb8..2f2e7b2db 100644
--- a/src/ui/widget/color-slider.h
+++ b/src/ui/widget/color-slider.h
@@ -12,14 +12,6 @@
 #ifndef SEEN_COLOR_SLIDER_H
 #define SEEN_COLOR_SLIDER_H
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
 #include <gtkmm/widget.h>
 #include <sigc++/signal.h>
 
diff --git a/src/ui/widget/color-wheel-selector.h b/src/ui/widget/color-wheel-selector.h
index f5213fad7..ec30cc7c5 100644
--- a/src/ui/widget/color-wheel-selector.h
+++ b/src/ui/widget/color-wheel-selector.h
@@ -16,13 +16,7 @@
 # include <config.h>
 #endif
 
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
-#include <glib.h>
-#include <gtk/gtk.h>
-#if GTK_CHECK_VERSION(3,0,0)
+#if WITH_GTKMM_3_0
 #include <gtkmm/grid.h>
 #else
 #include <gtkmm/table.h>