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

List:       kde-commits
Subject:    kdeartwork/kscreensaver
From:       Dirk Mueller <mueller () kde ! org>
Date:       2003-03-17 20:55:54
[Download RAW message or body]

CVS commit by mueller: 

- fix GPL headers
- use QDesktopWidget instead of bad DefaultWindow hacks


  M +1 -1      kpartsaver/kpartsaver.cpp   1.11
  M +4 -7      xsavers/main.cpp   1.9
  M +1 -1      xsavers/pipes.cpp   1.6
  M +1 -1      xsavers/slidescreen.cpp   1.7
  M +2 -2      xsavers/space.cpp   1.7


--- kdeartwork/kscreensaver/kpartsaver/kpartsaver.cpp  #1.10:1.11
@@ -14,5 +14,5 @@
  * You should have received a copy of the GNU Library General Public
  * License along with this program; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 

--- kdeartwork/kscreensaver/xsavers/main.cpp  #1.8:1.9
@@ -24,11 +24,8 @@
 #include "demowin.h"
 #include "saver.h"
-#include <kscreensaver_vroot.h>
-
-static const char *appName = "klock";
 
-static const char *description = I18N_NOOP("KDE Screen Lock/Saver");
-
-static const char *version = "2.0.0";
+static const char appName[] = "klock";
+static const char description[] = I18N_NOOP("KDE Screen Lock/Saver");
+static const char version[] = "2.0.0";
 
 static const KCmdLineOptions options[] =
@@ -79,5 +76,5 @@ int main(int argc, char *argv[])
     if (args->isSet("root"))
     {
-        saveWin = RootWindow(qt_xdisplay(), qt_xscreen());
+        saveWin = QApplication::desktop()->handle();
     }
 

--- kdeartwork/kscreensaver/xsavers/pipes.cpp  #1.5:1.6
@@ -22,5 +22,5 @@
  * You should have received a copy of the GNU Library General Public
  * License along with this program; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  * Some overall stuff taken from space.c, which is

--- kdeartwork/kscreensaver/xsavers/slidescreen.cpp  #1.6:1.7
@@ -81,5 +81,5 @@ init_slide (Display *dpy, Window window,
   // save screen
   Display *dsp = qt_xdisplay();
-  Window rootwin = RootWindow( dsp, qt_xscreen() );
+  Window rootwin = QApplication::desktop()->handle();
   save = XGetImage( dsp, rootwin, 0, 0, xgwa.width, xgwa.height, AllPlanes, ZPixmap);
 #endif

--- kdeartwork/kscreensaver/xsavers/space.cpp  #1.6:1.7
@@ -20,5 +20,5 @@
  * You should have received a copy of the GNU Library General Public
  * License along with this program; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  * Based on star.c:


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