[gtksourceviewmm] Changed namespace name from 'gtksourceview' to 'Gsv'.

From: Krzesimir Nowak <krnowak src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtksourceviewmm] Changed namespace name from 'gtksourceview' to 'Gsv'.
Date: Sat, 13 Nov 2010 10:59:26 +0000 (UTC)
commit 66e2696dfaf92d915184acb2e16ff0d2875380cc
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Fri Nov 12 23:26:48 2010 +0100

    Changed namespace name from 'gtksourceview' to 'Gsv'.
    
    * codegen/m4/convert_gtksourceview.m4: Updated comments.
    * gtksourceview/src/Makefile.am: Generate wrap_init.cc with Gsv namespace.
    * gtksourceview/gtksourceviewmm/init.cc:
    * gtksourceview/gtksourceviewmm/init.h:
    * gtksourceview/gtksourceviewmm/sourcemarkup.cc:
    * gtksourceview/gtksourceviewmm/sourcemarkup.h:
    * gtksourceview/gtksourceviewmm/wrap_init.h:
    * gtksourceview/src/sourcebuffer.hg:
    * gtksourceview/src/sourcecompletion.ccg:
    * gtksourceview/src/sourcecompletion.hg:
    * gtksourceview/src/sourcecompletionactivation.hg:
    * gtksourceview/src/sourcecompletioncontext.ccg:
    * gtksourceview/src/sourcecompletioncontext.hg:
    * gtksourceview/src/sourcecompletioninfo.ccg:
    * gtksourceview/src/sourcecompletioninfo.hg:
    * gtksourceview/src/sourcecompletionitem.ccg:
    * gtksourceview/src/sourcecompletionitem.hg:
    * gtksourceview/src/sourcecompletionproposal.hg:
    * gtksourceview/src/sourcecompletionprovider.hg:
    * gtksourceview/src/sourcecompletionwords.hg:
    * gtksourceview/src/sourcegutter.ccg:
    * gtksourceview/src/sourcegutter.hg:
    * gtksourceview/src/sourcelanguage.hg:
    * gtksourceview/src/sourcelanguagemanager.ccg:
    * gtksourceview/src/sourcelanguagemanager.hg:
    * gtksourceview/src/sourcemark.ccg:
    * gtksourceview/src/sourcemark.hg:
    * gtksourceview/src/sourceprintcompositor.ccg:
    * gtksourceview/src/sourceprintcompositor.hg:
    * gtksourceview/src/sourcestyle.ccg:
    * gtksourceview/src/sourcestyle.hg:
    * gtksourceview/src/sourcestylescheme.hg:
    * gtksourceview/src/sourcestyleschememanager.ccg:
    * gtksourceview/src/sourcestyleschememanager.hg:
    * gtksourceview/src/sourceundomanager.hg:
    * gtksourceview/src/sourceview.ccg:
    * gtksourceview/src/sourceview.hg: Changed namespace name from gtksourceview
    to Gsv. Now it is not awkward and inconsistent with the rest of *mm modules.
    * tests/basic/main.cc:
    * tests/completion/main.cc:
    * tests/get_buffer/main.cc:
    * tests/langs/main.cc:
    * tests/mime_types/main.cc:
    * tests/search/main.cc: Use new namespace name.

 codegen/m4/convert_gtksourceview.m4             |   42 +++++++-------
 gtksourceview/gtksourceviewmm/init.cc           |   17 +++---
 gtksourceview/gtksourceviewmm/init.h            |    4 +-
 gtksourceview/gtksourceviewmm/sourcemarkup.cc   |    4 +-
 gtksourceview/gtksourceviewmm/sourcemarkup.h    |   18 +++---
 gtksourceview/gtksourceviewmm/wrap_init.h       |    4 +-
 gtksourceview/src/Makefile.am                   |    2 +-
 gtksourceview/src/sourcebuffer.ccg              |    4 +-
 gtksourceview/src/sourcebuffer.hg               |    4 +-
 gtksourceview/src/sourcecompletion.ccg          |    4 +-
 gtksourceview/src/sourcecompletion.hg           |    4 +-
 gtksourceview/src/sourcecompletionactivation.hg |    4 +-
 gtksourceview/src/sourcecompletioncontext.ccg   |    4 +-
 gtksourceview/src/sourcecompletioncontext.hg    |    4 +-
 gtksourceview/src/sourcecompletioninfo.ccg      |    4 +-
 gtksourceview/src/sourcecompletioninfo.hg       |    4 +-
 gtksourceview/src/sourcecompletionitem.ccg      |    4 +-
 gtksourceview/src/sourcecompletionitem.hg       |    4 +-
 gtksourceview/src/sourcecompletionproposal.hg   |    4 +-
 gtksourceview/src/sourcecompletionprovider.hg   |    4 +-
 gtksourceview/src/sourcecompletionwords.hg      |    4 +-
 gtksourceview/src/sourcegutter.ccg              |   12 ++--
 gtksourceview/src/sourcegutter.hg               |    4 +-
 gtksourceview/src/sourcelanguage.hg             |    4 +-
 gtksourceview/src/sourcelanguagemanager.ccg     |    4 +-
 gtksourceview/src/sourcelanguagemanager.hg      |    4 +-
 gtksourceview/src/sourcemark.ccg                |    4 +-
 gtksourceview/src/sourcemark.hg                 |    6 +-
 gtksourceview/src/sourceprintcompositor.ccg     |    4 +-
 gtksourceview/src/sourceprintcompositor.hg      |   10 ++--
 gtksourceview/src/sourcestyle.ccg               |    1 -
 gtksourceview/src/sourcestyle.hg                |    4 +-
 gtksourceview/src/sourcestylescheme.hg          |    4 +-
 gtksourceview/src/sourcestyleschememanager.ccg  |    4 +-
 gtksourceview/src/sourcestyleschememanager.hg   |    4 +-
 gtksourceview/src/sourceundomanager.hg          |    4 +-
 gtksourceview/src/sourceview.ccg                |    8 +-
 gtksourceview/src/sourceview.hg                 |    6 +-
 tests/basic/main.cc                             |    6 +-
 tests/completion/main.cc                        |    2 -
 tests/get_buffer/main.cc                        |    1 -
 tests/langs/main.cc                             |    4 +-
 tests/mime_types/main.cc                        |   71 ++++++++++++-----------
 tests/search/main.cc                            |    4 +-
 44 files changed, 162 insertions(+), 160 deletions(-)
---
diff --git a/codegen/m4/convert_gtksourceview.m4 b/codegen/m4/convert_gtksourceview.m4
index f35b94f..f56cb37 100644
--- a/codegen/m4/convert_gtksourceview.m4
+++ b/codegen/m4/convert_gtksourceview.m4
@@ -13,91 +13,91 @@
 #
 
 
-# GtkSourceBuffer -> gtksourceview::SourceBuffer
+# GtkSourceBuffer -> Gsv::SourceBuffer
 _CONVERSION(`GtkSourceBuffer*',`Glib::RefPtr<SourceBuffer>',`Glib::wrap($3)')
 
 
-# gtksourceview::SourceBuffer -> GtkSourceBuffer
+# Gsv::SourceBuffer -> GtkSourceBuffer
 _CONVERSION(`const Glib::RefPtr<SourceBuffer>&',`GtkSourceBuffer*',__CONVERT_REFPTR_TO_P)
 
 
-# GtkSourceCompletion -> gtksourceview::SourceCompletion
+# GtkSourceCompletion -> Gsv::SourceCompletion
 _CONVERSION(`GtkSourceCompletion*',`Glib::RefPtr<SourceCompletion>',`Glib::wrap($3)')
 
 
-# GtkSourceCompletionContext -> gtksourceview::SourceCompletionContext
+# GtkSourceCompletionContext -> Gsv::SourceCompletionContext
 _CONVERSION(`GtkSourceCompletionContext*',`Glib::RefPtr<SourceCompletionContext>',`Glib::wrap($3)')
 
 
-# gtksourceview::SourceCompletionContext -> GtkSourceCompletionContext
+# Gsv::SourceCompletionContext -> GtkSourceCompletionContext
 _CONVERSION(`const Glib::RefPtr<SourceCompletionContext>&',`GtkSourceCompletionContext*',`Glib::unwrap($3)')
 _CONVERSION(`const Glib::RefPtr<const SourceCompletionContext>&',`GtkSourceCompletionContext*',`const_cast<GtkSourceCompletionContext*>(Glib::unwrap($3))')
 
 
-# GtkSourceCompletionInfo -> gtksourceview::SourceCompletionInfo
+# GtkSourceCompletionInfo -> Gsv::SourceCompletionInfo
 _CONVERSION(`GtkSourceCompletionInfo*',`SourceCompletionInfo*',`Glib::wrap($3)')
 _CONVERSION(`GtkSourceCompletionInfo*',`const SourceCompletionInfo*',`Glib::wrap($3)')
 _CONVERSION(`GtkSourceCompletionInfo*',`const SourceCompletionInfo&',`(*(Glib::wrap($3)))')
 
 
-# gtksourceview::SourceCompletionInfo -> GtkSourceCompletionInfo
+# Gsv::SourceCompletionInfo -> GtkSourceCompletionInfo
 _CONVERSION(`const SourceCompletionInfo&',`GtkSourceCompletionInfo*',`const_cast<GtkSourceCompletionInfo*>(($3).gobj())')
 
 
-# gtksourceview::SourceCompletionProposal -> GtkSourceCompletionProposal
+# Gsv::SourceCompletionProposal -> GtkSourceCompletionProposal
 _CONVERSION(`const Glib::RefPtr<const SourceCompletionProposal>&',`GtkSourceCompletionProposal*',`const_cast<GtkSourceCompletionProposal*>(Glib::unwrap($3))')
 _CONVERSION(`const Glib::RefPtr<SourceCompletionProposal>&',`GtkSourceCompletionProposal*',`Glib::unwrap($3)')
 
 
-# gtksourceview::SourceCompletionProvider -> GtkSourceCompletionProvider
+# Gsv::SourceCompletionProvider -> GtkSourceCompletionProvider
 _CONVERSION(`const Glib::RefPtr<SourceCompletionProvider>&',`GtkSourceCompletionProvider*',`Glib::unwrap($3)')
 
 
-# GtkSourceGutter -> gtksourceview::SourceGutter
+# GtkSourceGutter -> Gsv::SourceGutter
 _CONVERSION(`GtkSourceGutter*',`Glib::RefPtr<SourceGutter>',`Glib::wrap($3)')
 
 
-# GtkSourceLanguage -> gtksourceview::SourceLanguage
+# GtkSourceLanguage -> Gsv::SourceLanguage
 _CONVERSION(`GtkSourceLanguage*',`Glib::RefPtr<SourceLanguage>',`Glib::wrap($3)')
 
 
-# gtksourceview::SourceLanguage -> GtkSourceLanguage
+# Gsv::SourceLanguage -> GtkSourceLanguage
 _CONVERSION(`const Glib::RefPtr<SourceLanguage>&',`GtkSourceLanguage*',`Glib::unwrap($3)')
 
 
-# GtkSourceLanguageManager -> gtksourceview::SourceLanguageManager
+# GtkSourceLanguageManager -> Gsv::SourceLanguageManager
 _CONVERSION(`GtkSourceLanguageManager*',`Glib::RefPtr<SourceLanguageManager>',`Glib::wrap($3)')
 
 
-# GtkSourceMark -> gtksourceview::SourceMark
+# GtkSourceMark -> Gsv::SourceMark
 _CONVERSION(`GtkSourceMark*',`Glib::RefPtr<SourceMark>',`Glib::wrap($3)')
 
 
-# GtkSourceStyle -> gtksourceview::SourceStyle
+# GtkSourceStyle -> Gsv::SourceStyle
 _CONVERSION(`GtkSourceStyle*',`Glib::RefPtr<SourceStyle>',`Glib::wrap($3)')
 
 
-# GtkSourceStyleScheme -> gtksourceview::SourceStyleScheme
+# GtkSourceStyleScheme -> Gsv::SourceStyleScheme
 _CONVERSION(`GtkSourceStyleScheme*',`Glib::RefPtr<SourceStyleScheme>',`Glib::wrap($3)')
 
 
-# gtksourceview::SourceStyleScheme -> GtkSourceStyleScheme
+# Gsv::SourceStyleScheme -> GtkSourceStyleScheme
 _CONVERSION(`const Glib::RefPtr<SourceStyleScheme>&',`GtkSourceStyleScheme*',`Glib::unwrap($3)')
 
 
-# GtkSourceStyleSchemeManager -> gtksourceview::SourceStyleSchemeManager
+# GtkSourceStyleSchemeManager -> Gsv::SourceStyleSchemeManager
 _CONVERSION(`GtkSourceStyleSchemeManager*',`Glib::RefPtr<SourceStyleSchemeManager>',`Glib::wrap($3)')
 
 
-# GtkSourceUndoManager -> gtksourceview::SourceUndoManager
+# GtkSourceUndoManager -> Gsv::SourceUndoManager
 _CONVERSION(`GtkSourceUndoManager*',`Glib::RefPtr<SourceUndoManager>',`Glib::wrap($3)')
 
 
-# gtksourceview::SourceUndoManager -> GtkSourceUndoManager
+# Gsv::SourceUndoManager -> GtkSourceUndoManager
 _CONVERSION(`const Glib::RefPtr<const SourceUndoManager>&',`GtkSourceUndoManager*',`const_cast<GtkSourceUndoManager*>(Glib::unwrap($3))')
 
 
-# GtkSourceView -> Gtk::SourceView
+# GtkSourceView -> Gsv::SourceView
 _CONVERSION(`GtkSourceView*',`SourceView*',`Glib::wrap($3)')
 _CONVERSION(`GtkSourceView*',`const SourceView*',`Glib::wrap($3)')
 
diff --git a/gtksourceview/gtksourceviewmm/init.cc b/gtksourceview/gtksourceviewmm/init.cc
index 3b53962..93ad789 100644
--- a/gtksourceview/gtksourceviewmm/init.cc
+++ b/gtksourceview/gtksourceviewmm/init.cc
@@ -19,18 +19,19 @@
  */
 
 #include "init.h"
-namespace gtksourceview
+namespace Gsv
 {
 
 void
 init ()
 {
-    static bool s_init = false ;
-    if (!s_init) {
-        Gtk::Main::init_gtkmm_internals();
-        gtksourceview::wrap_init () ;
-        s_init = true ;
-    }
+  static bool s_init = false ;
+  if (!s_init)
+  {
+    Gtk::Main::init_gtkmm_internals() ;
+    Gsv::wrap_init () ;
+    s_init = true ;
+  }
 }
 
-} // namespace gtksourceview
+} // namespace Gsv
diff --git a/gtksourceview/gtksourceviewmm/init.h b/gtksourceview/gtksourceviewmm/init.h
index c4f30df..9c1e5b8 100644
--- a/gtksourceview/gtksourceviewmm/init.h
+++ b/gtksourceview/gtksourceviewmm/init.h
@@ -24,12 +24,12 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-namespace gtksourceview
+namespace Gsv
 {
   /** Initializes all type internals.
    */
   void init () ;
-}//end namespace gtksourceview
+}//end namespace Gsv
 
 #endif //_GTKSOURCEVIEWMM_INIT_H
 
diff --git a/gtksourceview/gtksourceviewmm/sourcemarkup.cc b/gtksourceview/gtksourceviewmm/sourcemarkup.cc
index 6f2fa6e..fa0f490 100644
--- a/gtksourceview/gtksourceviewmm/sourcemarkup.cc
+++ b/gtksourceview/gtksourceviewmm/sourcemarkup.cc
@@ -20,7 +20,7 @@
 #include <gtksourceviewmm/sourcemarkup.h>
 
 
-namespace gtksourceview
+namespace Gsv
 {
 
 SourceMarkup::SourceMarkup()
@@ -72,5 +72,5 @@ const char* SourceMarkup::get_c_str() const
   return markup_.c_str();
 }
 
-} // namespace gtksourceview
+} // namespace Gsv
 
diff --git a/gtksourceview/gtksourceviewmm/sourcemarkup.h b/gtksourceview/gtksourceviewmm/sourcemarkup.h
index fa260ff..13aeede 100644
--- a/gtksourceview/gtksourceviewmm/sourcemarkup.h
+++ b/gtksourceview/gtksourceviewmm/sourcemarkup.h
@@ -25,7 +25,7 @@
 #include <glibmm/ustring.h>
 #include <glibmm/containerhandle_shared.h>
 
-namespace gtksourceview
+namespace Gsv
 {
 /** It is just a class holding markup string.
  *
@@ -127,7 +127,7 @@ protected:
 
 /** See SourceMarkup::equal()
  *
- * @relates gtksourceview::SourceMarkup
+ * @relates Gsv::SourceMarkup
  *
  * @newin{2,10}
  */
@@ -136,7 +136,7 @@ inline bool operator==(const SourceMarkup& lhs, const SourceMarkup& rhs)
 
 /** See SourceMarkup::equal()
  *
- * @relates gtksourceview::SourceMarkup
+ * @relates Gsv::SourceMarkup
  *
  * @newin{2,10}
  */
@@ -148,7 +148,7 @@ inline bool operator!=(const SourceMarkup& lhs, const SourceMarkup& rhs)
 
 struct SourceMarkup_Traits : public Glib::Container_Helpers::TypeTraits<Glib::ustring>
 {
-  typedef gtksourceview::SourceMarkup CppType;
+  typedef Gsv::SourceMarkup CppType;
 
   static const char* to_c_type(const SourceMarkup& markup) { return markup.get_c_str(); }
   static SourceMarkup     to_cpp_type(const char* str)     { return SourceMarkup(str);   }
@@ -156,7 +156,7 @@ struct SourceMarkup_Traits : public Glib::Container_Helpers::TypeTraits<Glib::us
 
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
-} // namespace gtksourceview
+} // namespace Gsv
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -165,13 +165,13 @@ namespace Glib
 {
 
 template <>
-class Value<gtksourceview::SourceMarkup> : public Glib::ValueBase_String
+class Value<Gsv::SourceMarkup> : public Glib::ValueBase_String
 {
 public:
-  typedef gtksourceview::SourceMarkup CppType;
+  typedef Gsv::SourceMarkup CppType;
 
-  void set(const gtksourceview::SourceMarkup& data) { set_cstring(data.get_c_str());      }
-  gtksourceview::SourceMarkup get() const           { return gtksourceview::SourceMarkup(get_cstring()); }
+  void set(const Gsv::SourceMarkup& data) { set_cstring(data.get_c_str());      }
+  Gsv::SourceMarkup get() const           { return Gsv::SourceMarkup(get_cstring()); }
 };
 
 } // namespace Glib
diff --git a/gtksourceview/gtksourceviewmm/wrap_init.h b/gtksourceview/gtksourceviewmm/wrap_init.h
index 8218916..8595284 100644
--- a/gtksourceview/gtksourceviewmm/wrap_init.h
+++ b/gtksourceview/gtksourceviewmm/wrap_init.h
@@ -23,12 +23,12 @@
  * License along with this library; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-namespace gtksourceview
+namespace Gsv
 {
   /** Initializes wrapper types.
    */
   void wrap_init () ;
-}//end namespace gtksourceview
+}//end namespace Gsv
 
 #endif //_GTKSOURCEVIEWMM_WRAP_INIT_H
 
diff --git a/gtksourceview/src/Makefile.am b/gtksourceview/src/Makefile.am
index c284013..524a2d3 100644
--- a/gtksourceview/src/Makefile.am
+++ b/gtksourceview/src/Makefile.am
@@ -1,5 +1,5 @@
 binding_name = gtksourceviewmm
-wrap_init_flags = --namespace=gtksourceview --parent_dir=gtksourceviewmm
+wrap_init_flags = --namespace=Gsv --parent_dir=gtksourceviewmm
 
 include $(srcdir)/filelist.am
 include $(top_srcdir)/codegen/m4/filelist.am
diff --git a/gtksourceview/src/sourcebuffer.ccg b/gtksourceview/src/sourcebuffer.ccg
index 55658d4..57d72d4 100644
--- a/gtksourceview/src/sourcebuffer.ccg
+++ b/gtksourceview/src/sourcebuffer.ccg
@@ -22,7 +22,7 @@
 #include <gtksourceviewmm/sourcebuffer.h>
 #include <gtksourceview/gtksourcebuffer.h>
 
-namespace gtksourceview
+namespace Gsv
 {
 
 SourceBuffer::SourceBuffer () :
@@ -82,6 +82,6 @@ SourceBuffer::set_default_undo_manager()
   gtk_source_buffer_set_undo_manager(gobj(), 0);
 }
 
-}//end namespace gtksourceview
+}//end namespace Gsv
 
 
diff --git a/gtksourceview/src/sourcebuffer.hg b/gtksourceview/src/sourcebuffer.hg
index 3ef2e1d..a4e0138 100644
--- a/gtksourceview/src/sourcebuffer.hg
+++ b/gtksourceview/src/sourcebuffer.hg
@@ -29,7 +29,7 @@ _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(gtkmm/private/textbuffer_p.h)
 _PINCLUDE(gtksourceview/gtksourceview-typebuiltins.h)
 
-namespace gtksourceview
+namespace Gsv
 {
 
 /** Describes result of matching brackets.
@@ -504,4 +504,4 @@ public:
   _WRAP_SIGNAL(void bracket_matched(Gtk::TextIter& iter, SourceBracketMatchType state), "bracket-matched")
 };
 
-} /* namespace gtksourceview */
+} /* namespace Gsv */
diff --git a/gtksourceview/src/sourcecompletion.ccg b/gtksourceview/src/sourcecompletion.ccg
index 2e77f2a..0dea31a 100644
--- a/gtksourceview/src/sourcecompletion.ccg
+++ b/gtksourceview/src/sourcecompletion.ccg
@@ -19,7 +19,7 @@
 
 #include <gtksourceview/gtksourcecompletion.h>
 
-namespace gtksourceview
+namespace Gsv
 {
 
 Glib::RefPtr<SourceCompletionContext>
@@ -28,4 +28,4 @@ SourceCompletion::create_context()
   return Glib::wrap(gtk_source_completion_create_context(gobj(), 0));
 }
 
-} // namespace gtksourceview
+} // namespace Gsv
diff --git a/gtksourceview/src/sourcecompletion.hg b/gtksourceview/src/sourcecompletion.hg
index 49ecb37..819f60c 100644
--- a/gtksourceview/src/sourcecompletion.hg
+++ b/gtksourceview/src/sourcecompletion.hg
@@ -26,7 +26,7 @@
 _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(glibmm/private/object_p.h)
 
-namespace gtksourceview
+namespace Gsv
 {
 
 class SourceCompletionContext;
@@ -230,5 +230,5 @@ public:
   _WRAP_PROPERTY("view", SourceView*)
 };
 
-} /* namespace gtksourceview */
+} /* namespace Gsv */
 
diff --git a/gtksourceview/src/sourcecompletionactivation.hg b/gtksourceview/src/sourcecompletionactivation.hg
index df89b72..9b767c6 100644
--- a/gtksourceview/src/sourcecompletionactivation.hg
+++ b/gtksourceview/src/sourcecompletionactivation.hg
@@ -19,7 +19,7 @@
 
 _DEFS(gtksourceviewmm,gtksourceview)
 
-namespace gtksourceview
+namespace Gsv
 {
 // TODO: need docs. krnowak
 /** An enum type specifying something bla bla bla, probably type of activation.
@@ -39,4 +39,4 @@ _WRAP_ENUM(SourceCompletionActivation, GtkSourceCompletionActivation)
   * For example through a keyboard accelerator from the view.
   */
 
-} // namespace gtksourceview
+} // namespace Gsv
diff --git a/gtksourceview/src/sourcecompletioncontext.ccg b/gtksourceview/src/sourcecompletioncontext.ccg
index 50dd1a8..54567da 100644
--- a/gtksourceview/src/sourcecompletioncontext.ccg
+++ b/gtksourceview/src/sourcecompletioncontext.ccg
@@ -19,7 +19,7 @@
 
 #include <gtksourceview/gtksourcecompletioncontext.h>
 
-namespace gtksourceview
+namespace Gsv
 {
 
 Gtk::TextIter SourceCompletionContext::get_iter() const
@@ -29,4 +29,4 @@ Gtk::TextIter SourceCompletionContext::get_iter() const
   return iter;
 }
 
-} // namespace gtksourceview
+} // namespace Gsv
diff --git a/gtksourceview/src/sourcecompletioncontext.hg b/gtksourceview/src/sourcecompletioncontext.hg
index a7cc20f..ca1a6ed 100644
--- a/gtksourceview/src/sourcecompletioncontext.hg
+++ b/gtksourceview/src/sourcecompletioncontext.hg
@@ -30,7 +30,7 @@ _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(glibmm/private/object_p.h)
 
 
-namespace gtksourceview
+namespace Gsv
 {
 
 class SourceCompletionProvider;
@@ -97,5 +97,5 @@ public:
   _WRAP_SIGNAL(void cancelled(), "cancelled")
 };
 
-} /* namespace gtksourceview */
+} /* namespace Gsv */
 
diff --git a/gtksourceview/src/sourcecompletioninfo.ccg b/gtksourceview/src/sourcecompletioninfo.ccg
index 2f29e7d..d34eedd 100644
--- a/gtksourceview/src/sourcecompletioninfo.ccg
+++ b/gtksourceview/src/sourcecompletioninfo.ccg
@@ -19,7 +19,7 @@
 
 #include <gtksourceview/gtksourcecompletioninfo.h>
 
-namespace gtksourceview
+namespace Gsv
 {
 
 SourceCompletionInfo::SourceCompletionInfo() :
@@ -32,4 +32,4 @@ SourceCompletionInfo::move_to_iter(const Gtk::TextView& view)
   gtk_source_completion_info_move_to_iter(gobj(), const_cast<GtkTextView*>(view.gobj()), 0);
 }
 
-}
+} // namespace Gsv
diff --git a/gtksourceview/src/sourcecompletioninfo.hg b/gtksourceview/src/sourcecompletioninfo.hg
index b3a9e26..aa56f1b 100644
--- a/gtksourceview/src/sourcecompletioninfo.hg
+++ b/gtksourceview/src/sourcecompletioninfo.hg
@@ -25,7 +25,7 @@ _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(gtkmm/private/window_p.h)
 
 
-namespace gtksourceview
+namespace Gsv
 {
 
 /** Calltips object
@@ -138,5 +138,5 @@ public:
   _WRAP_SIGNAL(void before_show(), "before-show")
 };
 
-} /* namespace gtksourceview */
+} /* namespace Gsv */
 
diff --git a/gtksourceview/src/sourcecompletionitem.ccg b/gtksourceview/src/sourcecompletionitem.ccg
index adc7893..002ad43 100644
--- a/gtksourceview/src/sourcecompletionitem.ccg
+++ b/gtksourceview/src/sourcecompletionitem.ccg
@@ -19,7 +19,7 @@
 
 #include <gtksourceview/gtksourcecompletionitem.h>
 
-namespace gtksourceview
+namespace Gsv
 {
 
 SourceCompletionItem::SourceCompletionItem(const Glib::ustring& label, const Glib::ustring& text, const Glib::RefPtr<const Gdk::Pixbuf>& icon, const Glib::ustring& info) :
@@ -67,4 +67,4 @@ SourceCompletionItem::SourceCompletionItem(const Glib::ustring& label, const Gli
   }
 }
 
-} // namespace gtksourceview
+} // namespace Gsv
diff --git a/gtksourceview/src/sourcecompletionitem.hg b/gtksourceview/src/sourcecompletionitem.hg
index 9c830fb..70d61a4 100644
--- a/gtksourceview/src/sourcecompletionitem.hg
+++ b/gtksourceview/src/sourcecompletionitem.hg
@@ -26,7 +26,7 @@ _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(glibmm/private/object_p.h)
 
 
-namespace gtksourceview
+namespace Gsv
 {
 
 // TODO: need docs here. krnowak
@@ -102,5 +102,5 @@ public:
   _WRAP_PROPERTY("text", Glib::ustring)
 };
 
-} /* namespace gtksourceview */
+} /* namespace Gsv */
 
diff --git a/gtksourceview/src/sourcecompletionproposal.hg b/gtksourceview/src/sourcecompletionproposal.hg
index 49b48ea..07b7ed0 100644
--- a/gtksourceview/src/sourcecompletionproposal.hg
+++ b/gtksourceview/src/sourcecompletionproposal.hg
@@ -25,7 +25,7 @@
 _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(glibmm/private/interface_p.h)
 
-namespace gtksourceview
+namespace Gsv
 {
 
 /** Completion proposal object.
@@ -161,6 +161,6 @@ private:
 #m4 _CONVERSION(`GtkSourceCompletionProposal*', `const Glib::RefPtr<const SourceCompletionProposal>&', `Glib::wrap($3)')
 };
 
-} // namespace gtksourceview
+} // namespace Gsv
 
 
diff --git a/gtksourceview/src/sourcecompletionprovider.hg b/gtksourceview/src/sourcecompletionprovider.hg
index 09d8d24..5fac3f5 100644
--- a/gtksourceview/src/sourcecompletionprovider.hg
+++ b/gtksourceview/src/sourcecompletionprovider.hg
@@ -28,7 +28,7 @@
 _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(glibmm/private/interface_p.h)
 
-namespace gtksourceview
+namespace Gsv
 {
 
 class SourceCompletionContext;
@@ -237,6 +237,6 @@ private:
   _WRAP_VFUNC(int get_priority() const, get_priority)
 };
 
-} // namespace gtksourceview
+} // namespace Gsv
 
 
diff --git a/gtksourceview/src/sourcecompletionwords.hg b/gtksourceview/src/sourcecompletionwords.hg
index 19add2d..1f88396 100644
--- a/gtksourceview/src/sourcecompletionwords.hg
+++ b/gtksourceview/src/sourcecompletionwords.hg
@@ -23,7 +23,7 @@
 _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(glibmm/private/object_p.h)
 
-namespace gtksourceview
+namespace Gsv
 {
 // TODO: docs needed. krnowak
 /** Words completion provider.
@@ -82,5 +82,5 @@ public:
   _WRAP_PROPERTY("priority", int)
 };
 
-} /* namespace gtksourceview */
+} /* namespace Gsv */
 
diff --git a/gtksourceview/src/sourcegutter.ccg b/gtksourceview/src/sourcegutter.ccg
index 3273920..34a9ea5 100644
--- a/gtksourceview/src/sourcegutter.ccg
+++ b/gtksourceview/src/sourcegutter.ccg
@@ -25,7 +25,7 @@ static void SignalProxy_CellData_gtk_callback(GtkSourceGutter *gutter G_GNUC_UNU
                                               gboolean current_line,
                                               gpointer data)
 {
-  gtksourceview::SourceGutter::SlotData* the_slot = static_cast<gtksourceview::SourceGutter::SlotData*>(data);
+  Gsv::SourceGutter::SlotData* the_slot = static_cast<Gsv::SourceGutter::SlotData*>(data);
 
   #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
@@ -43,14 +43,14 @@ static void SignalProxy_CellData_gtk_callback(GtkSourceGutter *gutter G_GNUC_UNU
 
 static void SignalProxy_CellData_gtk_callback_destroy(void* data)
 {
-  delete static_cast<gtksourceview::SourceGutter::SlotData*>(data);
+  delete static_cast<Gsv::SourceGutter::SlotData*>(data);
 }
 
 static void SignalProxy_CellSize_gtk_callback(GtkSourceGutter *gutter G_GNUC_UNUSED,
                                               GtkCellRenderer *cell,
                                               gpointer data)
 {
-  gtksourceview::SourceGutter::SlotSize* the_slot = static_cast<gtksourceview::SourceGutter::SlotSize*>(data);
+  Gsv::SourceGutter::SlotSize* the_slot = static_cast<Gsv::SourceGutter::SlotSize*>(data);
 
   #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
@@ -68,10 +68,10 @@ static void SignalProxy_CellSize_gtk_callback(GtkSourceGutter *gutter G_GNUC_UNU
 
 static void SignalProxy_CellSize_gtk_callback_destroy(void* data)
 {
-  delete static_cast<gtksourceview::SourceGutter::SlotSize*>(data);
+  delete static_cast<Gsv::SourceGutter::SlotSize*>(data);
 }
 
-namespace gtksourceview
+namespace Gsv
 {
 
 void SourceGutter::set_cell_data_func(Gtk::CellRenderer* renderer, const SlotData& slot)
@@ -104,5 +104,5 @@ SourceGutter::reset_cell_size_func(Gtk::CellRenderer* renderer)
   gtk_source_gutter_set_cell_size_func(gobj(), Glib::unwrap(renderer), 0, 0, 0);
 }
 
-}//end namespace gtksourceview
+}//end namespace Gsv
 
diff --git a/gtksourceview/src/sourcegutter.hg b/gtksourceview/src/sourcegutter.hg
index 3cf92c9..09981c6 100644
--- a/gtksourceview/src/sourcegutter.hg
+++ b/gtksourceview/src/sourcegutter.hg
@@ -30,7 +30,7 @@
 _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(glibmm/private/object_p.h)
 
-namespace gtksourceview
+namespace Gsv
 {
 
 class SourceView;
@@ -222,6 +222,6 @@ public:
 #m4 _CONVERSION(`GtkTooltip*', `const Glib::RefPtr<Gtk::Tooltip>&', `Glib::wrap($3)')
 };
 
-} // namespace gtksourceview
+} // namespace Gsv
 
 
diff --git a/gtksourceview/src/sourcelanguage.hg b/gtksourceview/src/sourcelanguage.hg
index cf0f406..6662ea3 100644
--- a/gtksourceview/src/sourcelanguage.hg
+++ b/gtksourceview/src/sourcelanguage.hg
@@ -27,7 +27,7 @@ _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(glibmm/private/object_p.h)
 
 
-namespace gtksourceview
+namespace Gsv
 {
 
 class SourceLanguageManager ;
@@ -122,4 +122,4 @@ public:
   _WRAP_METHOD(Glib::ustring get_metadata(const Glib::ustring& name) const, gtk_source_language_get_metadata)
 };
 
-} /* namespace gtksourceview */
+} /* namespace Gsv */
diff --git a/gtksourceview/src/sourcelanguagemanager.ccg b/gtksourceview/src/sourcelanguagemanager.ccg
index 042ee66..8ecadc3 100644
--- a/gtksourceview/src/sourcelanguagemanager.ccg
+++ b/gtksourceview/src/sourcelanguagemanager.ccg
@@ -22,7 +22,7 @@
 
 #include "gtksourceviewmm/sourcelanguagemanager.h"
 
-namespace gtksourceview
+namespace Gsv
 {
 
 void
@@ -31,5 +31,5 @@ SourceLanguageManager::reset_search_path()
   gtk_source_language_manager_set_search_path(gobj(), 0);
 }
 
-}//end namespace gtksourceview
+}//end namespace Gsv
 
diff --git a/gtksourceview/src/sourcelanguagemanager.hg b/gtksourceview/src/sourcelanguagemanager.hg
index f2cce5e..dbbc69a 100644
--- a/gtksourceview/src/sourcelanguagemanager.hg
+++ b/gtksourceview/src/sourcelanguagemanager.hg
@@ -29,7 +29,7 @@
 _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(glibmm/private/object_p.h)
 
-namespace gtksourceview
+namespace Gsv
 {
 _CC_INCLUDE(gtksourceview/gtksourcelanguagemanager.h)
 _CC_INCLUDE(gtksourceview/gtksourceview-typebuiltins.h)
@@ -214,5 +214,5 @@ public:
   _WRAP_METHOD(Glib::RefPtr<const SourceLanguage> guess_language(const std::string& filename, const std::string& content_type) const, gtk_source_language_manager_guess_language, refreturn, constversion)
 };
 
-} /* namespace gtksourceview */
+} /* namespace Gsv */
 
diff --git a/gtksourceview/src/sourcemark.ccg b/gtksourceview/src/sourcemark.ccg
index b8111b7..4bbc446 100644
--- a/gtksourceview/src/sourcemark.ccg
+++ b/gtksourceview/src/sourcemark.ccg
@@ -20,7 +20,7 @@
 
 #include <gtksourceview/gtksourcemark.h>
 
-namespace gtksourceview
+namespace Gsv
 {
 
 // Both constructors are implemented by hand because the C _new() function
@@ -76,5 +76,5 @@ Glib::RefPtr<const SourceMark> SourceMark::prev() const
 }
 
 
-} //namespace gtksourceview
+} //namespace Gsv
 
diff --git a/gtksourceview/src/sourcemark.hg b/gtksourceview/src/sourcemark.hg
index fcd8711..2a4ad5c 100644
--- a/gtksourceview/src/sourcemark.hg
+++ b/gtksourceview/src/sourcemark.hg
@@ -23,7 +23,7 @@
 _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(gtkmm/private/textmark_p.h)
 
-namespace gtksourceview
+namespace Gsv
 {
 
 /** Mark class for SourceBuffer.
@@ -46,7 +46,7 @@ public:
    * Add it to a buffer using Gtk::TextBuffer::add_mark(). Note that such marks
    * cannot be retrieved by using Gtk::TextBuffer::get_mark(). Normally marks
    * are created using the utility function
-   * gtksourceview::SourceBuffer::create_source_mark().
+   * Gsv::SourceBuffer::create_source_mark().
    *
    * @param category Is used to classify marks according to common
    * characteristics (e.g. all the marks representing a bookmark could belong to
@@ -174,6 +174,6 @@ public:
 
 };//end class SourceMark
 
-}//end namespace gtksourceview
+}//end namespace Gsv
 
 
diff --git a/gtksourceview/src/sourceprintcompositor.ccg b/gtksourceview/src/sourceprintcompositor.ccg
index 5427d46..fd54ab5 100644
--- a/gtksourceview/src/sourceprintcompositor.ccg
+++ b/gtksourceview/src/sourceprintcompositor.ccg
@@ -19,7 +19,7 @@
 
 #include <gtksourceview/gtksourceprintcompositor.h>
 
-namespace gtksourceview
+namespace Gsv
 {
 
 SourcePrintCompositor::SourcePrintCompositor(const SourceView& view) :
@@ -40,4 +40,4 @@ SourcePrintCompositor::set_footer_format(bool separator, const Glib::ustring& le
   gtk_source_print_compositor_set_footer_format(gobj(), static_cast<gboolean>(separator), (left.empty() ? 0 : left.c_str()), (center.empty() ? 0 : center.c_str()), (right.empty() ? 0 : right.c_str()));
 }
 
-} // namespace gtksourceview
+} // namespace Gsv
diff --git a/gtksourceview/src/sourceprintcompositor.hg b/gtksourceview/src/sourceprintcompositor.hg
index d69d4ab..ec3d7a7 100644
--- a/gtksourceview/src/sourceprintcompositor.hg
+++ b/gtksourceview/src/sourceprintcompositor.hg
@@ -25,7 +25,7 @@
 _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(glibmm/private/object_p.h)
 
-namespace gtksourceview
+namespace Gsv
 {
 
 /** Compose a SourceBuffer for printing.
@@ -523,7 +523,7 @@ public:
    * static bool
    * paginate (Glib::RefPtr<Gtk::PrintOperation> operation,
    *           Glib::RefPtr<Gtk::PrintContext> context,
-   *           Glib::RefPtr<gtksourceview::SourcePrintCompositor> compositor)
+   *           Glib::RefPtr<Gsv::SourcePrintCompositor> compositor)
    * {
    *   if (compositor->paginate(context))
    *   {
@@ -548,7 +548,7 @@ public:
    * static void
    * begin_print (Glib::RefPtr< Gtk::PrintOperation > operation,
    *              Glib::RefPtr< Gtk::PrintContext > context,
-   *              Glib::RefPtr< gtksourceview::SourcePrintCompositor > compositor)
+   *              Glib::RefPtr< Gsv::SourcePrintCompositor > compositor)
    * {
    *   while (!compositor->paginate(context));
    *
@@ -589,7 +589,7 @@ public:
    * draw_page (Glib::RefPtr< Gtk::PrintOperation > operation,
    *            Glib::RefPtr< GtkPrintContext > context,
    *            int page_nr,
-   *            Glib::RefPtr< gtksourceview::SourcePrintCompositor > compositor)
+   *            Glib::RefPtr< Gsv::SourcePrintCompositor > compositor)
    * {
    *   compositor->draw_page(context, page_nr);
    * }
@@ -618,5 +618,5 @@ public:
   _WRAP_PROPERTY("wrap-mode", Gtk::WrapMode)
 };
 
-} /* namespace gtksourceview */
+} /* namespace Gsv */
 
diff --git a/gtksourceview/src/sourcestyle.ccg b/gtksourceview/src/sourcestyle.ccg
index 59865cd..9a58032 100644
--- a/gtksourceview/src/sourcestyle.ccg
+++ b/gtksourceview/src/sourcestyle.ccg
@@ -19,4 +19,3 @@
  */
 
 #include <gtksourceview/gtksourcestyle.h>
-#include <cstring>
diff --git a/gtksourceview/src/sourcestyle.hg b/gtksourceview/src/sourcestyle.hg
index 063ec1d..ffd37ae 100644
--- a/gtksourceview/src/sourcestyle.hg
+++ b/gtksourceview/src/sourcestyle.hg
@@ -23,7 +23,7 @@
 _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(glibmm/private/object_p.h)
 
-namespace gtksourceview
+namespace Gsv
 {
 
 /** Class representing a style.
@@ -58,6 +58,6 @@ public:
   _WRAP_PROPERTY("underline-set", bool)
 };
 
-}//end namespace gtksourceview
+}//end namespace Gsv
 
 
diff --git a/gtksourceview/src/sourcestylescheme.hg b/gtksourceview/src/sourcestylescheme.hg
index 21cace1..9233114 100644
--- a/gtksourceview/src/sourcestylescheme.hg
+++ b/gtksourceview/src/sourcestylescheme.hg
@@ -27,7 +27,7 @@
 _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(glibmm/private/object_p.h)
 
-namespace gtksourceview
+namespace Gsv
 {
 
 
@@ -116,6 +116,6 @@ public:
   _WRAP_METHOD(Glib::RefPtr<const SourceStyle> get_style(const Glib::ustring& style_id) const, gtk_source_style_scheme_get_style, refreturn, constversion)
 };//end class SourceStyleScheme
 
-}//end namespace gtksourceview
+}//end namespace Gsv
 
 
diff --git a/gtksourceview/src/sourcestyleschememanager.ccg b/gtksourceview/src/sourcestyleschememanager.ccg
index e8bcfbe..cfb821e 100644
--- a/gtksourceview/src/sourcestyleschememanager.ccg
+++ b/gtksourceview/src/sourcestyleschememanager.ccg
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-namespace gtksourceview
+namespace Gsv
 {
 
 
@@ -29,6 +29,6 @@ void SourceStyleSchemeManager::reset_search_path()
   gtk_source_style_scheme_manager_set_search_path(gobj(), 0);
 }
 
-}
+} // namespace Gsv
 
 
diff --git a/gtksourceview/src/sourcestyleschememanager.hg b/gtksourceview/src/sourcestyleschememanager.hg
index 35917a5..52a852a 100644
--- a/gtksourceview/src/sourcestyleschememanager.hg
+++ b/gtksourceview/src/sourcestyleschememanager.hg
@@ -24,7 +24,7 @@
 _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(glibmm/private/object_p.h)
 
-namespace gtksourceview
+namespace Gsv
 {
 
 /** Class providing access to SourceStyleSchemes.
@@ -113,6 +113,6 @@ public:
 
 };//end class SourceStyleSchemeManager
 
-}//end namespace gtksourceview
+}//end namespace Gsv
 
 
diff --git a/gtksourceview/src/sourceundomanager.hg b/gtksourceview/src/sourceundomanager.hg
index 4a428cb..a371d18 100644
--- a/gtksourceview/src/sourceundomanager.hg
+++ b/gtksourceview/src/sourceundomanager.hg
@@ -25,7 +25,7 @@
 _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(glibmm/private/interface_p.h)
 
-namespace gtksourceview
+namespace Gsv
 {
 
 /** Undo manager interface for SourceView.
@@ -129,6 +129,6 @@ private:
   _WRAP_VFUNC(void end_not_undoable_action(), end_not_undoable_action)
 };
 
-} // namespace gtksourceview
+} // namespace Gsv
 
 
diff --git a/gtksourceview/src/sourceview.ccg b/gtksourceview/src/sourceview.ccg
index b8cbc6b..71b8e64 100644
--- a/gtksourceview/src/sourceview.ccg
+++ b/gtksourceview/src/sourceview.ccg
@@ -25,7 +25,7 @@
 
 static gchar* SignalProxy_MarkTooltip_gtk_callback(GtkSourceMark* mark, gpointer user_data)
 {
-  gtksourceview::SourceView::SlotMarkTooltip* the_slot = static_cast<gtksourceview::SourceView::SlotMarkTooltip*>(user_data);
+  Gsv::SourceView::SlotMarkTooltip* the_slot = static_cast<Gsv::SourceView::SlotMarkTooltip*>(user_data);
 
   #ifdef GLIBMM_EXCEPTIONS_ENABLED
   try
@@ -45,10 +45,10 @@ static gchar* SignalProxy_MarkTooltip_gtk_callback(GtkSourceMark* mark, gpointer
 
 static void SignalProxy_MarkTooltip_gtk_callback_destroy(void* data)
 {
-  delete static_cast<gtksourceview::SourceView::SlotMarkTooltip*>(data);
+  delete static_cast<Gsv::SourceView::SlotMarkTooltip*>(data);
 }
 
-namespace gtksourceview
+namespace Gsv
 {
 
 SourceView::SourceView() :
@@ -131,5 +131,5 @@ SourceView::unset_mark_category_tooltip_func(const Glib::ustring& category)
   gtk_source_view_set_mark_category_tooltip_func(gobj(), category.c_str(), 0, 0, 0);
 }
 
-}//end namespace gtksourceview
+}//end namespace Gsv
 
diff --git a/gtksourceview/src/sourceview.hg b/gtksourceview/src/sourceview.hg
index 517b516..33d2a58 100644
--- a/gtksourceview/src/sourceview.hg
+++ b/gtksourceview/src/sourceview.hg
@@ -28,7 +28,7 @@
 _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(gtkmm/private/textview_p.h)
 
-namespace gtksourceview
+namespace Gsv
 {
 
 class SourceGutter;
@@ -395,7 +395,7 @@ public:
    *
    * @code
    * static Glib::ustring
-   * tooltip_func (gtksourceview::SourceMark *mark)
+   * tooltip_func (Gsv::SourceMark *mark)
    * {
    *   return get_tooltip_for_mark(mark);
    * }
@@ -551,5 +551,5 @@ public:
   _WRAP_PROPERTY("completion", Glib::RefPtr<SourceCompletion>)
 };
 
-} /* namespace gtksourceview */
+} /* namespace Gsv */
 
diff --git a/tests/basic/main.cc b/tests/basic/main.cc
index 51667f9..fe50bfb 100644
--- a/tests/basic/main.cc
+++ b/tests/basic/main.cc
@@ -4,18 +4,18 @@
 using namespace std ;
 using namespace Glib ;
 using namespace Gtk ;
-using namespace gtksourceview ;
+using namespace Gsv;
 
 int
 main (int a_argc, char *a_argv[])
 {
     Gtk::Main main_loop (a_argc, a_argv) ;
-    gtksourceview::init () ;
+    Gsv::init () ;
 
     SourceView source_view ;
     RefPtr<SourceBuffer> buffer = source_view.get_source_buffer () ;
     if (!buffer) {
-        cerr << "gtksourceview::SourceView::get_source_buffer () failed" << std::endl ;
+        cerr << "Gsv::SourceView::get_source_buffer () failed" << std::endl ;
         return -1;
     }
     buffer->set_text ("coin") ;
diff --git a/tests/completion/main.cc b/tests/completion/main.cc
index 84a2fce..f06b253 100644
--- a/tests/completion/main.cc
+++ b/tests/completion/main.cc
@@ -9,8 +9,6 @@
 // gtksourceviewmm
 #include <gtksourceviewmm.h>
 
-namespace Gsv = gtksourceview;
-
 class TestProvider : public Glib::Object, public Gsv::SourceCompletionProvider
 {
 public:
diff --git a/tests/get_buffer/main.cc b/tests/get_buffer/main.cc
index 61f4fdc..1ac6dc8 100644
--- a/tests/get_buffer/main.cc
+++ b/tests/get_buffer/main.cc
@@ -1,7 +1,6 @@
 #include <iostream>
 #include <gtkmm.h>
 #include <gtksourceviewmm.h>
-namespace Gsv = gtksourceview ;
 
 int
 main (int argc, char* argv[])
diff --git a/tests/langs/main.cc b/tests/langs/main.cc
index 9e54526..f53f57f 100644
--- a/tests/langs/main.cc
+++ b/tests/langs/main.cc
@@ -5,13 +5,13 @@
 #include<gtksourceviewmm/init.h>
 
 using namespace std ;
-using namespace gtksourceview ;
+using namespace Gsv ;
 
 int
 main (int argc, char **argv)
 {
     Gtk::Main loop (argc, argv) ;
-    gtksourceview::init () ;
+    Gsv::init () ;
 
     Glib::RefPtr<SourceLanguageManager> language_manager =
                                                 SourceLanguageManager::create();
diff --git a/tests/mime_types/main.cc b/tests/mime_types/main.cc
index 1ce622e..1a2e04b 100644
--- a/tests/mime_types/main.cc
+++ b/tests/mime_types/main.cc
@@ -1,46 +1,51 @@
+// standard
 #include <iostream>
+#include <string>
+#include <vector>
+// gtkmm
 #include <gtkmm.h>
+// gtksourceviewmm
 #include <gtksourceviewmm/sourcelanguagemanager.h>
 #include <gtksourceviewmm/init.h>
-#include <gtksourceview/gtksourcelanguagemanager.h>
-
-using namespace std ;
-using namespace gtksourceview ;
-
-const char * s_mime_types [] = {
-"text/xml",
-"text/html",
-"text/x-c",
-"text/x-c++",
-0
-};
 
 int
-main (int argc, char **argv)
+main (int /* argc */, char** /* argv */)
 {
-    if (argc || argv) {}
+  Gsv::init () ;
 
-    gtksourceview::init () ;
+  Glib::RefPtr<Gsv::SourceLanguageManager> lang_mgr = Gsv::SourceLanguageManager::create ();
+  if (!lang_mgr)
+  {
+    std::cerr << "Could not create the language manager.\n";
+    return -1;
+  }
 
-    Glib::RefPtr<SourceLanguageManager> lang_mgr =
-                                            SourceLanguageManager::create () ;
-    if (!lang_mgr) {
-        cerr << "Could not create the languages manager" << std::endl;
-        return -1 ;
-    }
+  std::vector<std::string> mime_types;
+  mime_types.push_back ("text/xml");
+  mime_types.push_back ("text/html");
+  mime_types.push_back ("text/x-c");
+  mime_types.push_back ("text/x-c++");
 
-    Glib::RefPtr<SourceLanguage> lang;
-    for (int i=0 ; s_mime_types[i] ; ++i) {
-        cout << "Looking for language that matches mime type '"
-             << s_mime_types[i]
-             << "'" << std::endl;
-        lang = lang_mgr->guess_language(std::string(), s_mime_types[i]);
-        if (lang) {
-            cout << "Found language '" << lang->get_name () << "'" << std::endl;
-        } else {
-            cout << "No language matching that mime type" << std::endl;
-        }
+  Glib::RefPtr<Gsv::SourceLanguage> lang;
+
+  unsigned int size (mime_types.size ());
+  for (unsigned int idx (0); idx < size ; ++idx)
+  {
+    const std::string mime_type (mime_types[idx]);
+
+    std::cout << "Looking for language that matches mime type '"
+              << mime_type
+              << "'.\n";
+    lang = lang_mgr->guess_language (std::string (), mime_type);
+    if (lang)
+    {
+      std::cout << "Found language '" << lang->get_name () << "'.\n";
+    }
+    else
+    {
+      std::cout << "No language matching that mime type.\n";
     }
-    return 0 ;
+  }
+  return 0 ;
 }
 
diff --git a/tests/search/main.cc b/tests/search/main.cc
index 767ebcb..c4c481c 100644
--- a/tests/search/main.cc
+++ b/tests/search/main.cc
@@ -11,7 +11,7 @@
 using namespace std ;
 using namespace Gtk;
 using namespace Glib;
-using namespace gtksourceview ;
+using namespace Gsv ;
 
 #define LOG(message) \
 std::cout << __PRETTY_FUNCTION__ << ":" << __FILE__<< ":" << __LINE__ << ":" \
@@ -366,7 +366,7 @@ main (int argc, char **argv)
     //init plumbing
     //***************
     Main kit (argc, argv) ;
-    gtksourceview::init () ;
+    Gsv::init () ;
 
     App app ;
     app.get_widget ().set_size_request (500, 400) ;
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]