Diffstat (limited to 'noncore/net/opieftp/opieftp.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 77 |
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 @@ -21,3 +21,4 @@ extern "C" { -#include <qmenubar.h> +/* OPIE */ +#include <opie2/odebug.h> #include <qpe/qpeapplication.h> @@ -26,2 +27,3 @@ extern "C" { #include <qpe/mimetype.h> +using namespace Opie::Core; @@ -38,2 +40,3 @@ extern "C" { #include <qmessagebox.h> +#include <qmenubar.h> #include <qlineedit.h> @@ -42,2 +45,3 @@ extern "C" { +/* STD */ #include <unistd.h> @@ -45,3 +49,2 @@ extern "C" { - QProgressBar *ProgressBar; @@ -63,3 +66,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) { - qDebug("OpieFtp constructor"); + odebug << "OpieFtp constructor" << oendl; setCaption( tr( "OpieFtp" ) ); @@ -336,3 +339,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) TabWidget->setCurrentPage(2); - qDebug("Constructor done"); + odebug << "Constructor done" << oendl; } @@ -407,3 +410,3 @@ void OpieFtp::serverComboEdited(const QString & ) // if( ServerComboBox->text(currentServerConfig) != edit /*edit.isEmpty() */) { -// qDebug("ServerComboEdited"); +// odebug << "ServerComboEdited" << oendl; // // currentServerConfig = -1; @@ -532,3 +535,3 @@ void OpieFtp::localUpload() FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn); - qDebug("Put: %s, %s",localFile.latin1(),remoteFile.latin1()); + odebug << "Put: " << localFile.latin1() << ", " << remoteFile.latin1() << "" << oendl; @@ -593,3 +596,3 @@ void OpieFtp::remoteDownload() FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn); - qDebug("Get: %s, %s",localFile.latin1(),remoteFile.latin1()); + odebug << "Get: " << localFile.latin1() << ", " << remoteFile.latin1() << "" << oendl; @@ -622,3 +625,3 @@ bool OpieFtp::remoteDirList(const QString &dir) tmp+="._temp"; -// qDebug("Listing remote dir "+tmp); +// odebug << "Listing remote dir "+tmp << oendl; // QCopEnvelope ( "QPE/System", "busy()" ); @@ -644,3 +647,3 @@ bool OpieFtp::remoteChDir(const QString &dir) QMessageBox::message(tr("Note"),msg); -// qDebug(msg); +// odebug << msg << oendl; // QCopEnvelope ( "QPE/System", "notBusy()" ); @@ -666,3 +669,3 @@ void OpieFtp::populateLocalView() QString symLink=fi->readLink(); - qDebug("Symlink detected "+symLink); + odebug << "Symlink detected "+symLink << oendl; QFileInfo sym( symLink); @@ -672,3 +675,3 @@ void OpieFtp::populateLocalView() } else { - qDebug("Not a dir: "+currentDir.canonicalPath()+fileL); + odebug << "Not a dir: "+currentDir.canonicalPath()+fileL << oendl; fileS.sprintf( "%10i", fi->size() ); @@ -679,3 +682,3 @@ void OpieFtp::populateLocalView() isDir=TRUE; - qDebug( fileL); + odebug << fileL << oendl; } @@ -722,3 +725,3 @@ bool OpieFtp::populateRemoteView( ) { -// qDebug("populate remoteview"); +// odebug << "populate remoteview" << oendl; QString sfile=QDir::homeDirPath(); @@ -771,3 +774,3 @@ bool OpieFtp::populateRemoteView( ) } else - qDebug("temp file not opened successfully "+sfile); + odebug << "temp file not opened successfully "+sfile << oendl; Remote_View->setSorting( 4,TRUE); @@ -790,3 +793,3 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem) QMessageBox::message(tr("Note"),msg); -// qDebug(msg); +// odebug << msg << oendl; } @@ -798,3 +801,3 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem) QMessageBox::message(tr("Note"),msg); -// qDebug(msg); +// odebug << msg << oendl; } @@ -809,3 +812,3 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem) strItem=""; -// qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir); +// odebug << "RemoteCurrentDir1 "+oldRemoteCurrentDir << oendl; } @@ -815,3 +818,3 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem) strItem=""; -// qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir); +// odebug << "RemoteCurrentDir1 "+oldRemoteCurrentDir << oendl; @@ -868,3 +871,3 @@ void OpieFtp::localListClicked(QListViewItem *selectedItem) if( QFile::exists(strItem ) ) { - // qDebug("upload "+strItem); + // odebug << "upload "+strItem << oendl; return; @@ -1172,3 +1175,3 @@ void OpieFtp::currentPathComboChanged() QString oldRemoteCurrentDir = currentRemoteDir; -// qDebug("oldRemoteCurrentDir "+oldRemoteCurrentDir); +// odebug << "oldRemoteCurrentDir "+oldRemoteCurrentDir << oendl; if (TabWidget->currentPageIndex() == 0) { @@ -1218,3 +1221,3 @@ void OpieFtp::readConfig() -// qDebug("Reading %d", currentServerConfig); +// odebug << "Reading " << currentServerConfig << "" << oendl; serverComboSelected( currentServerConfig-1); @@ -1225,3 +1228,3 @@ void OpieFtp::writeConfig() { - qDebug("write config"); + odebug << "write config" << oendl; Config cfg("opieftp"); @@ -1256,3 +1259,3 @@ void OpieFtp::writeConfig() currentServerConfig = numberOfEntries+1; - qDebug("setting currentserverconfig to %d", currentServerConfig); + odebug << "setting currentserverconfig to " << currentServerConfig << "" << oendl; @@ -1275,3 +1278,3 @@ void OpieFtp::writeConfig() void OpieFtp::clearCombos() { - qDebug("clearing"); + odebug << "clearing" << oendl; ServerComboBox->clear(); @@ -1294,6 +1297,6 @@ void OpieFtp::fillCombos() temp.setNum(i); - qDebug(temp); + odebug << temp << oendl; cfg.setGroup("Server"); remoteServerStr = cfg.readEntry( temp,""); - qDebug( remoteServerStr); + odebug << remoteServerStr << oendl; @@ -1305,3 +1308,3 @@ void OpieFtp::fillCombos() remoteServerStr = remoteServerStr.left(remoteServerStr.length()-divider); - qDebug( "remote server string "+remoteServerStr); + odebug << "remote server string "+remoteServerStr << oendl; ServerComboBox->insertItem( remoteServerStr ); @@ -1323,3 +1326,3 @@ 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; @@ -1334,5 +1337,5 @@ void OpieFtp::serverComboSelected(int index) - qDebug("Group" +temp); + odebug << "Group" +temp << oendl; cfg.setGroup(temp); -// qDebug(temp); +// odebug << temp << oendl; int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE); @@ -1351,4 +1354,4 @@ void OpieFtp::serverComboSelected(int index) 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")); @@ -1364,3 +1367,3 @@ void OpieFtp::serverComboSelected(int index) fuckeduphack=FALSE; - qDebug("server list set selected %d",index); + odebug << "server list set selected " << index << "" << oendl; update(); @@ -1393,3 +1396,3 @@ void OpieFtp::deleteServer() - qDebug("OK DELETE "+tempname); + odebug << "OK DELETE "+tempname << oendl; cfg.removeEntry(QString::number(i)); @@ -1448,3 +1451,3 @@ void OpieFtp::upDir() QMessageBox::message(tr("Note"),msg); -// qDebug(msg); +// odebug << msg << oendl; } @@ -1456,3 +1459,3 @@ void OpieFtp::upDir() QMessageBox::message(tr("Note"),msg); -// qDebug(msg); +// odebug << msg << oendl; } @@ -1517,3 +1520,3 @@ void OpieFtp::serverListClicked( const QString &item) { Config cfg("opieftp"); - qDebug("highltined "+item); + odebug << "highltined "+item << oendl; int numberOfEntries = cfg.readNumEntry("numberOfEntries",0); |