GNOME.org
 

[gstreamermm] Enable fatal warnings mode.

commit 1dfbb07eb51f3ed03ec7e827d3b43cdb167bef0b
Author: José Alburquerque <jaalburqu svn gnome org>
Date:   Wed Oct 21 00:58:57 2009 -0400

    	Enable fatal warnings mode.
    
    	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS):  enable fatal warnings
    	mode.
    	* examples/media_player_gtkmm/main.cc (main):
    	* examples/ogg_player/main.cc (main):
    	* examples/ogg_player_gtkmm/main.cc (main):
    	* tests/test-caps-structures.cc (main):
    	* tests/test-caps.cc (main):
    	* tests/test-create-bin.cc (main):
    	* tests/test-create-bus.cc (main):
    	* tests/test-create-element.cc (main):
    	* tests/test-event-wrap.cc (main):
    	* tests/test-ghost-pad.cc (main):
    	* tests/test-init-check-noargs.cc (main):
    	* tests/test-init-check.cc (main):
    	* tests/test-init-noargs.cc (main):
    	* tests/test-init.cc (main):
    	* tests/test-interface.cc (main):
    	* tests/test-iterator.cc (main):
    	* tests/test-link-elements.cc (main):
    	* tests/test-message-wrap.cc (main):
    	* tests/test-miniobject-wrap.cc (main):
    	* tests/test-pad.cc (main):
    	* tests/test-pipeline-add-element.cc (main):
    	* tests/test-plugin-gen.cc (main):
    	* tests/test-plugin-signals.cc (main):
    	(on_handoff):
    	* tests/test-property-caps.cc (main):
    	* tests/test-query-wrap.cc (main):
    	* tests/test-structure.cc (main):
    	* tests/test-taglist.cc (main):
    	* tests/test-tagsetter.cc (main): Use char** instead of
    	char*[] for argv and remove unused parameters.
    	* gstreamer/gstreamermm/miniobject.cc:
    	* gstreamer/gstreamermm/miniobject.h:
    	* gstreamer/gstreamermm/private/miniobject_p.h: Don't derive from
    	Glib::ObjectBase to avoid having to explicitly initialize it in the
    	MiniObject copy constructor.
    	* tools/m4/class_gstminiobject.m4 (class_init_function): return a
    	Gst::MiniObject* instead of a Glib::ObjectBase* for Gst::MiniObject
    	derived classes.
    	* gstreamer/gstreamermm/wrap.cc
    	(wrap_create_new_wrapper_for_interface): use Gst::quark_ instead of
    	Glib::quark_.
    	* gstreamer/src/taglist.ccg:
    	* gstreamer/src/taglist.hg: Don't derive from Gst::Structure to avoid
    	having two different gobject_ members.
    	(operator bool): Added because it already had one from Gst::Structure
    	which some of the tests use.

 ChangeLog                                    |   53 ++++++++++++++++++++++++++
 Makefile.am                                  |    3 +-
 examples/media_player_gtkmm/main.cc          |    3 +-
 examples/ogg_player/main.cc                  |    2 +-
 examples/ogg_player_gtkmm/main.cc            |    3 +-
 gstreamer/gstreamermm/miniobject.cc          |   11 ++---
 gstreamer/gstreamermm/miniobject.h           |   19 +--------
 gstreamer/gstreamermm/private/miniobject_p.h |    2 -
 gstreamer/gstreamermm/wrap.cc                |    2 +-
 gstreamer/src/taglist.ccg                    |    5 ++
 gstreamer/src/taglist.hg                     |   11 ++---
 tests/test-caps-structures.cc                |    2 +-
 tests/test-caps.cc                           |    2 +-
 tests/test-create-bin.cc                     |    2 +-
 tests/test-create-bus.cc                     |    2 +-
 tests/test-create-element.cc                 |    2 +-
 tests/test-event-wrap.cc                     |    2 +-
 tests/test-ghost-pad.cc                      |    2 +-
 tests/test-init-check-noargs.cc              |    2 +-
 tests/test-init-check.cc                     |    2 +-
 tests/test-init-noargs.cc                    |    2 +-
 tests/test-init.cc                           |    2 +-
 tests/test-interface.cc                      |    2 +-
 tests/test-iterator.cc                       |    2 +-
 tests/test-link-elements.cc                  |    2 +-
 tests/test-message-wrap.cc                   |    2 +-
 tests/test-miniobject-wrap.cc                |    2 +-
 tests/test-pad.cc                            |    2 +-
 tests/test-pipeline-add-element.cc           |    2 +-
 tests/test-plugin-gen.cc                     |    2 +-
 tests/test-plugin-signals.cc                 |    4 +-
 tests/test-property-caps.cc                  |    3 +-
 tests/test-query-wrap.cc                     |    2 +-
 tests/test-structure.cc                      |    2 +-
 tests/test-taglist.cc                        |    2 +-
 tests/test-tagsetter.cc                      |    2 +-
 tools/m4/class_gstminiobject.m4              |    4 +-
 37 files changed, 104 insertions(+), 67 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 64442eb..3100115 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,56 @@
+2009-10-21  José Alburquerque  <jaalburqu svn gnome org>
+
+	Enable fatal warnings mode.
+
+	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS):  enable fatal warnings
+	mode.
+	* examples/media_player_gtkmm/main.cc (main):
+	* examples/ogg_player/main.cc (main):
+	* examples/ogg_player_gtkmm/main.cc (main):
+	* tests/test-caps-structures.cc (main):
+	* tests/test-caps.cc (main):
+	* tests/test-create-bin.cc (main):
+	* tests/test-create-bus.cc (main):
+	* tests/test-create-element.cc (main):
+	* tests/test-event-wrap.cc (main):
+	* tests/test-ghost-pad.cc (main):
+	* tests/test-init-check-noargs.cc (main):
+	* tests/test-init-check.cc (main):
+	* tests/test-init-noargs.cc (main):
+	* tests/test-init.cc (main):
+	* tests/test-interface.cc (main):
+	* tests/test-iterator.cc (main):
+	* tests/test-link-elements.cc (main):
+	* tests/test-message-wrap.cc (main):
+	* tests/test-miniobject-wrap.cc (main):
+	* tests/test-pad.cc (main):
+	* tests/test-pipeline-add-element.cc (main):
+	* tests/test-plugin-gen.cc (main):
+	* tests/test-plugin-signals.cc (main):
+	(on_handoff):
+	* tests/test-property-caps.cc (main):
+	* tests/test-query-wrap.cc (main):
+	* tests/test-structure.cc (main):
+	* tests/test-taglist.cc (main):
+	* tests/test-tagsetter.cc (main): Use char** instead of
+	char*[] for argv and remove unused parameters.
+	* gstreamer/gstreamermm/miniobject.cc:
+	* gstreamer/gstreamermm/miniobject.h:
+	* gstreamer/gstreamermm/private/miniobject_p.h: Don't derive from
+	Glib::ObjectBase to avoid having to explicitly initialize it in the
+	MiniObject copy constructor.
+	* tools/m4/class_gstminiobject.m4 (class_init_function): return a
+	Gst::MiniObject* instead of a Glib::ObjectBase* for Gst::MiniObject
+	derived classes.
+	* gstreamer/gstreamermm/wrap.cc
+	(wrap_create_new_wrapper_for_interface): use Gst::quark_ instead of
+	Glib::quark_.
+	* gstreamer/src/taglist.ccg:
+	* gstreamer/src/taglist.hg: Don't derive from Gst::Structure to avoid
+	having two different gobject_ members.
+	(operator bool): Added because it already had one from Gst::Structure
+	which some of the tests use.
+
 2009-10-16  José Alburquerque  <jaalburqu svn gnome org>
 
 	Use unwrap() instead of gobj() for Glib::RefPtr<> type classes.
diff --git a/Makefile.am b/Makefile.am
index c48cfe3..74e2eb9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,8 +14,7 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
-# TODO: Fix warnings and switch back to fatal warnings mode.
-DISTCHECK_CONFIGURE_FLAGS = --enable-warnings=max
+DISTCHECK_CONFIGURE_FLAGS = --enable-warnings=fatal
 
 if MAINTAINER_MODE
 src_subdirs = gstreamer/src
diff --git a/examples/media_player_gtkmm/main.cc b/examples/media_player_gtkmm/main.cc
index bf94ed8..fde681d 100644
--- a/examples/media_player_gtkmm/main.cc
+++ b/examples/media_player_gtkmm/main.cc
@@ -29,8 +29,7 @@
 #include <iostream>
 #include "player_window.h"
 
-int
-main (int argc, char *argv[])
+int main(int argc, char** argv)
 {
   Gtk::Main kit(argc, argv);
   Gst::init(argc, argv);
diff --git a/examples/ogg_player/main.cc b/examples/ogg_player/main.cc
index 7efe982..842d9b4 100644
--- a/examples/ogg_player/main.cc
+++ b/examples/ogg_player/main.cc
@@ -121,7 +121,7 @@ bool on_sink_pad_have_data(const Glib::RefPtr<Gst::Pad>& pad,
 
 } // anonymous namespace
 
-int main(int argc, char* argv[])
+int main(int argc, char** argv)
 {
   // Initialize Gstreamermm:
   Gst::init(argc, argv);
diff --git a/examples/ogg_player_gtkmm/main.cc b/examples/ogg_player_gtkmm/main.cc
index 8ac33d8..e641f71 100644
--- a/examples/ogg_player_gtkmm/main.cc
+++ b/examples/ogg_player_gtkmm/main.cc
@@ -48,8 +48,7 @@ void on_parser_pad_added(const Glib::RefPtr<Gst::Pad>& newPad)
   }
 }
 
-int
-main (int argc, char *argv[])
+int main(int argc, char** argv)
 {
   Gtk::Main kit(argc, argv);
   Gst::init(argc, argv);
diff --git a/gstreamer/gstreamermm/miniobject.cc b/gstreamer/gstreamermm/miniobject.cc
index 932904b..03a4d68 100644
--- a/gstreamer/gstreamermm/miniobject.cc
+++ b/gstreamer/gstreamermm/miniobject.cc
@@ -25,23 +25,22 @@ namespace Gst
 {
 
 
+// gst_mini_object_base_[init|finalize]() don't do anything so those don't
+// have to be called from here.
 void MiniObject_Class::class_init_function(void*, void*)
 {}
 
 MiniObject::MiniObject()
 : gobject_(0)
-{
-}
+{}
 
 MiniObject::MiniObject(GstMiniObject* castitem, bool take_copy)
 : gobject_(take_copy ? gst_mini_object_copy(castitem) : castitem)
-{
-}
+{}
 
 MiniObject::MiniObject(const MiniObject& other)
 : gobject_(gst_mini_object_copy(other.gobject_))
-{
-}
+{}
 
 MiniObject&
 MiniObject::operator=(const MiniObject& other)
diff --git a/gstreamer/gstreamermm/miniobject.h b/gstreamer/gstreamermm/miniobject.h
index bdf286d..b3317e2 100644
--- a/gstreamer/gstreamermm/miniobject.h
+++ b/gstreamer/gstreamermm/miniobject.h
@@ -20,7 +20,7 @@
 #ifndef _GSTREAMERMM_MINIOBJECT_H
 #define _GSTREAMERMM_MINIOBJECT_H
 
-#include <glibmm/objectbase.h>
+#include <glibmm/refptr.h>
 #include <gst/gstminiobject.h>
 
 namespace Gst
@@ -31,7 +31,7 @@ class MiniObject_Class;
 /** This is a base class for some gstreamermm objects.
  * It is similar to Glib::Object but has no GObject property or signal support.
  */
-class MiniObject : public Glib::ObjectBase
+class MiniObject
 {
 public:
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -43,8 +43,6 @@ public:
 
 //protected:
 public:
-  //friend Glib::wrap;
-
   MiniObject();
   MiniObject(GstMiniObject* castitem, bool take_copy = false);
 
@@ -144,20 +142,9 @@ protected:
   void swap(MiniObject& other);
 
 protected:
-  GstMiniObject* gobject_; //TODO: Doesn't this shadow a member variable in Glib::ObjectBase?
+  GstMiniObject* gobject_;
 };
 
 } // namespace Gst
 
-/*
-namespace Glib
-{
-  inline Glib::RefPtr<Gst::MiniObject> wrap(GstMiniObject *object, bool take_copy)
-  {
-    return Glib::RefPtr<Gst::MiniObject>(new MiniObject(object, take_copy));
-  }
-
-} //namespace Glib
-*/
-
 #endif //#ifndef _GSTREAMERMM_MINIOBJECT_H
diff --git a/gstreamer/gstreamermm/private/miniobject_p.h b/gstreamer/gstreamermm/private/miniobject_p.h
index 42d210c..707a875 100644
--- a/gstreamer/gstreamermm/private/miniobject_p.h
+++ b/gstreamer/gstreamermm/private/miniobject_p.h
@@ -37,8 +37,6 @@ public:
   const Glib::Class& init();
 
   static void class_init_function(void* g_class, void* class_data);
-
-  static Glib::ObjectBase* wrap_new(GObject*);
 };
 
 
diff --git a/gstreamer/gstreamermm/wrap.cc b/gstreamer/gstreamermm/wrap.cc
index 0346e54..3ae2742 100644
--- a/gstreamer/gstreamermm/wrap.cc
+++ b/gstreamer/gstreamermm/wrap.cc
@@ -157,7 +157,7 @@ Gst::MiniObject* wrap_create_new_wrapper_for_interface(GstMiniObject* object, GT
     // But only if the type implements the interface, 
     // so that the C++ instance is likely to inherit from the appropriate class too.
     //
-    const gpointer idx = g_type_get_qdata(type, Glib::quark_);
+    const gpointer idx = g_type_get_qdata(type, Gst::quark_);
     if(idx && gtype_wraps_interface(type, interface_gtype))
     {
       const Gst::WrapNewFunction func = (*wrap_func_table)[GPOINTER_TO_UINT(idx)];
diff --git a/gstreamer/src/taglist.ccg b/gstreamer/src/taglist.ccg
index 0e4708d..99dab50 100644
--- a/gstreamer/src/taglist.ccg
+++ b/gstreamer/src/taglist.ccg
@@ -109,6 +109,11 @@ const char* const _tag_strings[] =
   GST_TAG_GEO_LOCATION_ELEVATION
 };
 
+TagList::operator bool() const
+{
+  return gobject_ != 0;
+}
+
 std::ostream& operator<<(std::ostream& stream, Tag tag)
 {
   stream << _tag_strings[tag];
diff --git a/gstreamer/src/taglist.hg b/gstreamer/src/taglist.hg
index a349705..1e60147 100644
--- a/gstreamer/src/taglist.hg
+++ b/gstreamer/src/taglist.hg
@@ -322,18 +322,17 @@ extern const char* const _tag_strings[];
  * as merging mode, so that a new title (which came in later) has a preference
  * over the old one for display.
  */
-class TagList : public Structure
+class TagList
 {
-  // TODO: Gst::Structure is already wrapped as a boxed type.  Wrapping this
-  // derived class as a boxed type again is wrong.  It even means that there
-  // are *two* separate gobject_ members!  The compiler warning about the
-  // missing explicit base instance initialization in the copy constructor
-  // exposes the problem, too.
   _CUSTOM_STRUCT_PROTOTYPE
   _CLASS_BOXEDTYPE_EXTRA(TagList, GstTagList, gst_tag_list_new, gst_tag_list_copy, gst_tag_list_free)
   _IGNORE(gst_tag_list_copy, gst_tag_list_free)
 
 public:
+  /** Use this to discover if the TagList is a valid object.
+   */
+  operator bool() const;
+
   _WRAP_METHOD(static bool exists(const Glib::ustring& tag), gst_tag_exists)
   _WRAP_METHOD(static GType get_type(const Glib::ustring& tag), gst_tag_get_type)
   _WRAP_METHOD(static Glib::ustring get_nick(const Glib::ustring& tag), gst_tag_get_nick)
diff --git a/tests/test-caps-structures.cc b/tests/test-caps-structures.cc
index b3fd109..e1fba83 100644
--- a/tests/test-caps-structures.cc
+++ b/tests/test-caps-structures.cc
@@ -40,7 +40,7 @@ void add_structures(const Glib::RefPtr<Gst::Caps>& caps)
   caps->append_structure(struct3);
 }
 
-int main (int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Gst::init(argc, argv);
 
diff --git a/tests/test-caps.cc b/tests/test-caps.cc
index f75bedc..1b24b58 100644
--- a/tests/test-caps.cc
+++ b/tests/test-caps.cc
@@ -77,7 +77,7 @@ void test_simple()
     std::cout << "Getting of simple caps sting field failed." << std::endl;
 }
 
-int main (int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Glib::RefPtr<Gst::Pipeline> pipeline;
   Glib::RefPtr<Gst::Element> e1, e2;
diff --git a/tests/test-create-bin.cc b/tests/test-create-bin.cc
index d5f12b3..cf00325 100644
--- a/tests/test-create-bin.cc
+++ b/tests/test-create-bin.cc
@@ -20,7 +20,7 @@
 #include <gstreamermm.h>
 #include <iostream>
 
-int main (int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Gst::init(argc, argv);
 
diff --git a/tests/test-create-bus.cc b/tests/test-create-bus.cc
index 5847727..c044ce3 100644
--- a/tests/test-create-bus.cc
+++ b/tests/test-create-bus.cc
@@ -20,7 +20,7 @@
 #include <gstreamermm.h>
 #include <iostream>
 
-int main (int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Gst::init(argc, argv);
 
diff --git a/tests/test-create-element.cc b/tests/test-create-element.cc
index b0cd0a0..500fa5e 100644
--- a/tests/test-create-element.cc
+++ b/tests/test-create-element.cc
@@ -20,7 +20,7 @@
 #include <gstreamermm.h>
 #include <iostream>
 
-int main (int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Gst::init(argc, argv);
 
diff --git a/tests/test-event-wrap.cc b/tests/test-event-wrap.cc
index 093cfd3..e18bd11 100644
--- a/tests/test-event-wrap.cc
+++ b/tests/test-event-wrap.cc
@@ -20,7 +20,7 @@
 #include <gstreamermm.h>
 #include <iostream>
 
-int main (int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Gst::init(argc, argv);
 
diff --git a/tests/test-ghost-pad.cc b/tests/test-ghost-pad.cc
index 4879d33..840baec 100644
--- a/tests/test-ghost-pad.cc
+++ b/tests/test-ghost-pad.cc
@@ -20,7 +20,7 @@
 #include <gstreamermm.h>
 #include <iostream>
 
-int main (int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Gst::init(argc, argv);
 
diff --git a/tests/test-init-check-noargs.cc b/tests/test-init-check-noargs.cc
index 54649a0..33b7909 100644
--- a/tests/test-init-check-noargs.cc
+++ b/tests/test-init-check-noargs.cc
@@ -20,7 +20,7 @@
 #include <gstreamermm.h>
 #include <iostream>
 
-int main (int argc, char* argv[])
+int main(int, char**)
 {
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
diff --git a/tests/test-init-check.cc b/tests/test-init-check.cc
index 856a05b..273679d 100644
--- a/tests/test-init-check.cc
+++ b/tests/test-init-check.cc
@@ -21,7 +21,7 @@
 #include <iostream>
 #include <gst/audio/gstaudioclock.h>
 
-int main (int argc, char* argv[])
+int main(int argc, char** argv)
 {
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
diff --git a/tests/test-init-noargs.cc b/tests/test-init-noargs.cc
index 2db898b..4b29440 100644
--- a/tests/test-init-noargs.cc
+++ b/tests/test-init-noargs.cc
@@ -20,7 +20,7 @@
 #include <gstreamermm.h>
 #include <iostream>
 
-int main (int argc, char* argv[])
+int main(int, char**)
 {
   Gst::init();
 
diff --git a/tests/test-init.cc b/tests/test-init.cc
index 86dbed5..ae4529f 100644
--- a/tests/test-init.cc
+++ b/tests/test-init.cc
@@ -21,7 +21,7 @@
 #include <iostream>
 #include <gst/audio/gstaudioclock.h>
 
-int main (int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Gst::init(argc, argv);
 
diff --git a/tests/test-interface.cc b/tests/test-interface.cc
index 4df0f05..0656d67 100644
--- a/tests/test-interface.cc
+++ b/tests/test-interface.cc
@@ -20,7 +20,7 @@
 #include <gstreamermm.h>
 #include <iostream>
 
-int main (int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Gst::init(argc, argv);
 
diff --git a/tests/test-iterator.cc b/tests/test-iterator.cc
index 6359647..bacf55a 100644
--- a/tests/test-iterator.cc
+++ b/tests/test-iterator.cc
@@ -20,7 +20,7 @@
 #include <gstreamermm.h>
 #include <iostream>
 
-int main (int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Gst::init(argc, argv);
 
diff --git a/tests/test-link-elements.cc b/tests/test-link-elements.cc
index e3b17bb..64de2b5 100644
--- a/tests/test-link-elements.cc
+++ b/tests/test-link-elements.cc
@@ -20,7 +20,7 @@
 #include <gstreamermm.h>
 #include <iostream>
 
-int main (int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Gst::init(argc, argv);
 
diff --git a/tests/test-message-wrap.cc b/tests/test-message-wrap.cc
index 4d5e7df..a528638 100644
--- a/tests/test-message-wrap.cc
+++ b/tests/test-message-wrap.cc
@@ -22,7 +22,7 @@
 #include <gst/gsterror.h>
 #include <iostream>
 
-int main (int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Gst::init(argc, argv);
 
diff --git a/tests/test-miniobject-wrap.cc b/tests/test-miniobject-wrap.cc
index dd94398..9142617 100644
--- a/tests/test-miniobject-wrap.cc
+++ b/tests/test-miniobject-wrap.cc
@@ -22,7 +22,7 @@
 #include <gst/gsterror.h>
 #include <iostream>
 
-int main (int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Gst::init(argc, argv);
 
diff --git a/tests/test-pad.cc b/tests/test-pad.cc
index 226489d..c534a24 100644
--- a/tests/test-pad.cc
+++ b/tests/test-pad.cc
@@ -20,7 +20,7 @@
 #include <gstreamermm.h>
 #include <iostream>
 
-int main (int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Gst::init(argc, argv);
 
diff --git a/tests/test-pipeline-add-element.cc b/tests/test-pipeline-add-element.cc
index 7071961..087fb82 100644
--- a/tests/test-pipeline-add-element.cc
+++ b/tests/test-pipeline-add-element.cc
@@ -20,7 +20,7 @@
 #include <gstreamermm.h>
 #include <iostream>
 
-int main (int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Gst::init(argc, argv);
 
diff --git a/tests/test-plugin-gen.cc b/tests/test-plugin-gen.cc
index b779f62..e15864d 100644
--- a/tests/test-plugin-gen.cc
+++ b/tests/test-plugin-gen.cc
@@ -21,7 +21,7 @@
 #include <gstreamermm/filesrc.h>
 #include <iostream>
 
-int main(int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Gst::init(argc, argv);
 
diff --git a/tests/test-plugin-signals.cc b/tests/test-plugin-signals.cc
index d6ef1fe..b732f99 100644
--- a/tests/test-plugin-signals.cc
+++ b/tests/test-plugin-signals.cc
@@ -58,14 +58,14 @@ bool on_bus_message(const Glib::RefPtr<Gst::Bus>& /* bus */, const Glib::RefPtr<
 }
 
 void on_handoff(const Glib::RefPtr<Gst::Buffer>& buffer,
-                const Glib::RefPtr<Gst::Pad>& pad)
+                const Glib::RefPtr<Gst::Pad>&)
 {
   std::cout << "Gst::FakeSrc's handoff signal triggered." << std::endl;
   if(buffer->flag_is_set(Gst::BUFFER_FLAG_DISCONT))
     std::cout << "The Gst::FakeSrc buffer's discont flag is set." << std::endl;
 }
 
-int main(int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Gst::init(argc, argv);
 
diff --git a/tests/test-property-caps.cc b/tests/test-property-caps.cc
index 13bfe21..02f0f54 100644
--- a/tests/test-property-caps.cc
+++ b/tests/test-property-caps.cc
@@ -20,8 +20,7 @@
 #include <gstreamermm.h>
 #include <iostream>
 
-int
-main(int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Gst::init(argc, argv);
 
diff --git a/tests/test-query-wrap.cc b/tests/test-query-wrap.cc
index b785f04..c60e622 100644
--- a/tests/test-query-wrap.cc
+++ b/tests/test-query-wrap.cc
@@ -20,7 +20,7 @@
 #include <gstreamermm.h>
 #include <iostream>
 
-int main (int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Gst::init(argc, argv);
 
diff --git a/tests/test-structure.cc b/tests/test-structure.cc
index ed35ccf..6fe433c 100644
--- a/tests/test-structure.cc
+++ b/tests/test-structure.cc
@@ -21,7 +21,7 @@
 #include <glibmm/date.h>
 #include <iostream>
 
-int main (int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Gst::init(argc, argv);
 
diff --git a/tests/test-taglist.cc b/tests/test-taglist.cc
index 0d8ad5d..1a2993e 100644
--- a/tests/test-taglist.cc
+++ b/tests/test-taglist.cc
@@ -20,7 +20,7 @@
 #include <gstreamermm.h>
 #include <iostream>
 
-int main (int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Gst::init(argc, argv);
 
diff --git a/tests/test-tagsetter.cc b/tests/test-tagsetter.cc
index 266c736..61cb080 100644
--- a/tests/test-tagsetter.cc
+++ b/tests/test-tagsetter.cc
@@ -20,7 +20,7 @@
 #include <gstreamermm.h>
 #include <iostream>
 
-int main (int argc, char* argv[])
+int main(int argc, char** argv)
 {
   Gst::init(argc, argv);
   
diff --git a/tools/m4/class_gstminiobject.m4 b/tools/m4/class_gstminiobject.m4
index 9668183..e7a60e9 100644
--- a/tools/m4/class_gstminiobject.m4
+++ b/tools/m4/class_gstminiobject.m4
@@ -127,7 +127,7 @@ ifdef(`__BOOL_NO_DERIVED_CLASS__',`dnl
   static void class_init_function(void* g_class, void* class_data);
 ')dnl
 
-  static Glib::ObjectBase* wrap_new(GstMiniObject*);
+  static Gst::MiniObject* wrap_new(GstMiniObject*);
 };
 ')
 
@@ -173,7 +173,7 @@ __NAMESPACE_BEGIN__
 _PCC_CLASS_IMPLEMENTATION()
 
 m4_ifdef(`__BOOL_CUSTOM_WRAP_NEW__',,`dnl else
-Glib::ObjectBase* __CPPNAME__`'_Class::wrap_new(GstMiniObject* object)
+Gst::MiniObject* __CPPNAME__`'_Class::wrap_new(GstMiniObject* object)
 {
   return new __CPPNAME__`'((__CNAME__*)`'object);
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]