From 168f32f3f42a2407858105aff10143eebabbd5a6 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Fri, 30 Nov 2012 10:59:07 +0100 Subject: Removed temporary backwards-compat properties and accessors in QWindow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I718b877e3b6c0b1191a932d934599d5c2f5aa958 Reviewed-by: Shawn Rutledge Reviewed-by: Samuel Rødal --- src/gui/kernel/qwindow.h | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'src/gui/kernel') diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h index 229275d7c7..179db9964f 100644 --- a/src/gui/kernel/qwindow.h +++ b/src/gui/kernel/qwindow.h @@ -113,35 +113,6 @@ class Q_GUI_EXPORT QWindow : public QObject, public QSurface Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged) Q_PROPERTY(Qt::ScreenOrientation contentOrientation READ contentOrientation WRITE reportContentOrientationChange NOTIFY contentOrientationChanged) - // ------------------------------------------------------------------------ - // Temporary backwards-compatibility properties to be removed ASAP - Q_PROPERTY(QString windowTitle READ windowTitle WRITE setWindowTitle) - Q_PROPERTY(QString windowFilePath READ windowFilePath WRITE setWindowFilePath) - Q_PROPERTY(QIcon windowIcon READ windowIcon WRITE setWindowIcon) - Q_PROPERTY(Qt::WindowModality windowModality READ windowModality WRITE setWindowModality NOTIFY windowModalityChanged) - -public: - - Qt::WindowModality windowModality() const { return modality(); } - void setWindowModality(Qt::WindowModality wm) { setModality(wm); } - void setWindowFlags(Qt::WindowFlags f) { setFlags(f); } - Qt::WindowFlags windowFlags() const { return flags(); } - Qt::WindowType windowType() const { return type(); } - QString windowTitle() const { return title(); } - void requestActivateWindow() { requestActivate(); } - bool requestWindowOrientation(Qt::ScreenOrientation o) { return requestOrientation(o); } - Qt::ScreenOrientation windowOrientation() const { return orientation(); } - void setWindowFilePath(const QString &fp) { setFilePath(fp); } - QString windowFilePath() const { return filePath(); } - void setWindowIcon(const QIcon &i) { setIcon(i); } - QIcon windowIcon() const { return icon(); } - void setWindowTitle(const QString &t) { setTitle(t); } - -Q_SIGNALS: - void windowModalityChanged(Qt::WindowModality windowModality); - // End of temporary backwards-compatibility properties - // ------------------------------------------------------------------------ - public: explicit QWindow(QScreen *screen = 0); @@ -240,13 +211,6 @@ public: inline void setPosition(const QPoint &pt) { setGeometry(QRect(pt, size())); } inline void setPosition(int posx, int posy) { setPosition(QPoint(posx, posy)); } -// Temporary backwards-compatible accessors for the benefit of Declarative -// to be removed ASAP - inline void setFramePos(const QPoint &pt) { setFramePosition(pt); } - inline void setPos(const QPoint &pt) { setPosition(pt); } - inline void setPos(int posx, int posy) { setPosition(posx, posy); } -// end of temporary accessors - void resize(const QSize &newSize); inline void resize(int w, int h) { resize(QSize(w, h)); } -- cgit v1.2.3