summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qeffects.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/widgets/qeffects.cpp')
-rw-r--r--src/widgets/widgets/qeffects.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/widgets/widgets/qeffects.cpp b/src/widgets/widgets/qeffects.cpp
index 4617a2dced..d4d3e985d8 100644
--- a/src/widgets/widgets/qeffects.cpp
+++ b/src/widgets/widgets/qeffects.cpp
@@ -102,7 +102,7 @@ static QAlphaWidget* q_blend = 0;
QAlphaWidget::QAlphaWidget(QWidget* w, Qt::WindowFlags f)
: QWidget(QApplication::desktop()->screen(QApplication::desktop()->screenNumber(w)), f)
{
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
setEnabled(false);
#endif
setAttribute(Qt::WA_NoSystemBackground, true);
@@ -112,7 +112,7 @@ QAlphaWidget::QAlphaWidget(QWidget* w, Qt::WindowFlags f)
QAlphaWidget::~QAlphaWidget()
{
-#if defined(Q_WS_WIN) && !defined(Q_OS_WINCE)
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
// Restore user-defined opacity value
if (widget)
widget->setWindowOpacity(1);
@@ -270,10 +270,10 @@ void QAlphaWidget::render()
if (widget) {
if (!showWidget) {
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
setEnabled(true);
setFocus();
-#endif // Q_WS_WIN
+#endif // Q_OS_WIN
widget->hide();
} else {
//Since we are faking the visibility of the widget
@@ -383,7 +383,7 @@ static QRollEffect* q_roll = 0;
QRollEffect::QRollEffect(QWidget* w, Qt::WindowFlags f, DirFlags orient)
: QWidget(0, f), orientation(orient)
{
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
setEnabled(false);
#endif
@@ -408,7 +408,7 @@ QRollEffect::QRollEffect(QWidget* w, Qt::WindowFlags f, DirFlags orient)
if (orientation & (DownScroll|UpScroll))
currentHeight = 0;
- pm = widget->grab(QRect());
+ pm = widget->grab();
}
/*
@@ -538,7 +538,7 @@ void QRollEffect::scroll()
qApp->removeEventFilter(this);
if (widget) {
if (!showWidget) {
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
setEnabled(true);
setFocus();
#endif