5 files changed, 20 insertions, 24 deletions

diff --git a/noncore/unsupported/mail2/attachdiag.cpp b/noncore/unsupported/mail2/attachdiag.cpp
index 36e1948..446cfe5 100644
--- a/noncore/unsupported/mail2/attachdiag.cpp
+++ b/noncore/unsupported/mail2/attachdiag.cpp
@@ -2,8 +2,9 @@
 #include <qpushbutton.h>
 #include <qlistbox.h>
 #include <qlayout.h>
 
+#include <qpe/applnk.h>
 #include <qpe/fileselector.h>
 #include <qpe/resource.h>
 
 #include <stdlib.h>
@@ -18,13 +19,13 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF
         QGridLayout *layout = new QGridLayout(this);
         layout->setSpacing(3);
         layout->setMargin(4);
 
-        FileSelector *fileSelector = new FileSelector("*", this, "FileSelector");
-        fileSelector->setCloseVisible(false);
-        fileSelector->setNewVisible(false);
+        _fileSelector = new FileSelector("*", this, "FileSelector");
+        _fileSelector->setCloseVisible(false);
+        _fileSelector->setNewVisible(false);
 
-        layout->addMultiCellWidget(fileSelector, 0, 0, 0, 1);
+        layout->addMultiCellWidget(_fileSelector, 0, 0, 0, 1);
 
         QPushButton *attachButton = new QPushButton(this);
         attachButton->setText(tr("Ok"));
         attachButton->setIconSet(Resource::loadPixmap("enter"));
@@ -36,24 +37,20 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF
         cancelButton->setIconSet(Resource::loadPixmap("editdelete"));
 
         layout->addWidget(cancelButton, 1, 1);
 
-        connect(fileSelector, SIGNAL(fileSelected(const DocLnk &)), SLOT(fileSelected(const DocLnk &)));
         connect(attachButton, SIGNAL(clicked()), SLOT(accept()));
         connect(cancelButton, SIGNAL(clicked()), SLOT(close()));
 
-        if (fileSelector->selected() != NULL)
-                currentFile = *fileSelector->selected();
-
-        if (fileSelector->fileCount() == 0) {
+        if (_fileSelector->fileCount() == 0) {
                 attachButton->setEnabled(false);
-                fileSelector->setEnabled(false);
+                _fileSelector->setEnabled(false);
         }
 }
 
-void AttachDiag::fileSelected(const DocLnk &file)
+DocLnk AttachDiag::selectedFile()
 {
-        currentFile = file;
+        return *_fileSelector->selected();
 }
 
 DocLnk AttachDiag::getFile(QWidget *parent)
 {
@@ -61,9 +58,9 @@ DocLnk AttachDiag::getFile(QWidget *parent)
         attach.showMaximized();
         attach.show();
 
         if (QDialog::Accepted == attach.exec()) {
-                return attach.currentFile;
+                return attach.selectedFile();
         }
 
         return DocLnk();
         }
diff --git a/noncore/unsupported/mail2/attachdiag.h b/noncore/unsupported/mail2/attachdiag.h
index bce5b4b..88686bc 100644
--- a/noncore/unsupported/mail2/attachdiag.h
+++ b/noncore/unsupported/mail2/attachdiag.h
@@ -2,25 +2,24 @@
 #define ATTACHDIAG_H
 
 #include <qdialog.h>
 
-#include <qpe/applnk.h>
+class DocLnk;
+class FileSelector;
 
 class AttachDiag : public QDialog
 {
         Q_OBJECT
 
 public:
+        DocLnk selectedFile();
         static DocLnk getFile(QWidget *parent);
 
 protected:
         AttachDiag(QWidget *parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0);
 
-private slots:
-        void fileSelected(const DocLnk &);
-
 private:
-        DocLnk currentFile;
+        FileSelector *_fileSelector;
 
 };
 
 #endif
diff --git a/noncore/unsupported/mail2/composer.cpp b/noncore/unsupported/mail2/composer.cpp
index 7f65dba..c36d973 100644
--- a/noncore/unsupported/mail2/composer.cpp
+++ b/noncore/unsupported/mail2/composer.cpp
@@ -19,9 +19,9 @@
 
 AttachViewItem::AttachViewItem(QListView *parent, Attachment &attachment)
         : QListViewItem(parent), _attachment(attachment)
 {
-        setPixmap(0, _attachment.docLnk()->pixmap().isNull() ? Resource::loadPixmap("UnknownDocument-14") : _attachment.docLnk()->pixmap());
+        setPixmap(0, _attachment.docLnk().pixmap().isNull() ? Resource::loadPixmap("UnknownDocument-14") : _attachment.docLnk().pixmap());
         setText(0, _attachment.newName().isEmpty() ? _attachment.fileName() : _attachment.newName());
         setText(1, _attachment.description());
 }
 
@@ -230,9 +230,9 @@ void Composer::slotAddAttach()
 
         Attachment attachment;
         attachment.setFileName(lnk.file());
         attachment.setNewName(lnk.name());
-        attachment.setDocLnk(&lnk);
+        attachment.setDocLnk(lnk);
         
         (void) new AttachViewItem(attachView, attachment);
 }
 
diff --git a/noncore/unsupported/mail2/libmail/mailfactory.cpp b/noncore/unsupported/mail2/libmail/mailfactory.cpp
index 6602919..e02f80f 100644
--- a/noncore/unsupported/mail2/libmail/mailfactory.cpp
+++ b/noncore/unsupported/mail2/libmail/mailfactory.cpp
@@ -85,9 +85,9 @@ MailFactory::MailFactory(SendMail &smail, QWidget *parent)
                                 QTextStream t(&f);
                                 QString file;
                                 while (!t.atEnd()) file += t.readLine() + "\n";
                                 f.close();
-                                QString mimetype = (new MimeType(*(*it).docLnk()))->id(); 
+                                QString mimetype = (new MimeType((*it).docLnk()))->id(); 
 
                                 _body += "\n--" + boundary + "\n";
                                 _body += "Content-Type: " + mimetype + "; name=\"" + (*it).newName() + "\"\n";
 
diff --git a/noncore/unsupported/mail2/libmail/mailfactory.h b/noncore/unsupported/mail2/libmail/mailfactory.h
index 8f67447..c938c27 100644
--- a/noncore/unsupported/mail2/libmail/mailfactory.h
+++ b/noncore/unsupported/mail2/libmail/mailfactory.h
@@ -12,18 +12,18 @@ class Attachment
 public:
         void setFileName(QString fileName) { _fileName = fileName; }
         void setNewName(QString newName) { _newName = newName; }
         void setDescription(QString description) { _description = description; }
-        void setDocLnk(DocLnk *docLnk) { _docLnk = docLnk; }
+        void setDocLnk(DocLnk docLnk) { _docLnk = docLnk; }
 
         QString fileName() { return _fileName; }
         QString newName() { return _newName; }
         QString description() { return _description; }
-        DocLnk *docLnk() { return _docLnk; }
+        DocLnk docLnk() { return _docLnk; }
 
 protected:
         QString _fileName, _newName, _description;
-        DocLnk *_docLnk;
+        DocLnk _docLnk;
 
 };
 
 class SendMail