Calmed down... 2nd try after merge

Use MetaFactory cuase it's so nice and avoids thousands of if() else if
stuff
Fix a bug in filetransfer where cancel after exit leaded to a crash cause
of bogus adresses in the QSocketNotifiers..

1 files changed, 5 insertions, 3 deletions

diff --git a/noncore/apps/opie-console/transferdialog.h b/noncore/apps/opie-console/transferdialog.h
index 61f425c..b0c1a76 100644
--- a/noncore/apps/opie-console/transferdialog.h
+++ b/noncore/apps/opie-console/transferdialog.h
@@ -1,38 +1,40 @@
 #ifndef TRANSFER_DIALOG_H
 #define TRANSFER_DIALOG_H
 
 #include "qdialog.h"
 
 class QLineEdit;
 class QComboBox;
 class QProgressBar;
 class QLabel;
 class QPushButton;
-class FileTransfer;
+class MainWindow;
+class FileTransferLayer;
 
 class TransferDialog : public QDialog
 {
         Q_OBJECT
         public:
-                TransferDialog(QWidget *parent = NULL, const char *name = NULL);
+                TransferDialog(MainWindow *parent = 0l, const char *name = 0l);
                 ~TransferDialog();
 
         public slots:
                 void slotFilename();
                 void slotTransfer();
                 void slotCancel();
                 void slotProgress(const QString&, int, int, int, int, int);
                 void slotError(int error, const QString& message);
                 void slotSent();
 
         private:
                 QLineEdit *filename;
                 QComboBox *protocol;
                 QProgressBar *progressbar;
                 QLabel *statusbar;
                 QPushButton *ok, *cancel;
-                FileTransfer *transfer;
+                MainWindow* m_win;
+                FileTransferLayer* m_lay;
 };
 
 #endif