[glom] Move some ifndefs around to fix the client-only build.

From: Murray Cumming <murrayc src gnome org>
To: svn-commits-list gnome org
Subject: [glom] Move some ifndefs around to fix the client-only build.
Date: Sun, 5 Jul 2009 09:56:39 +0000 (UTC)
commit 6a752b99ef82b88bbea06cf479159390a68b1b77
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun Jul 5 11:42:22 2009 +0200

    Move some ifndefs around to fix the client-only build.

 ChangeLog                                          |    4 +++
 glom/application.cc                                |   24 ++++++++++++-------
 glom/application.h                                 |    7 +++--
 glom/base_db.h                                     |    2 +-
 glom/frame_glom.cc                                 |   22 ++++++++++--------
 glom/frame_glom.h                                  |   12 +++++----
 glom/mode_data/box_data.h                          |    2 +-
 glom/mode_data/box_data_calendar_related.h         |    2 +-
 glom/mode_data/box_data_details.h                  |    2 +-
 glom/mode_data/box_data_list.h                     |    2 +-
 glom/mode_data/box_data_list_related.h             |    2 +-
 glom/mode_data/box_data_manyrecords.h              |    2 +-
 glom/mode_data/box_data_portal.h                   |    2 +-
 glom/mode_data/flowtablewithfields.h               |    2 +-
 glom/utility_widgets/canvas/canvas_editable.h      |    2 +-
 glom/utility_widgets/checkglom.h                   |    2 +-
 glom/utility_widgets/comboentryglom.h              |    2 +-
 glom/utility_widgets/comboglom.h                   |    2 +-
 glom/utility_widgets/datawidget.h                  |    2 +-
 glom/utility_widgets/db_adddel/db_adddel.h         |    2 +-
 glom/utility_widgets/entryglom.h                   |    2 +-
 .../utility_widgets/filechooserdialog_saveextras.h |    2 +-
 glom/utility_widgets/layoutwidgetbase.cc           |    4 +-
 glom/utility_widgets/layoutwidgetbase.h            |    2 +-
 glom/utility_widgets/textviewglom.h                |    2 +-
 25 files changed, 63 insertions(+), 48 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index dad41f2..a081da2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-07-05  Murray Cumming  <murrayc murrayc com>
 
+	* glom/*.[h|cc]: Move some ifndefs around to fix the client-only build.
+
+2009-07-05  Murray Cumming  <murrayc murrayc com>
+
 	* glom/libglom/document/document.cc: load_after(): Remove old code 
 	to check for developer mode in client-only builds.
 
diff --git a/glom/application.cc b/glom/application.cc
index 041ca7b..02db9ac 100644
--- a/glom/application.cc
+++ b/glom/application.cc
@@ -103,9 +103,8 @@ App_Glom::App_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& bu
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   m_ui_save_extra_showextras(false),
   m_ui_save_extra_newdb_hosting_mode(Document::HOSTING_MODE_DEFAULT),
-
-#endif // !GLOM_ENABLE_CLIENT_ONLY
   m_avahi_progress_dialog(0),
+#endif // !GLOM_ENABLE_CLIENT_ONLY
   m_show_sql_debug(false)
 {
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
@@ -140,8 +139,9 @@ App_Glom::App_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& bu
   add_mime_type("application/x-glom"); //TODO: make this actually work - we need to register it properly.
 
   //Hide the toolbar because it doesn't contain anything useful for this app.
-  m_HandleBox_Toolbar.hide();
+  m_HandleBox_Toolbar.hide(); //TODO: Remove this from our fork of Bakery.
   
+#ifndef GLOM_ENABLE_CLIENT_ONLY
   //Install UI hooks for this:
   ConnectionPool* connection_pool = ConnectionPool::get_instance();
   if(!connection_pool)
@@ -149,7 +149,8 @@ App_Glom::App_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& bu
       sigc::mem_fun(*this, &App_Glom::on_connection_avahi_begin),
       sigc::mem_fun(*this, &App_Glom::on_connection_avahi_progress),
       sigc::mem_fun(*this, &App_Glom::on_connection_avahi_done) );     
-  
+#endif // !GLOM_ENABLE_CLIENT_ONLY
+
   global_application = this;
 }
 
@@ -161,15 +162,16 @@ App_Glom::~App_Glom()
     m_pFrame->remove_view(m_window_translations);
     delete m_window_translations;
   }
-#endif // !GLOM_ENABLE_CLIENT_ONLY
 
   if(m_avahi_progress_dialog)
   {
     delete m_avahi_progress_dialog;
     m_avahi_progress_dialog = 0;
   }
+#endif // !GLOM_ENABLE_CLIENT_ONLY
 }
 
+#ifndef GLOM_ENABLE_CLIENT_ONLY
 void App_Glom::on_connection_avahi_begin()
 {
   //Create the dialog:
@@ -201,6 +203,7 @@ void App_Glom::on_connection_avahi_done()
     m_avahi_progress_dialog = 0;
   }
 }
+#endif // !GLOM_ENABLE_CLIENT_ONLY
 
 bool App_Glom::init(const Glib::ustring& document_uri)
 {
@@ -328,12 +331,14 @@ void App_Glom::init_menus_file()
   m_refFileActionGroup->add(action, sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_file_import));
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
+#ifndef GLOM_ENABLE_CLIENT_ONLY
   m_toggleaction_network_shared = Gtk::ToggleAction::create("BakeryAction_Menu_File_Share", _("Shared On Network"));
   m_refFileActionGroup->add(m_toggleaction_network_shared);
   m_connection_toggleaction_network_shared = 
     m_toggleaction_network_shared->signal_toggled().connect(
       sigc::mem_fun(*this, &App_Glom::on_menu_file_toggle_share) );
   m_listDeveloperActions.push_back(m_toggleaction_network_shared);
+#endif //!GLOM_ENABLE_CLIENT_ONLY
 
   m_refFileActionGroup->add(Gtk::Action::create("GlomAction_Menu_File_Print", Gtk::Stock::PRINT));
   m_refFileActionGroup->add(Gtk::Action::create("GlomAction_File_Print", _("_Standard")),
@@ -614,6 +619,7 @@ void App_Glom::init_menus()
   fill_menu_tables();
 }
 
+#ifndef GLOM_ENABLE_CLIENT_ONLY
 void App_Glom::on_menu_file_toggle_share()
 {
   if(!m_pFrame)
@@ -622,7 +628,6 @@ void App_Glom::on_menu_file_toggle_share()
   m_pFrame->on_menu_file_toggle_share(m_toggleaction_network_shared);
 }
 
-#ifndef GLOM_ENABLE_CLIENT_ONLY
 void App_Glom::on_menu_userlevel_developer()
 {
   if(!m_pFrame)
@@ -797,12 +802,13 @@ void App_Glom::open_browsed_document(const EpcServiceInfo* server, const Glib::u
     if(document)
     {
       document->set_opened_from_browse();
+      document->set_userlevel(AppState::USERLEVEL_OPERATOR); //TODO: This should happen automatically.
 
       document->set_network_shared(true); //It is shared by the computer that we opened this from.
-      update_network_shared_ui();
 
-      document->set_userlevel(AppState::USERLEVEL_OPERATOR); //TODO: This should happen automatically.
 #ifndef GLOM_ENABLE_CLIENT_ONLY
+      update_network_shared_ui(); //TODO: Maybe we should show this for client-only mode too.
+
       update_userlevel_ui();
 #endif // !GLOM_ENABLE_CLIENT_ONLY
     }
@@ -1168,9 +1174,9 @@ bool App_Glom::on_document_load()
     //List the non-hidden tables in the menu:
     fill_menu_tables();
 
+#ifndef GLOM_ENABLE_CLIENT_ONLY
     update_network_shared_ui();
 
-#ifndef GLOM_ENABLE_CLIENT_ONLY
     pDocument->set_allow_autosave(true);
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
diff --git a/glom/application.h b/glom/application.h
index 56a8f51..3721bea 100644
--- a/glom/application.h
+++ b/glom/application.h
@@ -24,7 +24,7 @@
 #include <glom/bakery/app_withdoc_gtk.h>
 #include "frame_glom.h"
 
-#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
+#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
 
 //Avoid including the header here:
@@ -105,6 +105,7 @@ private:
   bool offer_new_or_existing();
 
   void on_menu_help_contents();
+
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   void existing_or_new_new();
 
@@ -195,6 +196,8 @@ private:
   Glib::ustring m_ui_save_extra_newdb_title;
 
   Document::HostingMode m_ui_save_extra_newdb_hosting_mode;
+
+  Gtk::MessageDialog* m_avahi_progress_dialog;
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
   // This is set to the URI of an example file that is loaded to be able to
@@ -207,8 +210,6 @@ private:
   //so we can use them again when connecting directly to the database:
   Glib::ustring m_temp_username, m_temp_password;
 
-  Gtk::MessageDialog* m_avahi_progress_dialog;
-  
   bool m_show_sql_debug;
 };
 
diff --git a/glom/base_db.h b/glom/base_db.h
index 45906db..ec93ab2 100644
--- a/glom/base_db.h
+++ b/glom/base_db.h
@@ -21,7 +21,7 @@
 #ifndef BASE_DB_H
 #define BASE_DB_H
 
-#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
+#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
 #include <gtkmm.h>
 
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index fd71038..35d4113 100644
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@ -102,11 +102,11 @@ Frame_Glom::Frame_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
   m_pDialog_Relationships(0),
   m_dialog_addrelatedtable(0),
   m_dialog_relationships_overview(0),
-#endif // !GLOM_ENABLE_CLIENT_ONLY
-  m_pDialogConnection(0),
   m_dialog_progess_connection_initialize(0),
+#endif // !GLOM_ENABLE_CLIENT_ONLY
   m_dialog_progess_connection_startup(0),
-  m_dialog_progess_connection_cleanup(0)
+  m_dialog_progess_connection_cleanup(0),
+  m_pDialogConnection(0)
 {
   //Load widgets from glade file:
   builder->get_widget("label_table_name", m_pLabel_Table);
@@ -182,11 +182,6 @@ Frame_Glom::~Frame_Glom()
     m_pDialogConnection = 0;
   }
   
-  if(m_dialog_progess_connection_initialize)
-  {
-    delete m_dialog_progess_connection_initialize;
-    m_dialog_progess_connection_initialize = 0;
-  }
   
   if(m_dialog_progess_connection_startup)
   {
@@ -201,6 +196,12 @@ Frame_Glom::~Frame_Glom()
   }
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY
+  if(m_dialog_progess_connection_initialize)
+  {
+    delete m_dialog_progess_connection_initialize;
+    m_dialog_progess_connection_initialize = 0;
+  }
+
   if(m_pBox_Reports)
     remove_view(m_pBox_Reports);
 
@@ -832,7 +833,6 @@ void Frame_Glom::on_menu_file_import()
     }
   }
 }
-#endif // !GLOM_ENABLE_CLIENT_ONLY
 
 void Frame_Glom::on_menu_file_toggle_share(const Glib::RefPtr<Gtk::ToggleAction>& action)
 {
@@ -1039,6 +1039,7 @@ void Frame_Glom::on_menu_file_toggle_share(const Glib::RefPtr<Gtk::ToggleAction>
     pApp->update_network_shared_ui();
   }
 }
+#endif // !GLOM_ENABLE_CLIENT_ONLY
 
 void Frame_Glom::on_menu_file_print()
 {
@@ -1914,6 +1915,7 @@ namespace
   }
 }
 
+#ifndef GLOM_ENABLE_CLIENT_ONLY
 void Frame_Glom::on_connection_initialize_progress()
 {
   if(!m_dialog_progess_connection_initialize)
@@ -1921,7 +1923,7 @@ void Frame_Glom::on_connection_initialize_progress()
         
   m_dialog_progess_connection_initialize->pulse();
 }
-
+#endif //GLOM_ENABLE_CLIENT_ONLY
 
 void Frame_Glom::on_connection_startup_progress()
 {
diff --git a/glom/frame_glom.h b/glom/frame_glom.h
index b080988..a6e8a78 100644
--- a/glom/frame_glom.h
+++ b/glom/frame_glom.h
@@ -21,7 +21,7 @@
 #ifndef FRAME_GLOM_H
 #define FRAME_GLOM_H
 
-#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
+#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
 #include <gtkmm/frame.h>
 #include <gtkmm/toggleaction.h>
@@ -53,9 +53,10 @@ class Dialog_Layout_Report;
 class Window_PrintLayout_Edit;
 class Dialog_AddRelatedTable;
 class Dialog_RelationshipsOverview;
-class Dialog_ProgressCreating;
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
+class Dialog_ProgressCreating; //TODO: Rename this because it's not just about creating databases.
+
 class Frame_Glom :
   public PlaceHolder,
   //public GlomBakery::View_Composite<Document>,
@@ -278,12 +279,13 @@ protected:
   Dialog_AddRelatedTable* m_dialog_addrelatedtable;
   Dialog_RelationshipsOverview* m_dialog_relationships_overview;
     
-#endif // !GLOM_ENABLE_CLIENT_ONLY
-
-  Dialog_Connection* m_pDialogConnection;
   Dialog_ProgressCreating* m_dialog_progess_connection_initialize;
+#endif //GLOM_ENABLE_CLIENT_ONLY
+
   Dialog_ProgressCreating* m_dialog_progess_connection_startup;
   Dialog_ProgressCreating* m_dialog_progess_connection_cleanup;
+
+  Dialog_Connection* m_pDialogConnection;
 };
 
 } //namespace Glom
diff --git a/glom/mode_data/box_data.h b/glom/mode_data/box_data.h
index f0639c8..d50b9e4 100644
--- a/glom/mode_data/box_data.h
+++ b/glom/mode_data/box_data.h
@@ -21,7 +21,7 @@
 #ifndef BOX_DATA_H
 #define BOX_DATA_H
 
-#include <libglom/libglom_config.h> // GLOM_ENABLE_CLIENT_ONLY
+#include "config.h" // GLOM_ENABLE_CLIENT_ONLY
 
 #include <glom/box_withbuttons.h>
 #include <glom/base_db_table_data.h>
diff --git a/glom/mode_data/box_data_calendar_related.h b/glom/mode_data/box_data_calendar_related.h
index 41acd0b..fcf9091 100644
--- a/glom/mode_data/box_data_calendar_related.h
+++ b/glom/mode_data/box_data_calendar_related.h
@@ -21,7 +21,7 @@
 #ifndef BOX_DATA_CALENDAR_RELATED_H
 #define BOX_DATA_CALENDAR_RELATED_H
 
-#include <libglom/libglom_config.h> // GLOM_ENABLE_CLIENT_ONLY
+#include "config.h" // GLOM_ENABLE_CLIENT_ONLY
 
 #include "box_data_portal.h"
 #include <libglom/data_structure/layout/layoutitem_calendarportal.h>
diff --git a/glom/mode_data/box_data_details.h b/glom/mode_data/box_data_details.h
index 76ae147..42cc516 100644
--- a/glom/mode_data/box_data_details.h
+++ b/glom/mode_data/box_data_details.h
@@ -21,7 +21,7 @@
 #ifndef BOX_DATA_DETAILS_H
 #define BOX_DATA_DETAILS_H
 
-#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
+#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
 #include "box_data.h"
 //#include <glom/mode_data/box_data_list_related.h>
diff --git a/glom/mode_data/box_data_list.h b/glom/mode_data/box_data_list.h
index 3fba952..9aa4d50 100644
--- a/glom/mode_data/box_data_list.h
+++ b/glom/mode_data/box_data_list.h
@@ -21,7 +21,7 @@
 #ifndef BOX_DATA_LIST_H
 #define BOX_DATA_LIST_H
 
-#include <libglom/libglom_config.h> // GLOM_ENABLE_CLIENT_ONLY
+#include "config.h" // GLOM_ENABLE_CLIENT_ONLY
 
 #include "box_data_manyrecords.h"
 #include "../utility_widgets/db_adddel/db_adddel_withbuttons.h"
diff --git a/glom/mode_data/box_data_list_related.h b/glom/mode_data/box_data_list_related.h
index f68e2b0..c7aa80d 100644
--- a/glom/mode_data/box_data_list_related.h
+++ b/glom/mode_data/box_data_list_related.h
@@ -21,7 +21,7 @@
 #ifndef BOX_DATA_LIST_RELATED_H
 #define BOX_DATA_LIST_RELATED_H
 
-#include <libglom/libglom_config.h> // GLOM_ENABLE_CLIENT_ONLY
+#include "config.h" // GLOM_ENABLE_CLIENT_ONLY
 
 #include "box_data_portal.h"
 
diff --git a/glom/mode_data/box_data_manyrecords.h b/glom/mode_data/box_data_manyrecords.h
index bb6be61..2364be3 100644
--- a/glom/mode_data/box_data_manyrecords.h
+++ b/glom/mode_data/box_data_manyrecords.h
@@ -21,7 +21,7 @@
 #ifndef BOX_DATA_MANY_RECORDS_H
 #define BOX_DATA_MANY_RECORDS_H
 
-#include <libglom/libglom_config.h> // GLOM_ENABLE_CLIENT_ONLY
+#include "config.h" // GLOM_ENABLE_CLIENT_ONLY
 
 #include "box_data.h"
 #include "../utility_widgets/db_adddel/db_adddel_withbuttons.h"
diff --git a/glom/mode_data/box_data_portal.h b/glom/mode_data/box_data_portal.h
index d0fd13d..2612cd9 100644
--- a/glom/mode_data/box_data_portal.h
+++ b/glom/mode_data/box_data_portal.h
@@ -21,7 +21,7 @@
 #ifndef BOX_DATA_PORTAL_H
 #define BOX_DATA_PORTAL_H
 
-#include <libglom/libglom_config.h> // GLOM_ENABLE_CLIENT_ONLY
+#include "config.h" // GLOM_ENABLE_CLIENT_ONLY
 
 #include "box_data_manyrecords.h"
 #include "../utility_widgets/layoutwidgetbase.h"
diff --git a/glom/mode_data/flowtablewithfields.h b/glom/mode_data/flowtablewithfields.h
index 0725d6a..0d85a79 100644
--- a/glom/mode_data/flowtablewithfields.h
+++ b/glom/mode_data/flowtablewithfields.h
@@ -21,7 +21,7 @@
 #ifndef GLOM_UTILITYWIDGETS_FLOWTABLEWITHFIELDS_H
 #define GLOM_UTILITYWIDGETS_FLOWTABLEWITHFIELDS_H
 
-#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
+#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
 #ifdef GLOM_ENABLE_CLIENT_ONLY
 #include <glom/utility_widgets/flowtable.h>
diff --git a/glom/utility_widgets/canvas/canvas_editable.h b/glom/utility_widgets/canvas/canvas_editable.h
index 22fc39c..e51c462 100644
--- a/glom/utility_widgets/canvas/canvas_editable.h
+++ b/glom/utility_widgets/canvas/canvas_editable.h
@@ -24,7 +24,7 @@
 #include <goocanvasmm.h>
 #include "canvas_group_grid.h"
 #include <map>
-#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
+#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
 namespace Glom
 {
diff --git a/glom/utility_widgets/checkglom.h b/glom/utility_widgets/checkglom.h
index 68a4030..6d38247 100644
--- a/glom/utility_widgets/checkglom.h
+++ b/glom/utility_widgets/checkglom.h
@@ -21,7 +21,7 @@
 #ifndef GLOM_UTILITY_WIDGETS_CHECK_GLOM_H
 #define GLOM_UTILITY_WIDGETS_CHECK_GLOM_H
 
-#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
+#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
 #include <gtkmm.h>
 #include <libglom/data_structure/field.h>
diff --git a/glom/utility_widgets/comboentryglom.h b/glom/utility_widgets/comboentryglom.h
index e41c115..7e65975 100644
--- a/glom/utility_widgets/comboentryglom.h
+++ b/glom/utility_widgets/comboentryglom.h
@@ -21,7 +21,7 @@
 #ifndef GLOM_UTILITY_WIDGETS_COMBOENTRY_GLOM_H
 #define GLOM_UTILITY_WIDGETS_COMBOENTRY_GLOM_H
 
-#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
+#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
 #include <gtkmm.h>
 #include <libglom/data_structure/field.h>
diff --git a/glom/utility_widgets/comboglom.h b/glom/utility_widgets/comboglom.h
index 948867e..ad09f42 100644
--- a/glom/utility_widgets/comboglom.h
+++ b/glom/utility_widgets/comboglom.h
@@ -21,7 +21,7 @@
 #ifndef GLOM_UTILITY_WIDGETS_COMBO_GLOM_H
 #define GLOM_UTILITY_WIDGETS_COMBO_GLOM_H
 
-#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
+#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
 #include <gtkmm.h>
 #include <libglom/data_structure/field.h>
diff --git a/glom/utility_widgets/datawidget.h b/glom/utility_widgets/datawidget.h
index 4d16513..2d8fecc 100644
--- a/glom/utility_widgets/datawidget.h
+++ b/glom/utility_widgets/datawidget.h
@@ -21,7 +21,7 @@
 #ifndef GLOM_UTILITY_WIDGETS_DATAWIDGET_H
 #define GLOM_UTILITY_WIDGETS_DATAWIDGET_H
 
-#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
+#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
 #include "placeholder.h"
 #include "layoutwidgetmenu.h"
diff --git a/glom/utility_widgets/db_adddel/db_adddel.h b/glom/utility_widgets/db_adddel/db_adddel.h
index fe46dcf..268fdc3 100644
--- a/glom/utility_widgets/db_adddel/db_adddel.h
+++ b/glom/utility_widgets/db_adddel/db_adddel.h
@@ -31,7 +31,7 @@
 #include <vector>
 #include <map>
 
-#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
+#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
 namespace Glom
 {
diff --git a/glom/utility_widgets/entryglom.h b/glom/utility_widgets/entryglom.h
index 6f6dbc2..f29a1e0 100644
--- a/glom/utility_widgets/entryglom.h
+++ b/glom/utility_widgets/entryglom.h
@@ -21,7 +21,7 @@
 #ifndef GLOM_UTILITY_WIDGETS_ENTRY_GLOM_H
 #define GLOM_UTILITY_WIDGETS_ENTRY_GLOM_H
 
-#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
+#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
 #include <gtkmm.h>
 #include <libglom/data_structure/field.h>
diff --git a/glom/utility_widgets/filechooserdialog_saveextras.h b/glom/utility_widgets/filechooserdialog_saveextras.h
index 12ae42b..f9e87ac 100644
--- a/glom/utility_widgets/filechooserdialog_saveextras.h
+++ b/glom/utility_widgets/filechooserdialog_saveextras.h
@@ -22,7 +22,7 @@
 #define GLOM_UTILITY_WIDGETS_FILECHOOSERDIALOG_SAVEEXTRAS_H
 
 #include "config.h" //For GLOM_ENABLE_SQLITE
-#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY,
+#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY,
 
 #include <libglom/document/document.h>
 
diff --git a/glom/utility_widgets/layoutwidgetbase.cc b/glom/utility_widgets/layoutwidgetbase.cc
index b3beed2..593a8cb 100644
--- a/glom/utility_widgets/layoutwidgetbase.cc
+++ b/glom/utility_widgets/layoutwidgetbase.cc
@@ -26,9 +26,9 @@ namespace Glom
 {
 
 LayoutWidgetBase::LayoutWidgetBase()
-: m_pLayoutItem(0),
+: m_pLayoutItem(0)
 #ifndef GLOM_ENABLE_CLIENT_ONLY
-  m_drag_in_progress(false)
+  , m_drag_in_progress(false)
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 {
 }
diff --git a/glom/utility_widgets/layoutwidgetbase.h b/glom/utility_widgets/layoutwidgetbase.h
index 5033a0f..651ce7f 100644
--- a/glom/utility_widgets/layoutwidgetbase.h
+++ b/glom/utility_widgets/layoutwidgetbase.h
@@ -25,7 +25,7 @@
 #include <gtkmm.h>
 #include "../mode_data/treestore_layout.h" //Forthe enum.
 
-#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
+#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
 namespace Glom
 {
diff --git a/glom/utility_widgets/textviewglom.h b/glom/utility_widgets/textviewglom.h
index f268d7e..bfef253 100644
--- a/glom/utility_widgets/textviewglom.h
+++ b/glom/utility_widgets/textviewglom.h
@@ -21,7 +21,7 @@
 #ifndef GLOM_UTILITY_WIDGETS_TEXTVIEW_GLOM_H
 #define GLOM_UTILITY_WIDGETS_TEXTVIEW_GLOM_H
 
-#include <libglom/libglom_config.h> // For GLOM_ENABLE_CLIENT_ONLY
+#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
 
 #include <gtkmm.h>
 #include <libglom/data_structure/field.h>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]