Fix up depends on LIBOPIE1

Proper signature for signal and slots and namespaces

5 files changed, 10 insertions, 12 deletions

diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index a694b70..6d41ac3 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -1,132 +1,132 @@
 /***************************************************************************

    AdvancedFm.cpp

   -------------------

   ** Created: Sat Mar 9 23:33:09 2002

     copyright            : (C) 2002 by ljp

     email               : ljp@llornkcor.com

     *   This program is free software; you can redistribute it and/or modify  *

     *   it under the terms of the GNU General Public License as published by  *

     *   the Free Software Foundation; either version 2 of the License, or     *

     *   (at your option) any later version.                                   *

     ***************************************************************************/

 #include "advancedfm.h"

 #include "output.h"

 #include "filePermissions.h"

 

 #include <qpe/lnkproperties.h>

 #include <qpe/qpeapplication.h>

 #include <qpe/applnk.h>

 

 #include <qmessagebox.h>

 

 

 #include <qpopupmenu.h>

 #include <qlistview.h>

 

 #include <errno.h>

 #include <stdlib.h>

 #include <unistd.h>

 #include <sys/stat.h>

 #include <dirent.h>

 #include <sys/sendfile.h>

 #include <fcntl.h>

 

 

-using namespace Opie::Core;
-using namespace Opie::Core;
+using namespace Opie::Core;

+using namespace Opie::Core;

 void AdvancedFm::doDirChange() {

    QString pathItem = CurrentView()->currentItem()->text(0);

    if( pathItem == "../") {

       ListClicked( CurrentView()->currentItem());

    } else {

       if( pathItem.find(" -> ",0,TRUE) != -1)

          pathItem = dealWithSymName((const QString&)pathItem)+"/";

 //      qWarning(pathItem);

       gotoDirectory( CurrentDir()->path()+"/"+pathItem.left( pathItem.length() - 1) );

    }

 }

 

 void AdvancedFm::showMenuHidden() {

   if (b) {

       CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);

       OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);

       fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);

     } else {

       CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);

       OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);

       fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);

     }

      b = !b;

          populateView();

 }

 

 void AdvancedFm::showHidden() {

   if (b) {

       CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);

       OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);

     }  else {

       CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);

       OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);

     }

          populateView();

 }

 

 QString AdvancedFm::dealWithSymName(const QString &fileName) {

    QString strItem = fileName;

    return  strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);

 }

 

 void AdvancedFm::runThis() {

    if( !CurrentView()->currentItem()) return;

   QString fs;

   QDir *thisDir = CurrentDir();

 

   QString curFile = CurrentView()->currentItem()->text(0);

   QString path = thisDir->canonicalPath();

 

   if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 )  //if symlink

 

     curFile = dealWithSymName((const QString&)curFile);

 

   if(curFile != "../") {

 

       fs = getFileSystemType((const QString &) path);

       QFileInfo fileInfo( path  + "/" + curFile);

 //      qDebug( fileInfo.owner());

 

       if( (fileInfo.permission( QFileInfo::ExeUser)

            | fileInfo.permission( QFileInfo::ExeGroup)

            | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) {

           | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {

         QCopEnvelope e("QPE/System", "execute(QString)" );

         e << curFile;

       } else {

           curFile =  path + "/" + curFile;

           DocLnk nf(curFile);

           QString execStr = nf.exec();

 //          qDebug( execStr);

           if( execStr.isEmpty() ) {

             } else {

               nf.execute();

             }

         }

     }

 }

 

 void AdvancedFm::runText() {

    if( !CurrentView()->currentItem()) return;

   QString curFile = CurrentView()->currentItem()->text(0);

   if(curFile != "../") {

       if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 )  //if symlink

         curFile = dealWithSymName((const QString&)curFile);

       curFile =  CurrentDir()->canonicalPath()+"/"+curFile;

       QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );

       e << curFile;

     }

 }

 

 void AdvancedFm::makeDir() {

   InputDialog *fileDlg;

   fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);

   fileDlg->exec();

   if( fileDlg->result() == 1 ) {

@@ -612,196 +612,196 @@ void AdvancedFm::runCommandStd() {
    }

 }

 

 void AdvancedFm::fileStatus() {

    if( !CurrentView()->currentItem()) return;

    QString curFile;

    curFile = CurrentView()->currentItem()->text(0);

 

    QStringList command;

    command << "/bin/sh";

    command << "-c";

    command << "stat -l "+ curFile;

 

    Output *outDlg;

    outDlg = new Output( command, this, tr("AdvancedFm Output"), true);

    QPEApplication::execDialog( outDlg );

    qApp->processEvents();

 }

 

 

 void AdvancedFm::mkDir() {

     makeDir();

 }

 

 void AdvancedFm::rn() {

   renameIt();

 }

 

 void AdvancedFm::del() {

     doDelete();

 }

 

 void AdvancedFm::mkSym() {

   QString cmd;

   QStringList curFileList = getPath();

   if( curFileList.count() > 0) {

       QDir *thisDir = CurrentDir();

       QDir * thatDir = OtherDir();

 

       for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {

 

           QString destName = thatDir->canonicalPath()+"/"+(*it);

           if(destName.right(1) == "/") {

               destName = destName.left( destName.length() -1);

             }

 

           QString curFile =  thisDir->canonicalPath()+"/"+(*it);

 

           if( curFile.right(1) == "/") {

               curFile = curFile.left( curFile.length() -1);

             }

 

           cmd = "ln -s "+curFile+" "+destName;

 //          qDebug(cmd);

           startProcess( (const QString)cmd );

         }

             rePopulate();

             setOtherTabCurrent();

     }

 }

 

 void AdvancedFm::doBeam() {

    Ir ir;

    if(!ir.supported())  {

    } else {

       QStringList curFileList = getPath();

       if( curFileList.count() > 0)  {

          for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {

             QString curFile = (*it);

             QString curFilePath =  CurrentDir()->canonicalPath()+"/"+curFile;

             if( curFilePath.right(1) == "/") {

                curFilePath = curFilePath.left( curFilePath.length() -1);

             }

             Ir *file = new Ir(this, "IR");

             connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished(Ir*)));

             file->send( curFilePath, curFile );

          }

       }

    }

 }

 

 void AdvancedFm::fileBeamFinished( Ir *) {

   QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") );

 }

 

 void AdvancedFm::selectAll() {

   QListView *thisView = CurrentView();

   thisView->selectAll(true);

   thisView->setSelected( thisView->firstChild(),false);

 }

 

 void AdvancedFm::startProcess(const QString & cmd) {

   QStringList command;

   OProcess *process;

   process = new OProcess();

   connect(process, SIGNAL(processExited(Opie::Core::OProcess*)),

-          this, SLOT( processEnded(OProcess*)));

+          this, SLOT( processEnded(Opie::Core::OProcess*)));

 

   connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)),

-            this, SLOT( oprocessStderr(OProcess*,char*,int)));

+          this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int)));

 

   command << "/bin/sh";

   command << "-c";

   command << cmd.latin1();

   *process << command;

   if(!process->start(OProcess::NotifyOnExit, OProcess::All) )

     qDebug("could not start process");

 }

 

 void AdvancedFm::processEnded(OProcess *) {

             rePopulate();

 }

 

 void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) {

 //    qWarning("received stderrt %d bytes", buflen);

 

     QString lineStr = buffer;

     QMessageBox::warning( this, tr("Error"), lineStr ,tr("Ok") );

 }

 

 bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {

   if ( o->inherits( "QLineEdit" ) )  {

       if ( e->type() == QEvent::KeyPress ) {

           QKeyEvent *ke = (QKeyEvent*)e;

           if ( ke->key() == Key_Return ||

                ke->key() == Key_Enter )  {

               okRename();

               return true;

             }

           else if ( ke->key() == Key_Escape ) {

                 cancelRename();

                 return true;

               }

         }

       else if ( e->type() == QEvent::FocusOut ) {

             cancelRename();

             return true;

           }

     }

    if ( o->inherits( "QListView" ) ) {

        if ( e->type() == QEvent::FocusIn ) {

           if( o == Local_View) { //keep track of which view

              whichTab=1;

           }

           else {

              whichTab=2;

           }

        }

        OtherView()->setSelected( OtherView()->currentItem(), FALSE );//make sure there's correct selection

      }

 

   return QWidget::eventFilter( o, e );

 }

 

 

 void AdvancedFm::cancelRename() {

 //  qDebug("cancel rename");

   QListView * view;

   view = CurrentView();

 

   bool resetFocus = view->viewport()->focusProxy() == renameBox;

   delete renameBox;

   renameBox = 0;

   if ( resetFocus ) {

       view->viewport()->setFocusProxy( view);

       view->setFocus();

     }

 }

 

 void AdvancedFm::doRename(QListView * view) {

    if( !CurrentView()->currentItem()) return;

 

     QRect r = view->itemRect( view->currentItem( ));

     r = QRect( view->viewportToContents( r.topLeft() ), r.size() );

     r.setX( view->contentsX() );

 

         if ( r.width() > view->visibleWidth() )

         r.setWidth( view->visibleWidth() );

 

     renameBox = new QLineEdit( view->viewport(), "qt_renamebox" );

     renameBox->setFrame(true);

 

     renameBox->setText(  view->currentItem()->text(0) );

 

     renameBox->selectAll();

     renameBox->installEventFilter( this );

 

     view->addChild( renameBox, r.x(), r.y() );

 

         renameBox->resize( r.size() );

 

         view->viewport()->setFocusProxy( renameBox );

 

         renameBox->setFocus();

     renameBox->show();

 }

diff --git a/noncore/apps/advancedfm/output.cpp b/noncore/apps/advancedfm/output.cpp
index 16a0992..6906298 100644
--- a/noncore/apps/advancedfm/output.cpp
+++ b/noncore/apps/advancedfm/output.cpp
@@ -54,196 +54,196 @@ static char * filesave_xpm[] = {
 "3  c #2C2C2C",
 "4  c #7C7C7C",
 "5  c #F6F6F6",
 "6  c #FCFCFC",
 "7  c #6B6B6B",
 "8  c #959595",
 "9  c #4F4F4F",
 "0  c #808080",
 "a  c #767676",
 "b  c #818181",
 "c  c #B8B8B8",
 "d  c #FBFBFB",
 "e  c #F9F9F9",
 "f  c #CCCCCC",
 "g  c #030303",
 "h  c #737373",
 "i  c #7A7A7A",
 "j  c #7E7E7E",
 "k  c #6A6A6A",
 "l  c #FAFAFA",
 "m  c #505050",
 "n  c #9D9D9D",
 "o  c #333333",
 "p  c #7B7B7B",
 "q  c #787878",
 "r  c #696969",
 "s  c #494949",
 "t  c #555555",
 "u  c #949494",
 "v  c #E6E6E6",
 "w  c #424242",
 "x  c #515151",
 "y  c #535353",
 "z  c #3E3E3E",
 "A  c #D4D4D4",
 "B  c #0C0C0C",
 "C  c #353535",
 "D  c #474747",
 "E  c #ECECEC",
 "F  c #919191",
 "G  c #7D7D7D",
 "H  c #000000",
 "I  c #404040",
 "J  c #858585",
 "K  c #323232",
 "L  c #D0D0D0",
 "M  c #1C1C1C",
 "    ...+        ",
 "   @#$%&..+     ",
 "   .*=-;;>,..+  ",
 "  ')!~;;;;;;{]..",
 "  ^/(-;;;;;;;_:<",
 "  [}|;;;;;;;{12$",
 " #34-55;;;;678$+",
 " 90ab=c;dd;e1fg ",
 " [ahij((kbl0mn$ ",
 " op^q^^7r&]s/$+ ",
 "@btu;vbwxy]zAB  ",
 "CzDEvEv;;DssF$  ",
 "G.H{E{E{IxsJ$+  ",
 "  +...vEKxzLM   ",
 "     +...z]n$   ",
 "        +...    "};
 
 Output::Output( const QStringList commands, QWidget* parent,  const char* name, bool modal, WFlags fl)
     : QDialog( parent, name, modal, fl )
 {
    QStringList cmmds;
 //   cmmds=QStringList::split( " ", commands, false);
    cmmds=commands;
 //   qDebug("count %d", cmmds.count());
    if ( !name )
        setName( tr("Output"));
     resize( 196, 269 );
     setCaption( name );
 
     OutputLayout = new QGridLayout( this );
     OutputLayout->setSpacing( 2);
     OutputLayout->setMargin( 2);
 
     QPushButton *docButton;
      docButton = new QPushButton(  QPixmap(( const char** ) filesave_xpm  ) ,"",this,"saveButton");
      docButton->setFixedSize( QSize( 20, 20 ) );
      connect( docButton,SIGNAL(released()),this,SLOT( saveOutput() ));
  //    docButton->setFlat(TRUE);
      OutputLayout->addMultiCellWidget( docButton, 0,0,3,3 );
 
     OutputEdit = new QMultiLineEdit( this, "OutputEdit" );
     OutputLayout->addMultiCellWidget( OutputEdit, 1,1,0,3 );
 
     proc = new OProcess();
 
     connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)),
             this, SLOT( processFinished()));
 
     connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
-            this, SLOT(commandStdout(OProcess*,char*,int)));
+            this, SLOT(commandStdout(Opie::Core::OProcess*,char*,int)));
 
     connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
-            this, SLOT(commandStderr(OProcess*,char*,int)));
+            this, SLOT(commandStderr(Opie::Core::OProcess*,char*,int)));
 
 //     connect( , SIGNAL(received(const QByteArray&)),
 //             this, SLOT(commandStdin(const QByteArray&)));
 
 //    * proc << commands.latin1();
       for ( QStringList::Iterator it = cmmds.begin(); it != cmmds.end(); ++it ) {
          qDebug( "%s", (*it).latin1() );
          * proc << (*it).latin1();
       }
 
      if(!proc->start(OProcess::NotifyOnExit, OProcess::All)) {
 
          OutputEdit->append(tr("Process could not start") );
          OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE);
          perror("Error: ");
          QString errorMsg=tr("Error\n")+(QString)strerror(errno);
          OutputEdit->append( errorMsg);
          OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE);
      }
 }
 
 Output::~Output() {
 }
 
 void Output::saveOutput() {
 
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Save output to file (name only)"),TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
       QString  filename = QPEApplication::documentDir();
       if(filename.right(1).find('/') == -1)
           filename+="/";
       QString name = fileDlg->LineEdit1->text();
       filename+="text/plain/"+name;
       qDebug(filename);
 
       QFile f(filename);
       f.open( IO_WriteOnly);
       if( f.writeBlock( OutputEdit->text(), qstrlen( OutputEdit->text()) ) != -1) {
           DocLnk lnk;
           lnk.setName(name); //sets file name
           lnk.setFile(filename); //sets File property
           lnk.setType("text/plain");
           if(!lnk.writeLink()) {
               qDebug("Writing doclink did not work");
           }
       } else
           qWarning("Could not write file");
       f.close();
     }
 }
 
 void Output::commandStdout(OProcess*, char *buffer, int buflen) {
     qWarning("received stdout %d bytes", buflen);
 
 //     QByteArray data(buflen);
 //     data.fill(*buffer, buflen);
 //     for (uint i = 0; i < data.count(); i++ ) {
 //         printf("%c", buffer[i] );
 //     }
 //     printf("\n");
 
     QString lineStr = buffer;
     lineStr=lineStr.left(lineStr.length()-1);
     OutputEdit->append(lineStr);
     OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE);
 }
 
 
 void Output::commandStdin( const QByteArray &data) {
     qWarning("received stdin  %d bytes", data.size());
     // recieved data from the io layer goes to sz
     proc->writeStdin(data.data(), data.size());
 }
 
 void Output::commandStderr(OProcess*, char *buffer, int buflen) {
     qWarning("received stderrt %d bytes", buflen);
 
     QString lineStr = buffer;
 //    lineStr=lineStr.left(lineStr.length()-1);
     OutputEdit->append(lineStr);
     OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE);
 }
 
 void Output::processFinished() {
 
     delete proc;
     OutputEdit->append( tr("\nFinished\n") );
     OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE);
 //    close();
 //     disconnect( layer(), SIGNAL(received(const QByteArray&)),
 //                this, SLOT(commandStdin(const QByteArray&)));
 }
 
 //==============================
diff --git a/noncore/apps/opie-console/io_bt.cpp b/noncore/apps/opie-console/io_bt.cpp
index 35a328f..a29fa8e 100644
--- a/noncore/apps/opie-console/io_bt.cpp
+++ b/noncore/apps/opie-console/io_bt.cpp
@@ -1,94 +1,93 @@
 
 #include "io_bt.h"
 
 using namespace Opie::Core;
-using namespace Opie::Core;
 IOBt::IOBt( const Profile &config ) : IOSerial( config ) {
     m_attach = 0;
 }
 
 
 IOBt::~IOBt() {
     if ( m_attach ) {
         delete m_attach;
     }
 }
 
 
 void IOBt::close() {
 
     IOSerial::close();
     // still need error handling
     if ( m_attach ) {
         delete m_attach;
         m_attach = 0;
     }
 }
 
 bool IOBt::open() {
     bool ret = false;
 
     // only set up bt stuff if mac address was set, otherwise use the device set
     if ( !m_mac.isEmpty() ) {
 
         // now it should also be checked, if there is a connection to the device with that mac allready
         // hciattach here
         m_attach = new OProcess();
         *m_attach << "hciattach /dev/ttyS2 any 57600";
 
         // then start hcid, then rcfomm handling (m_mac)
 
         connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ),
-                 this, SLOT( slotExited(OProcess*) ) );
+                 this, SLOT( slotExited(Opie::Core::OProcess*) ) );
 
         if ( m_attach->start() ) {
             ret = IOSerial::open();
         } else {
             qWarning("could not attach to device");
             delete m_attach;
             m_attach = 0;
         }
     } else {
         // directly to the normal serial
         // TODO: look first if the connection really exists. ( is set up )
 
         ret =IOSerial::open();
     }
     return ret;
 }
 
 void IOBt::reload( const Profile &config ) {
     m_device = config.readEntry("Device", BT_DEFAULT_DEVICE);
     m_mac = config.readEntry("Mac", BT_DEFAULT_MAC);
     m_baud = config.readNumEntry("Baud", BT_DEFAULT_BAUD);
     m_parity = config.readNumEntry("Parity", BT_DEFAULT_PARITY);
     m_dbits = config.readNumEntry("DataBits", BT_DEFAULT_DBITS);
     m_sbits = config.readNumEntry("StopBits", BT_DEFAULT_SBITS);
     m_flow = config.readNumEntry("Flow", BT_DEFAULT_FLOW);
 }
 
 
 QString IOBt::identifier() const {
     return "bluetooth";
 }
 
 QString IOBt::name() const {
     return "BLuetooth IO Layer";
 }
 
 void IOBt::slotExited( OProcess* proc ){
     close();
     delete proc;
 }
 
 QBitArray IOBt::supports() const {
     return QBitArray( 3 );
 }
 
 bool IOBt::isConnected() {
     return false;
 }
 
 void IOBt::send(const QByteArray &data) {
     qDebug( "Please overload me..." );
 }
diff --git a/noncore/apps/opie-console/io_irda.cpp b/noncore/apps/opie-console/io_irda.cpp
index ba0b0e5..07c2b62 100644
--- a/noncore/apps/opie-console/io_irda.cpp
+++ b/noncore/apps/opie-console/io_irda.cpp
@@ -1,79 +1,78 @@
 
 #include "io_irda.h"
 
 using namespace Opie::Core;
-using namespace Opie::Core;
 IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) {
     m_attach = 0;
 }
 
 
 IOIrda::~IOIrda() {
     if ( m_attach ) {
         delete m_attach;
     }
 }
 
 
 void IOIrda::close() {
 
     IOSerial::close();
     // still need error handling
     delete m_attach;
 }
 
 bool IOIrda::open() {
     bool ret;
 
     // irdaattach here
     m_attach = new OProcess();
     *m_attach << "irattach /dev/ttyS2 -s";
 
     connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ),
-            this, SLOT( slotExited(OProcess*) ) );
+             this, SLOT( slotExited(Opie::Core::OProcess*) ) );
 
     if ( m_attach->start() ) {
         ret= IOSerial::open();
     } else {
     // emit error!!!
         qWarning("could not attach to device");
         delete m_attach;
 	m_attach = 0l;
     }
     return ret;
 }
 
 void IOIrda::reload( const Profile &config ) {
     m_device = config.readEntry("Device", IRDA_DEFAULT_DEVICE);
     m_baud = config.readNumEntry("Baud", IRDA_DEFAULT_BAUD);
     m_parity = config.readNumEntry("Parity", IRDA_DEFAULT_PARITY);
     m_dbits = config.readNumEntry("DataBits", IRDA_DEFAULT_DBITS);
     m_sbits = config.readNumEntry("StopBits", IRDA_DEFAULT_SBITS);
     m_flow = config.readNumEntry("Flow", IRDA_DEFAULT_FLOW);
 }
 
 
 QString IOIrda::identifier() const {
     return "irda";
 }
 
 QString IOIrda::name() const {
     return "Irda IO Layer";
 }
 
 void IOIrda::slotExited(OProcess* proc ){
     close();
     delete proc;
 }
 
 QBitArray IOIrda::supports()const {
     return QBitArray( 3 );
 }
 
 bool IOIrda::isConnected() {
     return false;
 }
 
 void IOIrda::send(const QByteArray &data) {
     qDebug( "Please overload me..." );
 }
diff --git a/noncore/apps/opie-console/sz_transfer.cpp b/noncore/apps/opie-console/sz_transfer.cpp
index 5958e93..fbc5306 100644
--- a/noncore/apps/opie-console/sz_transfer.cpp
+++ b/noncore/apps/opie-console/sz_transfer.cpp
@@ -1,86 +1,86 @@
 
 #include "sz_transfer.h"
 #include <qfile.h>
 #include <stdio.h>
 #include <sys/termios.h>
 
 
 
 using namespace Opie::Core;
 using namespace Opie::Core;
 SzTransfer::SzTransfer(Type t, IOLayer *layer) : FileTransferLayer(layer), m_t(t)
 {
 }
 
 SzTransfer::~SzTransfer() {
 }
 
 void SzTransfer::sendFile(const QFile& file) {
 
     sendFile(file.name());
 }
 
 void SzTransfer::sendFile(const QString& file) {
 
     //setcbreak(2); /* raw no echo */
 
     proc = new OProcess;
     *proc << "sz";
     *proc << "-v" << "-v" << "-b" << file;
     connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)),
             this, SLOT(sent()));
     connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
-            this, SLOT(SzReceivedStdout(OProcess*,char*,int)));
+            this, SLOT(SzReceivedStdout(Opie::Core::OProcess*,char*,int)));
     connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
-            this, SLOT(SzReceivedStderr(OProcess*,char*,int)));
+            this, SLOT(SzReceivedStderr(Opie::Core::OProcess*,char*,int)));
     connect(layer(), SIGNAL(received(const QByteArray&)),
             this, SLOT(receivedStdin(const QByteArray&)));
     proc->start(OProcess::NotifyOnExit, OProcess::All);
 
 }
 
 void SzTransfer::SzReceivedStdout(OProcess *, char *buffer, int buflen) {
 
     qWarning("recieved from sz on stdout %d bytes", buflen);
 
     QByteArray data(buflen);
     data.fill(*buffer, buflen);
     for (uint i = 0; i < data.count(); i++ ) {
         printf("%c", buffer[i] );
     }
     printf("\n");
 
     // send out through the io layer
     layer()->send(data);
 }
 
 void SzTransfer::SzReceivedStderr(OProcess *, char *buffer, int length) {
 
     // parse and show data in a progress dialog/widget
     printf("stderr:\n");
     //for (int i = 0; i < length; i++)
     //    printf("%c", buffer[i]);
     //printf("\n");
 }
 
 void SzTransfer::receivedStdin(const QByteArray &data) {
 
     qWarning("recieved from io_serial %d bytes", data.size());
 
     // recieved data from the io layer goes to sz
     proc->writeStdin(data.data(), data.size());
 
 }
 
 void SzTransfer::sent() {
 
     qWarning("sent file");
 
     //setcbreak(0); /* default */
 
 
     delete proc;
     disconnect(layer(), SIGNAL(received(const QByteArray&)),
             this, SLOT(receivedStdin(const QByteArray&)));
 
 }