rename LFUN enum values according to their command (as used in th minibuffer/bind...

[lyx.git] / src / frontends / qt4 / qscreen.C

diff --git a/src/frontends/qt4/qscreen.C b/src/frontends/qt4/qscreen.C
index 48a9a8a291ed8ac9b87b19dcc3cb92d7cd903426..ef24f99ce2e300c522648704413c108e5b7bfbdd 100644 (file)
--- a/src/frontends/qt4/qscreen.C
+++ b/src/frontends/qt4/qscreen.C
@@ -9,18 +9,18 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#include <config.h>\r
+#include <config.h>
 
-#include "QWorkArea.h"\r
-#include "qscreen.h"\r
-\r
-#include <QColor>\r
-#include <QPainter>\r
+#include "QWorkArea.h"
+#include "qscreen.h"
+
+#include <QColor>
+#include <QPainter>
 #include <QApplication>
 
-#include "debug.h"\r
-#include "lcolorcache.h"\r
-\r
+#include "debug.h"
+#include "lcolorcache.h"
+
 
 namespace {
 
@@ -45,7 +45,7 @@ WorkArea & QScreen::workarea() const
 
 void QScreen::expose(int x, int y, int w, int h)
 {
-       lyxerr[Debug::GUI] << "expose " << w << 'x' << h\r
+       lyxerr[Debug::GUI] << "expose " << w << 'x' << h
                << '+' << x << '+' << y << std::endl;
 
        owner_.update(x, y, w, h);
@@ -61,7 +61,7 @@ void QScreen::showCursor(int x, int y, int h, Cursor_Shape shape)
                owner_.drawScreen(cursor_x_, cursor_y_, vcursor_);
                return;
        }
-               
+
        // Cache the dimensions of the cursor.
        cursor_x_ = x;
        cursor_y_ = y;
@@ -85,14 +85,14 @@ void QScreen::showCursor(int x, int y, int h, Cursor_Shape shape)
        // 1 the rectangle of the original screen.
        // 2 the vertical line of the cursor.
        // 3 the horizontal line of the L-shaped cursor (if necessary).
-\r
+
        QColor const & required_color = lcolorcache.get(LColor::cursor);
        bool const cursor_color_changed = required_color != cursor_color_;
        if (cursor_color_changed)
-               cursor_color_ = required_color;\r
-\r
-       vcursor_ = QPixmap(cursor_w_, cursor_h_);\r
-       vcursor_ .fill(cursor_color_);\r
+               cursor_color_ = required_color;
+
+       vcursor_ = QPixmap(cursor_w_, cursor_h_);
+       vcursor_ .fill(cursor_color_);
 
        switch (shape) {
        case BAR_SHAPE:
@@ -102,14 +102,14 @@ void QScreen::showCursor(int x, int y, int h, Cursor_Shape shape)
                if (cursor_w_ != hcursor_.width() ||
                    cursor_color_changed) {
                        if (cursor_w_ != hcursor_.width())
-                               hcursor_ = QPixmap(cursor_w_, 1);\r
-                       hcursor_.fill(cursor_color_);\r
+                               hcursor_ = QPixmap(cursor_w_, 1);
+                       hcursor_.fill(cursor_color_);
                }
                break;
        }
 
-       // Save the old area (no cursor).\r
-       nocursor_ = owner_.copyScreen(cursor_x_, cursor_y_, cursor_w_, cursor_h_);\r
+       // Save the old area (no cursor).
+       nocursor_ = owner_.copyScreen(cursor_x_, cursor_y_, cursor_w_, cursor_h_);
 
        // Draw the new (vertical) cursor using the cached store.
        owner_.drawScreen(cursor_x_, cursor_y_, vcursor_);