diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2014-04-05 00:09:43 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-09 12:40:58 +0200 |
commit | 323ce42de637fa2b5e456dda27d07bcb0c715456 (patch) | |
tree | 5e497645eb9fd80ca2902fe58a72be45eeccdb92 /src/gui/painting/qpagesize.h | |
parent | c92fead4333683f7b13fc730203c67834aa478ef (diff) |
QPageSize: remove QPageSize:: overqualifications
This is not Qt style, not needed, and clutters the code, so remove
QPageSize:: qualifications where they're not needed.
Change-Id: Ia93ac9523ef43a40cf4dab3bcb383a54af666c96
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/gui/painting/qpagesize.h')
-rw-r--r-- | src/gui/painting/qpagesize.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/gui/painting/qpagesize.h b/src/gui/painting/qpagesize.h index 8205d2eae4..ae337a2438 100644 --- a/src/gui/painting/qpagesize.h +++ b/src/gui/painting/qpagesize.h @@ -229,13 +229,13 @@ public: }; QPageSize(); - explicit QPageSize(QPageSize::PageSizeId pageSizeId); + explicit QPageSize(PageSizeId pageSizeId); explicit QPageSize(const QSize &pointSize, const QString &name = QString(), - QPageSize::SizeMatchPolicy matchPolicy = QPageSize::FuzzyMatch); - explicit QPageSize(const QSizeF &size, QPageSize::Unit units, + SizeMatchPolicy matchPolicy = FuzzyMatch); + explicit QPageSize(const QSizeF &size, Unit units, const QString &name = QString(), - QPageSize::SizeMatchPolicy matchPolicy = QPageSize::FuzzyMatch); + SizeMatchPolicy matchPolicy = FuzzyMatch); QPageSize(const QPageSize &other); ~QPageSize(); @@ -254,38 +254,38 @@ public: QString key() const; QString name() const; - QPageSize::PageSizeId id() const; + PageSizeId id() const; int windowsId() const; QSizeF definitionSize() const; - QPageSize::Unit definitionUnits() const; + Unit definitionUnits() const; - QSizeF size(QPageSize::Unit units) const; + QSizeF size(Unit units) const; QSize sizePoints() const; QSize sizePixels(int resolution) const; - QRectF rect(QPageSize::Unit units) const; + QRectF rect(Unit units) const; QRect rectPoints() const; QRect rectPixels(int resolution) const; - static QString key(QPageSize::PageSizeId pageSizeId); - static QString name(QPageSize::PageSizeId pageSizeId); + static QString key(PageSizeId pageSizeId); + static QString name(PageSizeId pageSizeId); - static QPageSize::PageSizeId id(const QSize &pointSize, - QPageSize::SizeMatchPolicy matchPolicy = QPageSize::FuzzyMatch); - static QPageSize::PageSizeId id(const QSizeF &size, QPageSize::Unit units, - QPageSize::SizeMatchPolicy matchPolicy = QPageSize::FuzzyMatch); + static PageSizeId id(const QSize &pointSize, + SizeMatchPolicy matchPolicy = FuzzyMatch); + static PageSizeId id(const QSizeF &size, Unit units, + SizeMatchPolicy matchPolicy = FuzzyMatch); - static QPageSize::PageSizeId id(int windowsId); - static int windowsId(QPageSize::PageSizeId pageSizeId); + static PageSizeId id(int windowsId); + static int windowsId(PageSizeId pageSizeId); - static QSizeF definitionSize(QPageSize::PageSizeId pageSizeId); - static QPageSize::Unit definitionUnits(QPageSize::PageSizeId pageSizeId); + static QSizeF definitionSize(PageSizeId pageSizeId); + static Unit definitionUnits(PageSizeId pageSizeId); - static QSizeF size(QPageSize::PageSizeId pageSizeId, QPageSize::Unit units); - static QSize sizePoints(QPageSize::PageSizeId pageSizeId); - static QSize sizePixels(QPageSize::PageSizeId pageSizeId, int resolution); + static QSizeF size(PageSizeId pageSizeId, Unit units); + static QSize sizePoints(PageSizeId pageSizeId); + static QSize sizePixels(PageSizeId pageSizeId, int resolution); private: friend class QPageSizePrivate; |