merge the too common headers in gladish

gui/Patchage.cpp

@@ -25,6 +25,8 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "common.h"
+
 #include <string.h>
 #include <cmath>
 #include <sstream>
@@ -34,8 +36,6 @@
 #include <gtk/gtkwindow.h>
 #include <boost/format.hpp>
 
-#include "config.h"
-#include "common.hpp"
 #include "jack_proxy.hpp"
 #include "Patchage.hpp"
 #include "PatchageCanvas.hpp"

gui/Patchage.hpp

@@ -32,7 +32,6 @@
 #include <boost/shared_ptr.hpp>
 #include <libgnomecanvasmm.h>
 #include <libglademm/xml.h>
-#include "config.h"
 #include "Widget.hpp"
 
 #include "PatchagePort.hpp"

gui/PatchageCanvas.cpp

@@ -24,8 +24,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
-#include "common.hpp"
+#include "common.h"
 #include "PatchageCanvas.hpp"
 #include "Patchage.hpp"
 #include "PatchageModule.hpp"

gui/PatchageCanvas.hpp

@@ -28,7 +28,6 @@
 #define PATCHAGE_PATCHAGECANVAS_HPP
 
 #include "common.h"
-#include <string>
 #include "StateManager.hpp"
 
 class Patchage;

gui/a2j_proxy.cpp

@@ -24,9 +24,10 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "common.h"
+
 #include <dbus/dbus.h>
 
-#include "common.hpp"
 #include "a2j_proxy.hpp"
 #include "Patchage.hpp"
 #include "globals.hpp"

gui/common.h

@@ -32,6 +32,17 @@
 #include <stdbool.h>            /* C99 bool */
 #include <stdint.h>             /* fixed bit size ints */
 
+#include <string>
+#include <list>
+#include <sigc++/sigc++.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
+#include <boost/format.hpp>
+
+using namespace boost;
+using namespace std;
+using namespace sigc;
+
 #include "canvas.h"
 
 #endif /* #ifndef COMMON_H__15E63B7A_8350_4ABD_B04C_592158354949__INCLUDED */

gui/common.hpp

@@ -1,33 +0,0 @@
-// -*- Mode: C++ ; indent-tabs-mode: t -*-
-/* This file is part of Patchage.
- * Copyright (C) 2008 Nedko Arnaudov <nedko@arnaudov.name>
- *
- * Patchage is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- *
- * Patchage is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#ifndef COMMON_HPP__AA9070A8_1E8C_4C6E_9769_395BF3D848C0__INCLUDED
-#define COMMON_HPP__AA9070A8_1E8C_4C6E_9769_395BF3D848C0__INCLUDED
-
-#include <string>
-#include <list>
-#include <sigc++/sigc++.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-#include <boost/format.hpp>
-
-using namespace boost;
-using namespace std;
-using namespace sigc;
-
-#endif // #ifndef COMMON_HPP__AA9070A8_1E8C_4C6E_9769_395BF3D848C0__INCLUDED

gui/jack_proxy.cpp

@@ -24,19 +24,18 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "common.h"
+
 #include <cassert>
 #include <cstring>
 #include <set>
 #include <iostream>
 
-#include "config.h"
-
 #include <glib.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include "common.hpp"
 #include "Patchage.hpp"
 #include "jack_proxy.hpp"
 #include "dbus_helpers.h"

gui/lash_client.cpp

@@ -24,7 +24,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "common.hpp"
+#include "common.h"
 #include "lash_client.hpp"
 #include "Patchage.hpp"
 //#include "globals.hpp"

gui/lash_proxy.cpp

@@ -24,10 +24,11 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "common.h"
+
 #include <string.h>
 #include <dbus/dbus.h>
 
-#include "common.hpp"
 #include "lash_proxy.hpp"
 #include "session.hpp"
 #include "project.hpp"

gui/load_projects_dialog.cpp

@@ -25,7 +25,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "common.hpp"
+#include "common.h"
 #include "lash_proxy.hpp"
 #include "load_projects_dialog.hpp"
 #include "Patchage.hpp"

gui/main.cpp

@@ -25,8 +25,6 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
-
 #include <iostream>
 #include <libgnomecanvasmm.h>
 #include <glibmm/exception.h>
@@ -36,7 +34,6 @@
 #include <sstream>
 #include <stdexcept>
 #include <libglademm/xml.h>
-#include "config.h"
 
 #include "Patchage.hpp"
 #include "globals.hpp"

gui/project.cpp

@@ -24,7 +24,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "common.hpp"
+#include "common.h"
 #include "project.hpp"
 #include "lash_proxy.hpp"
 #include "lash_client.hpp"

gui/project_list.cpp

@@ -24,11 +24,12 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "common.h"
+
 #include <iostream>
 #include <gtkmm.h>
 #include <libglademm/xml.h>
 
-#include "common.hpp"
 #include "project_list.hpp"
 #include "Widget.hpp"
 #include "Patchage.hpp"

gui/project_properties.cpp

@@ -24,10 +24,11 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "common.h"
+
 #include <gtkmm.h>
 #include <libglademm/xml.h>
 
-#include "common.hpp"
 #include "project.hpp"
 #include "project_properties.hpp"
 #include "Widget.hpp"

gui/session.cpp

@@ -24,7 +24,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "common.hpp"
+#include "common.h"
 #include "project.hpp"
 #include "session.hpp"
 #include "lash_client.hpp"