generic: make use of the new KRandom::randomMax() function

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/kdeplasma-addons/applets/bubblemon/src/bubble.cpp b/kdeplasma-addons/applets/bubblemon/src/bubble.cpp
index e582e3a..8bf82ca 100644 (file)
--- a/kdeplasma-addons/applets/bubblemon/src/bubble.cpp
+++ b/kdeplasma-addons/applets/bubblemon/src/bubble.cpp
@@ -33,8 +33,8 @@
 #include <Plasma/ToolTipContent>
 
 #include <KConfigDialog>
-
 #include <KDebug>
+#include <KRandom>
 
 
 K_EXPORT_PLASMA_APPLET(bubblemon, Bubble)
@@ -309,8 +309,8 @@ Bubble::moveBubbles()
         for(i=m_bubbles.begin();i!=m_bubbles.end();++i) {
             (*i).setY((*i).y()-m_bubbleSpeed);
             if ((*i).y()<maxHeight-m_bubbleRect.height()) {
-                (*i).setY(rect.bottom()+(qrand() % (int)( m_bubbleRect.height()*m_bubbleCount ) ) );
-                (*i).setX(qrand() % (int)rect.width());
+                (*i).setY(rect.bottom()+KRandom::randomMax((int)( m_bubbleRect.height()*m_bubbleCount ) ) );
+                (*i).setX(KRandom::randomMax((int)rect.width()));
                 needsUpdate = true;
             }
             if ((*i).y()<rect.bottom() && (*i).y()>maxHeight)

diff --git a/kdeplasma-addons/applets/fifteenPuzzle/src/fifteen.cpp b/kdeplasma-addons/applets/fifteenPuzzle/src/fifteen.cpp
index 94fe216..163422e 100644 (file)
--- a/kdeplasma-addons/applets/fifteenPuzzle/src/fifteen.cpp
+++ b/kdeplasma-addons/applets/fifteenPuzzle/src/fifteen.cpp
@@ -27,6 +27,7 @@
 
 #include <KDebug>
 #include <KGlobalSettings>
+#include <KRandom>
 
 #include <Plasma/Animation>
 #include <Plasma/Animator>
@@ -138,7 +139,7 @@ void Fifteen::shuffle()
     qsrand(QTime::currentTime().msec());
     for (int i = m_size * m_size - 1; i > 0; i--) {
         // choose a random number such that 0 <= rand <= i
-        int rand = qrand() % (i + 1);
+        int rand = KRandom::randomMax(i + 1);
         qSwap(m_pieces[i], m_pieces[rand]);
     }
 

diff --git a/kdeplasma-addons/dataengines/potd/flickrprovider.cpp b/kdeplasma-addons/dataengines/potd/flickrprovider.cpp
index d2bca90..f16200a 100644 (file)
--- a/kdeplasma-addons/dataengines/potd/flickrprovider.cpp
+++ b/kdeplasma-addons/dataengines/potd/flickrprovider.cpp
@@ -26,6 +26,7 @@
 #include <QXmlStreamReader>
 
 #include <KDebug>
+#include <KRandom>
 #include <kio/job.h>
 
 POTDPROVIDER_EXPORT_PLUGIN( FlickrProvider, "FlickrProvider", "" )
@@ -103,7 +104,7 @@ void FlickrProvider::Private::pageRequestFinished( KJob *_job )
     }
 
     if (m_photoList.begin() != m_photoList.end()) {
-        KUrl url( m_photoList.at(qrand() % m_photoList.size()) );
+        KUrl url( m_photoList.at(KRandom::randomMax(m_photoList.size())) );
             KIO::StoredTransferJob *imageJob = KIO::storedGet(url, KIO::NoReload, KIO::HideProgressInfo);
             mParent->connect( imageJob, SIGNAL(finished(KJob*)), SLOT(imageRequestFinished(KJob*)) );
     } else {

diff --git a/kget/tests/testtransfers.cpp b/kget/tests/testtransfers.cpp
index afdd61c..d42cbc6 100644 (file)
--- a/kget/tests/testtransfers.cpp
+++ b/kget/tests/testtransfers.cpp
@@ -25,6 +25,7 @@
 
 #include <KRun>
 #include <KTempDir>
+#include <KRandom>
 #include <qtest_kde.h>
 
 //FIXME not working fine if files or transfers are existing already
@@ -297,7 +298,7 @@ void Commands::timerEvent(QTimerEvent *event)
 {
     Q_UNUSED(event)
 
-    const int value = qrand() % 10;
+    const int value = KRandom::randomMax(10);
     //70% of the cases start, in 30% stop
     if (value > 2) {
         kDebug(5001) << this << "is randomly started.";

diff --git a/krfb/krfb/invitationsrfbserver.cpp b/krfb/krfb/invitationsrfbserver.cpp
index 57a4c7d..ba76262 100644 (file)
--- a/krfb/krfb/invitationsrfbserver.cpp
+++ b/krfb/krfb/invitationsrfbserver.cpp
@@ -167,12 +167,11 @@ PendingRfbClient* InvitationsRfbServer::newClient(rfbClientPtr client)
 }
 
 // a random string that doesn't contain i, I, o, O, 1, l, 0
-// based on KRandom::randomString()
 QString InvitationsRfbServer::readableRandomString(int length)
 {
     QString str;
     while (length) {
-        int r = KRandom::random() % 62;
+        int r = KRandom::randomMax(62);
         r += 48;
         if (r > 57) {
             r += 7;

diff --git a/kuser/ku_misc.cpp b/kuser/ku_misc.cpp
index ce16fda..5703c38 100644 (file)
--- a/kuser/ku_misc.cpp
+++ b/kuser/ku_misc.cpp
@@ -213,14 +213,7 @@ void addShell(const QString &shell)
 
 QByteArray genSalt( int len )
 {
-  QByteArray salt( len, 0 );
-  const char * set = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./";
-
-  salt[0] = set[getpid() % strlen(set)];
-  for( int i = 1; i < len; i++ ) {
-    salt[i] = set[KRandom::random() % strlen(set)];
-  }
-  return salt;
+  return KRandom::randomString(len).toLatin1();
 }
 
 QString encryptPass( const QString &pass, bool md5 )

diff --git a/okular/ui/presentationwidget.cpp b/okular/ui/presentationwidget.cpp
index 143a8de..1bc0ffb 100644 (file)
--- a/okular/ui/presentationwidget.cpp
+++ b/okular/ui/presentationwidget.cpp
@@ -1650,59 +1650,50 @@ const Okular::PageTransition PresentationWidget::defaultTransition( int type ) c
             Okular::PageTransition transition( Okular::PageTransition::Blinds );
             transition.setAlignment( Okular::PageTransition::Horizontal );
             return transition;
-            break;
         }
         case Okular::Settings::EnumSlidesTransition::BlindsVertical:
         {
             Okular::PageTransition transition( Okular::PageTransition::Blinds );
             transition.setAlignment( Okular::PageTransition::Vertical );
             return transition;
-            break;
         }
         case Okular::Settings::EnumSlidesTransition::BoxIn:
         {
             Okular::PageTransition transition( Okular::PageTransition::Box );
             transition.setDirection( Okular::PageTransition::Inward );
             return transition;
-            break;
         }
         case Okular::Settings::EnumSlidesTransition::BoxOut:
         {
             Okular::PageTransition transition( Okular::PageTransition::Box );
             transition.setDirection( Okular::PageTransition::Outward );
             return transition;
-            break;
         }
         case Okular::Settings::EnumSlidesTransition::Dissolve:
         {
             return Okular::PageTransition( Okular::PageTransition::Dissolve );
-            break;
         }
         case Okular::Settings::EnumSlidesTransition::GlitterDown:
         {
             Okular::PageTransition transition( Okular::PageTransition::Glitter );
             transition.setAngle( 270 );
             return transition;
-            break;
         }
         case Okular::Settings::EnumSlidesTransition::GlitterRight:
         {
             Okular::PageTransition transition( Okular::PageTransition::Glitter );
             transition.setAngle( 0 );
             return transition;
-            break;
         }
         case Okular::Settings::EnumSlidesTransition::GlitterRightDown:
         {
             Okular::PageTransition transition( Okular::PageTransition::Glitter );
             transition.setAngle( 315 );
             return transition;
-            break;
         }
         case Okular::Settings::EnumSlidesTransition::Random:
         {
-            return defaultTransition( KRandom::random() % 18 );
-            break;
+            return defaultTransition( KRandom::randomMax(18) );
         }
         case Okular::Settings::EnumSlidesTransition::SplitHorizontalIn:
         {
@@ -1710,7 +1701,6 @@ const Okular::PageTransition PresentationWidget::defaultTransition( int type ) c
             transition.setAlignment( Okular::PageTransition::Horizontal );
             transition.setDirection( Okular::PageTransition::Inward );
             return transition;
-            break;
         }
         case Okular::Settings::EnumSlidesTransition::SplitHorizontalOut:
         {
@@ -1718,7 +1708,6 @@ const Okular::PageTransition PresentationWidget::defaultTransition( int type ) c
             transition.setAlignment( Okular::PageTransition::Horizontal );
             transition.setDirection( Okular::PageTransition::Outward );
             return transition;
-            break;
         }
         case Okular::Settings::EnumSlidesTransition::SplitVerticalIn:
         {
@@ -1726,7 +1715,6 @@ const Okular::PageTransition PresentationWidget::defaultTransition( int type ) c
             transition.setAlignment( Okular::PageTransition::Vertical );
             transition.setDirection( Okular::PageTransition::Inward );
             return transition;
-            break;
         }
         case Okular::Settings::EnumSlidesTransition::SplitVerticalOut:
         {
@@ -1734,40 +1722,34 @@ const Okular::PageTransition PresentationWidget::defaultTransition( int type ) c
             transition.setAlignment( Okular::PageTransition::Vertical );
             transition.setDirection( Okular::PageTransition::Outward );
             return transition;
-            break;
         }
         case Okular::Settings::EnumSlidesTransition::WipeDown:
         {
             Okular::PageTransition transition( Okular::PageTransition::Wipe );
             transition.setAngle( 270 );
             return transition;
-            break;
         }
         case Okular::Settings::EnumSlidesTransition::WipeRight:
         {
             Okular::PageTransition transition( Okular::PageTransition::Wipe );
             transition.setAngle( 0 );
             return transition;
-            break;
         }
         case Okular::Settings::EnumSlidesTransition::WipeLeft:
         {
             Okular::PageTransition transition( Okular::PageTransition::Wipe );
             transition.setAngle( 180 );
             return transition;
-            break;
         }
         case Okular::Settings::EnumSlidesTransition::WipeUp:
         {
             Okular::PageTransition transition( Okular::PageTransition::Wipe );
             transition.setAngle( 90 );
             return transition;
-            break;
         }
         case Okular::Settings::EnumSlidesTransition::Replace:
         default:
             return Okular::PageTransition( Okular::PageTransition::Replace );
-            break;
     }
     // should not happen, just make gcc happy
     return Okular::PageTransition();