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

List:       kde-commits
Subject:    kdeartwork/kscreensaver/kdesavers
From:       Chris Howells <howells () kde ! org>
Date:       2003-04-24 9:47:42
[Download RAW message or body]

CVS commit by howells: 

Remove an unused function, and a few other cleanups.

I'm not entirely sure why some many of the functions are virtual, so it could \
probably do with some more work.


  M +6 -33     slideshow.cpp   1.12
  M +0 -3      slideshow.h   1.5


--- kdeartwork/kscreensaver/kdesavers/slideshow.cpp  #1.11:1.12
@@ -126,5 +126,5 @@ void kSlideShowSaver::readConfig()
   mZoomImages = config->readBoolEntry("ZoomImages", false);
   mPrintName = config->readBoolEntry("PrintName", true);
-  mDirectory = config->readEntry("Directory", KGlobal::dirs()->saveLocation("data", \
"kslideshow/pics", false)); +  mDirectory = config->readEntry("Directory", \
QDir::homeDirPath());  mDelay = config->readNumEntry("Delay", 10) * 1000;
   mSubdirectory = config->readBoolEntry("SubDirectory", false);
@@ -771,5 +771,5 @@ void kSlideShowSaver::createNextScreen()
 void kSlideShowSaver::loadNextImage()
 {
-  QString fname, fpath;
+  QString fname;
   int num, i, j;
 
@@ -794,11 +794,7 @@ void kSlideShowSaver::loadNextImage()
   }
 
-  //if (!mDirectory.isEmpty()) fpath = mDirectory + '/' + fname;
-  //else
-  fpath = fname;
-
-  if (!mImage.load(fpath))
+  if (!mImage.load(fname))
   {
-    kdDebug() << "Failed to load image " << fpath << endl;
+    kdDebug() << "Failed to load image " << fname << endl;
     mFileList.remove(fname);
     mRandomList.remove(fname);
@@ -822,4 +818,5 @@ void kSlideShowSaver::loadDirectory()
   mFileList.clear();
   traverseDirectory(mDirectory);
+  mRandomList = mFileList;
 }
 
@@ -827,5 +824,5 @@ void kSlideShowSaver::traverseDirectory(
 {
   QDir dir(dirName);
-  dir.setFilter( QDir::Dirs | QDir::Files | QDir::NoSymLinks);
+  dir.setFilter(QDir::Dirs | QDir::Files | QDir::NoSymLinks);
 
   const QFileInfoList *fileinfolist = dir.entryInfoList();
@@ -852,28 +849,4 @@ void kSlideShowSaver::traverseDirectory(
   ++it;
    }
-}
-
-
-//----------------------------------------------------------------------------
-void kSlideShowSaver::loadFileList(const QCString& aFileName)
-{
-  QFile file(aFileName);
-  QString fname;
-
-  mFileList.clear();
-  mFileIdx = 0;
-
-  if (!file.open(IO_ReadOnly)) return;
-
-  while (!file.atEnd())
-  {
-    if (file.readLine(fname, 256) > 0)
-    {
-      fname = fname.stripWhiteSpace();
-      if (fname.isEmpty() || fname[0] == '#') continue;
-      mFileList.append(fname);
-    }
-  }
-  file.close();
 }
 

--- kdeartwork/kscreensaver/kdesavers/slideshow.h  #1.4:1.5
@@ -42,7 +42,4 @@ protected:
   void blank();
 
-  /** Load list of images from file */
-  virtual void loadFileList(const QCString &fileName);
-
   /** Load list of images from directory */
   virtual void loadDirectory();


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