summaryrefslogtreecommitdiff
authorleseb <leseb>2002-06-17 20:52:48 (UTC)
committer leseb <leseb>2002-06-17 20:52:48 (UTC)
commitb177eb4a659c674d1bc3ab82d6d980aade7c0959 (patch) (side-by-side diff)
tree4ba2aee9db13423e37ae0a8051d80c010f815666
parent7ba6590093fb86fe4bf64839d3a517dd396853a3 (diff)
downloadopie-b177eb4a659c674d1bc3ab82d6d980aade7c0959.zip
opie-b177eb4a659c674d1bc3ab82d6d980aade7c0959.tar.gz
opie-b177eb4a659c674d1bc3ab82d6d980aade7c0959.tar.bz2
Fix some bugs when dealing with attachments
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/mail2/attachdiag.cpp23
-rw-r--r--noncore/unsupported/mail2/attachdiag.h9
-rw-r--r--noncore/unsupported/mail2/composer.cpp4
-rw-r--r--noncore/unsupported/mail2/libmail/mailfactory.cpp2
-rw-r--r--noncore/unsupported/mail2/libmail/mailfactory.h6
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
@@ -5,2 +5,3 @@
+#include <qpe/applnk.h>
#include <qpe/fileselector.h>
@@ -21,7 +22,7 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF
- 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);
@@ -39,3 +40,2 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF
- connect(fileSelector, SIGNAL(fileSelected(const DocLnk &)), SLOT(fileSelected(const DocLnk &)));
connect(attachButton, SIGNAL(clicked()), SLOT(accept()));
@@ -43,8 +43,5 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF
- if (fileSelector->selected() != NULL)
- currentFile = *fileSelector->selected();
-
- if (fileSelector->fileCount() == 0) {
+ if (_fileSelector->fileCount() == 0) {
attachButton->setEnabled(false);
- fileSelector->setEnabled(false);
+ _fileSelector->setEnabled(false);
}
@@ -52,5 +49,5 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF
-void AttachDiag::fileSelected(const DocLnk &file)
+DocLnk AttachDiag::selectedFile()
{
- currentFile = file;
+ return *_fileSelector->selected();
}
@@ -64,3 +61,3 @@ DocLnk AttachDiag::getFile(QWidget *parent)
if (QDialog::Accepted == attach.exec()) {
- return attach.currentFile;
+ return attach.selectedFile();
}
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
@@ -5,3 +5,4 @@
-#include <qpe/applnk.h>
+class DocLnk;
+class FileSelector;
@@ -12,2 +13,3 @@ class AttachDiag : public QDialog
public:
+ DocLnk selectedFile();
static DocLnk getFile(QWidget *parent);
@@ -17,7 +19,4 @@ protected:
-private slots:
- void fileSelected(const DocLnk &);
-
private:
- DocLnk currentFile;
+ FileSelector *_fileSelector;
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
@@ -22,3 +22,3 @@ AttachViewItem::AttachViewItem(QListView *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());
@@ -233,3 +233,3 @@ void Composer::slotAddAttach()
attachment.setNewName(lnk.name());
- attachment.setDocLnk(&lnk);
+ attachment.setDocLnk(lnk);
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
@@ -88,3 +88,3 @@ MailFactory::MailFactory(SendMail &smail, QWidget *parent)
f.close();
- QString mimetype = (new MimeType(*(*it).docLnk()))->id();
+ QString mimetype = (new MimeType((*it).docLnk()))->id();
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
@@ -15,3 +15,3 @@ public:
void setDescription(QString description) { _description = description; }
- void setDocLnk(DocLnk *docLnk) { _docLnk = docLnk; }
+ void setDocLnk(DocLnk docLnk) { _docLnk = docLnk; }
@@ -20,3 +20,3 @@ public:
QString description() { return _description; }
- DocLnk *docLnk() { return _docLnk; }
+ DocLnk docLnk() { return _docLnk; }
@@ -24,3 +24,3 @@ protected:
QString _fileName, _newName, _description;
- DocLnk *_docLnk;
+ DocLnk _docLnk;