Renaming leftovers

[lyx.git] / src / rowpainter.cpp

diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index 9a63d53b8ea7161b0498df60a04851bca67ab448..cd19b72389b3d7903cb01be77046c11e6ed2422c 100644 (file)
--- a/src/rowpainter.cpp
+++ b/src/rowpainter.cpp
@@ -17,12 +17,12 @@
 #include "Buffer.h"
 #include "CoordCache.h"
 #include "Cursor.h"
-#include "debug.h"
+#include "support/debug.h"
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Changes.h"
 #include "Encoding.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "Language.h"
 #include "Layout.h"
 #include "LyXRC.h"
@@ -44,10 +44,9 @@
 
 #include <boost/crc.hpp>
 
-using std::endl;
-using std::max;
-using std::string;
+#include <ostream>
 
+using namespace std;
 
 namespace lyx {
 
@@ -87,36 +86,6 @@ int RowPainter::leftMargin() const
                row_.pos());
 }
 
-
-void RowPainter::paintHfill(pos_type const pos, pos_type const body_pos)
-{
-       x_ += 1;
-
-       int const y0 = yo_;
-       int const y1 = y0 - defaultRowHeight() / 2;
-
-       pi_.pain.line(int(x_), y1, int(x_), y0, Color_added_space);
-
-       if (pm_.hfillExpansion(row_, pos)) {
-               int const y2 = (y0 + y1) / 2;
-
-               if (pos >= body_pos) {
-                       pi_.pain.line(int(x_), y2, int(x_ + row_.hfill), y2,
-                               Color_added_space,
-                               Painter::line_onoffdash);
-                       x_ += row_.hfill;
-               } else {
-                       pi_.pain.line(int(x_), y2, int(x_ + row_.label_hfill), y2,
-                               Color_added_space,
-                               Painter::line_onoffdash);
-                       x_ += row_.label_hfill;
-               }
-               pi_.pain.line(int(x_), y1, int(x_), y0, Color_added_space);
-       }
-       x_ += 2;
-}
-
-
 // If you want to debug inset metrics uncomment the following line:
 //#define DEBUG_METRICS
 // This draws green lines around each inset.
@@ -156,15 +125,15 @@ void RowPainter::paintInset(Inset const * inset, pos_type const pos)
        if (dim.wid != dim2.wid)
                lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
                       << " draw width " << dim.width()
-                      << "> metrics width " << dim2.wid << "." << std::endl;
+                      << "> metrics width " << dim2.wid << "." << endl;
        if (dim->asc != dim2.asc)
                lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
                       << " draw ascent " << dim.ascent()
-                      << "> metrics ascent " << dim2.asc << "." << std::endl;
+                      << "> metrics ascent " << dim2.asc << "." << endl;
        if (dim2.descent() != dim.des)
                lyxerr << "Error: inset " << to_ascii(inset->getInsetName())
                       << " draw ascent " << dim.descent()
-                      << "> metrics descent " << dim2.des << "." << std::endl;
+                      << "> metrics descent " << dim2.des << "." << endl;
        BOOST_ASSERT(dim2.wid == dim.wid);
        BOOST_ASSERT(dim2.asc == dim.asc);
        BOOST_ASSERT(dim2.des == dim.des);
@@ -253,7 +222,7 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo const & font,
        Change::Type const prev_change = par_.lookupChange(pos).type;
 
        // first character
-       std::vector<char_type> str;
+       vector<char_type> str;
        str.reserve(100);
        str.push_back(par_.getChar(pos));
 
@@ -360,7 +329,7 @@ void RowPainter::paintFromPos(pos_type & vpos)
        char_type const c = par_.getChar(pos);
 
        // special case languages
-       std::string const & lang = orig_font.language()->lang();
+       string const & lang = orig_font.language()->lang();
        bool const hebrew = lang == "hebrew";
        bool const arabic = lang == "arabic_arabtex" || lang == "arabic_arabi" || 
                                                lang == "farsi";
@@ -518,7 +487,7 @@ void RowPainter::paintFirst()
 
        bool const is_rtl = text_.isRTL(buffer, par_);
        bool const is_seq = isFirstInSequence(pit_, text_.paragraphs());
-       //lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << std::endl;
+       //lyxerr << "paintFirst: " << par_.id() << " is_seq: " << is_seq << endl;
 
        // should we print a label?
        if (layout->labeltype >= LABEL_STATIC
@@ -772,11 +741,7 @@ void RowPainter::paintText()
                        x_ += row_.label_hfill + lwidth - width_pos;
                }
 
-               if (par_.isHfill(pos)) {
-                       paintHfill(pos, body_pos);
-                       ++vpos;
-
-               } else if (par_.isSeparator(pos)) {
+               if (par_.isSeparator(pos)) {
                        Font const orig_font = text_metrics_.getDisplayFont(pit_, pos);
                        double const orig_x = x_;
                        x_ += width_pos;