From 62ca3fcbe14dec667f71fc42789e633a3f94dbc8 Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa Date: Wed, 7 Aug 2013 13:53:11 +0200 Subject: [PATCH] Qt::WFlags -> Qt::WindowFlags REVIEW: 111933 --- libkdecorations/kcommondecoration.cpp | 4 ++-- libkdecorations/kcommondecoration.h | 4 ++-- libkdecorations/kdecoration.cpp | 4 ++-- libkdecorations/kdecoration.h | 4 ++-- libkdecorations/kdecorationbridge.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libkdecorations/kcommondecoration.cpp b/libkdecorations/kcommondecoration.cpp index 4a43bf1eb7..ede881a3a6 100644 --- a/libkdecorations/kcommondecoration.cpp +++ b/libkdecorations/kcommondecoration.cpp @@ -1261,7 +1261,7 @@ void KCommonDecoration::setMainWidget(QWidget* w) { return wrapper->setMainWidget(w); } -void KCommonDecoration::createMainWidget(Qt::WFlags flags) +void KCommonDecoration::createMainWidget(Qt::WindowFlags flags) { return wrapper->createMainWidget(flags); } @@ -1269,7 +1269,7 @@ QWidget* KCommonDecoration::initialParentWidget() const { return wrapper->initialParentWidget(); } -Qt::WFlags KCommonDecoration::initialWFlags() const +Qt::WindowFlags KCommonDecoration::initialWFlags() const { return wrapper->initialWFlags(); } diff --git a/libkdecorations/kcommondecoration.h b/libkdecorations/kcommondecoration.h index fb0807a921..b19a41f366 100644 --- a/libkdecorations/kcommondecoration.h +++ b/libkdecorations/kcommondecoration.h @@ -329,9 +329,9 @@ Q_SIGNALS: void keepBelowChanged(bool); public: void setMainWidget(QWidget*); - void createMainWidget(Qt::WFlags flags = 0); + void createMainWidget(Qt::WindowFlags flags = 0); QWidget* initialParentWidget() const; - Qt::WFlags initialWFlags() const; + Qt::WindowFlags initialWFlags() const; QWidget* widget(); const QWidget* widget() const; KDecorationFactory* factory() const; diff --git a/libkdecorations/kdecoration.cpp b/libkdecorations/kdecoration.cpp index f7f9020d3d..565cf8a8df 100644 --- a/libkdecorations/kdecoration.cpp +++ b/libkdecorations/kdecoration.cpp @@ -85,7 +85,7 @@ const KDecorationOptions* KDecoration::options() return options_; } -void KDecoration::createMainWidget(Qt::WFlags flags) +void KDecoration::createMainWidget(Qt::WindowFlags flags) { // FRAME check flags? QWidget *w = new QWidget(initialParentWidget(), initialWFlags() | flags); @@ -109,7 +109,7 @@ QWidget* KDecoration::initialParentWidget() const return bridge_->initialParentWidget(); } -Qt::WFlags KDecoration::initialWFlags() const +Qt::WindowFlags KDecoration::initialWFlags() const { return bridge_->initialWFlags(); } diff --git a/libkdecorations/kdecoration.h b/libkdecorations/kdecoration.h index 307503303b..0a20145e53 100644 --- a/libkdecorations/kdecoration.h +++ b/libkdecorations/kdecoration.h @@ -918,7 +918,7 @@ public: * flags that affect widget drawing are allowed. Window type flags * like WX11BypassWM or WStyle_NoBorder are forbidden. */ - void createMainWidget(Qt::WFlags flags = 0); + void createMainWidget(Qt::WindowFlags flags = 0); /** * The parent widget that should be used for the main widget. */ @@ -929,7 +929,7 @@ public: * that affect widget drawing are allowed. Window type flags like WX11BypassWM * or WStyle_NoBorder are forbidden. */ - Qt::WFlags initialWFlags() const; + Qt::WindowFlags initialWFlags() const; /** * Returns the main widget for the decoration. */ diff --git a/libkdecorations/kdecorationbridge.h b/libkdecorations/kdecorationbridge.h index 5096333e28..4f7aadc290 100644 --- a/libkdecorations/kdecorationbridge.h +++ b/libkdecorations/kdecorationbridge.h @@ -82,7 +82,7 @@ public: // not part of public API virtual int currentDesktop() const = 0; virtual QWidget* initialParentWidget() const = 0; - virtual Qt::WFlags initialWFlags() const = 0; + virtual Qt::WindowFlags initialWFlags() const = 0; virtual void grabXServer(bool grab) = 0; };