New Patches
Yuriy Skalko
yuriy.skalko at gmail.com
Fri Nov 20 22:16:50 UTC 2020
And here are next 3 patches.
Yuriy
-------------- next part --------------
From 83a9828c25ab2501bbaadcfe86040b076905d3c5 Mon Sep 17 00:00:00 2001
From: Yuriy Skalko <yuriy.skalko at gmail.com>
Date: Thu, 19 Nov 2020 14:51:00 +0200
Subject: [PATCH 1/4] Remove unused header
---
src/mathed/InsetMathSymbol.cpp | 1 -
src/mathed/MathSupport.cpp | 1 -
2 files changed, 2 deletions(-)
diff --git a/src/mathed/InsetMathSymbol.cpp b/src/mathed/InsetMathSymbol.cpp
index 471ee75460..a87b0464ed 100644
--- a/src/mathed/InsetMathSymbol.cpp
+++ b/src/mathed/InsetMathSymbol.cpp
@@ -23,7 +23,6 @@
#include "support/debug.h"
#include "support/docstream.h"
-#include "support/lyxlib.h"
#include "support/textutils.h"
#include "support/unique_ptr.h"
diff --git a/src/mathed/MathSupport.cpp b/src/mathed/MathSupport.cpp
index 732c5ac247..acc9523243 100644
--- a/src/mathed/MathSupport.cpp
+++ b/src/mathed/MathSupport.cpp
@@ -32,7 +32,6 @@
#include "support/docstream.h"
#include "support/lassert.h"
#include "support/Length.h"
-#include "support/lyxlib.h"
#include <map>
#include <algorithm>
--
2.28.0.windows.1
-------------- next part --------------
From 27fd2a824d554e6a1cb56a12aef28d7164c53b3a Mon Sep 17 00:00:00 2001
From: Yuriy Skalko <yuriy.skalko at gmail.com>
Date: Thu, 19 Nov 2020 15:40:14 +0200
Subject: [PATCH 2/4] Add more `override` specifiers
---
src/frontends/qt/GuiClickableLabel.h | 2 +-
src/frontends/qt/GuiFontExample.h | 4 +-
src/frontends/qt/GuiIdListModel.h | 15 +++----
src/frontends/qt/GuiImage.h | 12 +++---
src/frontends/qt/GuiPainter.h | 64 ++++++++++++++--------------
src/frontends/qt/LaTeXHighlighter.h | 2 +-
src/frontends/qt/TocModel.h | 2 +-
7 files changed, 50 insertions(+), 51 deletions(-)
diff --git a/src/frontends/qt/GuiClickableLabel.h b/src/frontends/qt/GuiClickableLabel.h
index 4ae49055ee..b14ba15de8 100644
--- a/src/frontends/qt/GuiClickableLabel.h
+++ b/src/frontends/qt/GuiClickableLabel.h
@@ -27,7 +27,7 @@ Q_SIGNALS:
void clicked();
protected:
- void mouseReleaseEvent(QMouseEvent *);
+ void mouseReleaseEvent(QMouseEvent *) override;
};
}
diff --git a/src/frontends/qt/GuiFontExample.h b/src/frontends/qt/GuiFontExample.h
index f0592fd9cf..57862e93ee 100644
--- a/src/frontends/qt/GuiFontExample.h
+++ b/src/frontends/qt/GuiFontExample.h
@@ -27,10 +27,10 @@ public:
void set(QFont const & font, QString const & text);
- virtual QSize sizeHint() const;
+ QSize sizeHint() const override;
protected:
- virtual void paintEvent(QPaintEvent * p);
+ void paintEvent(QPaintEvent * p) override;
private:
QFont font_;
diff --git a/src/frontends/qt/GuiIdListModel.h b/src/frontends/qt/GuiIdListModel.h
index a63b40d46c..53da3ecd06 100644
--- a/src/frontends/qt/GuiIdListModel.h
+++ b/src/frontends/qt/GuiIdListModel.h
@@ -44,23 +44,22 @@ public:
// Methods overridden from QAbstractListModel
//////////////////////////////////////////////////////////////////////
///
- int rowCount(QModelIndex const & = QModelIndex()) const
+ int rowCount(QModelIndex const & = QModelIndex()) const override
{ return int(userData_.size()); }
///
- virtual QVariant data(QModelIndex const & index,
- int role = Qt::DisplayRole) const;
+ QVariant data(QModelIndex const & index, int role = Qt::DisplayRole) const override;
///
- bool insertRows(int row, int count, QModelIndex const & parent = QModelIndex());
+ bool insertRows(int row, int count, QModelIndex const & parent = QModelIndex()) override;
///
- bool removeRows(int row, int count, QModelIndex const & parent = QModelIndex());
+ bool removeRows(int row, int count, QModelIndex const & parent = QModelIndex()) override;
///
void clear() { removeRows(0, rowCount()); }
///
- virtual bool setData (QModelIndex const & index,
- const QVariant & value, int role = Qt::EditRole );
+ bool setData (QModelIndex const & index,
+ const QVariant & value, int role = Qt::EditRole) override;
///
- virtual QMap<int, QVariant> itemData(QModelIndex const & index ) const;
+ QMap<int, QVariant> itemData(QModelIndex const & index ) const override;
//////////////////////////////////////////////////////////////////////
// New methods
//////////////////////////////////////////////////////////////////////
diff --git a/src/frontends/qt/GuiImage.h b/src/frontends/qt/GuiImage.h
index 6f6064438a..075c4e9bc3 100644
--- a/src/frontends/qt/GuiImage.h
+++ b/src/frontends/qt/GuiImage.h
@@ -34,24 +34,24 @@ public:
private:
/// Create a copy
- Image * clone() const;
+ Image * clone() const override;
/// Get the image width
- unsigned int width() const;
+ unsigned int width() const override;
/// Get the image height
- unsigned int height() const;
+ unsigned int height() const override;
// FIXME Is the image drawable ?
- bool isDrawable() const { return true; }
+ bool isDrawable() const override { return true; }
/**
* Load the image file into memory.
*/
- bool load(support::FileName const & filename);
+ bool load(support::FileName const & filename) override;
bool load();
/**
* Finishes the process of modifying transformed_, using
* \c params to decide on color, grayscale etc.
* \returns true if successful.
*/
- bool setPixmap(Params const & params);
+ bool setPixmap(Params const & params) override;
/// Clip the image using params.
bool clip(Params const & params);
diff --git a/src/frontends/qt/GuiPainter.h b/src/frontends/qt/GuiPainter.h
index 2e2a7f2ec8..bffcd9ae5a 100644
--- a/src/frontends/qt/GuiPainter.h
+++ b/src/frontends/qt/GuiPainter.h
@@ -36,15 +36,15 @@ public:
virtual ~GuiPainter();
/// This painter paints
- virtual bool isNull() const { return false; }
+ bool isNull() const override { return false; }
/// draw a line from point to point
- virtual void line(
+ void line(
int x1, int y1,
int x2, int y2,
Color,
line_style ls = line_solid,
- int lw = thin_line);
+ int lw = thin_line) override;
/**
* lines - draw a set of lines
@@ -52,14 +52,14 @@ public:
* @param yp array of points' y co-ords
* @param np size of the points array
*/
- virtual void lines(
+ void lines(
int const * xp,
int const * yp,
int np,
Color,
fill_style fs = fill_none,
line_style ls = line_solid,
- int lw = thin_line);
+ int lw = thin_line) override;
/**
* path - draw a path with bezier curves
@@ -71,72 +71,72 @@ public:
* @param c2y array of second control points' y co-ords
* @param np size of the points array
*/
- virtual void path(int const * xp, int const * yp,
+ void path(int const * xp, int const * yp,
int const * c1x, int const * c1y,
int const * c2x, int const * c2y,
int np, Color,
fill_style = fill_none, line_style = line_solid,
- int line_width = thin_line);
+ int line_width = thin_line) override;
/// draw a rectangle
- virtual void rectangle(
+ void rectangle(
int x, int y,
int w, int h,
Color,
line_style = line_solid,
- int lw = thin_line);
+ int lw = thin_line) override;
/// draw a filled rectangle
- virtual void fillRectangle(
+ void fillRectangle(
int x, int y,
int w, int h,
- Color);
+ Color) override;
/// draw an arc
- virtual void arc(
+ void arc(
int x, int y,
unsigned int w, unsigned int h,
int a1, int a2,
- Color);
+ Color) override;
/// draw a pixel
- virtual void point(int x, int y, Color);
+ void point(int x, int y, Color) override;
/// draw an image from the image cache
- virtual void image(int x, int y, int w, int h,
- lyx::graphics::Image const & image);
+ void image(int x, int y, int w, int h,
+ lyx::graphics::Image const & image) override;
/// draw a string at position x, y (y is the baseline).
- virtual void text(int x, int y, docstring const & str, FontInfo const & f);
+ void text(int x, int y, docstring const & str, FontInfo const & f) override;
/// draw a char at position x, y (y is the baseline)
- virtual void text(int x, int y, char_type c, FontInfo const & f);
+ void text(int x, int y, char_type c, FontInfo const & f) override;
/** draw a string at position x, y (y is the baseline). The
* text direction is enforced by the \c Font.
*/
- virtual void text(int x, int y, docstring const & str, Font const & f,
- double wordspacing, double textwidth);
+ void text(int x, int y, docstring const & str, Font const & f,
+ double wordspacing, double textwidth) override;
/** draw a string at position x, y (y is the baseline), but
* make sure that the part between \c from and \c to is in
* \c other color. The text direction is enforced by the \c Font.
*/
- virtual void text(int x, int y, docstring const & str, Font const & f,
+ void text(int x, int y, docstring const & str, Font const & f,
Color other, size_type from, size_type to,
- double wordspacing, double textwidth);
+ double wordspacing, double textwidth) override;
///
- virtual void textDecoration(FontInfo const & f, int x, int y, int width);
+ void textDecoration(FontInfo const & f, int x, int y, int width) override;
/// draw a string and enclose it inside a button frame
- virtual void buttonText(int x, int baseline, docstring const & s,
- FontInfo const & font, Color back, Color frame, int offset);
+ void buttonText(int x, int baseline, docstring const & s,
+ FontInfo const & font, Color back, Color frame, int offset) override;
/// start monochrome painting mode, i.e. map every color a shade of \c blend.
- virtual void enterMonochromeMode(Color const & blend);
+ void enterMonochromeMode(Color const & blend) override;
/// leave monochrome painting mode
- virtual void leaveMonochromeMode();
+ void leaveMonochromeMode() override;
/**
* Draw a string and enclose it inside a rectangle. If
@@ -144,14 +144,14 @@ public:
* the given color. If frame is specified, a thin frame is drawn
* around the text with the given color.
*/
- virtual void rectText(int x, int baseline, docstring const & str,
- FontInfo const & font, Color back, Color frame);
+ void rectText(int x, int baseline, docstring const & str,
+ FontInfo const & font, Color back, Color frame) override;
/// draw a character of a preedit string for cjk support.
- virtual int preeditText(int x, int y,
- char_type c, FontInfo const & f, preedit_style style);
+ int preeditText(int x, int y,
+ char_type c, FontInfo const & f, preedit_style style) override;
- void wavyHorizontalLine(int x, int y, int width, ColorCode col);
+ void wavyHorizontalLine(int x, int y, int width, ColorCode col) override;
private:
/// check the font, and if set, draw an underline
diff --git a/src/frontends/qt/LaTeXHighlighter.h b/src/frontends/qt/LaTeXHighlighter.h
index c780b9ffb7..47df8b9ad2 100644
--- a/src/frontends/qt/LaTeXHighlighter.h
+++ b/src/frontends/qt/LaTeXHighlighter.h
@@ -28,7 +28,7 @@ public:
explicit LaTeXHighlighter(QTextDocument * parent, bool at_letter = false);
protected:
- void highlightBlock(QString const & text);
+ void highlightBlock(QString const & text) override;
private:
QTextCharFormat commentFormat;
diff --git a/src/frontends/qt/TocModel.h b/src/frontends/qt/TocModel.h
index b2d74a2b51..55507a0a92 100644
--- a/src/frontends/qt/TocModel.h
+++ b/src/frontends/qt/TocModel.h
@@ -90,7 +90,7 @@ public:
: QSortFilterProxyModel(w)
{}
- bool lessThan (const QModelIndex & left, const QModelIndex & right) const
+ bool lessThan(const QModelIndex & left, const QModelIndex & right) const override
{
if (left.model()->data(left, Qt::UserRole).toString()
== QString("tableofcontents"))
--
2.28.0.windows.1
-------------- next part --------------
From a34f72c4cc17e82af563e2133788080155ebd8d1 Mon Sep 17 00:00:00 2001
From: Yuriy Skalko <yuriy.skalko at gmail.com>
Date: Thu, 19 Nov 2020 15:53:33 +0200
Subject: [PATCH 3/4] Simplify Length
---
src/support/Length.cpp | 97 ------------------------------------------
src/support/Length.h | 46 +++++++++++---------
2 files changed, 25 insertions(+), 118 deletions(-)
diff --git a/src/support/Length.cpp b/src/support/Length.cpp
index d3aa434892..e4339953cf 100644
--- a/src/support/Length.cpp
+++ b/src/support/Length.cpp
@@ -39,18 +39,7 @@ namespace lyx {
//
/////////////////////////////////////////////////////////////////////
-Length::Length()
- : val_(0), unit_(Length::UNIT_NONE)
-{}
-
-
-Length::Length(double v, Length::UNIT u)
- : val_(v), unit_(u)
-{}
-
-
Length::Length(string const & data)
- : val_(0), unit_(Length::UNIT_NONE)
{
Length tmp;
@@ -161,42 +150,6 @@ string const Length::asHTMLString() const
}
-double Length::value() const
-{
- return val_;
-}
-
-
-Length::UNIT Length::unit() const
-{
- return unit_;
-}
-
-
-void Length::value(double v)
-{
- val_ = v;
-}
-
-
-void Length::unit(Length::UNIT u)
-{
- unit_ = u;
-}
-
-
-bool Length::zero() const
-{
- return val_ == 0.0;
-}
-
-
-bool Length::empty() const
-{
- return unit_ == Length::UNIT_NONE;
-}
-
-
int Length::inPixels(int text_width, int em_width_base) const
{
// Zoom factor specified by user in percent
@@ -325,37 +278,12 @@ Length::UNIT Length::defaultUnit()
}
-
-bool operator==(Length const & l1, Length const & l2)
-{
- return l1.value() == l2.value() && l1.unit() == l2.unit();
-}
-
-
-bool operator!=(Length const & l1, Length const & l2)
-{
- return !(l1 == l2);
-}
-
-
/////////////////////////////////////////////////////////////////////
//
// GlueLength
//
/////////////////////////////////////////////////////////////////////
-
-GlueLength::GlueLength(Length const & len)
- : len_(len)
-{}
-
-
-GlueLength::GlueLength(Length const & len, Length const & plus,
- Length const & minus)
- : len_(len), plus_(plus), minus_(minus)
-{}
-
-
GlueLength::GlueLength(string const & data)
{
if (!isValidGlueLength(data, this))
@@ -429,24 +357,6 @@ string const GlueLength::asLatexString() const
}
-Length const & GlueLength::len() const
-{
- return len_;
-}
-
-
-Length const & GlueLength::plus() const
-{
- return plus_;
-}
-
-
-Length const & GlueLength::minus() const
-{
- return minus_;
-}
-
-
bool operator==(GlueLength const & l1, GlueLength const & l2)
{
return l1.len() == l2.len()
@@ -454,11 +364,4 @@ bool operator==(GlueLength const & l1, GlueLength const & l2)
&& l1.minus() == l2.minus();
}
-
-bool operator!=(GlueLength const & l1, GlueLength const & l2)
-{
- return !(l1 == l2);
-}
-
-
} // namespace lyx
diff --git a/src/support/Length.h b/src/support/Length.h
index aaf19238e6..03b4d366b0 100644
--- a/src/support/Length.h
+++ b/src/support/Length.h
@@ -61,25 +61,25 @@ public:
};
///
- Length();
+ Length() = default;
///
- Length(double v, Length::UNIT u);
+ Length(double v, Length::UNIT u) : val_(v), unit_(u) {}
/// "data" must be a decimal number, followed by a unit
explicit Length(std::string const & data);
///
- double value() const;
+ double value() const { return val_; };
///
- Length::UNIT unit() const;
+ Length::UNIT unit() const { return unit_; };
///
- void value(double);
+ void value(double val) { val_ = val; }
///
- void unit(Length::UNIT unit);
+ void unit(Length::UNIT unit) { unit_ = unit; }
///
- bool zero() const;
+ bool zero() const { return val_ == 0.0; }
///
- bool empty() const;
+ bool empty() const { return unit_ == Length::UNIT_NONE; }
/// return string representation
std::string const asString() const;
/// return string representation
@@ -109,15 +109,18 @@ private:
/// Convert value to inch for text width and em width given in inch
double inInch(double text_width, double em_width) const;
///
- double val_;
+ double val_ = 0;
///
- Length::UNIT unit_;
+ Length::UNIT unit_ = UNIT_NONE;
};
///
-bool operator==(Length const & l1, Length const & l2);
+inline bool operator==(Length const & l1, Length const & l2)
+ { return l1.value() == l2.value() && l1.unit() == l2.unit(); }
///
-bool operator!=(Length const & l1, Length const & l2);
+inline bool operator!=(Length const & l1, Length const & l2)
+ { return !(l1 == l2); }
+
/** Test whether \p data represents a valid length.
*
* \returns whether \p data is a valid length
@@ -142,13 +145,12 @@ char const * stringFromUnit(int unit);
class GlueLength {
public:
///
- GlueLength() {}
+ GlueLength() = default;
///
- explicit GlueLength(Length const & len);
+ explicit GlueLength(Length const & len) : len_(len) {}
///
- GlueLength(Length const & len,
- Length const & plus,
- Length const & minus);
+ GlueLength(Length const & len, Length const & plus, Length const & minus)
+ : len_(len), plus_(plus), minus_(minus) {}
/** "data" must be a decimal number, followed by a unit, and
optional "glue" indicated by "+" and "-". You may abbreviate
@@ -159,11 +161,11 @@ public:
explicit GlueLength(std::string const & data);
///
- Length const & len() const;
+ Length const & len() const { return len_; }
///
- Length const & plus() const;
+ Length const & plus() const { return plus_; }
///
- Length const & minus() const;
+ Length const & minus() const { return minus_; }
/// conversion
@@ -186,7 +188,9 @@ private:
///
bool operator==(GlueLength const & l1, GlueLength const & l2);
///
-bool operator!=(GlueLength const & l1, GlueLength const & l2);
+inline bool operator!=(GlueLength const & l1, GlueLength const & l2)
+ { return !(l1 == l2); }
+
/** If "data" is valid, the length represented by it is
stored into "result", if that is not 0. */
bool isValidGlueLength(std::string const & data, GlueLength * result = 0);
--
2.28.0.windows.1
More information about the lyx-devel
mailing list