8 files changed, 235 insertions, 235 deletions

diff --git a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
index 6c246e97..7f21ab3 100644
--- a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
@@ -21,5 +21,5 @@
 #include <qpe/qpeapplication.h>
 #include <qpe/qpedialog.h>
-//#include <opie2///odebug.h>
+#include <opie2/odebug.h>
 
 /* QT */
@@ -459,53 +459,56 @@ bool LibraryDialog::download_newEtext()
 bool LibraryDialog::getEtext(const QStringList &networkList)
 {
-   NetworkDialog *NetworkDlg;
-   NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog", true, 0, networkList);
+    NetworkDialog *NetworkDlg;
+    NetworkDlg = new NetworkDialog( this,"Network Protocol Dialog", true, 0, networkList);
 
-// use new, improved, *INSTANT* network-dialog-file-getterer
-   if( NetworkDlg->exec() != 0 ) {
-      File_Name = NetworkDlg->localFileName;
+    // use new, improved, *INSTANT* network-dialog-file-getterer
+    if( NetworkDlg->exec() != 0 ) {
+        File_Name = NetworkDlg->localFileName;
 
-      qDebug("Just downloaded " + NetworkDlg->localFileName);
+        qDebug("Just downloaded " + NetworkDlg->localFileName);
 
-      if(NetworkDlg->successDownload) {
-         //odebug << "Filename is "+File_Name << oendl;
-         if(File_Name.right(4) == ".txt") {
-            QString  s_fileName = File_Name;
-            s_fileName.replace( s_fileName.length() - 3, 3, "gtn");
-            //                s_fileName.replace( s_fileName.length()-3,3,"etx");
-            rename( File_Name.latin1(), s_fileName.latin1());
-            File_Name = s_fileName;
+        if(NetworkDlg->successDownload) {
+            //odebug << "Filename is "+File_Name << oendl;
+            if(File_Name.right(4) == ".txt") {
+                QString  s_fileName = File_Name;
+                s_fileName.replace( s_fileName.length() - 3, 3, "gtn");
+                if (rename( File_Name.latin1(), s_fileName.latin1()) == 1) {
+                    owarn << "Failed to rename " << File_Name.latin1() << " to "
+                        << s_fileName.latin1() << oendl;
+                    return false;
+                }
 
-            //odebug << "Filename is now "+File_Name << oendl;
+                File_Name = s_fileName;
 
-         }
-         if(File_Name.length() > 5 ) {
-            setTitle();
-            QFileInfo fi(File_Name);
-            QString  name_file = fi.fileName();
-            name_file = name_file.left( name_file.length() - 4);
-
-            //odebug << "Setting doclink" << oendl;
-            DocLnk lnk;
-            //odebug << "name is "+name_file << oendl;
-            lnk.setName(name_file); //sets file name
-            //odebug << "Title is "+DlglistItemTitle << oendl;
-            lnk.setComment(DlglistItemTitle);
+                //odebug << "Filename is now "+File_Name << oendl;
 
-            //odebug << "Filename is "+File_Name << oendl;
-            lnk.setFile(File_Name); //sets File property
-            lnk.setType("guten/plain");// hey is this a REGISTERED mime type?!?!? ;D
-            lnk.setExec(File_Name);
-            lnk.setIcon("gutenbrowser/Gutenbrowser");
-            if(!lnk.writeLink()) {
-               //odebug << "Writing doclink did not work" << oendl;
-            } else {
             }
-         } else
-            QMessageBox::message("Note","<p>There was an error with the file</p>");
-      }
-   }
+            if(File_Name.length() > 5 ) {
+                setTitle();
+                QFileInfo fi(File_Name);
+                QString  name_file = fi.fileName();
+                name_file = name_file.left( name_file.length() - 4);
+
+                //odebug << "Setting doclink" << oendl;
+                DocLnk lnk;
+                //odebug << "name is "+name_file << oendl;
+                lnk.setName(name_file); //sets file name
+                //odebug << "Title is "+DlglistItemTitle << oendl;
+                lnk.setComment(DlglistItemTitle);
+
+                //odebug << "Filename is "+File_Name << oendl;
+                lnk.setFile(File_Name); //sets File property
+                lnk.setType("guten/plain");// hey is this a REGISTERED mime type?!?!? ;D
+                lnk.setExec(File_Name);
+                lnk.setIcon("gutenbrowser/Gutenbrowser");
+                if(!lnk.writeLink()) {
+                   //odebug << "Writing doclink did not work" << oendl;
+                }
+            } else
+                QMessageBox::message("Note","<p>There was an error with the file</p>");
+        }
+    }
 
-   return true;
+    return true;
 }
 
@@ -702,5 +705,4 @@ void LibraryDialog::onButtonSearch()
    if( searchDlg->exec() != 0 )  {
       QString searcherStr = searchDlg->get_text();
-      int fluff = 0;
 
       bool cS;
diff --git a/noncore/apps/opie-gutenbrowser/openetext.cpp b/noncore/apps/opie-gutenbrowser/openetext.cpp
index 0267416..a5d855d 100644
--- a/noncore/apps/opie-gutenbrowser/openetext.cpp
+++ b/noncore/apps/opie-gutenbrowser/openetext.cpp
@@ -58,6 +58,5 @@ void OpenEtext::getTitles()
     config.setGroup( "Files" );
     s_numofFiles = config.readEntry("NumberOfFiles", "0");
-    QLabel_1->setText( tr(
-        s_numofFiles+" etexts in your library."));
+    QLabel_1->setText( tr( s_numofFiles+" etexts in your library." ) );
      int  i_numofFiles = s_numofFiles.toInt();
     for (int i = 1; i <= i_numofFiles+1; i++) {
@@ -69,5 +68,10 @@ void OpenEtext::getTitles()
         title = config.readEntry(ramble, "");
         if( !title.isEmpty()) {
-            QListBox_1->insertItem ( QPixmap( QPEApplication::qpeDir()+"pics/gutenbrowser/gutenbrowser_sm.png"), title, -1);
+            QListBox_1->insertItem ( QPixmap(
+                                         QPEApplication::qpeDir() +
+                                         "pics/gutenbrowser/gutenbrowser_sm.png"
+                                            ),
+                                     title,
+                                     -1);
         }
     }
@@ -101,6 +105,7 @@ void OpenEtext::select_title(int index )
 }
 
-/*
- This function imports already existing etexts into the local library list*/
+/*!
+ * This function imports already existing etexts into the local library list
+ */
 void OpenEtext::open()
 {
@@ -114,12 +119,4 @@ OpenFileButton->setDown(TRUE);
     QDir library( local);
 
-//      fileBrowser *browseForFiles;
-//      browseForFiles=new fileBrowser(this,"Browse for File", TRUE, 0, "guten/plain;text/plain");
-//  //    browseForFiles=new fileBrowser(this,"fileBrowser",TRUE,0, "*");
-//              browseForFiles->setFileView( 0);
-//              browseForFiles->showMaximized();
-//      browseForFiles->exec();
-//      QString selFile= browseForFiles->selectedFileName;
-//      fileList=browseForFiles->fileList;
     Config cfg("Gutenbrowser");
     cfg. setGroup ( "View" );
@@ -135,53 +132,41 @@ OpenFileButton->setDown(TRUE);
     QString str = OFileDialog::getOpenFileName( 2, dir , QString::null, map);
 
-    if( !str.isEmpty() && QFile(str).exists() && !QFileInfo(str).isDir() )  {
-      filer = str;
-
-    odebug << "Open file: "+str << oendl;
-
-    //      QStringList::ConstIterator f;
-//      QString fileTemp;
-//      for (  f = fileList.begin(); f != fileList.end(); f++ ) {
-//          fileTemp = *f;
-//          fileTemp.right( fileTemp.length()-5);
-//          fileName = fileTemp;
-//          if( !fileName.isEmpty() ){
-//              filer = fileName;
-//          } else { //filename is empty
-//  //              QString sMsg;
-//  //              sMsg = "Error opening library filelist "+fileName;
-//          }
-
-        if( filer.right(4) == ".txt"
-                        || filer.right(4) == ".TXT"
-                        || filer.right(4) == ".etx"
-                        || filer.right(4) == ".ETX"
-                        || filer.right(4) == ".etx"
-                        || filer.right(4) == ".ETX"
-                        || filer.right(4) == ".zip"
-                        || filer.right(4) == ".ZIP" ) {
+    if( !str.isEmpty() && QFile(str).exists() && !QFileInfo(str).isDir() ) {
+        filer = str;
+
+        odebug << "Open file: "+str << oendl;
+
+        if( filer.right(4) == ".txt" ||
+            filer.right(4) == ".TXT" ||
+            filer.right(4) == ".etx" ||
+            filer.right(4) == ".ETX" ||
+            filer.right(4) == ".etx" ||
+            filer.right(4) == ".ETX" ||
+            filer.right(4) == ".zip" ||
+            filer.right(4) == ".ZIP" )
+        {
             QFileInfo zipFile( filer);
             QString s_fileName = zipFile.fileName();
             QString cmd;
 
-            if( s_fileName.right(4) == ".zip") { // unzip that sucker....
+            if( s_fileName.right(4) == ".zip") { // unzip the file
                 s_fileName = s_fileName.left( s_fileName.length() - 4);
                 if( chdir((const char*)local_library.latin1())!=0)
-                    odebug << "chdir failed." << oendl; //                QString cmd = "gunzip -d " + filer + " -d " + local_library;
+                    odebug << "chdir failed." << oendl;
                 cmd = "gunzip -S .zip " + filer;
                 fileName = local_library + s_fileName + ".txt";
                 system( cmd);
-            }
-// this renames the .txt to .etx!!
-            else  /*if( s_fileName.right(4) == ".txt" ||  if( s_fileName.right(4) == ".TXT"))*/ {
-//   odebug << "Filename is "+fileName << oendl;
+            } else { // else rename .txt to .etx
+                // odebug << "Filename is "+fileName << oendl;
                 s_fileName = fileName;
-                s_fileName.replace( s_fileName.length()-3,3,"gtn");//  s_fileName.replace( s_fileName.length()-3,3,"etx");
-                rename(fileName.latin1(),s_fileName.latin1());
+                s_fileName.replace( s_fileName.length()-3,3,"gtn");
+                if (rename(fileName.latin1(),s_fileName.latin1()) == -1)
+                    owarn << "Rename of " << fileName.latin1() << " to "
+                        << s_fileName.latin1() << " failed" << oendl;
                 fileName = s_fileName;
-//  odebug << "Filename is now "+fileName << oendl;
+                //  odebug << "Filename is now "+fileName << oendl;
             }
         } else
-                        fileName = str;
+            fileName = str;
 
         FindTitle(fileName);
@@ -202,5 +187,8 @@ OpenFileButton->setDown(TRUE);
         odebug << "Filename is "+fileName << oendl;
         lnk.setFile(fileName); //sets File property
-        lnk.setType("guten/plain");// hey is this a REGISTERED mime type?!?!? ;D
+        // @bug This is probably not a registered MIME type. Perhaps we should
+        // set a valid MIME type here instead. Or maybe register .etx as a
+        // Gutenberge etext?
+        lnk.setType("guten/plain");
         lnk.setExec(fileName);
         lnk.setIcon("gutenbrowser/Gutenbrowser");
@@ -209,5 +197,5 @@ OpenFileButton->setDown(TRUE);
 
    } // end of for each file name....
-    OpenFileButton->setDown(FALSE);
+   OpenFileButton->setDown(FALSE);
 }
 
@@ -225,9 +213,8 @@ bool OpenEtext::FindTitle( QString filename)
     odebug << "filename to open is " + name << oendl;
     QFile indexLib( filename);
-        bool findCheck = FALSE;
-        //        int Titlenumber=0;
+    bool findCheck = FALSE;
 
     if ( indexLib.open( IO_ReadOnly) ) {
-                odebug << "file opened successfully" << oendl;
+        odebug << "file opened successfully" << oendl;
         QTextStream indexStream( &indexLib );
         QString target = "Project Gutenberg Etext of";
@@ -237,5 +224,5 @@ bool OpenEtext::FindTitle( QString filename)
         QString indexLine;
         while ( !indexStream.eof() ) {
-              // until end of file..
+            // until end of file..
             indexLine = indexStream.readLine();
             if(  indexLine.find(target, 0, TRUE) > -1 && !findCheck) {findCheck = TRUE;
@@ -244,5 +231,5 @@ bool OpenEtext::FindTitle( QString filename)
                 title = title.stripWhiteSpace ();
 //                odebug << "Found the title 1 and it is " << title << "" << oendl;
-//                              QListBox_1->insertItem ( title);
+//                QListBox_1->insertItem ( title);
             }
             if( indexLine.find( target2, 0, TRUE) > -1 && !findCheck) {
@@ -251,6 +238,6 @@ bool OpenEtext::FindTitle( QString filename)
                 title = title.left( title.find( "*",0, TRUE));
                 title = title.stripWhiteSpace ();
-//                    odebug << "Found the title 2 and it is " << title << "" << oendl;
-//                              QListBox_1->insertItem ( title);
+//                odebug << "Found the title 2 and it is " << title << "" << oendl;
+//                QListBox_1->insertItem ( title);
             }
             if( indexLine.find( target3, 0, TRUE) > -1 && !findCheck) {
@@ -278,5 +265,4 @@ bool OpenEtext::FindTitle( QString filename)
 
         if ( checkConf() == false && findCheck == TRUE) {
-
             config.setGroup( "Files");
             config.writeEntry("NumberOfFiles",i_numofFiles + 1 );
@@ -316,8 +302,8 @@ QString OpenEtext::titleFromLibrary( QString fileName)
     int find1 = fileName.findRev("/",-1,TRUE)  + 1;
     int find2 = fileName.findRev(".gtn",-1,TRUE) - find1;
-    if(find2==-1-find1)
-    int find2 = fileName.findRev(".etx",-1,TRUE) - find1;
-    else if(find2==-1-find1)
-    int find2 = fileName.findRev(".txt",-1,TRUE) - find1;
+    if(find2== (-1-find1))
+        find2 = fileName.findRev(".etx",-1,TRUE) - find1;
+    else if(find2==(-1-find1))
+        find2 = fileName.findRev(".txt",-1,TRUE) - find1;
 
     target = fileName.mid( find1,  find2 );
@@ -335,9 +321,9 @@ QString OpenEtext::titleFromLibrary( QString fileName)
     }
     if ( indexLib.open( IO_ReadOnly) ) {
-          // file opened successfully
+        // file opened successfully
         QTextStream indexStream( &indexLib );
         QString indexLine;
         bool findCheck = FALSE;
-        while ( !indexStream.atEnd() ) {                  // until end of file..
+        while ( !indexStream.atEnd() ) { // until end of file..
             indexLine = indexStream.readLine();
 
@@ -345,13 +331,12 @@ QString OpenEtext::titleFromLibrary( QString fileName)
                 findCheck = TRUE;
                 title = indexLine.mid( 9, 50);
-//                title = indexLine.mid( 26, indexLine.length() );
                 title = title.stripWhiteSpace ();
 //                odebug << "Finally Found the title and it is\n " << title << "" << oendl;
-//                              QListBox_1->insertItem ( title);
+//                QListBox_1->insertItem ( title);
             }
         } //end while loop
     }
     else
-       odebug << "Error opening library index "+ local_index << oendl;
+        odebug << "Error opening library index "+ local_index << oendl;
     return title;
 }
@@ -382,8 +367,10 @@ void OpenEtext::remove()
     title_text = QListBox_1->text( QListBox_1->currentItem() );
     title_text=title_text.stripWhiteSpace();
-    QString msg ="<p>Do you really want to REMOVE\n" +title_text +"?\nThis will not delete the file.</P>";
-    switch( QMessageBox::information( this, (tr("Remove Etext")),
-                                      (tr(msg)),
-                                      (tr("&Yes")), (tr("&Cancel")), 0 )){
+    QString msg ="<p>Do you really want to REMOVE\n" + title_text +
+                 "?\nThis will not delete the file.</P>";
+    switch( QMessageBox::information( this, tr("Remove Etext"),
+                                      tr(msg),
+                                      tr("&Yes"), tr("&Cancel"), 0 ) )
+    {
         case 0: // Yes clicked,
             removeSelection();
@@ -391,11 +378,12 @@ void OpenEtext::remove()
             getTitles();
             break;
-        case 1: // Cancel
-            break;
-    };
+        case 1:
+        default:
+    }
 }
 
-/*
- this removes selected title entry*/
+/*!
+ * This removes selected title entry
+ */
 void OpenEtext::removeSelection()
 {
@@ -418,5 +406,5 @@ void OpenEtext::removeSelection()
         if(title_text == file_title) {
             rem=i;
-//odebug << "file title to remove is "+file_title << oendl;
+            //odebug << "file title to remove is "+file_title << oendl;
             selFile = s_filename;
             config.removeEntry( s_filename); //removes file=title
@@ -437,9 +425,9 @@ void OpenEtext::removeSelection()
     config.writeEntry("NumberOfFiles", i_numofFiles - 1 );
     config.removeEntry(fileNum2);
-//    remFile();
 }
 
-/*
- removes file title name from list and config file*/
+/*!
+ * Removes file title name from list and config file
+ */
 void OpenEtext::remFile()
 {
@@ -462,7 +450,6 @@ void OpenEtext::remFile()
                 QString s_filename2 = config.readEntry(fileNum2, "" );
 
-                if (!s_filename2.isEmpty()) {
+                if (!s_filename2.isEmpty())
                     config.writeEntry(fileNum, s_filename2 );
-                }
             }
         }
@@ -474,6 +461,7 @@ void OpenEtext::remFile()
 }
 
-/*
-sorts the list*/
+/*!
+ * Sorts the list
+ */
 void OpenEtext::scan() {
 
@@ -486,5 +474,5 @@ void  OpenEtext::editTitle() {
     int currentItem=QListBox_1->currentItem();
     QString title_text = QListBox_1->text( currentItem);
-//odebug << "Selected "+title_text << oendl;
+    //odebug << "Selected "+title_text << oendl;
 
     Config config("Gutenbrowser");
@@ -500,21 +488,25 @@ void  OpenEtext::editTitle() {
         config.setGroup( "Titles" );
         QString file_title = config.readEntry( s_filename, "");
-//odebug << "file_title is "+file_title << oendl;
+        //odebug << "file_title is "+file_title << oendl;
         if(title_text == file_title ) {
             selFile = s_filename;
-//odebug << "Edit: "+ file_title << oendl;
+            //odebug << "Edit: "+ file_title << oendl;
             i=i_numofFiles+1;
             Edit_Title *titleEdit;
             titleEdit = new Edit_Title(this,file_title ,TRUE);
             if(titleEdit->exec() !=0) {
-//odebug << titleEdit->newTitle << oendl;
+                //odebug << titleEdit->newTitle << oendl;
                 config.writeEntry( s_filename, titleEdit->newTitle);
                 QListBox_1->removeItem(currentItem);
-                QListBox_1->insertItem ( QPixmap( QPEApplication::qpeDir()+"pics/gutenbrowser/gutenbrowser_sm.png"), titleEdit->newTitle, currentItem);
+                QListBox_1->insertItem (
+                    QPixmap( QPEApplication::qpeDir()+
+                             "pics/gutenbrowser/gutenbrowser_sm.png"),
+                    titleEdit->newTitle, currentItem
+                                       );
             }
         }
     }
 
-//    getTitles();
+    //getTitles();
     QListBox_1->triggerUpdate(true);
 }
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 84d28ce..5f281b7 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -78,18 +78,20 @@ Lib::Lib( InitializationMode initMode, XineVideoWidget* widget )
     if ( !QFile::exists(configPath) ) {
         QFile f(configPath);
-        f.open(IO_WriteOnly);
-        QTextStream ts( &f );
-        ts << "misc.memcpy_method:glibc\n";
-        ts << "# uncomment if you experience double speed audio \n #audio.oss_sync_method:softsync\n";
-        ts << "codec.ffmpeg_pp_quality:3\n";
-        ts << "audio.num_buffers:50\n";
-        ts << "audio.size_buffers:4096\n";
-        ts << "video.num_buffers:20\n";
-        ts << "video.size_buffers:4096\n";
-        ts << "audio.out_num_audio_buf:16\n";
-        ts << "audio.out_size_audio_buf:8096\n";
-        ts << "audio.out_size_zero_buf:1024\n";
-        ts << "audio.passthrough_offset:0\n";
-        f.close();
+        if (f.open(IO_WriteOnly)) {
+            QTextStream ts( &f );
+            ts << "misc.memcpy_method:glibc\n";
+            ts << "# uncomment if you experience double speed audio \n #audio.oss_sync_method:softsync\n";
+            ts << "codec.ffmpeg_pp_quality:3\n";
+            ts << "audio.num_buffers:50\n";
+            ts << "audio.size_buffers:4096\n";
+            ts << "video.num_buffers:20\n";
+            ts << "video.size_buffers:4096\n";
+            ts << "audio.out_num_audio_buf:16\n";
+            ts << "audio.out_size_audio_buf:8096\n";
+            ts << "audio.out_size_zero_buf:1024\n";
+            ts << "audio.passthrough_offset:0\n";
+            f.close();
+        } else
+            owarn << "Failed to open " f.name() << oendl;
     }
 
diff --git a/noncore/multimedia/opieplayer2/om3u.cpp b/noncore/multimedia/opieplayer2/om3u.cpp
index 790fa09..f2a01d3 100644
--- a/noncore/multimedia/opieplayer2/om3u.cpp
+++ b/noncore/multimedia/opieplayer2/om3u.cpp
@@ -39,8 +39,11 @@ using namespace Opie::Core;
 
 Om3u::Om3u( const QString &filePath, int mode)
-      : QStringList (){
-odebug << "<<<<<<<new m3u "+filePath << oendl; 
-  f.setName(filePath);
-  f.open(mode);
+  : QStringList ()
+{
+    odebug << "<<<<<<<new m3u "+filePath << oendl;
+    f.setName(filePath);
+    if (!f.open(mode)) {
+        owarn << "Unable to open file " << f.name() << oendl;
+    }
 }
 
@@ -48,25 +51,25 @@ Om3u::~Om3u(){}
 
 void Om3u::readM3u() {
-//    odebug << "<<<<<<reading m3u "+f.name() << oendl; 
+//    odebug << "<<<<<<reading m3u "+f.name() << oendl;
     QTextStream t(&f);
-                t.setEncoding(QTextStream::UnicodeUTF8);
-                QString s;
+    t.setEncoding(QTextStream::UnicodeUTF8);
+    QString s;
     while ( !t.atEnd() ) {
         s=t.readLine();
-//                odebug << s << oendl; 
+        // odebug << s << oendl;
         if( s.find( "#", 0, TRUE) == -1 ) {
-                if( s.left(2) == "E:" || s.left(2) == "P:" ) {
-                    s = s.right( s.length() -2 );
-                    QFileInfo f( s );
-                    QString name = f.baseName();
-                    name = name.right( name.length() - name.findRev( "\\", -1, TRUE )  -1 );
-                    s=s.replace( QRegExp( "\\" ), "/" );
-                    append(s);
-//                    odebug << s << oendl; 
-                } else { // is url
-                    QString name;
-                    name = s;
-                    append(name);
-                }
+            if( s.left(2) == "E:" || s.left(2) == "P:" ) {
+                s = s.right( s.length() -2 );
+                QFileInfo f( s );
+                QString name = f.baseName();
+                name = name.right( name.length() - name.findRev( "\\", -1, TRUE )  -1 );
+                s=s.replace( QRegExp( "\\" ), "/" );
+                append(s);
+// odebug << s << oendl;
+            } else { // is url
+                QString name;
+                name = s;
+                append(name);
+            }
         }
     }
@@ -74,52 +77,42 @@ void Om3u::readM3u() {
 
 void Om3u::readPls() { //it's a pls file
-        QTextStream t( &f );
-                                t.setEncoding(QTextStream::UnicodeUTF8);
-                                QString s;
-        while ( !t.atEnd() ) {
-            s = t.readLine();
-            if( s.left(4)  == "File" ) {
-                s = s.right( s.length() - s.find("=",0,true)-1 );
-                s = s.stripWhiteSpace();
-                s.replace( QRegExp( "%20" )," ");
-//                odebug << "adding " + s + " to playlist" << oendl; 
-                // numberofentries=2
-                // File1=http
-                // Title
-                // Length
-                // Version
-                // File2=http
-                s = s.replace( QRegExp( "\\" ), "/" );
-                QFileInfo f( s );
-                QString name = f.baseName();
-                if( name.left( 4 ) == "http" ) {
-                    name = s.right( s.length() - 7);
-                }  else {
-                    name = s;
-                }
-                name = name.right( name.length() - name.findRev( "\\", -1, TRUE) - 1 );
-                if( s.at( s.length() - 4) == '.') // if this is probably a file
+    QTextStream t( &f );
+    t.setEncoding(QTextStream::UnicodeUTF8);
+    QString s;
+    while ( !t.atEnd() ) {
+        s = t.readLine();
+        if( s.left(4)  == "File" ) {
+            s = s.right( s.length() - s.find("=",0,true)-1 );
+            s = s.stripWhiteSpace();
+            s.replace( QRegExp( "%20" )," ");
+            // odebug << "adding " + s + " to playlist" << oendl;
+            s = s.replace( QRegExp( "\\" ), "/" );
+            QFileInfo f( s );
+            QString name = f.baseName();
+            if( name.left( 4 ) == "http" ) {
+                name = s.right( s.length() - 7);
+            }  else {
+                name = s;
+            }
+            name = name.right( name.length() - name.findRev( "\\", -1, TRUE) - 1 );
+            if( s.at( s.length() - 4) == '.') // if this is probably a file
+                append(s);
+            else { //if its a url
                 append(s);
-                else { //if its a url
-//                     if( name.right( 1 ).find( '/' ) == -1) {
-//                         s += "/";
-//                     }
-                    append(s);
-                }
             }
         }
+    }
 }
 
 void Om3u::write() { //writes list to m3u file
-  QString list;
-        QTextStream t(&f);
-  t.setEncoding(QTextStream::UnicodeUTF8);
- if(count()>0) {
-    for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) {
-//      odebug << *it << oendl; 
-                                t << *it << "\n";
+    QString list;
+    QTextStream t(&f);
+    t.setEncoding(QTextStream::UnicodeUTF8);
+    if(count()>0) {
+        for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) {
+            // odebug << *it << oendl;
+            t << *it << "\n";
+        }
     }
-  }
-//    f.close();
 }
 
@@ -129,20 +122,20 @@ void Om3u::add(const QString &filePath) { //adds to m3u file
 
 void Om3u::remove(const QString &filePath) { //removes from m3u list
-  QString list, currentFile;
-  if(count()>0) {
-    for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) {
-      currentFile=*it;
-      //        odebug << *it << oendl; 
-
-      if( filePath != currentFile)
-        list += currentFile+"\n";
+    QString list, currentFile;
+    if(count()>0) {
+        for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) {
+            currentFile=*it;
+            // odebug << *it << oendl;
+
+           if( filePath != currentFile)
+               list += currentFile+"\n";
+        }
+        f.writeBlock( list, list.length() );
     }
-    f.writeBlock( list, list.length() );
-  }
 }
 
 void Om3u::deleteFile(const QString &/*filePath*/) {//deletes m3u file
-     f.close();
-     f.remove();
+    f.close();
+    f.remove();
 
 }
diff --git a/noncore/multimedia/opieplayer2/threadutil.cpp b/noncore/multimedia/opieplayer2/threadutil.cpp
index b5cac61..5fc8a0b 100644
--- a/noncore/multimedia/opieplayer2/threadutil.cpp
+++ b/noncore/multimedia/opieplayer2/threadutil.cpp
@@ -234,10 +234,15 @@ void Thread::exit()
 }
 
-OnewayNotifier::OnewayNotifier()
-{
-    int fds[ 2 ];
-    pipe( fds );
-    m_readFd = fds[ 0 ];
-    m_writeFd = fds[ 1 ];
+OnewayNotifier::OnewayNotifier() :
+  m_readFd(-1),
+  m_writeFd(-1)
+{
+    int fds[ 2 ] = { -1, -1 };
+    if (pipe( fds ) == 0) {
+        m_readFd = fds[ 0 ];
+        m_writeFd = fds[ 1 ];
+    } else {
+        owarn << "Call to pipe() failed" << oendl;
+    }
 
     m_notifier = new QSocketNotifier( m_readFd, QSocketNotifier::Read );
diff --git a/noncore/net/opiestumbler/opiestumbler.cpp b/noncore/net/opiestumbler/opiestumbler.cpp
index 9b0d099..ab0b8d8 100644
--- a/noncore/net/opiestumbler/opiestumbler.cpp
+++ b/noncore/net/opiestumbler/opiestumbler.cpp
@@ -343,5 +343,6 @@ void OpieStumbler::slotAssociated()
         
     *m_proc << "udhcpc" << "-f" << "-n" << "-i" << m_interface;
-    m_proc->start(Opie::Core::OProcess::DontCare);
+    if (!m_proc->start(Opie::Core::OProcess::DontCare))
+        owarn << "Execution of udhcpc returned false. Are paths correct?" << oendl;
     QTimer::singleShot(5000, this, SLOT(slotCheckDHCP()));
 }
diff --git a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
index 650e634..e81f603 100644
--- a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp
@@ -197,5 +197,6 @@ void MainWindowImp::getAllInterfaces()
     else
     {
-        procFile.open(IO_ReadOnly);
+        if (!procFile.open(IO_ReadOnly))
+            owarn << "Failed to open proc file " << procFile.name() << oendl;
         QString line;
         QTextStream procTs(&procFile);
@@ -733,5 +734,6 @@ void MainWindowImp::setHostname()
     h << "hostname" << m_Nameinput->text();
     connect(&h,SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),this,SLOT(slotHostname(Opie::Core::OProcess*,char*,int)));
-    h.start(OProcess::Block,OProcess::Stderr);
+    if (!h.start(OProcess::Block,OProcess::Stderr))
+        owarn << "Failed execution of 'hostname'. Are the paths correct?" << oendl;
     odebug << "Got " << _procTemp << " - " << h.exitStatus() << oendl;
     if (h.exitStatus()!=0) {
@@ -769,5 +771,6 @@ void MainWindowImp::initHostname()
     h << "hostname";
     connect(&h,SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),this,SLOT(slotHostname(Opie::Core::OProcess*,char*,int)));
-    h.start(OProcess::Block,OProcess::AllOutput);
+    if (!h.start(OProcess::Block,OProcess::AllOutput))
+        owarn << "Could not execute 'hostname'. Are the paths correct?" oendl;
     odebug << "Got " << _procTemp <<oendl;
     m_Nameinput->setText(_procTemp.stripWhiteSpace());
@@ -775,5 +778,5 @@ void MainWindowImp::initHostname()
 }
 
-void MainWindowImp::slotHostname(Opie::Core::OProcess */*proc*/, char *buffer, int buflen)
+void MainWindowImp::slotHostname(Opie::Core::OProcess * /*proc*/, char *buffer, int buflen)
 {
     if (buflen < 1 || buffer==0) return;
diff --git a/noncore/settings/networksettings/ppp/modem.cpp b/noncore/settings/networksettings/ppp/modem.cpp
index 7b2e2a3..17ada9b 100644
--- a/noncore/settings/networksettings/ppp/modem.cpp
+++ b/noncore/settings/networksettings/ppp/modem.cpp
@@ -769,6 +769,8 @@ bool Modem::createAuthFile(Auth method, const char *username, const char *passwo
   unlink(oldName);
 
-  rename(authfile, oldName);
-  rename(newName, authfile);
+  if (rename(authfile, oldName) == -1)
+    return false;
+  if (rename(newName, authfile) == -1)
+    return false;
 
   return true;