1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QPageLayout: remove QPageLayout:: overqualifications

Browse Source 
This is not Qt style, not needed, and clutters the code, so remove
QPageLayout:: qualifications where they're not needed.

Change-Id: I62f90c29bcb9f3c137d319051ac79e081fe5fb69
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: John Layt <jlayt@kde.org>
This commit is contained in:
Marc Mutz 2014-04-05 00:09:43 +02:00 committed by The Qt Project
parent 22afdaa2da
commit 7b3d9bbdf2
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/gui/painting/qpagelayout.cpp
View File

@ -375,8 +375,8 @@ QPageLayout::QPageLayout()
margins allowed by the page size.
*/
QPageLayout::QPageLayout(const QPageSize &pageSize, QPageLayout::Orientation orientation,
const QMarginsF &margins, QPageLayout::Unit units,
QPageLayout::QPageLayout(const QPageSize &pageSize, Orientation orientation,
const QMarginsF &margins, Unit units,
const QMarginsF &minMargins)
: d(new QPageLayoutPrivate(pageSize, orientation, margins, units, minMargins))
{
@ -464,7 +464,7 @@ bool QPageLayout::isValid() const
Sets a page layout mode to \a mode.
*/
void QPageLayout::setMode(QPageLayout::Mode mode)
void QPageLayout::setMode(Mode mode)
{
d->m_mode = mode;
}
@ -519,7 +519,7 @@ QPageSize QPageLayout::pageSize() const
the minimum margins.
*/
void QPageLayout::setOrientation(QPageLayout::Orientation orientation)
void QPageLayout::setOrientation(Orientation orientation)
{
if (orientation != d->m_orientation) {
d->m_orientation = orientation;
@ -546,7 +546,7 @@ QPageLayout::Orientation QPageLayout::orientation() const
Sets the \a units used to define the page layout.
*/
void QPageLayout::setUnits(QPageLayout::Unit units)
void QPageLayout::setUnits(Unit units)
{
if (units != d->m_units) {
d->m_margins = qt_convertMargins(d->m_margins, d->m_units, units);
@ -584,7 +584,7 @@ QPageLayout::Unit QPageLayout::units() const
bool QPageLayout::setMargins(const QMarginsF &margins)
{
if (d->m_mode == QPageLayout::FullPageMode) {
if (d->m_mode == FullPageMode) {
d->m_margins = margins;
return true;
} else if (margins.left() >= d->m_minMargins.left()
@ -619,7 +619,7 @@ bool QPageLayout::setMargins(const QMarginsF &margins)
bool QPageLayout::setLeftMargin(qreal leftMargin)
{
if (d->m_mode == QPageLayout::FullPageMode
if (d->m_mode == FullPageMode
|| (leftMargin >= d->m_minMargins.left() && leftMargin <= d->m_maxMargins.left())) {
d->m_margins.setLeft(leftMargin);
return true;
@ -645,7 +645,7 @@ bool QPageLayout::setLeftMargin(qreal leftMargin)
bool QPageLayout::setRightMargin(qreal rightMargin)
{
if (d->m_mode == QPageLayout::FullPageMode
if (d->m_mode == FullPageMode
|| (rightMargin >= d->m_minMargins.right() && rightMargin <= d->m_maxMargins.right())) {
d->m_margins.setRight(rightMargin);
return true;
@ -671,7 +671,7 @@ bool QPageLayout::setRightMargin(qreal rightMargin)
bool QPageLayout::setTopMargin(qreal topMargin)
{
if (d->m_mode == QPageLayout::FullPageMode
if (d->m_mode == FullPageMode
|| (topMargin >= d->m_minMargins.top() && topMargin <= d->m_maxMargins.top())) {
d->m_margins.setTop(topMargin);
return true;
@ -697,7 +697,7 @@ bool QPageLayout::setTopMargin(qreal topMargin)
bool QPageLayout::setBottomMargin(qreal bottomMargin)
{
if (d->m_mode == QPageLayout::FullPageMode
if (d->m_mode == FullPageMode
|| (bottomMargin >= d->m_minMargins.bottom() && bottomMargin <= d->m_maxMargins.bottom())) {
d->m_margins.setBottom(bottomMargin);
return true;
@ -722,7 +722,7 @@ QMarginsF QPageLayout::margins() const
\sa setMargins(), margins()
*/
QMarginsF QPageLayout::margins(QPageLayout::Unit units) const
QMarginsF QPageLayout::margins(Unit units) const
{
return d->margins(units);
}
@ -818,7 +818,7 @@ QRectF QPageLayout::fullRect() const
\sa paintRect()
*/
QRectF QPageLayout::fullRect(QPageLayout::Unit units) const
QRectF QPageLayout::fullRect(Unit units) const
{
return isValid() ? d->fullRect(units) : QRect();
}
@ -876,13 +876,13 @@ QRectF QPageLayout::paintRect() const
the margins must be manually managed.
*/
QRectF QPageLayout::paintRect(QPageLayout::Unit units) const
QRectF QPageLayout::paintRect(Unit units) const
{
if (!isValid())
return QRectF();
if (units == d->m_units)
return d->paintRect();
return d->m_mode == QPageLayout::FullPageMode ? d->fullRect(units)
return d->m_mode == FullPageMode ? d->fullRect(units)
: d->fullRect(units) - d->margins(units);
}
@ -900,7 +900,7 @@ QRect QPageLayout::paintRectPoints() const
{
if (!isValid())
return QRect();
return d->m_mode == QPageLayout::FullPageMode ? d->fullRectPoints()
return d->m_mode == FullPageMode ? d->fullRectPoints()
: d->fullRectPoints() - d->marginsPoints();
}
@ -918,7 +918,7 @@ QRect QPageLayout::paintRectPixels(int resolution) const
{
if (!isValid())
return QRect();
return d->m_mode == QPageLayout::FullPageMode ? d->fullRectPixels(resolution)
return d->m_mode == FullPageMode ? d->fullRectPixels(resolution)
: d->fullRectPixels(resolution) - d->marginsPixels(resolution);
}

22
src/gui/painting/qpagelayout.h
View File

@ -79,8 +79,8 @@ public:
};
QPageLayout();
QPageLayout(const QPageSize &pageSize, QPageLayout::Orientation orientation,
const QMarginsF &margins, QPageLayout::Unit units = QPageLayout::Point,
QPageLayout(const QPageSize &pageSize, Orientation orientation,
const QMarginsF &margins, Unit units = Point,
const QMarginsF &minMargins = QMarginsF(0, 0, 0, 0));
QPageLayout(const QPageLayout &other);
~QPageLayout();
@ -97,18 +97,18 @@ public:
bool isValid() const;
void setMode(QPageLayout::Mode mode);
QPageLayout::Mode mode() const;
void setMode(Mode mode);
Mode mode() const;
void setPageSize(const QPageSize &pageSize,
const QMarginsF &minMargins = QMarginsF(0, 0, 0, 0));
QPageSize pageSize() const;
void setOrientation(QPageLayout::Orientation orientation);
QPageLayout::Orientation orientation() const;
void setOrientation(Orientation orientation);
Orientation orientation() const;
void setUnits(QPageLayout::Unit units);
QPageLayout::Unit units() const;
void setUnits(Unit units);
Unit units() const;
bool setMargins(const QMarginsF &margins);
bool setLeftMargin(qreal leftMargin);
@ -117,7 +117,7 @@ public:
bool setBottomMargin(qreal bottomMargin);
QMarginsF margins() const;
QMarginsF margins(QPageLayout::Unit units) const;
QMarginsF margins(Unit units) const;
QMargins marginsPoints() const;
QMargins marginsPixels(int resolution) const;
@ -126,12 +126,12 @@ public:
QMarginsF maximumMargins() const;
QRectF fullRect() const;
QRectF fullRect(QPageLayout::Unit units) const;
QRectF fullRect(Unit units) const;
QRect fullRectPoints() const;
QRect fullRectPixels(int resolution) const;
QRectF paintRect() const;
QRectF paintRect(QPageLayout::Unit units) const;
QRectF paintRect(Unit units) const;
QRect paintRectPoints() const;
QRect paintRectPixels(int resolution) const;