1 files changed, 42 insertions, 36 deletions

diff --git a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
index aed53c6..6e6b707 100644
--- a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
@@ -11,13 +11,13 @@
 // // half-assed attempt at providing a network dialog.
 // /* Created: Sun Aug 27 15:24:52 2000*/
-#include <unistd.h>
 
-extern "C" {
-#include <ftplib.h>
-}
 
 #include "NetworkDialog.h"
 #include "gutenbrowser.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
 #include <qprogressbar.h>
 #include <qstringlist.h>
@@ -31,4 +31,10 @@ extern "C" {
 #include <qlayout.h>
 
+/* STD */
+#include <unistd.h>
+extern "C" {
+#include <ftplib.h>
+}
+
 QProgressBar* ProgressBar1;
 QPushButton* buttonCancel;
@@ -47,5 +53,5 @@ static int log_progress(netbuf *ctl, int xfered, void *arg) {
 
 NetworkDialog::NetworkDialog( QWidget* parent,  const char* name, bool modal, WFlags fl, const QStringList netL)
-                                : QDialog( parent, name, modal, fl )
+                : QDialog( parent, name, modal, fl )
 {
 
@@ -54,11 +60,11 @@ NetworkDialog::NetworkDialog( QWidget* parent,  const char* name, bool modal, WF
 
     dir = ftp_base_dir = netL[1];
-                localFileName = netL[2];
-                s_partialFileName = netL[3];
+        localFileName = netL[2];
+        s_partialFileName = netL[3];
 
-                resize(240,110);
+        resize(240,110);
 
-                local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/";
-        //      autoOk = autoDownload;
+        local_library = (QDir::homeDirPath ()) +"/Applications/gutenbrowser/";
+//      autoOk = autoDownload;
 //      if( networkUrl.find("ftp",0,false)== -1 ) {
 //         if ( !name )
@@ -119,9 +125,9 @@ void NetworkDialog::initDialog() {
 //    connect( timer, SIGNAL(timeout()), this , SLOT(timeSlot()));
 //    connect( connectionTimer,SIGNAL( timeout()),this,SLOT( connectionTimeSlot()));
-                if(autoOk) {
-                                qWarning("XXXXXXXXXXXXXXXXXXXXXXXX");
-                                buttonOk->setDown(true);
-                                doOk();
-                }
+        if(autoOk) {
+                owarn << "XXXXXXXXXXXXXXXXXXXXXXXX" << oendl;
+                buttonOk->setDown(true);
+                doOk();
+        }
 }
 
@@ -144,5 +150,5 @@ void NetworkDialog::timeSlot() {
 //          posTimer=TRUE;
 //      }
-//  //    qDebug("timer event");
+//  //    odebug << "timer event" << oendl;
 //      qApp->processEvents();
 //      repaint();
@@ -150,5 +156,5 @@ void NetworkDialog::timeSlot() {
 
 void NetworkDialog::connectionTimeSlot() {
-//      qDebug("Connections timed out");
+//      odebug << "Connections timed out" << oendl;
 //      ftpQuit();
 //      qApp->processEvents();
@@ -168,6 +174,6 @@ bool NetworkDialog::downloadFile( QString networkUrl )
     warnLabel ->setText( "");
     qApp->processEvents();
-    qDebug("Downloading: %s",networkUrl.latin1());
-    qDebug("Into: %s",localFileName.latin1());
+    odebug << "Downloading: " << networkUrl << "" << oendl;
+    odebug << "Into: " << localFileName << "" << oendl;
     if( networkUrl.length() > 5) {
         QString ftp_user = "anonymous";
@@ -175,5 +181,5 @@ bool NetworkDialog::downloadFile( QString networkUrl )
 //    ftp_host= networkUrl.mid(networkUrl.find("ftp://",0, TRUE),
         if(ftp_host.length() < 2) {
-            qDebug("Please select an ftp host" );
+            odebug << "Please select an ftp host" << oendl;
             successDownload=false;
             QMessageBox::message("Note","You need to select an ftp host");
@@ -181,6 +187,6 @@ bool NetworkDialog::downloadFile( QString networkUrl )
         }
         QString msg;
-        qDebug(ftp_host);
-        qDebug("Opening ftp connection.");
+        odebug << ftp_host << oendl;
+        odebug << "Opening ftp connection." << oendl;
         warnLabel->setText("connecting to: "+ftp_host );
         qApp->processEvents();
@@ -201,5 +207,5 @@ bool NetworkDialog::downloadFile( QString networkUrl )
             return  false;
         }
-        qDebug("Changing directories.");
+        odebug << "Changing directories." << oendl;
         TextLabel3->setText("Changing directories.");
         qApp->processEvents();
@@ -218,5 +224,5 @@ bool NetworkDialog::downloadFile( QString networkUrl )
 //              return false;
 //      }
-        qDebug("Requesting directory list.");
+        odebug << "Requesting directory list." << oendl;
         TextLabel3->setText("Getting directory list.");
         qApp->processEvents();
@@ -233,5 +239,5 @@ bool NetworkDialog::downloadFile( QString networkUrl )
         if (tmp.open(IO_ReadOnly)) {
             QTextStream t( &tmp );   // use a text stream
-            qDebug("Finding partial filename "+s_partialFileName);
+            odebug << "Finding partial filename "+s_partialFileName << oendl;
             while ( !t.eof()) {
                 s = t.readLine();
@@ -242,13 +248,13 @@ bool NetworkDialog::downloadFile( QString networkUrl )
                     if (str.contains(".txt")) {
                         File_Name = str;
-                        qDebug("Found file_name "+ File_Name);
+                        odebug << "Found file_name "+ File_Name << oendl;
                         break;
                     }
 //                      if (str.contains(".zip")) {
 //                          File_Name = str;
-//                          qDebug("Found file_name "+ File_Name);
+//                          odebug << "Found file_name "+ File_Name << oendl;
 //                          break;
 //                      }
-                    
+
                 }
             }  //end of while loop
@@ -257,5 +263,5 @@ bool NetworkDialog::downloadFile( QString networkUrl )
         }
         else
-            qDebug("Error opening temp file.");
+            odebug << "Error opening temp file." << oendl;
 
         Config cfg("Gutenbrowser");
@@ -264,6 +270,6 @@ bool NetworkDialog::downloadFile( QString networkUrl )
 
         localFileName = temp+File_Name;
-        qDebug("Requesting file "+ File_Name);
-        qDebug( "Saving as "+localFileName);
+        odebug << "Requesting file "+ File_Name << oendl;
+        odebug << "Saving as "+localFileName << oendl;
         msg="Requesting file "+ File_Name;
         TextLabel3->setText(msg);
@@ -273,7 +279,7 @@ bool NetworkDialog::downloadFile( QString networkUrl )
                 fsz = 0;
             QString temp;
-            temp.sprintf( File_Name+" "+" %dkb", fsz); 
+            temp.sprintf( File_Name+" "+" %dkb", fsz);
             TextLabel3->setText(temp);
-            
+
              ProgressBar1->setTotalSteps(fsz);
             FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn);
@@ -294,5 +300,5 @@ bool NetworkDialog::downloadFile( QString networkUrl )
             return false;
         }
-        qDebug("Ftp session successful");
+        odebug << "Ftp session successful" << oendl;
         successDownload=TRUE;
         FtpQuit(conn);
@@ -303,5 +309,5 @@ bool NetworkDialog::downloadFile( QString networkUrl )
 
 void NetworkDialog::doOk() {
-                qWarning("Do OK");
+        owarn << "Do OK" << oendl;
     QString loginStr;
     loginStr = "gutenbrowser";
@@ -315,5 +321,5 @@ void NetworkDialog::doOk() {
             else {
                 successDownload = false;
-                reject(); 
+                reject();
             }
         } else {