A great big renaming patch

This patch renames the bridging* files to bridge*. This may seem pedantic
and silly, but it fits better in line with current Asterisk naming conventions:
* channel is not "channeling"
* monitor is not "monitoring"
etc.

A bridge is an object. It is a first class citizen in Asterisk. "Bridging" is
the act of using a bridge on a set of channels - and the API that fulfills that
role is more than just the action.

(closes issue ASTERISK-22130)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395378 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 files changed, 16 insertions, 16 deletions

diff --git a/res/parking/parking_applications.c b/res/parking/parking_applications.c
index f7e279766..4e52e21d7 100644
--- a/res/parking/parking_applications.c
+++ b/res/parking/parking_applications.c
@@ -38,7 +38,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/app.h"
 #include "asterisk/say.h"
 #include "asterisk/features.h"
-#include "asterisk/bridging_basic.h"
+#include "asterisk/bridge_basic.h"
 
 /*** DOCUMENTATION
 	<application name="Park" language="en_US">
diff --git a/res/parking/parking_bridge.c b/res/parking/parking_bridge.c
index 4c9199830..04250bf25 100644
--- a/res/parking/parking_bridge.c
+++ b/res/parking/parking_bridge.c
@@ -30,7 +30,7 @@
 #include "asterisk/say.h"
 #include "asterisk/term.h"
 #include "asterisk/features.h"
-#include "asterisk/bridging_internal.h"
+#include "asterisk/bridge_internal.h"
 
 struct ast_bridge_parking
 {
diff --git a/res/parking/parking_bridge_features.c b/res/parking/parking_bridge_features.c
index 15d4980d2..1b57f9c07 100644
--- a/res/parking/parking_bridge_features.c
+++ b/res/parking/parking_bridge_features.c
@@ -32,10 +32,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/astobj2.h"
 #include "asterisk/logger.h"
 #include "asterisk/pbx.h"
-#include "asterisk/bridging.h"
-#include "asterisk/bridging_internal.h"
-#include "asterisk/bridging_channel.h"
-#include "asterisk/bridging_features.h"
+#include "asterisk/bridge.h"
+#include "asterisk/bridge_internal.h"
+#include "asterisk/bridge_channel.h"
+#include "asterisk/bridge_features.h"
 #include "asterisk/features.h"
 #include "asterisk/say.h"
 #include "asterisk/datastore.h"
diff --git a/res/parking/parking_controller.c b/res/parking/parking_controller.c
index ec34cd483..0e91ebe7f 100644
--- a/res/parking/parking_controller.c
+++ b/res/parking/parking_controller.c
@@ -31,7 +31,7 @@
 #include "asterisk/manager.h"
 #include "asterisk/test.h"
 #include "asterisk/features.h"
-#include "asterisk/bridging_basic.h"
+#include "asterisk/bridge_basic.h"
 
 struct ast_bridge *parking_lot_get_bridge(struct parking_lot *lot)
 {
diff --git a/res/parking/parking_manager.c b/res/parking/parking_manager.c
index 02858d8bf..430d5408a 100644
--- a/res/parking/parking_manager.c
+++ b/res/parking/parking_manager.c
@@ -37,7 +37,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/astobj2.h"
 #include "asterisk/features.h"
 #include "asterisk/manager.h"
-#include "asterisk/bridging.h"
+#include "asterisk/bridge.h"
 
 /*** DOCUMENTATION
 	<manager name="Parkinglots" language="en_US">
diff --git a/res/parking/res_parking.h b/res/parking/res_parking.h
index 78ad9117d..b2e56347d 100644
--- a/res/parking/res_parking.h
+++ b/res/parking/res_parking.h
@@ -24,7 +24,7 @@
  */
 
 #include "asterisk/pbx.h"
-#include "asterisk/bridging.h"
+#include "asterisk/bridge.h"
 #include "asterisk/parking.h"
 #include "asterisk/stasis_channels.h"
 
diff --git a/res/res_sip_refer.c b/res/res_sip_refer.c
index 48c7e6dba..098f4bdd0 100644
--- a/res/res_sip_refer.c
+++ b/res/res_sip_refer.c
@@ -34,7 +34,7 @@
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
 #include "asterisk/taskprocessor.h"
-#include "asterisk/bridging.h"
+#include "asterisk/bridge.h"
 #include "asterisk/framehook.h"
 
 /*! \brief REFER Progress structure */
diff --git a/res/res_stasis_bridge_add.c b/res/res_stasis_bridge_add.c
index 5ff3b255e..ce1315560 100644
--- a/res/res_stasis_bridge_add.c
+++ b/res/res_stasis_bridge_add.c
@@ -34,7 +34,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/module.h"
 #include "asterisk/stasis_app_impl.h"
-#include "asterisk/bridging.h"
+#include "asterisk/bridge.h"
 
 static void *app_control_join_bridge(struct stasis_app_control *control,
 	struct ast_channel *chan, void *data)
diff --git a/res/stasis/control.c b/res/stasis/control.c
index 50da8b9f0..1fbae0c7c 100644
--- a/res/stasis/control.c
+++ b/res/stasis/control.c
@@ -32,9 +32,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "command.h"
 #include "control.h"
 #include "asterisk/dial.h"
-#include "asterisk/bridging.h"
-#include "asterisk/bridging_basic.h"
-#include "asterisk/bridging_features.h"
+#include "asterisk/bridge.h"
+#include "asterisk/bridge_basic.h"
+#include "asterisk/bridge_features.h"
 #include "asterisk/frame.h"
 #include "asterisk/pbx.h"
 #include "asterisk/musiconhold.h"
diff --git a/res/stasis_http/resource_bridges.c b/res/stasis_http/resource_bridges.c
index b378eb8a5..ea5ec0611 100644
--- a/res/stasis_http/resource_bridges.c
+++ b/res/stasis_http/resource_bridges.c
@@ -40,7 +40,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/stasis_channels.h"
 #include "asterisk/core_unreal.h"
 #include "asterisk/channel.h"
-#include "asterisk/bridging.h"
+#include "asterisk/bridge.h"
 #include "asterisk/format_cap.h"
 #include "asterisk/file.h"
 
diff --git a/res/stasis_http/resource_channels.c b/res/stasis_http/resource_channels.c
index 38befbdc1..592cd6df5 100644
--- a/res/stasis_http/resource_channels.c
+++ b/res/stasis_http/resource_channels.c
@@ -35,7 +35,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/file.h"
 #include "asterisk/pbx.h"
 #include "asterisk/dial.h"
-#include "asterisk/bridging.h"
+#include "asterisk/bridge.h"
 #include "asterisk/callerid.h"
 #include "asterisk/stasis_app.h"
 #include "asterisk/stasis_app_playback.h"