minor method name changes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6152 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 7e2df5b6b7842ec0c1f8a4e3a5461fe881857401..54b5648e6c2cd088d8e01e5d529e6143c11e41f6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-14  John Levon  <levon@movementarian.org>
+
+       * tabular.h:
+       * tabular.C: better method names
+
 2003-02-14  John Levon  <levon@movementarian.org>
 
        * BufferView_pimpl.C:

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 0352364794402c4c2815f79bf3a86c01590d9782..6251eb31c15c84ecb30a7c69b558dc45b5c9df6e 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-14  John Levon  <levon@movementarian.org>
+
+       * insettabular.C: changed method names in tabular.C
+
 2003-02-14  John Levon  <levon@movementarian.org>
 
        * inset.h:

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 67d342a301b62efe179b2a307d6ac2c354ecb462..5626bb1d17acc57ac021c33ed309c611eeedb61a 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -442,7 +442,7 @@ void InsetTabular::drawCellLines(Painter & pain, int x, int baseline,
        int x2 = x + tabular->GetWidthOfColumn(cell);
        bool on_off;
 
-       if (!tabular->TopAlreadyDrawed(cell)) {
+       if (!tabular->topAlreadyDrawn(cell)) {
                on_off = !tabular->TopLine(cell);
                pain.line(x, baseline - tabular->GetAscentOfRow(row),
                          x2, baseline -  tabular->GetAscentOfRow(row),
@@ -454,7 +454,7 @@ void InsetTabular::drawCellLines(Painter & pain, int x, int baseline,
                  x2, baseline + tabular->GetDescentOfRow(row),
                  on_off ? LColor::tabularonoffline : LColor::tabularline,
                  on_off ? Painter::line_onoffdash : Painter::line_solid);
-       if (!tabular->LeftAlreadyDrawed(cell)) {
+       if (!tabular->leftAlreadyDrawn(cell)) {
                on_off = !tabular->LeftLine(cell);
                pain.line(x, baseline -  tabular->GetAscentOfRow(row),
                          x, baseline +  tabular->GetDescentOfRow(row),
@@ -1834,8 +1834,10 @@ bool InsetTabular::tabularFeatures(BufferView * bv, string const & what)
        return true;
 }
 
-static void checkLongtableSpecial(LyXTabular::ltType & ltt,
-                                 string const & special, bool & flag)
+namespace {
+ 
+void checkLongtableSpecial(LyXTabular::ltType & ltt,
+                         string const & special, bool & flag)
 {
        if (special == "dl_above") {
                ltt.topDL = flag;
@@ -1852,6 +1854,8 @@ static void checkLongtableSpecial(LyXTabular::ltType & ltt,
        }
 }
 
+}
+
 
 void InsetTabular::tabularFeatures(BufferView * bv,
                                   LyXTabular::Feature feature,

diff --git a/src/tabular.C b/src/tabular.C
index 826f3c7aab7f4556969ec9e8395fbe9bb50ada36..00dbed5f197745582287b880a90cb3f13eab7901 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -97,7 +97,7 @@ LyXTabular::columnstruct::columnstruct()
 }
 
 
-LyXTabular::lttype::lttype()
+LyXTabular::ltType::ltType()
 {
        topDL = false;
        bottomDL = false;
@@ -153,7 +153,7 @@ LyXTabular::LyXTabular(Buffer const * buf, InsetTabular * inset, LyXLex & lex)
 LyXTabular & LyXTabular::operator=(LyXTabular const & lt)
 {
 #if 0
-#warning This while method should look like this: (Lgb)
+#warning This whole method should look like this: (Lgb)
 
                LyXTabular tmp(lt);
                tmp.swap(*this);
@@ -509,7 +509,7 @@ bool LyXTabular::RightLine(int cell, bool onlycolumn) const
 }
 
 
-bool LyXTabular::TopAlreadyDrawed(int cell) const
+bool LyXTabular::topAlreadyDrawn(int cell) const
 {
        int row = row_of_cell(cell);
        if ((row > 0) && !GetAdditionalHeight(row)) {
@@ -528,7 +528,7 @@ bool LyXTabular::TopAlreadyDrawed(int cell) const
 }
 
 
-bool LyXTabular::LeftAlreadyDrawed(int cell) const
+bool LyXTabular::leftAlreadyDrawn(int cell) const
 {
        int column = column_of_cell(cell);
        if (column > 0) {

diff --git a/src/tabular.h b/src/tabular.h
index ed06496481499a31f121844ccebc0f027bc999e6..bac0c068ea72d7b162730017f65922c8ae3cc752 100644 (file)
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -158,9 +158,9 @@ public:
                BOX_MINIPAGE = 2
        };
 
-       struct lttype {
+       struct ltType {
                // constructor
-               lttype();
+               ltType();
                // we have this header type (is set in the GetLT... functions)
                bool set;
                // double borders on top
@@ -172,8 +172,6 @@ public:
                // ignored in the output and it is set to be empty!
                bool empty;
        };
-       ///
-       typedef struct lttype ltType;
 
        /* konstruktor */
        ///
@@ -201,9 +199,9 @@ public:
        bool RightLine(int cell, bool onlycolumn = false) const;
 
        ///
-       bool TopAlreadyDrawed(int cell) const;
+       bool topAlreadyDrawn(int cell) const;
        ///
-       bool LeftAlreadyDrawed(int cell) const;
+       bool leftAlreadyDrawn(int cell) const;
        ///
        bool IsLastRow(int cell) const;