[ekiga] Huge cleaning of inclusions
- From: Julien Puydt <jpuydt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Huge cleaning of inclusions
- Date: Thu, 12 Sep 2013 13:42:15 +0000 (UTC)
commit c460b89e7616edecc1ddd80694f6da6738143842
Author: Julien Puydt <jpuydt free fr>
Date: Thu Sep 12 15:41:48 2013 +0200
Huge cleaning of inclusions
This was done using iwyu as a guide.
lib/engine/account/account-core.cpp | 4 ----
lib/engine/account/account-core.h | 2 +-
lib/engine/addressbook/contact-core.cpp | 3 ---
lib/engine/audioinput/audioinput-core.cpp | 3 ---
lib/engine/audioinput/audioinput-core.h | 3 +--
lib/engine/audioinput/audioinput-gmconf-bridge.cpp | 2 --
lib/engine/audiooutput/audiooutput-core.cpp | 2 --
lib/engine/audiooutput/audiooutput-core.h | 3 +--
.../audiooutput/audiooutput-gmconf-bridge.cpp | 2 --
lib/engine/audiooutput/audiooutput-scheduler.h | 4 +---
lib/engine/chat/chat-core.cpp | 2 --
.../components/call-history/history-book.cpp | 5 +++--
.../components/call-history/history-contact.cpp | 7 ++-----
.../components/call-history/history-source.cpp | 2 --
.../videooutput-manager-common.cpp | 2 ++
.../videooutput-manager-common.h | 6 +++---
lib/engine/components/echo/echo-dialect.cpp | 2 --
.../gmconf-personal-details.cpp | 5 ++---
.../components/hal-dbus/hal-manager-dbus.cpp | 3 +--
lib/engine/components/hal-dbus/hal-manager-dbus.h | 3 +--
lib/engine/components/hal-dbus/hal-v4l-helper.c | 1 -
.../components/local-roster/local-cluster.cpp | 5 +----
lib/engine/components/local-roster/local-heap.cpp | 7 +++----
.../local-roster/local-roster-bridge.cpp | 4 ++--
.../mlogo-videoinput/videoinput-manager-mlogo.cpp | 3 ++-
.../mlogo-videoinput/videoinput-manager-mlogo.h | 3 +--
.../null-audioinput/audioinput-manager-null.cpp | 3 +++
.../null-audioinput/audioinput-manager-null.h | 2 +-
.../null-audiooutput/audiooutput-manager-null.cpp | 2 ++
.../null-audiooutput/audiooutput-manager-null.h | 2 +-
lib/engine/components/opal/h323-endpoint.h | 2 --
lib/engine/components/opal/opal-account.cpp | 3 ---
lib/engine/components/opal/opal-account.h | 4 +---
lib/engine/components/opal/opal-bank.cpp | 2 --
lib/engine/components/opal/opal-call-manager.cpp | 1 -
lib/engine/components/opal/opal-call-manager.h | 2 --
lib/engine/components/opal/opal-call.cpp | 1 +
lib/engine/components/opal/opal-call.h | 1 -
.../components/opal/opal-codec-description.cpp | 2 --
.../components/opal/opal-codec-description.h | 3 +--
lib/engine/components/opal/opal-gmconf-bridge.h | 2 --
lib/engine/components/opal/opal-videoinput.h | 1 -
lib/engine/components/opal/opal-videooutput.cpp | 1 -
lib/engine/components/opal/opal-videooutput.h | 2 --
lib/engine/components/opal/pcss-endpoint.cpp | 5 -----
lib/engine/components/opal/pcss-endpoint.h | 1 -
lib/engine/components/opal/sip-dialect.cpp | 2 --
lib/engine/components/opal/sip-endpoint.h | 1 -
.../components/ptlib/audioinput-manager-ptlib.cpp | 6 ++++--
.../components/ptlib/audioinput-manager-ptlib.h | 8 ++++----
.../components/ptlib/audiooutput-manager-ptlib.cpp | 6 ++++--
.../components/ptlib/audiooutput-manager-ptlib.h | 4 ++--
lib/engine/components/ptlib/utils.cpp | 3 +--
lib/engine/components/ptlib/utils.h | 1 -
.../components/ptlib/videoinput-manager-ptlib.cpp | 7 ++++---
.../components/ptlib/videoinput-manager-ptlib.h | 3 +--
.../x-videooutput/videooutput-manager-x.cpp | 1 +
lib/engine/engine.h | 1 -
lib/engine/framework/form-request-simple.cpp | 2 --
lib/engine/framework/gmconf-bridge.cpp | 2 --
lib/engine/framework/menu-xml.cpp | 2 --
lib/engine/gui/gtk-core/codecsbox.cpp | 3 ++-
lib/engine/gui/gtk-core/codecsbox.h | 1 -
lib/engine/gui/gtk-core/gtk-core-main.cpp | 2 --
lib/engine/gui/gtk-core/gtk-core.cpp | 2 --
lib/engine/gui/gtk-core/menu-builder-gtk.cpp | 2 --
lib/engine/gui/gtk-frontend/accounts-window.cpp | 4 ++--
lib/engine/gui/gtk-frontend/accounts-window.h | 1 -
lib/engine/gui/gtk-frontend/addressbook-window.cpp | 5 -----
lib/engine/gui/gtk-frontend/book-view-gtk.cpp | 4 ----
.../gui/gtk-frontend/call-history-view-gtk.cpp | 2 --
lib/engine/gui/gtk-frontend/call-window.cpp | 5 -----
lib/engine/gui/gtk-frontend/chat-area.cpp | 1 -
lib/engine/gui/gtk-frontend/chat-window.cpp | 1 -
lib/engine/gui/gtk-frontend/device-lists.cpp | 4 ++--
lib/engine/gui/gtk-frontend/device-lists.h | 1 -
lib/engine/gui/gtk-frontend/ext-window.cpp | 1 -
lib/engine/gui/gtk-frontend/gtk-frontend.cpp | 2 --
lib/engine/gui/gtk-frontend/gtk-frontend.h | 1 -
lib/engine/gui/gtk-frontend/main_window.cpp | 1 -
lib/engine/gui/gtk-frontend/preferences-window.cpp | 6 ++++--
lib/engine/gui/gtk-frontend/preferences-window.h | 2 +-
lib/engine/gui/gtk-frontend/roster-view-gtk.cpp | 5 -----
lib/engine/gui/gtk-frontend/statusicon.cpp | 2 --
lib/engine/gui/gtk-frontend/statusmenu.cpp | 9 +++------
lib/engine/hal/hal-core.cpp | 5 -----
lib/engine/hal/hal-core.h | 1 -
lib/engine/protocol/call-core.cpp | 5 -----
lib/engine/protocol/call-core.h | 2 --
lib/engine/videoinput/videoinput-core.cpp | 3 ---
lib/engine/videoinput/videoinput-core.h | 4 +---
lib/engine/videoinput/videoinput-gmconf-bridge.cpp | 2 --
lib/engine/videooutput/videooutput-core.cpp | 5 -----
lib/engine/videooutput/videooutput-core.h | 5 +----
.../videooutput/videooutput-gmconf-bridge.cpp | 2 --
lib/gmconf/gmconf-ekiga-keys.h | 1 +
lib/gmconf/gmconf-gconf.c | 11 ++++++-----
lib/gmconf/gmconf-upgrade.c | 2 +-
lib/gmconf/gmconf-upgrade.h | 2 +-
lib/gui/dialpad.c | 1 +
lib/gui/gm-text-extlink.c | 1 -
lib/gui/gmcallbacks.c | 1 -
lib/gui/gmdialog.c | 4 ----
lib/gui/gmdialog.h | 2 --
lib/gui/gmmenuaddon.h | 1 -
lib/gui/gmpreferences.c | 2 +-
lib/gui/gmstatusbar.c | 2 ++
lib/gui/gmwindow.c | 3 ---
lib/pixops/pixops.c | 4 ++--
lib/platform/platform.c | 1 +
plugins/loudmouth/loudmouth-bank.cpp | 6 ++----
plugins/loudmouth/loudmouth-chat-multiple.cpp | 4 ----
plugins/loudmouth/loudmouth-chat-simple.cpp | 4 +---
plugins/loudmouth/loudmouth-helpers.cpp | 6 ------
plugins/loudmouth/loudmouth-presentity.cpp | 4 ++--
src/dbus-helper/dbus-helper.cpp | 2 --
src/dbus-helper/dbus.cpp | 4 +---
src/ekiga.cpp | 6 +++---
src/ekiga.h | 8 ++------
src/gui/main.cpp | 5 +++--
win32/plugin-gconst.cpp | 2 +-
121 files changed, 105 insertions(+), 264 deletions(-)
---
diff --git a/lib/engine/account/account-core.cpp b/lib/engine/account/account-core.cpp
index fc818a0..4722e8f 100644
--- a/lib/engine/account/account-core.cpp
+++ b/lib/engine/account/account-core.cpp
@@ -33,10 +33,6 @@
*
*/
-#include <iostream>
-
-#include "config.h"
-
#include "account-core.h"
#include "bank.h"
diff --git a/lib/engine/account/account-core.h b/lib/engine/account/account-core.h
index 90bede6..f95782d 100644
--- a/lib/engine/account/account-core.h
+++ b/lib/engine/account/account-core.h
@@ -37,7 +37,7 @@
#define __ACCOUNT_CORE_H__
#include <list>
-#include <iostream>
+#include <string>
#include "menu-builder.h"
#include "form-request.h"
diff --git a/lib/engine/addressbook/contact-core.cpp b/lib/engine/addressbook/contact-core.cpp
index 3dc8e72..1c8eb22 100644
--- a/lib/engine/addressbook/contact-core.cpp
+++ b/lib/engine/addressbook/contact-core.cpp
@@ -33,11 +33,8 @@
*
*/
-#include <iostream>
#include <glib/gi18n.h>
-#include "config.h"
-
#include "contact-core.h"
/*
diff --git a/lib/engine/audioinput/audioinput-core.cpp b/lib/engine/audioinput/audioinput-core.cpp
index 947534c..b205e16 100644
--- a/lib/engine/audioinput/audioinput-core.cpp
+++ b/lib/engine/audioinput/audioinput-core.cpp
@@ -35,13 +35,10 @@
*/
#include <iostream>
-#include <sstream>
#include <math.h>
#include <glib/gi18n.h>
-#include "config.h"
-
#include "audioinput-core.h"
using namespace Ekiga;
diff --git a/lib/engine/audioinput/audioinput-core.h b/lib/engine/audioinput/audioinput-core.h
index 70737a6..f943047 100644
--- a/lib/engine/audioinput/audioinput-core.h
+++ b/lib/engine/audioinput/audioinput-core.h
@@ -45,8 +45,7 @@
#include "hal-core.h"
#include "audioinput-gmconf-bridge.h"
-#include "ptbuildopts.h"
-#include "ptlib.h"
+#include <ptlib.h>
#define AUDIO_INPUT_FALLBACK_DEVICE_TYPE "Ekiga"
#define AUDIO_INPUT_FALLBACK_DEVICE_SOURCE "Ekiga"
diff --git a/lib/engine/audioinput/audioinput-gmconf-bridge.cpp
b/lib/engine/audioinput/audioinput-gmconf-bridge.cpp
index ee35078..3f30083 100644
--- a/lib/engine/audioinput/audioinput-gmconf-bridge.cpp
+++ b/lib/engine/audioinput/audioinput-gmconf-bridge.cpp
@@ -34,8 +34,6 @@
*
*/
-#include "config.h"
-
#include "audioinput-gmconf-bridge.h"
#include "audioinput-core.h"
diff --git a/lib/engine/audiooutput/audiooutput-core.cpp b/lib/engine/audiooutput/audiooutput-core.cpp
index add180f..a6ba0f9 100644
--- a/lib/engine/audiooutput/audiooutput-core.cpp
+++ b/lib/engine/audiooutput/audiooutput-core.cpp
@@ -39,8 +39,6 @@
#include <glib/gi18n.h>
-#include "config.h"
-
#include "audiooutput-core.h"
#include "audiooutput-manager.h"
diff --git a/lib/engine/audiooutput/audiooutput-core.h b/lib/engine/audiooutput/audiooutput-core.h
index 00063b0..d447880 100644
--- a/lib/engine/audiooutput/audiooutput-core.h
+++ b/lib/engine/audiooutput/audiooutput-core.h
@@ -45,8 +45,7 @@
#include "audiooutput-gmconf-bridge.h"
#include "audiooutput-scheduler.h"
-#include "ptbuildopts.h"
-#include "ptlib.h"
+#include <ptlib.h>
#define AUDIO_OUTPUT_FALLBACK_DEVICE_TYPE "Ekiga"
#define AUDIO_OUTPUT_FALLBACK_DEVICE_SOURCE "Ekiga"
diff --git a/lib/engine/audiooutput/audiooutput-gmconf-bridge.cpp
b/lib/engine/audiooutput/audiooutput-gmconf-bridge.cpp
index 78a684c..bf8dc6c 100644
--- a/lib/engine/audiooutput/audiooutput-gmconf-bridge.cpp
+++ b/lib/engine/audiooutput/audiooutput-gmconf-bridge.cpp
@@ -34,8 +34,6 @@
*
*/
-#include "config.h"
-
#include "audiooutput-gmconf-bridge.h"
#include "audiooutput-core.h"
diff --git a/lib/engine/audiooutput/audiooutput-scheduler.h b/lib/engine/audiooutput/audiooutput-scheduler.h
index 3520d4e..92eb917 100644
--- a/lib/engine/audiooutput/audiooutput-scheduler.h
+++ b/lib/engine/audiooutput/audiooutput-scheduler.h
@@ -43,9 +43,7 @@
#include <glib.h>
#include <vector>
-
-#include "ptbuildopts.h"
-#include "ptlib.h"
+#include <ptlib.h>
#include <ptclib/pwavfile.h>
namespace Ekiga
diff --git a/lib/engine/chat/chat-core.cpp b/lib/engine/chat/chat-core.cpp
index bb95fe2..4b7eb67 100644
--- a/lib/engine/chat/chat-core.cpp
+++ b/lib/engine/chat/chat-core.cpp
@@ -35,8 +35,6 @@
#include "chat-core.h"
-#include <iostream>
-
Ekiga::ChatCore::~ChatCore ()
{
}
diff --git a/lib/engine/components/call-history/history-book.cpp
b/lib/engine/components/call-history/history-book.cpp
index 44e5d11..b2bc417 100644
--- a/lib/engine/components/call-history/history-book.cpp
+++ b/lib/engine/components/call-history/history-book.cpp
@@ -33,10 +33,11 @@
*
*/
-#include "config.h"
+#include "history-book.h"
+
#include <glib/gi18n.h>
+
#include "gmconf.h"
-#include "history-book.h"
History::Book::Book (Ekiga::ServiceCore& core):
contact_core(core.get<Ekiga::ContactCore>("contact-core")), doc()
diff --git a/lib/engine/components/call-history/history-contact.cpp
b/lib/engine/components/call-history/history-contact.cpp
index fc28090..dea5433 100644
--- a/lib/engine/components/call-history/history-contact.cpp
+++ b/lib/engine/components/call-history/history-contact.cpp
@@ -33,16 +33,13 @@
*
*/
-#include "config.h"
+#include "history-contact.h"
-#include <iostream>
-#include <glib/gi18n.h>
#include <glib.h>
+#include <glib/gi18n.h>
#include "robust-xml.h"
-#include "history-contact.h"
-
/* at one point we will return a smart pointer on this... and if we don't use
* a false smart pointer, we will crash : the reference count isn't embedded!
*/
diff --git a/lib/engine/components/call-history/history-source.cpp
b/lib/engine/components/call-history/history-source.cpp
index 3e7b301..d478a93 100644
--- a/lib/engine/components/call-history/history-source.cpp
+++ b/lib/engine/components/call-history/history-source.cpp
@@ -33,8 +33,6 @@
*
*/
-#include <iostream>
-
#include "history-source.h"
History::Source::Source (Ekiga::ServiceCore &_core): core(_core)
diff --git a/lib/engine/components/common-videooutput/videooutput-manager-common.cpp
b/lib/engine/components/common-videooutput/videooutput-manager-common.cpp
index b45f13e..4b4cd30 100644
--- a/lib/engine/components/common-videooutput/videooutput-manager-common.cpp
+++ b/lib/engine/components/common-videooutput/videooutput-manager-common.cpp
@@ -49,6 +49,8 @@
#include "videooutput-manager-common.h"
+#include "runtime.h"
+
/* The functions */
GMVideoOutputManager::GMVideoOutputManager(Ekiga::ServiceCore & _core)
: PThread (1000, AutoDeleteThread, HighestPriority, "GMVideoOutputManager"),
diff --git a/lib/engine/components/common-videooutput/videooutput-manager-common.h
b/lib/engine/components/common-videooutput/videooutput-manager-common.h
index 9365cb5..c896b46 100644
--- a/lib/engine/components/common-videooutput/videooutput-manager-common.h
+++ b/lib/engine/components/common-videooutput/videooutput-manager-common.h
@@ -47,10 +47,10 @@
#define _VIDEOOUTPUT_MANAGER_COMMON_H_
#include "videooutput-manager.h"
-#include "runtime.h"
-#include "ptbuildopts.h"
-#include "ptlib.h"
+#include <ptlib.h>
+
+#include "services.h"
/**
* @addtogroup videooutput
diff --git a/lib/engine/components/echo/echo-dialect.cpp b/lib/engine/components/echo/echo-dialect.cpp
index df9826e..59afd1b 100644
--- a/lib/engine/components/echo/echo-dialect.cpp
+++ b/lib/engine/components/echo/echo-dialect.cpp
@@ -33,8 +33,6 @@
*
*/
-#include <iostream>
-
#include "echo-dialect.h"
Echo::Dialect::Dialect ()
diff --git a/lib/engine/components/gmconf-personal-details/gmconf-personal-details.cpp
b/lib/engine/components/gmconf-personal-details/gmconf-personal-details.cpp
index 533a3ed..cc234c9 100644
--- a/lib/engine/components/gmconf-personal-details/gmconf-personal-details.cpp
+++ b/lib/engine/components/gmconf-personal-details/gmconf-personal-details.cpp
@@ -34,12 +34,11 @@
*
*/
+#include "gmconf-personal-details.h"
+
#include <glib.h>
-#include <iostream>
-#include "config.h"
#include "gmconf.h"
-#include "gmconf-personal-details.h"
static void
display_name_changed_nt (G_GNUC_UNUSED gpointer id,
diff --git a/lib/engine/components/hal-dbus/hal-manager-dbus.cpp
b/lib/engine/components/hal-dbus/hal-manager-dbus.cpp
index 9d8a733..f7fd105 100644
--- a/lib/engine/components/hal-dbus/hal-manager-dbus.cpp
+++ b/lib/engine/components/hal-dbus/hal-manager-dbus.cpp
@@ -48,8 +48,7 @@ extern "C" {
#endif /* HAVE_V4L */
//FIXME: for tracing
-#include "ptbuildopts.h"
-#include "ptlib.h"
+#include <ptlib.h>
HalManager_dbus::HalManager_dbus (Ekiga::ServiceCore & _core)
: core (_core)
diff --git a/lib/engine/components/hal-dbus/hal-manager-dbus.h
b/lib/engine/components/hal-dbus/hal-manager-dbus.h
index c8e2b0c..813e2d0 100644
--- a/lib/engine/components/hal-dbus/hal-manager-dbus.h
+++ b/lib/engine/components/hal-dbus/hal-manager-dbus.h
@@ -40,12 +40,11 @@
#include "hal-core.h"
#include "hal-manager.h"
-#include "runtime.h"
+#include "services.h"
extern "C" {
#include <dbus/dbus.h>
#include <dbus/dbus-glib.h>
-#include <glib-object.h>
}
#include <vector>
diff --git a/lib/engine/components/hal-dbus/hal-v4l-helper.c b/lib/engine/components/hal-dbus/hal-v4l-helper.c
index 8dbf15d..6264739 100644
--- a/lib/engine/components/hal-dbus/hal-v4l-helper.c
+++ b/lib/engine/components/hal-dbus/hal-v4l-helper.c
@@ -37,7 +37,6 @@
*
*/
-#include "config.h"
#include <fcntl.h> // for open()
#include <unistd.h> // for read(), write(), close()
#include <sys/ioctl.h> // for ioctl()
diff --git a/lib/engine/components/local-roster/local-cluster.cpp
b/lib/engine/components/local-roster/local-cluster.cpp
index 6d8f5c3..188d236 100644
--- a/lib/engine/components/local-roster/local-cluster.cpp
+++ b/lib/engine/components/local-roster/local-cluster.cpp
@@ -33,13 +33,10 @@
*
*/
-#include "config.h"
+#include "local-cluster.h"
-#include <iostream>
#include <glib/gi18n.h>
-#include "local-cluster.h"
-
Local::Cluster::Cluster (boost::shared_ptr<Ekiga::PresenceCore> pcore):
presence_core (pcore)
{
diff --git a/lib/engine/components/local-roster/local-heap.cpp
b/lib/engine/components/local-roster/local-heap.cpp
index 5639fa7..4d3e8e2 100644
--- a/lib/engine/components/local-roster/local-heap.cpp
+++ b/lib/engine/components/local-roster/local-heap.cpp
@@ -33,17 +33,16 @@
*
*/
-#include <algorithm>
+#include "local-heap.h"
+
#include <set>
#include <glib/gi18n.h>
-#include "config.h"
-
#include "gmconf.h"
+
#include "form-request-simple.h"
#include "local-cluster.h"
-#include "local-heap.h"
#include "local-presentity.h"
/*
diff --git a/lib/engine/components/local-roster/local-roster-bridge.cpp
b/lib/engine/components/local-roster/local-roster-bridge.cpp
index 1517f61..9d77eb3 100644
--- a/lib/engine/components/local-roster/local-roster-bridge.cpp
+++ b/lib/engine/components/local-roster/local-roster-bridge.cpp
@@ -35,10 +35,10 @@
*
*/
-#include <iostream>
+#include "local-roster-bridge.h"
+
#include <glib/gi18n.h>
-#include "local-roster-bridge.h"
#include "contact-core.h"
#include "local-cluster.h"
diff --git a/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.cpp
b/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.cpp
index 51be6e1..2a87465 100644
--- a/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.cpp
+++ b/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.cpp
@@ -36,9 +36,10 @@
#include "videoinput-manager-mlogo.h"
+#include <glib.h>
+
#include "runtime.h"
-#include <glib.h>
#include "pixmaps/icon.h"
#define DEVICE_TYPE "Moving Logo"
diff --git a/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.h
b/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.h
index 2dc1070..e61f458 100644
--- a/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.h
+++ b/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.h
@@ -40,8 +40,7 @@
#include "videoinput-manager.h"
-#include "ptbuildopts.h"
-#include "ptlib.h"
+#include <ptlib.h>
#include <ptclib/delaychan.h>
/**
diff --git a/lib/engine/components/null-audioinput/audioinput-manager-null.cpp
b/lib/engine/components/null-audioinput/audioinput-manager-null.cpp
index b98abca..a87ddd9 100644
--- a/lib/engine/components/null-audioinput/audioinput-manager-null.cpp
+++ b/lib/engine/components/null-audioinput/audioinput-manager-null.cpp
@@ -34,6 +34,9 @@
#include "audioinput-manager-null.h"
+#include "runtime.h"
+#include "services.h"
+
#define DEVICE_TYPE "Ekiga"
#define DEVICE_SOURCE "Ekiga"
#define DEVICE_NAME "SILENT"
diff --git a/lib/engine/components/null-audioinput/audioinput-manager-null.h
b/lib/engine/components/null-audioinput/audioinput-manager-null.h
index 7462f08..f150ab9 100644
--- a/lib/engine/components/null-audioinput/audioinput-manager-null.h
+++ b/lib/engine/components/null-audioinput/audioinput-manager-null.h
@@ -39,7 +39,7 @@
#include "audioinput-info.h"
#include "audioinput-manager.h"
-#include "runtime.h"
+#include "services.h"
#include <ptlib.h>
#include <ptclib/delaychan.h>
diff --git a/lib/engine/components/null-audiooutput/audiooutput-manager-null.cpp
b/lib/engine/components/null-audiooutput/audiooutput-manager-null.cpp
index a2bb537..b372ff6 100644
--- a/lib/engine/components/null-audiooutput/audiooutput-manager-null.cpp
+++ b/lib/engine/components/null-audiooutput/audiooutput-manager-null.cpp
@@ -34,6 +34,8 @@
#include "audiooutput-manager-null.h"
+#include "runtime.h"
+
#define DEVICE_TYPE "Ekiga"
#define DEVICE_SOURCE "Ekiga"
#define DEVICE_NAME "SILENT"
diff --git a/lib/engine/components/null-audiooutput/audiooutput-manager-null.h
b/lib/engine/components/null-audiooutput/audiooutput-manager-null.h
index 0ee29ad..38fdc81 100644
--- a/lib/engine/components/null-audiooutput/audiooutput-manager-null.h
+++ b/lib/engine/components/null-audiooutput/audiooutput-manager-null.h
@@ -38,7 +38,7 @@
#define __AUDIOOUTPUT_MANAGER_NULL_H__
#include "audiooutput-manager.h"
-#include "runtime.h"
+#include "services.h"
#include <ptlib.h>
#include <ptclib/delaychan.h>
diff --git a/lib/engine/components/opal/h323-endpoint.h b/lib/engine/components/opal/h323-endpoint.h
index e5a2d56..f327605 100644
--- a/lib/engine/components/opal/h323-endpoint.h
+++ b/lib/engine/components/opal/h323-endpoint.h
@@ -46,8 +46,6 @@
#include "presence-core.h"
#include "contact-core.h"
#include "call-manager.h"
-#include "runtime.h"
-#include "services.h"
#include "opal-account.h"
#include "opal-call-manager.h"
diff --git a/lib/engine/components/opal/opal-account.cpp b/lib/engine/components/opal/opal-account.cpp
index 07d8828..90441fd 100644
--- a/lib/engine/components/opal/opal-account.cpp
+++ b/lib/engine/components/opal/opal-account.cpp
@@ -35,11 +35,8 @@
*
*/
-#include "config.h"
-
#include <string.h>
#include <stdlib.h>
-#include <algorithm>
#include <sstream>
#include <glib.h>
diff --git a/lib/engine/components/opal/opal-account.h b/lib/engine/components/opal/opal-account.h
index 55dd311..d38cf2e 100644
--- a/lib/engine/components/opal/opal-account.h
+++ b/lib/engine/components/opal/opal-account.h
@@ -38,9 +38,8 @@
#ifndef __OPAL_ACCOUNT_H__
#define __OPAL_ACCOUNT_H__
-#include "config.h"
-
#include <opal/pres_ent.h>
+#include <sip/sippdu.h>
#include "notification-core.h"
#include "presence-core.h"
@@ -48,7 +47,6 @@
#include "audiooutput-core.h"
#include "bank-impl.h"
-#include <sip/sippdu.h>
namespace Opal
{
diff --git a/lib/engine/components/opal/opal-bank.cpp b/lib/engine/components/opal/opal-bank.cpp
index 35d66c1..74f3ca4 100644
--- a/lib/engine/components/opal/opal-bank.cpp
+++ b/lib/engine/components/opal/opal-bank.cpp
@@ -37,9 +37,7 @@
#include "config.h"
-#include <string.h>
#include <stdlib.h>
-#include <sstream>
#include <glib/gi18n.h>
diff --git a/lib/engine/components/opal/opal-call-manager.cpp
b/lib/engine/components/opal/opal-call-manager.cpp
index 6161c86..d2b27c3 100644
--- a/lib/engine/components/opal/opal-call-manager.cpp
+++ b/lib/engine/components/opal/opal-call-manager.cpp
@@ -47,7 +47,6 @@
#include "videoinput-info.h"
#include "call-manager.h"
-#include "form-request-simple.h"
#include "sip-endpoint.h"
#ifdef HAVE_H323
diff --git a/lib/engine/components/opal/opal-call-manager.h b/lib/engine/components/opal/opal-call-manager.h
index 22bac86..6b50efd 100644
--- a/lib/engine/components/opal/opal-call-manager.h
+++ b/lib/engine/components/opal/opal-call-manager.h
@@ -42,8 +42,6 @@
#include "config.h"
#include <opal/buildopts.h>
-#include <ptbuildopts.h>
-
#include <ptlib.h>
#include <h323/h323.h>
diff --git a/lib/engine/components/opal/opal-call.cpp b/lib/engine/components/opal/opal-call.cpp
index 2f562b6..4af2050 100644
--- a/lib/engine/components/opal/opal-call.cpp
+++ b/lib/engine/components/opal/opal-call.cpp
@@ -48,6 +48,7 @@
#include "opal-call-manager.h"
#include "notification-core.h"
#include "call-core.h"
+#include "runtime.h"
using namespace Opal;
diff --git a/lib/engine/components/opal/opal-call.h b/lib/engine/components/opal/opal-call.h
index 9812f1d..cdbc672 100644
--- a/lib/engine/components/opal/opal-call.h
+++ b/lib/engine/components/opal/opal-call.h
@@ -38,7 +38,6 @@
#include <opal/opal.h>
#include <opal/call.h>
-#include "runtime.h"
#include "call.h"
#include "notification-core.h"
diff --git a/lib/engine/components/opal/opal-codec-description.cpp
b/lib/engine/components/opal/opal-codec-description.cpp
index 9d994c0..349db5c 100644
--- a/lib/engine/components/opal/opal-codec-description.cpp
+++ b/lib/engine/components/opal/opal-codec-description.cpp
@@ -34,8 +34,6 @@
*/
#include <algorithm>
-#include <iostream>
-#include <sstream>
#include "opal-codec-description.h"
diff --git a/lib/engine/components/opal/opal-codec-description.h
b/lib/engine/components/opal/opal-codec-description.h
index 84ad0c4..b242e82 100644
--- a/lib/engine/components/opal/opal-codec-description.h
+++ b/lib/engine/components/opal/opal-codec-description.h
@@ -37,9 +37,8 @@
#ifndef __OPAL_CODEC_DESCRIPTION_H__
#define __OPAL_CODEC_DESCRIPTION_H__
-#include <opal/buildopts.h>
-#include <ptbuildopts.h>
#include <ptlib.h>
+#include <opal/buildopts.h>
#include <opal/manager.h>
#include "codec-description.h"
diff --git a/lib/engine/components/opal/opal-gmconf-bridge.h b/lib/engine/components/opal/opal-gmconf-bridge.h
index afb0ec2..af9dfb1 100644
--- a/lib/engine/components/opal/opal-gmconf-bridge.h
+++ b/lib/engine/components/opal/opal-gmconf-bridge.h
@@ -40,8 +40,6 @@
#include "gmconf-bridge.h"
#include "services.h"
-class GMManager;
-
namespace Opal
{
class CallManager;
diff --git a/lib/engine/components/opal/opal-videoinput.h b/lib/engine/components/opal/opal-videoinput.h
index 0d2e150..6e3d9b2 100644
--- a/lib/engine/components/opal/opal-videoinput.h
+++ b/lib/engine/components/opal/opal-videoinput.h
@@ -40,7 +40,6 @@
#ifndef _EKIGA_VIDEO_INPUT_H_
#define _EKIGA_VIDEO_INPUT_H_
-#include <ptbuildopts.h>
#include <ptlib.h>
#include <opal/manager.h>
diff --git a/lib/engine/components/opal/opal-videooutput.cpp b/lib/engine/components/opal/opal-videooutput.cpp
index a9669c2..5dd3670 100644
--- a/lib/engine/components/opal/opal-videooutput.cpp
+++ b/lib/engine/components/opal/opal-videooutput.cpp
@@ -35,7 +35,6 @@
*
*/
-#include <ptbuildopts.h>
#include <ptlib.h>
#include <opal/manager.h>
diff --git a/lib/engine/components/opal/opal-videooutput.h b/lib/engine/components/opal/opal-videooutput.h
index 38d786d..e3e3a0a 100644
--- a/lib/engine/components/opal/opal-videooutput.h
+++ b/lib/engine/components/opal/opal-videooutput.h
@@ -42,8 +42,6 @@
#include "videooutput-core.h"
-class GMManager;
-
class PVideoOutputDevice_EKIGA : public PVideoOutputDevice
{
PCLASSINFO(PVideoOutputDevice_EKIGA, PVideoOutputDevice);
diff --git a/lib/engine/components/opal/pcss-endpoint.cpp b/lib/engine/components/opal/pcss-endpoint.cpp
index 8727fb1..e51e4b7 100644
--- a/lib/engine/components/opal/pcss-endpoint.cpp
+++ b/lib/engine/components/opal/pcss-endpoint.cpp
@@ -35,14 +35,9 @@
*
*/
-
-#include "config.h"
-
#include "pcss-endpoint.h"
#include "opal-call-manager.h"
-#include "call.h"
-
GMPCSSEndpoint::GMPCSSEndpoint (Opal::CallManager & ep,
Ekiga::ServiceCore & _core)
diff --git a/lib/engine/components/opal/pcss-endpoint.h b/lib/engine/components/opal/pcss-endpoint.h
index 4ee2ea3..a4660d1 100644
--- a/lib/engine/components/opal/pcss-endpoint.h
+++ b/lib/engine/components/opal/pcss-endpoint.h
@@ -40,7 +40,6 @@
#define _PCSS_ENDPOINT_H_
#include "services.h"
-#include "runtime.h"
#include <opal/opal.h>
#include <opal/pcss.h>
diff --git a/lib/engine/components/opal/sip-dialect.cpp b/lib/engine/components/opal/sip-dialect.cpp
index 2aba323..21a3863 100644
--- a/lib/engine/components/opal/sip-dialect.cpp
+++ b/lib/engine/components/opal/sip-dialect.cpp
@@ -35,8 +35,6 @@
*
*/
-#include "config.h"
-
#include "sip-dialect.h"
#include "presence-core.h"
#include "personal-details.h"
diff --git a/lib/engine/components/opal/sip-endpoint.h b/lib/engine/components/opal/sip-endpoint.h
index d4d6553..2c634a5 100644
--- a/lib/engine/components/opal/sip-endpoint.h
+++ b/lib/engine/components/opal/sip-endpoint.h
@@ -48,7 +48,6 @@
#include "sip-dialect.h"
#include "call-core.h"
#include "contact-core.h"
-#include "runtime.h"
#include "services.h"
#include "opal-call-manager.h"
diff --git a/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
b/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
index 6557e6a..8f13c85 100644
--- a/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
+++ b/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
@@ -35,8 +35,10 @@
*/
#include "audioinput-manager-ptlib.h"
-#include "ptbuildopts.h"
-#include "ptlib.h"
+
+#include <ptlib.h>
+
+#include "runtime.h"
#include "utils.h"
#define DEVICE_TYPE "PTLIB"
diff --git a/lib/engine/components/ptlib/audioinput-manager-ptlib.h
b/lib/engine/components/ptlib/audioinput-manager-ptlib.h
index a23d11f..2ee74ae 100644
--- a/lib/engine/components/ptlib/audioinput-manager-ptlib.h
+++ b/lib/engine/components/ptlib/audioinput-manager-ptlib.h
@@ -38,12 +38,12 @@
#ifndef __AUDIOINPUT_MANAGER_PTLIB_H__
#define __AUDIOINPUT_MANAGER_PTLIB_H__
-#include "audioinput-manager.h"
-#include "runtime.h"
-
-#include "ptbuildopts.h"
+#include <ptbuildopts.h>
#include <ptlib/sound.h>
+#include "services.h"
+#include "audioinput-manager.h"
+
/**
* @addtogroup audioinput
* @{
diff --git a/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
b/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
index cd68253..fbf5606 100644
--- a/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
+++ b/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
@@ -35,8 +35,10 @@
*/
#include "audiooutput-manager-ptlib.h"
-#include "ptbuildopts.h"
-#include "ptlib.h"
+
+#include <ptlib.h>
+
+#include "runtime.h"
#include "utils.h"
#define DEVICE_TYPE "PTLIB"
diff --git a/lib/engine/components/ptlib/audiooutput-manager-ptlib.h
b/lib/engine/components/ptlib/audiooutput-manager-ptlib.h
index 11fe918..439694d 100644
--- a/lib/engine/components/ptlib/audiooutput-manager-ptlib.h
+++ b/lib/engine/components/ptlib/audiooutput-manager-ptlib.h
@@ -39,9 +39,9 @@
#define __AUDIOINPUT_MANAGER_PTLIB_H__
#include "audiooutput-manager.h"
-#include "runtime.h"
+#include "services.h"
-#include "ptbuildopts.h"
+#include <ptbuildopts.h>
#include <ptlib/sound.h>
/**
diff --git a/lib/engine/components/ptlib/utils.cpp b/lib/engine/components/ptlib/utils.cpp
index 400e232..e68d893 100644
--- a/lib/engine/components/ptlib/utils.cpp
+++ b/lib/engine/components/ptlib/utils.cpp
@@ -33,11 +33,10 @@
* description : Functions to change encoding of std::string
*/
+#include "utils.h"
#include <glib.h>
-#include "utils.h"
-
const std::string
codepage2utf (const std::string str)
{
diff --git a/lib/engine/components/ptlib/utils.h b/lib/engine/components/ptlib/utils.h
index 5eba947..a8d5175 100644
--- a/lib/engine/components/ptlib/utils.h
+++ b/lib/engine/components/ptlib/utils.h
@@ -33,7 +33,6 @@
* description : Functions to change encoding of std::string
*/
-
#include <string>
/* DESCRIPTION : /
diff --git a/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
b/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
index f56617c..2e7200a 100644
--- a/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
+++ b/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
@@ -35,9 +35,10 @@
*/
#include "videoinput-manager-ptlib.h"
-#include "ptbuildopts.h"
-#include "ptlib.h"
-#include "utils.h"
+
+#include <ptlib.h>
+
+#include "runtime.h"
#define DEVICE_TYPE "PTLIB"
diff --git a/lib/engine/components/ptlib/videoinput-manager-ptlib.h
b/lib/engine/components/ptlib/videoinput-manager-ptlib.h
index dd93907..a4b9307 100644
--- a/lib/engine/components/ptlib/videoinput-manager-ptlib.h
+++ b/lib/engine/components/ptlib/videoinput-manager-ptlib.h
@@ -39,9 +39,8 @@
#define __VIDEOINPUT_MANAGER_PTLIB_H__
#include "videoinput-manager.h"
-#include "runtime.h"
-#include "ptbuildopts.h"
+#include <ptbuildopts.h>
#include <ptlib/videoio.h>
/**
diff --git a/lib/engine/components/x-videooutput/videooutput-manager-x.cpp
b/lib/engine/components/x-videooutput/videooutput-manager-x.cpp
index c00faff..1db69e4 100644
--- a/lib/engine/components/x-videooutput/videooutput-manager-x.cpp
+++ b/lib/engine/components/x-videooutput/videooutput-manager-x.cpp
@@ -41,6 +41,7 @@
#include "videooutput-manager-x.h"
+#include "runtime.h"
#include "xwindow.h"
#ifdef HAVE_XV
diff --git a/lib/engine/engine.h b/lib/engine/engine.h
index 28854a2..169f4d1 100644
--- a/lib/engine/engine.h
+++ b/lib/engine/engine.h
@@ -38,7 +38,6 @@
#define __ENGINE_H__
#include "services.h"
-#include "runtime.h"
/**
* @addtogroup services
diff --git a/lib/engine/framework/form-request-simple.cpp b/lib/engine/framework/form-request-simple.cpp
index 1784310..22b7cdc 100644
--- a/lib/engine/framework/form-request-simple.cpp
+++ b/lib/engine/framework/form-request-simple.cpp
@@ -33,8 +33,6 @@
*
*/
-#include <iostream>
-
#include "form-request-simple.h"
Ekiga::FormRequestSimple::FormRequestSimple (boost::function2<void, bool, Form&> callback_):
callback(callback_)
diff --git a/lib/engine/framework/gmconf-bridge.cpp b/lib/engine/framework/gmconf-bridge.cpp
index fd41667..c33dbf2 100644
--- a/lib/engine/framework/gmconf-bridge.cpp
+++ b/lib/engine/framework/gmconf-bridge.cpp
@@ -34,8 +34,6 @@
*
*/
-#include <iostream>
-
#include "gmconf-bridge.h"
#include "gmconf.h"
diff --git a/lib/engine/framework/menu-xml.cpp b/lib/engine/framework/menu-xml.cpp
index 57f72fd..73f021e 100644
--- a/lib/engine/framework/menu-xml.cpp
+++ b/lib/engine/framework/menu-xml.cpp
@@ -33,8 +33,6 @@
*
*/
-#include <iostream>
-
#include <glib.h>
#include "menu-xml.h"
diff --git a/lib/engine/gui/gtk-core/codecsbox.cpp b/lib/engine/gui/gtk-core/codecsbox.cpp
index 6e771fe..4784106 100644
--- a/lib/engine/gui/gtk-core/codecsbox.cpp
+++ b/lib/engine/gui/gtk-core/codecsbox.cpp
@@ -35,9 +35,10 @@
*
*/
-#include "config.h"
#include "codecsbox.h"
+#include <glib/gi18n.h>
+
#include "gmconf.h"
#include "codec-description.h"
diff --git a/lib/engine/gui/gtk-core/codecsbox.h b/lib/engine/gui/gtk-core/codecsbox.h
index a40998b..846517f 100644
--- a/lib/engine/gui/gtk-core/codecsbox.h
+++ b/lib/engine/gui/gtk-core/codecsbox.h
@@ -40,7 +40,6 @@
#ifndef __CODECS_BOX_H
#define __CODECS_BOX_H
-#include <glib/gi18n.h>
#include <glib-object.h>
#include <gtk/gtk.h>
diff --git a/lib/engine/gui/gtk-core/gtk-core-main.cpp b/lib/engine/gui/gtk-core/gtk-core-main.cpp
index 0ea55e9..117730a 100644
--- a/lib/engine/gui/gtk-core/gtk-core-main.cpp
+++ b/lib/engine/gui/gtk-core/gtk-core-main.cpp
@@ -36,8 +36,6 @@
*
*/
-#include <gtk/gtk.h>
-
#include "gtk-core-main.h"
#include "gtk-core.h"
diff --git a/lib/engine/gui/gtk-core/gtk-core.cpp b/lib/engine/gui/gtk-core/gtk-core.cpp
index ddf7770..dae9f55 100644
--- a/lib/engine/gui/gtk-core/gtk-core.cpp
+++ b/lib/engine/gui/gtk-core/gtk-core.cpp
@@ -33,8 +33,6 @@
*
*/
-#include <gtk/gtk.h>
-
#include "gmstockicons.h"
#include "gtk-core.h"
diff --git a/lib/engine/gui/gtk-core/menu-builder-gtk.cpp b/lib/engine/gui/gtk-core/menu-builder-gtk.cpp
index a3fc400..d69184a 100644
--- a/lib/engine/gui/gtk-core/menu-builder-gtk.cpp
+++ b/lib/engine/gui/gtk-core/menu-builder-gtk.cpp
@@ -35,8 +35,6 @@
*
*/
-#include <iostream>
-
#include "menu-builder-gtk.h"
struct Action
diff --git a/lib/engine/gui/gtk-frontend/accounts-window.cpp b/lib/engine/gui/gtk-frontend/accounts-window.cpp
index afc636d..5035fa9 100644
--- a/lib/engine/gui/gtk-frontend/accounts-window.cpp
+++ b/lib/engine/gui/gtk-frontend/accounts-window.cpp
@@ -37,14 +37,14 @@
#include "accounts-window.h"
+#include <glib/gi18n.h>
+
#include "account.h"
#include "bank.h"
#include "opal-bank.h"
#include "gmcallbacks.h"
-#include "gmconf.h"
-
#include "services.h"
#include "menu-builder-tools.h"
#include "menu-builder-gtk.h"
diff --git a/lib/engine/gui/gtk-frontend/accounts-window.h b/lib/engine/gui/gtk-frontend/accounts-window.h
index aeda4f7..eba1468 100644
--- a/lib/engine/gui/gtk-frontend/accounts-window.h
+++ b/lib/engine/gui/gtk-frontend/accounts-window.h
@@ -40,7 +40,6 @@
#define _ACCOUNTS_H_
#include <glib.h>
-#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include "services.h"
diff --git a/lib/engine/gui/gtk-frontend/addressbook-window.cpp
b/lib/engine/gui/gtk-frontend/addressbook-window.cpp
index 1dddb83..582c5b5 100644
--- a/lib/engine/gui/gtk-frontend/addressbook-window.cpp
+++ b/lib/engine/gui/gtk-frontend/addressbook-window.cpp
@@ -32,13 +32,8 @@
*
*/
-#include <iostream>
-#include <map>
-#include <vector>
#include <glib/gi18n.h>
-#include "gmstockicons.h"
-
#include "addressbook-window.h"
#include "book-view-gtk.h"
#include "menu-builder-gtk.h"
diff --git a/lib/engine/gui/gtk-frontend/book-view-gtk.cpp b/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
index 6462ce1..412e788 100644
--- a/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
@@ -35,16 +35,12 @@
*
*/
-
-#include <algorithm>
-#include <iostream>
#include <glib/gi18n.h>
#include "book-view-gtk.h"
#include "filterable.h"
-#include "gmstockicons.h"
#include "menu-builder-tools.h"
#include "menu-builder-gtk.h"
#include "scoped-connections.h"
diff --git a/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
b/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
index d44e42e..2a08af8 100644
--- a/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
@@ -36,8 +36,6 @@
*/
#include <sstream>
-#include <iostream>
-#include <iomanip>
#include <glib/gi18n.h>
#include "call-history-view-gtk.h"
diff --git a/lib/engine/gui/gtk-frontend/call-window.cpp b/lib/engine/gui/gtk-frontend/call-window.cpp
index 0c4a8f5..a3fa2d7 100644
--- a/lib/engine/gui/gtk-frontend/call-window.cpp
+++ b/lib/engine/gui/gtk-frontend/call-window.cpp
@@ -38,8 +38,6 @@
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#include "config.h"
-
#include "call-window.h"
#include "dialpad.h"
@@ -51,7 +49,6 @@
#include "gmconf.h"
#include <boost/smart_ptr.hpp>
#include "gmmenuaddon.h"
-//#include "gmlevelmeter.h"
#include "gmpowermeter.h"
#include "trigger.h"
#include "scoped-connections.h"
@@ -78,8 +75,6 @@
#include "audioinput-core.h"
#include "audiooutput-core.h"
-#include <algorithm>
-
enum CallingState {Standby, Calling, Ringing, Connected, Called};
enum DeviceType {AudioInput, AudioOutput, Ringer, VideoInput};
diff --git a/lib/engine/gui/gtk-frontend/chat-area.cpp b/lib/engine/gui/gtk-frontend/chat-area.cpp
index af4c244..d411a98 100644
--- a/lib/engine/gui/gtk-frontend/chat-area.cpp
+++ b/lib/engine/gui/gtk-frontend/chat-area.cpp
@@ -44,7 +44,6 @@
#include "gm-text-extlink.h"
#include "gm-smiley-chooser-button.h"
-#include "gm-smileys.h"
#include "platform.h"
#include <string.h>
diff --git a/lib/engine/gui/gtk-frontend/chat-window.cpp b/lib/engine/gui/gtk-frontend/chat-window.cpp
index 8b6d7de..f4970c3 100644
--- a/lib/engine/gui/gtk-frontend/chat-window.cpp
+++ b/lib/engine/gui/gtk-frontend/chat-window.cpp
@@ -41,7 +41,6 @@
#include "chat-core.h"
#include "notification-core.h"
-#include "menu-builder-gtk.h"
#include "form-dialog-gtk.h"
#include "scoped-connections.h"
diff --git a/lib/engine/gui/gtk-frontend/device-lists.cpp b/lib/engine/gui/gtk-frontend/device-lists.cpp
index a903007..f7ca6cc 100644
--- a/lib/engine/gui/gtk-frontend/device-lists.cpp
+++ b/lib/engine/gui/gtk-frontend/device-lists.cpp
@@ -32,10 +32,10 @@
* description : This file contains functions to get device lists
*/
-#include "config.h"
-
#include "device-lists.h"
+#include <glib/gi18n.h>
+
gchar**
vector_of_string_to_array (const std::vector<std::string>& list)
{
diff --git a/lib/engine/gui/gtk-frontend/device-lists.h b/lib/engine/gui/gtk-frontend/device-lists.h
index b0b0bda..8663f1b 100644
--- a/lib/engine/gui/gtk-frontend/device-lists.h
+++ b/lib/engine/gui/gtk-frontend/device-lists.h
@@ -33,7 +33,6 @@
*/
#include <glib.h>
-#include <glib/gi18n.h>
#include "audiooutput-core.h"
#include "audioinput-core.h"
diff --git a/lib/engine/gui/gtk-frontend/ext-window.cpp b/lib/engine/gui/gtk-frontend/ext-window.cpp
index 368d844..6dc71a4 100644
--- a/lib/engine/gui/gtk-frontend/ext-window.cpp
+++ b/lib/engine/gui/gtk-frontend/ext-window.cpp
@@ -26,7 +26,6 @@
* GNU GPL for all the rest of the software thus combined.
*/
-#include "config.h"
#include "ext-window.h"
#ifndef WIN32
diff --git a/lib/engine/gui/gtk-frontend/gtk-frontend.cpp b/lib/engine/gui/gtk-frontend/gtk-frontend.cpp
index 4cbccb6..559a169 100644
--- a/lib/engine/gui/gtk-frontend/gtk-frontend.cpp
+++ b/lib/engine/gui/gtk-frontend/gtk-frontend.cpp
@@ -36,8 +36,6 @@
*
*/
-#include <iostream>
-
#include <gtk/gtk.h>
#include "config.h"
diff --git a/lib/engine/gui/gtk-frontend/gtk-frontend.h b/lib/engine/gui/gtk-frontend/gtk-frontend.h
index 8543de8..5815d89 100644
--- a/lib/engine/gui/gtk-frontend/gtk-frontend.h
+++ b/lib/engine/gui/gtk-frontend/gtk-frontend.h
@@ -40,7 +40,6 @@
#define __GTK_FRONTEND_H__
#include <gtk/gtk.h>
-#include <vector>
#include "statusicon.h"
diff --git a/lib/engine/gui/gtk-frontend/main_window.cpp b/lib/engine/gui/gtk-frontend/main_window.cpp
index 48846c5..87b1003 100644
--- a/lib/engine/gui/gtk-frontend/main_window.cpp
+++ b/lib/engine/gui/gtk-frontend/main_window.cpp
@@ -46,7 +46,6 @@
#include "gmdialog.h"
#include "gmentrydialog.h"
#include "gmstatusbar.h"
-#include "gmstockicons.h"
#include "gmmenuaddon.h"
#include "trigger.h"
#include "menu-builder-tools.h"
diff --git a/lib/engine/gui/gtk-frontend/preferences-window.cpp
b/lib/engine/gui/gtk-frontend/preferences-window.cpp
index d1e22e8..fa7beca 100644
--- a/lib/engine/gui/gtk-frontend/preferences-window.cpp
+++ b/lib/engine/gui/gtk-frontend/preferences-window.cpp
@@ -39,8 +39,10 @@
#include "config.h"
-#include <gmpreferences.h>
-#include <gmconf.h>
+#include <glib/gi18n.h>
+
+#include "gmpreferences.h"
+#include "gmconf.h"
#include "preferences-window.h"
#include "default_devices.h"
diff --git a/lib/engine/gui/gtk-frontend/preferences-window.h
b/lib/engine/gui/gtk-frontend/preferences-window.h
index a7c4ecb..48ac4cb 100644
--- a/lib/engine/gui/gtk-frontend/preferences-window.h
+++ b/lib/engine/gui/gtk-frontend/preferences-window.h
@@ -42,7 +42,7 @@
#include <gtk/gtk.h>
-#include "framework/services.h"
+#include "services.h"
/* DESCRIPTION : /
* BEHAVIOR : It builds the preferences window
diff --git a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
index d6fe9b5..740efdc 100644
--- a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
@@ -35,15 +35,10 @@
*
*/
-#include <algorithm>
-#include <iostream>
-#include <vector>
#include <ctime>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#include "config.h"
-
#include "gm-cell-renderer-bitext.h"
#include "gmcellrendererexpander.h"
#include "gmconf.h"
diff --git a/lib/engine/gui/gtk-frontend/statusicon.cpp b/lib/engine/gui/gtk-frontend/statusicon.cpp
index 0c61cbc..a07ead5 100644
--- a/lib/engine/gui/gtk-frontend/statusicon.cpp
+++ b/lib/engine/gui/gtk-frontend/statusicon.cpp
@@ -38,8 +38,6 @@
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#include <vector>
-
#include "statusicon.h"
#include "gmstockicons.h"
diff --git a/lib/engine/gui/gtk-frontend/statusmenu.cpp b/lib/engine/gui/gtk-frontend/statusmenu.cpp
index c38733f..f341a7f 100644
--- a/lib/engine/gui/gtk-frontend/statusmenu.cpp
+++ b/lib/engine/gui/gtk-frontend/statusmenu.cpp
@@ -35,17 +35,14 @@
*
*/
-
-#include "config.h"
-
#include "statusmenu.h"
-#include "personal-details.h"
+#include <glib/gi18n.h>
#include "gmconf.h"
-#include <glib/gi18n.h>
-#include <vector>
+#include "personal-details.h"
+
struct _StatusMenuPrivate
{
diff --git a/lib/engine/hal/hal-core.cpp b/lib/engine/hal/hal-core.cpp
index d8c95bd..7487490 100644
--- a/lib/engine/hal/hal-core.cpp
+++ b/lib/engine/hal/hal-core.cpp
@@ -34,11 +34,6 @@
*
*/
-#include <iostream>
-#include <sstream>
-
-#include "config.h"
-
#include "hal-core.h"
#include "hal-manager.h"
diff --git a/lib/engine/hal/hal-core.h b/lib/engine/hal/hal-core.h
index 3a66314..7e7bb68 100644
--- a/lib/engine/hal/hal-core.h
+++ b/lib/engine/hal/hal-core.h
@@ -44,7 +44,6 @@
#include <boost/bind.hpp>
#include <set>
-#include <map>
#define V4L_VERSION_1 (1<<0)
#define V4L_VERSION_2 (1<<1)
diff --git a/lib/engine/protocol/call-core.cpp b/lib/engine/protocol/call-core.cpp
index e8de1ed..9b0ad4c 100644
--- a/lib/engine/protocol/call-core.cpp
+++ b/lib/engine/protocol/call-core.cpp
@@ -34,11 +34,6 @@
*
*/
-#include <iostream>
-#include <sstream>
-
-#include "config.h"
-
#include "call-core.h"
#include "call-manager.h"
diff --git a/lib/engine/protocol/call-core.h b/lib/engine/protocol/call-core.h
index 35040f3..bff0d24 100644
--- a/lib/engine/protocol/call-core.h
+++ b/lib/engine/protocol/call-core.h
@@ -51,8 +51,6 @@
#include <set>
#include <map>
-#include <iostream>
-
namespace Ekiga
{
diff --git a/lib/engine/videoinput/videoinput-core.cpp b/lib/engine/videoinput/videoinput-core.cpp
index 56b27fd..0aae9ac 100644
--- a/lib/engine/videoinput/videoinput-core.cpp
+++ b/lib/engine/videoinput/videoinput-core.cpp
@@ -35,12 +35,9 @@
*/
#include <iostream>
-#include <sstream>
#include <glib/gi18n.h>
-#include "config.h"
-
#include "videoinput-core.h"
#include "videoinput-manager.h"
diff --git a/lib/engine/videoinput/videoinput-core.h b/lib/engine/videoinput/videoinput-core.h
index 3f87f89..19a636d 100644
--- a/lib/engine/videoinput/videoinput-core.h
+++ b/lib/engine/videoinput/videoinput-core.h
@@ -49,9 +49,7 @@
#include <boost/bind.hpp>
#include <glib.h>
#include <set>
-
-#include "ptbuildopts.h"
-#include "ptlib.h"
+#include <ptlib.h>
#define VIDEO_INPUT_FALLBACK_DEVICE_TYPE "Moving Logo"
#define VIDEO_INPUT_FALLBACK_DEVICE_SOURCE "Moving Logo"
diff --git a/lib/engine/videoinput/videoinput-gmconf-bridge.cpp
b/lib/engine/videoinput/videoinput-gmconf-bridge.cpp
index 12b9997..1ef576f 100644
--- a/lib/engine/videoinput/videoinput-gmconf-bridge.cpp
+++ b/lib/engine/videoinput/videoinput-gmconf-bridge.cpp
@@ -34,8 +34,6 @@
*
*/
-#include "config.h"
-
#include "videoinput-gmconf-bridge.h"
#include "videoinput-core.h"
diff --git a/lib/engine/videooutput/videooutput-core.cpp b/lib/engine/videooutput/videooutput-core.cpp
index 19ceed1..dcb3683 100644
--- a/lib/engine/videooutput/videooutput-core.cpp
+++ b/lib/engine/videooutput/videooutput-core.cpp
@@ -34,11 +34,6 @@
*
*/
-#include <iostream>
-#include <sstream>
-
-#include "config.h"
-
#include "videooutput-core.h"
#include "videooutput-manager.h"
diff --git a/lib/engine/videooutput/videooutput-core.h b/lib/engine/videooutput/videooutput-core.h
index 2ff261d..905d915 100644
--- a/lib/engine/videooutput/videooutput-core.h
+++ b/lib/engine/videooutput/videooutput-core.h
@@ -46,11 +46,8 @@
#include <boost/bind.hpp>
#include <set>
#include <map>
-
#include <glib.h>
-
-#include "ptbuildopts.h"
-#include "ptlib.h"
+#include <ptlib.h>
namespace Ekiga
{
diff --git a/lib/engine/videooutput/videooutput-gmconf-bridge.cpp
b/lib/engine/videooutput/videooutput-gmconf-bridge.cpp
index bdea6d6..ba2a2fc 100644
--- a/lib/engine/videooutput/videooutput-gmconf-bridge.cpp
+++ b/lib/engine/videooutput/videooutput-gmconf-bridge.cpp
@@ -34,8 +34,6 @@
*
*/
-#include "config.h"
-
#include "videooutput-gmconf-bridge.h"
#include "videooutput-core.h"
diff --git a/lib/gmconf/gmconf-ekiga-keys.h b/lib/gmconf/gmconf-ekiga-keys.h
index f1021a2..a8ff9bf 100644
--- a/lib/gmconf/gmconf-ekiga-keys.h
+++ b/lib/gmconf/gmconf-ekiga-keys.h
@@ -36,6 +36,7 @@
*
*/
+#include "config.h"
#ifndef GMCONF_EKIGA_KEYS_H_
#define GMCONF_EKIGA_KEYS_H_
diff --git a/lib/gmconf/gmconf-gconf.c b/lib/gmconf/gmconf-gconf.c
index 8b806f2..51282f5 100644
--- a/lib/gmconf/gmconf-gconf.c
+++ b/lib/gmconf/gmconf-gconf.c
@@ -38,13 +38,13 @@
*
*/
-
-#include "config.h"
-
-#include <gconf/gconf-client.h>
#include <string.h>
+#include <glib.h>
+#include <gconf/gconf-client.h>
+
+#include "gmconf.h"
-#include <gmconf/gmconf.h>
+#include "config.h"
/* Using a global variable is dirty, but the api is built like this
*/
@@ -54,6 +54,7 @@ static GConfClient *client;
* call the GmConfNotifier from inside a gconf notifier, so we hide the real
* notifier and its associated user data into the user data of a gconf
* notifier, that will do the unwrapping, and call the real stuff */
+
typedef struct _GConfNotifierWrap GConfNotifierWrap;
struct _GConfNotifierWrap {
diff --git a/lib/gmconf/gmconf-upgrade.c b/lib/gmconf/gmconf-upgrade.c
index 0adfd79..c25532c 100644
--- a/lib/gmconf/gmconf-upgrade.c
+++ b/lib/gmconf/gmconf-upgrade.c
@@ -43,7 +43,7 @@
#include "gmconf-upgrade.h"
-#include "config.h"
+#include "gmconf.h"
void
gmconf_upgrade_version ()
diff --git a/lib/gmconf/gmconf-upgrade.h b/lib/gmconf/gmconf-upgrade.h
index ca3bab8..0c91abe 100644
--- a/lib/gmconf/gmconf-upgrade.h
+++ b/lib/gmconf/gmconf-upgrade.h
@@ -44,7 +44,7 @@
#ifndef _GMCONF_UPGRADE_H
#define _GMCONF_UPGRADE_H
-#include "gmconf.h"
+#include <glib.h>
G_BEGIN_DECLS
diff --git a/lib/gui/dialpad.c b/lib/gui/dialpad.c
index 4ab4e47..69e3845 100644
--- a/lib/gui/dialpad.c
+++ b/lib/gui/dialpad.c
@@ -36,6 +36,7 @@
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
+#include <string.h>
struct const_key_info
{
diff --git a/lib/gui/gm-text-extlink.c b/lib/gui/gm-text-extlink.c
index 7d8fcd3..a7abf8e 100644
--- a/lib/gui/gm-text-extlink.c
+++ b/lib/gui/gm-text-extlink.c
@@ -38,7 +38,6 @@
#include "gm-text-extlink.h"
#include <string.h>
-#include <sys/types.h>
#include <regex.h>
struct _GmTextExtlinkPrivate {
diff --git a/lib/gui/gmcallbacks.c b/lib/gui/gmcallbacks.c
index 8a9f589..d195dd3 100644
--- a/lib/gui/gmcallbacks.c
+++ b/lib/gui/gmcallbacks.c
@@ -41,7 +41,6 @@
#include "gmcallbacks.h"
-#include "gmwindow.h"
#include "gmstockicons.h"
#ifdef WIN32
diff --git a/lib/gui/gmdialog.c b/lib/gui/gmdialog.c
index 4ef228c..8708249 100644
--- a/lib/gui/gmdialog.c
+++ b/lib/gui/gmdialog.c
@@ -45,15 +45,11 @@
#include <glib/gi18n.h>
#include <stdio.h>
-#include <string.h>
#include <stdarg.h>
#include "gmdialog.h"
-
#include "gmwindow.h"
-#include "config.h"
-
/* GUI functions */
diff --git a/lib/gui/gmdialog.h b/lib/gui/gmdialog.h
index 26d48db..0a5862e 100644
--- a/lib/gui/gmdialog.h
+++ b/lib/gui/gmdialog.h
@@ -46,8 +46,6 @@
#ifndef __GM_DIALOG_H
#define __GM_DIALOG_H
-#include <stdarg.h>
-
G_BEGIN_DECLS
/**
diff --git a/lib/gui/gmmenuaddon.h b/lib/gui/gmmenuaddon.h
index e9b945f..f4ec63b 100644
--- a/lib/gui/gmmenuaddon.h
+++ b/lib/gui/gmmenuaddon.h
@@ -41,7 +41,6 @@
#include <gtk/gtk.h>
-
G_BEGIN_DECLS
/* Possible values for the Menu entries */
diff --git a/lib/gui/gmpreferences.c b/lib/gui/gmpreferences.c
index 62fe482..2e77117 100644
--- a/lib/gui/gmpreferences.c
+++ b/lib/gui/gmpreferences.c
@@ -972,7 +972,7 @@ gnome_prefs_window_new (const gchar *logo_name)
cwhite.blue = 1.0;
cwhite.alpha = 1.0;
gtk_widget_override_background_color (GTK_WIDGET (event_box),
- GTK_STATE_NORMAL, &cwhite);
+ GTK_STATE_FLAG_NORMAL, &cwhite);
gtk_notebook_prepend_page (GTK_NOTEBOOK (gpw->notebook), event_box, NULL);
diff --git a/lib/gui/gmstatusbar.c b/lib/gui/gmstatusbar.c
index 09ab0b9..0f1b4ca 100644
--- a/lib/gui/gmstatusbar.c
+++ b/lib/gui/gmstatusbar.c
@@ -38,6 +38,8 @@
#include "gmstatusbar.h"
+#include <stdarg.h>
+
G_DEFINE_TYPE (GmStatusbar, gm_statusbar, GTK_TYPE_STATUSBAR);
/* this is ugly, but we want to give several pieces of data to a callback...
diff --git a/lib/gui/gmwindow.c b/lib/gui/gmwindow.c
index 28fd6ba..3aef798 100644
--- a/lib/gui/gmwindow.c
+++ b/lib/gui/gmwindow.c
@@ -36,14 +36,11 @@
*
*/
-#include "config.h"
-
#include "gmwindow.h"
#include "gmconf.h"
#include <gdk/gdkkeysyms.h>
-#include <string.h>
#include <stdlib.h>
/*
diff --git a/lib/pixops/pixops.c b/lib/pixops/pixops.c
index b459edf..84ae20c 100644
--- a/lib/pixops/pixops.c
+++ b/lib/pixops/pixops.c
@@ -16,9 +16,9 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
-#include <config.h>
-#include <math.h>
+
#include <glib.h>
+#include <math.h>
#include "pixops.h"
#include "pixops-internal.h"
diff --git a/lib/platform/platform.c b/lib/platform/platform.c
index 81df102..55e3361 100644
--- a/lib/platform/platform.c
+++ b/lib/platform/platform.c
@@ -35,6 +35,7 @@
*/
#include "platform.h"
+#include <gtk/gtk.h> // for gtk_show_uri
#ifdef WIN32
#include "winpaths.h"
diff --git a/plugins/loudmouth/loudmouth-bank.cpp b/plugins/loudmouth/loudmouth-bank.cpp
index 825db9b..3f27430 100644
--- a/plugins/loudmouth/loudmouth-bank.cpp
+++ b/plugins/loudmouth/loudmouth-bank.cpp
@@ -33,14 +33,12 @@
*
*/
+#include "loudmouth-bank.h"
+
#include <glib/gi18n.h>
#include "gmconf.h"
-#include "config.h"
-
-#include "loudmouth-bank.h"
-
#include "form-request-simple.h"
#define JABBER_KEY CONTACTS_KEY "jabber"
diff --git a/plugins/loudmouth/loudmouth-chat-multiple.cpp b/plugins/loudmouth/loudmouth-chat-multiple.cpp
index 5ee8463..7efb210 100644
--- a/plugins/loudmouth/loudmouth-chat-multiple.cpp
+++ b/plugins/loudmouth/loudmouth-chat-multiple.cpp
@@ -33,10 +33,6 @@
*
*/
-#include <iostream>
-
-#include "personal-details.h"
-
#include "loudmouth-chat-multiple.h"
LM::MultipleChat::MultipleChat (Ekiga::ServiceCore& core_,
diff --git a/plugins/loudmouth/loudmouth-chat-simple.cpp b/plugins/loudmouth/loudmouth-chat-simple.cpp
index d57c980..920d37b 100644
--- a/plugins/loudmouth/loudmouth-chat-simple.cpp
+++ b/plugins/loudmouth/loudmouth-chat-simple.cpp
@@ -33,12 +33,10 @@
*
*/
-#include <iostream>
+#include "loudmouth-chat-simple.h"
#include "personal-details.h"
-#include "loudmouth-chat-simple.h"
-
LM::SimpleChat::SimpleChat (Ekiga::ServiceCore& core_,
PresentityPtr presentity_):
core(core_), presentity(presentity_)
diff --git a/plugins/loudmouth/loudmouth-helpers.cpp b/plugins/loudmouth/loudmouth-helpers.cpp
index 52d0e0b..e58a578 100644
--- a/plugins/loudmouth/loudmouth-helpers.cpp
+++ b/plugins/loudmouth/loudmouth-helpers.cpp
@@ -33,12 +33,6 @@
*
*/
-#define DEBUG 1
-
-#if DEBUG
-#include <iostream>
-#endif
-
#include "loudmouth-helpers.h"
boost::shared_ptr<LmMessageHandler> ignore_message_handler;
diff --git a/plugins/loudmouth/loudmouth-presentity.cpp b/plugins/loudmouth/loudmouth-presentity.cpp
index beab377..449e05b 100644
--- a/plugins/loudmouth/loudmouth-presentity.cpp
+++ b/plugins/loudmouth/loudmouth-presentity.cpp
@@ -33,14 +33,14 @@
*
*/
-#include <string.h>
+#include "loudmouth-presentity.h"
+
#include <stdlib.h>
#include <glib/gi18n.h>
#include "form-request-simple.h"
#include "loudmouth-helpers.h"
-#include "loudmouth-presentity.h"
LM::Presentity::Presentity (LmConnection* connection_,
LmMessageNode* item_):
diff --git a/src/dbus-helper/dbus-helper.cpp b/src/dbus-helper/dbus-helper.cpp
index 3d54551..6d24718 100644
--- a/src/dbus-helper/dbus-helper.cpp
+++ b/src/dbus-helper/dbus-helper.cpp
@@ -35,8 +35,6 @@
*
*/
-#include "config.h"
-
#include <dbus/dbus-glib.h>
/* Here is the description of method calls that this little program
diff --git a/src/dbus-helper/dbus.cpp b/src/dbus-helper/dbus.cpp
index d417c59..89c7dd6 100644
--- a/src/dbus-helper/dbus.cpp
+++ b/src/dbus-helper/dbus.cpp
@@ -37,12 +37,10 @@
*
*/
-#include "config.h"
-
#include <dbus/dbus-glib.h>
+#include <ptlib.h>
#include "dbus.h"
-#include "ekiga.h"
#include "gmconf.h"
#include "gmcallbacks.h"
#include "gtk-frontend.h"
diff --git a/src/ekiga.cpp b/src/ekiga.cpp
index 79b21ab..fe102b1 100644
--- a/src/ekiga.cpp
+++ b/src/ekiga.cpp
@@ -35,18 +35,18 @@
*
*/
-
#include "config.h"
#include "ekiga.h"
#include <gtk/gtk.h>
-#include <opal/buildopts.h>
+
+#include "runtime.h"
#define new PNEW
-GnomeMeeting *GnomeMeeting::GM = NULL;
+GnomeMeeting *GnomeMeeting::GM = 0;
/* The main GnomeMeeting Class */
GnomeMeeting::GnomeMeeting ()
diff --git a/src/ekiga.h b/src/ekiga.h
index 8778b6f..778db43 100644
--- a/src/ekiga.h
+++ b/src/ekiga.h
@@ -36,12 +36,8 @@
*/
-#ifndef _GNOMEMEETING_H_
-#define _GNOMEMEETING_H_
-
-#include "config.h"
-#include "gmconf.h"
-#include "runtime.h"
+#ifndef __EKIGA_H__
+#define __EKIGA_H__
#include <ptlib.h>
#include <ptlib/pprocess.h>
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index c134441..ce5081d 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -41,12 +41,12 @@
#include <glib/gi18n.h>
+#include <opal/buildopts.h> // only for OPAL_VERSION!
+
#ifdef HAVE_DBUS
#include "dbus-helper/dbus.h"
#endif
-#include <sip/sip.h>
-
#ifndef WIN32
#include <signal.h>
#include <gdk/gdkx.h>
@@ -60,6 +60,7 @@
#include "gmconf-upgrade.h"
#include "engine.h"
+#include "runtime.h"
#include "call-core.h"
diff --git a/win32/plugin-gconst.cpp b/win32/plugin-gconst.cpp
index 6c47c2f..5b24bca 100644
--- a/win32/plugin-gconst.cpp
+++ b/win32/plugin-gconst.cpp
@@ -3,7 +3,7 @@
extern PPlugin_##serviceType##_##serviceName##_Registration
PPlugin_##serviceType##_##serviceName##_Registration_Instance; \
PPlugin_##serviceType##_##serviceName##_Registration const
*PPlugin_##serviceType##_##serviceName##_Registration_Static_Library_Loader =
&PPlugin_##serviceType##_##serviceName##_Registration_Instance;
-#include "ptbuildopts.h"
+#include <ptbuildopts.h>
#if P_AUDIO
PPLUGIN_STATIC_LOAD(WindowsMultimedia, PSoundChannel);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
