1 files changed, 208 insertions, 208 deletions

diff --git a/noncore/apps/opie-console/transferdialog.cpp b/noncore/apps/opie-console/transferdialog.cpp
index 55dd748..30e7caf 100644
--- a/noncore/apps/opie-console/transferdialog.cpp
+++ b/noncore/apps/opie-console/transferdialog.cpp
@@ -10,3 +10,3 @@
 
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
 
@@ -21,71 +21,71 @@ TransferDialog::TransferDialog(QWidget *parent, MainWindow *mainwindow, const ch
     m_lay = 0l;
-        m_recvlay = 0l;
-        QVBoxLayout *vbox, *vbox2;
-        QHBoxLayout *hbox, *hbox2, *hbox3;
-        QLabel *file, *mode, *progress, *status;
-        QButtonGroup *group;
-        QRadioButton *mode_send, *mode_receive;
-
-        m_autocleanup = 0;
-        m_running = true;
-
-        group = new QButtonGroup(QObject::tr("Transfer mode"), this);
-        mode_send = new QRadioButton(QObject::tr("Send"), group);
-        mode_receive = new QRadioButton(QObject::tr("Receive"), group);
-        group->insert(mode_send, id_send);
-        group->insert(mode_receive, id_receive);
-        vbox2 = new QVBoxLayout(group, 2);
-        vbox2->addSpacing(10);
-        hbox3 = new QHBoxLayout(vbox2, 2);
-        hbox3->add(mode_send);
-        hbox3->add(mode_receive);
-        mode_send->setChecked(true);
-        m_transfermode = id_send;
-
-        file = new QLabel(QObject::tr("Send file"), this);
-        mode = new QLabel(QObject::tr("Transfer protocol"), this);
-        progress = new QLabel(QObject::tr("Progress"), this);
-        status = new QLabel(QObject::tr("Status"), this);
-
-        statusbar = new QLabel(QObject::tr("Ready"), this);
-        statusbar->setFrameStyle(QFrame::Panel | QFrame::Sunken);
-
-        protocol = new QComboBox(this);
-        QStringList list = m_win->factory()->fileTransferLayers();
-        for (QStringList::Iterator it = list.begin(); it != list.end(); ++it)
-                protocol->insertItem((*it));
-
-        filename = new QLineEdit(this);
-
-        progressbar = new QProgressBar(this);
-        progressbar->setProgress(0);
-
-        selector = new QPushButton("...", this);
-        ok = new QPushButton(QObject::tr("Start transfer"), this);
-        cancel = new QPushButton(QObject::tr("Cancel"), this);
-
-        vbox = new QVBoxLayout(this, 2);
-        vbox->add(group);
-        vbox->add(file);
-        hbox = new QHBoxLayout(vbox, 0);
-        hbox->add(filename);
-        hbox->add(selector);
-        vbox->add(mode);
-        vbox->add(protocol);
-        vbox->add(progress);
-        vbox->add(progressbar);
-        vbox->add(status);
-        vbox->add(statusbar);
-        vbox->addStretch(1);
-        hbox2 = new QHBoxLayout(vbox, 2);
-        hbox2->add(ok);
-        hbox2->add(cancel);
-
-        setCaption(QObject::tr("File transfer"));
-        show();
-
-        connect(selector, SIGNAL(clicked()), SLOT(slotFilename()));
-        connect(ok, SIGNAL(clicked()), SLOT(slotTransfer()));
-        connect(cancel, SIGNAL(clicked()), SLOT(slotCancel()));
-        connect(group, SIGNAL(clicked(int)), SLOT(slotMode(int)));
+    m_recvlay = 0l;
+    QVBoxLayout *vbox, *vbox2;
+    QHBoxLayout *hbox, *hbox2, *hbox3;
+    QLabel *file, *mode, *progress, *status;
+    QButtonGroup *group;
+    QRadioButton *mode_send, *mode_receive;
+
+    m_autocleanup = 0;
+    m_running = true;
+
+    group = new QButtonGroup(QObject::tr("Transfer mode"), this);
+    mode_send = new QRadioButton(QObject::tr("Send"), group);
+    mode_receive = new QRadioButton(QObject::tr("Receive"), group);
+    group->insert(mode_send, id_send);
+    group->insert(mode_receive, id_receive);
+    vbox2 = new QVBoxLayout(group, 2);
+    vbox2->addSpacing(10);
+    hbox3 = new QHBoxLayout(vbox2, 2);
+    hbox3->add(mode_send);
+    hbox3->add(mode_receive);
+    mode_send->setChecked(true);
+    m_transfermode = id_send;
+
+    file = new QLabel(QObject::tr("Send file"), this);
+    mode = new QLabel(QObject::tr("Transfer protocol"), this);
+    progress = new QLabel(QObject::tr("Progress"), this);
+    status = new QLabel(QObject::tr("Status"), this);
+
+    statusbar = new QLabel(QObject::tr("Ready"), this);
+    statusbar->setFrameStyle(QFrame::Panel | QFrame::Sunken);
+
+    protocol = new QComboBox(this);
+    QStringList list = m_win->factory()->fileTransferLayers();
+    for (QStringList::Iterator it = list.begin(); it != list.end(); ++it)
+        protocol->insertItem((*it));
+
+    filename = new QLineEdit(this);
+
+    progressbar = new QProgressBar(this);
+    progressbar->setProgress(0);
+
+    selector = new QPushButton("...", this);
+    ok = new QPushButton(QObject::tr("Start transfer"), this);
+    cancel = new QPushButton(QObject::tr("Cancel"), this);
+
+    vbox = new QVBoxLayout(this, 2);
+    vbox->add(group);
+    vbox->add(file);
+    hbox = new QHBoxLayout(vbox, 0);
+    hbox->add(filename);
+    hbox->add(selector);
+    vbox->add(mode);
+    vbox->add(protocol);
+    vbox->add(progress);
+    vbox->add(progressbar);
+    vbox->add(status);
+    vbox->add(statusbar);
+    vbox->addStretch(1);
+    hbox2 = new QHBoxLayout(vbox, 2);
+    hbox2->add(ok);
+    hbox2->add(cancel);
+
+    setCaption(QObject::tr("File transfer"));
+    show();
+
+    connect(selector, SIGNAL(clicked()), SLOT(slotFilename()));
+    connect(ok, SIGNAL(clicked()), SLOT(slotTransfer()));
+    connect(cancel, SIGNAL(clicked()), SLOT(slotCancel()));
+    connect(group, SIGNAL(clicked(int)), SLOT(slotMode(int)));
 }
@@ -98,6 +98,6 @@ void TransferDialog::slotFilename()
 {
-        QString f;
+    QString f;
 
-        f = OFileDialog::getOpenFileName(0);
-        if(!f.isNull()) filename->setText(f);
+    f = Opie::OFileDialog::getOpenFileName(0);
+    if(!f.isNull()) filename->setText(f);
 }
@@ -106,38 +106,38 @@ void TransferDialog::slotTransfer()
 {
-        if((m_transfermode == id_send) && (filename->text().isEmpty()))
-        {
-                QMessageBox::information(this,
-                        QObject::tr("Attention"),
-                        QObject::tr("No file has been specified."));
-                return;
-        }
-
-        ok->setEnabled(false);
-
-        cleanup();
-        m_autocleanup = 0;
-
-        if(m_transfermode == id_send) statusbar->setText(QObject::tr("Sending..."));
-        else statusbar->setText(QObject::tr("Receiving..."));
-
-        if(m_transfermode == id_send)
-        {
-                m_lay = m_win->factory()->newFileTransfer(protocol->currentText(), m_win->currentSession()->layer());
-                m_lay->sendFile(filename->text());
-
-                connect(m_lay, SIGNAL(progress(const QString&, int, int, int, int, int)),
-                        SLOT(slotProgress(const QString&, int, int, int, int, int)));
-                connect(m_lay, SIGNAL(error(int, const QString&)), SLOT(slotError(int, const QString&)));
-                connect(m_lay, SIGNAL(sent()), SLOT(slotSent()));
-        }
-        else
-        {
-                m_recvlay = m_win->factory()->newReceive(protocol->currentText(), m_win->currentSession()->layer());
-                m_recvlay->receive();
-
-                connect(m_recvlay, SIGNAL(progress(const QString&, int, int, int, int, int)),
-                        SLOT(slotProgress(const QString&, int, int, int, int, int)));
-                connect(m_recvlay, SIGNAL(error(int, const QString&)), SLOT(slotError(int, const QString&)));
-                connect(m_recvlay, SIGNAL(received(const QString&)), SLOT(slotReceived(const QString&)));
-        }
+    if((m_transfermode == id_send) && (filename->text().isEmpty()))
+    {
+        QMessageBox::information(this,
+            QObject::tr("Attention"),
+            QObject::tr("No file has been specified."));
+        return;
+    }
+
+    ok->setEnabled(false);
+
+    cleanup();
+    m_autocleanup = 0;
+
+    if(m_transfermode == id_send) statusbar->setText(QObject::tr("Sending..."));
+    else statusbar->setText(QObject::tr("Receiving..."));
+
+    if(m_transfermode == id_send)
+    {
+        m_lay = m_win->factory()->newFileTransfer(protocol->currentText(), m_win->currentSession()->layer());
+        m_lay->sendFile(filename->text());
+
+        connect(m_lay, SIGNAL(progress(const QString&, int, int, int, int, int)),
+            SLOT(slotProgress(const QString&, int, int, int, int, int)));
+        connect(m_lay, SIGNAL(error(int, const QString&)), SLOT(slotError(int, const QString&)));
+        connect(m_lay, SIGNAL(sent()), SLOT(slotSent()));
+    }
+    else
+    {
+        m_recvlay = m_win->factory()->newReceive(protocol->currentText(), m_win->currentSession()->layer());
+        m_recvlay->receive();
+
+        connect(m_recvlay, SIGNAL(progress(const QString&, int, int, int, int, int)),
+            SLOT(slotProgress(const QString&, int, int, int, int, int)));
+        connect(m_recvlay, SIGNAL(error(int, const QString&)), SLOT(slotError(int, const QString&)));
+        connect(m_recvlay, SIGNAL(received(const QString&)), SLOT(slotReceived(const QString&)));
+    }
 }
@@ -146,14 +146,14 @@ void TransferDialog::cleanup()
 {
-        if(m_lay)
-        {
-                m_lay->cancel();
-                delete m_lay;
-                m_lay = 0l;
-        }
-        if(m_recvlay)
-        {
-                m_recvlay->cancel();
-                delete m_recvlay;
-                m_recvlay = 0l;
-        }
+    if(m_lay)
+    {
+        m_lay->cancel();
+        delete m_lay;
+        m_lay = 0l;
+    }
+    if(m_recvlay)
+    {
+        m_recvlay->cancel();
+        delete m_recvlay;
+        m_recvlay = 0l;
+    }
 }
@@ -162,25 +162,25 @@ void TransferDialog::slotCancel()
 {
-        ok->setEnabled(true);
-        statusbar->setText(QObject::tr("Ready"));
-
-        if((m_lay) || (m_recvlay))
-        {
-                cleanup();
-                if(m_autocleanup)
-                {
-                        m_running = false;
-                        close();
-                }
-                else
-                {
-                        QMessageBox::information(this,
-                                QObject::tr("Cancelled"),
-                                QObject::tr("The file transfer has been cancelled."));
-                }
-        }
-        else
-        {
-                m_running = false;
-                close();
-        }
+    ok->setEnabled(true);
+    statusbar->setText(QObject::tr("Ready"));
+
+    if((m_lay) || (m_recvlay))
+    {
+        cleanup();
+        if(m_autocleanup)
+        {
+            m_running = false;
+            close();
+        }
+        else
+        {
+            QMessageBox::information(this,
+                QObject::tr("Cancelled"),
+                QObject::tr("The file transfer has been cancelled."));
+        }
+    }
+    else
+    {
+        m_running = false;
+        close();
+    }
 }
@@ -189,3 +189,3 @@ void TransferDialog::slotProgress(const QString& , int progress, int , int , int
 {
-        progressbar->setProgress(progress);
+    progressbar->setProgress(progress);
 }
@@ -194,40 +194,40 @@ void TransferDialog::slotError(int error, const QString& )
 {
-        statusbar->setText(QObject::tr("Ready"));
-
-        switch(error)
-        {
-                        case FileTransferLayer::NotSupported:
-                                QMessageBox::critical(this,
-                                        QObject::tr("Error"),
-                                        QObject::tr("Operation not supported."));
-                                break;
-                        case FileTransferLayer::StartError:
-                                QMessageBox::critical(this,
-                                        QObject::tr("Error"),
-                                        QObject::tr("Transfer could not be started."));
-                                break;
-                        case FileTransferLayer::NoError:
-                                QMessageBox::critical(this,
-                                        QObject::tr("Error"),
-                                        QObject::tr("No error."));
-                                break;
-                        case FileTransferLayer::Undefined:
-                                QMessageBox::critical(this,
-                                        QObject::tr("Error"),
-                                        QObject::tr("Undefined error occured."));
-                                break;
-                        case FileTransferLayer::Incomplete:
-                                QMessageBox::critical(this,
-                                        QObject::tr("Error"),
-                                        QObject::tr("Incomplete transfer."));
-                                break;
-                        case FileTransferLayer::Unknown:
-                        default:
-                                QMessageBox::critical(this,
-                                        QObject::tr("Error"),
-                                        QObject::tr("Unknown error occured."));
-                                break;
-        }
-
-        m_autocleanup = 1;
+    statusbar->setText(QObject::tr("Ready"));
+
+    switch(error)
+    {
+            case FileTransferLayer::NotSupported:
+                QMessageBox::critical(this,
+                    QObject::tr("Error"),
+                    QObject::tr("Operation not supported."));
+                break;
+            case FileTransferLayer::StartError:
+                QMessageBox::critical(this,
+                    QObject::tr("Error"),
+                    QObject::tr("Transfer could not be started."));
+                break;
+            case FileTransferLayer::NoError:
+                QMessageBox::critical(this,
+                    QObject::tr("Error"),
+                    QObject::tr("No error."));
+                break;
+            case FileTransferLayer::Undefined:
+                QMessageBox::critical(this,
+                    QObject::tr("Error"),
+                    QObject::tr("Undefined error occured."));
+                break;
+            case FileTransferLayer::Incomplete:
+                QMessageBox::critical(this,
+                    QObject::tr("Error"),
+                    QObject::tr("Incomplete transfer."));
+                break;
+            case FileTransferLayer::Unknown:
+            default:
+                QMessageBox::critical(this,
+                    QObject::tr("Error"),
+                    QObject::tr("Unknown error occured."));
+                break;
+    }
+
+    m_autocleanup = 1;
 }
@@ -236,8 +236,8 @@ void TransferDialog::slotSent()
 {
-        progressbar->setProgress(100);
-        QMessageBox::information(this, QObject::tr("Sent"), QObject::tr("File has been sent."));
-        ok->setEnabled(true);
-        progressbar->setProgress(0);
-        statusbar->setText(QObject::tr("Ready"));
-        m_autocleanup = 1;
+    progressbar->setProgress(100);
+    QMessageBox::information(this, QObject::tr("Sent"), QObject::tr("File has been sent."));
+    ok->setEnabled(true);
+    progressbar->setProgress(0);
+    statusbar->setText(QObject::tr("Ready"));
+    m_autocleanup = 1;
 }
@@ -246,9 +246,9 @@ void TransferDialog::slotReceived(const QString& )
 {
-        progressbar->setProgress(100);
-        QMessageBox::information(this, QObject::tr("Received"), QObject::tr("File has been received."));
-        //QMessageBox::information(this, QObject::tr("Sent"), QObject::tr("File has been received as %1.").arg(file));
-        ok->setEnabled(true);
-        progressbar->setProgress(0);
-        statusbar->setText(QObject::tr("Ready"));
-        m_autocleanup = 1;
+    progressbar->setProgress(100);
+    QMessageBox::information(this, QObject::tr("Received"), QObject::tr("File has been received."));
+    //QMessageBox::information(this, QObject::tr("Sent"), QObject::tr("File has been received as %1.").arg(file));
+    ok->setEnabled(true);
+    progressbar->setProgress(0);
+    statusbar->setText(QObject::tr("Ready"));
+    m_autocleanup = 1;
 }
@@ -257,13 +257,13 @@ void TransferDialog::slotMode(int id)
 {
-        if(id == id_send)
-        {
-                selector->setEnabled(true);
-                filename->setEnabled(true);
-        }
-        else
-        {
-                selector->setEnabled(false);
-                filename->setEnabled(false);
-        }
-        m_transfermode = id;
+    if(id == id_send)
+    {
+        selector->setEnabled(true);
+        filename->setEnabled(true);
+    }
+    else
+    {
+        selector->setEnabled(false);
+        filename->setEnabled(false);
+    }
+    m_transfermode = id;
 }
@@ -272,3 +272,3 @@ bool TransferDialog::isRunning()
 {
-        return m_running;
+    return m_running;
 }