Qt::WFlags -> Qt::WindowFlags
REVIEW: 111933
This commit is contained in:
parent
c52d6cee80
commit
62ca3fcbe1
5 changed files with 9 additions and 9 deletions
|
@ -1261,7 +1261,7 @@ void KCommonDecoration::setMainWidget(QWidget* w)
|
||||||
{
|
{
|
||||||
return wrapper->setMainWidget(w);
|
return wrapper->setMainWidget(w);
|
||||||
}
|
}
|
||||||
void KCommonDecoration::createMainWidget(Qt::WFlags flags)
|
void KCommonDecoration::createMainWidget(Qt::WindowFlags flags)
|
||||||
{
|
{
|
||||||
return wrapper->createMainWidget(flags);
|
return wrapper->createMainWidget(flags);
|
||||||
}
|
}
|
||||||
|
@ -1269,7 +1269,7 @@ QWidget* KCommonDecoration::initialParentWidget() const
|
||||||
{
|
{
|
||||||
return wrapper->initialParentWidget();
|
return wrapper->initialParentWidget();
|
||||||
}
|
}
|
||||||
Qt::WFlags KCommonDecoration::initialWFlags() const
|
Qt::WindowFlags KCommonDecoration::initialWFlags() const
|
||||||
{
|
{
|
||||||
return wrapper->initialWFlags();
|
return wrapper->initialWFlags();
|
||||||
}
|
}
|
||||||
|
|
|
@ -329,9 +329,9 @@ Q_SIGNALS:
|
||||||
void keepBelowChanged(bool);
|
void keepBelowChanged(bool);
|
||||||
public:
|
public:
|
||||||
void setMainWidget(QWidget*);
|
void setMainWidget(QWidget*);
|
||||||
void createMainWidget(Qt::WFlags flags = 0);
|
void createMainWidget(Qt::WindowFlags flags = 0);
|
||||||
QWidget* initialParentWidget() const;
|
QWidget* initialParentWidget() const;
|
||||||
Qt::WFlags initialWFlags() const;
|
Qt::WindowFlags initialWFlags() const;
|
||||||
QWidget* widget();
|
QWidget* widget();
|
||||||
const QWidget* widget() const;
|
const QWidget* widget() const;
|
||||||
KDecorationFactory* factory() const;
|
KDecorationFactory* factory() const;
|
||||||
|
|
|
@ -85,7 +85,7 @@ const KDecorationOptions* KDecoration::options()
|
||||||
return options_;
|
return options_;
|
||||||
}
|
}
|
||||||
|
|
||||||
void KDecoration::createMainWidget(Qt::WFlags flags)
|
void KDecoration::createMainWidget(Qt::WindowFlags flags)
|
||||||
{
|
{
|
||||||
// FRAME check flags?
|
// FRAME check flags?
|
||||||
QWidget *w = new QWidget(initialParentWidget(), initialWFlags() | flags);
|
QWidget *w = new QWidget(initialParentWidget(), initialWFlags() | flags);
|
||||||
|
@ -109,7 +109,7 @@ QWidget* KDecoration::initialParentWidget() const
|
||||||
return bridge_->initialParentWidget();
|
return bridge_->initialParentWidget();
|
||||||
}
|
}
|
||||||
|
|
||||||
Qt::WFlags KDecoration::initialWFlags() const
|
Qt::WindowFlags KDecoration::initialWFlags() const
|
||||||
{
|
{
|
||||||
return bridge_->initialWFlags();
|
return bridge_->initialWFlags();
|
||||||
}
|
}
|
||||||
|
|
|
@ -918,7 +918,7 @@ public:
|
||||||
* flags that affect widget drawing are allowed. Window type flags
|
* flags that affect widget drawing are allowed. Window type flags
|
||||||
* like WX11BypassWM or WStyle_NoBorder are forbidden.
|
* 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.
|
* 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
|
* that affect widget drawing are allowed. Window type flags like WX11BypassWM
|
||||||
* or WStyle_NoBorder are forbidden.
|
* or WStyle_NoBorder are forbidden.
|
||||||
*/
|
*/
|
||||||
Qt::WFlags initialWFlags() const;
|
Qt::WindowFlags initialWFlags() const;
|
||||||
/**
|
/**
|
||||||
* Returns the main widget for the decoration.
|
* Returns the main widget for the decoration.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -82,7 +82,7 @@ public:
|
||||||
// not part of public API
|
// not part of public API
|
||||||
virtual int currentDesktop() const = 0;
|
virtual int currentDesktop() const = 0;
|
||||||
virtual QWidget* initialParentWidget() 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;
|
virtual void grabXServer(bool grab) = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue