[gtksourceviewmm/devel] Autogenerate enum in SourceIter.



commit db374350d14237f743797bd005ce8147de03fc9f
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Sun Jan 10 21:21:13 2010 +0100

    Autogenerate enum in SourceIter.
    
    * gtksourceview/src/sourceiter.ccg:
    * gtksourceview/src/sourceiter.hg: Removed handwritten definition
    of SourceSearchFlags.

 gtksourceview/src/sourceiter.ccg |   40 +------------------------------------
 gtksourceview/src/sourceiter.hg  |   23 +++------------------
 2 files changed, 6 insertions(+), 57 deletions(-)
---
diff --git a/gtksourceview/src/sourceiter.ccg b/gtksourceview/src/sourceiter.ccg
index 2940223..02f9359 100644
--- a/gtksourceview/src/sourceiter.ccg
+++ b/gtksourceview/src/sourceiter.ccg
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2005 Jae Jang
  * Copyright (C) 2005-2006 Rob Page
  * Copyright (C) 2005-2006 Dodji Seketeli
+ * Copyright (C) 2010 Krzesimir Nowak
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -21,47 +22,10 @@
 
 #include "sourceiter.h"
 #include <glib/gmessages.h>
+#include <gtksourceview/gtksourceview-typebuiltins.h>
 namespace gtksourceview
 {
 
-SearchFlags operator| (SearchFlags lhs, SearchFlags rhs)
-{
-    return SearchFlags ((unsigned)lhs | (unsigned)rhs) ;
-}
-
-SearchFlags operator& (SearchFlags lhs, SearchFlags rhs)
-{
-    return  (SearchFlags) ((unsigned)lhs & (unsigned)rhs) ;
-}
-
-SearchFlags operator^ (SearchFlags lhs, SearchFlags rhs)
-{
-    return (SearchFlags) ((unsigned)lhs ^ (unsigned)rhs) ;
-}
-
-SearchFlags operator- (SearchFlags lhs)
-{
-    return (SearchFlags) (-(unsigned)lhs) ;
-}
-
-SearchFlags operator|= (SearchFlags &lhs, SearchFlags rhs)
-{
-    lhs = (SearchFlags) ((unsigned)lhs | (unsigned)rhs) ;
-    return lhs ;
-}
-
-SearchFlags operator&= (SearchFlags &lhs, SearchFlags rhs)
-{
-    lhs = (SearchFlags) ((unsigned)lhs & (unsigned)rhs) ;
-    return lhs ;
-}
-
-SearchFlags operator^= (SearchFlags &lhs, SearchFlags rhs)
-{
-    lhs = (SearchFlags) ((unsigned)lhs ^ (unsigned)rhs) ;
-    return lhs ;
-}
-
 SourceIter::SourceIter ()
 {
 }
diff --git a/gtksourceview/src/sourceiter.hg b/gtksourceview/src/sourceiter.hg
index ab3765b..5f6c05e 100644
--- a/gtksourceview/src/sourceiter.hg
+++ b/gtksourceview/src/sourceiter.hg
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2005 Jae Jang
  * Copyright (C) 2005-2006 Rob Page
  * Copyright (C) 2005-2006 Dodji Seketeli
+ * Copyright (C) 2010 Krzesimir Nowak
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -28,26 +29,10 @@ _CC_INCLUDE(gtksourceview/gtksourceiter.h)
 
 namespace gtksourceview
 {
-    enum SearchFlags {
-        SEARCH_VISIBLE_ONLY           = 1 << 0,
-        SEARCH_TEXT_ONLY              = 1 << 1,
-        SEARCH_CASE_INSENSITIVE       = 1 << 2
-    };//end enum searchFlags
 
-
-    SearchFlags operator| (SearchFlags lhs, SearchFlags rhs) ;
-
-    SearchFlags operator& (SearchFlags lhs, SearchFlags rhs) ;
-
-    SearchFlags operator^ (SearchFlags lhs, SearchFlags rhs) ;
-
-    SearchFlags operator- (SearchFlags lhs) ;
-
-    SearchFlags operator|= (SearchFlags &lhs, SearchFlags rhs) ;
-
-    SearchFlags operator&= (SearchFlags &lhs, SearchFlags rhs) ;
-
-    SearchFlags operator^= (SearchFlags &lhs, SearchFlags rhs) ;
+// TODO: rename all SearchFlags into SourceSearchFlags and remove the typedef when breaking API/ABI.
+  _WRAP_ENUM(SourceSearchFlags, GtkSourceSearchFlags)
+  typedef SourceSearchFlags SearchFlags;
 
 /// \brief an iterator type for gtksourceview::SourceBuffer.
 ///



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]