GNOME.org
 

[libvtemm] Removed nonconst getters.

commit 1ab3fa8bc4bd6bfe5f33545f3b253430addade77
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Sun May 10 22:51:10 2009 +0200

    Removed nonconst getters.
    
    API/ABI/whatever goes to hell. Since libvtemm is not an official
    GNOME module/platform bindings or such, I felt free to tweak it a bit.
    src/libvtemm/g/terminal.ccg:
    src/libvtemm/g/terminal.hg:
    src/libvtemm/textandcharattrs.cc:
    src/libvtemm/textandcharattrs.h: Removed most of nonconst getters.
    But only those, which returned the same type like const getter.
    TODO: little update on things to do.
---
 TODO                             |    5 +-
 src/libvtemm/g/terminal.ccg      |   35 ++++++-----------
 src/libvtemm/g/terminal.hg       |   80 +++++++++++++++-----------------------
 src/libvtemm/textandcharattrs.cc |   10 -----
 src/libvtemm/textandcharattrs.h  |   10 +----
 5 files changed, 48 insertions(+), 92 deletions(-)

diff --git a/TODO b/TODO
index b2dfd5d..8888b5b 100644
--- a/TODO
+++ b/TODO
@@ -1,9 +1,8 @@
 src/libvtemm/g/terminal.(h|cc)g:
 	1. wrap commit signal by hand, when it will be possible.
 	("char, int" -> ("std::string"|"Glib::ustring"))
-	2. remove nonconst getter functions, when it will be possible.
-src/libvtemm/textandcharattrs.(h|cc):
-	1. remove nonconst getter functions, when it will be possible.
+	2. change Glib::StringArrayHandles to ArrayHandles<std::string>
+	or something where appropriate.
 src/libvtemm/g/*.(h|cc)g:
 src/libvtemm/*.(cc|h):
 	1. squashing bugs. as always.
diff --git a/src/libvtemm/g/terminal.ccg b/src/libvtemm/g/terminal.ccg
index c7f037b..79cc68b 100644
--- a/src/libvtemm/g/terminal.ccg
+++ b/src/libvtemm/g/terminal.ccg
@@ -29,7 +29,8 @@ namespace Vte
 namespace Private
 {
 
-gboolean SignalProxy_selected_gtk_callback(VteTerminal *terminal, glong column, glong row, gpointer data)
+gboolean
+SignalProxy_selected_gtk_callback(VteTerminal *terminal, glong column, glong row, gpointer data)
 {
   bool selected = true;
   Gnome::Vte::Terminal::SlotSelectedCallback* the_slot = static_cast<Gnome::Vte::Terminal::SlotSelectedCallback*>(data);
@@ -52,7 +53,8 @@ gboolean SignalProxy_selected_gtk_callback(VteTerminal *terminal, glong column,
 }
 } // namespace Private
 
-TextAndCharAttrs Terminal::get_text(const Gnome::Vte::Terminal::SlotSelectedCallback& slot)
+TextAndCharAttrs
+Terminal::get_text(const Gnome::Vte::Terminal::SlotSelectedCallback& slot) const
 {
   GArray* array = g_array_new(FALSE, FALSE, sizeof(VteCharAttributes));
   char* c_text = vte_terminal_get_text(gobj(), &Private::SignalProxy_selected_gtk_callback, const_cast<Gnome::Vte::Terminal::SlotSelectedCallback*>(&slot), array);
@@ -63,12 +65,8 @@ TextAndCharAttrs Terminal::get_text(const Gnome::Vte::Terminal::SlotSelectedCall
   return TextAndCharAttrs(text, attributes);
 }
 
-TextAndCharAttrs Terminal::get_text(const Gnome::Vte::Terminal::SlotSelectedCallback& slot) const
-{
-	return const_cast<Terminal*>(this)->get_text(slot);
-}
-
-TextAndCharAttrs Terminal::get_text_include_trailing_spaces(const Gnome::Vte::Terminal::SlotSelectedCallback& slot)
+TextAndCharAttrs
+Terminal::get_text_include_trailing_spaces(const Gnome::Vte::Terminal::SlotSelectedCallback& slot) const
 {
   GArray* array = g_array_new(FALSE, FALSE, sizeof(struct _VteCharAttributes));
   char* c_text = vte_terminal_get_text_include_trailing_spaces(gobj(), &Private::SignalProxy_selected_gtk_callback, const_cast<Gnome::Vte::Terminal::SlotSelectedCallback*>(&slot), array);
@@ -79,12 +77,8 @@ TextAndCharAttrs Terminal::get_text_include_trailing_spaces(const Gnome::Vte::Te
   return TextAndCharAttrs(text, attributes);
 }
 
-TextAndCharAttrs Terminal::get_text_include_trailing_spaces(const Gnome::Vte::Terminal::SlotSelectedCallback& slot) const
-{
-	return const_cast<Terminal*>(this)->get_text_include_trailing_spaces(slot);
-}
-
-TextAndCharAttrs Terminal::get_text_range(long start_row, long start_col, long end_row, long end_col, const Gnome::Vte::Terminal::SlotSelectedCallback& slot)
+TextAndCharAttrs
+Terminal::get_text_range(long start_row, long start_col, long end_row, long end_col, const Gnome::Vte::Terminal::SlotSelectedCallback& slot) const
 {
   GArray* array = g_array_new(FALSE, FALSE, sizeof(struct _VteCharAttributes));
   char* c_text = vte_terminal_get_text_range(gobj(), start_row, start_col, end_row, end_col, &Private::SignalProxy_selected_gtk_callback, const_cast<Gnome::Vte::Terminal::SlotSelectedCallback*>(&slot), array);
@@ -95,17 +89,12 @@ TextAndCharAttrs Terminal::get_text_range(long start_row, long start_col, long e
   return TextAndCharAttrs(text, attributes);
 }
 
-TextAndCharAttrs Terminal::get_text_range(long start_row, long start_col, long end_row, long end_col, const Gnome::Vte::Terminal::SlotSelectedCallback& slot) const
-{
-	return const_cast<Terminal*>(this)->get_text_range(start_row, start_col, end_row, end_col, slot);
-}
-
 Glib::ustring Terminal::match_check(long column, long row, int& tag)
 {
-	char* c_text = vte_terminal_match_check(gobj(), column, row, &tag);
-	Glib::ustring text(c_text);
-	g_free(c_text);
-	return text;
+  char* c_text = vte_terminal_match_check(gobj(), column, row, &tag);
+  Glib::ustring text(c_text);
+  g_free(c_text);
+  return text;
 }
 
 void Terminal::set_colors(const Gdk::Color& foreground, const Gdk::Color& background, const Gdk::ArrayHandle_Color& palette)
diff --git a/src/libvtemm/g/terminal.hg b/src/libvtemm/g/terminal.hg
index 1b0cf8b..db497d2 100644
--- a/src/libvtemm/g/terminal.hg
+++ b/src/libvtemm/g/terminal.hg
@@ -102,12 +102,10 @@ public:
 
   _WRAP_METHOD(void set_cursor_blinks(bool blink), vte_terminal_set_cursor_blinks, deprecated "Use set_cursor_blink_mode instead")
   _WRAP_METHOD(void set_cursor_blink_mode(TerminalCursorBlinkMode mode), vte_terminal_set_cursor_blink_mode)
-  _WRAP_METHOD(TerminalCursorBlinkMode get_cursor_blink_mode(), vte_terminal_get_cursor_blink_mode)
-  _WRAP_METHOD(TerminalCursorBlinkMode get_cursor_blink_mode() const, vte_terminal_get_cursor_blink_mode, constversion)
+  _WRAP_METHOD(TerminalCursorBlinkMode get_cursor_blink_mode() const, vte_terminal_get_cursor_blink_mode)
   
   _WRAP_METHOD(void set_cursor_shape(TerminalCursorShape shape), vte_terminal_set_cursor_shape)
-  _WRAP_METHOD(TerminalCursorShape get_cursor_shape(), vte_terminal_get_cursor_shape)
-  _WRAP_METHOD(TerminalCursorShape get_cursor_shape() const, vte_terminal_get_cursor_shape, constversion)
+  _WRAP_METHOD(TerminalCursorShape get_cursor_shape() const, vte_terminal_get_cursor_shape)
 
   _WRAP_METHOD(void set_scrollback_lines(long lines), vte_terminal_set_scrollback_lines)
 
@@ -117,16 +115,12 @@ public:
   _WRAP_METHOD(void set_font_full(const Pango::FontDescription& font_desc, TerminalAntiAlias antialias), vte_terminal_set_font_full, deprecated)
   _WRAP_METHOD(void set_font_from_string(const Glib::ustring& name), vte_terminal_set_font_from_string)
   _WRAP_METHOD(void set_font_from_string_full(const Glib::ustring name, TerminalAntiAlias antialias), vte_terminal_set_font_from_string_full, deprecated)
-  _WRAP_METHOD(const Pango::FontDescription get_font(), vte_terminal_get_font)
-  _WRAP_METHOD(const Pango::FontDescription get_font() const, vte_terminal_get_font, constversion)
-  _WRAP_METHOD(bool get_using_xft(), vte_terminal_get_using_xft, deprecated)
-  _WRAP_METHOD(bool get_using_xft() const, vte_terminal_get_using_xft, constversion, deprecated)
+  _WRAP_METHOD(const Pango::FontDescription get_font() const, vte_terminal_get_font)
+  _WRAP_METHOD(bool get_using_xft() const, vte_terminal_get_using_xft, deprecated)
   _WRAP_METHOD(void set_allow_bold(bool allow_bold), vte_terminal_set_allow_bold)
-  _WRAP_METHOD(bool get_allow_bold(), vte_terminal_get_allow_bold)
-  _WRAP_METHOD(bool get_allow_bold() const, vte_terminal_get_allow_bold, constversion)
+  _WRAP_METHOD(bool get_allow_bold() const, vte_terminal_get_allow_bold)
 
-  _WRAP_METHOD(bool get_has_selection(), vte_terminal_get_has_selection)
-  _WRAP_METHOD(bool get_has_selection() const, vte_terminal_get_has_selection, constversion)
+  _WRAP_METHOD(bool get_has_selection() const, vte_terminal_get_has_selection)
 
   _WRAP_METHOD(void set_word_chars(const Glib::ustring& spec), vte_terminal_set_word_chars)
   _WRAP_METHOD(bool is_word_char(gunichar c), vte_terminal_is_word_char)
@@ -135,23 +129,28 @@ public:
   _WRAP_METHOD(void set_delete_binding(TerminalEraseBinding binding), vte_terminal_set_delete_binding)
 
   _WRAP_METHOD(void set_mouse_autohide(bool setting), vte_terminal_set_mouse_autohide)
-  _WRAP_METHOD(bool get_mouse_autohide() const, vte_terminal_get_mouse_autohide, constversion)
+  _WRAP_METHOD(bool get_mouse_autohide() const, vte_terminal_get_mouse_autohide)
 
   _WRAP_METHOD(void reset(bool full, bool clear_history), vte_terminal_reset)
 
   typedef sigc::slot<bool, Terminal& /* terminal */, long /* column */, long /* row */> SlotSelectedCallback;
   _WRAP_METHOD_DOCS_ONLY(vte_terminal_get_text)
-  TextAndCharAttrs get_text(const SlotSelectedCallback& slot);
   TextAndCharAttrs get_text(const SlotSelectedCallback& slot) const;
   _WRAP_METHOD_DOCS_ONLY(vte_terminal_get_text_include_trailing_spaces)
-  TextAndCharAttrs get_text_include_trailing_spaces(const SlotSelectedCallback& slot);
   TextAndCharAttrs get_text_include_trailing_spaces(const SlotSelectedCallback& slot) const;
   _WRAP_METHOD_DOCS_ONLY(vte_terminal_get_text_range)
-  TextAndCharAttrs get_text_range(long start_row, long start_col, long end_row, long end_col, const SlotSelectedCallback& slot);
   TextAndCharAttrs get_text_range(long start_row, long start_col, long end_row, long end_col, const SlotSelectedCallback& slot) const;
   _IGNORE(vte_terminal_get_text, vte_terminal_get_text_include_trailing_spaces, vte_terminal_get_text_range)
-  _WRAP_METHOD(void get_cursor_position(long& column, long& row), vte_terminal_get_cursor_position)
-  _WRAP_METHOD(void get_cursor_position(long& column, long& row) const, vte_terminal_get_cursor_position, constversion)
+  _WRAP_METHOD_DOCS_ONLY(vte_terminal_get_cursor_position)
+/** @struct CursorPosition - simple struct holding cursor position.
+ * It contains two members describing cursor position - column and row.
+ */
+  struct CursorPosition
+  {
+  	long column;
+  	long row;
+  };
+  CursorPosition get_cursor_position() const;
 
   _WRAP_METHOD(void match_clear_all(), vte_terminal_match_clear_all)
 
@@ -169,46 +168,31 @@ public:
   _IGNORE(vte_terminal_match_check)
 
   _WRAP_METHOD(void set_emulation(const Glib::ustring& emulation), vte_terminal_set_emulation)
-  _WRAP_METHOD(const Glib::ustring get_emulation(), vte_terminal_get_emulation)
-  _WRAP_METHOD(const Glib::ustring get_emulation() const, vte_terminal_get_emulation, constversion)
-  _WRAP_METHOD(const Glib::ustring get_default_emulation(), vte_terminal_get_default_emulation)
-  _WRAP_METHOD(const Glib::ustring get_default_emulation() const, vte_terminal_get_default_emulation, constversion)
+  _WRAP_METHOD(const Glib::ustring get_emulation() const, vte_terminal_get_emulation)
+  _WRAP_METHOD(const Glib::ustring get_default_emulation() const, vte_terminal_get_default_emulation)
 
   _WRAP_METHOD(void set_encoding(const Glib::ustring& codeset), vte_terminal_set_encoding)
-  _WRAP_METHOD(const Glib::ustring get_encoding(), vte_terminal_get_encoding)
-  _WRAP_METHOD(const Glib::ustring get_encoding() const, vte_terminal_get_encoding, constversion)
+  _WRAP_METHOD(const Glib::ustring get_encoding() const, vte_terminal_get_encoding)
 
-  _WRAP_METHOD(const Glib::ustring get_status_line(), vte_terminal_get_status_line)
-  _WRAP_METHOD(const Glib::ustring get_status_line() const, vte_terminal_get_status_line, constversion)
+  _WRAP_METHOD(const Glib::ustring get_status_line() const, vte_terminal_get_status_line)
 
-  _WRAP_METHOD(void get_padding(int& xpad, int& ypad), vte_terminal_get_padding)
-  _WRAP_METHOD(void get_padding(int& xpad, int& ypad) const, vte_terminal_get_padding, constversion)
+  _WRAP_METHOD(void get_padding(int& xpad, int& ypad) const, vte_terminal_get_padding)
 
   _WRAP_METHOD(void set_pty(int pty_master), vte_terminal_set_pty)
-  _WRAP_METHOD(int get_pty(), vte_terminal_get_pty)
-  _WRAP_METHOD(int get_pty() const, vte_terminal_get_pty, constversion)
+  _WRAP_METHOD(int get_pty() const, vte_terminal_get_pty)
 
   _WRAP_METHOD(Gtk::Adjustment* get_adjustment(), vte_terminal_get_adjustment)
   _WRAP_METHOD(Gtk::Adjustment const* get_adjustment() const, vte_terminal_get_adjustment, constversion)
-  _WRAP_METHOD(long get_char_width(), vte_terminal_get_char_width)
-  _WRAP_METHOD(long get_char_width() const, vte_terminal_get_char_width, constversion)
-  _WRAP_METHOD(long get_char_height(), vte_terminal_get_char_height)
-  _WRAP_METHOD(long get_char_height() const, vte_terminal_get_char_height, constversion)
-  _WRAP_METHOD(long get_char_descent(), vte_terminal_get_char_descent, deprecated)
-  _WRAP_METHOD(long get_char_descent() const, vte_terminal_get_char_descent, deprecated, constversion)
-  _WRAP_METHOD(long get_char_ascent(), vte_terminal_get_char_ascent, deprecated)
-  _WRAP_METHOD(long get_char_ascent() const, vte_terminal_get_char_ascent, deprecated, constversion)
-  _WRAP_METHOD(long get_row_count(), vte_terminal_get_row_count)
-  _WRAP_METHOD(long get_row_count() const, vte_terminal_get_row_count, constversion)
-  _WRAP_METHOD(long get_column_count(), vte_terminal_get_column_count)
-  _WRAP_METHOD(long get_column_count() const, vte_terminal_get_column_count, constversion)
-  _WRAP_METHOD(const Glib::ustring get_window_title(), vte_terminal_get_window_title)
-  _WRAP_METHOD(const Glib::ustring get_window_title() const, vte_terminal_get_window_title, constversion)
-  _WRAP_METHOD(const Glib::ustring get_icon_title(), vte_terminal_get_icon_title)
-  _WRAP_METHOD(const Glib::ustring get_icon_title() const, vte_terminal_get_icon_title, constversion)
+  _WRAP_METHOD(long get_char_width() const, vte_terminal_get_char_width)
+  _WRAP_METHOD(long get_char_height() const, vte_terminal_get_char_height)
+  _WRAP_METHOD(long get_char_descent() const, vte_terminal_get_char_descent, deprecated)
+  _WRAP_METHOD(long get_char_ascent() const, vte_terminal_get_char_ascent, deprecated)
+  _WRAP_METHOD(long get_row_count() const, vte_terminal_get_row_count)
+  _WRAP_METHOD(long get_column_count() const, vte_terminal_get_column_count)
+  _WRAP_METHOD(Glib::ustring get_window_title() const, vte_terminal_get_window_title)
+  _WRAP_METHOD(Glib::ustring get_icon_title() const, vte_terminal_get_icon_title)
   
-  _WRAP_METHOD(int get_child_exit_status(), vte_terminal_get_child_exit_status)
-  _WRAP_METHOD(int get_child_exit_status() const, vte_terminal_get_child_exit_status, const)
+  _WRAP_METHOD(int get_child_exit_status() const, vte_terminal_get_child_exit_status)
 
   _WRAP_SIGNAL(void eof(), "eof")
   _WRAP_SIGNAL(void child_exited(), "child-exited")
diff --git a/src/libvtemm/textandcharattrs.cc b/src/libvtemm/textandcharattrs.cc
index 6f76d29..2862964 100644
--- a/src/libvtemm/textandcharattrs.cc
+++ b/src/libvtemm/textandcharattrs.cc
@@ -36,21 +36,11 @@ TextAndCharAttrs::~TextAndCharAttrs()
 {
 }
 
-inline Glib::ustring TextAndCharAttrs::get_text()
-{
-  return text;
-}
-
 inline Glib::ustring TextAndCharAttrs::get_text() const
 {
   return text;
 }
 
-inline ArrayHandle_CharAttributes TextAndCharAttrs::get_attributes()
-{
-  return attributes;
-}
-
 inline ArrayHandle_CharAttributes TextAndCharAttrs::get_attributes() const
 {
   return attributes;
diff --git a/src/libvtemm/textandcharattrs.h b/src/libvtemm/textandcharattrs.h
index ef3d744..874d492 100644
--- a/src/libvtemm/textandcharattrs.h
+++ b/src/libvtemm/textandcharattrs.h
@@ -43,18 +43,12 @@ public:
  */
   TextAndCharAttrs(const Glib::ustring& src_text, const ArrayHandle_CharAttributes& src_attributes);
   ~TextAndCharAttrs();
-/** Gets stored string.
- * @return Stored string.
- */
-  Glib::ustring get_text();
+
 /** Gets stored string.
  * @return Stored string.
  */
   Glib::ustring get_text() const;
-/** Gets stored attributes.
- * @return Stored attributes.
- */
-  ArrayHandle_CharAttributes get_attributes();
+
 /** Gets stored attributes.
  * @return Stored attributes.
  */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]