1 files changed, 40 insertions, 37 deletions

diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index 4c39569..fe96103 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -16,37 +16,40 @@
 extern "C" {
 #include "../ftplib/ftplib.h"
 }
 
 #include "inputDialog.h"
 
-#include <qmenubar.h>
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/mimetype.h>
+using namespace Opie::Core;
 
 #include <qtextstream.h>
 #include <qpushbutton.h>
 #include <qtoolbutton.h>
 #include <qcombobox.h>
 #include <qlistview.h>
 #include <qlabel.h>
 #include <qprogressbar.h>
 #include <qspinbox.h>
 #include <qtabwidget.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
+#include <qmenubar.h>
 #include <qlineedit.h>
 #include <qlistbox.h>
 #include <qvbox.h>
 
+/* STD */
 #include <unistd.h>
 #include <stdlib.h>
 
-
 QProgressBar *ProgressBar;
 static netbuf *conn=NULL;
 
 static int log_progress(netbuf *, int xfered, void *)
 {
 //    int fsz = *(int *)arg;
@@ -58,13 +61,13 @@ static int log_progress(netbuf *, int xfered, void *)
     return 1;
 }
 
 OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
         : QMainWindow( parent,  name, fl )
 {
-    qDebug("OpieFtp constructor");
+    odebug << "OpieFtp constructor" << oendl; 
     setCaption( tr( "OpieFtp" ) );
     fuckeduphack=FALSE;
 
     QVBox* wrapperBox = new QVBox( this );
     setCentralWidget( wrapperBox );
 
@@ -331,13 +334,13 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
 #endif
     readConfig();
 
 //    ServerComboBox->setCurrentItem(currentServerConfig);
 
     TabWidget->setCurrentPage(2);
-        qDebug("Constructor done");
+        odebug << "Constructor done" << oendl; 
 }
 
 OpieFtp::~OpieFtp()
 {
 }
 
@@ -402,13 +405,13 @@ void OpieFtp::newConnection()
    TabWidget->setCurrentPage(2);
 }
 
 void OpieFtp::serverComboEdited(const QString & )
 {
 //   if(  ServerComboBox->text(currentServerConfig) != edit /*edit.isEmpty() */) {
-//       qDebug("ServerComboEdited");
+//       odebug << "ServerComboEdited" << oendl; 
 //  //        currentServerConfig = -1;
 //      }
 }
 
 void OpieFtp::UsernameComboBoxEdited(const QString &) {
 //        currentServerConfig = -1;
@@ -527,13 +530,13 @@ void OpieFtp::localUpload()
                 ProgressBar->setTotalSteps(fsz);
 
                 FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn);
                 FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn);
                 FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn);
                 FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
-                qDebug("Put: %s, %s",localFile.latin1(),remoteFile.latin1());
+                odebug << "Put: " << localFile.latin1() << ", " << remoteFile.latin1() << "" << oendl; 
 
                 if( !FtpPut( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) {
                     QString msg;
                     msg.sprintf(tr("Unable to upload\n")+"%s",FtpLastResponse(conn));
                     msg.replace(QRegExp(":"),"\n");
                     QMessageBox::message(tr("Note"),msg);
@@ -588,13 +591,13 @@ void OpieFtp::remoteDownload()
 
             ProgressBar->setTotalSteps(fsz);
             FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn);
             FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn);
             FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn);
             FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
-            qDebug("Get: %s, %s",localFile.latin1(),remoteFile.latin1());
+            odebug << "Get: " << localFile.latin1() << ", " << remoteFile.latin1() << "" << oendl; 
 
             if(!FtpGet( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) {
                 QString msg;
                 msg.sprintf(tr("Unable to download \n")+"%s",FtpLastResponse(conn));
                 msg.replace(QRegExp(":"),"\n");
                 QMessageBox::message(tr("Note"),msg);
@@ -617,13 +620,13 @@ bool OpieFtp::remoteDirList(const QString &dir)
 {
     QString tmp = QDir::homeDirPath();
     if(tmp.right(1) != "/")
         tmp+="/._temp";
     else
         tmp+="._temp";
-//    qDebug("Listing remote dir "+tmp);
+//    odebug << "Listing remote dir "+tmp << oendl; 
 //    QCopEnvelope ( "QPE/System", "busy()" );
     if (!FtpDir( tmp.latin1(), dir.latin1(), conn) ) {
         QString msg;
         msg.sprintf(tr("Unable to list the directory\n")+dir+"\n%s",FtpLastResponse(conn) );
         msg.replace(QRegExp(":"),"\n");
         QMessageBox::message(tr("Note"),msg);
@@ -639,13 +642,13 @@ bool OpieFtp::remoteChDir(const QString &dir)
 //    QCopEnvelope ( "QPE/System", "busy()" );
     if (!FtpChdir( dir.latin1(), conn )) {
         QString msg;
         msg.sprintf(tr("Unable to change directories\n")+dir+"\n%s",FtpLastResponse(conn));
         msg.replace(QRegExp(":"),"\n");
         QMessageBox::message(tr("Note"),msg);
-//        qDebug(msg);
+//        odebug << msg << oendl; 
 //        QCopEnvelope ( "QPE/System", "notBusy()" );
         return FALSE;
     }
 //    QCopEnvelope ( "QPE/System", "notBusy()" );
     return TRUE;
 }
@@ -661,26 +664,26 @@ void OpieFtp::populateLocalView()
     const QFileInfoList *list = currentDir.entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
     QFileInfoListIterator it(*list);
     QFileInfo *fi;
     while ( (fi=it.current()) ) {
         if (fi->isSymLink() ){
             QString symLink=fi->readLink();
-         qDebug("Symlink detected "+symLink);
+         odebug << "Symlink detected "+symLink << oendl; 
             QFileInfo sym( symLink);
             fileS.sprintf( "%10i", sym.size() );
             fileL.sprintf( "%s ->  %s",  fi->fileName().data(),sym.absFilePath().data() );
             fileDate = sym.lastModified().toString();
         } else {
-        qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
+        odebug << "Not a dir: "+currentDir.canonicalPath()+fileL << oendl; 
             fileS.sprintf( "%10i", fi->size() );
             fileL.sprintf( "%s",fi->fileName().data() );
             fileDate= fi->lastModified().toString();
             if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) {
                 fileL+="/";
                 isDir=TRUE;
-     qDebug( fileL);
+     odebug << fileL << oendl; 
             }
         }
         if(fileL !="./" && fi->exists()) {
             item = new QListViewItem( Local_View,fileL, fileDate, fileS );
             QPixmap pm;
 
@@ -717,13 +720,13 @@ void OpieFtp::populateLocalView()
     currentPathCombo->lineEdit()->setText( currentDir.canonicalPath() );
     fillCombo( (const QString &)currentDir);
 }
 
 bool OpieFtp::populateRemoteView( )
 {
-//    qDebug("populate remoteview");
+//    odebug << "populate remoteview" << oendl; 
     QString sfile=QDir::homeDirPath();
     if(sfile.right(1) != "/")
         sfile+="/._temp";
     else
         sfile+="._temp";
     QFile file( sfile);
@@ -766,13 +769,13 @@ bool OpieFtp::populateRemoteView( )
         QListViewItem * item1 = new QListViewItem( Remote_View, "../");
         item1->setPixmap( 0, Resource::loadPixmap( "folder" ));
         file.close();
         if( file.exists())
             file. remove();
     } else
-        qDebug("temp file not opened successfully "+sfile);
+        odebug << "temp file not opened successfully "+sfile << oendl; 
     Remote_View->setSorting( 4,TRUE);
     return true;
 }
 
 void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
 {
@@ -785,38 +788,38 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
         if(strItem == "../") { // the user wants to go ^
             if( FtpCDUp( conn) == 0) {
                 QString msg;
                 msg.sprintf(tr("Unable to cd up\n")+"%s",FtpLastResponse(conn));
                 msg.replace(QRegExp(":"),"\n");
                 QMessageBox::message(tr("Note"),msg);
-//                qDebug(msg);
+//                odebug << msg << oendl; 
             }
             char path[256];
             if( FtpPwd( path,sizeof(path),conn) == 0) { //this is easier than fudging the string
                 QString msg;
                 msg.sprintf(tr("Unable to get working dir\n")+"%s",FtpLastResponse(conn));
                 msg.replace(QRegExp(":"),"\n");
                 QMessageBox::message(tr("Note"),msg);
-//                qDebug(msg);
+//                odebug << msg << oendl; 
             }
             currentRemoteDir=path;
         } else {
             if(strItem.find("->",0,TRUE) != -1) { //symlink on some servers
                 strItem=strItem.right( strItem.length() - strItem.find("->",0,TRUE) - 2 );
                 strItem = strItem.stripWhiteSpace();
                 currentRemoteDir = strItem;
                 if( !remoteChDir( (const QString &)strItem)) {
                     currentRemoteDir = oldRemoteCurrentDir;
                     strItem="";
-//                     qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir);
+//                     odebug << "RemoteCurrentDir1 "+oldRemoteCurrentDir << oendl; 
                 }
             } else if(strItem.find("/",0,TRUE) != -1) { // this is a directory
                 if( !remoteChDir( (const QString &)currentRemoteDir + strItem)) {
                     currentRemoteDir = oldRemoteCurrentDir;
                     strItem="";
-//                     qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir);
+//                     odebug << "RemoteCurrentDir1 "+oldRemoteCurrentDir << oendl; 
 
                 } else {
                     currentRemoteDir = currentRemoteDir+strItem;
                 }
             } else {
 //                QCopEnvelope ( "QPE/System", "notBusy()" );
@@ -863,13 +866,13 @@ void OpieFtp::localListClicked(QListViewItem *selectedItem)
                     currentDir.cd(strItem, TRUE);
                     populateLocalView();
                 }
             } else {
                 strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
                 if( QFile::exists(strItem ) ) {
-                      //  qDebug("upload "+strItem);
+                      //  odebug << "upload "+strItem << oendl; 
                     return;
                 }
             } //end not symlink
             chdir(strItem.latin1());
         }
     Local_View->ensureItemVisible(Local_View->firstChild());
@@ -1167,13 +1170,13 @@ void OpieFtp::fillRemoteCombo(const QString &currentPath) {
         }
 }
 
 void OpieFtp::currentPathComboChanged()
 {
     QString  oldRemoteCurrentDir =  currentRemoteDir;
-//    qDebug("oldRemoteCurrentDir "+oldRemoteCurrentDir);
+//    odebug << "oldRemoteCurrentDir "+oldRemoteCurrentDir << oendl; 
     if (TabWidget->currentPageIndex() == 0) {
         if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
             currentDir.setPath( currentPathCombo->lineEdit()->text() );
             populateLocalView();
         } else {
             QMessageBox::message(tr("Note"),tr("That directory does not exist"));
@@ -1213,20 +1216,20 @@ void OpieFtp::readConfig()
 {
     fillCombos();
     Config cfg("opieftp");
     cfg.setGroup("Server");
     currentServerConfig = cfg.readNumEntry("currentServer", -1);
 
-//    qDebug("Reading %d", currentServerConfig);
+//    odebug << "Reading " << currentServerConfig << "" << oendl; 
     serverComboSelected( currentServerConfig-1);
 
 }
 
 void OpieFtp::writeConfig()
 {
-    qDebug("write config");
+    odebug << "write config" << oendl; 
     Config cfg("opieftp");
     cfg.setGroup("Server");
 
     QString username, remoteServerStr, remotePathStr, password, port, temp;
 
     int numberOfEntries = cfg.readNumEntry("numberOfEntries",0);
@@ -1251,13 +1254,13 @@ void OpieFtp::writeConfig()
         cfg.setGroup("Server");
 
         cfg.writeEntry( temp, ServerComboBox->currentText() +":"+PortSpinBox->cleanText() );
         cfg.writeEntry("currentServer", numberOfEntries+1);
 
         currentServerConfig = numberOfEntries+1;
-        qDebug("setting currentserverconfig to %d",        currentServerConfig);
+        odebug << "setting currentserverconfig to " << currentServerConfig << "" << oendl; 
 
         cfg.setGroup(temp);
         if(!newServerName.isEmpty())
             cfg.writeEntry("ServerName", newServerName);
 
         cfg.writeEntry("RemotePath", remotePath->text());
@@ -1270,13 +1273,13 @@ void OpieFtp::writeConfig()
         cfg.writeEntry("numberOfEntries", QString::number(numberOfEntries + 1 ));
 
     }
 }
 
 void OpieFtp::clearCombos() {
-    qDebug("clearing");
+    odebug << "clearing" << oendl; 
     ServerComboBox->clear();
     UsernameComboBox->clear();
     PasswordEdit->clear();
     serverListView->clear();
 }
 
@@ -1289,24 +1292,24 @@ void OpieFtp::fillCombos()
     cfg.setGroup("Server");
     QString username, remoteServerStr, remotePathStr, password, port, temp;
     int numberOfEntries = cfg.readNumEntry("numberOfEntries",0);
 
     for (int i = 1; i <= numberOfEntries; i++) {
         temp.setNum(i);
-        qDebug(temp);
+        odebug << temp << oendl; 
         cfg.setGroup("Server");
         remoteServerStr = cfg.readEntry( temp,"");
-        qDebug( remoteServerStr);
+        odebug << remoteServerStr << oendl; 
 
         int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE);
         port = remoteServerStr.right( divider - 1);
         bool ok;
         PortSpinBox->setValue( port.toInt(&ok,10));
 
         remoteServerStr = remoteServerStr.left(remoteServerStr.length()-divider);
-        qDebug( "remote server string "+remoteServerStr);
+        odebug << "remote server string "+remoteServerStr << oendl; 
         ServerComboBox->insertItem( remoteServerStr );
 
         cfg.setGroup(temp);
 
         username = cfg.readEntry(temp);
         UsernameComboBox->insertItem(username);
@@ -1318,26 +1321,26 @@ void OpieFtp::fillCombos()
 }
 
 
 void OpieFtp::serverComboSelected(int index)
 {
     currentServerConfig = index+1;
-    qDebug("server combo selected %d", index+1);
+    odebug << "server combo selected " << index+1 << "" << oendl; 
     QString username, remoteServerStr, remotePathStr, password, port, temp;
 //    remoteServerStr = ServerComboBox->text(index);
 
     Config cfg("opieftp");
     cfg.setGroup("Server");
 //    int numberOfEntries = cfg.readNumEntry("numberOfEntries",0);
 
     temp.setNum(index+1);
     remoteServerStr = cfg.readEntry( temp,"");
 
-    qDebug("Group" +temp);
+    odebug << "Group" +temp << oendl; 
     cfg.setGroup(temp);
-//    qDebug(temp);
+//    odebug << temp << oendl; 
     int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE);
     port = remoteServerStr.right( divider - 1);
     bool ok;
     int portInt = port.toInt(&ok,10);
     if( portInt == 0) portInt = 21;
 
@@ -1346,26 +1349,26 @@ void OpieFtp::serverComboSelected(int index)
     PortSpinBox->setValue( portInt);
 
     remotePath->setText(cfg.readEntry("RemotePath", "/"));
 
     username =  cfg.readEntry("Username", "anonymous");
     UsernameComboBox->lineEdit()->setText(username);
-    qDebug(username);
-//    qDebug("Password is "+cfg.readEntryCrypt(username, "me@opieftp.org"));
+    odebug << username << oendl; 
+//    odebug << "Password is "+cfg.readEntryCrypt(username << oendl; 
     PasswordEdit->setText(cfg.readEntryCrypt(username, "me@opieftp.org"));
 //   UsernameComboBox
 //        PasswordEdit
 
     cfg.setGroup("Server");
     temp.sprintf("%d",currentServerConfig);
     cfg.writeEntry("currentServer", temp);
 
    fuckeduphack = TRUE;
    serverListView->setCurrentItem( index);
    fuckeduphack=FALSE;
-   qDebug("server list set selected %d",index);
+   odebug << "server list set selected " << index << "" << oendl; 
     update();
 }
 
 void OpieFtp::deleteServer()
 {
     QString username, remoteServerStr, remotePathStr, password, port, temp, servername;
@@ -1388,13 +1391,13 @@ void OpieFtp::deleteServer()
 //             servername.find( cfg.readEntry("ServerName"))  != -1 &&
 //             remoteServerStr.find( cfg.readEntry("RemotePath")) != -1 &&
 //             username.find( cfg.readEntry("Username")) != -1) {
 
             serverListView->removeItem(i);
 
-            qDebug("OK DELETE "+tempname);
+            odebug << "OK DELETE "+tempname << oendl; 
             cfg.removeEntry(QString::number(i));
             for ( ; i <= numberOfEntries; i++) {
                 cfg.setGroup("Server");
                 cfg.writeEntry("Server", QString::number(numberOfEntries + 1 ));
 
                 cfg.setGroup(QString::number(i+1)); //get next server config
@@ -1443,21 +1446,21 @@ void OpieFtp::upDir()
     } else {
         if( FtpCDUp( conn) == 0) {
             QString msg;
             msg.sprintf(tr("Unable to cd up\n")+"%s",FtpLastResponse(conn));
             msg.replace(QRegExp(":"),"\n");
             QMessageBox::message(tr("Note"),msg);
-//                qDebug(msg);
+//                odebug << msg << oendl; 
         }
         char path[256];
         if( FtpPwd( path,sizeof(path),conn) == 0) { //this is easier than fudging the string
             QString msg;
             msg.sprintf(tr("Unable to get working dir\n")+"%s",FtpLastResponse(conn));
             msg.replace(QRegExp(":"),"\n");
             QMessageBox::message(tr("Note"),msg);
-//                qDebug(msg);
+//                odebug << msg << oendl; 
         }
         currentRemoteDir=path;
         remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
         if(currentRemoteDir.right(1) !="/")
             currentRemoteDir +="/";
         currentPathCombo->lineEdit()->setText( currentRemoteDir);
@@ -1512,13 +1515,13 @@ void OpieFtp::NewServer() {
     }
 }
 
 void OpieFtp::serverListClicked( const QString &item) {
     if(item.isEmpty()) return;
     Config cfg("opieftp");
-    qDebug("highltined "+item);
+    odebug << "highltined "+item << oendl; 
     int numberOfEntries = cfg.readNumEntry("numberOfEntries",0);
         for (int i = 1; i <= numberOfEntries; i++) {
             cfg.setGroup(QString::number(i));
               if(cfg.readEntry( "ServerName").find(item) != -1 && !fuckeduphack)
                   serverComboSelected(i-1);
     }