summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qpoint.h
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2012-04-19 12:56:50 +0300
committerQt by Nokia <qt-info@nokia.com>2012-04-20 10:29:14 +0200
commit65ae2151c34877d7a5a046a39e34a8513c849f8f (patch)
tree2d29550575ff9f446a1adc2e0d61f18cdd91db7a /src/corelib/tools/qpoint.h
parent128b7c56b732cabdbd600445aac5162c775e58d4 (diff)
mingw: fix a lot of annoying warnings
like "QRect::intersected() redeclared without dllimport attribute after being referenced with dll linkage" (-fno-keep-inline-dllexport) Change-Id: Id24e5ee857579ee9f97a60de0ab88ce3db8385cf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/corelib/tools/qpoint.h')
-rw-r--r--src/corelib/tools/qpoint.h52
1 files changed, 26 insertions, 26 deletions
diff --git a/src/corelib/tools/qpoint.h b/src/corelib/tools/qpoint.h
index 0eb22807e8..3b986cd81e 100644
--- a/src/corelib/tools/qpoint.h
+++ b/src/corelib/tools/qpoint.h
@@ -55,26 +55,26 @@ public:
Q_DECL_CONSTEXPR QPoint();
Q_DECL_CONSTEXPR QPoint(int xpos, int ypos);
- Q_DECL_CONSTEXPR bool isNull() const;
+ Q_DECL_CONSTEXPR inline bool isNull() const;
- Q_DECL_CONSTEXPR int x() const;
- Q_DECL_CONSTEXPR int y() const;
- void setX(int x);
- void setY(int y);
+ Q_DECL_CONSTEXPR inline int x() const;
+ Q_DECL_CONSTEXPR inline int y() const;
+ inline void setX(int x);
+ inline void setY(int y);
- Q_DECL_CONSTEXPR int manhattanLength() const;
+ Q_DECL_CONSTEXPR inline int manhattanLength() const;
- int &rx();
- int &ry();
+ inline int &rx();
+ inline int &ry();
- QPoint &operator+=(const QPoint &p);
- QPoint &operator-=(const QPoint &p);
+ inline QPoint &operator+=(const QPoint &p);
+ inline QPoint &operator-=(const QPoint &p);
- QPoint &operator*=(float c);
- QPoint &operator*=(double c);
- QPoint &operator*=(int c);
+ inline QPoint &operator*=(float c);
+ inline QPoint &operator*=(double c);
+ inline QPoint &operator*=(int c);
- QPoint &operator/=(qreal c);
+ inline QPoint &operator/=(qreal c);
friend Q_DECL_CONSTEXPR inline bool operator==(const QPoint &, const QPoint &);
friend Q_DECL_CONSTEXPR inline bool operator!=(const QPoint &, const QPoint &);
@@ -212,22 +212,22 @@ public:
Q_DECL_CONSTEXPR QPointF(const QPoint &p);
Q_DECL_CONSTEXPR QPointF(qreal xpos, qreal ypos);
- Q_DECL_CONSTEXPR qreal manhattanLength() const;
+ Q_DECL_CONSTEXPR inline qreal manhattanLength() const;
- bool isNull() const;
+ inline bool isNull() const;
- Q_DECL_CONSTEXPR qreal x() const;
- Q_DECL_CONSTEXPR qreal y() const;
- void setX(qreal x);
- void setY(qreal y);
+ Q_DECL_CONSTEXPR inline qreal x() const;
+ Q_DECL_CONSTEXPR inline qreal y() const;
+ inline void setX(qreal x);
+ inline void setY(qreal y);
- qreal &rx();
- qreal &ry();
+ inline qreal &rx();
+ inline qreal &ry();
- QPointF &operator+=(const QPointF &p);
- QPointF &operator-=(const QPointF &p);
- QPointF &operator*=(qreal c);
- QPointF &operator/=(qreal c);
+ inline QPointF &operator+=(const QPointF &p);
+ inline QPointF &operator-=(const QPointF &p);
+ inline QPointF &operator*=(qreal c);
+ inline QPointF &operator/=(qreal c);
friend Q_DECL_CONSTEXPR inline bool operator==(const QPointF &, const QPointF &);
friend Q_DECL_CONSTEXPR inline bool operator!=(const QPointF &, const QPointF &);