From 1725a8546852cc52196e49eca2aae8c847c1f834 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Sun, 14 Nov 2010 15:03:57 +0000 Subject: Rename variable in Fluid to make more sense git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7827 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- fluid/Fl_Type.cxx | 4 ++-- fluid/Fl_Type.h | 4 ++-- fluid/code.cxx | 40 ++++++++++++++++++++-------------------- fluid/fluid.cxx | 8 ++++---- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/fluid/Fl_Type.cxx b/fluid/Fl_Type.cxx index 183beb443..26047b08f 100644 --- a/fluid/Fl_Type.cxx +++ b/fluid/Fl_Type.cxx @@ -473,8 +473,8 @@ Fl_Type::Fl_Type() { comment_ = 0; rtti = 0; level = 0; - code_line = header_line = -1; - code_line_end = header_line_end = -1; + code_position = header_position = -1; + code_position_end = header_position_end = -1; } static void fixvisible(Fl_Type *p) { diff --git a/fluid/Fl_Type.h b/fluid/Fl_Type.h index 49800b6c5..eb93e616c 100644 --- a/fluid/Fl_Type.h +++ b/fluid/Fl_Type.h @@ -75,8 +75,8 @@ public: // things that should not be public: Fl_Type *factory; const char *callback_name(); - int code_line, header_line; - int code_line_end, header_line_end; + int code_position, header_position; + int code_position_end, header_position_end; protected: int user_defined(const char* cbname) const; diff --git a/fluid/code.cxx b/fluid/code.cxx index fab97d428..2e55d9f7a 100644 --- a/fluid/code.cxx +++ b/fluid/code.cxx @@ -290,9 +290,9 @@ extern Fl_Widget_Class_Type *current_widget_class; // of the parent code: static Fl_Type* write_code(Fl_Type* p) { if (write_sourceview) { - p->code_line = (int)ftell(code_file); - if (p->header_line_end==-1) - p->header_line = (int)ftell(header_file); + p->code_position = (int)ftell(code_file); + if (p->header_position_end==-1) + p->header_position = (int)ftell(header_file); } // write all code that come before the children code // (but don't write the last comment until the very end) @@ -333,9 +333,9 @@ static Fl_Type* write_code(Fl_Type* p) { p->write_code2(); } if (write_sourceview) { - p->code_line_end = (int)ftell(code_file); - if (p->header_line_end==-1) - p->header_line_end = (int)ftell(header_file); + p->code_position_end = (int)ftell(code_file); + if (p->header_position_end==-1) + p->header_position_end = (int)ftell(header_file); } return q; } @@ -369,14 +369,14 @@ int write_code(const char *s, const char *t) { Fl_Type* first_type = Fl_Type::first; if (first_type && first_type->is_comment()) { if (write_sourceview) { - first_type->code_line = (int)ftell(code_file); - first_type->header_line = (int)ftell(header_file); + first_type->code_position = (int)ftell(code_file); + first_type->header_position = (int)ftell(header_file); } // it is ok to write non-recusive code here, because comments have no children or code2 blocks first_type->write_code1(); if (write_sourceview) { - first_type->code_line_end = (int)ftell(code_file); - first_type->header_line_end = (int)ftell(header_file); + first_type->code_position_end = (int)ftell(code_file); + first_type->header_position_end = (int)ftell(header_file); } first_type = first_type->next; } @@ -423,18 +423,18 @@ int write_code(const char *s, const char *t) { } for (Fl_Type* p = first_type; p;) { // write all static data for this & all children first - if (write_sourceview) p->header_line = (int)ftell(header_file); + if (write_sourceview) p->header_position = (int)ftell(header_file); p->write_static(); if (write_sourceview) { - p->header_line_end = (int)ftell(header_file); - if (p->header_line==p->header_line_end) p->header_line_end = -1; + p->header_position_end = (int)ftell(header_file); + if (p->header_position==p->header_position_end) p->header_position_end = -1; } for (Fl_Type* q = p->next; q && q->level > p->level; q = q->next) { - if (write_sourceview) q->header_line = (int)ftell(header_file); + if (write_sourceview) q->header_position = (int)ftell(header_file); q->write_static(); if (write_sourceview) { - q->header_line_end = (int)ftell(header_file); - if (q->header_line==q->header_line_end) q->header_line_end = -1; + q->header_position_end = (int)ftell(header_file); + if (q->header_position==q->header_position_end) q->header_position_end = -1; } } // then write the nested code: @@ -450,13 +450,13 @@ int write_code(const char *s, const char *t) { Fl_Type* last_type = Fl_Type::last; if (last_type && last_type->is_comment()) { if (write_sourceview) { - last_type->code_line = (int)ftell(code_file); - last_type->header_line = (int)ftell(header_file); + last_type->code_position = (int)ftell(code_file); + last_type->header_position = (int)ftell(header_file); } last_type->write_code1(); if (write_sourceview) { - last_type->code_line_end = (int)ftell(code_file); - last_type->header_line_end = (int)ftell(header_file); + last_type->code_position_end = (int)ftell(code_file); + last_type->header_position_end = (int)ftell(header_file); } } diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx index 796a93085..e9f13b271 100644 --- a/fluid/fluid.cxx +++ b/fluid/fluid.cxx @@ -2151,8 +2151,8 @@ void update_sourceview_position() if (sourceview_panel && sourceview_panel->visible() && Fl_Type::current) { int pos0, pos1; if (sv_source->visible_r()) { - pos0 = Fl_Type::current->code_line; - pos1 = Fl_Type::current->code_line_end; + pos0 = Fl_Type::current->code_position; + pos1 = Fl_Type::current->code_position_end; if (pos0>=0) { if (pos1visible_r()) { - pos0 = Fl_Type::current->header_line; - pos1 = Fl_Type::current->header_line_end; + pos0 = Fl_Type::current->header_position; + pos1 = Fl_Type::current->header_position_end; if (pos0>=0) { if (pos1