[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/kcontrol/screensaver
From:       Daniel Molkentin <molkentin () kde ! org>
Date:       2005-07-31 18:38:32
Message-ID: 1122835112.361088.20159.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 441715 by danimo:

small adjustments


 M  +1 -1      kswidget.cpp  
 M  +2 -2      kswidget.h  
 M  +2 -3      testwin.cpp  


--- trunk/KDE/kdebase/kcontrol/screensaver/kswidget.cpp #441714:441715
@@ -7,7 +7,7 @@
 #include <GL/glx.h>
 #endif
 
-KSWidget::KSWidget( QWidget* parent, const char* , Qt::WFlags )
+KSWidget::KSWidget( QWidget* parent )
     : QX11EmbedWidget( parent )
 {
 // use visual with support for double-buffering, for opengl
--- trunk/KDE/kdebase/kcontrol/screensaver/kswidget.h #441714:441715
@@ -1,14 +1,14 @@
 #ifndef KSWIDGET_H
 #define KSWIDGET_H
 
-#include <qx11embed_x11.h>
+#include <QX11EmbedWidget>
 #include <qwidget.h>
 
 class KSWidget : public QX11EmbedWidget
 {
     Q_OBJECT
 public:
-    KSWidget( QWidget *parent = NULL, const char* name = NULL, Qt::WFlags flags = 0 );
+    KSWidget( QWidget *parent = NULL );
 };
 
 #endif
--- trunk/KDE/kdebase/kcontrol/screensaver/testwin.cpp #441714:441715
@@ -1,11 +1,10 @@
 #include <kwin.h>
 #include "testwin.h"
 
-class QXEmbed;
-
 TestWin::TestWin()
-    : KSWidget(0, 0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WX11BypassWM )
+    : KSWidget(0)
 {
+    overrideWindowFlags(Qt::X11BypassWindowManagerHint);
     setFocusPolicy(Qt::StrongFocus);
     KWin::setState( winId(), NET::StaysOnTop );
 }
[prev in list] [next in list] [prev in thread] [next in thread]