dasher r3633 - in trunk: . Src Src/Common Src/DasherCore Src/Gtk2

[pwelche svn gnome org]

Author: pwelche
Date: Mon Mar  2 14:12:43 2009
New Revision: 3633
URL: http://svn.gnome.org/viewvc/dasher?rev=3633&view=rev

Log:
To quote the autoconf manual:

   With the appropriate `-I' option, you can use `#include <config.h>'.
Actually, it's a good habit to use it, because in the rare case when
the source directory contains another `config.h', the build directory
should be searched first.



Modified:
   trunk/ChangeLog
   trunk/Src/Common/AppSettingsHeader.h
   trunk/Src/Common/Common.h
   trunk/Src/Common/myassert.h
   trunk/Src/DasherCore/AutoSpeedControl.cpp
   trunk/Src/DasherCore/CannaConversionHelper.cpp
   trunk/Src/DasherCore/ConversionManager.cpp
   trunk/Src/DasherCore/ConversionManagerFactory.cpp
   trunk/Src/DasherCore/DasherModel.h
   trunk/Src/DasherCore/GnomeSettingsStore.cpp
   trunk/Src/DasherCore/GnomeSettingsStore.h
   trunk/Src/DasherCore/Parameters.h
   trunk/Src/DasherCore/PinYinConversionHelper.cpp
   trunk/Src/Gtk2/DasherAppSettings.cpp
   trunk/Src/Gtk2/DasherControl.cpp
   trunk/Src/Gtk2/DasherControl.h
   trunk/Src/Gtk2/Preferences.cpp
   trunk/Src/Gtk2/dasher_action_keyboard.cpp
   trunk/Src/Gtk2/dasher_action_keyboard_maemo.cpp
   trunk/Src/Gtk2/dasher_action_speech.cpp
   trunk/Src/Gtk2/dasher_editor.cpp
   trunk/Src/Gtk2/dasher_editor_external.cpp
   trunk/Src/Gtk2/dasher_editor_internal.cpp
   trunk/Src/Gtk2/dasher_external_buffer.cpp
   trunk/Src/Gtk2/dasher_lock_dialogue.cpp
   trunk/Src/Gtk2/dasher_main.cpp
   trunk/Src/Gtk2/module_settings_window.cpp
   trunk/Src/main.cc

Modified: trunk/Src/Common/AppSettingsHeader.h
==============================================================================
--- trunk/Src/Common/AppSettingsHeader.h	(original)
+++ trunk/Src/Common/AppSettingsHeader.h	Mon Mar  2 14:12:43 2009
@@ -2,8 +2,8 @@
 #define __appsettingsheader_h__
 
 #include "../DasherCore/Parameters.h"
-#ifndef _WIN32
-#include "../../config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
 #endif
 
 enum { 

Modified: trunk/Src/Common/Common.h
==============================================================================
--- trunk/Src/Common/Common.h	(original)
+++ trunk/Src/Common/Common.h	Mon Mar  2 14:12:43 2009
@@ -16,7 +16,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #if HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 // Deduce the platform, setting macros of the form DASHER_......

Modified: trunk/Src/Common/myassert.h
==============================================================================
--- trunk/Src/Common/myassert.h	(original)
+++ trunk/Src/Common/myassert.h	Mon Mar  2 14:12:43 2009
@@ -23,8 +23,8 @@
 
 #include "Platform.h"
 
-#ifndef DASHER_WIN32
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
 #endif
 
 // The DASHER_ASSERT macro causes execution to break into the debugger in DEBUG mode

Modified: trunk/Src/DasherCore/AutoSpeedControl.cpp
==============================================================================
--- trunk/Src/DasherCore/AutoSpeedControl.cpp	(original)
+++ trunk/Src/DasherCore/AutoSpeedControl.cpp	Mon Mar  2 14:12:43 2009
@@ -1,5 +1,5 @@
-#ifndef _WIN32
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
 #endif
 
 #include "../Common/Common.h"

Modified: trunk/Src/DasherCore/CannaConversionHelper.cpp
==============================================================================
--- trunk/Src/DasherCore/CannaConversionHelper.cpp	(original)
+++ trunk/Src/DasherCore/CannaConversionHelper.cpp	Mon Mar  2 14:12:43 2009
@@ -1,4 +1,6 @@
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "CannaConversionHelper.h"
 

Modified: trunk/Src/DasherCore/ConversionManager.cpp
==============================================================================
--- trunk/Src/DasherCore/ConversionManager.cpp	(original)
+++ trunk/Src/DasherCore/ConversionManager.cpp	Mon Mar  2 14:12:43 2009
@@ -18,8 +18,8 @@
 // along with Dasher; if not, write to the Free Software 
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-#ifndef WIN32
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
 #endif 
 
 #include "ConversionManager.h"

Modified: trunk/Src/DasherCore/ConversionManagerFactory.cpp
==============================================================================
--- trunk/Src/DasherCore/ConversionManagerFactory.cpp	(original)
+++ trunk/Src/DasherCore/ConversionManagerFactory.cpp	Mon Mar  2 14:12:43 2009
@@ -1,5 +1,5 @@
-#ifndef WIN32
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
 #endif
 
 #include "ConversionManager.h"

Modified: trunk/Src/DasherCore/DasherModel.h
==============================================================================
--- trunk/Src/DasherCore/DasherModel.h	(original)
+++ trunk/Src/DasherCore/DasherModel.h	Mon Mar  2 14:12:43 2009
@@ -21,8 +21,8 @@
 #ifndef __DasherModel_h__
 #define __DasherModel_h__
 
-#ifndef WIN32
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
 #endif
 
 #include <climits>

Modified: trunk/Src/DasherCore/GnomeSettingsStore.cpp
==============================================================================
--- trunk/Src/DasherCore/GnomeSettingsStore.cpp	(original)
+++ trunk/Src/DasherCore/GnomeSettingsStore.cpp	Mon Mar  2 14:12:43 2009
@@ -1,4 +1,6 @@
-#include "../../config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "../Common/Common.h"
 

Modified: trunk/Src/DasherCore/GnomeSettingsStore.h
==============================================================================
--- trunk/Src/DasherCore/GnomeSettingsStore.h	(original)
+++ trunk/Src/DasherCore/GnomeSettingsStore.h	Mon Mar  2 14:12:43 2009
@@ -1,7 +1,9 @@
 #ifndef __gnomesettingsstore_h__
 #define __gnomesettingsstore_h__
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <string>
 

Modified: trunk/Src/DasherCore/Parameters.h
==============================================================================
--- trunk/Src/DasherCore/Parameters.h	(original)
+++ trunk/Src/DasherCore/Parameters.h	Mon Mar  2 14:12:43 2009
@@ -23,8 +23,8 @@
 
 #include <string>
 
-#ifndef _WIN32
-#include "../../config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
 #endif
 
 // All parameters go into the enums here

Modified: trunk/Src/DasherCore/PinYinConversionHelper.cpp
==============================================================================
--- trunk/Src/DasherCore/PinYinConversionHelper.cpp	(original)
+++ trunk/Src/DasherCore/PinYinConversionHelper.cpp	Mon Mar  2 14:12:43 2009
@@ -1,6 +1,5 @@
-
-#ifndef _WIN32
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
 #endif 
 
 #include "LanguageModelling/LanguageModel.h"

Modified: trunk/Src/Gtk2/DasherAppSettings.cpp
==============================================================================
--- trunk/Src/Gtk2/DasherAppSettings.cpp	(original)
+++ trunk/Src/Gtk2/DasherAppSettings.cpp	Mon Mar  2 14:12:43 2009
@@ -1,4 +1,6 @@
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #ifdef WITH_GCONF
 #include <gconf/gconf.h>

Modified: trunk/Src/Gtk2/DasherControl.cpp
==============================================================================
--- trunk/Src/Gtk2/DasherControl.cpp	(original)
+++ trunk/Src/Gtk2/DasherControl.cpp	Mon Mar  2 14:12:43 2009
@@ -1,5 +1,7 @@
 #include "../Common/Common.h"
-#include "../../config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <cstring>
 #include <iostream>

Modified: trunk/Src/Gtk2/DasherControl.h
==============================================================================
--- trunk/Src/Gtk2/DasherControl.h	(original)
+++ trunk/Src/Gtk2/DasherControl.h	Mon Mar  2 14:12:43 2009
@@ -1,7 +1,9 @@
 #ifndef __dashercontrol_h__
 #define __dashercontrol_h__
 
-#include "../../config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "PangoCache.h"
 #include "Canvas.h"

Modified: trunk/Src/Gtk2/Preferences.cpp
==============================================================================
--- trunk/Src/Gtk2/Preferences.cpp	(original)
+++ trunk/Src/Gtk2/Preferences.cpp	Mon Mar  2 14:12:43 2009
@@ -1,4 +1,6 @@
-#include "../../config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <glib/gi18n.h>
 #include <libintl.h>

Modified: trunk/Src/Gtk2/dasher_action_keyboard.cpp
==============================================================================
--- trunk/Src/Gtk2/dasher_action_keyboard.cpp	(original)
+++ trunk/Src/Gtk2/dasher_action_keyboard.cpp	Mon Mar  2 14:12:43 2009
@@ -1,4 +1,6 @@
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "dasher_action_keyboard.h"
 #include "dasher_editor.h"
 

Modified: trunk/Src/Gtk2/dasher_action_keyboard_maemo.cpp
==============================================================================
--- trunk/Src/Gtk2/dasher_action_keyboard_maemo.cpp	(original)
+++ trunk/Src/Gtk2/dasher_action_keyboard_maemo.cpp	Mon Mar  2 14:12:43 2009
@@ -1,5 +1,7 @@
-// TODO: Make inc lusion of this file in build conditional
-#include "config.h"
+// TODO: Make inclusion of this file in build conditional
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef WITH_MAEMO
 
 #include "dasher.h"

Modified: trunk/Src/Gtk2/dasher_action_speech.cpp
==============================================================================
--- trunk/Src/Gtk2/dasher_action_speech.cpp	(original)
+++ trunk/Src/Gtk2/dasher_action_speech.cpp	Mon Mar  2 14:12:43 2009
@@ -1,5 +1,7 @@
 // TODO: Make inclusion in build system conditional
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef GNOME_SPEECH
 
 #include "dasher_action_speech.h"

Modified: trunk/Src/Gtk2/dasher_editor.cpp
==============================================================================
--- trunk/Src/Gtk2/dasher_editor.cpp	(original)
+++ trunk/Src/Gtk2/dasher_editor.cpp	Mon Mar  2 14:12:43 2009
@@ -18,7 +18,9 @@
 // along with Dasher; if not, write to the Free Software 
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

Modified: trunk/Src/Gtk2/dasher_editor_external.cpp
==============================================================================
--- trunk/Src/Gtk2/dasher_editor_external.cpp	(original)
+++ trunk/Src/Gtk2/dasher_editor_external.cpp	Mon Mar  2 14:12:43 2009
@@ -1,4 +1,6 @@
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

Modified: trunk/Src/Gtk2/dasher_editor_internal.cpp
==============================================================================
--- trunk/Src/Gtk2/dasher_editor_internal.cpp	(original)
+++ trunk/Src/Gtk2/dasher_editor_internal.cpp	Mon Mar  2 14:12:43 2009
@@ -1,4 +1,6 @@
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <cstring>
 

Modified: trunk/Src/Gtk2/dasher_external_buffer.cpp
==============================================================================
--- trunk/Src/Gtk2/dasher_external_buffer.cpp	(original)
+++ trunk/Src/Gtk2/dasher_external_buffer.cpp	Mon Mar  2 14:12:43 2009
@@ -1,5 +1,7 @@
 // TODO: Make build system conditional
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <string.h>
 

Modified: trunk/Src/Gtk2/dasher_lock_dialogue.cpp
==============================================================================
--- trunk/Src/Gtk2/dasher_lock_dialogue.cpp	(original)
+++ trunk/Src/Gtk2/dasher_lock_dialogue.cpp	Mon Mar  2 14:12:43 2009
@@ -1,4 +1,6 @@
-#include "../../config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include "GtkDasherControl.h"
 #include "dasher.h"

Modified: trunk/Src/Gtk2/dasher_main.cpp
==============================================================================
--- trunk/Src/Gtk2/dasher_main.cpp	(original)
+++ trunk/Src/Gtk2/dasher_main.cpp	Mon Mar  2 14:12:43 2009
@@ -1,4 +1,6 @@
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <cstring>
 

Modified: trunk/Src/Gtk2/module_settings_window.cpp
==============================================================================
--- trunk/Src/Gtk2/module_settings_window.cpp	(original)
+++ trunk/Src/Gtk2/module_settings_window.cpp	Mon Mar  2 14:12:43 2009
@@ -18,7 +18,9 @@
 // along with Dasher; if not, write to the Free Software 
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <glib/gi18n.h>
 
 #include "module_settings_window.h"

Modified: trunk/Src/main.cc
==============================================================================
--- trunk/Src/main.cc	(original)
+++ trunk/Src/main.cc	Mon Mar  2 14:12:43 2009
@@ -1,4 +1,6 @@
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef GNOME_LIBS
 #include <glib/gi18n.h>
 #endif