author | leseb <leseb> | 2002-06-17 20:52:48 (UTC) |
---|---|---|
committer | leseb <leseb> | 2002-06-17 20:52:48 (UTC) |
commit | b177eb4a659c674d1bc3ab82d6d980aade7c0959 (patch) (side-by-side diff) | |
tree | 4ba2aee9db13423e37ae0a8051d80c010f815666 /noncore/unsupported | |
parent | 7ba6590093fb86fe4bf64839d3a517dd396853a3 (diff) | |
download | opie-b177eb4a659c674d1bc3ab82d6d980aade7c0959.zip opie-b177eb4a659c674d1bc3ab82d6d980aade7c0959.tar.gz opie-b177eb4a659c674d1bc3ab82d6d980aade7c0959.tar.bz2 |
Fix some bugs when dealing with attachments
-rw-r--r-- | noncore/unsupported/mail2/attachdiag.cpp | 23 | ||||
-rw-r--r-- | noncore/unsupported/mail2/attachdiag.h | 9 | ||||
-rw-r--r-- | noncore/unsupported/mail2/composer.cpp | 4 | ||||
-rw-r--r-- | noncore/unsupported/mail2/libmail/mailfactory.cpp | 2 | ||||
-rw-r--r-- | noncore/unsupported/mail2/libmail/mailfactory.h | 6 |
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 @@ -4,4 +4,5 @@ #include <qlayout.h> +#include <qpe/applnk.h> #include <qpe/fileselector.h> #include <qpe/resource.h> @@ -20,9 +21,9 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF 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); @@ -38,20 +39,16 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF 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(); } @@ -63,5 +60,5 @@ 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 @@ -4,5 +4,6 @@ #include <qdialog.h> -#include <qpe/applnk.h> +class DocLnk; +class FileSelector; class AttachDiag : public QDialog @@ -11,4 +12,5 @@ class AttachDiag : public QDialog public: + DocLnk selectedFile(); static DocLnk getFile(QWidget *parent); @@ -16,9 +18,6 @@ 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; }; 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 @@ -21,5 +21,5 @@ 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()); @@ -232,5 +232,5 @@ void Composer::slotAddAttach() 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 @@ -87,5 +87,5 @@ MailFactory::MailFactory(SendMail &smail, QWidget *parent) 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"; 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 @@ -14,14 +14,14 @@ public: 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; }; |