From b58cabebf440f16d9904212f647de4589e23c0f3 Mon Sep 17 00:00:00 2001
From: mlaurent <mlaurent@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 18 Jul 2006 13:23:45 +0000
Subject: [PATCH] Deprecated--

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdeartwork@563773 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kscreensaver/kdesavers/Flux.cpp     | 11 ++++++-----
 kscreensaver/kdesavers/fountain.cpp |  6 ++++--
 kscreensaver/kdesavers/gravity.cpp  |  6 ++++--
 kscreensaver/kdesavers/lines.cpp    |  6 +++---
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/kscreensaver/kdesavers/Flux.cpp b/kscreensaver/kdesavers/Flux.cpp
index 09324894..ac6a19b1 100644
--- a/kscreensaver/kdesavers/Flux.cpp
+++ b/kscreensaver/kdesavers/Flux.cpp
@@ -538,8 +538,8 @@ void FluxWidget::initializeGL()
     //resizeGL( width(), height() );
 
     updateParameters();
-
-    _timer->start( _frameTime, true );
+    _timer->setSingleShot(true);
+    _timer->start( _frameTime );
 }
 
 
@@ -559,7 +559,8 @@ void FluxWidget::keyPressEvent( QKeyEvent* e )
 void FluxWidget::nextFrame()
 {
     updateGL();
-    _timer->start( _frameTime, true );
+    _timer->setSingleShot(true);
+    _timer->start( _frameTime );
 }
 
 
@@ -918,7 +919,7 @@ KFluxSetup::KFluxSetup( QWidget* parent, const char* name )
     top->addWidget(preview);
 
     // Now that we have _saver...
-    modeW->setCurrentItem( _saver->mode() );    // set before we connect
+    modeW->setCurrentIndex( _saver->mode() );    // set before we connect
    connect( modeW, SIGNAL(activated(int)), _saver, SLOT(setMode(int)) );
    connect( this, SIGNAL(okClicked()), SLOT(slotOk()));
 }
@@ -947,7 +948,7 @@ void KFluxSetup::slotOk()
     config->setGroup("Settings");
 
     QString val;
-    val.setNum( modeW->currentItem() );
+    val.setNum( modeW->currentIndex() );
     config->writeEntry("Mode", val );
 
     config->sync();
diff --git a/kscreensaver/kdesavers/fountain.cpp b/kscreensaver/kdesavers/fountain.cpp
index f9b4e9be..28ef5eb3 100644
--- a/kscreensaver/kdesavers/fountain.cpp
+++ b/kscreensaver/kdesavers/fountain.cpp
@@ -163,7 +163,8 @@ KFountainSaver::KFountainSaver( WId id ) : KScreenSaver( id )
 	kDebug() << "Blank" << endl;
 
 	timer = new QTimer( this );
-    	timer->start( 25, TRUE );
+    timer->setSingleShot(true);
+    timer->start( 25);
 	setBackgroundColor( Qt::black );
         erase();
 	fountain = new Fountain();
@@ -189,7 +190,8 @@ void KFountainSaver::blank()
 	// Play fountain
 
 	fountain->updateGL();
-	timer->start( 25, TRUE );
+    timer->setSingleShot(true);
+	timer->start( 25);
 
 }
 Fountain::Fountain( QWidget * parent, const char * name) : QGLWidget (parent,name)
diff --git a/kscreensaver/kdesavers/gravity.cpp b/kscreensaver/kdesavers/gravity.cpp
index e5a64ee7..6d0b235a 100644
--- a/kscreensaver/kdesavers/gravity.cpp
+++ b/kscreensaver/kdesavers/gravity.cpp
@@ -149,7 +149,8 @@ KGravitySaver::KGravitySaver( WId id ) : KScreenSaver( id )
 	kDebug() << "Blank" << endl;
 
 	timer = new QTimer( this );
-    	timer->start( 25, TRUE );
+    timer->setSingleShot(true);
+    timer->start( 25);
 	setBackgroundColor( Qt::black );
         erase();
 	gravity = new Gravity();
@@ -177,7 +178,8 @@ void KGravitySaver::blank()
 	// Play gravity
 
 	gravity->updateGL();
-	timer->start( 25, TRUE );
+    timer->setSingleShot(true);	
+	timer->start( 25);
 
 }
 Gravity::Gravity( QWidget * parent, const char * name) : QGLWidget (parent,name)
diff --git a/kscreensaver/kdesavers/lines.cpp b/kscreensaver/kdesavers/lines.cpp
index d1f06b1c..e7162294 100644
--- a/kscreensaver/kdesavers/lines.cpp
+++ b/kscreensaver/kdesavers/lines.cpp
@@ -343,9 +343,9 @@ void kLinesSaver::readSettings(){
     if(numLines>MAXLENGTH) numLines=MAXLENGTH;
     else if(numLines<1) numLines = 1;
 
-    colstart=config->readColorEntry("StartColor", &QColor(Qt::white));
-    colmid=config->readColorEntry("MidColor", &QColor(Qt::blue));
-    colend=config->readColorEntry("EndColor", &QColor(Qt::black));
+    colstart=config->readEntry("StartColor", Qt::white);
+    colmid=config->readEntry("MidColor", Qt::blue);
+    colend=config->readEntry("EndColor", Qt::black);
 }
 
 // draw next lines and erase tail
-- 
2.11.4.GIT