author | zecke <zecke> | 2004-03-14 13:22:42 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 13:22:42 (UTC) |
commit | 0f7217afa7cdcb108dd2afba0ff6b42c97ab6f44 (patch) (unidiff) | |
tree | f6a68afa76a9be4099c3de7a286caeadd250c966 /noncore | |
parent | d9d68663164078b8dbdbfe70d291291b9fd5aacf (diff) | |
download | opie-0f7217afa7cdcb108dd2afba0ff6b42c97ab6f44.zip opie-0f7217afa7cdcb108dd2afba0ff6b42c97ab6f44.tar.gz opie-0f7217afa7cdcb108dd2afba0ff6b42c97ab6f44.tar.bz2 |
Convert net to ODP and QtAUX
70 files changed, 310 insertions, 228 deletions
diff --git a/noncore/net/linphone/main.cpp b/noncore/net/linphone/main.cpp index 9146fee..6368708 100644 --- a/noncore/net/linphone/main.cpp +++ b/noncore/net/linphone/main.cpp | |||
@@ -1,22 +1,24 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | main-opie.cpp - description | 2 | main-opie.cpp - description |
3 | ------------------- | 3 | ------------------- |
4 | begin : ven mai 23 19:26:00 CEST 2003 | 4 | begin : ven mai 23 19:26:00 CEST 2003 |
5 | copyright : (C) 2003 by Simon Morlat | 5 | copyright : (C) 2003 by Simon Morlat |
6 | email : simon.morlat@linphone.org | 6 | email : simon.morlat@linphone.org |
7 | ***************************************************************************/ | 7 | ***************************************************************************/ |
8 | 8 | ||
9 | /*************************************************************************** | 9 | /*************************************************************************** |
10 | * * | 10 | * * |
11 | * This program is free software; you can redistribute it and/or modify * | 11 | * This program is free software; you can redistribute it and/or modify * |
12 | * it under the terms of the GNU General Public License as published by * | 12 | * it under the terms of the GNU General Public License as published by * |
13 | * the Free Software Foundation; either version 2 of the License, or * | 13 | * the Free Software Foundation; either version 2 of the License, or * |
14 | * (at your option) any later version. * | 14 | * (at your option) any later version. * |
15 | * * | 15 | * * |
16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
17 | #include <opie/oapplicationfactory.h> | 17 | #include <opie2/oapplicationfactory.h> |
18 | #include "mainwindow.h" | 18 | #include "mainwindow.h" |
19 | 19 | ||
20 | |||
21 | using namespace Opie::Core; | ||
20 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) | 22 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) |
21 | 23 | ||
22 | 24 | ||
diff --git a/noncore/net/mail/accountitem.cpp b/noncore/net/mail/accountitem.cpp index 9a09c18..e4bb6c5 100644 --- a/noncore/net/mail/accountitem.cpp +++ b/noncore/net/mail/accountitem.cpp | |||
@@ -1,76 +1,77 @@ | |||
1 | 1 | ||
2 | #include "accountitem.h" | 2 | #include "accountitem.h" |
3 | #include "accountview.h" | 3 | #include "accountview.h" |
4 | #include "newmaildir.h" | 4 | #include "newmaildir.h" |
5 | #include "nntpgroupsdlg.h" | 5 | #include "nntpgroupsdlg.h" |
6 | #include "defines.h" | 6 | #include "defines.h" |
7 | 7 | ||
8 | /* OPIE */ | 8 | /* OPIE */ |
9 | #include <libmailwrapper/mailtypes.h> | 9 | #include <libmailwrapper/mailtypes.h> |
10 | #include <libmailwrapper/abstractmail.h> | 10 | #include <libmailwrapper/abstractmail.h> |
11 | #include <libmailwrapper/mailwrapper.h> | 11 | #include <libmailwrapper/mailwrapper.h> |
12 | #include <qpe/qpeapplication.h> | 12 | #include <qpe/qpeapplication.h> |
13 | 13 | ||
14 | /* QT */ | 14 | /* QT */ |
15 | #include <qpopupmenu.h> | 15 | #include <qpopupmenu.h> |
16 | #include <qmessagebox.h> | 16 | #include <qmessagebox.h> |
17 | 17 | ||
18 | using namespace Opie::Core; | ||
18 | #define SETPIX(x) if (!account->getOffline()) {setPixmap( 0,x);} else {setPixmap( 0, PIXMAP_OFFLINE );} | 19 | #define SETPIX(x) if (!account->getOffline()) {setPixmap( 0,x);} else {setPixmap( 0, PIXMAP_OFFLINE );} |
19 | /** | 20 | /** |
20 | * POP3 Account stuff | 21 | * POP3 Account stuff |
21 | */ | 22 | */ |
22 | POP3viewItem::POP3viewItem( POP3account *a, AccountView *parent ) | 23 | POP3viewItem::POP3viewItem( POP3account *a, AccountView *parent ) |
23 | : AccountViewItem( parent ) | 24 | : AccountViewItem( parent ) |
24 | { | 25 | { |
25 | account = a; | 26 | account = a; |
26 | wrapper = AbstractMail::getWrapper( account ); | 27 | wrapper = AbstractMail::getWrapper( account ); |
27 | SETPIX(PIXMAP_POP3FOLDER); | 28 | SETPIX(PIXMAP_POP3FOLDER); |
28 | #if 0 | 29 | #if 0 |
29 | if (!account->getOffline()) | 30 | if (!account->getOffline()) |
30 | { | 31 | { |
31 | setPixmap( 0, ); | 32 | setPixmap( 0, ); |
32 | } | 33 | } |
33 | else | 34 | else |
34 | { | 35 | { |
35 | setPixmap( 0, PIXMAP_OFFLINE ); | 36 | setPixmap( 0, PIXMAP_OFFLINE ); |
36 | } | 37 | } |
37 | #endif | 38 | #endif |
38 | setText( 0, account->getAccountName() ); | 39 | setText( 0, account->getAccountName() ); |
39 | setOpen( true ); | 40 | setOpen( true ); |
40 | } | 41 | } |
41 | 42 | ||
42 | POP3viewItem::~POP3viewItem() | 43 | POP3viewItem::~POP3viewItem() |
43 | { | 44 | { |
44 | delete wrapper; | 45 | delete wrapper; |
45 | } | 46 | } |
46 | 47 | ||
47 | AbstractMail *POP3viewItem::getWrapper() | 48 | AbstractMail *POP3viewItem::getWrapper() |
48 | { | 49 | { |
49 | return wrapper; | 50 | return wrapper; |
50 | } | 51 | } |
51 | 52 | ||
52 | void POP3viewItem::refresh(QValueList<Opie::OSmartPointer<RecMail> > & ) | 53 | void POP3viewItem::refresh(QValueList<Opie::Core::OSmartPointer<RecMail> > & ) |
53 | { | 54 | { |
54 | refresh(); | 55 | refresh(); |
55 | } | 56 | } |
56 | 57 | ||
57 | void POP3viewItem::refresh() | 58 | void POP3viewItem::refresh() |
58 | { | 59 | { |
59 | if (account->getOffline()) return; | 60 | if (account->getOffline()) return; |
60 | QValueList<FolderP> *folders = wrapper->listFolders(); | 61 | QValueList<FolderP> *folders = wrapper->listFolders(); |
61 | QListViewItem *child = firstChild(); | 62 | QListViewItem *child = firstChild(); |
62 | while ( child ) | 63 | while ( child ) |
63 | { | 64 | { |
64 | QListViewItem *tmp = child; | 65 | QListViewItem *tmp = child; |
65 | child = child->nextSibling(); | 66 | child = child->nextSibling(); |
66 | delete tmp; | 67 | delete tmp; |
67 | } | 68 | } |
68 | QValueList<FolderP>::ConstIterator it; | 69 | QValueList<FolderP>::ConstIterator it; |
69 | QListViewItem*item = 0; | 70 | QListViewItem*item = 0; |
70 | for ( it = folders->begin(); it!=folders->end(); ++it) | 71 | for ( it = folders->begin(); it!=folders->end(); ++it) |
71 | { | 72 | { |
72 | item = new POP3folderItem( (*it), this , item ); | 73 | item = new POP3folderItem( (*it), this , item ); |
73 | item->setSelectable( (*it)->may_select()); | 74 | item->setSelectable( (*it)->may_select()); |
74 | } | 75 | } |
75 | delete folders; | 76 | delete folders; |
76 | } | 77 | } |
@@ -1021,49 +1022,49 @@ bool MHfolderItem::isDraftfolder() | |||
1021 | * Generic stuff | 1022 | * Generic stuff |
1022 | */ | 1023 | */ |
1023 | 1024 | ||
1024 | const QString AccountViewItem::contextName="AccountViewItem"; | 1025 | const QString AccountViewItem::contextName="AccountViewItem"; |
1025 | 1026 | ||
1026 | AccountViewItem::AccountViewItem( AccountView *parent ) | 1027 | AccountViewItem::AccountViewItem( AccountView *parent ) |
1027 | : QListViewItem( parent ) | 1028 | : QListViewItem( parent ) |
1028 | { | 1029 | { |
1029 | init(); | 1030 | init(); |
1030 | m_Backlink = parent; | 1031 | m_Backlink = parent; |
1031 | } | 1032 | } |
1032 | 1033 | ||
1033 | AccountViewItem::AccountViewItem( QListViewItem *parent) | 1034 | AccountViewItem::AccountViewItem( QListViewItem *parent) |
1034 | : QListViewItem( parent),folder(0) | 1035 | : QListViewItem( parent),folder(0) |
1035 | { | 1036 | { |
1036 | init(); | 1037 | init(); |
1037 | } | 1038 | } |
1038 | 1039 | ||
1039 | AccountViewItem::AccountViewItem( QListViewItem *parent , QListViewItem*after ) | 1040 | AccountViewItem::AccountViewItem( QListViewItem *parent , QListViewItem*after ) |
1040 | :QListViewItem( parent,after ),folder(0) | 1041 | :QListViewItem( parent,after ),folder(0) |
1041 | { | 1042 | { |
1042 | init(); | 1043 | init(); |
1043 | } | 1044 | } |
1044 | 1045 | ||
1045 | AccountViewItem::AccountViewItem( const Opie::OSmartPointer<Folder>&folderInit,QListViewItem *parent , QListViewItem*after ) | 1046 | AccountViewItem::AccountViewItem( const Opie::Core::OSmartPointer<Folder>&folderInit,QListViewItem *parent , QListViewItem*after ) |
1046 | :QListViewItem( parent,after ),folder(folderInit) | 1047 | :QListViewItem( parent,after ),folder(folderInit) |
1047 | { | 1048 | { |
1048 | init(); | 1049 | init(); |
1049 | } | 1050 | } |
1050 | 1051 | ||
1051 | void AccountViewItem::init() | 1052 | void AccountViewItem::init() |
1052 | { | 1053 | { |
1053 | m_Backlink = 0; | 1054 | m_Backlink = 0; |
1054 | } | 1055 | } |
1055 | 1056 | ||
1056 | AccountViewItem::~AccountViewItem() | 1057 | AccountViewItem::~AccountViewItem() |
1057 | { | 1058 | { |
1058 | folder = 0; | 1059 | folder = 0; |
1059 | } | 1060 | } |
1060 | 1061 | ||
1061 | AccountView*AccountViewItem::accountView() | 1062 | AccountView*AccountViewItem::accountView() |
1062 | { | 1063 | { |
1063 | return m_Backlink; | 1064 | return m_Backlink; |
1064 | } | 1065 | } |
1065 | 1066 | ||
1066 | void AccountViewItem::deleteAllMail(AbstractMail*wrapper,const FolderP&folder) | 1067 | void AccountViewItem::deleteAllMail(AbstractMail*wrapper,const FolderP&folder) |
1067 | { | 1068 | { |
1068 | if (!wrapper) return; | 1069 | if (!wrapper) return; |
1069 | QString fname=""; | 1070 | QString fname=""; |
diff --git a/noncore/net/mail/accountitem.h b/noncore/net/mail/accountitem.h index 276eae0..6cdb260 100644 --- a/noncore/net/mail/accountitem.h +++ b/noncore/net/mail/accountitem.h | |||
@@ -3,208 +3,208 @@ | |||
3 | 3 | ||
4 | #include <qlistview.h> | 4 | #include <qlistview.h> |
5 | #include <qlist.h> | 5 | #include <qlist.h> |
6 | #include <opie2/osmartpointer.h> | 6 | #include <opie2/osmartpointer.h> |
7 | 7 | ||
8 | class POP3wrapper; | 8 | class POP3wrapper; |
9 | class RecMail; | 9 | class RecMail; |
10 | class RecBody; | 10 | class RecBody; |
11 | class QPopupMenu; | 11 | class QPopupMenu; |
12 | class Selectstore; | 12 | class Selectstore; |
13 | class AccountView; | 13 | class AccountView; |
14 | class POP3account; | 14 | class POP3account; |
15 | class NNTPaccount; | 15 | class NNTPaccount; |
16 | class IMAPaccount; | 16 | class IMAPaccount; |
17 | class AbstractMail; | 17 | class AbstractMail; |
18 | class Folder; | 18 | class Folder; |
19 | 19 | ||
20 | class AccountViewItem : public QListViewItem | 20 | class AccountViewItem : public QListViewItem |
21 | { | 21 | { |
22 | 22 | ||
23 | public: | 23 | public: |
24 | AccountViewItem( AccountView *parent ); | 24 | AccountViewItem( AccountView *parent ); |
25 | AccountViewItem( QListViewItem *parent); | 25 | AccountViewItem( QListViewItem *parent); |
26 | AccountViewItem( QListViewItem *parent , QListViewItem*after ); | 26 | AccountViewItem( QListViewItem *parent , QListViewItem*after ); |
27 | AccountViewItem( const Opie::OSmartPointer<Folder>&folderInit,QListViewItem *parent , QListViewItem*after ); | 27 | AccountViewItem( const Opie::Core::OSmartPointer<Folder>&folderInit,QListViewItem *parent , QListViewItem*after ); |
28 | 28 | ||
29 | virtual ~AccountViewItem(); | 29 | virtual ~AccountViewItem(); |
30 | virtual void refresh(QValueList<Opie::OSmartPointer<RecMail> >&)=0; | 30 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&)=0; |
31 | virtual RecBody fetchBody(const Opie::OSmartPointer<RecMail>&)=0; | 31 | virtual RecBody fetchBody(const Opie::Core::OSmartPointer<RecMail>&)=0; |
32 | virtual QPopupMenu * getContextMenu(){return 0;}; | 32 | virtual QPopupMenu * getContextMenu(){return 0;}; |
33 | virtual void contextMenuSelected(int){} | 33 | virtual void contextMenuSelected(int){} |
34 | virtual AccountView*accountView(); | 34 | virtual AccountView*accountView(); |
35 | virtual bool matchName(const QString&name)const; | 35 | virtual bool matchName(const QString&name)const; |
36 | virtual bool isDraftfolder(); | 36 | virtual bool isDraftfolder(); |
37 | 37 | ||
38 | protected: | 38 | protected: |
39 | AccountViewItem*findSubItem(const QString&path,AccountViewItem*start=0); | 39 | AccountViewItem*findSubItem(const QString&path,AccountViewItem*start=0); |
40 | virtual void init(); | 40 | virtual void init(); |
41 | virtual void removeChilds(); | 41 | virtual void removeChilds(); |
42 | virtual void deleteAllMail(AbstractMail*wrapper,const Opie::OSmartPointer<Folder>&f); | 42 | virtual void deleteAllMail(AbstractMail*wrapper,const Opie::Core::OSmartPointer<Folder>&f); |
43 | static const QString contextName; | 43 | static const QString contextName; |
44 | AccountView*m_Backlink; | 44 | AccountView*m_Backlink; |
45 | Opie::OSmartPointer<Folder> folder; | 45 | Opie::Core::OSmartPointer<Folder> folder; |
46 | }; | 46 | }; |
47 | 47 | ||
48 | class POP3viewItem : public AccountViewItem | 48 | class POP3viewItem : public AccountViewItem |
49 | { | 49 | { |
50 | 50 | ||
51 | public: | 51 | public: |
52 | POP3viewItem( POP3account *a, AccountView *parent ); | 52 | POP3viewItem( POP3account *a, AccountView *parent ); |
53 | virtual ~POP3viewItem(); | 53 | virtual ~POP3viewItem(); |
54 | virtual void refresh(QValueList<Opie::OSmartPointer<RecMail> >&target ); | 54 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target ); |
55 | virtual RecBody fetchBody( const Opie::OSmartPointer<RecMail> &mail ); | 55 | virtual RecBody fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail ); |
56 | AbstractMail *getWrapper(); | 56 | AbstractMail *getWrapper(); |
57 | virtual QPopupMenu * getContextMenu(); | 57 | virtual QPopupMenu * getContextMenu(); |
58 | virtual void contextMenuSelected(int); | 58 | virtual void contextMenuSelected(int); |
59 | 59 | ||
60 | protected: | 60 | protected: |
61 | POP3account *account; | 61 | POP3account *account; |
62 | virtual void refresh(); | 62 | virtual void refresh(); |
63 | AbstractMail *wrapper; | 63 | AbstractMail *wrapper; |
64 | void disconnect(); | 64 | void disconnect(); |
65 | void setOnOffline(); | 65 | void setOnOffline(); |
66 | }; | 66 | }; |
67 | 67 | ||
68 | class POP3folderItem : public AccountViewItem | 68 | class POP3folderItem : public AccountViewItem |
69 | { | 69 | { |
70 | 70 | ||
71 | public: | 71 | public: |
72 | POP3folderItem( const Opie::OSmartPointer<Folder>&folder, POP3viewItem *parent , QListViewItem*after ); | 72 | POP3folderItem( const Opie::Core::OSmartPointer<Folder>&folder, POP3viewItem *parent , QListViewItem*after ); |
73 | virtual ~POP3folderItem(); | 73 | virtual ~POP3folderItem(); |
74 | virtual void refresh(QValueList<Opie::OSmartPointer<RecMail> >&); | 74 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&); |
75 | virtual RecBody fetchBody(const Opie::OSmartPointer<RecMail>&); | 75 | virtual RecBody fetchBody(const Opie::Core::OSmartPointer<RecMail>&); |
76 | virtual QPopupMenu * getContextMenu(); | 76 | virtual QPopupMenu * getContextMenu(); |
77 | virtual void contextMenuSelected(int); | 77 | virtual void contextMenuSelected(int); |
78 | 78 | ||
79 | protected: | 79 | protected: |
80 | void downloadMails(); | 80 | void downloadMails(); |
81 | POP3viewItem *pop3; | 81 | POP3viewItem *pop3; |
82 | }; | 82 | }; |
83 | 83 | ||
84 | 84 | ||
85 | class NNTPviewItem : public AccountViewItem | 85 | class NNTPviewItem : public AccountViewItem |
86 | { | 86 | { |
87 | 87 | ||
88 | public: | 88 | public: |
89 | NNTPviewItem( NNTPaccount *a, AccountView *parent ); | 89 | NNTPviewItem( NNTPaccount *a, AccountView *parent ); |
90 | virtual ~NNTPviewItem(); | 90 | virtual ~NNTPviewItem(); |
91 | virtual void refresh(QValueList<Opie::OSmartPointer<RecMail> >&target ); | 91 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target ); |
92 | virtual RecBody fetchBody( const Opie::OSmartPointer<RecMail> &mail ); | 92 | virtual RecBody fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail ); |
93 | AbstractMail *getWrapper(); | 93 | AbstractMail *getWrapper(); |
94 | virtual QPopupMenu * getContextMenu(); | 94 | virtual QPopupMenu * getContextMenu(); |
95 | virtual void contextMenuSelected(int); | 95 | virtual void contextMenuSelected(int); |
96 | 96 | ||
97 | protected: | 97 | protected: |
98 | NNTPaccount *account; | 98 | NNTPaccount *account; |
99 | virtual void refresh(); | 99 | virtual void refresh(); |
100 | AbstractMail *wrapper; | 100 | AbstractMail *wrapper; |
101 | void disconnect(); | 101 | void disconnect(); |
102 | void setOnOffline(); | 102 | void setOnOffline(); |
103 | void subscribeGroups(); | 103 | void subscribeGroups(); |
104 | }; | 104 | }; |
105 | 105 | ||
106 | class NNTPfolderItem : public AccountViewItem | 106 | class NNTPfolderItem : public AccountViewItem |
107 | { | 107 | { |
108 | 108 | ||
109 | public: | 109 | public: |
110 | NNTPfolderItem(const Opie::OSmartPointer<Folder>&folder, NNTPviewItem *parent , QListViewItem*after ); | 110 | NNTPfolderItem(const Opie::Core::OSmartPointer<Folder>&folder, NNTPviewItem *parent , QListViewItem*after ); |
111 | virtual ~NNTPfolderItem(); | 111 | virtual ~NNTPfolderItem(); |
112 | virtual void refresh(QValueList<Opie::OSmartPointer<RecMail> >&); | 112 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&); |
113 | virtual RecBody fetchBody(const Opie::OSmartPointer<RecMail>&); | 113 | virtual RecBody fetchBody(const Opie::Core::OSmartPointer<RecMail>&); |
114 | virtual QPopupMenu * getContextMenu(); | 114 | virtual QPopupMenu * getContextMenu(); |
115 | virtual void contextMenuSelected(int); | 115 | virtual void contextMenuSelected(int); |
116 | 116 | ||
117 | protected: | 117 | protected: |
118 | void downloadMails(); | 118 | void downloadMails(); |
119 | NNTPviewItem *nntp; | 119 | NNTPviewItem *nntp; |
120 | }; | 120 | }; |
121 | 121 | ||
122 | 122 | ||
123 | 123 | ||
124 | class IMAPviewItem : public AccountViewItem | 124 | class IMAPviewItem : public AccountViewItem |
125 | { | 125 | { |
126 | friend class IMAPfolderItem; | 126 | friend class IMAPfolderItem; |
127 | public: | 127 | public: |
128 | IMAPviewItem( IMAPaccount *a, AccountView *parent ); | 128 | IMAPviewItem( IMAPaccount *a, AccountView *parent ); |
129 | virtual ~IMAPviewItem(); | 129 | virtual ~IMAPviewItem(); |
130 | virtual void refresh(QValueList<Opie::OSmartPointer<RecMail> >&); | 130 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&); |
131 | virtual RecBody fetchBody(const Opie::OSmartPointer<RecMail>&); | 131 | virtual RecBody fetchBody(const Opie::Core::OSmartPointer<RecMail>&); |
132 | AbstractMail *getWrapper(); | 132 | AbstractMail *getWrapper(); |
133 | virtual QPopupMenu * getContextMenu(); | 133 | virtual QPopupMenu * getContextMenu(); |
134 | virtual void contextMenuSelected(int); | 134 | virtual void contextMenuSelected(int); |
135 | const QStringList&subFolders(); | 135 | const QStringList&subFolders(); |
136 | virtual void refreshFolders(bool force=false); | 136 | virtual void refreshFolders(bool force=false); |
137 | bool offline(); | 137 | bool offline(); |
138 | 138 | ||
139 | protected: | 139 | protected: |
140 | virtual void createNewFolder(); | 140 | virtual void createNewFolder(); |
141 | IMAPaccount *account; | 141 | IMAPaccount *account; |
142 | AbstractMail *wrapper; | 142 | AbstractMail *wrapper; |
143 | QStringList currentFolders; | 143 | QStringList currentFolders; |
144 | }; | 144 | }; |
145 | 145 | ||
146 | class IMAPfolderItem : public AccountViewItem | 146 | class IMAPfolderItem : public AccountViewItem |
147 | { | 147 | { |
148 | 148 | ||
149 | public: | 149 | public: |
150 | IMAPfolderItem( const Opie::OSmartPointer<Folder>&folder, IMAPviewItem *parent , QListViewItem*after ); | 150 | IMAPfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, IMAPviewItem *parent , QListViewItem*after ); |
151 | IMAPfolderItem( const Opie::OSmartPointer<Folder>&folder, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master ); | 151 | IMAPfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master ); |
152 | virtual ~IMAPfolderItem(); | 152 | virtual ~IMAPfolderItem(); |
153 | virtual void refresh(QValueList<Opie::OSmartPointer<RecMail> >&); | 153 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&); |
154 | virtual RecBody fetchBody(const Opie::OSmartPointer<RecMail>&); | 154 | virtual RecBody fetchBody(const Opie::Core::OSmartPointer<RecMail>&); |
155 | virtual QPopupMenu * getContextMenu(); | 155 | virtual QPopupMenu * getContextMenu(); |
156 | virtual void contextMenuSelected(int); | 156 | virtual void contextMenuSelected(int); |
157 | virtual const QString& Delemiter()const; | 157 | virtual const QString& Delemiter()const; |
158 | protected: | 158 | protected: |
159 | virtual void createNewFolder(); | 159 | virtual void createNewFolder(); |
160 | virtual void deleteFolder(); | 160 | virtual void deleteFolder(); |
161 | virtual void downloadMails(); | 161 | virtual void downloadMails(); |
162 | IMAPviewItem *imap; | 162 | IMAPviewItem *imap; |
163 | }; | 163 | }; |
164 | 164 | ||
165 | class MHviewItem : public AccountViewItem | 165 | class MHviewItem : public AccountViewItem |
166 | { | 166 | { |
167 | friend class MHfolderItem; | 167 | friend class MHfolderItem; |
168 | 168 | ||
169 | public: | 169 | public: |
170 | MHviewItem( const QString&aMboxPath, AccountView *parent ); | 170 | MHviewItem( const QString&aMboxPath, AccountView *parent ); |
171 | virtual ~MHviewItem(); | 171 | virtual ~MHviewItem(); |
172 | virtual void refresh(QValueList<Opie::OSmartPointer<RecMail> >&target ); | 172 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&target ); |
173 | virtual RecBody fetchBody( const Opie::OSmartPointer<RecMail> &mail ); | 173 | virtual RecBody fetchBody( const Opie::Core::OSmartPointer<RecMail> &mail ); |
174 | AbstractMail *getWrapper(); | 174 | AbstractMail *getWrapper(); |
175 | virtual QPopupMenu * getContextMenu(); | 175 | virtual QPopupMenu * getContextMenu(); |
176 | virtual void contextMenuSelected(int); | 176 | virtual void contextMenuSelected(int); |
177 | QStringList subFolders(); | 177 | QStringList subFolders(); |
178 | virtual void refresh(bool force=false); | 178 | virtual void refresh(bool force=false); |
179 | 179 | ||
180 | protected: | 180 | protected: |
181 | void downloadMails(); | 181 | void downloadMails(); |
182 | virtual void createFolder(); | 182 | virtual void createFolder(); |
183 | QString m_Path; | 183 | QString m_Path; |
184 | AbstractMail *wrapper; | 184 | AbstractMail *wrapper; |
185 | QStringList currentFolders; | 185 | QStringList currentFolders; |
186 | }; | 186 | }; |
187 | 187 | ||
188 | class MHfolderItem : public AccountViewItem | 188 | class MHfolderItem : public AccountViewItem |
189 | { | 189 | { |
190 | 190 | ||
191 | public: | 191 | public: |
192 | MHfolderItem( const Opie::OSmartPointer<Folder>&folder, MHviewItem *parent , QListViewItem*after ); | 192 | MHfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, MHviewItem *parent , QListViewItem*after ); |
193 | MHfolderItem( const Opie::OSmartPointer<Folder>&folder, MHfolderItem *parent, QListViewItem*after, MHviewItem*master); | 193 | MHfolderItem( const Opie::Core::OSmartPointer<Folder>&folder, MHfolderItem *parent, QListViewItem*after, MHviewItem*master); |
194 | virtual ~MHfolderItem(); | 194 | virtual ~MHfolderItem(); |
195 | virtual void refresh(QValueList<Opie::OSmartPointer<RecMail> >&); | 195 | virtual void refresh(QValueList<Opie::Core::OSmartPointer<RecMail> >&); |
196 | virtual RecBody fetchBody(const Opie::OSmartPointer<RecMail>&); | 196 | virtual RecBody fetchBody(const Opie::Core::OSmartPointer<RecMail>&); |
197 | virtual QPopupMenu * getContextMenu(); | 197 | virtual QPopupMenu * getContextMenu(); |
198 | virtual void contextMenuSelected(int); | 198 | virtual void contextMenuSelected(int); |
199 | virtual const Opie::OSmartPointer<Folder>&getFolder()const; | 199 | virtual const Opie::Core::OSmartPointer<Folder>&getFolder()const; |
200 | virtual bool isDraftfolder(); | 200 | virtual bool isDraftfolder(); |
201 | 201 | ||
202 | protected: | 202 | protected: |
203 | void downloadMails(); | 203 | void downloadMails(); |
204 | virtual void createFolder(); | 204 | virtual void createFolder(); |
205 | virtual void deleteFolder(); | 205 | virtual void deleteFolder(); |
206 | void initName(); | 206 | void initName(); |
207 | MHviewItem *mbox; | 207 | MHviewItem *mbox; |
208 | }; | 208 | }; |
209 | 209 | ||
210 | #endif | 210 | #endif |
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp index 26107ff..811e57a 100644 --- a/noncore/net/mail/accountview.cpp +++ b/noncore/net/mail/accountview.cpp | |||
@@ -1,40 +1,41 @@ | |||
1 | 1 | ||
2 | #include "accountview.h" | 2 | #include "accountview.h" |
3 | #include "accountitem.h" | 3 | #include "accountitem.h" |
4 | #include "selectstore.h" | 4 | #include "selectstore.h" |
5 | 5 | ||
6 | /* OPIE */ | 6 | /* OPIE */ |
7 | #include <libmailwrapper/settings.h> | 7 | #include <libmailwrapper/settings.h> |
8 | #include <libmailwrapper/mailwrapper.h> | 8 | #include <libmailwrapper/mailwrapper.h> |
9 | #include <libmailwrapper/mailtypes.h> | 9 | #include <libmailwrapper/mailtypes.h> |
10 | #include <libmailwrapper/abstractmail.h> | 10 | #include <libmailwrapper/abstractmail.h> |
11 | #include <qpe/qpeapplication.h> | 11 | #include <qpe/qpeapplication.h> |
12 | 12 | ||
13 | /* QT */ | 13 | /* QT */ |
14 | #include <qmessagebox.h> | 14 | #include <qmessagebox.h> |
15 | #include <qpopupmenu.h> | 15 | #include <qpopupmenu.h> |
16 | 16 | ||
17 | using namespace Opie::Core; | ||
17 | AccountView::AccountView( QWidget *parent, const char *name, WFlags flags ) | 18 | AccountView::AccountView( QWidget *parent, const char *name, WFlags flags ) |
18 | : QListView( parent, name, flags ) | 19 | : QListView( parent, name, flags ) |
19 | { | 20 | { |
20 | connect( this, SIGNAL( selectionChanged(QListViewItem*) ), | 21 | connect( this, SIGNAL( selectionChanged(QListViewItem*) ), |
21 | SLOT( refresh(QListViewItem*) ) ); | 22 | SLOT( refresh(QListViewItem*) ) ); |
22 | connect( this, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this, | 23 | connect( this, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this, |
23 | SLOT( slotHold(int,QListViewItem*,const QPoint&,int) ) ); | 24 | SLOT( slotHold(int,QListViewItem*,const QPoint&,int) ) ); |
24 | setSorting(0); | 25 | setSorting(0); |
25 | } | 26 | } |
26 | 27 | ||
27 | AccountView::~AccountView() | 28 | AccountView::~AccountView() |
28 | { | 29 | { |
29 | imapAccounts.clear(); | 30 | imapAccounts.clear(); |
30 | mhAccounts.clear(); | 31 | mhAccounts.clear(); |
31 | } | 32 | } |
32 | 33 | ||
33 | void AccountView::slotContextMenu(int id) | 34 | void AccountView::slotContextMenu(int id) |
34 | { | 35 | { |
35 | AccountViewItem *view = static_cast<AccountViewItem *>(currentItem()); | 36 | AccountViewItem *view = static_cast<AccountViewItem *>(currentItem()); |
36 | if (!view) return; | 37 | if (!view) return; |
37 | view->contextMenuSelected(id); | 38 | view->contextMenuSelected(id); |
38 | } | 39 | } |
39 | 40 | ||
40 | void AccountView::slotHold(int button, QListViewItem * item,const QPoint&,int) | 41 | void AccountView::slotHold(int button, QListViewItem * item,const QPoint&,int) |
diff --git a/noncore/net/mail/accountview.h b/noncore/net/mail/accountview.h index d236058..b082b1f 100644 --- a/noncore/net/mail/accountview.h +++ b/noncore/net/mail/accountview.h | |||
@@ -1,45 +1,45 @@ | |||
1 | #ifndef ACCOUNTVIEW_H | 1 | #ifndef ACCOUNTVIEW_H |
2 | #define ACCOUNTVIEW_H | 2 | #define ACCOUNTVIEW_H |
3 | 3 | ||
4 | #include <qlistview.h> | 4 | #include <qlistview.h> |
5 | #include <qlist.h> | 5 | #include <qlist.h> |
6 | #include <opie2/osmartpointer.h> | 6 | #include <opie2/osmartpointer.h> |
7 | #include <libmailwrapper/mailtypes.h> | 7 | #include <libmailwrapper/mailtypes.h> |
8 | 8 | ||
9 | class Selectstore; | 9 | class Selectstore; |
10 | class Folder; | 10 | class Folder; |
11 | class AbstractMail; | 11 | class AbstractMail; |
12 | class Account; | 12 | class Account; |
13 | class IMAPviewItem; | 13 | class IMAPviewItem; |
14 | class MHviewItem; | 14 | class MHviewItem; |
15 | 15 | ||
16 | class AccountView : public QListView | 16 | class AccountView : public QListView |
17 | { | 17 | { |
18 | Q_OBJECT | 18 | Q_OBJECT |
19 | 19 | ||
20 | public: | 20 | public: |
21 | AccountView( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 ); | 21 | AccountView( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 ); |
22 | virtual ~AccountView(); | 22 | virtual ~AccountView(); |
23 | virtual void populate( QList<Account> list ); | 23 | virtual void populate( QList<Account> list ); |
24 | virtual RecBody fetchBody(const Opie::OSmartPointer<RecMail>&aMail); | 24 | virtual RecBody fetchBody(const Opie::Core::OSmartPointer<RecMail>&aMail); |
25 | virtual void downloadMails(const Opie::OSmartPointer<Folder>&fromFolder,AbstractMail*fromWrapper); | 25 | virtual void downloadMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,AbstractMail*fromWrapper); |
26 | virtual bool currentisDraft(); | 26 | virtual bool currentisDraft(); |
27 | 27 | ||
28 | public slots: | 28 | public slots: |
29 | virtual void refreshAll(); | 29 | virtual void refreshAll(); |
30 | virtual void refresh(QListViewItem *item); | 30 | virtual void refresh(QListViewItem *item); |
31 | virtual void refreshCurrent(); | 31 | virtual void refreshCurrent(); |
32 | virtual void slotHold(int, QListViewItem *,const QPoint&,int); | 32 | virtual void slotHold(int, QListViewItem *,const QPoint&,int); |
33 | virtual void slotContextMenu(int id); | 33 | virtual void slotContextMenu(int id); |
34 | void setupFolderselect(Selectstore*sels); | 34 | void setupFolderselect(Selectstore*sels); |
35 | 35 | ||
36 | signals: | 36 | signals: |
37 | void refreshMailview(const QValueList<RecMailP>& ); | 37 | void refreshMailview(const QValueList<RecMailP>& ); |
38 | 38 | ||
39 | protected: | 39 | protected: |
40 | QListViewItem* m_currentItem; | 40 | QListViewItem* m_currentItem; |
41 | QValueList<IMAPviewItem*> imapAccounts; | 41 | QValueList<IMAPviewItem*> imapAccounts; |
42 | QValueList<MHviewItem*> mhAccounts; | 42 | QValueList<MHviewItem*> mhAccounts; |
43 | }; | 43 | }; |
44 | 44 | ||
45 | #endif | 45 | #endif |
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp index 74ccc7b..5bc2883 100644 --- a/noncore/net/mail/composemail.cpp +++ b/noncore/net/mail/composemail.cpp | |||
@@ -1,39 +1,41 @@ | |||
1 | #include <qt.h> | 1 | #include <qt.h> |
2 | 2 | ||
3 | #include <opie2/ofiledialog.h> | 3 | #include <opie2/ofiledialog.h> |
4 | #include <qpe/resource.h> | 4 | #include <qpe/resource.h> |
5 | #include <qpe/config.h> | 5 | #include <qpe/config.h> |
6 | #include <qpe/global.h> | 6 | #include <qpe/global.h> |
7 | #include <qpe/contact.h> | 7 | #include <qpe/contact.h> |
8 | 8 | ||
9 | #include "composemail.h" | 9 | #include "composemail.h" |
10 | 10 | ||
11 | #include <libmailwrapper/smtpwrapper.h> | 11 | #include <libmailwrapper/smtpwrapper.h> |
12 | #include <libmailwrapper/storemail.h> | 12 | #include <libmailwrapper/storemail.h> |
13 | #include <libmailwrapper/abstractmail.h> | 13 | #include <libmailwrapper/abstractmail.h> |
14 | #include <libmailwrapper/mailtypes.h> | 14 | #include <libmailwrapper/mailtypes.h> |
15 | 15 | ||
16 | using namespace Opie::Core; | ||
17 | using namespace Opie::Ui; | ||
16 | ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags ) | 18 | ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags ) |
17 | : ComposeMailUI( parent, name, modal, flags ) | 19 | : ComposeMailUI( parent, name, modal, flags ) |
18 | { | 20 | { |
19 | settings = s; | 21 | settings = s; |
20 | m_replyid = ""; | 22 | m_replyid = ""; |
21 | 23 | ||
22 | QString vfilename = Global::applicationFileName("addressbook", | 24 | QString vfilename = Global::applicationFileName("addressbook", |
23 | "businesscard.vcf"); | 25 | "businesscard.vcf"); |
24 | Contact c; | 26 | Contact c; |
25 | if (QFile::exists(vfilename)) { | 27 | if (QFile::exists(vfilename)) { |
26 | c = Contact::readVCard( vfilename )[0]; | 28 | c = Contact::readVCard( vfilename )[0]; |
27 | } | 29 | } |
28 | 30 | ||
29 | QStringList mails = c.emailList(); | 31 | QStringList mails = c.emailList(); |
30 | QString defmail = c.defaultEmail(); | 32 | QString defmail = c.defaultEmail(); |
31 | 33 | ||
32 | if (defmail.length()!=0) { | 34 | if (defmail.length()!=0) { |
33 | fromBox->insertItem(defmail); | 35 | fromBox->insertItem(defmail); |
34 | } | 36 | } |
35 | QStringList::ConstIterator sit = mails.begin(); | 37 | QStringList::ConstIterator sit = mails.begin(); |
36 | for (;sit!=mails.end();++sit) { | 38 | for (;sit!=mails.end();++sit) { |
37 | if ( (*sit)==defmail) | 39 | if ( (*sit)==defmail) |
38 | continue; | 40 | continue; |
39 | fromBox->insertItem((*sit)); | 41 | fromBox->insertItem((*sit)); |
@@ -139,125 +141,125 @@ void ComposeMail::fillValues( int ) | |||
139 | if ( smtp->getUseBCC() ) { | 141 | if ( smtp->getUseBCC() ) { |
140 | bccLine->setText( smtp->getBCC() ); | 142 | bccLine->setText( smtp->getBCC() ); |
141 | } | 143 | } |
142 | replyLine->clear(); | 144 | replyLine->clear(); |
143 | if ( smtp->getUseReply() ) { | 145 | if ( smtp->getUseReply() ) { |
144 | replyLine->setText( smtp->getReply() ); | 146 | replyLine->setText( smtp->getReply() ); |
145 | } | 147 | } |
146 | sigMultiLine->setText( smtp->getSignature() ); | 148 | sigMultiLine->setText( smtp->getSignature() ); |
147 | #endif | 149 | #endif |
148 | } | 150 | } |
149 | 151 | ||
150 | void ComposeMail::slotAdjustColumns() | 152 | void ComposeMail::slotAdjustColumns() |
151 | { | 153 | { |
152 | int currPage = tabWidget->currentPageIndex(); | 154 | int currPage = tabWidget->currentPageIndex(); |
153 | 155 | ||
154 | tabWidget->showPage( attachTab ); | 156 | tabWidget->showPage( attachTab ); |
155 | attList->setColumnWidth( 0, attList->visibleWidth() - 80 ); | 157 | attList->setColumnWidth( 0, attList->visibleWidth() - 80 ); |
156 | attList->setColumnWidth( 1, 80 ); | 158 | attList->setColumnWidth( 1, 80 ); |
157 | 159 | ||
158 | tabWidget->setCurrentPage( currPage ); | 160 | tabWidget->setCurrentPage( currPage ); |
159 | } | 161 | } |
160 | 162 | ||
161 | void ComposeMail::addAttachment() | 163 | void ComposeMail::addAttachment() |
162 | { | 164 | { |
163 | DocLnk lnk = Opie::OFileDialog::getOpenFileName( 1, "/" ); | 165 | DocLnk lnk = OFileDialog::getOpenFileName( 1, "/" ); |
164 | if ( !lnk.name().isEmpty() ) { | 166 | if ( !lnk.name().isEmpty() ) { |
165 | Attachment *att = new Attachment( lnk ); | 167 | Attachment *att = new Attachment( lnk ); |
166 | (void) new AttachViewItem( attList, att ); | 168 | (void) new AttachViewItem( attList, att ); |
167 | } | 169 | } |
168 | } | 170 | } |
169 | 171 | ||
170 | void ComposeMail::removeAttachment() | 172 | void ComposeMail::removeAttachment() |
171 | { | 173 | { |
172 | if ( !attList->currentItem() ) { | 174 | if ( !attList->currentItem() ) { |
173 | QMessageBox::information( this, tr( "Error" ), | 175 | QMessageBox::information( this, tr( "Error" ), |
174 | tr( "<p>Please select a File.</p>" ), | 176 | tr( "<p>Please select a File.</p>" ), |
175 | tr( "Ok" ) ); | 177 | tr( "Ok" ) ); |
176 | } else { | 178 | } else { |
177 | attList->takeItem( attList->currentItem() ); | 179 | attList->takeItem( attList->currentItem() ); |
178 | } | 180 | } |
179 | } | 181 | } |
180 | 182 | ||
181 | void ComposeMail::accept() | 183 | void ComposeMail::accept() |
182 | { | 184 | { |
183 | if ( checkBoxLater->isChecked() ) { | 185 | if ( checkBoxLater->isChecked() ) { |
184 | qDebug( "Send later" ); | 186 | qDebug( "Send later" ); |
185 | } | 187 | } |
186 | 188 | ||
187 | #if 0 | 189 | #if 0 |
188 | qDebug( "Sending Mail with " + | 190 | qDebug( "Sending Mail with " + |
189 | smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() ); | 191 | smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() ); |
190 | #endif | 192 | #endif |
191 | Opie::OSmartPointer<Mail> mail=new Mail; | 193 | Opie::Core::OSmartPointer<Mail> mail=new Mail; |
192 | 194 | ||
193 | SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() ); | 195 | SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() ); |
194 | mail->setMail(fromBox->currentText()); | 196 | mail->setMail(fromBox->currentText()); |
195 | 197 | ||
196 | if ( !toLine->text().isEmpty() ) { | 198 | if ( !toLine->text().isEmpty() ) { |
197 | mail->setTo( toLine->text() ); | 199 | mail->setTo( toLine->text() ); |
198 | } else { | 200 | } else { |
199 | QMessageBox::warning(0,tr("Sending mail"), | 201 | QMessageBox::warning(0,tr("Sending mail"), |
200 | tr("No Receiver spezified" ) ); | 202 | tr("No Receiver spezified" ) ); |
201 | return; | 203 | return; |
202 | } | 204 | } |
203 | mail->setName(senderNameEdit->text()); | 205 | mail->setName(senderNameEdit->text()); |
204 | mail->setCC( ccLine->text() ); | 206 | mail->setCC( ccLine->text() ); |
205 | mail->setBCC( bccLine->text() ); | 207 | mail->setBCC( bccLine->text() ); |
206 | mail->setReply( replyLine->text() ); | 208 | mail->setReply( replyLine->text() ); |
207 | mail->setSubject( subjectLine->text() ); | 209 | mail->setSubject( subjectLine->text() ); |
208 | if (!m_replyid.isEmpty()) { | 210 | if (!m_replyid.isEmpty()) { |
209 | QStringList ids; | 211 | QStringList ids; |
210 | ids.append(m_replyid); | 212 | ids.append(m_replyid); |
211 | mail->setInreply(ids); | 213 | mail->setInreply(ids); |
212 | } | 214 | } |
213 | QString txt = message->text(); | 215 | QString txt = message->text(); |
214 | if ( !sigMultiLine->text().isEmpty() ) { | 216 | if ( !sigMultiLine->text().isEmpty() ) { |
215 | txt.append( "\n--\n" ); | 217 | txt.append( "\n--\n" ); |
216 | txt.append( sigMultiLine->text() ); | 218 | txt.append( sigMultiLine->text() ); |
217 | } | 219 | } |
218 | mail->setMessage( txt ); | 220 | mail->setMessage( txt ); |
219 | AttachViewItem *it = (AttachViewItem *) attList->firstChild(); | 221 | AttachViewItem *it = (AttachViewItem *) attList->firstChild(); |
220 | while ( it != NULL ) { | 222 | while ( it != NULL ) { |
221 | mail->addAttachment( it->getAttachment() ); | 223 | mail->addAttachment( it->getAttachment() ); |
222 | it = (AttachViewItem *) it->nextSibling(); | 224 | it = (AttachViewItem *) it->nextSibling(); |
223 | } | 225 | } |
224 | 226 | ||
225 | SMTPwrapper wrapper( smtp ); | 227 | SMTPwrapper wrapper( smtp ); |
226 | wrapper.sendMail( mail,checkBoxLater->isChecked() ); | 228 | wrapper.sendMail( mail,checkBoxLater->isChecked() ); |
227 | 229 | ||
228 | QDialog::accept(); | 230 | QDialog::accept(); |
229 | } | 231 | } |
230 | 232 | ||
231 | void ComposeMail::reject() | 233 | void ComposeMail::reject() |
232 | { | 234 | { |
233 | int yesno = QMessageBox::warning(0,tr("Store message"), | 235 | int yesno = QMessageBox::warning(0,tr("Store message"), |
234 | tr("Store message into drafts?"), | 236 | tr("Store message into drafts?"), |
235 | tr("Yes"), | 237 | tr("Yes"), |
236 | tr("No"),QString::null,0,1); | 238 | tr("No"),QString::null,0,1); |
237 | 239 | ||
238 | if (yesno == 0) { | 240 | if (yesno == 0) { |
239 | Opie::OSmartPointer<Mail> mail=new Mail(); | 241 | Opie::Core::OSmartPointer<Mail> mail=new Mail(); |
240 | mail->setMail(fromBox->currentText()); | 242 | mail->setMail(fromBox->currentText()); |
241 | mail->setTo( toLine->text() ); | 243 | mail->setTo( toLine->text() ); |
242 | mail->setName(senderNameEdit->text()); | 244 | mail->setName(senderNameEdit->text()); |
243 | mail->setCC( ccLine->text() ); | 245 | mail->setCC( ccLine->text() ); |
244 | mail->setBCC( bccLine->text() ); | 246 | mail->setBCC( bccLine->text() ); |
245 | mail->setReply( replyLine->text() ); | 247 | mail->setReply( replyLine->text() ); |
246 | mail->setSubject( subjectLine->text() ); | 248 | mail->setSubject( subjectLine->text() ); |
247 | if (!m_replyid.isEmpty()) { | 249 | if (!m_replyid.isEmpty()) { |
248 | QStringList ids; | 250 | QStringList ids; |
249 | ids.append(m_replyid); | 251 | ids.append(m_replyid); |
250 | mail->setInreply(ids); | 252 | mail->setInreply(ids); |
251 | } | 253 | } |
252 | QString txt = message->text(); | 254 | QString txt = message->text(); |
253 | if ( !sigMultiLine->text().isEmpty() ) { | 255 | if ( !sigMultiLine->text().isEmpty() ) { |
254 | txt.append( "\n--\n" ); | 256 | txt.append( "\n--\n" ); |
255 | txt.append( sigMultiLine->text() ); | 257 | txt.append( sigMultiLine->text() ); |
256 | } | 258 | } |
257 | qDebug(txt); | 259 | qDebug(txt); |
258 | mail->setMessage( txt ); | 260 | mail->setMessage( txt ); |
259 | 261 | ||
260 | /* only use the default drafts folder name! */ | 262 | /* only use the default drafts folder name! */ |
261 | Storemail wrapper(AbstractMail::draftFolder()); | 263 | Storemail wrapper(AbstractMail::draftFolder()); |
262 | wrapper.storeMail(mail); | 264 | wrapper.storeMail(mail); |
263 | 265 | ||
diff --git a/noncore/net/mail/composemail.h b/noncore/net/mail/composemail.h index c12eb30..4693927 100644 --- a/noncore/net/mail/composemail.h +++ b/noncore/net/mail/composemail.h | |||
@@ -16,49 +16,49 @@ class RecMail; | |||
16 | class AddressPicker : public AddressPickerUI | 16 | class AddressPicker : public AddressPickerUI |
17 | { | 17 | { |
18 | Q_OBJECT | 18 | Q_OBJECT |
19 | 19 | ||
20 | public: | 20 | public: |
21 | AddressPicker( QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 ); | 21 | AddressPicker( QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 ); |
22 | static QString getNames(); | 22 | static QString getNames(); |
23 | 23 | ||
24 | protected: | 24 | protected: |
25 | QString selectedNames; | 25 | QString selectedNames; |
26 | void accept(); | 26 | void accept(); |
27 | 27 | ||
28 | }; | 28 | }; |
29 | 29 | ||
30 | class RecMail; | 30 | class RecMail; |
31 | 31 | ||
32 | class ComposeMail : public ComposeMailUI | 32 | class ComposeMail : public ComposeMailUI |
33 | { | 33 | { |
34 | Q_OBJECT | 34 | Q_OBJECT |
35 | 35 | ||
36 | public: | 36 | public: |
37 | ComposeMail( Settings *s, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 ); | 37 | ComposeMail( Settings *s, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 ); |
38 | virtual ~ComposeMail(); | 38 | virtual ~ComposeMail(); |
39 | 39 | ||
40 | void reEditMail(const Opie::OSmartPointer<RecMail>¤t); | 40 | void reEditMail(const Opie::Core::OSmartPointer<RecMail>¤t); |
41 | 41 | ||
42 | public slots: | 42 | public slots: |
43 | void slotAdjustColumns(); | 43 | void slotAdjustColumns(); |
44 | 44 | ||
45 | void setTo( const QString & to ); | 45 | void setTo( const QString & to ); |
46 | void setSubject( const QString & subject ); | 46 | void setSubject( const QString & subject ); |
47 | void setInReplyTo( const QString & messageId ); | 47 | void setInReplyTo( const QString & messageId ); |
48 | void setMessage( const QString & text ); | 48 | void setMessage( const QString & text ); |
49 | 49 | ||
50 | protected slots: | 50 | protected slots: |
51 | void accept(); | 51 | void accept(); |
52 | void reject(); | 52 | void reject(); |
53 | 53 | ||
54 | private slots: | 54 | private slots: |
55 | void fillValues( int current ); | 55 | void fillValues( int current ); |
56 | void pickAddress( QLineEdit *line ); | 56 | void pickAddress( QLineEdit *line ); |
57 | void pickAddressTo(); | 57 | void pickAddressTo(); |
58 | void pickAddressCC(); | 58 | void pickAddressCC(); |
59 | void pickAddressBCC(); | 59 | void pickAddressBCC(); |
60 | void pickAddressReply(); | 60 | void pickAddressReply(); |
61 | void addAttachment(); | 61 | void addAttachment(); |
62 | void removeAttachment(); | 62 | void removeAttachment(); |
63 | 63 | ||
64 | protected: | 64 | protected: |
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.cpp b/noncore/net/mail/libmailwrapper/abstractmail.cpp index 68a7a4d..6bebb7b 100644 --- a/noncore/net/mail/libmailwrapper/abstractmail.cpp +++ b/noncore/net/mail/libmailwrapper/abstractmail.cpp | |||
@@ -1,37 +1,38 @@ | |||
1 | #include "abstractmail.h" | 1 | #include "abstractmail.h" |
2 | #include "imapwrapper.h" | 2 | #include "imapwrapper.h" |
3 | #include "pop3wrapper.h" | 3 | #include "pop3wrapper.h" |
4 | #include "nntpwrapper.h" | 4 | #include "nntpwrapper.h" |
5 | #include "mhwrapper.h" | 5 | #include "mhwrapper.h" |
6 | #include "mailtypes.h" | 6 | #include "mailtypes.h" |
7 | 7 | ||
8 | #include <qfile.h> | 8 | #include <qfile.h> |
9 | #include <qtextstream.h> | 9 | #include <qtextstream.h> |
10 | #include <stdlib.h> | 10 | #include <stdlib.h> |
11 | #include <libetpan/mailmime_content.h> | 11 | #include <libetpan/mailmime_content.h> |
12 | #include <libetpan/mailmime.h> | 12 | #include <libetpan/mailmime.h> |
13 | 13 | ||
14 | using namespace Opie::Core; | ||
14 | AbstractMail* AbstractMail::getWrapper(IMAPaccount *a) | 15 | AbstractMail* AbstractMail::getWrapper(IMAPaccount *a) |
15 | { | 16 | { |
16 | return new IMAPwrapper(a); | 17 | return new IMAPwrapper(a); |
17 | } | 18 | } |
18 | 19 | ||
19 | AbstractMail* AbstractMail::getWrapper(POP3account *a) | 20 | AbstractMail* AbstractMail::getWrapper(POP3account *a) |
20 | { | 21 | { |
21 | return new POP3wrapper(a); | 22 | return new POP3wrapper(a); |
22 | } | 23 | } |
23 | 24 | ||
24 | AbstractMail* AbstractMail::getWrapper(NNTPaccount *a) | 25 | AbstractMail* AbstractMail::getWrapper(NNTPaccount *a) |
25 | { | 26 | { |
26 | return new NNTPwrapper(a); | 27 | return new NNTPwrapper(a); |
27 | } | 28 | } |
28 | 29 | ||
29 | AbstractMail* AbstractMail::getWrapper(const QString&a,const QString&name) | 30 | AbstractMail* AbstractMail::getWrapper(const QString&a,const QString&name) |
30 | { | 31 | { |
31 | return new MHwrapper(a,name); | 32 | return new MHwrapper(a,name); |
32 | } | 33 | } |
33 | 34 | ||
34 | AbstractMail* AbstractMail::getWrapper(Account*a) | 35 | AbstractMail* AbstractMail::getWrapper(Account*a) |
35 | { | 36 | { |
36 | if (!a) return 0; | 37 | if (!a) return 0; |
37 | switch (a->getType()) { | 38 | switch (a->getType()) { |
@@ -108,49 +109,49 @@ QString AbstractMail::gen_attachment_id() | |||
108 | 109 | ||
109 | QTextStream stream(&file); | 110 | QTextStream stream(&file); |
110 | 111 | ||
111 | return "{" + stream.read().stripWhiteSpace() + "}"; | 112 | return "{" + stream.read().stripWhiteSpace() + "}"; |
112 | } | 113 | } |
113 | 114 | ||
114 | int AbstractMail::createMbox(const QString&,const FolderP&,const QString& ,bool) | 115 | int AbstractMail::createMbox(const QString&,const FolderP&,const QString& ,bool) |
115 | { | 116 | { |
116 | return 0; | 117 | return 0; |
117 | } | 118 | } |
118 | 119 | ||
119 | QString AbstractMail::defaultLocalfolder() | 120 | QString AbstractMail::defaultLocalfolder() |
120 | { | 121 | { |
121 | QString f = getenv( "HOME" ); | 122 | QString f = getenv( "HOME" ); |
122 | f += "/Applications/opiemail/localmail"; | 123 | f += "/Applications/opiemail/localmail"; |
123 | return f; | 124 | return f; |
124 | } | 125 | } |
125 | 126 | ||
126 | QString AbstractMail::draftFolder() | 127 | QString AbstractMail::draftFolder() |
127 | { | 128 | { |
128 | return QString("Drafts"); | 129 | return QString("Drafts"); |
129 | } | 130 | } |
130 | 131 | ||
131 | /* temporary - will be removed when implemented in all classes */ | 132 | /* temporary - will be removed when implemented in all classes */ |
132 | void AbstractMail::deleteMails(const QString &,const QValueList<Opie::OSmartPointer<RecMail> > &) | 133 | void AbstractMail::deleteMails(const QString &,const QValueList<Opie::Core::OSmartPointer<RecMail> > &) |
133 | { | 134 | { |
134 | } | 135 | } |
135 | 136 | ||
136 | void AbstractMail::mvcpAllMails(const FolderP&fromFolder, | 137 | void AbstractMail::mvcpAllMails(const FolderP&fromFolder, |
137 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) | 138 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) |
138 | { | 139 | { |
139 | QValueList<RecMailP> t; | 140 | QValueList<RecMailP> t; |
140 | listMessages(fromFolder->getName(),t); | 141 | listMessages(fromFolder->getName(),t); |
141 | encodedString*st = 0; | 142 | encodedString*st = 0; |
142 | while (t.count()>0) { | 143 | while (t.count()>0) { |
143 | RecMailP r = (*t.begin()); | 144 | RecMailP r = (*t.begin()); |
144 | st = fetchRawBody(r); | 145 | st = fetchRawBody(r); |
145 | if (st) { | 146 | if (st) { |
146 | targetWrapper->storeMessage(st->Content(),st->Length(),targetFolder); | 147 | targetWrapper->storeMessage(st->Content(),st->Length(),targetFolder); |
147 | delete st; | 148 | delete st; |
148 | } | 149 | } |
149 | t.remove(t.begin()); | 150 | t.remove(t.begin()); |
150 | } | 151 | } |
151 | if (moveit) { | 152 | if (moveit) { |
152 | deleteAllMail(fromFolder); | 153 | deleteAllMail(fromFolder); |
153 | } | 154 | } |
154 | } | 155 | } |
155 | 156 | ||
156 | void AbstractMail::mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) | 157 | void AbstractMail::mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) |
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.h b/noncore/net/mail/libmailwrapper/abstractmail.h index b03d757..2d55c83 100644 --- a/noncore/net/mail/libmailwrapper/abstractmail.h +++ b/noncore/net/mail/libmailwrapper/abstractmail.h | |||
@@ -1,72 +1,72 @@ | |||
1 | #ifndef __abstract_mail_ | 1 | #ifndef __abstract_mail_ |
2 | #define __abstract_mail_ | 2 | #define __abstract_mail_ |
3 | 3 | ||
4 | #include "maildefines.h" | 4 | #include "maildefines.h" |
5 | 5 | ||
6 | #include "settings.h" | 6 | #include "settings.h" |
7 | 7 | ||
8 | #include <qobject.h> | 8 | #include <qobject.h> |
9 | #include <opie2/osmartpointer.h> | 9 | #include <opie2/osmartpointer.h> |
10 | #include "mailtypes.h" | 10 | #include "mailtypes.h" |
11 | 11 | ||
12 | class IMAPwrapper; | 12 | class IMAPwrapper; |
13 | class POP3wrapper; | 13 | class POP3wrapper; |
14 | class Folder; | 14 | class Folder; |
15 | class encodedString; | 15 | class encodedString; |
16 | struct folderStat; | 16 | struct folderStat; |
17 | 17 | ||
18 | class AbstractMail:public QObject | 18 | class AbstractMail:public QObject |
19 | { | 19 | { |
20 | Q_OBJECT | 20 | Q_OBJECT |
21 | public: | 21 | public: |
22 | AbstractMail(){}; | 22 | AbstractMail(){}; |
23 | virtual ~AbstractMail(){} | 23 | virtual ~AbstractMail(){} |
24 | virtual QValueList<Opie::OSmartPointer<Folder> >* listFolders()=0; | 24 | virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders()=0; |
25 | virtual void listMessages(const QString & mailbox,QValueList<RecMailP>&target )=0; | 25 | virtual void listMessages(const QString & mailbox,QValueList<RecMailP>&target )=0; |
26 | virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX")=0; | 26 | virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX")=0; |
27 | virtual RecBody fetchBody(const RecMailP&mail)=0; | 27 | virtual RecBody fetchBody(const RecMailP&mail)=0; |
28 | virtual QString fetchTextPart(const RecMailP&mail,const RecPart&part)=0; | 28 | virtual QString fetchTextPart(const RecMailP&mail,const RecPart&part)=0; |
29 | virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPart&part)=0; | 29 | virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPart&part)=0; |
30 | virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPart&part)=0; | 30 | virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPart&part)=0; |
31 | virtual encodedString* fetchRawBody(const RecMailP&mail)=0; | 31 | virtual encodedString* fetchRawBody(const RecMailP&mail)=0; |
32 | 32 | ||
33 | virtual void deleteMail(const RecMailP&mail)=0; | 33 | virtual void deleteMail(const RecMailP&mail)=0; |
34 | virtual void answeredMail(const RecMailP&mail)=0; | 34 | virtual void answeredMail(const RecMailP&mail)=0; |
35 | virtual int deleteAllMail(const Opie::OSmartPointer<Folder>&)=0; | 35 | virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&)=0; |
36 | virtual void deleteMails(const QString & FolderName,const QValueList<Opie::OSmartPointer<RecMail> >&target); | 36 | virtual void deleteMails(const QString & FolderName,const QValueList<Opie::Core::OSmartPointer<RecMail> >&target); |
37 | virtual int deleteMbox(const Opie::OSmartPointer<Folder>&)=0; | 37 | virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&)=0; |
38 | virtual void storeMessage(const char*msg,size_t length, const QString&folder)=0; | 38 | virtual void storeMessage(const char*msg,size_t length, const QString&folder)=0; |
39 | 39 | ||
40 | virtual void mvcpAllMails(const Opie::OSmartPointer<Folder>&fromFolder, | 40 | virtual void mvcpAllMails(const Opie::Core::OSmartPointer<Folder>&fromFolder, |
41 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit); | 41 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit); |
42 | virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit); | 42 | virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit); |
43 | 43 | ||
44 | virtual void cleanMimeCache(){}; | 44 | virtual void cleanMimeCache(){}; |
45 | /* mail box methods */ | 45 | /* mail box methods */ |
46 | /* parameter is the box to create. | 46 | /* parameter is the box to create. |
47 | * if the implementing subclass has prefixes, | 47 | * if the implementing subclass has prefixes, |
48 | * them has to be appended automatic. | 48 | * them has to be appended automatic. |
49 | */ | 49 | */ |
50 | virtual int createMbox(const QString&,const Opie::OSmartPointer<Folder>&parentfolder=0, | 50 | virtual int createMbox(const QString&,const Opie::Core::OSmartPointer<Folder>&parentfolder=0, |
51 | const QString& delemiter="/",bool getsubfolder=false); | 51 | const QString& delemiter="/",bool getsubfolder=false); |
52 | virtual void logout()=0; | 52 | virtual void logout()=0; |
53 | 53 | ||
54 | static AbstractMail* getWrapper(IMAPaccount *a); | 54 | static AbstractMail* getWrapper(IMAPaccount *a); |
55 | static AbstractMail* getWrapper(POP3account *a); | 55 | static AbstractMail* getWrapper(POP3account *a); |
56 | static AbstractMail* getWrapper(NNTPaccount *a); | 56 | static AbstractMail* getWrapper(NNTPaccount *a); |
57 | /* mbox only! */ | 57 | /* mbox only! */ |
58 | static AbstractMail* getWrapper(const QString&a,const QString&name="Local Folders"); | 58 | static AbstractMail* getWrapper(const QString&a,const QString&name="Local Folders"); |
59 | static AbstractMail* getWrapper(Account*a); | 59 | static AbstractMail* getWrapper(Account*a); |
60 | 60 | ||
61 | static QString defaultLocalfolder(); | 61 | static QString defaultLocalfolder(); |
62 | static QString draftFolder(); | 62 | static QString draftFolder(); |
63 | 63 | ||
64 | virtual MAILLIB::ATYPE getType()const=0; | 64 | virtual MAILLIB::ATYPE getType()const=0; |
65 | virtual const QString&getName()const=0; | 65 | virtual const QString&getName()const=0; |
66 | 66 | ||
67 | protected: | 67 | protected: |
68 | static encodedString*decode_String(const encodedString*text,const QString&enc); | 68 | static encodedString*decode_String(const encodedString*text,const QString&enc); |
69 | static QString convert_String(const char*text); | 69 | static QString convert_String(const char*text); |
70 | static QString gen_attachment_id(); | 70 | static QString gen_attachment_id(); |
71 | }; | 71 | }; |
72 | #endif | 72 | #endif |
diff --git a/noncore/net/mail/libmailwrapper/generatemail.cpp b/noncore/net/mail/libmailwrapper/generatemail.cpp index cb7ccc0..cb58d82 100644 --- a/noncore/net/mail/libmailwrapper/generatemail.cpp +++ b/noncore/net/mail/libmailwrapper/generatemail.cpp | |||
@@ -1,31 +1,32 @@ | |||
1 | #include "generatemail.h" | 1 | #include "generatemail.h" |
2 | #include "mailwrapper.h" | 2 | #include "mailwrapper.h" |
3 | 3 | ||
4 | #include <libetpan/libetpan.h> | 4 | #include <libetpan/libetpan.h> |
5 | 5 | ||
6 | #include <qt.h> | 6 | #include <qt.h> |
7 | 7 | ||
8 | using namespace Opie::Core; | ||
8 | const char* Generatemail::USER_AGENT="OpieMail v0.6"; | 9 | const char* Generatemail::USER_AGENT="OpieMail v0.6"; |
9 | 10 | ||
10 | Generatemail::Generatemail() | 11 | Generatemail::Generatemail() |
11 | { | 12 | { |
12 | } | 13 | } |
13 | 14 | ||
14 | Generatemail::~Generatemail() | 15 | Generatemail::~Generatemail() |
15 | { | 16 | { |
16 | } | 17 | } |
17 | 18 | ||
18 | void Generatemail::addRcpts( clist *list, mailimf_address_list *addr_list ) { | 19 | void Generatemail::addRcpts( clist *list, mailimf_address_list *addr_list ) { |
19 | clistiter *it, *it2; | 20 | clistiter *it, *it2; |
20 | 21 | ||
21 | for ( it = clist_begin( addr_list->ad_list ); it; it = it->next ) { | 22 | for ( it = clist_begin( addr_list->ad_list ); it; it = it->next ) { |
22 | mailimf_address *addr; | 23 | mailimf_address *addr; |
23 | addr = (mailimf_address *) it->data; | 24 | addr = (mailimf_address *) it->data; |
24 | 25 | ||
25 | if ( addr->ad_type == MAILIMF_ADDRESS_MAILBOX ) { | 26 | if ( addr->ad_type == MAILIMF_ADDRESS_MAILBOX ) { |
26 | esmtp_address_list_add( list, addr->ad_data.ad_mailbox->mb_addr_spec, 0, NULL ); | 27 | esmtp_address_list_add( list, addr->ad_data.ad_mailbox->mb_addr_spec, 0, NULL ); |
27 | } else if ( addr->ad_type == MAILIMF_ADDRESS_GROUP ) { | 28 | } else if ( addr->ad_type == MAILIMF_ADDRESS_GROUP ) { |
28 | clist *l = addr->ad_data.ad_group->grp_mb_list->mb_list; | 29 | clist *l = addr->ad_data.ad_group->grp_mb_list->mb_list; |
29 | for ( it2 = clist_begin( l ); it2; it2 = it2->next ) { | 30 | for ( it2 = clist_begin( l ); it2; it2 = it2->next ) { |
30 | mailimf_mailbox *mbox; | 31 | mailimf_mailbox *mbox; |
31 | mbox = (mailimf_mailbox *) it2->data; | 32 | mbox = (mailimf_mailbox *) it2->data; |
@@ -258,49 +259,49 @@ mailmime *Generatemail::buildTxtPart(const QString&str ) { | |||
258 | if ( err != MAILIMF_NO_ERROR ) | 259 | if ( err != MAILIMF_NO_ERROR ) |
259 | goto err_free_txtPart; | 260 | goto err_free_txtPart; |
260 | 261 | ||
261 | return txtPart; // Success :) | 262 | return txtPart; // Success :) |
262 | 263 | ||
263 | err_free_txtPart: | 264 | err_free_txtPart: |
264 | mailmime_free( txtPart ); | 265 | mailmime_free( txtPart ); |
265 | err_free_fields: | 266 | err_free_fields: |
266 | mailmime_fields_free( fields ); | 267 | mailmime_fields_free( fields ); |
267 | err_free_content: | 268 | err_free_content: |
268 | mailmime_content_free( content ); | 269 | mailmime_content_free( content ); |
269 | err_free_param: | 270 | err_free_param: |
270 | mailmime_parameter_free( param ); | 271 | mailmime_parameter_free( param ); |
271 | err_free: | 272 | err_free: |
272 | qDebug( "buildTxtPart - error" ); | 273 | qDebug( "buildTxtPart - error" ); |
273 | 274 | ||
274 | return NULL; // Error :( | 275 | return NULL; // Error :( |
275 | } | 276 | } |
276 | 277 | ||
277 | mailimf_mailbox *Generatemail::newMailbox(const QString&name, const QString&mail ) { | 278 | mailimf_mailbox *Generatemail::newMailbox(const QString&name, const QString&mail ) { |
278 | return mailimf_mailbox_new( strdup( name.latin1() ), | 279 | return mailimf_mailbox_new( strdup( name.latin1() ), |
279 | strdup( mail.latin1() ) ); | 280 | strdup( mail.latin1() ) ); |
280 | } | 281 | } |
281 | 282 | ||
282 | mailimf_fields *Generatemail::createImfFields(const Opie::OSmartPointer<Mail>&mail ) | 283 | mailimf_fields *Generatemail::createImfFields(const Opie::Core::OSmartPointer<Mail>&mail ) |
283 | { | 284 | { |
284 | mailimf_fields *fields = NULL; | 285 | mailimf_fields *fields = NULL; |
285 | mailimf_field *xmailer = NULL; | 286 | mailimf_field *xmailer = NULL; |
286 | mailimf_mailbox *sender=0,*fromBox=0; | 287 | mailimf_mailbox *sender=0,*fromBox=0; |
287 | mailimf_mailbox_list *from=0; | 288 | mailimf_mailbox_list *from=0; |
288 | mailimf_address_list *to=0, *cc=0, *bcc=0, *reply=0; | 289 | mailimf_address_list *to=0, *cc=0, *bcc=0, *reply=0; |
289 | clist*in_reply_to = 0; | 290 | clist*in_reply_to = 0; |
290 | char *subject = strdup( mail->getSubject().latin1() ); | 291 | char *subject = strdup( mail->getSubject().latin1() ); |
291 | int err; | 292 | int err; |
292 | int res = 1; | 293 | int res = 1; |
293 | 294 | ||
294 | sender = newMailbox( mail->getName(), mail->getMail() ); | 295 | sender = newMailbox( mail->getName(), mail->getMail() ); |
295 | if ( sender == NULL ) { | 296 | if ( sender == NULL ) { |
296 | res = 0; | 297 | res = 0; |
297 | } | 298 | } |
298 | 299 | ||
299 | if (res) { | 300 | if (res) { |
300 | fromBox = newMailbox( mail->getName(), mail->getMail() ); | 301 | fromBox = newMailbox( mail->getName(), mail->getMail() ); |
301 | } | 302 | } |
302 | if ( fromBox == NULL ) { | 303 | if ( fromBox == NULL ) { |
303 | res = 0; | 304 | res = 0; |
304 | } | 305 | } |
305 | 306 | ||
306 | if (res) { | 307 | if (res) { |
@@ -378,49 +379,49 @@ mailimf_fields *Generatemail::createImfFields(const Opie::OSmartPointer<Mail>&ma | |||
378 | if (reply) | 379 | if (reply) |
379 | mailimf_address_list_free( reply ); | 380 | mailimf_address_list_free( reply ); |
380 | if (bcc) | 381 | if (bcc) |
381 | mailimf_address_list_free( bcc ); | 382 | mailimf_address_list_free( bcc ); |
382 | if (cc) | 383 | if (cc) |
383 | mailimf_address_list_free( cc ); | 384 | mailimf_address_list_free( cc ); |
384 | if (to) | 385 | if (to) |
385 | mailimf_address_list_free( to ); | 386 | mailimf_address_list_free( to ); |
386 | if (fromBox) { | 387 | if (fromBox) { |
387 | mailimf_mailbox_free( fromBox ); | 388 | mailimf_mailbox_free( fromBox ); |
388 | } else if (from) { | 389 | } else if (from) { |
389 | mailimf_mailbox_list_free( from ); | 390 | mailimf_mailbox_list_free( from ); |
390 | } | 391 | } |
391 | if (sender) { | 392 | if (sender) { |
392 | mailimf_mailbox_free( sender ); | 393 | mailimf_mailbox_free( sender ); |
393 | } | 394 | } |
394 | if (subject) { | 395 | if (subject) { |
395 | free( subject ); | 396 | free( subject ); |
396 | } | 397 | } |
397 | } | 398 | } |
398 | } | 399 | } |
399 | return fields; | 400 | return fields; |
400 | } | 401 | } |
401 | 402 | ||
402 | mailmime *Generatemail::createMimeMail(const Opie::OSmartPointer<Mail> &mail ) { | 403 | mailmime *Generatemail::createMimeMail(const Opie::Core::OSmartPointer<Mail> &mail ) { |
403 | mailmime *message, *txtPart; | 404 | mailmime *message, *txtPart; |
404 | mailimf_fields *fields; | 405 | mailimf_fields *fields; |
405 | int err; | 406 | int err; |
406 | 407 | ||
407 | fields = createImfFields( mail ); | 408 | fields = createImfFields( mail ); |
408 | if ( fields == NULL ) | 409 | if ( fields == NULL ) |
409 | goto err_free; | 410 | goto err_free; |
410 | 411 | ||
411 | message = mailmime_new_message_data( NULL ); | 412 | message = mailmime_new_message_data( NULL ); |
412 | if ( message == NULL ) | 413 | if ( message == NULL ) |
413 | goto err_free_fields; | 414 | goto err_free_fields; |
414 | 415 | ||
415 | mailmime_set_imf_fields( message, fields ); | 416 | mailmime_set_imf_fields( message, fields ); |
416 | 417 | ||
417 | txtPart = buildTxtPart( mail->getMessage() ); | 418 | txtPart = buildTxtPart( mail->getMessage() ); |
418 | 419 | ||
419 | if ( txtPart == NULL ) | 420 | if ( txtPart == NULL ) |
420 | goto err_free_message; | 421 | goto err_free_message; |
421 | 422 | ||
422 | err = mailmime_smart_add_part( message, txtPart ); | 423 | err = mailmime_smart_add_part( message, txtPart ); |
423 | if ( err != MAILIMF_NO_ERROR ) | 424 | if ( err != MAILIMF_NO_ERROR ) |
424 | goto err_free_txtPart; | 425 | goto err_free_txtPart; |
425 | 426 | ||
426 | addFileParts( message, mail->getAttachments() ); | 427 | addFileParts( message, mail->getAttachments() ); |
diff --git a/noncore/net/mail/libmailwrapper/generatemail.h b/noncore/net/mail/libmailwrapper/generatemail.h index c246a2a..a767b61 100644 --- a/noncore/net/mail/libmailwrapper/generatemail.h +++ b/noncore/net/mail/libmailwrapper/generatemail.h | |||
@@ -15,32 +15,32 @@ struct mailimf_fields; | |||
15 | struct mailimf_field; | 15 | struct mailimf_field; |
16 | struct mailimf_mailbox; | 16 | struct mailimf_mailbox; |
17 | struct mailmime; | 17 | struct mailmime; |
18 | struct mailimf_address_list; | 18 | struct mailimf_address_list; |
19 | class progressMailSend; | 19 | class progressMailSend; |
20 | struct mailsmtp; | 20 | struct mailsmtp; |
21 | 21 | ||
22 | class Generatemail : public QObject | 22 | class Generatemail : public QObject |
23 | { | 23 | { |
24 | Q_OBJECT | 24 | Q_OBJECT |
25 | public: | 25 | public: |
26 | Generatemail(); | 26 | Generatemail(); |
27 | virtual ~Generatemail(); | 27 | virtual ~Generatemail(); |
28 | 28 | ||
29 | protected: | 29 | protected: |
30 | static void addRcpts( clist *list, mailimf_address_list *addr_list ); | 30 | static void addRcpts( clist *list, mailimf_address_list *addr_list ); |
31 | static char *getFrom( mailmime *mail ); | 31 | static char *getFrom( mailmime *mail ); |
32 | static char *getFrom( mailimf_field *ffrom); | 32 | static char *getFrom( mailimf_field *ffrom); |
33 | static mailimf_field *getField( mailimf_fields *fields, int type ); | 33 | static mailimf_field *getField( mailimf_fields *fields, int type ); |
34 | mailimf_address_list *parseAddresses(const QString&addr ); | 34 | mailimf_address_list *parseAddresses(const QString&addr ); |
35 | void addFileParts( mailmime *message,const QList<Attachment>&files ); | 35 | void addFileParts( mailmime *message,const QList<Attachment>&files ); |
36 | mailmime *buildFilePart(const QString&filename,const QString&mimetype,const QString&content); | 36 | mailmime *buildFilePart(const QString&filename,const QString&mimetype,const QString&content); |
37 | mailmime *buildTxtPart(const QString&str ); | 37 | mailmime *buildTxtPart(const QString&str ); |
38 | mailimf_mailbox *newMailbox(const QString&name,const QString&mail ); | 38 | mailimf_mailbox *newMailbox(const QString&name,const QString&mail ); |
39 | mailimf_fields *createImfFields(const Opie::OSmartPointer<Mail> &mail ); | 39 | mailimf_fields *createImfFields(const Opie::Core::OSmartPointer<Mail> &mail ); |
40 | mailmime *createMimeMail(const Opie::OSmartPointer<Mail>&mail ); | 40 | mailmime *createMimeMail(const Opie::Core::OSmartPointer<Mail>&mail ); |
41 | clist *createRcptList( mailimf_fields *fields ); | 41 | clist *createRcptList( mailimf_fields *fields ); |
42 | 42 | ||
43 | static const char* USER_AGENT; | 43 | static const char* USER_AGENT; |
44 | }; | 44 | }; |
45 | 45 | ||
46 | #endif | 46 | #endif |
diff --git a/noncore/net/mail/libmailwrapper/genericwrapper.cpp b/noncore/net/mail/libmailwrapper/genericwrapper.cpp index ee2c8cd..f428415 100644 --- a/noncore/net/mail/libmailwrapper/genericwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/genericwrapper.cpp | |||
@@ -1,28 +1,29 @@ | |||
1 | #include "genericwrapper.h" | 1 | #include "genericwrapper.h" |
2 | #include <libetpan/libetpan.h> | 2 | #include <libetpan/libetpan.h> |
3 | #include "mailtypes.h" | 3 | #include "mailtypes.h" |
4 | 4 | ||
5 | using namespace Opie::Core; | ||
5 | Genericwrapper::Genericwrapper() | 6 | Genericwrapper::Genericwrapper() |
6 | : AbstractMail() | 7 | : AbstractMail() |
7 | { | 8 | { |
8 | bodyCache.clear(); | 9 | bodyCache.clear(); |
9 | m_storage = 0; | 10 | m_storage = 0; |
10 | m_folder = 0; | 11 | m_folder = 0; |
11 | } | 12 | } |
12 | 13 | ||
13 | Genericwrapper::~Genericwrapper() | 14 | Genericwrapper::~Genericwrapper() |
14 | { | 15 | { |
15 | if (m_folder) { | 16 | if (m_folder) { |
16 | mailfolder_free(m_folder); | 17 | mailfolder_free(m_folder); |
17 | } | 18 | } |
18 | if (m_storage) { | 19 | if (m_storage) { |
19 | mailstorage_free(m_storage); | 20 | mailstorage_free(m_storage); |
20 | } | 21 | } |
21 | cleanMimeCache(); | 22 | cleanMimeCache(); |
22 | } | 23 | } |
23 | 24 | ||
24 | void Genericwrapper::fillSingleBody(RecPart&target,mailmessage*,mailmime*mime) | 25 | void Genericwrapper::fillSingleBody(RecPart&target,mailmessage*,mailmime*mime) |
25 | { | 26 | { |
26 | if (!mime) { | 27 | if (!mime) { |
27 | return; | 28 | return; |
28 | } | 29 | } |
@@ -366,49 +367,49 @@ void Genericwrapper::cleanMimeCache() | |||
366 | bodyCache.clear(); | 367 | bodyCache.clear(); |
367 | qDebug("Genericwrapper: cache cleaned"); | 368 | qDebug("Genericwrapper: cache cleaned"); |
368 | } | 369 | } |
369 | 370 | ||
370 | QStringList Genericwrapper::parseInreplies(mailimf_in_reply_to * in_replies) | 371 | QStringList Genericwrapper::parseInreplies(mailimf_in_reply_to * in_replies) |
371 | { | 372 | { |
372 | QStringList res; | 373 | QStringList res; |
373 | if (!in_replies || !in_replies->mid_list) return res; | 374 | if (!in_replies || !in_replies->mid_list) return res; |
374 | clistiter * current = 0; | 375 | clistiter * current = 0; |
375 | for ( current = clist_begin( in_replies->mid_list ); current != NULL; current = current->next ) { | 376 | for ( current = clist_begin( in_replies->mid_list ); current != NULL; current = current->next ) { |
376 | QString h((char*)current->data); | 377 | QString h((char*)current->data); |
377 | while (h.length()>0 && h[0]=='<') { | 378 | while (h.length()>0 && h[0]=='<') { |
378 | h.remove(0,1); | 379 | h.remove(0,1); |
379 | } | 380 | } |
380 | while (h.length()>0 && h[h.length()-1]=='>') { | 381 | while (h.length()>0 && h[h.length()-1]=='>') { |
381 | h.remove(h.length()-1,1); | 382 | h.remove(h.length()-1,1); |
382 | } | 383 | } |
383 | if (h.length()>0) { | 384 | if (h.length()>0) { |
384 | res.append(h); | 385 | res.append(h); |
385 | } | 386 | } |
386 | } | 387 | } |
387 | return res; | 388 | return res; |
388 | } | 389 | } |
389 | 390 | ||
390 | void Genericwrapper::parseList(QValueList<Opie::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to) | 391 | void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to) |
391 | { | 392 | { |
392 | int r; | 393 | int r; |
393 | mailmessage_list * env_list = 0; | 394 | mailmessage_list * env_list = 0; |
394 | r = mailsession_get_messages_list(session,&env_list); | 395 | r = mailsession_get_messages_list(session,&env_list); |
395 | if (r != MAIL_NO_ERROR) { | 396 | if (r != MAIL_NO_ERROR) { |
396 | qDebug("Error message list"); | 397 | qDebug("Error message list"); |
397 | return; | 398 | return; |
398 | } | 399 | } |
399 | r = mailsession_get_envelopes_list(session, env_list); | 400 | r = mailsession_get_envelopes_list(session, env_list); |
400 | if (r != MAIL_NO_ERROR) { | 401 | if (r != MAIL_NO_ERROR) { |
401 | qDebug("Error filling message list"); | 402 | qDebug("Error filling message list"); |
402 | if (env_list) { | 403 | if (env_list) { |
403 | mailmessage_list_free(env_list); | 404 | mailmessage_list_free(env_list); |
404 | } | 405 | } |
405 | return; | 406 | return; |
406 | } | 407 | } |
407 | mailimf_references * refs = 0; | 408 | mailimf_references * refs = 0; |
408 | mailimf_in_reply_to * in_replies = 0; | 409 | mailimf_in_reply_to * in_replies = 0; |
409 | uint32_t i = 0; | 410 | uint32_t i = 0; |
410 | for(; i < carray_count(env_list->msg_tab) ; ++i) { | 411 | for(; i < carray_count(env_list->msg_tab) ; ++i) { |
411 | mailmessage * msg; | 412 | mailmessage * msg; |
412 | QBitArray mFlags(7); | 413 | QBitArray mFlags(7); |
413 | msg = (mailmessage*)carray_get(env_list->msg_tab, i); | 414 | msg = (mailmessage*)carray_get(env_list->msg_tab, i); |
414 | if (msg->msg_fields == NULL) { | 415 | if (msg->msg_fields == NULL) { |
diff --git a/noncore/net/mail/libmailwrapper/genericwrapper.h b/noncore/net/mail/libmailwrapper/genericwrapper.h index f9968d1..f5b9504 100644 --- a/noncore/net/mail/libmailwrapper/genericwrapper.h +++ b/noncore/net/mail/libmailwrapper/genericwrapper.h | |||
@@ -17,51 +17,51 @@ struct mailimf_mailbox_list; | |||
17 | struct mailimf_mailbox; | 17 | struct mailimf_mailbox; |
18 | struct mailimf_date_time; | 18 | struct mailimf_date_time; |
19 | struct mailimf_group; | 19 | struct mailimf_group; |
20 | struct mailimf_address_list; | 20 | struct mailimf_address_list; |
21 | struct mailsession; | 21 | struct mailsession; |
22 | struct mailstorage; | 22 | struct mailstorage; |
23 | struct mailfolder; | 23 | struct mailfolder; |
24 | struct mailimf_in_reply_to; | 24 | struct mailimf_in_reply_to; |
25 | 25 | ||
26 | /* this class hold just the funs shared between | 26 | /* this class hold just the funs shared between |
27 | * mbox and pop3 (later mh, too) mail access. | 27 | * mbox and pop3 (later mh, too) mail access. |
28 | * it is not desigend to make a instance of it! | 28 | * it is not desigend to make a instance of it! |
29 | */ | 29 | */ |
30 | class Genericwrapper : public AbstractMail | 30 | class Genericwrapper : public AbstractMail |
31 | { | 31 | { |
32 | Q_OBJECT | 32 | Q_OBJECT |
33 | public: | 33 | public: |
34 | Genericwrapper(); | 34 | Genericwrapper(); |
35 | virtual ~Genericwrapper(); | 35 | virtual ~Genericwrapper(); |
36 | 36 | ||
37 | virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPart&part); | 37 | virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPart&part); |
38 | virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPart&part); | 38 | virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPart&part); |
39 | virtual QString fetchTextPart(const RecMailP&mail,const RecPart&part); | 39 | virtual QString fetchTextPart(const RecMailP&mail,const RecPart&part); |
40 | virtual void cleanMimeCache(); | 40 | virtual void cleanMimeCache(); |
41 | virtual int deleteMbox(const Opie::OSmartPointer<Folder>&){return 1;} | 41 | virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&){return 1;} |
42 | virtual void logout(){}; | 42 | virtual void logout(){}; |
43 | virtual void storeMessage(const char*msg,size_t length, const QString&folder){}; | 43 | virtual void storeMessage(const char*msg,size_t length, const QString&folder){}; |
44 | 44 | ||
45 | protected: | 45 | protected: |
46 | RecBody parseMail( mailmessage * msg ); | 46 | RecBody parseMail( mailmessage * msg ); |
47 | QString parseMailboxList( mailimf_mailbox_list *list ); | 47 | QString parseMailboxList( mailimf_mailbox_list *list ); |
48 | QString parseMailbox( mailimf_mailbox *box ); | 48 | QString parseMailbox( mailimf_mailbox *box ); |
49 | QString parseGroup( mailimf_group *group ); | 49 | QString parseGroup( mailimf_group *group ); |
50 | QString parseAddressList( mailimf_address_list *list ); | 50 | QString parseAddressList( mailimf_address_list *list ); |
51 | QString parseDateTime( mailimf_date_time *date ); | 51 | QString parseDateTime( mailimf_date_time *date ); |
52 | 52 | ||
53 | void traverseBody(RecBody&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rek=0,int current_count=1); | 53 | void traverseBody(RecBody&target,mailmessage*message,mailmime*mime,QValueList<int>recList,unsigned int current_rek=0,int current_count=1); |
54 | static void fillSingleBody(RecPart&target,mailmessage*message,mailmime*mime); | 54 | static void fillSingleBody(RecPart&target,mailmessage*message,mailmime*mime); |
55 | static void fillParameters(RecPart&target,clist*parameters); | 55 | static void fillParameters(RecPart&target,clist*parameters); |
56 | static QString getencoding(mailmime_mechanism*aEnc); | 56 | static QString getencoding(mailmime_mechanism*aEnc); |
57 | virtual void parseList(QValueList<Opie::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to=false); | 57 | virtual void parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &target,mailsession*session,const QString&mailbox,bool mbox_as_to=false); |
58 | QStringList parseInreplies(mailimf_in_reply_to * in_replies); | 58 | QStringList parseInreplies(mailimf_in_reply_to * in_replies); |
59 | 59 | ||
60 | QString msgTempName; | 60 | QString msgTempName; |
61 | unsigned int last_msg_id; | 61 | unsigned int last_msg_id; |
62 | QMap<QString,encodedString*> bodyCache; | 62 | QMap<QString,encodedString*> bodyCache; |
63 | mailstorage * m_storage; | 63 | mailstorage * m_storage; |
64 | mailfolder*m_folder; | 64 | mailfolder*m_folder; |
65 | }; | 65 | }; |
66 | 66 | ||
67 | #endif | 67 | #endif |
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 071e734..56e7df9 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp | |||
@@ -1,32 +1,33 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | #include <libetpan/libetpan.h> | 2 | #include <libetpan/libetpan.h> |
3 | #include <qpe/global.h> | 3 | #include <qpe/global.h> |
4 | 4 | ||
5 | #include "imapwrapper.h" | 5 | #include "imapwrapper.h" |
6 | #include "mailtypes.h" | 6 | #include "mailtypes.h" |
7 | #include "logindialog.h" | 7 | #include "logindialog.h" |
8 | 8 | ||
9 | using namespace Opie::Core; | ||
9 | IMAPwrapper::IMAPwrapper( IMAPaccount *a ) | 10 | IMAPwrapper::IMAPwrapper( IMAPaccount *a ) |
10 | : AbstractMail() | 11 | : AbstractMail() |
11 | { | 12 | { |
12 | account = a; | 13 | account = a; |
13 | m_imap = 0; | 14 | m_imap = 0; |
14 | m_Lastmbox = ""; | 15 | m_Lastmbox = ""; |
15 | } | 16 | } |
16 | 17 | ||
17 | IMAPwrapper::~IMAPwrapper() | 18 | IMAPwrapper::~IMAPwrapper() |
18 | { | 19 | { |
19 | logout(); | 20 | logout(); |
20 | } | 21 | } |
21 | 22 | ||
22 | /* to avoid to often select statements in loops etc. | 23 | /* to avoid to often select statements in loops etc. |
23 | we trust that we are logged in and connection is established!*/ | 24 | we trust that we are logged in and connection is established!*/ |
24 | int IMAPwrapper::selectMbox(const QString&mbox) | 25 | int IMAPwrapper::selectMbox(const QString&mbox) |
25 | { | 26 | { |
26 | if (mbox == m_Lastmbox) { | 27 | if (mbox == m_Lastmbox) { |
27 | return MAILIMAP_NO_ERROR; | 28 | return MAILIMAP_NO_ERROR; |
28 | } | 29 | } |
29 | int err = mailimap_select( m_imap, (char*)mbox.latin1()); | 30 | int err = mailimap_select( m_imap, (char*)mbox.latin1()); |
30 | if ( err != MAILIMAP_NO_ERROR ) { | 31 | if ( err != MAILIMAP_NO_ERROR ) { |
31 | qDebug("error selecting mailbox: %s",m_imap->imap_response); | 32 | qDebug("error selecting mailbox: %s",m_imap->imap_response); |
32 | m_Lastmbox = ""; | 33 | m_Lastmbox = ""; |
@@ -184,49 +185,49 @@ void IMAPwrapper::login() | |||
184 | err = mailimap_login_simple( m_imap, (char*)user, (char*)pass ); | 185 | err = mailimap_login_simple( m_imap, (char*)user, (char*)pass ); |
185 | if ( err != MAILIMAP_NO_ERROR ) { | 186 | if ( err != MAILIMAP_NO_ERROR ) { |
186 | Global::statusMessage(tr("error logging in imap server: %1").arg(m_imap->imap_response)); | 187 | Global::statusMessage(tr("error logging in imap server: %1").arg(m_imap->imap_response)); |
187 | ok = false; | 188 | ok = false; |
188 | } | 189 | } |
189 | } | 190 | } |
190 | if (!ok) { | 191 | if (!ok) { |
191 | err = mailimap_close( m_imap ); | 192 | err = mailimap_close( m_imap ); |
192 | mailimap_free( m_imap ); | 193 | mailimap_free( m_imap ); |
193 | m_imap = 0; | 194 | m_imap = 0; |
194 | } | 195 | } |
195 | } | 196 | } |
196 | 197 | ||
197 | void IMAPwrapper::logout() | 198 | void IMAPwrapper::logout() |
198 | { | 199 | { |
199 | int err = MAILIMAP_NO_ERROR; | 200 | int err = MAILIMAP_NO_ERROR; |
200 | if (!m_imap) return; | 201 | if (!m_imap) return; |
201 | err = mailimap_logout( m_imap ); | 202 | err = mailimap_logout( m_imap ); |
202 | err = mailimap_close( m_imap ); | 203 | err = mailimap_close( m_imap ); |
203 | mailimap_free( m_imap ); | 204 | mailimap_free( m_imap ); |
204 | m_imap = 0; | 205 | m_imap = 0; |
205 | m_Lastmbox = ""; | 206 | m_Lastmbox = ""; |
206 | } | 207 | } |
207 | 208 | ||
208 | void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::OSmartPointer<RecMail> > &target ) | 209 | void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::Core::OSmartPointer<RecMail> > &target ) |
209 | { | 210 | { |
210 | int err = MAILIMAP_NO_ERROR; | 211 | int err = MAILIMAP_NO_ERROR; |
211 | clist *result = 0; | 212 | clist *result = 0; |
212 | clistcell *current; | 213 | clistcell *current; |
213 | mailimap_fetch_type *fetchType = 0; | 214 | mailimap_fetch_type *fetchType = 0; |
214 | mailimap_set *set = 0; | 215 | mailimap_set *set = 0; |
215 | 216 | ||
216 | login(); | 217 | login(); |
217 | if (!m_imap) { | 218 | if (!m_imap) { |
218 | return; | 219 | return; |
219 | } | 220 | } |
220 | /* select mailbox READONLY for operations */ | 221 | /* select mailbox READONLY for operations */ |
221 | err = selectMbox(mailbox); | 222 | err = selectMbox(mailbox); |
222 | if ( err != MAILIMAP_NO_ERROR ) { | 223 | if ( err != MAILIMAP_NO_ERROR ) { |
223 | return; | 224 | return; |
224 | } | 225 | } |
225 | 226 | ||
226 | int last = m_imap->imap_selection_info->sel_exists; | 227 | int last = m_imap->imap_selection_info->sel_exists; |
227 | 228 | ||
228 | if (last == 0) { | 229 | if (last == 0) { |
229 | Global::statusMessage(tr("Mailbox has no mails")); | 230 | Global::statusMessage(tr("Mailbox has no mails")); |
230 | return; | 231 | return; |
231 | } else { | 232 | } else { |
232 | } | 233 | } |
@@ -245,49 +246,49 @@ void IMAPwrapper::listMessages(const QString&mailbox,QValueList<Opie::OSmartPoin | |||
245 | 246 | ||
246 | QString date,subject,from; | 247 | QString date,subject,from; |
247 | 248 | ||
248 | if ( err == MAILIMAP_NO_ERROR ) { | 249 | if ( err == MAILIMAP_NO_ERROR ) { |
249 | mailimap_msg_att * msg_att; | 250 | mailimap_msg_att * msg_att; |
250 | int i = 0; | 251 | int i = 0; |
251 | for (current = clist_begin(result); current != 0; current=clist_next(current)) { | 252 | for (current = clist_begin(result); current != 0; current=clist_next(current)) { |
252 | ++i; | 253 | ++i; |
253 | msg_att = (mailimap_msg_att*)current->data; | 254 | msg_att = (mailimap_msg_att*)current->data; |
254 | RecMail*m = parse_list_result(msg_att); | 255 | RecMail*m = parse_list_result(msg_att); |
255 | if (m) { | 256 | if (m) { |
256 | m->setNumber(i); | 257 | m->setNumber(i); |
257 | m->setMbox(mailbox); | 258 | m->setMbox(mailbox); |
258 | m->setWrapper(this); | 259 | m->setWrapper(this); |
259 | target.append(m); | 260 | target.append(m); |
260 | } | 261 | } |
261 | } | 262 | } |
262 | Global::statusMessage(tr("Mailbox has %1 mails").arg(target.count())); | 263 | Global::statusMessage(tr("Mailbox has %1 mails").arg(target.count())); |
263 | } else { | 264 | } else { |
264 | Global::statusMessage(tr("Error fetching headers: %1").arg(m_imap->imap_response)); | 265 | Global::statusMessage(tr("Error fetching headers: %1").arg(m_imap->imap_response)); |
265 | } | 266 | } |
266 | if (result) mailimap_fetch_list_free(result); | 267 | if (result) mailimap_fetch_list_free(result); |
267 | } | 268 | } |
268 | 269 | ||
269 | QValueList<Opie::OSmartPointer<Folder> >* IMAPwrapper::listFolders() | 270 | QValueList<Opie::Core::OSmartPointer<Folder> >* IMAPwrapper::listFolders() |
270 | { | 271 | { |
271 | const char *path, *mask; | 272 | const char *path, *mask; |
272 | int err = MAILIMAP_NO_ERROR; | 273 | int err = MAILIMAP_NO_ERROR; |
273 | clist *result = 0; | 274 | clist *result = 0; |
274 | clistcell *current = 0; | 275 | clistcell *current = 0; |
275 | clistcell*cur_flag = 0; | 276 | clistcell*cur_flag = 0; |
276 | mailimap_mbx_list_flags*bflags = 0; | 277 | mailimap_mbx_list_flags*bflags = 0; |
277 | 278 | ||
278 | QValueList<FolderP>* folders = new QValueList<FolderP>(); | 279 | QValueList<FolderP>* folders = new QValueList<FolderP>(); |
279 | login(); | 280 | login(); |
280 | if (!m_imap) { | 281 | if (!m_imap) { |
281 | return folders; | 282 | return folders; |
282 | } | 283 | } |
283 | 284 | ||
284 | /* | 285 | /* |
285 | * First we have to check for INBOX 'cause it sometimes it's not inside the path. | 286 | * First we have to check for INBOX 'cause it sometimes it's not inside the path. |
286 | * We must not forget to filter them out in next loop! | 287 | * We must not forget to filter them out in next loop! |
287 | * it seems like ugly code. and yes - it is ugly code. but the best way. | 288 | * it seems like ugly code. and yes - it is ugly code. but the best way. |
288 | */ | 289 | */ |
289 | QString temp; | 290 | QString temp; |
290 | mask = "INBOX" ; | 291 | mask = "INBOX" ; |
291 | mailimap_mailbox_list *list; | 292 | mailimap_mailbox_list *list; |
292 | err = mailimap_list( m_imap, (char*)"", (char*)mask, &result ); | 293 | err = mailimap_list( m_imap, (char*)"", (char*)mask, &result ); |
293 | QString del; | 294 | QString del; |
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.h b/noncore/net/mail/libmailwrapper/imapwrapper.h index 3bd5967..7448acb 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.h +++ b/noncore/net/mail/libmailwrapper/imapwrapper.h | |||
@@ -2,69 +2,69 @@ | |||
2 | #define __IMAPWRAPPER | 2 | #define __IMAPWRAPPER |
3 | 3 | ||
4 | #include <qlist.h> | 4 | #include <qlist.h> |
5 | #include "mailwrapper.h" | 5 | #include "mailwrapper.h" |
6 | #include "abstractmail.h" | 6 | #include "abstractmail.h" |
7 | #include <libetpan/clist.h> | 7 | #include <libetpan/clist.h> |
8 | 8 | ||
9 | struct mailimap; | 9 | struct mailimap; |
10 | struct mailimap_body; | 10 | struct mailimap_body; |
11 | struct mailimap_body_type_1part; | 11 | struct mailimap_body_type_1part; |
12 | struct mailimap_body_type_text; | 12 | struct mailimap_body_type_text; |
13 | struct mailimap_body_type_basic; | 13 | struct mailimap_body_type_basic; |
14 | struct mailimap_body_type_msg; | 14 | struct mailimap_body_type_msg; |
15 | struct mailimap_body_type_mpart; | 15 | struct mailimap_body_type_mpart; |
16 | struct mailimap_body_fields; | 16 | struct mailimap_body_fields; |
17 | struct mailimap_msg_att; | 17 | struct mailimap_msg_att; |
18 | class encodedString; | 18 | class encodedString; |
19 | 19 | ||
20 | class IMAPwrapper : public AbstractMail | 20 | class IMAPwrapper : public AbstractMail |
21 | { | 21 | { |
22 | Q_OBJECT | 22 | Q_OBJECT |
23 | public: | 23 | public: |
24 | IMAPwrapper( IMAPaccount *a ); | 24 | IMAPwrapper( IMAPaccount *a ); |
25 | virtual ~IMAPwrapper(); | 25 | virtual ~IMAPwrapper(); |
26 | virtual QValueList<Opie::OSmartPointer<Folder> >* listFolders(); | 26 | virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders(); |
27 | virtual void listMessages(const QString & mailbox,QValueList<Opie::OSmartPointer<RecMail> >&target ); | 27 | virtual void listMessages(const QString & mailbox,QValueList<Opie::Core::OSmartPointer<RecMail> >&target ); |
28 | virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX"); | 28 | virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX"); |
29 | 29 | ||
30 | virtual void deleteMail(const RecMailP&mail); | 30 | virtual void deleteMail(const RecMailP&mail); |
31 | virtual void answeredMail(const RecMailP&mail); | 31 | virtual void answeredMail(const RecMailP&mail); |
32 | virtual int deleteAllMail(const Opie::OSmartPointer<Folder>&folder); | 32 | virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&folder); |
33 | virtual void storeMessage(const char*msg,size_t length, const QString&folder); | 33 | virtual void storeMessage(const char*msg,size_t length, const QString&folder); |
34 | virtual void mvcpAllMails(const Opie::OSmartPointer<Folder>&fromFolder, | 34 | virtual void mvcpAllMails(const Opie::Core::OSmartPointer<Folder>&fromFolder, |
35 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit); | 35 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit); |
36 | virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit); | 36 | virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit); |
37 | 37 | ||
38 | virtual RecBody fetchBody(const RecMailP&mail); | 38 | virtual RecBody fetchBody(const RecMailP&mail); |
39 | virtual QString fetchTextPart(const RecMailP&mail,const RecPart&part); | 39 | virtual QString fetchTextPart(const RecMailP&mail,const RecPart&part); |
40 | virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPart&part); | 40 | virtual encodedString* fetchDecodedPart(const RecMailP&mail,const RecPart&part); |
41 | virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPart&part); | 41 | virtual encodedString* fetchRawPart(const RecMailP&mail,const RecPart&part); |
42 | virtual encodedString* fetchRawBody(const RecMailP&mail); | 42 | virtual encodedString* fetchRawBody(const RecMailP&mail); |
43 | 43 | ||
44 | virtual int createMbox(const QString&,const Opie::OSmartPointer<Folder>&parentfolder=0, | 44 | virtual int createMbox(const QString&,const Opie::Core::OSmartPointer<Folder>&parentfolder=0, |
45 | const QString& delemiter="/",bool getsubfolder=false); | 45 | const QString& delemiter="/",bool getsubfolder=false); |
46 | virtual int deleteMbox(const Opie::OSmartPointer<Folder>&folder); | 46 | virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&folder); |
47 | 47 | ||
48 | static void imap_progress( size_t current, size_t maximum ); | 48 | static void imap_progress( size_t current, size_t maximum ); |
49 | 49 | ||
50 | virtual void logout(); | 50 | virtual void logout(); |
51 | virtual MAILLIB::ATYPE getType()const; | 51 | virtual MAILLIB::ATYPE getType()const; |
52 | virtual const QString&getName()const; | 52 | virtual const QString&getName()const; |
53 | 53 | ||
54 | protected: | 54 | protected: |
55 | RecMail*parse_list_result(mailimap_msg_att*); | 55 | RecMail*parse_list_result(mailimap_msg_att*); |
56 | void login(); | 56 | void login(); |
57 | bool start_tls(bool force=true); | 57 | bool start_tls(bool force=true); |
58 | 58 | ||
59 | virtual QString fetchTextPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call=false,const QString&enc=""); | 59 | virtual QString fetchTextPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call=false,const QString&enc=""); |
60 | virtual encodedString*fetchRawPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call); | 60 | virtual encodedString*fetchRawPart(const RecMailP&mail,const QValueList<int>&path,bool internal_call); |
61 | int selectMbox(const QString&mbox); | 61 | int selectMbox(const QString&mbox); |
62 | 62 | ||
63 | void fillSinglePart(RecPart&target_part,mailimap_body_type_1part*Description); | 63 | void fillSinglePart(RecPart&target_part,mailimap_body_type_1part*Description); |
64 | void fillSingleTextPart(RecPart&target_part,mailimap_body_type_text*which); | 64 | void fillSingleTextPart(RecPart&target_part,mailimap_body_type_text*which); |
65 | void fillSingleBasicPart(RecPart&target_part,mailimap_body_type_basic*which); | 65 | void fillSingleBasicPart(RecPart&target_part,mailimap_body_type_basic*which); |
66 | void fillSingleMsgPart(RecPart&target_part,mailimap_body_type_msg*which); | 66 | void fillSingleMsgPart(RecPart&target_part,mailimap_body_type_msg*which); |
67 | void fillMultiPart(RecPart&target_part,mailimap_body_type_mpart*which); | 67 | void fillMultiPart(RecPart&target_part,mailimap_body_type_mpart*which); |
68 | void traverseBody(const RecMailP&mail,mailimap_body*body,RecBody&target_body,int current_recursion,QValueList<int>recList,int current_count=1); | 68 | void traverseBody(const RecMailP&mail,mailimap_body*body,RecBody&target_body,int current_recursion,QValueList<int>recList,int current_count=1); |
69 | 69 | ||
70 | /* just helpers */ | 70 | /* just helpers */ |
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.cpp b/noncore/net/mail/libmailwrapper/mailtypes.cpp index 7dd7e58..fd91fe5 100644 --- a/noncore/net/mail/libmailwrapper/mailtypes.cpp +++ b/noncore/net/mail/libmailwrapper/mailtypes.cpp | |||
@@ -1,35 +1,36 @@ | |||
1 | #include "mailtypes.h" | 1 | #include "mailtypes.h" |
2 | #include <stdlib.h> | 2 | #include <stdlib.h> |
3 | 3 | ||
4 | using namespace Opie::Core; | ||
4 | RecMail::RecMail() | 5 | RecMail::RecMail() |
5 | :Opie::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_size(0),msg_flags(7) | 6 | :Opie::Core::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_size(0),msg_flags(7) |
6 | { | 7 | { |
7 | init(); | 8 | init(); |
8 | } | 9 | } |
9 | 10 | ||
10 | RecMail::RecMail(const RecMail&old) | 11 | RecMail::RecMail(const RecMail&old) |
11 | :Opie::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7) | 12 | :Opie::Core::ORefCount(),subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7) |
12 | { | 13 | { |
13 | init(); | 14 | init(); |
14 | copy_old(old); | 15 | copy_old(old); |
15 | qDebug("Copy constructor RecMail"); | 16 | qDebug("Copy constructor RecMail"); |
16 | } | 17 | } |
17 | 18 | ||
18 | RecMail::~RecMail() | 19 | RecMail::~RecMail() |
19 | { | 20 | { |
20 | wrapper = 0; | 21 | wrapper = 0; |
21 | } | 22 | } |
22 | 23 | ||
23 | void RecMail::copy_old(const RecMail&old) | 24 | void RecMail::copy_old(const RecMail&old) |
24 | { | 25 | { |
25 | subject = old.subject; | 26 | subject = old.subject; |
26 | date = old.date; | 27 | date = old.date; |
27 | mbox = old.mbox; | 28 | mbox = old.mbox; |
28 | msg_id = old.msg_id; | 29 | msg_id = old.msg_id; |
29 | msg_size = old.msg_size; | 30 | msg_size = old.msg_size; |
30 | msg_number = old.msg_number; | 31 | msg_number = old.msg_number; |
31 | from = old.from; | 32 | from = old.from; |
32 | msg_flags = old.msg_flags; | 33 | msg_flags = old.msg_flags; |
33 | to = old.to; | 34 | to = old.to; |
34 | cc = old.cc; | 35 | cc = old.cc; |
35 | bcc = old.bcc; | 36 | bcc = old.bcc; |
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.h b/noncore/net/mail/libmailwrapper/mailtypes.h index dc10de6..941556a 100644 --- a/noncore/net/mail/libmailwrapper/mailtypes.h +++ b/noncore/net/mail/libmailwrapper/mailtypes.h | |||
@@ -8,49 +8,49 @@ | |||
8 | #define FLAG_DRAFT 4 | 8 | #define FLAG_DRAFT 4 |
9 | #define FLAG_RECENT 5 | 9 | #define FLAG_RECENT 5 |
10 | 10 | ||
11 | #include <opie2/osmartpointer.h> | 11 | #include <opie2/osmartpointer.h> |
12 | 12 | ||
13 | #include <qbitarray.h> | 13 | #include <qbitarray.h> |
14 | #include <qstring.h> | 14 | #include <qstring.h> |
15 | #include <qstringlist.h> | 15 | #include <qstringlist.h> |
16 | #include <qmap.h> | 16 | #include <qmap.h> |
17 | #include <qvaluelist.h> | 17 | #include <qvaluelist.h> |
18 | 18 | ||
19 | class AbstractMail; | 19 | class AbstractMail; |
20 | /* a class to describe mails in a mailbox */ | 20 | /* a class to describe mails in a mailbox */ |
21 | /* Attention! | 21 | /* Attention! |
22 | From programmers point of view it would make sense to | 22 | From programmers point of view it would make sense to |
23 | store the mail body into this class, too. | 23 | store the mail body into this class, too. |
24 | But: not from the point of view of the device. | 24 | But: not from the point of view of the device. |
25 | Mailbodies can be real large. So we request them when | 25 | Mailbodies can be real large. So we request them when |
26 | needed from the mail-wrapper class direct from the server itself | 26 | needed from the mail-wrapper class direct from the server itself |
27 | (imap) or from a file-based cache (pop3?) | 27 | (imap) or from a file-based cache (pop3?) |
28 | So there is no interface "const QString&body()" but you should | 28 | So there is no interface "const QString&body()" but you should |
29 | make a request to the mailwrapper with this class as parameter to | 29 | make a request to the mailwrapper with this class as parameter to |
30 | get the body. Same words for the attachments. | 30 | get the body. Same words for the attachments. |
31 | */ | 31 | */ |
32 | class RecMail:public Opie::ORefCount | 32 | class RecMail:public Opie::Core::ORefCount |
33 | { | 33 | { |
34 | public: | 34 | public: |
35 | RecMail(); | 35 | RecMail(); |
36 | RecMail(const RecMail&old); | 36 | RecMail(const RecMail&old); |
37 | virtual ~RecMail(); | 37 | virtual ~RecMail(); |
38 | 38 | ||
39 | const unsigned int getNumber()const{return msg_number;} | 39 | const unsigned int getNumber()const{return msg_number;} |
40 | void setNumber(unsigned int number){msg_number=number;} | 40 | void setNumber(unsigned int number){msg_number=number;} |
41 | const QString&getDate()const{ return date; } | 41 | const QString&getDate()const{ return date; } |
42 | void setDate( const QString&a ) { date = a; } | 42 | void setDate( const QString&a ) { date = a; } |
43 | const QString&getFrom()const{ return from; } | 43 | const QString&getFrom()const{ return from; } |
44 | void setFrom( const QString&a ) { from = a; } | 44 | void setFrom( const QString&a ) { from = a; } |
45 | const QString&getSubject()const { return subject; } | 45 | const QString&getSubject()const { return subject; } |
46 | void setSubject( const QString&s ) { subject = s; } | 46 | void setSubject( const QString&s ) { subject = s; } |
47 | const QString&getMbox()const{return mbox;} | 47 | const QString&getMbox()const{return mbox;} |
48 | void setMbox(const QString&box){mbox = box;} | 48 | void setMbox(const QString&box){mbox = box;} |
49 | void setMsgid(const QString&id){msg_id=id;} | 49 | void setMsgid(const QString&id){msg_id=id;} |
50 | const QString&Msgid()const{return msg_id;} | 50 | const QString&Msgid()const{return msg_id;} |
51 | void setReplyto(const QString&reply){replyto=reply;} | 51 | void setReplyto(const QString&reply){replyto=reply;} |
52 | const QString&Replyto()const{return replyto;} | 52 | const QString&Replyto()const{return replyto;} |
53 | void setMsgsize(unsigned int size){msg_size = size;} | 53 | void setMsgsize(unsigned int size){msg_size = size;} |
54 | const unsigned int Msgsize()const{return msg_size;} | 54 | const unsigned int Msgsize()const{return msg_size;} |
55 | 55 | ||
56 | 56 | ||
@@ -60,49 +60,49 @@ public: | |||
60 | const QStringList&CC()const; | 60 | const QStringList&CC()const; |
61 | void setBcc(const QStringList&list); | 61 | void setBcc(const QStringList&list); |
62 | const QStringList&Bcc()const; | 62 | const QStringList&Bcc()const; |
63 | void setInreply(const QStringList&list); | 63 | void setInreply(const QStringList&list); |
64 | const QStringList&Inreply()const; | 64 | const QStringList&Inreply()const; |
65 | void setReferences(const QStringList&list); | 65 | void setReferences(const QStringList&list); |
66 | const QStringList&References()const; | 66 | const QStringList&References()const; |
67 | 67 | ||
68 | const QBitArray&getFlags()const{return msg_flags;} | 68 | const QBitArray&getFlags()const{return msg_flags;} |
69 | void setFlags(const QBitArray&flags){msg_flags = flags;} | 69 | void setFlags(const QBitArray&flags){msg_flags = flags;} |
70 | 70 | ||
71 | void setWrapper(AbstractMail*wrapper); | 71 | void setWrapper(AbstractMail*wrapper); |
72 | AbstractMail* Wrapper(); | 72 | AbstractMail* Wrapper(); |
73 | 73 | ||
74 | protected: | 74 | protected: |
75 | QString subject,date,from,mbox,msg_id,replyto; | 75 | QString subject,date,from,mbox,msg_id,replyto; |
76 | unsigned int msg_number,msg_size; | 76 | unsigned int msg_number,msg_size; |
77 | QBitArray msg_flags; | 77 | QBitArray msg_flags; |
78 | QStringList to,cc,bcc,in_reply_to,references; | 78 | QStringList to,cc,bcc,in_reply_to,references; |
79 | AbstractMail*wrapper; | 79 | AbstractMail*wrapper; |
80 | void init(); | 80 | void init(); |
81 | void copy_old(const RecMail&old); | 81 | void copy_old(const RecMail&old); |
82 | }; | 82 | }; |
83 | 83 | ||
84 | typedef Opie::OSmartPointer<RecMail> RecMailP; | 84 | typedef Opie::Core::OSmartPointer<RecMail> RecMailP; |
85 | typedef QMap<QString,QString> part_plist_t; | 85 | typedef QMap<QString,QString> part_plist_t; |
86 | 86 | ||
87 | class RecPart | 87 | class RecPart |
88 | { | 88 | { |
89 | protected: | 89 | protected: |
90 | QString m_type,m_subtype,m_identifier,m_encoding,m_description; | 90 | QString m_type,m_subtype,m_identifier,m_encoding,m_description; |
91 | unsigned int m_lines,m_size; | 91 | unsigned int m_lines,m_size; |
92 | part_plist_t m_Parameters; | 92 | part_plist_t m_Parameters; |
93 | /* describes the position in the mail */ | 93 | /* describes the position in the mail */ |
94 | QValueList<int> m_poslist; | 94 | QValueList<int> m_poslist; |
95 | 95 | ||
96 | public: | 96 | public: |
97 | RecPart(); | 97 | RecPart(); |
98 | virtual ~RecPart(); | 98 | virtual ~RecPart(); |
99 | 99 | ||
100 | const QString&Type()const; | 100 | const QString&Type()const; |
101 | void setType(const QString&type); | 101 | void setType(const QString&type); |
102 | const QString&Subtype()const; | 102 | const QString&Subtype()const; |
103 | void setSubtype(const QString&subtype); | 103 | void setSubtype(const QString&subtype); |
104 | const QString&Identifier()const; | 104 | const QString&Identifier()const; |
105 | void setIdentifier(const QString&identifier); | 105 | void setIdentifier(const QString&identifier); |
106 | const QString&Encoding()const; | 106 | const QString&Encoding()const; |
107 | void setEncoding(const QString&encoding); | 107 | void setEncoding(const QString&encoding); |
108 | const QString&Description()const; | 108 | const QString&Description()const; |
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.cpp b/noncore/net/mail/libmailwrapper/mailwrapper.cpp index 9bf2fd3..eddc0b9 100644 --- a/noncore/net/mail/libmailwrapper/mailwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/mailwrapper.cpp | |||
@@ -1,47 +1,48 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | #include <sys/stat.h> | 2 | #include <sys/stat.h> |
3 | #include <sys/types.h> | 3 | #include <sys/types.h> |
4 | #include <unistd.h> | 4 | #include <unistd.h> |
5 | #include <fcntl.h> | 5 | #include <fcntl.h> |
6 | #include <string.h> | 6 | #include <string.h> |
7 | #include <qdir.h> | 7 | #include <qdir.h> |
8 | 8 | ||
9 | #include "mailwrapper.h" | 9 | #include "mailwrapper.h" |
10 | //#include "logindialog.h" | 10 | //#include "logindialog.h" |
11 | //#include "defines.h" | 11 | //#include "defines.h" |
12 | 12 | ||
13 | #define UNDEFINED 64 | 13 | #define UNDEFINED 64 |
14 | #define MAXLINE 76 | 14 | #define MAXLINE 76 |
15 | #define UTF16MASK 0x03FFUL | 15 | #define UTF16MASK 0x03FFUL |
16 | #define UTF16SHIFT 10 | 16 | #define UTF16SHIFT 10 |
17 | #define UTF16BASE 0x10000UL | 17 | #define UTF16BASE 0x10000UL |
18 | #define UTF16HIGHSTART 0xD800UL | 18 | #define UTF16HIGHSTART 0xD800UL |
19 | #define UTF16HIGHEND 0xDBFFUL | 19 | #define UTF16HIGHEND 0xDBFFUL |
20 | #define UTF16LOSTART 0xDC00UL | 20 | #define UTF16LOSTART 0xDC00UL |
21 | #define UTF16LOEND 0xDFFFUL | 21 | #define UTF16LOEND 0xDFFFUL |
22 | 22 | ||
23 | 23 | ||
24 | using namespace Opie::Core; | ||
24 | Attachment::Attachment( DocLnk lnk ) | 25 | Attachment::Attachment( DocLnk lnk ) |
25 | { | 26 | { |
26 | doc = lnk; | 27 | doc = lnk; |
27 | size = QFileInfo( doc.file() ).size(); | 28 | size = QFileInfo( doc.file() ).size(); |
28 | } | 29 | } |
29 | 30 | ||
30 | Folder::Folder(const QString&tmp_name, const QString&sep ) | 31 | Folder::Folder(const QString&tmp_name, const QString&sep ) |
31 | { | 32 | { |
32 | name = tmp_name; | 33 | name = tmp_name; |
33 | nameDisplay = name; | 34 | nameDisplay = name; |
34 | separator = sep; | 35 | separator = sep; |
35 | prefix = ""; | 36 | prefix = ""; |
36 | } | 37 | } |
37 | 38 | ||
38 | Folder::~Folder() | 39 | Folder::~Folder() |
39 | { | 40 | { |
40 | } | 41 | } |
41 | 42 | ||
42 | const QString& Folder::Separator()const | 43 | const QString& Folder::Separator()const |
43 | { | 44 | { |
44 | return separator; | 45 | return separator; |
45 | } | 46 | } |
46 | 47 | ||
47 | IMAPFolder::IMAPFolder(const QString&name,const QString&sep, bool select,bool no_inf, const QString&aprefix ) | 48 | IMAPFolder::IMAPFolder(const QString&name,const QString&sep, bool select,bool no_inf, const QString&aprefix ) |
@@ -134,45 +135,45 @@ QString IMAPFolder::decodeFolderName( const QString &name ) | |||
134 | i = 3; | 135 | i = 3; |
135 | } else { | 136 | } else { |
136 | utf8[0] = 0xf0 | (ucs4 >> 18); | 137 | utf8[0] = 0xf0 | (ucs4 >> 18); |
137 | utf8[1] = 0x80 | ((ucs4 >> 12) & 0x3f); | 138 | utf8[1] = 0x80 | ((ucs4 >> 12) & 0x3f); |
138 | utf8[2] = 0x80 | ((ucs4 >> 6) & 0x3f); | 139 | utf8[2] = 0x80 | ((ucs4 >> 6) & 0x3f); |
139 | utf8[3] = 0x80 | (ucs4 & 0x3f); | 140 | utf8[3] = 0x80 | (ucs4 & 0x3f); |
140 | i = 4; | 141 | i = 4; |
141 | } | 142 | } |
142 | /* copy it */ | 143 | /* copy it */ |
143 | for (c = 0; c < i; ++c) { | 144 | for (c = 0; c < i; ++c) { |
144 | dst += utf8[c]; | 145 | dst += utf8[c]; |
145 | } | 146 | } |
146 | } | 147 | } |
147 | } | 148 | } |
148 | /* skip over trailing '-' in modified UTF-7 encoding */ | 149 | /* skip over trailing '-' in modified UTF-7 encoding */ |
149 | if (src[srcPtr] == '-') | 150 | if (src[srcPtr] == '-') |
150 | ++srcPtr; | 151 | ++srcPtr; |
151 | } | 152 | } |
152 | } | 153 | } |
153 | 154 | ||
154 | return QString::fromUtf8( dst.data() ); | 155 | return QString::fromUtf8( dst.data() ); |
155 | } | 156 | } |
156 | 157 | ||
157 | Mail::Mail() | 158 | Mail::Mail() |
158 | :Opie::ORefCount(),name(""), mail(""), to(""), cc(""), bcc(""), reply(""), subject(""), message("") | 159 | :Opie::Core::ORefCount(),name(""), mail(""), to(""), cc(""), bcc(""), reply(""), subject(""), message("") |
159 | { | 160 | { |
160 | } | 161 | } |
161 | 162 | ||
162 | MHFolder::MHFolder(const QString&disp_name,const QString&mbox) | 163 | MHFolder::MHFolder(const QString&disp_name,const QString&mbox) |
163 | : Folder( disp_name,"/" ) | 164 | : Folder( disp_name,"/" ) |
164 | { | 165 | { |
165 | separator = "/"; | 166 | separator = "/"; |
166 | name = mbox; | 167 | name = mbox; |
167 | if (!disp_name.startsWith("/") && disp_name.length()>0) | 168 | if (!disp_name.startsWith("/") && disp_name.length()>0) |
168 | name+="/"; | 169 | name+="/"; |
169 | name+=disp_name; | 170 | name+=disp_name; |
170 | if (disp_name.length()==0) { | 171 | if (disp_name.length()==0) { |
171 | nameDisplay = separator; | 172 | nameDisplay = separator; |
172 | } | 173 | } |
173 | prefix = mbox; | 174 | prefix = mbox; |
174 | } | 175 | } |
175 | 176 | ||
176 | MHFolder::~MHFolder() | 177 | MHFolder::~MHFolder() |
177 | { | 178 | { |
178 | } | 179 | } |
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.h b/noncore/net/mail/libmailwrapper/mailwrapper.h index 6bf0078..542de03 100644 --- a/noncore/net/mail/libmailwrapper/mailwrapper.h +++ b/noncore/net/mail/libmailwrapper/mailwrapper.h | |||
@@ -7,100 +7,100 @@ | |||
7 | #include <qdatetime.h> | 7 | #include <qdatetime.h> |
8 | 8 | ||
9 | #include "settings.h" | 9 | #include "settings.h" |
10 | 10 | ||
11 | #include <opie2/osmartpointer.h> | 11 | #include <opie2/osmartpointer.h> |
12 | 12 | ||
13 | class Attachment | 13 | class Attachment |
14 | { | 14 | { |
15 | public: | 15 | public: |
16 | Attachment( DocLnk lnk ); | 16 | Attachment( DocLnk lnk ); |
17 | virtual ~Attachment(){} | 17 | virtual ~Attachment(){} |
18 | const QString getFileName()const{ return doc.file(); } | 18 | const QString getFileName()const{ return doc.file(); } |
19 | const QString getName()const{ return doc.name(); } | 19 | const QString getName()const{ return doc.name(); } |
20 | const QString getMimeType()const{ return doc.type(); } | 20 | const QString getMimeType()const{ return doc.type(); } |
21 | const QPixmap getPixmap()const{ return doc.pixmap(); } | 21 | const QPixmap getPixmap()const{ return doc.pixmap(); } |
22 | const int getSize()const { return size; } | 22 | const int getSize()const { return size; } |
23 | DocLnk getDocLnk() { return doc; } | 23 | DocLnk getDocLnk() { return doc; } |
24 | 24 | ||
25 | protected: | 25 | protected: |
26 | DocLnk doc; | 26 | DocLnk doc; |
27 | int size; | 27 | int size; |
28 | 28 | ||
29 | }; | 29 | }; |
30 | 30 | ||
31 | class Mail:public Opie::ORefCount | 31 | class Mail:public Opie::Core::ORefCount |
32 | { | 32 | { |
33 | public: | 33 | public: |
34 | Mail(); | 34 | Mail(); |
35 | /* Possible that this destructor must not be declared virtual | 35 | /* Possible that this destructor must not be declared virtual |
36 | * 'cause it seems that it will never have some child classes. | 36 | * 'cause it seems that it will never have some child classes. |
37 | * in this case this object will not get a virtual table -> memory and | 37 | * in this case this object will not get a virtual table -> memory and |
38 | * speed will be a little bit better? | 38 | * speed will be a little bit better? |
39 | */ | 39 | */ |
40 | virtual ~Mail(){} | 40 | virtual ~Mail(){} |
41 | void addAttachment( Attachment *att ) { attList.append( att ); } | 41 | void addAttachment( Attachment *att ) { attList.append( att ); } |
42 | const QList<Attachment>& getAttachments()const { return attList; } | 42 | const QList<Attachment>& getAttachments()const { return attList; } |
43 | void removeAttachment( Attachment *att ) { attList.remove( att ); } | 43 | void removeAttachment( Attachment *att ) { attList.remove( att ); } |
44 | const QString&getName()const { return name; } | 44 | const QString&getName()const { return name; } |
45 | void setName( QString s ) { name = s; } | 45 | void setName( QString s ) { name = s; } |
46 | const QString&getMail()const{ return mail; } | 46 | const QString&getMail()const{ return mail; } |
47 | void setMail( const QString&s ) { mail = s; } | 47 | void setMail( const QString&s ) { mail = s; } |
48 | const QString&getTo()const{ return to; } | 48 | const QString&getTo()const{ return to; } |
49 | void setTo( const QString&s ) { to = s; } | 49 | void setTo( const QString&s ) { to = s; } |
50 | const QString&getCC()const{ return cc; } | 50 | const QString&getCC()const{ return cc; } |
51 | void setCC( const QString&s ) { cc = s; } | 51 | void setCC( const QString&s ) { cc = s; } |
52 | const QString&getBCC()const { return bcc; } | 52 | const QString&getBCC()const { return bcc; } |
53 | void setBCC( const QString&s ) { bcc = s; } | 53 | void setBCC( const QString&s ) { bcc = s; } |
54 | const QString&getMessage()const { return message; } | 54 | const QString&getMessage()const { return message; } |
55 | void setMessage( const QString&s ) { message = s; } | 55 | void setMessage( const QString&s ) { message = s; } |
56 | const QString&getSubject()const { return subject; } | 56 | const QString&getSubject()const { return subject; } |
57 | void setSubject( const QString&s ) { subject = s; } | 57 | void setSubject( const QString&s ) { subject = s; } |
58 | const QString&getReply()const{ return reply; } | 58 | const QString&getReply()const{ return reply; } |
59 | void setReply( const QString&a ) { reply = a; } | 59 | void setReply( const QString&a ) { reply = a; } |
60 | void setInreply(const QStringList&list){m_in_reply_to = list;} | 60 | void setInreply(const QStringList&list){m_in_reply_to = list;} |
61 | const QStringList&Inreply()const{return m_in_reply_to;} | 61 | const QStringList&Inreply()const{return m_in_reply_to;} |
62 | 62 | ||
63 | private: | 63 | private: |
64 | QList<Attachment> attList; | 64 | QList<Attachment> attList; |
65 | QString name, mail, to, cc, bcc, reply, subject, message; | 65 | QString name, mail, to, cc, bcc, reply, subject, message; |
66 | QStringList m_in_reply_to; | 66 | QStringList m_in_reply_to; |
67 | }; | 67 | }; |
68 | 68 | ||
69 | class Folder:public Opie::ORefCount | 69 | class Folder:public Opie::Core::ORefCount |
70 | { | 70 | { |
71 | public: | 71 | public: |
72 | Folder( const QString&init_name,const QString&sep ); | 72 | Folder( const QString&init_name,const QString&sep ); |
73 | virtual ~Folder(); | 73 | virtual ~Folder(); |
74 | const QString&getDisplayName()const { return nameDisplay; } | 74 | const QString&getDisplayName()const { return nameDisplay; } |
75 | const QString&getName()const { return name; } | 75 | const QString&getName()const { return name; } |
76 | const QString&getPrefix()const{return prefix; } | 76 | const QString&getPrefix()const{return prefix; } |
77 | virtual bool may_select()const{return true;} | 77 | virtual bool may_select()const{return true;} |
78 | virtual bool no_inferior()const{return true;} | 78 | virtual bool no_inferior()const{return true;} |
79 | const QString&Separator()const; | 79 | const QString&Separator()const; |
80 | 80 | ||
81 | protected: | 81 | protected: |
82 | QString nameDisplay, name, separator,prefix; | 82 | QString nameDisplay, name, separator,prefix; |
83 | }; | 83 | }; |
84 | 84 | ||
85 | typedef Opie::OSmartPointer<Folder> FolderP; | 85 | typedef Opie::Core::OSmartPointer<Folder> FolderP; |
86 | 86 | ||
87 | class MHFolder : public Folder | 87 | class MHFolder : public Folder |
88 | { | 88 | { |
89 | public: | 89 | public: |
90 | MHFolder(const QString&disp_name,const QString&mbox); | 90 | MHFolder(const QString&disp_name,const QString&mbox); |
91 | virtual ~MHFolder(); | 91 | virtual ~MHFolder(); |
92 | }; | 92 | }; |
93 | 93 | ||
94 | class IMAPFolder : public Folder | 94 | class IMAPFolder : public Folder |
95 | { | 95 | { |
96 | public: | 96 | public: |
97 | IMAPFolder(const QString&name, const QString&sep, bool select=true,bool noinf=false,const QString&prefix="" ); | 97 | IMAPFolder(const QString&name, const QString&sep, bool select=true,bool noinf=false,const QString&prefix="" ); |
98 | virtual ~IMAPFolder(); | 98 | virtual ~IMAPFolder(); |
99 | virtual bool may_select()const{return m_MaySelect;} | 99 | virtual bool may_select()const{return m_MaySelect;} |
100 | virtual bool no_inferior()const{return m_NoInferior;} | 100 | virtual bool no_inferior()const{return m_NoInferior;} |
101 | private: | 101 | private: |
102 | static QString decodeFolderName( const QString &name ); | 102 | static QString decodeFolderName( const QString &name ); |
103 | bool m_MaySelect,m_NoInferior; | 103 | bool m_MaySelect,m_NoInferior; |
104 | }; | 104 | }; |
105 | 105 | ||
106 | #endif | 106 | #endif |
diff --git a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp index 5e6b714..4aee0be 100644 --- a/noncore/net/mail/libmailwrapper/mboxwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/mboxwrapper.cpp | |||
@@ -1,73 +1,74 @@ | |||
1 | #include "mboxwrapper.h" | 1 | #include "mboxwrapper.h" |
2 | #include "mailtypes.h" | 2 | #include "mailtypes.h" |
3 | #include "mailwrapper.h" | 3 | #include "mailwrapper.h" |
4 | #include <libetpan/libetpan.h> | 4 | #include <libetpan/libetpan.h> |
5 | #include <qdir.h> | 5 | #include <qdir.h> |
6 | #include <stdlib.h> | 6 | #include <stdlib.h> |
7 | #include <qpe/global.h> | 7 | #include <qpe/global.h> |
8 | 8 | ||
9 | using namespace Opie::Core; | ||
9 | MBOXwrapper::MBOXwrapper(const QString & mbox_dir,const QString&mbox_name) | 10 | MBOXwrapper::MBOXwrapper(const QString & mbox_dir,const QString&mbox_name) |
10 | : Genericwrapper(),MBOXPath(mbox_dir),MBOXName(mbox_name) | 11 | : Genericwrapper(),MBOXPath(mbox_dir),MBOXName(mbox_name) |
11 | { | 12 | { |
12 | QDir dir(MBOXPath); | 13 | QDir dir(MBOXPath); |
13 | if (!dir.exists()) { | 14 | if (!dir.exists()) { |
14 | dir.mkdir(MBOXPath); | 15 | dir.mkdir(MBOXPath); |
15 | } | 16 | } |
16 | } | 17 | } |
17 | 18 | ||
18 | MBOXwrapper::~MBOXwrapper() | 19 | MBOXwrapper::~MBOXwrapper() |
19 | { | 20 | { |
20 | } | 21 | } |
21 | 22 | ||
22 | void MBOXwrapper::listMessages(const QString & mailbox, QValueList<RecMailP> &target ) | 23 | void MBOXwrapper::listMessages(const QString & mailbox, QValueList<RecMailP> &target ) |
23 | { | 24 | { |
24 | mailstorage*storage = mailstorage_new(NULL); | 25 | mailstorage*storage = mailstorage_new(NULL); |
25 | QString p = MBOXPath+"/"; | 26 | QString p = MBOXPath+"/"; |
26 | p+=mailbox; | 27 | p+=mailbox; |
27 | 28 | ||
28 | int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0); | 29 | int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0); |
29 | mailfolder*folder; | 30 | mailfolder*folder; |
30 | folder = mailfolder_new( storage,(char*)p.latin1(),NULL); | 31 | folder = mailfolder_new( storage,(char*)p.latin1(),NULL); |
31 | r = mailfolder_connect(folder); | 32 | r = mailfolder_connect(folder); |
32 | if (r != MAIL_NO_ERROR) { | 33 | if (r != MAIL_NO_ERROR) { |
33 | qDebug("Error initializing mbox"); | 34 | qDebug("Error initializing mbox"); |
34 | mailfolder_free(folder); | 35 | mailfolder_free(folder); |
35 | mailstorage_free(storage); | 36 | mailstorage_free(storage); |
36 | return; | 37 | return; |
37 | } | 38 | } |
38 | 39 | ||
39 | parseList(target,folder->fld_session,mailbox); | 40 | parseList(target,folder->fld_session,mailbox); |
40 | 41 | ||
41 | mailfolder_disconnect(folder); | 42 | mailfolder_disconnect(folder); |
42 | mailfolder_free(folder); | 43 | mailfolder_free(folder); |
43 | mailstorage_free(storage); | 44 | mailstorage_free(storage); |
44 | Global::statusMessage(tr("Mailbox has %1 mail(s)").arg(target.count())); | 45 | Global::statusMessage(tr("Mailbox has %1 mail(s)").arg(target.count())); |
45 | } | 46 | } |
46 | 47 | ||
47 | QValueList<Opie::OSmartPointer<Folder> >* MBOXwrapper::listFolders() | 48 | QValueList<Opie::Core::OSmartPointer<Folder> >* MBOXwrapper::listFolders() |
48 | { | 49 | { |
49 | QValueList<Opie::OSmartPointer<Folder> >* folders = new QValueList<Opie::OSmartPointer<Folder> >(); | 50 | QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >(); |
50 | QDir dir(MBOXPath); | 51 | QDir dir(MBOXPath); |
51 | if (!dir.exists()) return folders; | 52 | if (!dir.exists()) return folders; |
52 | dir.setFilter(QDir::Files|QDir::Writable|QDir::Readable); | 53 | dir.setFilter(QDir::Files|QDir::Writable|QDir::Readable); |
53 | QStringList entries = dir.entryList(); | 54 | QStringList entries = dir.entryList(); |
54 | QStringList::ConstIterator it = entries.begin(); | 55 | QStringList::ConstIterator it = entries.begin(); |
55 | for (;it!=entries.end();++it) { | 56 | for (;it!=entries.end();++it) { |
56 | FolderP inb=new Folder(*it,"/"); | 57 | FolderP inb=new Folder(*it,"/"); |
57 | folders->append(inb); | 58 | folders->append(inb); |
58 | } | 59 | } |
59 | return folders; | 60 | return folders; |
60 | } | 61 | } |
61 | 62 | ||
62 | void MBOXwrapper::deleteMail(const RecMailP & mail) | 63 | void MBOXwrapper::deleteMail(const RecMailP & mail) |
63 | { | 64 | { |
64 | mailstorage*storage = mailstorage_new(NULL); | 65 | mailstorage*storage = mailstorage_new(NULL); |
65 | QString p = MBOXPath+"/"; | 66 | QString p = MBOXPath+"/"; |
66 | p+=mail->getMbox(); | 67 | p+=mail->getMbox(); |
67 | int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0); | 68 | int r = mbox_mailstorage_init(storage,(char*)p.latin1(),0,0,0); |
68 | mailfolder*folder; | 69 | mailfolder*folder; |
69 | folder = mailfolder_new( storage,(char*)p.latin1(),NULL); | 70 | folder = mailfolder_new( storage,(char*)p.latin1(),NULL); |
70 | r = mailfolder_connect(folder); | 71 | r = mailfolder_connect(folder); |
71 | if (r != MAIL_NO_ERROR) { | 72 | if (r != MAIL_NO_ERROR) { |
72 | qDebug("Error initializing mbox"); | 73 | qDebug("Error initializing mbox"); |
73 | mailfolder_free(folder); | 74 | mailfolder_free(folder); |
diff --git a/noncore/net/mail/libmailwrapper/mboxwrapper.h b/noncore/net/mail/libmailwrapper/mboxwrapper.h index 33eeb1e..a2ecfee 100644 --- a/noncore/net/mail/libmailwrapper/mboxwrapper.h +++ b/noncore/net/mail/libmailwrapper/mboxwrapper.h | |||
@@ -1,46 +1,46 @@ | |||
1 | #ifndef __MBOX_WRAPPER_H | 1 | #ifndef __MBOX_WRAPPER_H |
2 | #define __MBOX_WRAPPER_H | 2 | #define __MBOX_WRAPPER_H |
3 | 3 | ||
4 | #include "genericwrapper.h" | 4 | #include "genericwrapper.h" |
5 | #include <qstring.h> | 5 | #include <qstring.h> |
6 | 6 | ||
7 | class encodedString; | 7 | class encodedString; |
8 | struct mailmbox_folder; | 8 | struct mailmbox_folder; |
9 | 9 | ||
10 | class MBOXwrapper : public Genericwrapper | 10 | class MBOXwrapper : public Genericwrapper |
11 | { | 11 | { |
12 | Q_OBJECT | 12 | Q_OBJECT |
13 | 13 | ||
14 | public: | 14 | public: |
15 | MBOXwrapper(const QString & dir,const QString&name); | 15 | MBOXwrapper(const QString & dir,const QString&name); |
16 | virtual ~MBOXwrapper(); | 16 | virtual ~MBOXwrapper(); |
17 | 17 | ||
18 | virtual void listMessages(const QString & mailbox, QValueList<RecMailP>&target ); | 18 | virtual void listMessages(const QString & mailbox, QValueList<RecMailP>&target ); |
19 | virtual QValueList<Opie::OSmartPointer<Folder> >* listFolders(); | 19 | virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders(); |
20 | virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX"); | 20 | virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX"); |
21 | 21 | ||
22 | virtual void deleteMail(const RecMailP&mail); | 22 | virtual void deleteMail(const RecMailP&mail); |
23 | virtual void answeredMail(const RecMailP&mail); | 23 | virtual void answeredMail(const RecMailP&mail); |
24 | 24 | ||
25 | virtual int createMbox(const QString&folder,const Opie::OSmartPointer<Folder>&f=0, | 25 | virtual int createMbox(const QString&folder,const Opie::Core::OSmartPointer<Folder>&f=0, |
26 | const QString&d="",bool s=false); | 26 | const QString&d="",bool s=false); |
27 | virtual int deleteMbox(const Opie::OSmartPointer<Folder>&); | 27 | virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&); |
28 | 28 | ||
29 | virtual void storeMessage(const char*msg,size_t length, const QString&folder); | 29 | virtual void storeMessage(const char*msg,size_t length, const QString&folder); |
30 | 30 | ||
31 | virtual RecBody fetchBody( const RecMailP &mail ); | 31 | virtual RecBody fetchBody( const RecMailP &mail ); |
32 | static void mbox_progress( size_t current, size_t maximum ); | 32 | static void mbox_progress( size_t current, size_t maximum ); |
33 | 33 | ||
34 | virtual encodedString* fetchRawBody(const RecMailP&mail); | 34 | virtual encodedString* fetchRawBody(const RecMailP&mail); |
35 | virtual void deleteMails(const QString & FolderName,const QValueList<RecMailP> &target); | 35 | virtual void deleteMails(const QString & FolderName,const QValueList<RecMailP> &target); |
36 | virtual int deleteAllMail(const Opie::OSmartPointer<Folder>&); | 36 | virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&); |
37 | virtual MAILLIB::ATYPE getType()const; | 37 | virtual MAILLIB::ATYPE getType()const; |
38 | virtual const QString&getName()const; | 38 | virtual const QString&getName()const; |
39 | 39 | ||
40 | protected: | 40 | protected: |
41 | static void deleteMails(mailmbox_folder*f,const QValueList<RecMailP> &target); | 41 | static void deleteMails(mailmbox_folder*f,const QValueList<RecMailP> &target); |
42 | QString MBOXPath; | 42 | QString MBOXPath; |
43 | QString MBOXName; | 43 | QString MBOXName; |
44 | }; | 44 | }; |
45 | 45 | ||
46 | #endif | 46 | #endif |
diff --git a/noncore/net/mail/libmailwrapper/mhwrapper.cpp b/noncore/net/mail/libmailwrapper/mhwrapper.cpp index 0b00a2e..21e24a0 100644 --- a/noncore/net/mail/libmailwrapper/mhwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/mhwrapper.cpp | |||
@@ -1,34 +1,37 @@ | |||
1 | #include "mhwrapper.h" | 1 | #include "mhwrapper.h" |
2 | #include "mailtypes.h" | 2 | #include "mailtypes.h" |
3 | #include "mailwrapper.h" | 3 | #include "mailwrapper.h" |
4 | #include <libetpan/libetpan.h> | 4 | #include <libetpan/libetpan.h> |
5 | #include <qdir.h> | 5 | #include <qdir.h> |
6 | #include <qmessagebox.h> | 6 | #include <qmessagebox.h> |
7 | #include <stdlib.h> | 7 | #include <stdlib.h> |
8 | #include <qpe/global.h> | 8 | #include <qpe/global.h> |
9 | #include <opie2/oprocess.h> | 9 | #include <opie2/oprocess.h> |
10 | 10 | ||
11 | using namespace Opie::Core; | ||
12 | using namespace Opie::Core; | ||
13 | using namespace Opie::Core; | ||
11 | MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name) | 14 | MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name) |
12 | : Genericwrapper(),MHPath(mbox_dir),MHName(mbox_name) | 15 | : Genericwrapper(),MHPath(mbox_dir),MHName(mbox_name) |
13 | { | 16 | { |
14 | if (MHPath.length()>0) { | 17 | if (MHPath.length()>0) { |
15 | if (MHPath[MHPath.length()-1]=='/') { | 18 | if (MHPath[MHPath.length()-1]=='/') { |
16 | MHPath=MHPath.left(MHPath.length()-1); | 19 | MHPath=MHPath.left(MHPath.length()-1); |
17 | } | 20 | } |
18 | qDebug(MHPath); | 21 | qDebug(MHPath); |
19 | QDir dir(MHPath); | 22 | QDir dir(MHPath); |
20 | if (!dir.exists()) { | 23 | if (!dir.exists()) { |
21 | dir.mkdir(MHPath); | 24 | dir.mkdir(MHPath); |
22 | } | 25 | } |
23 | init_storage(); | 26 | init_storage(); |
24 | } | 27 | } |
25 | } | 28 | } |
26 | 29 | ||
27 | void MHwrapper::init_storage() | 30 | void MHwrapper::init_storage() |
28 | { | 31 | { |
29 | int r; | 32 | int r; |
30 | QString pre = MHPath; | 33 | QString pre = MHPath; |
31 | if (!m_storage) { | 34 | if (!m_storage) { |
32 | m_storage = mailstorage_new(NULL); | 35 | m_storage = mailstorage_new(NULL); |
33 | r = mh_mailstorage_init(m_storage,(char*)pre.latin1(),0,0,0); | 36 | r = mh_mailstorage_init(m_storage,(char*)pre.latin1(),0,0,0); |
34 | if (r != MAIL_NO_ERROR) { | 37 | if (r != MAIL_NO_ERROR) { |
@@ -39,67 +42,67 @@ void MHwrapper::init_storage() | |||
39 | } | 42 | } |
40 | } | 43 | } |
41 | r = mailstorage_connect(m_storage); | 44 | r = mailstorage_connect(m_storage); |
42 | if (r!=MAIL_NO_ERROR) { | 45 | if (r!=MAIL_NO_ERROR) { |
43 | qDebug("error connecting storage"); | 46 | qDebug("error connecting storage"); |
44 | mailstorage_free(m_storage); | 47 | mailstorage_free(m_storage); |
45 | m_storage = 0; | 48 | m_storage = 0; |
46 | } | 49 | } |
47 | } | 50 | } |
48 | 51 | ||
49 | void MHwrapper::clean_storage() | 52 | void MHwrapper::clean_storage() |
50 | { | 53 | { |
51 | if (m_storage) { | 54 | if (m_storage) { |
52 | mailstorage_disconnect(m_storage); | 55 | mailstorage_disconnect(m_storage); |
53 | mailstorage_free(m_storage); | 56 | mailstorage_free(m_storage); |
54 | m_storage = 0; | 57 | m_storage = 0; |
55 | } | 58 | } |
56 | } | 59 | } |
57 | 60 | ||
58 | MHwrapper::~MHwrapper() | 61 | MHwrapper::~MHwrapper() |
59 | { | 62 | { |
60 | clean_storage(); | 63 | clean_storage(); |
61 | } | 64 | } |
62 | 65 | ||
63 | void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::OSmartPointer<RecMail> > &target ) | 66 | void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target ) |
64 | { | 67 | { |
65 | init_storage(); | 68 | init_storage(); |
66 | if (!m_storage) { | 69 | if (!m_storage) { |
67 | return; | 70 | return; |
68 | } | 71 | } |
69 | QString f = buildPath(mailbox); | 72 | QString f = buildPath(mailbox); |
70 | int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1()); | 73 | int r = mailsession_select_folder(m_storage->sto_session,(char*)f.latin1()); |
71 | if (r!=MAIL_NO_ERROR) { | 74 | if (r!=MAIL_NO_ERROR) { |
72 | qDebug("listMessages: error selecting folder!"); | 75 | qDebug("listMessages: error selecting folder!"); |
73 | return; | 76 | return; |
74 | } | 77 | } |
75 | parseList(target,m_storage->sto_session,f); | 78 | parseList(target,m_storage->sto_session,f); |
76 | Global::statusMessage(tr("Mailbox has %1 mail(s)").arg(target.count())); | 79 | Global::statusMessage(tr("Mailbox has %1 mail(s)").arg(target.count())); |
77 | } | 80 | } |
78 | 81 | ||
79 | QValueList<Opie::OSmartPointer<Folder> >* MHwrapper::listFolders() | 82 | QValueList<Opie::Core::OSmartPointer<Folder> >* MHwrapper::listFolders() |
80 | { | 83 | { |
81 | QValueList<Opie::OSmartPointer<Folder> >* folders = new QValueList<Opie::OSmartPointer<Folder> >(); | 84 | QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >(); |
82 | /* this is needed! */ | 85 | /* this is needed! */ |
83 | if (m_storage) mailstorage_disconnect(m_storage); | 86 | if (m_storage) mailstorage_disconnect(m_storage); |
84 | init_storage(); | 87 | init_storage(); |
85 | if (!m_storage) { | 88 | if (!m_storage) { |
86 | return folders; | 89 | return folders; |
87 | } | 90 | } |
88 | mail_list*flist = 0; | 91 | mail_list*flist = 0; |
89 | clistcell*current=0; | 92 | clistcell*current=0; |
90 | int r = mailsession_list_folders(m_storage->sto_session,NULL,&flist); | 93 | int r = mailsession_list_folders(m_storage->sto_session,NULL,&flist); |
91 | if (r != MAIL_NO_ERROR || !flist) { | 94 | if (r != MAIL_NO_ERROR || !flist) { |
92 | qDebug("error getting folder list"); | 95 | qDebug("error getting folder list"); |
93 | return folders; | 96 | return folders; |
94 | } | 97 | } |
95 | for (current=clist_begin(flist->mb_list);current!=0;current=clist_next(current)) { | 98 | for (current=clist_begin(flist->mb_list);current!=0;current=clist_next(current)) { |
96 | QString t = (char*)current->data; | 99 | QString t = (char*)current->data; |
97 | t.replace(0,MHPath.length(),""); | 100 | t.replace(0,MHPath.length(),""); |
98 | folders->append(new MHFolder(t,MHPath)); | 101 | folders->append(new MHFolder(t,MHPath)); |
99 | } | 102 | } |
100 | mail_list_free(flist); | 103 | mail_list_free(flist); |
101 | return folders; | 104 | return folders; |
102 | } | 105 | } |
103 | 106 | ||
104 | void MHwrapper::deleteMail(const RecMailP&mail) | 107 | void MHwrapper::deleteMail(const RecMailP&mail) |
105 | { | 108 | { |
@@ -296,51 +299,51 @@ int MHwrapper::deleteAllMail(const FolderP&tfolder) | |||
296 | } | 299 | } |
297 | 300 | ||
298 | int MHwrapper::deleteMbox(const FolderP&tfolder) | 301 | int MHwrapper::deleteMbox(const FolderP&tfolder) |
299 | { | 302 | { |
300 | init_storage(); | 303 | init_storage(); |
301 | if (!m_storage) { | 304 | if (!m_storage) { |
302 | return 0; | 305 | return 0; |
303 | } | 306 | } |
304 | if (!tfolder) return 0; | 307 | if (!tfolder) return 0; |
305 | if (tfolder->getName()=="/" || tfolder->getName().isEmpty()) return 0; | 308 | if (tfolder->getName()=="/" || tfolder->getName().isEmpty()) return 0; |
306 | 309 | ||
307 | int r = mailsession_delete_folder(m_storage->sto_session,(char*)tfolder->getName().latin1()); | 310 | int r = mailsession_delete_folder(m_storage->sto_session,(char*)tfolder->getName().latin1()); |
308 | 311 | ||
309 | if (r != MAIL_NO_ERROR) { | 312 | if (r != MAIL_NO_ERROR) { |
310 | qDebug("error deleting mail box"); | 313 | qDebug("error deleting mail box"); |
311 | return 0; | 314 | return 0; |
312 | } | 315 | } |
313 | QString cmd = "rm -rf "+tfolder->getName(); | 316 | QString cmd = "rm -rf "+tfolder->getName(); |
314 | QStringList command; | 317 | QStringList command; |
315 | command << "/bin/sh"; | 318 | command << "/bin/sh"; |
316 | command << "-c"; | 319 | command << "-c"; |
317 | command << cmd.latin1(); | 320 | command << cmd.latin1(); |
318 | OProcess *process = new OProcess(); | 321 | OProcess *process = new OProcess(); |
319 | 322 | ||
320 | connect(process, SIGNAL(processExited(OProcess*)), | 323 | connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), |
321 | this, SLOT( processEnded(OProcess*))); | 324 | this, SLOT( processEnded(OProcess*))); |
322 | connect(process, SIGNAL( receivedStderr(OProcess*,char*,int)), | 325 | connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), |
323 | this, SLOT( oprocessStderr(OProcess*,char*,int))); | 326 | this, SLOT( oprocessStderr(OProcess*,char*,int))); |
324 | 327 | ||
325 | *process << command; | 328 | *process << command; |
326 | removeMboxfailed = false; | 329 | removeMboxfailed = false; |
327 | if(!process->start(OProcess::Block, OProcess::All) ) { | 330 | if(!process->start(OProcess::Block, OProcess::All) ) { |
328 | qDebug("could not start process"); | 331 | qDebug("could not start process"); |
329 | return 0; | 332 | return 0; |
330 | } | 333 | } |
331 | qDebug("mail box deleted"); | 334 | qDebug("mail box deleted"); |
332 | return 1; | 335 | return 1; |
333 | } | 336 | } |
334 | 337 | ||
335 | void MHwrapper::processEnded(OProcess *p) | 338 | void MHwrapper::processEnded(OProcess *p) |
336 | { | 339 | { |
337 | if (p) delete p; | 340 | if (p) delete p; |
338 | } | 341 | } |
339 | 342 | ||
340 | void MHwrapper::oprocessStderr(OProcess*, char *buffer, int ) | 343 | void MHwrapper::oprocessStderr(OProcess*, char *buffer, int ) |
341 | { | 344 | { |
342 | QString lineStr = buffer; | 345 | QString lineStr = buffer; |
343 | QMessageBox::warning( 0, tr("Error"), lineStr ,tr("Ok") ); | 346 | QMessageBox::warning( 0, tr("Error"), lineStr ,tr("Ok") ); |
344 | removeMboxfailed = true; | 347 | removeMboxfailed = true; |
345 | } | 348 | } |
346 | 349 | ||
diff --git a/noncore/net/mail/libmailwrapper/mhwrapper.h b/noncore/net/mail/libmailwrapper/mhwrapper.h index 208cf2f..1245507 100644 --- a/noncore/net/mail/libmailwrapper/mhwrapper.h +++ b/noncore/net/mail/libmailwrapper/mhwrapper.h | |||
@@ -1,60 +1,60 @@ | |||
1 | #ifndef __MH_WRAPPER_H | 1 | #ifndef __MH_WRAPPER_H |
2 | #define __MH_WRAPPER_H | 2 | #define __MH_WRAPPER_H |
3 | 3 | ||
4 | #include "maildefines.h" | 4 | #include "maildefines.h" |
5 | 5 | ||
6 | #include "genericwrapper.h" | 6 | #include "genericwrapper.h" |
7 | #include <qstring.h> | 7 | #include <qstring.h> |
8 | 8 | ||
9 | class encodedString; | 9 | class encodedString; |
10 | struct mailmbox_folder; | 10 | struct mailmbox_folder; |
11 | class OProcess; | 11 | namespace Opie {namespace Core {class Opie::Core::OProcess;}} |
12 | 12 | ||
13 | class MHwrapper : public Genericwrapper | 13 | class MHwrapper : public Genericwrapper |
14 | { | 14 | { |
15 | Q_OBJECT | 15 | Q_OBJECT |
16 | public: | 16 | public: |
17 | MHwrapper(const QString & dir,const QString&name); | 17 | MHwrapper(const QString & dir,const QString&name); |
18 | virtual ~MHwrapper(); | 18 | virtual ~MHwrapper(); |
19 | 19 | ||
20 | virtual void listMessages(const QString & mailbox, QValueList<Opie::OSmartPointer<RecMail> > &target ); | 20 | virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target ); |
21 | virtual QValueList<Opie::OSmartPointer<Folder> >* listFolders(); | 21 | virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders(); |
22 | virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX"); | 22 | virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX"); |
23 | 23 | ||
24 | virtual void deleteMail(const RecMailP&mail); | 24 | virtual void deleteMail(const RecMailP&mail); |
25 | virtual void answeredMail(const RecMailP&mail); | 25 | virtual void answeredMail(const RecMailP&mail); |
26 | virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit); | 26 | virtual void mvcpMail(const RecMailP&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit); |
27 | virtual void mvcpAllMails(const Opie::OSmartPointer<Folder>&fromFolder, | 27 | virtual void mvcpAllMails(const Opie::Core::OSmartPointer<Folder>&fromFolder, |
28 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit); | 28 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit); |
29 | 29 | ||
30 | virtual int createMbox(const QString&folder,const Opie::OSmartPointer<Folder>&f=0, | 30 | virtual int createMbox(const QString&folder,const Opie::Core::OSmartPointer<Folder>&f=0, |
31 | const QString&d="",bool s=false); | 31 | const QString&d="",bool s=false); |
32 | virtual int deleteMbox(const Opie::OSmartPointer<Folder>&); | 32 | virtual int deleteMbox(const Opie::Core::OSmartPointer<Folder>&); |
33 | 33 | ||
34 | virtual void storeMessage(const char*msg,size_t length, const QString&folder); | 34 | virtual void storeMessage(const char*msg,size_t length, const QString&folder); |
35 | 35 | ||
36 | virtual RecBody fetchBody( const RecMailP &mail ); | 36 | virtual RecBody fetchBody( const RecMailP &mail ); |
37 | static void mbox_progress( size_t current, size_t maximum ); | 37 | static void mbox_progress( size_t current, size_t maximum ); |
38 | 38 | ||
39 | virtual encodedString* fetchRawBody(const RecMailP&mail); | 39 | virtual encodedString* fetchRawBody(const RecMailP&mail); |
40 | virtual void deleteMails(const QString & FolderName,const QValueList<Opie::OSmartPointer<RecMail> > &target); | 40 | virtual void deleteMails(const QString & FolderName,const QValueList<Opie::Core::OSmartPointer<RecMail> > &target); |
41 | virtual int deleteAllMail(const Opie::OSmartPointer<Folder>&); | 41 | virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&); |
42 | virtual MAILLIB::ATYPE getType()const; | 42 | virtual MAILLIB::ATYPE getType()const; |
43 | virtual const QString&getName()const; | 43 | virtual const QString&getName()const; |
44 | 44 | ||
45 | public slots: | 45 | public slots: |
46 | /* for deleting maildirs we are using a system call */ | 46 | /* for deleting maildirs we are using a system call */ |
47 | virtual void oprocessStderr(OProcess*, char *buffer, int ); | 47 | virtual void oprocessStderr(Opie::Core::OProcess*, char *buffer, int ); |
48 | virtual void processEnded(OProcess *); | 48 | virtual void processEnded(Opie::Core::OProcess *); |
49 | protected: | 49 | protected: |
50 | QString buildPath(const QString&p); | 50 | QString buildPath(const QString&p); |
51 | QString MHPath; | 51 | QString MHPath; |
52 | QString MHName; | 52 | QString MHName; |
53 | 53 | ||
54 | void init_storage(); | 54 | void init_storage(); |
55 | void clean_storage(); | 55 | void clean_storage(); |
56 | 56 | ||
57 | bool removeMboxfailed; | 57 | bool removeMboxfailed; |
58 | }; | 58 | }; |
59 | 59 | ||
60 | #endif | 60 | #endif |
diff --git a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp index c0b3eec..9de958d 100644 --- a/noncore/net/mail/libmailwrapper/nntpwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/nntpwrapper.cpp | |||
@@ -1,37 +1,38 @@ | |||
1 | #include "nntpwrapper.h" | 1 | #include "nntpwrapper.h" |
2 | #include "logindialog.h" | 2 | #include "logindialog.h" |
3 | #include "mailtypes.h" | 3 | #include "mailtypes.h" |
4 | 4 | ||
5 | #include <qfile.h> | 5 | #include <qfile.h> |
6 | 6 | ||
7 | #include <stdlib.h> | 7 | #include <stdlib.h> |
8 | 8 | ||
9 | #include <libetpan/libetpan.h> | 9 | #include <libetpan/libetpan.h> |
10 | 10 | ||
11 | 11 | ||
12 | #define HARD_MSG_SIZE_LIMIT 5242880 | 12 | #define HARD_MSG_SIZE_LIMIT 5242880 |
13 | 13 | ||
14 | using namespace Opie::Core; | ||
14 | NNTPwrapper::NNTPwrapper( NNTPaccount *a ) | 15 | NNTPwrapper::NNTPwrapper( NNTPaccount *a ) |
15 | : Genericwrapper() { | 16 | : Genericwrapper() { |
16 | account = a; | 17 | account = a; |
17 | m_nntp = NULL; | 18 | m_nntp = NULL; |
18 | msgTempName = a->getFileName()+"_msg_cache"; | 19 | msgTempName = a->getFileName()+"_msg_cache"; |
19 | last_msg_id = 0; | 20 | last_msg_id = 0; |
20 | } | 21 | } |
21 | 22 | ||
22 | NNTPwrapper::~NNTPwrapper() { | 23 | NNTPwrapper::~NNTPwrapper() { |
23 | logout(); | 24 | logout(); |
24 | QFile msg_cache(msgTempName); | 25 | QFile msg_cache(msgTempName); |
25 | if (msg_cache.exists()) { | 26 | if (msg_cache.exists()) { |
26 | msg_cache.remove(); | 27 | msg_cache.remove(); |
27 | } | 28 | } |
28 | } | 29 | } |
29 | 30 | ||
30 | void NNTPwrapper::nntp_progress( size_t current, size_t maximum ) { | 31 | void NNTPwrapper::nntp_progress( size_t current, size_t maximum ) { |
31 | qDebug( "NNTP: %i of %i", current, maximum ); | 32 | qDebug( "NNTP: %i of %i", current, maximum ); |
32 | } | 33 | } |
33 | 34 | ||
34 | 35 | ||
35 | RecBody NNTPwrapper::fetchBody( const RecMailP &mail ) { | 36 | RecBody NNTPwrapper::fetchBody( const RecMailP &mail ) { |
36 | int err = NEWSNNTP_NO_ERROR; | 37 | int err = NEWSNNTP_NO_ERROR; |
37 | char *message = 0; | 38 | char *message = 0; |
@@ -75,49 +76,49 @@ RecBody NNTPwrapper::fetchBody( const RecMailP &mail ) { | |||
75 | message = (char*)malloc(msg.length()+1*sizeof(char)); | 76 | message = (char*)malloc(msg.length()+1*sizeof(char)); |
76 | memset(message,0,msg.length()+1); | 77 | memset(message,0,msg.length()+1); |
77 | memcpy(message,msg.latin1(),msg.length()); | 78 | memcpy(message,msg.latin1(),msg.length()); |
78 | /* transform to libetpan stuff */ | 79 | /* transform to libetpan stuff */ |
79 | mailmsg = mailmessage_new(); | 80 | mailmsg = mailmessage_new(); |
80 | mailmessage_init(mailmsg, NULL, data_message_driver, 0, strlen(message)); | 81 | mailmessage_init(mailmsg, NULL, data_message_driver, 0, strlen(message)); |
81 | generic_message_t * msg_data; | 82 | generic_message_t * msg_data; |
82 | msg_data = (generic_message_t *)mailmsg->msg_data; | 83 | msg_data = (generic_message_t *)mailmsg->msg_data; |
83 | msg_data->msg_fetched = 1; | 84 | msg_data->msg_fetched = 1; |
84 | msg_data->msg_message = message; | 85 | msg_data->msg_message = message; |
85 | msg_data->msg_length = strlen(message); | 86 | msg_data->msg_length = strlen(message); |
86 | } | 87 | } |
87 | body = parseMail(mailmsg); | 88 | body = parseMail(mailmsg); |
88 | 89 | ||
89 | /* clean up */ | 90 | /* clean up */ |
90 | if (mailmsg) | 91 | if (mailmsg) |
91 | mailmessage_free(mailmsg); | 92 | mailmessage_free(mailmsg); |
92 | if (message) | 93 | if (message) |
93 | free(message); | 94 | free(message); |
94 | 95 | ||
95 | return body; | 96 | return body; |
96 | } | 97 | } |
97 | 98 | ||
98 | 99 | ||
99 | void NNTPwrapper::listMessages(const QString & which, QValueList<Opie::OSmartPointer<RecMail> > &target ) | 100 | void NNTPwrapper::listMessages(const QString & which, QValueList<Opie::Core::OSmartPointer<RecMail> > &target ) |
100 | { | 101 | { |
101 | login(); | 102 | login(); |
102 | if (!m_nntp) | 103 | if (!m_nntp) |
103 | return; | 104 | return; |
104 | uint32_t res_messages,res_recent,res_unseen; | 105 | uint32_t res_messages,res_recent,res_unseen; |
105 | mailsession_status_folder(m_nntp->sto_session,(char*)which.latin1(),&res_messages,&res_recent,&res_unseen); | 106 | mailsession_status_folder(m_nntp->sto_session,(char*)which.latin1(),&res_messages,&res_recent,&res_unseen); |
106 | parseList(target,m_nntp->sto_session,which,true); | 107 | parseList(target,m_nntp->sto_session,which,true); |
107 | } | 108 | } |
108 | 109 | ||
109 | void NNTPwrapper::login() | 110 | void NNTPwrapper::login() |
110 | { | 111 | { |
111 | if (account->getOffline()) | 112 | if (account->getOffline()) |
112 | return; | 113 | return; |
113 | /* we'll hold the line */ | 114 | /* we'll hold the line */ |
114 | if ( m_nntp != NULL ) | 115 | if ( m_nntp != NULL ) |
115 | return; | 116 | return; |
116 | 117 | ||
117 | const char *server, *user, *pass; | 118 | const char *server, *user, *pass; |
118 | QString User,Pass; | 119 | QString User,Pass; |
119 | uint16_t port; | 120 | uint16_t port; |
120 | int err = NEWSNNTP_NO_ERROR; | 121 | int err = NEWSNNTP_NO_ERROR; |
121 | 122 | ||
122 | server = account->getServer().latin1(); | 123 | server = account->getServer().latin1(); |
123 | port = account->getPort().toUInt(); | 124 | port = account->getPort().toUInt(); |
@@ -167,51 +168,51 @@ void NNTPwrapper::login() | |||
167 | nntp_mailstorage_init(m_nntp,(char*)server, port, NULL, CONNECTION_TYPE_PLAIN, NNTP_AUTH_TYPE_PLAIN, | 168 | nntp_mailstorage_init(m_nntp,(char*)server, port, NULL, CONNECTION_TYPE_PLAIN, NNTP_AUTH_TYPE_PLAIN, |
168 | (char*)user,(char*)pass,0,0,0); | 169 | (char*)user,(char*)pass,0,0,0); |
169 | 170 | ||
170 | err = mailstorage_connect( m_nntp ); | 171 | err = mailstorage_connect( m_nntp ); |
171 | 172 | ||
172 | if (err != NEWSNNTP_NO_ERROR) { | 173 | if (err != NEWSNNTP_NO_ERROR) { |
173 | qDebug( QString( "FEHLERNUMMER %1" ).arg( err ) ); | 174 | qDebug( QString( "FEHLERNUMMER %1" ).arg( err ) ); |
174 | // Global::statusMessage(tr("Error initializing folder")); | 175 | // Global::statusMessage(tr("Error initializing folder")); |
175 | mailstorage_free(m_nntp); | 176 | mailstorage_free(m_nntp); |
176 | m_nntp = 0; | 177 | m_nntp = 0; |
177 | 178 | ||
178 | } | 179 | } |
179 | 180 | ||
180 | } | 181 | } |
181 | 182 | ||
182 | void NNTPwrapper::logout() | 183 | void NNTPwrapper::logout() |
183 | { | 184 | { |
184 | int err = NEWSNNTP_NO_ERROR; | 185 | int err = NEWSNNTP_NO_ERROR; |
185 | if ( m_nntp == NULL ) | 186 | if ( m_nntp == NULL ) |
186 | return; | 187 | return; |
187 | mailstorage_free(m_nntp); | 188 | mailstorage_free(m_nntp); |
188 | m_nntp = 0; | 189 | m_nntp = 0; |
189 | } | 190 | } |
190 | 191 | ||
191 | QValueList<Opie::OSmartPointer<Folder> >* NNTPwrapper::listFolders() { | 192 | QValueList<Opie::Core::OSmartPointer<Folder> >* NNTPwrapper::listFolders() { |
192 | 193 | ||
193 | QValueList<Opie::OSmartPointer<Folder> >* folders = new QValueList<Opie::OSmartPointer<Folder> >(); | 194 | QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<Opie::Core::OSmartPointer<Folder> >(); |
194 | QStringList groups; | 195 | QStringList groups; |
195 | if (account) { | 196 | if (account) { |
196 | groups = account->getGroups(); | 197 | groups = account->getGroups(); |
197 | } | 198 | } |
198 | for ( QStringList::Iterator it = groups.begin(); it != groups.end(); ++it ) { | 199 | for ( QStringList::Iterator it = groups.begin(); it != groups.end(); ++it ) { |
199 | folders->append(new Folder((*it),".")); | 200 | folders->append(new Folder((*it),".")); |
200 | } | 201 | } |
201 | return folders; | 202 | return folders; |
202 | } | 203 | } |
203 | 204 | ||
204 | /* we made this method in raw nntp access of etpan and not via generic interface | 205 | /* we made this method in raw nntp access of etpan and not via generic interface |
205 | * 'cause in that case there will be doubled copy operations. eg. the etpan would | 206 | * 'cause in that case there will be doubled copy operations. eg. the etpan would |
206 | * copy that stuff into its own structures and we must copy it into useable c++ | 207 | * copy that stuff into its own structures and we must copy it into useable c++ |
207 | * structures for our frontend. this would not make sense, so it is better to reimplement | 208 | * structures for our frontend. this would not make sense, so it is better to reimplement |
208 | * the stuff from generic interface of etpan but copy it direct to qt classes. | 209 | * the stuff from generic interface of etpan but copy it direct to qt classes. |
209 | */ | 210 | */ |
210 | QStringList NNTPwrapper::listAllNewsgroups(const QString&mask) { | 211 | QStringList NNTPwrapper::listAllNewsgroups(const QString&mask) { |
211 | login(); | 212 | login(); |
212 | QStringList res; | 213 | QStringList res; |
213 | clist *result = 0; | 214 | clist *result = 0; |
214 | clistcell *current = 0; | 215 | clistcell *current = 0; |
215 | newsnntp_group_description *group; | 216 | newsnntp_group_description *group; |
216 | 217 | ||
217 | if ( m_nntp ) { | 218 | if ( m_nntp ) { |
diff --git a/noncore/net/mail/libmailwrapper/nntpwrapper.h b/noncore/net/mail/libmailwrapper/nntpwrapper.h index a7e4b95..a87a8e8 100644 --- a/noncore/net/mail/libmailwrapper/nntpwrapper.h +++ b/noncore/net/mail/libmailwrapper/nntpwrapper.h | |||
@@ -1,48 +1,48 @@ | |||
1 | #ifndef __NNTPWRAPPER | 1 | #ifndef __NNTPWRAPPER |
2 | #define __NNTPWRAPPER | 2 | #define __NNTPWRAPPER |
3 | 3 | ||
4 | #include "mailwrapper.h" | 4 | #include "mailwrapper.h" |
5 | #include "genericwrapper.h" | 5 | #include "genericwrapper.h" |
6 | #include <qstring.h> | 6 | #include <qstring.h> |
7 | #include <libetpan/clist.h> | 7 | #include <libetpan/clist.h> |
8 | 8 | ||
9 | class encodedString; | 9 | class encodedString; |
10 | struct mailstorage; | 10 | struct mailstorage; |
11 | struct mailfolder; | 11 | struct mailfolder; |
12 | 12 | ||
13 | class NNTPwrapper : public Genericwrapper | 13 | class NNTPwrapper : public Genericwrapper |
14 | { | 14 | { |
15 | 15 | ||
16 | Q_OBJECT | 16 | Q_OBJECT |
17 | 17 | ||
18 | public: | 18 | public: |
19 | NNTPwrapper( NNTPaccount *a ); | 19 | NNTPwrapper( NNTPaccount *a ); |
20 | virtual ~NNTPwrapper(); | 20 | virtual ~NNTPwrapper(); |
21 | 21 | ||
22 | /* mailbox will be ignored */ | 22 | /* mailbox will be ignored */ |
23 | virtual void listMessages(const QString & mailbox, QValueList<Opie::OSmartPointer<RecMail> > &target ); | 23 | virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target ); |
24 | /* should only get the subscribed one */ | 24 | /* should only get the subscribed one */ |
25 | virtual QValueList<Opie::OSmartPointer<Folder> >* listFolders(); | 25 | virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders(); |
26 | /* mailbox will be ignored */ | 26 | /* mailbox will be ignored */ |
27 | virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX"); | 27 | virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX"); |
28 | QStringList listAllNewsgroups(const QString&mask = QString::null); | 28 | QStringList listAllNewsgroups(const QString&mask = QString::null); |
29 | virtual void deleteMail(const RecMailP&mail); | 29 | virtual void deleteMail(const RecMailP&mail); |
30 | virtual void answeredMail(const RecMailP&mail); | 30 | virtual void answeredMail(const RecMailP&mail); |
31 | virtual int deleteAllMail(const Opie::OSmartPointer<Folder>&); | 31 | virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&); |
32 | 32 | ||
33 | virtual RecBody fetchBody( const RecMailP &mail ); | 33 | virtual RecBody fetchBody( const RecMailP &mail ); |
34 | virtual encodedString* fetchRawBody(const RecMailP&mail); | 34 | virtual encodedString* fetchRawBody(const RecMailP&mail); |
35 | virtual void logout(); | 35 | virtual void logout(); |
36 | virtual MAILLIB::ATYPE getType()const; | 36 | virtual MAILLIB::ATYPE getType()const; |
37 | virtual const QString&getName()const; | 37 | virtual const QString&getName()const; |
38 | static void nntp_progress( size_t current, size_t maximum ); | 38 | static void nntp_progress( size_t current, size_t maximum ); |
39 | 39 | ||
40 | protected: | 40 | protected: |
41 | void login(); | 41 | void login(); |
42 | NNTPaccount *account; | 42 | NNTPaccount *account; |
43 | mailstorage* m_nntp; | 43 | mailstorage* m_nntp; |
44 | 44 | ||
45 | 45 | ||
46 | }; | 46 | }; |
47 | 47 | ||
48 | #endif | 48 | #endif |
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp index 6737d6c..f5694fe 100644 --- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp +++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp | |||
@@ -1,36 +1,37 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | #include "pop3wrapper.h" | 2 | #include "pop3wrapper.h" |
3 | #include "mailtypes.h" | 3 | #include "mailtypes.h" |
4 | #include "logindialog.h" | 4 | #include "logindialog.h" |
5 | #include <libetpan/libetpan.h> | 5 | #include <libetpan/libetpan.h> |
6 | #include <qpe/global.h> | 6 | #include <qpe/global.h> |
7 | #include <qfile.h> | 7 | #include <qfile.h> |
8 | //#include <qstring.h> | 8 | //#include <qstring.h> |
9 | 9 | ||
10 | /* we don't fetch messages larger than 5 MB */ | 10 | /* we don't fetch messages larger than 5 MB */ |
11 | #define HARD_MSG_SIZE_LIMIT 5242880 | 11 | #define HARD_MSG_SIZE_LIMIT 5242880 |
12 | 12 | ||
13 | using namespace Opie::Core; | ||
13 | POP3wrapper::POP3wrapper( POP3account *a ) | 14 | POP3wrapper::POP3wrapper( POP3account *a ) |
14 | : Genericwrapper() { | 15 | : Genericwrapper() { |
15 | account = a; | 16 | account = a; |
16 | m_pop3 = NULL; | 17 | m_pop3 = NULL; |
17 | msgTempName = a->getFileName()+"_msg_cache"; | 18 | msgTempName = a->getFileName()+"_msg_cache"; |
18 | last_msg_id = 0; | 19 | last_msg_id = 0; |
19 | } | 20 | } |
20 | 21 | ||
21 | POP3wrapper::~POP3wrapper() { | 22 | POP3wrapper::~POP3wrapper() { |
22 | logout(); | 23 | logout(); |
23 | QFile msg_cache(msgTempName); | 24 | QFile msg_cache(msgTempName); |
24 | if (msg_cache.exists()) { | 25 | if (msg_cache.exists()) { |
25 | msg_cache.remove(); | 26 | msg_cache.remove(); |
26 | } | 27 | } |
27 | } | 28 | } |
28 | 29 | ||
29 | void POP3wrapper::pop3_progress( size_t current, size_t maximum ) { | 30 | void POP3wrapper::pop3_progress( size_t current, size_t maximum ) { |
30 | qDebug( "POP3: %i of %i", current, maximum ); | 31 | qDebug( "POP3: %i of %i", current, maximum ); |
31 | } | 32 | } |
32 | 33 | ||
33 | RecBody POP3wrapper::fetchBody( const RecMailP &mail ) { | 34 | RecBody POP3wrapper::fetchBody( const RecMailP &mail ) { |
34 | int err = MAILPOP3_NO_ERROR; | 35 | int err = MAILPOP3_NO_ERROR; |
35 | char *message = 0; | 36 | char *message = 0; |
36 | size_t length = 0; | 37 | size_t length = 0; |
@@ -72,49 +73,49 @@ RecBody POP3wrapper::fetchBody( const RecMailP &mail ) { | |||
72 | delete message; | 73 | delete message; |
73 | message = (char*)malloc(msg.length()+1*sizeof(char)); | 74 | message = (char*)malloc(msg.length()+1*sizeof(char)); |
74 | memset(message,0,msg.length()+1); | 75 | memset(message,0,msg.length()+1); |
75 | memcpy(message,msg.latin1(),msg.length()); | 76 | memcpy(message,msg.latin1(),msg.length()); |
76 | /* transform to libetpan stuff */ | 77 | /* transform to libetpan stuff */ |
77 | mailmsg = mailmessage_new(); | 78 | mailmsg = mailmessage_new(); |
78 | mailmessage_init(mailmsg, NULL, data_message_driver, 0, strlen(message)); | 79 | mailmessage_init(mailmsg, NULL, data_message_driver, 0, strlen(message)); |
79 | generic_message_t * msg_data; | 80 | generic_message_t * msg_data; |
80 | msg_data = (generic_message_t *)mailmsg->msg_data; | 81 | msg_data = (generic_message_t *)mailmsg->msg_data; |
81 | msg_data->msg_fetched = 1; | 82 | msg_data->msg_fetched = 1; |
82 | msg_data->msg_message = message; | 83 | msg_data->msg_message = message; |
83 | msg_data->msg_length = strlen(message); | 84 | msg_data->msg_length = strlen(message); |
84 | } | 85 | } |
85 | body = parseMail(mailmsg); | 86 | body = parseMail(mailmsg); |
86 | 87 | ||
87 | /* clean up */ | 88 | /* clean up */ |
88 | if (mailmsg) | 89 | if (mailmsg) |
89 | mailmessage_free(mailmsg); | 90 | mailmessage_free(mailmsg); |
90 | if (message) | 91 | if (message) |
91 | free(message); | 92 | free(message); |
92 | 93 | ||
93 | return body; | 94 | return body; |
94 | } | 95 | } |
95 | 96 | ||
96 | void POP3wrapper::listMessages(const QString &, QValueList<Opie::OSmartPointer<RecMail> > &target ) | 97 | void POP3wrapper::listMessages(const QString &, QValueList<Opie::Core::OSmartPointer<RecMail> > &target ) |
97 | { | 98 | { |
98 | login(); | 99 | login(); |
99 | if (!m_pop3) | 100 | if (!m_pop3) |
100 | return; | 101 | return; |
101 | uint32_t res_messages,res_recent,res_unseen; | 102 | uint32_t res_messages,res_recent,res_unseen; |
102 | mailsession_status_folder(m_pop3->sto_session,"INBOX",&res_messages,&res_recent,&res_unseen); | 103 | mailsession_status_folder(m_pop3->sto_session,"INBOX",&res_messages,&res_recent,&res_unseen); |
103 | parseList(target,m_pop3->sto_session,"INBOX"); | 104 | parseList(target,m_pop3->sto_session,"INBOX"); |
104 | Global::statusMessage( tr("Mailbox contains %1 mail(s)").arg(res_messages)); | 105 | Global::statusMessage( tr("Mailbox contains %1 mail(s)").arg(res_messages)); |
105 | } | 106 | } |
106 | 107 | ||
107 | void POP3wrapper::login() | 108 | void POP3wrapper::login() |
108 | { | 109 | { |
109 | if (account->getOffline()) | 110 | if (account->getOffline()) |
110 | return; | 111 | return; |
111 | /* we'll hold the line */ | 112 | /* we'll hold the line */ |
112 | if ( m_pop3 != NULL ) | 113 | if ( m_pop3 != NULL ) |
113 | return; | 114 | return; |
114 | 115 | ||
115 | const char *server, *user, *pass; | 116 | const char *server, *user, *pass; |
116 | uint16_t port; | 117 | uint16_t port; |
117 | int err = MAILPOP3_NO_ERROR; | 118 | int err = MAILPOP3_NO_ERROR; |
118 | 119 | ||
119 | server = account->getServer().latin1(); | 120 | server = account->getServer().latin1(); |
120 | port = account->getPort().toUInt(); | 121 | port = account->getPort().toUInt(); |
@@ -155,50 +156,50 @@ void POP3wrapper::login() | |||
155 | //(ssl?CONNECTION_TYPE_TLS:CONNECTION_TYPE_PLAIN); | 156 | //(ssl?CONNECTION_TYPE_TLS:CONNECTION_TYPE_PLAIN); |
156 | 157 | ||
157 | pop3_mailstorage_init(m_pop3,(char*)server, port, NULL, conntype, POP3_AUTH_TYPE_PLAIN, | 158 | pop3_mailstorage_init(m_pop3,(char*)server, port, NULL, conntype, POP3_AUTH_TYPE_PLAIN, |
158 | (char*)user,(char*)pass,0,0,0); | 159 | (char*)user,(char*)pass,0,0,0); |
159 | 160 | ||
160 | 161 | ||
161 | err = mailstorage_connect(m_pop3); | 162 | err = mailstorage_connect(m_pop3); |
162 | if (err != MAIL_NO_ERROR) { | 163 | if (err != MAIL_NO_ERROR) { |
163 | qDebug( QString( "FEHLERNUMMER %1" ).arg( err ) ); | 164 | qDebug( QString( "FEHLERNUMMER %1" ).arg( err ) ); |
164 | Global::statusMessage(tr("Error initializing folder")); | 165 | Global::statusMessage(tr("Error initializing folder")); |
165 | mailstorage_free(m_pop3); | 166 | mailstorage_free(m_pop3); |
166 | m_pop3 = 0; | 167 | m_pop3 = 0; |
167 | } | 168 | } |
168 | } | 169 | } |
169 | 170 | ||
170 | void POP3wrapper::logout() | 171 | void POP3wrapper::logout() |
171 | { | 172 | { |
172 | if ( m_pop3 == NULL ) | 173 | if ( m_pop3 == NULL ) |
173 | return; | 174 | return; |
174 | mailstorage_free(m_pop3); | 175 | mailstorage_free(m_pop3); |
175 | m_pop3 = 0; | 176 | m_pop3 = 0; |
176 | } | 177 | } |
177 | 178 | ||
178 | 179 | ||
179 | QValueList<Opie::OSmartPointer<Folder> >* POP3wrapper::listFolders() { | 180 | QValueList<Opie::Core::OSmartPointer<Folder> >* POP3wrapper::listFolders() { |
180 | QValueList<Opie::OSmartPointer<Folder> >* folders = new QValueList<FolderP>(); | 181 | QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<FolderP>(); |
181 | FolderP inb=new Folder("INBOX","/"); | 182 | FolderP inb=new Folder("INBOX","/"); |
182 | folders->append(inb); | 183 | folders->append(inb); |
183 | return folders; | 184 | return folders; |
184 | } | 185 | } |
185 | 186 | ||
186 | void POP3wrapper::deleteMail(const RecMailP&mail) { | 187 | void POP3wrapper::deleteMail(const RecMailP&mail) { |
187 | login(); | 188 | login(); |
188 | if (!m_pop3) | 189 | if (!m_pop3) |
189 | return; | 190 | return; |
190 | int err = mailsession_remove_message(m_pop3->sto_session,mail->getNumber()); | 191 | int err = mailsession_remove_message(m_pop3->sto_session,mail->getNumber()); |
191 | if (err != MAIL_NO_ERROR) { | 192 | if (err != MAIL_NO_ERROR) { |
192 | Global::statusMessage(tr("error deleting mail")); | 193 | Global::statusMessage(tr("error deleting mail")); |
193 | } | 194 | } |
194 | } | 195 | } |
195 | 196 | ||
196 | void POP3wrapper::answeredMail(const RecMailP&) {} | 197 | void POP3wrapper::answeredMail(const RecMailP&) {} |
197 | 198 | ||
198 | int POP3wrapper::deleteAllMail(const FolderP&) { | 199 | int POP3wrapper::deleteAllMail(const FolderP&) { |
199 | login(); | 200 | login(); |
200 | if (!m_pop3) | 201 | if (!m_pop3) |
201 | return 0; | 202 | return 0; |
202 | int res = 1; | 203 | int res = 1; |
203 | 204 | ||
204 | uint32_t result = 0; | 205 | uint32_t result = 0; |
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.h b/noncore/net/mail/libmailwrapper/pop3wrapper.h index 31eb6f1..c46b941 100644 --- a/noncore/net/mail/libmailwrapper/pop3wrapper.h +++ b/noncore/net/mail/libmailwrapper/pop3wrapper.h | |||
@@ -1,42 +1,42 @@ | |||
1 | #ifndef __POP3WRAPPER | 1 | #ifndef __POP3WRAPPER |
2 | #define __POP3WRAPPER | 2 | #define __POP3WRAPPER |
3 | 3 | ||
4 | #include "mailwrapper.h" | 4 | #include "mailwrapper.h" |
5 | #include "genericwrapper.h" | 5 | #include "genericwrapper.h" |
6 | #include <qstring.h> | 6 | #include <qstring.h> |
7 | 7 | ||
8 | class encodedString; | 8 | class encodedString; |
9 | struct mailstorage; | 9 | struct mailstorage; |
10 | struct mailfolder; | 10 | struct mailfolder; |
11 | 11 | ||
12 | class POP3wrapper : public Genericwrapper | 12 | class POP3wrapper : public Genericwrapper |
13 | { | 13 | { |
14 | Q_OBJECT | 14 | Q_OBJECT |
15 | 15 | ||
16 | public: | 16 | public: |
17 | POP3wrapper( POP3account *a ); | 17 | POP3wrapper( POP3account *a ); |
18 | virtual ~POP3wrapper(); | 18 | virtual ~POP3wrapper(); |
19 | /* mailbox will be ignored */ | 19 | /* mailbox will be ignored */ |
20 | virtual void listMessages(const QString & mailbox, QValueList<Opie::OSmartPointer<RecMail> > &target ); | 20 | virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target ); |
21 | virtual QValueList<Opie::OSmartPointer<Folder> >* listFolders(); | 21 | virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders(); |
22 | /* mailbox will be ignored */ | 22 | /* mailbox will be ignored */ |
23 | virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX"); | 23 | virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX"); |
24 | 24 | ||
25 | virtual void deleteMail(const RecMailP&mail); | 25 | virtual void deleteMail(const RecMailP&mail); |
26 | virtual void answeredMail(const RecMailP&mail); | 26 | virtual void answeredMail(const RecMailP&mail); |
27 | virtual int deleteAllMail(const Opie::OSmartPointer<Folder>&); | 27 | virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&); |
28 | 28 | ||
29 | virtual RecBody fetchBody( const RecMailP &mail ); | 29 | virtual RecBody fetchBody( const RecMailP &mail ); |
30 | virtual encodedString* fetchRawBody(const RecMailP&mail); | 30 | virtual encodedString* fetchRawBody(const RecMailP&mail); |
31 | virtual void logout(); | 31 | virtual void logout(); |
32 | virtual MAILLIB::ATYPE getType()const; | 32 | virtual MAILLIB::ATYPE getType()const; |
33 | virtual const QString&getName()const; | 33 | virtual const QString&getName()const; |
34 | static void pop3_progress( size_t current, size_t maximum ); | 34 | static void pop3_progress( size_t current, size_t maximum ); |
35 | 35 | ||
36 | protected: | 36 | protected: |
37 | void login(); | 37 | void login(); |
38 | POP3account *account; | 38 | POP3account *account; |
39 | mailstorage*m_pop3; | 39 | mailstorage*m_pop3; |
40 | }; | 40 | }; |
41 | 41 | ||
42 | #endif | 42 | #endif |
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp index 86673aa..e2cea7a 100644 --- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp | |||
@@ -1,39 +1,40 @@ | |||
1 | #include "smtpwrapper.h" | 1 | #include "smtpwrapper.h" |
2 | #include "mailwrapper.h" | 2 | #include "mailwrapper.h" |
3 | #include "abstractmail.h" | 3 | #include "abstractmail.h" |
4 | #include "logindialog.h" | 4 | #include "logindialog.h" |
5 | #include "mailtypes.h" | 5 | #include "mailtypes.h" |
6 | #include "sendmailprogress.h" | 6 | #include "sendmailprogress.h" |
7 | 7 | ||
8 | #include <qt.h> | 8 | #include <qt.h> |
9 | 9 | ||
10 | #include <qpe/config.h> | 10 | #include <qpe/config.h> |
11 | #include <qpe/qcopenvelope_qws.h> | 11 | #include <qpe/qcopenvelope_qws.h> |
12 | 12 | ||
13 | #include <libetpan/libetpan.h> | 13 | #include <libetpan/libetpan.h> |
14 | 14 | ||
15 | 15 | ||
16 | using namespace Opie::Core; | ||
16 | progressMailSend*SMTPwrapper::sendProgress = 0; | 17 | progressMailSend*SMTPwrapper::sendProgress = 0; |
17 | 18 | ||
18 | SMTPwrapper::SMTPwrapper(SMTPaccount * aSmtp ) | 19 | SMTPwrapper::SMTPwrapper(SMTPaccount * aSmtp ) |
19 | : Generatemail() | 20 | : Generatemail() |
20 | { | 21 | { |
21 | m_SmtpAccount = aSmtp; | 22 | m_SmtpAccount = aSmtp; |
22 | Config cfg( "mail" ); | 23 | Config cfg( "mail" ); |
23 | cfg.setGroup( "Status" ); | 24 | cfg.setGroup( "Status" ); |
24 | m_queuedMail = cfg.readNumEntry( "outgoing", 0 ); | 25 | m_queuedMail = cfg.readNumEntry( "outgoing", 0 ); |
25 | emit queuedMails( m_queuedMail ); | 26 | emit queuedMails( m_queuedMail ); |
26 | connect( this, SIGNAL( queuedMails(int) ), this, SLOT( emitQCop(int) ) ); | 27 | connect( this, SIGNAL( queuedMails(int) ), this, SLOT( emitQCop(int) ) ); |
27 | m_smtp = 0; | 28 | m_smtp = 0; |
28 | } | 29 | } |
29 | 30 | ||
30 | SMTPwrapper::~SMTPwrapper() | 31 | SMTPwrapper::~SMTPwrapper() |
31 | { | 32 | { |
32 | disc_server(); | 33 | disc_server(); |
33 | } | 34 | } |
34 | 35 | ||
35 | void SMTPwrapper::emitQCop( int queued ) { | 36 | void SMTPwrapper::emitQCop( int queued ) { |
36 | QCopEnvelope env( "QPE/Pim", "outgoingMails(int)" ); | 37 | QCopEnvelope env( "QPE/Pim", "outgoingMails(int)" ); |
37 | env << queued; | 38 | env << queued; |
38 | } | 39 | } |
39 | 40 | ||
@@ -291,49 +292,49 @@ int SMTPwrapper::smtpSend(char*from,clist*rcpts,const char*data,size_t size ) | |||
291 | QString failuretext = ""; | 292 | QString failuretext = ""; |
292 | 293 | ||
293 | connect_server(); | 294 | connect_server(); |
294 | 295 | ||
295 | result = 1; | 296 | result = 1; |
296 | if (m_smtp) { | 297 | if (m_smtp) { |
297 | err = mailsmtp_send( m_smtp, from, rcpts, data, size ); | 298 | err = mailsmtp_send( m_smtp, from, rcpts, data, size ); |
298 | if ( err != MAILSMTP_NO_ERROR ) { | 299 | if ( err != MAILSMTP_NO_ERROR ) { |
299 | failuretext=tr("Error sending mail: %1").arg(mailsmtpError(err)); | 300 | failuretext=tr("Error sending mail: %1").arg(mailsmtpError(err)); |
300 | result = 0; | 301 | result = 0; |
301 | } | 302 | } |
302 | } else { | 303 | } else { |
303 | result = 0; | 304 | result = 0; |
304 | } | 305 | } |
305 | 306 | ||
306 | if (!result) { | 307 | if (!result) { |
307 | storeFailedMail(data,size,failuretext); | 308 | storeFailedMail(data,size,failuretext); |
308 | } else { | 309 | } else { |
309 | qDebug( "Mail sent." ); | 310 | qDebug( "Mail sent." ); |
310 | storeMail(data,size,"Sent"); | 311 | storeMail(data,size,"Sent"); |
311 | } | 312 | } |
312 | return result; | 313 | return result; |
313 | } | 314 | } |
314 | 315 | ||
315 | void SMTPwrapper::sendMail(const Opie::OSmartPointer<Mail>&mail,bool later ) | 316 | void SMTPwrapper::sendMail(const Opie::Core::OSmartPointer<Mail>&mail,bool later ) |
316 | { | 317 | { |
317 | mailmime * mimeMail; | 318 | mailmime * mimeMail; |
318 | 319 | ||
319 | mimeMail = createMimeMail(mail ); | 320 | mimeMail = createMimeMail(mail ); |
320 | if ( mimeMail == NULL ) { | 321 | if ( mimeMail == NULL ) { |
321 | qDebug( "sendMail: error creating mime mail" ); | 322 | qDebug( "sendMail: error creating mime mail" ); |
322 | } else { | 323 | } else { |
323 | sendProgress = new progressMailSend(); | 324 | sendProgress = new progressMailSend(); |
324 | sendProgress->show(); | 325 | sendProgress->show(); |
325 | sendProgress->setMaxMails(1); | 326 | sendProgress->setMaxMails(1); |
326 | smtpSend( mimeMail,later); | 327 | smtpSend( mimeMail,later); |
327 | qDebug("Clean up done"); | 328 | qDebug("Clean up done"); |
328 | sendProgress->hide(); | 329 | sendProgress->hide(); |
329 | delete sendProgress; | 330 | delete sendProgress; |
330 | sendProgress = 0; | 331 | sendProgress = 0; |
331 | mailmime_free( mimeMail ); | 332 | mailmime_free( mimeMail ); |
332 | } | 333 | } |
333 | } | 334 | } |
334 | 335 | ||
335 | int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,const RecMailP&which) { | 336 | int SMTPwrapper::sendQueuedMail(AbstractMail*wrap,const RecMailP&which) { |
336 | size_t curTok = 0; | 337 | size_t curTok = 0; |
337 | mailimf_fields *fields = 0; | 338 | mailimf_fields *fields = 0; |
338 | mailimf_field*ffrom = 0; | 339 | mailimf_field*ffrom = 0; |
339 | clist *rcpts = 0; | 340 | clist *rcpts = 0; |
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.h b/noncore/net/mail/libmailwrapper/smtpwrapper.h index 71ae35c..6c5bbe8 100644 --- a/noncore/net/mail/libmailwrapper/smtpwrapper.h +++ b/noncore/net/mail/libmailwrapper/smtpwrapper.h | |||
@@ -2,62 +2,62 @@ | |||
2 | #ifndef SMTPwrapper_H | 2 | #ifndef SMTPwrapper_H |
3 | #define SMTPwrapper_H | 3 | #define SMTPwrapper_H |
4 | 4 | ||
5 | #include <qpe/applnk.h> | 5 | #include <qpe/applnk.h> |
6 | 6 | ||
7 | #include <qbitarray.h> | 7 | #include <qbitarray.h> |
8 | #include <qdatetime.h> | 8 | #include <qdatetime.h> |
9 | #include <libetpan/clist.h> | 9 | #include <libetpan/clist.h> |
10 | 10 | ||
11 | #include "settings.h" | 11 | #include "settings.h" |
12 | #include "generatemail.h" | 12 | #include "generatemail.h" |
13 | 13 | ||
14 | #include <opie2/osmartpointer.h> | 14 | #include <opie2/osmartpointer.h> |
15 | 15 | ||
16 | class SMTPaccount; | 16 | class SMTPaccount; |
17 | class AbstractMail; | 17 | class AbstractMail; |
18 | 18 | ||
19 | class SMTPwrapper : public Generatemail | 19 | class SMTPwrapper : public Generatemail |
20 | { | 20 | { |
21 | Q_OBJECT | 21 | Q_OBJECT |
22 | 22 | ||
23 | public: | 23 | public: |
24 | SMTPwrapper(SMTPaccount * aSmtp); | 24 | SMTPwrapper(SMTPaccount * aSmtp); |
25 | virtual ~SMTPwrapper(); | 25 | virtual ~SMTPwrapper(); |
26 | void sendMail(const Opie::OSmartPointer<Mail>& mail,bool later=false ); | 26 | void sendMail(const Opie::Core::OSmartPointer<Mail>& mail,bool later=false ); |
27 | bool flushOutbox(); | 27 | bool flushOutbox(); |
28 | 28 | ||
29 | static progressMailSend*sendProgress; | 29 | static progressMailSend*sendProgress; |
30 | 30 | ||
31 | signals: | 31 | signals: |
32 | void queuedMails( int ); | 32 | void queuedMails( int ); |
33 | 33 | ||
34 | protected: | 34 | protected: |
35 | mailsmtp *m_smtp; | 35 | mailsmtp *m_smtp; |
36 | SMTPaccount * m_SmtpAccount; | 36 | SMTPaccount * m_SmtpAccount; |
37 | 37 | ||
38 | void connect_server(); | 38 | void connect_server(); |
39 | void disc_server(); | 39 | void disc_server(); |
40 | int start_smtp_tls(); | 40 | int start_smtp_tls(); |
41 | 41 | ||
42 | 42 | ||
43 | void smtpSend( mailmime *mail,bool later); | 43 | void smtpSend( mailmime *mail,bool later); |
44 | 44 | ||
45 | static void storeMail(const char*mail, size_t length, const QString&box); | 45 | static void storeMail(const char*mail, size_t length, const QString&box); |
46 | static QString mailsmtpError( int err ); | 46 | static QString mailsmtpError( int err ); |
47 | static void progress( size_t current, size_t maximum ); | 47 | static void progress( size_t current, size_t maximum ); |
48 | 48 | ||
49 | int smtpSend(char*from,clist*rcpts,const char*data,size_t size); | 49 | int smtpSend(char*from,clist*rcpts,const char*data,size_t size); |
50 | 50 | ||
51 | void storeMail(mailmime*mail, const QString&box); | 51 | void storeMail(mailmime*mail, const QString&box); |
52 | 52 | ||
53 | int sendQueuedMail(AbstractMail*wrap,const Opie::OSmartPointer<RecMail>&which); | 53 | int sendQueuedMail(AbstractMail*wrap,const Opie::Core::OSmartPointer<RecMail>&which); |
54 | void storeFailedMail(const char*data,unsigned int size, const char*failuremessage); | 54 | void storeFailedMail(const char*data,unsigned int size, const char*failuremessage); |
55 | 55 | ||
56 | int m_queuedMail; | 56 | int m_queuedMail; |
57 | 57 | ||
58 | protected slots: | 58 | protected slots: |
59 | void emitQCop( int queued ); | 59 | void emitQCop( int queued ); |
60 | 60 | ||
61 | }; | 61 | }; |
62 | 62 | ||
63 | #endif | 63 | #endif |
diff --git a/noncore/net/mail/libmailwrapper/storemail.cpp b/noncore/net/mail/libmailwrapper/storemail.cpp index 595e7fc..914a11d 100644 --- a/noncore/net/mail/libmailwrapper/storemail.cpp +++ b/noncore/net/mail/libmailwrapper/storemail.cpp | |||
@@ -1,76 +1,77 @@ | |||
1 | #include "storemail.h" | 1 | #include "storemail.h" |
2 | #include "mailwrapper.h" | 2 | #include "mailwrapper.h" |
3 | #include "settings.h" | 3 | #include "settings.h" |
4 | #include "abstractmail.h" | 4 | #include "abstractmail.h" |
5 | 5 | ||
6 | #include <libetpan/libetpan.h> | 6 | #include <libetpan/libetpan.h> |
7 | 7 | ||
8 | #include <qstring.h> | 8 | #include <qstring.h> |
9 | 9 | ||
10 | #include <stdlib.h> | 10 | #include <stdlib.h> |
11 | 11 | ||
12 | using namespace Opie::Core; | ||
12 | Storemail::Storemail(Account*aAccount,const QString&aFolder) | 13 | Storemail::Storemail(Account*aAccount,const QString&aFolder) |
13 | : Generatemail() | 14 | : Generatemail() |
14 | { | 15 | { |
15 | wrapper = 0; | 16 | wrapper = 0; |
16 | m_Account = aAccount; | 17 | m_Account = aAccount; |
17 | m_tfolder = aFolder; | 18 | m_tfolder = aFolder; |
18 | wrapper = AbstractMail::getWrapper(m_Account); | 19 | wrapper = AbstractMail::getWrapper(m_Account); |
19 | if (wrapper) { | 20 | if (wrapper) { |
20 | wrapper->createMbox(m_tfolder); | 21 | wrapper->createMbox(m_tfolder); |
21 | } | 22 | } |
22 | } | 23 | } |
23 | 24 | ||
24 | Storemail::Storemail(const QString&dir,const QString&aFolder) | 25 | Storemail::Storemail(const QString&dir,const QString&aFolder) |
25 | : Generatemail() | 26 | : Generatemail() |
26 | { | 27 | { |
27 | wrapper = 0; | 28 | wrapper = 0; |
28 | m_Account = 0; | 29 | m_Account = 0; |
29 | m_tfolder = aFolder; | 30 | m_tfolder = aFolder; |
30 | wrapper = AbstractMail::getWrapper(dir); | 31 | wrapper = AbstractMail::getWrapper(dir); |
31 | if (wrapper) { | 32 | if (wrapper) { |
32 | wrapper->createMbox(m_tfolder); | 33 | wrapper->createMbox(m_tfolder); |
33 | } | 34 | } |
34 | } | 35 | } |
35 | 36 | ||
36 | Storemail::Storemail(const QString&aFolder) | 37 | Storemail::Storemail(const QString&aFolder) |
37 | : Generatemail() | 38 | : Generatemail() |
38 | { | 39 | { |
39 | wrapper = 0; | 40 | wrapper = 0; |
40 | m_Account = 0; | 41 | m_Account = 0; |
41 | m_tfolder = aFolder; | 42 | m_tfolder = aFolder; |
42 | wrapper = AbstractMail::getWrapper(AbstractMail::defaultLocalfolder()); | 43 | wrapper = AbstractMail::getWrapper(AbstractMail::defaultLocalfolder()); |
43 | if (wrapper) { | 44 | if (wrapper) { |
44 | wrapper->createMbox(m_tfolder); | 45 | wrapper->createMbox(m_tfolder); |
45 | } | 46 | } |
46 | } | 47 | } |
47 | 48 | ||
48 | Storemail::~Storemail() | 49 | Storemail::~Storemail() |
49 | { | 50 | { |
50 | } | 51 | } |
51 | 52 | ||
52 | int Storemail::storeMail(const Opie::OSmartPointer<Mail>&mail) | 53 | int Storemail::storeMail(const Opie::Core::OSmartPointer<Mail>&mail) |
53 | { | 54 | { |
54 | if (!wrapper) return 0; | 55 | if (!wrapper) return 0; |
55 | int ret = 1; | 56 | int ret = 1; |
56 | 57 | ||
57 | mailmime * mimeMail = 0; | 58 | mailmime * mimeMail = 0; |
58 | mimeMail = createMimeMail(mail ); | 59 | mimeMail = createMimeMail(mail ); |
59 | if ( mimeMail == NULL ) { | 60 | if ( mimeMail == NULL ) { |
60 | qDebug( "storeMail: error creating mime mail" ); | 61 | qDebug( "storeMail: error creating mime mail" ); |
61 | return 0; | 62 | return 0; |
62 | } | 63 | } |
63 | char *data; | 64 | char *data; |
64 | size_t size; | 65 | size_t size; |
65 | data = 0; | 66 | data = 0; |
66 | 67 | ||
67 | mailmessage * msg = 0; | 68 | mailmessage * msg = 0; |
68 | msg = mime_message_init(mimeMail); | 69 | msg = mime_message_init(mimeMail); |
69 | mime_message_set_tmpdir(msg,getenv( "HOME" )); | 70 | mime_message_set_tmpdir(msg,getenv( "HOME" )); |
70 | int r = mailmessage_fetch(msg,&data,&size); | 71 | int r = mailmessage_fetch(msg,&data,&size); |
71 | mime_message_detach_mime(msg); | 72 | mime_message_detach_mime(msg); |
72 | mailmessage_free(msg); | 73 | mailmessage_free(msg); |
73 | msg = 0; | 74 | msg = 0; |
74 | if (r != MAIL_NO_ERROR || !data) { | 75 | if (r != MAIL_NO_ERROR || !data) { |
75 | qDebug("Error fetching mime..."); | 76 | qDebug("Error fetching mime..."); |
76 | ret = 0; | 77 | ret = 0; |
diff --git a/noncore/net/mail/libmailwrapper/storemail.h b/noncore/net/mail/libmailwrapper/storemail.h index 80c7431..4433de0 100644 --- a/noncore/net/mail/libmailwrapper/storemail.h +++ b/noncore/net/mail/libmailwrapper/storemail.h | |||
@@ -1,29 +1,29 @@ | |||
1 | #ifndef __STORE_MAIL_H | 1 | #ifndef __STORE_MAIL_H |
2 | #define __STORE_MAIL_H | 2 | #define __STORE_MAIL_H |
3 | 3 | ||
4 | #include <qpe/applnk.h> | 4 | #include <qpe/applnk.h> |
5 | 5 | ||
6 | #include "generatemail.h" | 6 | #include "generatemail.h" |
7 | 7 | ||
8 | class Account; | 8 | class Account; |
9 | class Mail; | 9 | class Mail; |
10 | class AbstractMail; | 10 | class AbstractMail; |
11 | 11 | ||
12 | class Storemail : public Generatemail | 12 | class Storemail : public Generatemail |
13 | { | 13 | { |
14 | Q_OBJECT | 14 | Q_OBJECT |
15 | public: | 15 | public: |
16 | Storemail(Account*aAccount,const QString&aFolder); | 16 | Storemail(Account*aAccount,const QString&aFolder); |
17 | Storemail(const QString&dir,const QString&aFolder); | 17 | Storemail(const QString&dir,const QString&aFolder); |
18 | Storemail(const QString&aFolder); | 18 | Storemail(const QString&aFolder); |
19 | virtual ~Storemail(); | 19 | virtual ~Storemail(); |
20 | 20 | ||
21 | int storeMail(const Opie::OSmartPointer<Mail>&mail); | 21 | int storeMail(const Opie::Core::OSmartPointer<Mail>&mail); |
22 | 22 | ||
23 | protected: | 23 | protected: |
24 | Account* m_Account; | 24 | Account* m_Account; |
25 | QString m_tfolder; | 25 | QString m_tfolder; |
26 | AbstractMail*wrapper; | 26 | AbstractMail*wrapper; |
27 | }; | 27 | }; |
28 | 28 | ||
29 | #endif | 29 | #endif |
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro index 005a839..926cdbd 100644 --- a/noncore/net/mail/mail.pro +++ b/noncore/net/mail/mail.pro | |||
@@ -31,36 +31,36 @@ SOURCES = main.cpp \ | |||
31 | mailistviewitem.cpp \ | 31 | mailistviewitem.cpp \ |
32 | settingsdialog.cpp \ | 32 | settingsdialog.cpp \ |
33 | statuswidget.cpp \ | 33 | statuswidget.cpp \ |
34 | newmaildir.cpp \ | 34 | newmaildir.cpp \ |
35 | selectstore.cpp \ | 35 | selectstore.cpp \ |
36 | selectsmtp.cpp \ | 36 | selectsmtp.cpp \ |
37 | nntpgroups.cpp \ | 37 | nntpgroups.cpp \ |
38 | nntpgroupsdlg.cpp | 38 | nntpgroupsdlg.cpp |
39 | 39 | ||
40 | INTERFACES = editaccountsui.ui \ | 40 | INTERFACES = editaccountsui.ui \ |
41 | selectmailtypeui.ui \ | 41 | selectmailtypeui.ui \ |
42 | imapconfigui.ui \ | 42 | imapconfigui.ui \ |
43 | pop3configui.ui \ | 43 | pop3configui.ui \ |
44 | nntpconfigui.ui \ | 44 | nntpconfigui.ui \ |
45 | smtpconfigui.ui \ | 45 | smtpconfigui.ui \ |
46 | addresspickerui.ui \ | 46 | addresspickerui.ui \ |
47 | composemailui.ui \ | 47 | composemailui.ui \ |
48 | settingsdialogui.ui \ | 48 | settingsdialogui.ui \ |
49 | statuswidgetui.ui \ | 49 | statuswidgetui.ui \ |
50 | newmaildirui.ui \ | 50 | newmaildirui.ui \ |
51 | selectstoreui.ui \ | 51 | selectstoreui.ui \ |
52 | nntpgroupsui.ui | 52 | nntpgroupsui.ui |
53 | 53 | ||
54 | 54 | ||
55 | INCLUDEPATH += $(OPIEDIR)/include | 55 | INCLUDEPATH += $(OPIEDIR)/include /usr/local/include |
56 | 56 | ||
57 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) | 57 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) |
58 | contains( CONFTEST, y ){ | 58 | contains( CONFTEST, y ){ |
59 | LIBS += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lopiedb2 -lmailwrapper -liconv | 59 | LIBS += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lopiedb2 -lmailwrapper -liconv |
60 | }else{ | 60 | }else{ |
61 | LIBS += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lopiedb2 -lmailwrapper | 61 | LIBS += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lopiedb2 -lmailwrapper |
62 | } | 62 | } |
63 | 63 | ||
64 | TARGET = opiemail | 64 | TARGET = opiemail |
65 | 65 | ||
66 | include ( $(OPIEDIR)/include.pro ) | 66 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/net/mail/main.cpp b/noncore/net/mail/main.cpp index 54ac7fb..4942083 100644 --- a/noncore/net/mail/main.cpp +++ b/noncore/net/mail/main.cpp | |||
@@ -1,5 +1,7 @@ | |||
1 | #include <opie2/oapplicationfactory.h> | 1 | #include <opie2/oapplicationfactory.h> |
2 | 2 | ||
3 | #include "opiemail.h" | 3 | #include "opiemail.h" |
4 | 4 | ||
5 | using namespace Opie::Core; | ||
6 | using namespace Opie::Core; | ||
5 | OPIE_EXPORT_APP( OApplicationFactory<OpieMail> ) | 7 | OPIE_EXPORT_APP( OApplicationFactory<OpieMail> ) |
diff --git a/noncore/net/mail/taskbarapplet/mailapplet.cpp b/noncore/net/mail/taskbarapplet/mailapplet.cpp index de32007..f672a36 100644 --- a/noncore/net/mail/taskbarapplet/mailapplet.cpp +++ b/noncore/net/mail/taskbarapplet/mailapplet.cpp | |||
@@ -1,39 +1,39 @@ | |||
1 | #include <qpainter.h> | 1 | #include <qpainter.h> |
2 | #include <qtimer.h> | 2 | #include <qtimer.h> |
3 | 3 | ||
4 | #include <qpe/qcopenvelope_qws.h> | 4 | #include <qpe/qcopenvelope_qws.h> |
5 | #include <qpe/resource.h> | 5 | #include <qpe/resource.h> |
6 | #include <qpe/config.h> | 6 | #include <qpe/config.h> |
7 | #include <qpe/applnk.h> | 7 | #include <qpe/applnk.h> |
8 | 8 | ||
9 | #include <opie2/odevice.h> | 9 | #include <opie2/odevice.h> |
10 | 10 | ||
11 | #include <libmailwrapper/settings.h> | 11 | #include <libmailwrapper/settings.h> |
12 | 12 | ||
13 | #include "mailapplet.h" | 13 | #include "mailapplet.h" |
14 | 14 | ||
15 | using namespace Opie; | 15 | using namespace Opie::Core; |
16 | 16 | ||
17 | MailApplet::MailApplet( QWidget *parent ) | 17 | MailApplet::MailApplet( QWidget *parent ) |
18 | : QWidget( parent ) { | 18 | : QWidget( parent ) { |
19 | 19 | ||
20 | m_config = new Config( "mail" ); | 20 | m_config = new Config( "mail" ); |
21 | m_config->setGroup( "Applet" ); | 21 | m_config->setGroup( "Applet" ); |
22 | 22 | ||
23 | setFixedWidth( AppLnk::smallIconSize() ); | 23 | setFixedWidth( AppLnk::smallIconSize() ); |
24 | setFixedHeight( AppLnk::smallIconSize() ); | 24 | setFixedHeight( AppLnk::smallIconSize() ); |
25 | 25 | ||
26 | hide(); | 26 | hide(); |
27 | 27 | ||
28 | m_newMails = 0; | 28 | m_newMails = 0; |
29 | m_statusMail = 0l; | 29 | m_statusMail = 0l; |
30 | 30 | ||
31 | if ( !m_config->readBoolEntry( "Disabled", false ) ) { | 31 | if ( !m_config->readBoolEntry( "Disabled", false ) ) { |
32 | // delay 5 sec until the whole mail backend gets started .-) | 32 | // delay 5 sec until the whole mail backend gets started .-) |
33 | QTimer::singleShot( 5000, this, SLOT( startup() ) ); | 33 | QTimer::singleShot( 5000, this, SLOT( startup() ) ); |
34 | } | 34 | } |
35 | repaint( true ); | 35 | repaint( true ); |
36 | } | 36 | } |
37 | 37 | ||
38 | 38 | ||
39 | MailApplet::~MailApplet() { | 39 | MailApplet::~MailApplet() { |
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index 894a386..f00d2cb 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp | |||
@@ -1,44 +1,45 @@ | |||
1 | #include "composemail.h" | 1 | #include "composemail.h" |
2 | #include "viewmail.h" | 2 | #include "viewmail.h" |
3 | 3 | ||
4 | /* OPIE */ | 4 | /* OPIE */ |
5 | #include <libmailwrapper/settings.h> | 5 | #include <libmailwrapper/settings.h> |
6 | #include <libmailwrapper/abstractmail.h> | 6 | #include <libmailwrapper/abstractmail.h> |
7 | #include <libmailwrapper/mailtypes.h> | 7 | #include <libmailwrapper/mailtypes.h> |
8 | 8 | ||
9 | #include <opie2/ofiledialog.h> | 9 | #include <opie2/ofiledialog.h> |
10 | #include <qpe/config.h> | 10 | #include <qpe/config.h> |
11 | #include <qpe/qpeapplication.h> | 11 | #include <qpe/qpeapplication.h> |
12 | 12 | ||
13 | /* QT */ | 13 | /* QT */ |
14 | #include <qtextbrowser.h> | 14 | #include <qtextbrowser.h> |
15 | #include <qmessagebox.h> | 15 | #include <qmessagebox.h> |
16 | #include <qtextstream.h> | 16 | #include <qtextstream.h> |
17 | #include <qaction.h> | 17 | #include <qaction.h> |
18 | #include <qpopupmenu.h> | 18 | #include <qpopupmenu.h> |
19 | #include <qfile.h> | 19 | #include <qfile.h> |
20 | 20 | ||
21 | using namespace Opie::Ui; | ||
21 | AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, | 22 | AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, |
22 | const QString&fsize,int num,const QValueList<int>&path) | 23 | const QString&fsize,int num,const QValueList<int>&path) |
23 | : QListViewItem(parent,after),_partNum(num) | 24 | : QListViewItem(parent,after),_partNum(num) |
24 | { | 25 | { |
25 | _path=path; | 26 | _path=path; |
26 | setText(0, mime); | 27 | setText(0, mime); |
27 | setText(1, desc); | 28 | setText(1, desc); |
28 | setText(2, file); | 29 | setText(2, file); |
29 | setText(3, fsize); | 30 | setText(3, fsize); |
30 | } | 31 | } |
31 | 32 | ||
32 | AttachItem::AttachItem(QListViewItem * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, | 33 | AttachItem::AttachItem(QListViewItem * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, |
33 | const QString&fsize,int num,const QValueList<int>&path) | 34 | const QString&fsize,int num,const QValueList<int>&path) |
34 | : QListViewItem(parent,after),_partNum(num) | 35 | : QListViewItem(parent,after),_partNum(num) |
35 | { | 36 | { |
36 | _path=path; | 37 | _path=path; |
37 | setText(0, mime); | 38 | setText(0, mime); |
38 | setText(1, desc); | 39 | setText(1, desc); |
39 | setText(2, file); | 40 | setText(2, file); |
40 | setText(3, fsize); | 41 | setText(3, fsize); |
41 | } | 42 | } |
42 | 43 | ||
43 | bool AttachItem::isParentof(const QValueList<int>&path) | 44 | bool AttachItem::isParentof(const QValueList<int>&path) |
44 | { | 45 | { |
@@ -199,49 +200,49 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int | |||
199 | 200 | ||
200 | if ( ( ( AttachItem* )item )->Partnumber() == -1 ) | 201 | if ( ( ( AttachItem* )item )->Partnumber() == -1 ) |
201 | { | 202 | { |
202 | setText(); | 203 | setText(); |
203 | return; | 204 | return; |
204 | } | 205 | } |
205 | QPopupMenu *menu = new QPopupMenu(); | 206 | QPopupMenu *menu = new QPopupMenu(); |
206 | int ret=0; | 207 | int ret=0; |
207 | 208 | ||
208 | if ( item->text( 0 ).left( 5 ) == "text/" || item->text(0)=="message/rfc822" ) | 209 | if ( item->text( 0 ).left( 5 ) == "text/" || item->text(0)=="message/rfc822" ) |
209 | { | 210 | { |
210 | menu->insertItem( tr( "Show Text" ), 1 ); | 211 | menu->insertItem( tr( "Show Text" ), 1 ); |
211 | } | 212 | } |
212 | menu->insertItem( tr( "Save Attachment" ), 0 ); | 213 | menu->insertItem( tr( "Save Attachment" ), 0 ); |
213 | menu->insertSeparator(1); | 214 | menu->insertSeparator(1); |
214 | 215 | ||
215 | ret = menu->exec( point, 0 ); | 216 | ret = menu->exec( point, 0 ); |
216 | 217 | ||
217 | switch(ret) | 218 | switch(ret) |
218 | { | 219 | { |
219 | case 0: | 220 | case 0: |
220 | { | 221 | { |
221 | MimeTypes types; | 222 | MimeTypes types; |
222 | types.insert( "all", "*" ); | 223 | types.insert( "all", "*" ); |
223 | QString str = Opie::OFileDialog::getSaveFileName( 1, | 224 | QString str = OFileDialog::getSaveFileName( 1, |
224 | "/", item->text( 2 ) , types, 0 ); | 225 | "/", item->text( 2 ) , types, 0 ); |
225 | 226 | ||
226 | if( !str.isEmpty() ) | 227 | if( !str.isEmpty() ) |
227 | { | 228 | { |
228 | encodedString*content = m_recMail->Wrapper()->fetchDecodedPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ); | 229 | encodedString*content = m_recMail->Wrapper()->fetchDecodedPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ); |
229 | if (content) | 230 | if (content) |
230 | { | 231 | { |
231 | QFile output(str); | 232 | QFile output(str); |
232 | output.open(IO_WriteOnly); | 233 | output.open(IO_WriteOnly); |
233 | output.writeBlock(content->Content(),content->Length()); | 234 | output.writeBlock(content->Content(),content->Length()); |
234 | output.close(); | 235 | output.close(); |
235 | delete content; | 236 | delete content; |
236 | } | 237 | } |
237 | } | 238 | } |
238 | } | 239 | } |
239 | break ; | 240 | break ; |
240 | 241 | ||
241 | case 1: | 242 | case 1: |
242 | if ( ( ( AttachItem* )item )->Partnumber() == -1 ) | 243 | if ( ( ( AttachItem* )item )->Partnumber() == -1 ) |
243 | { | 244 | { |
244 | setText(); | 245 | setText(); |
245 | } | 246 | } |
246 | else | 247 | else |
247 | { | 248 | { |
diff --git a/noncore/net/mail/viewmailbase.cpp b/noncore/net/mail/viewmailbase.cpp index c2bf08c..cbb98cc 100644 --- a/noncore/net/mail/viewmailbase.cpp +++ b/noncore/net/mail/viewmailbase.cpp | |||
@@ -1,31 +1,31 @@ | |||
1 | #include <qtextbrowser.h> | 1 | #include <qtextbrowser.h> |
2 | #include <qlistview.h> | 2 | #include <qlistview.h> |
3 | #include <qaction.h> | 3 | #include <qaction.h> |
4 | #include <qlabel.h> | 4 | #include <qlabel.h> |
5 | #include <qvbox.h> | 5 | #include <qvbox.h> |
6 | 6 | ||
7 | #include <qpe/qpetoolbar.h> | 7 | #include <qtoolbar.h> |
8 | #include <qmenubar.h> | 8 | #include <qmenubar.h> |
9 | #include <qpe/resource.h> | 9 | #include <qpe/resource.h> |
10 | 10 | ||
11 | #include "viewmailbase.h" | 11 | #include "viewmailbase.h" |
12 | //#include "opendiag.h" | 12 | //#include "opendiag.h" |
13 | 13 | ||
14 | ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) | 14 | ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) |
15 | : QMainWindow(parent, name, fl) | 15 | : QMainWindow(parent, name, fl) |
16 | { | 16 | { |
17 | setCaption(tr("E-Mail by %1")); | 17 | setCaption(tr("E-Mail by %1")); |
18 | setToolBarsMovable(false); | 18 | setToolBarsMovable(false); |
19 | 19 | ||
20 | toolbar = new QToolBar(this); | 20 | toolbar = new QToolBar(this); |
21 | menubar = new QMenuBar( toolbar ); | 21 | menubar = new QMenuBar( toolbar ); |
22 | mailmenu = new QPopupMenu( menubar ); | 22 | mailmenu = new QPopupMenu( menubar ); |
23 | menubar->insertItem( tr( "Mail" ), mailmenu ); | 23 | menubar->insertItem( tr( "Mail" ), mailmenu ); |
24 | 24 | ||
25 | toolbar->setHorizontalStretchable(true); | 25 | toolbar->setHorizontalStretchable(true); |
26 | addToolBar(toolbar); | 26 | addToolBar(toolbar); |
27 | 27 | ||
28 | QLabel *spacer = new QLabel(toolbar); | 28 | QLabel *spacer = new QLabel(toolbar); |
29 | spacer->setBackgroundMode(QWidget::PaletteButton); | 29 | spacer->setBackgroundMode(QWidget::PaletteButton); |
30 | toolbar->setStretchableWidget(spacer); | 30 | toolbar->setStretchableWidget(spacer); |
31 | 31 | ||
diff --git a/noncore/net/opieftp/main.cpp b/noncore/net/opieftp/main.cpp index d9da4b2..330ca52 100644 --- a/noncore/net/opieftp/main.cpp +++ b/noncore/net/opieftp/main.cpp | |||
@@ -1,16 +1,18 @@ | |||
1 | 1 | ||
2 | /*************************************************************************** | 2 | /*************************************************************************** |
3 | |||
3 | main.cpp - description | 4 | main.cpp - description |
4 | ------------------- | 5 | ------------------- |
5 | begin : March 10, 2002 | 6 | begin : March 10, 2002 |
6 | copyright : (C) 2002 by llornkcor | 7 | copyright : (C) 2002 by llornkcor |
7 | email : ljp@llornkcor.com | 8 | email : ljp@llornkcor.com |
8 | * This program is free software; you can redistribute it and/or modify * | 9 | * This program is free software; you can redistribute it and/or modify * |
9 | * it under the terms of the GNU General Public License as published by * | 10 | * it under the terms of the GNU General Public License as published by * |
10 | * the Free Software Foundation; either version 2 of the License, or * | 11 | * the Free Software Foundation; either version 2 of the License, or * |
11 | * (at your option) any later version. * | 12 | * (at your option) any later version. * |
12 | ***************************************************************************/ | 13 | ***************************************************************************/ |
13 | #include <opie2/oapplicationfactory.h> | 14 | #include <opie2/oapplicationfactory.h> |
14 | #include "opieftp.h" | 15 | #include "opieftp.h" |
15 | 16 | ||
17 | using namespace Opie::Core; | ||
16 | OPIE_EXPORT_APP( OApplicationFactory<OpieFtp> ) | 18 | OPIE_EXPORT_APP( OApplicationFactory<OpieFtp> ) |
diff --git a/noncore/net/opieirc/config.in b/noncore/net/opieirc/config.in index 7c6949d..38fa347 100644 --- a/noncore/net/opieirc/config.in +++ b/noncore/net/opieirc/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config OPIEIRC | 1 | config OPIEIRC |
2 | boolean "opie-irc (chat via your favorite IRC server)" | 2 | boolean "opie-irc (chat via your favorite IRC server)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2 && LIBQTAUX |
diff --git a/noncore/net/opieirc/ircsettings.cpp b/noncore/net/opieirc/ircsettings.cpp index f69d2c4..13fcc24 100644 --- a/noncore/net/opieirc/ircsettings.cpp +++ b/noncore/net/opieirc/ircsettings.cpp | |||
@@ -1,37 +1,39 @@ | |||
1 | 1 | ||
2 | #include "ircsettings.h" | 2 | #include "ircsettings.h" |
3 | #include "irctab.h" | 3 | #include "irctab.h" |
4 | 4 | ||
5 | /* OPIE */ | 5 | /* OPIE */ |
6 | #include <opie/ocolorbutton.h> | 6 | #include <opie2/ocolorbutton.h> |
7 | #include <opie/otabwidget.h> | 7 | #include <opie2/otabwidget.h> |
8 | #include <qpe/qpeapplication.h> | 8 | #include <qpe/qpeapplication.h> |
9 | 9 | ||
10 | /* QT */ | 10 | /* QT */ |
11 | #include <qvalidator.h> | 11 | #include <qvalidator.h> |
12 | #include <qwhatsthis.h> | 12 | #include <qwhatsthis.h> |
13 | 13 | ||
14 | using namespace Opie; | ||
15 | using namespace Opie::Ui; | ||
14 | IRCSettings::IRCSettings(QWidget* parent, const char* name, bool modal, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp) | 16 | IRCSettings::IRCSettings(QWidget* parent, const char* name, bool modal, WFlags) : QDialog(parent, name, modal, WStyle_ContextHelp) |
15 | { | 17 | { |
16 | setCaption(tr("Settings") ); | 18 | setCaption(tr("Settings") ); |
17 | m_config = new Config("OpieIRC"); | 19 | m_config = new Config("OpieIRC"); |
18 | m_config->setGroup("OpieIRC"); | 20 | m_config->setGroup("OpieIRC"); |
19 | QHBoxLayout *l = new QHBoxLayout(this, 2, 2); | 21 | QHBoxLayout *l = new QHBoxLayout(this, 2, 2); |
20 | OTabWidget *tw = new OTabWidget(this); | 22 | OTabWidget *tw = new OTabWidget(this); |
21 | l->addWidget(tw); | 23 | l->addWidget(tw); |
22 | /* General Configuration */ | 24 | /* General Configuration */ |
23 | QWidget *genwidget = new QWidget(tw); | 25 | QWidget *genwidget = new QWidget(tw); |
24 | QGridLayout *layout = new QGridLayout(genwidget, 1, 2, 5, 0); | 26 | QGridLayout *layout = new QGridLayout(genwidget, 1, 2, 5, 0); |
25 | QLabel *label = new QLabel(tr("Lines displayed :"), genwidget); | 27 | QLabel *label = new QLabel(tr("Lines displayed :"), genwidget); |
26 | layout->addWidget(label, 0, 0); | 28 | layout->addWidget(label, 0, 0); |
27 | m_lines = new QLineEdit(m_config->readEntry("Lines", "100"), genwidget); | 29 | m_lines = new QLineEdit(m_config->readEntry("Lines", "100"), genwidget); |
28 | QWhatsThis::add(m_lines, tr("Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don't need this")); | 30 | QWhatsThis::add(m_lines, tr("Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don't need this")); |
29 | QIntValidator *validator = new QIntValidator(this); | 31 | QIntValidator *validator = new QIntValidator(this); |
30 | validator->setTop(10000); | 32 | validator->setTop(10000); |
31 | validator->setBottom(0); | 33 | validator->setBottom(0); |
32 | m_lines->setValidator(validator); | 34 | m_lines->setValidator(validator); |
33 | layout->addWidget(m_lines, 0, 1); | 35 | layout->addWidget(m_lines, 0, 1); |
34 | tw->addTab(genwidget, "opieirc/settings", tr("General")); | 36 | tw->addTab(genwidget, "opieirc/settings", tr("General")); |
35 | 37 | ||
36 | /* Color configuration */ | 38 | /* Color configuration */ |
37 | QScrollView *view = new QScrollView(this); | 39 | QScrollView *view = new QScrollView(this); |
diff --git a/noncore/net/opieirc/ircsettings.h b/noncore/net/opieirc/ircsettings.h index cb8d896..56e667b 100644 --- a/noncore/net/opieirc/ircsettings.h +++ b/noncore/net/opieirc/ircsettings.h | |||
@@ -4,46 +4,48 @@ | |||
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
18 | 18 | ||
19 | */ | 19 | */ |
20 | 20 | ||
21 | #ifndef __IRCSETTINGS_H | 21 | #ifndef __IRCSETTINGS_H |
22 | #define __IRCSETTINGS_H | 22 | #define __IRCSETTINGS_H |
23 | 23 | ||
24 | #include <qpe/config.h> | 24 | #include <qpe/config.h> |
25 | #include <qdialog.h> | 25 | #include <qdialog.h> |
26 | #include <qlineedit.h> | 26 | #include <qlineedit.h> |
27 | 27 | ||
28 | namespace Opie { | ||
28 | class OColorButton; | 29 | class OColorButton; |
30 | } | ||
29 | 31 | ||
30 | class IRCSettings : public QDialog { | 32 | class IRCSettings : public QDialog { |
31 | Q_OBJECT | 33 | Q_OBJECT |
32 | public: | 34 | public: |
33 | IRCSettings(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags f = 0); | 35 | IRCSettings(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags f = 0); |
34 | ~IRCSettings(); | 36 | ~IRCSettings(); |
35 | protected slots: | 37 | protected slots: |
36 | void accept(); | 38 | void accept(); |
37 | protected: | 39 | protected: |
38 | Config *m_config; | 40 | Config *m_config; |
39 | OColorButton *m_background; | 41 | Opie::OColorButton *m_background; |
40 | OColorButton *m_text; | 42 | Opie::OColorButton *m_text; |
41 | OColorButton *m_error; | 43 | Opie::OColorButton *m_error; |
42 | OColorButton *m_self; | 44 | Opie::OColorButton *m_self; |
43 | OColorButton *m_server; | 45 | Opie::OColorButton *m_server; |
44 | OColorButton *m_other; | 46 | Opie::OColorButton *m_other; |
45 | OColorButton *m_notification; | 47 | Opie::OColorButton *m_notification; |
46 | QLineEdit *m_lines; | 48 | QLineEdit *m_lines; |
47 | }; | 49 | }; |
48 | 50 | ||
49 | #endif /* __IRCSETTINGS_H */ | 51 | #endif /* __IRCSETTINGS_H */ |
diff --git a/noncore/net/opieirc/main.cpp b/noncore/net/opieirc/main.cpp index da38024..f3cbecc 100644 --- a/noncore/net/opieirc/main.cpp +++ b/noncore/net/opieirc/main.cpp | |||
@@ -1,6 +1,7 @@ | |||
1 | #include "mainwindow.h" | 1 | #include "mainwindow.h" |
2 | 2 | ||
3 | #include <opie/oapplicationfactory.h> | 3 | #include <opie2/oapplicationfactory.h> |
4 | 4 | ||
5 | 5 | ||
6 | using namespace Opie::Core; | ||
6 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) | 7 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) |
diff --git a/noncore/net/opieirc/opieirc.pro b/noncore/net/opieirc/opieirc.pro index 537f810..9039ff8 100644 --- a/noncore/net/opieirc/opieirc.pro +++ b/noncore/net/opieirc/opieirc.pro | |||
@@ -1,25 +1,25 @@ | |||
1 | CONFIG = qt warn_on release quick-app | 1 | CONFIG = qt warn_on release quick-app |
2 | HEADERS = ircchannel.h ircconnection.h \ | 2 | HEADERS = ircchannel.h ircconnection.h \ |
3 | ircmessage.h \ | 3 | ircmessage.h \ |
4 | ircmessageparser.h ircoutput.h \ | 4 | ircmessageparser.h ircoutput.h \ |
5 | ircperson.h ircserver.h ircsession.h \ | 5 | ircperson.h ircserver.h ircsession.h \ |
6 | mainwindow.h irctab.h ircservertab.h \ | 6 | mainwindow.h irctab.h ircservertab.h \ |
7 | ircchanneltab.h ircchannellist.h \ | 7 | ircchanneltab.h ircchannellist.h \ |
8 | ircserverlist.h ircservereditor.h \ | 8 | ircserverlist.h ircservereditor.h \ |
9 | ircquerytab.h ircsettings.h ircmisc.h | 9 | ircquerytab.h ircsettings.h ircmisc.h |
10 | SOURCES = ircchannel.cpp ircconnection.cpp \ | 10 | SOURCES = ircchannel.cpp ircconnection.cpp \ |
11 | ircmessage.cpp \ | 11 | ircmessage.cpp \ |
12 | ircmessageparser.cpp ircoutput.cpp \ | 12 | ircmessageparser.cpp ircoutput.cpp \ |
13 | ircperson.cpp ircserver.cpp \ | 13 | ircperson.cpp ircserver.cpp \ |
14 | ircsession.cpp main.cpp mainwindow.cpp \ | 14 | ircsession.cpp main.cpp mainwindow.cpp \ |
15 | irctab.cpp ircservertab.cpp \ | 15 | irctab.cpp ircservertab.cpp \ |
16 | ircchanneltab.cpp ircchannellist.cpp \ | 16 | ircchanneltab.cpp ircchannellist.cpp \ |
17 | ircserverlist.cpp ircservereditor.cpp \ | 17 | ircserverlist.cpp ircservereditor.cpp \ |
18 | ircquerytab.cpp ircsettings.cpp ircmisc.cpp | 18 | ircquerytab.cpp ircsettings.cpp ircmisc.cpp |
19 | INCLUDEPATH += $(OPIEDIR)/include | 19 | INCLUDEPATH += $(OPIEDIR)/include |
20 | DEPENDPATH+= $(OPIEDIR)/include | 20 | DEPENDPATH+= $(OPIEDIR)/include |
21 | LIBS += -lqpe -lopie | 21 | LIBS += -lqpe -lopieui2 -lqtaux2 |
22 | 22 | ||
23 | TARGET= opieirc | 23 | TARGET= opieirc |
24 | 24 | ||
25 | include ( $(OPIEDIR)/include.pro ) | 25 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp index 817936d..93b2c67 100644 --- a/noncore/net/opietooth/applet/bluezapplet.cpp +++ b/noncore/net/opietooth/applet/bluezapplet.cpp | |||
@@ -13,49 +13,49 @@ | |||
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
15 | =_ + =;=| MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=| MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>: PARTICULAR PURPOSE. See the GNU | 16 | _.=:. : :=>: PARTICULAR PURPOSE. See the GNU |
17 | ..}^=.= = ; Library General Public License for more | 17 | ..}^=.= = ; Library General Public License for more |
18 | ++= -. . .: details. | 18 | ++= -. . .: details. |
19 | : = ...= . :.=- | 19 | : = ...= . :.=- |
20 | -. .:....=;==+<; You should have received a copy of the GNU | 20 | -. .:....=;==+<; You should have received a copy of the GNU |
21 | -_. . . )=. = Library General Public License along with | 21 | -_. . . )=. = Library General Public License along with |
22 | -- :-= this library; see the file COPYING.LIB. | 22 | -- :-= this library; see the file COPYING.LIB. |
23 | If not, write to the Free Software Foundation, | 23 | If not, write to the Free Software Foundation, |
24 | Inc., 59 Temple Place - Suite 330, | 24 | Inc., 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
29 | 29 | ||
30 | #include "bluezapplet.h" | 30 | #include "bluezapplet.h" |
31 | #include <qapplication.h> | 31 | #include <qapplication.h> |
32 | 32 | ||
33 | #include <qpe/qcopenvelope_qws.h> | 33 | #include <qpe/qcopenvelope_qws.h> |
34 | #include <qpe/config.h> | 34 | #include <qpe/config.h> |
35 | #include <qpe/resource.h> | 35 | #include <qpe/resource.h> |
36 | 36 | ||
37 | #include <opie/odevice.h> | 37 | #include <opie2/odevice.h> |
38 | 38 | ||
39 | #include <qpoint.h> | 39 | #include <qpoint.h> |
40 | #include <qpainter.h> | 40 | #include <qpainter.h> |
41 | #include <qlayout.h> | 41 | #include <qlayout.h> |
42 | #include <qframe.h> | 42 | #include <qframe.h> |
43 | #include <qpixmap.h> | 43 | #include <qpixmap.h> |
44 | #include <qstring.h> | 44 | #include <qstring.h> |
45 | #include <qtimer.h> | 45 | #include <qtimer.h> |
46 | #include <qpopupmenu.h> | 46 | #include <qpopupmenu.h> |
47 | 47 | ||
48 | #include <device.h> | 48 | #include <device.h> |
49 | 49 | ||
50 | using namespace Opie; | 50 | using namespace Opie; |
51 | 51 | ||
52 | namespace OpieTooth { | 52 | namespace OpieTooth { |
53 | 53 | ||
54 | BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { | 54 | BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { |
55 | setFixedHeight( 18 ); | 55 | setFixedHeight( 18 ); |
56 | setFixedWidth( 14 ); | 56 | setFixedWidth( 14 ); |
57 | bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" ); | 57 | bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" ); |
58 | bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" ); | 58 | bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" ); |
59 | // bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass" ); | 59 | // bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass" ); |
60 | startTimer(4000); | 60 | startTimer(4000); |
61 | btDevice = 0; | 61 | btDevice = 0; |
diff --git a/noncore/net/opietooth/lib/device.cc b/noncore/net/opietooth/lib/device.cc index bae1c47..d913853 100644 --- a/noncore/net/opietooth/lib/device.cc +++ b/noncore/net/opietooth/lib/device.cc | |||
@@ -1,123 +1,125 @@ | |||
1 | 1 | ||
2 | #include <signal.h> | 2 | #include <signal.h> |
3 | 3 | ||
4 | #include <opie/oprocess.h> | 4 | #include <opie2/oprocess.h> |
5 | 5 | ||
6 | #include "device.h" | 6 | #include "device.h" |
7 | 7 | ||
8 | using namespace OpieTooth; | 8 | using namespace OpieTooth; |
9 | 9 | ||
10 | using namespace Opie::Core; | ||
11 | using namespace Opie::Core; | ||
10 | namespace { | 12 | namespace { |
11 | int parsePid( const QCString& par ){ | 13 | int parsePid( const QCString& par ){ |
12 | int id=0; | 14 | int id=0; |
13 | QString string( par ); | 15 | QString string( par ); |
14 | QStringList list = QStringList::split( '\n', string ); | 16 | QStringList list = QStringList::split( '\n', string ); |
15 | for( QStringList::Iterator it = list.begin(); it != list.end(); ++it ){ | 17 | for( QStringList::Iterator it = list.begin(); it != list.end(); ++it ){ |
16 | qWarning("parsePID: %s", (*it).latin1() ); | 18 | qWarning("parsePID: %s", (*it).latin1() ); |
17 | if( !(*it).startsWith("CSR") ){ | 19 | if( !(*it).startsWith("CSR") ){ |
18 | id = (*it).toInt(); | 20 | id = (*it).toInt(); |
19 | break; | 21 | break; |
20 | } | 22 | } |
21 | } | 23 | } |
22 | return id; | 24 | return id; |
23 | } | 25 | } |
24 | } | 26 | } |
25 | 27 | ||
26 | Device::Device(const QString &device, const QString &mode, const QString &speed ) | 28 | Device::Device(const QString &device, const QString &mode, const QString &speed ) |
27 | : QObject(0, "device") { | 29 | : QObject(0, "device") { |
28 | 30 | ||
29 | qWarning("OpieTooth::Device create" ); | 31 | qWarning("OpieTooth::Device create" ); |
30 | m_hci = 0; | 32 | m_hci = 0; |
31 | m_process = 0; | 33 | m_process = 0; |
32 | m_attached = false; | 34 | m_attached = false; |
33 | m_device = device; | 35 | m_device = device; |
34 | m_mode = mode; | 36 | m_mode = mode; |
35 | m_speed = speed; | 37 | m_speed = speed; |
36 | attach(); | 38 | attach(); |
37 | } | 39 | } |
38 | Device::~Device(){ | 40 | Device::~Device(){ |
39 | detach(); | 41 | detach(); |
40 | } | 42 | } |
41 | void Device::attach(){ | 43 | void Device::attach(){ |
42 | qWarning("attaching %s %s %s", m_device.latin1(), m_mode.latin1(), m_speed.latin1() ); | 44 | qWarning("attaching %s %s %s", m_device.latin1(), m_mode.latin1(), m_speed.latin1() ); |
43 | if(m_process == 0 ){ | 45 | if(m_process == 0 ){ |
44 | m_output.resize(0); | 46 | m_output.resize(0); |
45 | qWarning("new process to create" ); | 47 | qWarning("new process to create" ); |
46 | m_process = new OProcess(); | 48 | m_process = new OProcess(); |
47 | *m_process << "hciattach"; | 49 | *m_process << "hciattach"; |
48 | *m_process << "-p"; | 50 | *m_process << "-p"; |
49 | *m_process << m_device << m_mode << m_speed; | 51 | *m_process << m_device << m_mode << m_speed; |
50 | connect(m_process, SIGNAL( processExited(OProcess*) ), | 52 | connect(m_process, SIGNAL( processExited(Opie::Core::OProcess*) ), |
51 | this, SLOT( slotExited(OProcess* ) ) ); | 53 | this, SLOT( slotExited(OProcess* ) ) ); |
52 | connect(m_process, SIGNAL( receivedStdout(OProcess*, char*, int) ), | 54 | connect(m_process, SIGNAL( receivedStdout(Opie::Core::OProcess*, char*, int) ), |
53 | this, SLOT(slotStdOut(OProcess*,char*,int ) ) ); | 55 | this, SLOT(slotStdOut(OProcess*,char*,int ) ) ); |
54 | connect(m_process, SIGNAL(receivedStderr(OProcess*, char*, int ) ), | 56 | connect(m_process, SIGNAL(receivedStderr(Opie::Core::OProcess*, char*, int ) ), |
55 | this, SLOT(slotStdErr(OProcess*,char*,int) ) ); | 57 | this, SLOT(slotStdErr(OProcess*,char*,int) ) ); |
56 | if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ){ | 58 | if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ){ |
57 | qWarning("Could not start" ); | 59 | qWarning("Could not start" ); |
58 | delete m_process; | 60 | delete m_process; |
59 | m_process = 0; | 61 | m_process = 0; |
60 | } | 62 | } |
61 | }; | 63 | }; |
62 | } | 64 | } |
63 | void Device::detach(){ | 65 | void Device::detach(){ |
64 | delete m_hci; | 66 | delete m_hci; |
65 | delete m_process; | 67 | delete m_process; |
66 | // kill the pid we got | 68 | // kill the pid we got |
67 | if(m_attached ){ | 69 | if(m_attached ){ |
68 | //kill the pid | 70 | //kill the pid |
69 | qWarning( "killing" ); | 71 | qWarning( "killing" ); |
70 | kill(pid, 9); | 72 | kill(pid, 9); |
71 | } | 73 | } |
72 | qWarning("detached" ); | 74 | qWarning("detached" ); |
73 | } | 75 | } |
74 | bool Device::isLoaded()const{ | 76 | bool Device::isLoaded()const{ |
75 | return m_attached; | 77 | return m_attached; |
76 | } | 78 | } |
77 | QString Device::devName()const { | 79 | QString Device::devName()const { |
78 | return QString::fromLatin1("hci0"); | 80 | return QString::fromLatin1("hci0"); |
79 | }; | 81 | }; |
80 | void Device::slotExited( OProcess* proc) | 82 | void Device::slotExited( OProcess* proc) |
81 | { | 83 | { |
82 | qWarning("prcess exited" ); | 84 | qWarning("prcess exited" ); |
83 | if(proc== m_process ){ | 85 | if(proc== m_process ){ |
84 | qWarning("proc == m_process" ); | 86 | qWarning("proc == m_process" ); |
85 | if( m_process->normalExit() ){ // normal exit | 87 | if( m_process->normalExit() ){ // normal exit |
86 | qWarning("normalExit" ); | 88 | qWarning("normalExit" ); |
87 | int ret = m_process->exitStatus(); | 89 | int ret = m_process->exitStatus(); |
88 | if( ret == 0 ){ // attached | 90 | if( ret == 0 ){ // attached |
89 | qWarning("attached" ); | 91 | qWarning("attached" ); |
90 | qWarning("Output: %s", m_output.data() ); | 92 | qWarning("Output: %s", m_output.data() ); |
91 | pid = parsePid( m_output ); | 93 | pid = parsePid( m_output ); |
92 | qWarning("Pid = %d", pid ); | 94 | qWarning("Pid = %d", pid ); |
93 | // now hciconfig hci0 up ( determine hciX FIXME) | 95 | // now hciconfig hci0 up ( determine hciX FIXME) |
94 | // and call hciconfig hci0 up | 96 | // and call hciconfig hci0 up |
95 | // FIXME hardcoded to hci0 now :( | 97 | // FIXME hardcoded to hci0 now :( |
96 | m_hci = new OProcess( ); | 98 | m_hci = new OProcess( ); |
97 | *m_hci << "hciconfig"; | 99 | *m_hci << "hciconfig"; |
98 | *m_hci << "hci0 up"; | 100 | *m_hci << "hci0 up"; |
99 | connect(m_hci, SIGNAL( processExited(OProcess*) ), | 101 | connect(m_hci, SIGNAL( processExited(Opie::Core::OProcess*) ), |
100 | this, SLOT( slotExited(OProcess* ) ) ); | 102 | this, SLOT( slotExited(OProcess* ) ) ); |
101 | if(!m_hci->start() ){ | 103 | if(!m_hci->start() ){ |
102 | qWarning("could not start" ); | 104 | qWarning("could not start" ); |
103 | m_attached = false; | 105 | m_attached = false; |
104 | emit device("hci0", false ); | 106 | emit device("hci0", false ); |
105 | } | 107 | } |
106 | }else{ | 108 | }else{ |
107 | qWarning("crass" ); | 109 | qWarning("crass" ); |
108 | m_attached = false; | 110 | m_attached = false; |
109 | emit device("hci0", false ); | 111 | emit device("hci0", false ); |
110 | 112 | ||
111 | } | 113 | } |
112 | } | 114 | } |
113 | delete m_process; | 115 | delete m_process; |
114 | m_process = 0; | 116 | m_process = 0; |
115 | }else if(proc== m_hci ){ | 117 | }else if(proc== m_hci ){ |
116 | qWarning("M HCI exited" ); | 118 | qWarning("M HCI exited" ); |
117 | if( m_hci->normalExit() ){ | 119 | if( m_hci->normalExit() ){ |
118 | qWarning("normal exit" ); | 120 | qWarning("normal exit" ); |
119 | int ret = m_hci->exitStatus(); | 121 | int ret = m_hci->exitStatus(); |
120 | if( ret == 0 ){ | 122 | if( ret == 0 ){ |
121 | qWarning("attached really really attached" ); | 123 | qWarning("attached really really attached" ); |
122 | m_attached = true; | 124 | m_attached = true; |
123 | emit device("hci0", true ); | 125 | emit device("hci0", true ); |
diff --git a/noncore/net/opietooth/lib/device.h b/noncore/net/opietooth/lib/device.h index ce7fccc..f3339fc 100644 --- a/noncore/net/opietooth/lib/device.h +++ b/noncore/net/opietooth/lib/device.h | |||
@@ -1,35 +1,35 @@ | |||
1 | 1 | ||
2 | #ifndef OpieToothDevice_H | 2 | #ifndef OpieToothDevice_H |
3 | #define OpieToothDevice_H | 3 | #define OpieToothDevice_H |
4 | 4 | ||
5 | #include <qobject.h> | 5 | #include <qobject.h> |
6 | #include <qstring.h> | 6 | #include <qstring.h> |
7 | #include <qvaluelist.h> | 7 | #include <qvaluelist.h> |
8 | 8 | ||
9 | #include <sys/types.h> | 9 | #include <sys/types.h> |
10 | 10 | ||
11 | class OProcess; | 11 | namespace Opie {namespace Core {class Opie::Core::OProcess;}} |
12 | namespace OpieTooth { | 12 | namespace OpieTooth { |
13 | /** | 13 | /** |
14 | * Device takes care of attaching serial | 14 | * Device takes care of attaching serial |
15 | * devices to the blueZ stack. | 15 | * devices to the blueZ stack. |
16 | * After attaching it hciconfig ups it | 16 | * After attaching it hciconfig ups it |
17 | */ | 17 | */ |
18 | class Device : public QObject { | 18 | class Device : public QObject { |
19 | 19 | ||
20 | Q_OBJECT | 20 | Q_OBJECT |
21 | 21 | ||
22 | public: | 22 | public: |
23 | 23 | ||
24 | /** | 24 | /** |
25 | * Brings up an device. | 25 | * Brings up an device. |
26 | * Usage example: new Device(/dev/ttySB0, csr) | 26 | * Usage example: new Device(/dev/ttySB0, csr) |
27 | * | 27 | * |
28 | * @param &device QString the device name | 28 | * @param &device QString the device name |
29 | * @param &mode QString the mode | 29 | * @param &mode QString the mode |
30 | * @param &speed QString the speed of the device, can be left blank | 30 | * @param &speed QString the speed of the device, can be left blank |
31 | */ | 31 | */ |
32 | Device(const QString &device, const QString& mode, const QString& speed); | 32 | Device(const QString &device, const QString& mode, const QString& speed); |
33 | 33 | ||
34 | /** | 34 | /** |
35 | * unloads the device | 35 | * unloads the device |
@@ -46,43 +46,43 @@ namespace OpieTooth { | |||
46 | */ | 46 | */ |
47 | void detach(); | 47 | void detach(); |
48 | 48 | ||
49 | /** | 49 | /** |
50 | * Is the device loaded? | 50 | * Is the device loaded? |
51 | * @return bool, if the device is loaded | 51 | * @return bool, if the device is loaded |
52 | */ | 52 | */ |
53 | bool isLoaded()const; | 53 | bool isLoaded()const; |
54 | 54 | ||
55 | /** | 55 | /** |
56 | * Returns the device name | 56 | * Returns the device name |
57 | * @return QString, the device name | 57 | * @return QString, the device name |
58 | */ | 58 | */ |
59 | QString devName()const ; // hci0 | 59 | QString devName()const ; // hci0 |
60 | 60 | ||
61 | signals: | 61 | signals: |
62 | 62 | ||
63 | /** | 63 | /** |
64 | * Signals devicename and up status | 64 | * Signals devicename and up status |
65 | * @return &device QString, Devicename | 65 | * @return &device QString, Devicename |
66 | * @return up bool, if the device is up or not. | 66 | * @return up bool, if the device is up or not. |
67 | */ | 67 | */ |
68 | void device(const QString& device, bool up ); | 68 | void device(const QString& device, bool up ); |
69 | private slots: | 69 | private slots: |
70 | virtual void slotExited( OProcess* ); | 70 | virtual void slotExited( Opie::Core::OProcess* ); |
71 | virtual void slotStdOut(OProcess*, char*, int ); | 71 | virtual void slotStdOut(Opie::Core::OProcess*, char*, int ); |
72 | virtual void slotStdErr(OProcess*, char*, int ); | 72 | virtual void slotStdErr(Opie::Core::OProcess*, char*, int ); |
73 | private: | 73 | private: |
74 | class Private; | 74 | class Private; |
75 | Private *d; | 75 | Private *d; |
76 | QString m_device; | 76 | QString m_device; |
77 | bool m_attached:1; | 77 | bool m_attached:1; |
78 | OProcess* m_hci; | 78 | Opie::Core::OProcess* m_hci; |
79 | OProcess* m_process; | 79 | Opie::Core::OProcess* m_process; |
80 | QString m_devId; | 80 | QString m_devId; |
81 | QString m_mode; | 81 | QString m_mode; |
82 | QString m_speed; | 82 | QString m_speed; |
83 | pid_t pid; | 83 | pid_t pid; |
84 | QCString m_output; | 84 | QCString m_output; |
85 | }; | 85 | }; |
86 | }; | 86 | }; |
87 | 87 | ||
88 | #endif | 88 | #endif |
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc index c89d325..56156a8 100644 --- a/noncore/net/opietooth/lib/manager.cc +++ b/noncore/net/opietooth/lib/manager.cc | |||
@@ -1,136 +1,138 @@ | |||
1 | 1 | ||
2 | 2 | ||
3 | #include <opie/oprocess.h> | 3 | #include <opie2/oprocess.h> |
4 | 4 | ||
5 | #include "parser.h" | 5 | #include "parser.h" |
6 | #include "manager.h" | 6 | #include "manager.h" |
7 | 7 | ||
8 | 8 | ||
9 | using namespace OpieTooth; | 9 | using namespace OpieTooth; |
10 | 10 | ||
11 | using namespace Opie::Core; | ||
12 | using namespace Opie::Core; | ||
11 | Manager::Manager( const QString& dev ) | 13 | Manager::Manager( const QString& dev ) |
12 | : QObject() | 14 | : QObject() |
13 | { | 15 | { |
14 | qWarning("created"); | 16 | qWarning("created"); |
15 | m_device = dev; | 17 | m_device = dev; |
16 | m_hcitool = 0; | 18 | m_hcitool = 0; |
17 | m_sdp = 0; | 19 | m_sdp = 0; |
18 | } | 20 | } |
19 | Manager::Manager( Device* /*dev*/ ) | 21 | Manager::Manager( Device* /*dev*/ ) |
20 | : QObject() | 22 | : QObject() |
21 | { | 23 | { |
22 | m_hcitool = 0; | 24 | m_hcitool = 0; |
23 | m_sdp = 0; | 25 | m_sdp = 0; |
24 | } | 26 | } |
25 | Manager::Manager() | 27 | Manager::Manager() |
26 | : QObject() | 28 | : QObject() |
27 | { | 29 | { |
28 | m_hcitool = 0; | 30 | m_hcitool = 0; |
29 | m_sdp = 0; | 31 | m_sdp = 0; |
30 | } | 32 | } |
31 | Manager::~Manager(){ | 33 | Manager::~Manager(){ |
32 | delete m_hcitool; | 34 | delete m_hcitool; |
33 | delete m_sdp; | 35 | delete m_sdp; |
34 | } | 36 | } |
35 | void Manager::setDevice( const QString& dev ){ | 37 | void Manager::setDevice( const QString& dev ){ |
36 | m_device = dev; | 38 | m_device = dev; |
37 | } | 39 | } |
38 | void Manager::setDevice( Device* /*dev*/ ){ | 40 | void Manager::setDevice( Device* /*dev*/ ){ |
39 | 41 | ||
40 | } | 42 | } |
41 | void Manager::isAvailable( const QString& device ){ | 43 | void Manager::isAvailable( const QString& device ){ |
42 | OProcess* l2ping = new OProcess(); | 44 | OProcess* l2ping = new OProcess(); |
43 | l2ping->setName( device.latin1() ); | 45 | l2ping->setName( device.latin1() ); |
44 | *l2ping << "l2ping" << "-c1" << device; | 46 | *l2ping << "l2ping" << "-c1" << device; |
45 | connect(l2ping, SIGNAL(processExited(OProcess* ) ), | 47 | connect(l2ping, SIGNAL(processExited(Opie::Core::OProcess* ) ), |
46 | this, SLOT(slotProcessExited(OProcess*) ) ); | 48 | this, SLOT(slotProcessExited(OProcess*) ) ); |
47 | if (!l2ping->start() ) { | 49 | if (!l2ping->start() ) { |
48 | emit available( device, false ); | 50 | emit available( device, false ); |
49 | delete l2ping; | 51 | delete l2ping; |
50 | } | 52 | } |
51 | 53 | ||
52 | } | 54 | } |
53 | 55 | ||
54 | void Manager::isAvailable( Device* /*dev*/ ){ | 56 | void Manager::isAvailable( Device* /*dev*/ ){ |
55 | 57 | ||
56 | 58 | ||
57 | } | 59 | } |
58 | void Manager::searchDevices( const QString& device ){ | 60 | void Manager::searchDevices( const QString& device ){ |
59 | qWarning("search devices"); | 61 | qWarning("search devices"); |
60 | OProcess* hcitool = new OProcess(); | 62 | OProcess* hcitool = new OProcess(); |
61 | hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() ); | 63 | hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() ); |
62 | *hcitool << "hcitool" << "scan"; | 64 | *hcitool << "hcitool" << "scan"; |
63 | connect( hcitool, SIGNAL(processExited(OProcess*) ) , | 65 | connect( hcitool, SIGNAL(processExited(Opie::Core::OProcess*) ) , |
64 | this, SLOT(slotHCIExited(OProcess* ) ) ); | 66 | this, SLOT(slotHCIExited(OProcess* ) ) ); |
65 | connect( hcitool, SIGNAL(receivedStdout(OProcess*, char*, int ) ), | 67 | connect( hcitool, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), |
66 | this, SLOT(slotHCIOut(OProcess*, char*, int ) ) ); | 68 | this, SLOT(slotHCIOut(OProcess*, char*, int ) ) ); |
67 | if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 69 | if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
68 | qWarning("could not start"); | 70 | qWarning("could not start"); |
69 | RemoteDevice::ValueList list; | 71 | RemoteDevice::ValueList list; |
70 | emit foundDevices( device, list ); | 72 | emit foundDevices( device, list ); |
71 | delete hcitool; | 73 | delete hcitool; |
72 | } | 74 | } |
73 | } | 75 | } |
74 | 76 | ||
75 | void Manager::searchDevices(Device* /*d*/ ){ | 77 | void Manager::searchDevices(Device* /*d*/ ){ |
76 | 78 | ||
77 | 79 | ||
78 | } | 80 | } |
79 | void Manager::addService(const QString& name ){ | 81 | void Manager::addService(const QString& name ){ |
80 | OProcess proc; | 82 | OProcess proc; |
81 | proc << "sdptool" << "add" << name; | 83 | proc << "sdptool" << "add" << name; |
82 | bool bo = true; | 84 | bool bo = true; |
83 | if (!proc.start(OProcess::DontCare ) ) | 85 | if (!proc.start(OProcess::DontCare ) ) |
84 | bo = false; | 86 | bo = false; |
85 | emit addedService( name, bo ); | 87 | emit addedService( name, bo ); |
86 | } | 88 | } |
87 | void Manager::addServices(const QStringList& list){ | 89 | void Manager::addServices(const QStringList& list){ |
88 | QStringList::ConstIterator it; | 90 | QStringList::ConstIterator it; |
89 | for (it = list.begin(); it != list.end(); ++it ) | 91 | for (it = list.begin(); it != list.end(); ++it ) |
90 | addService( (*it) ); | 92 | addService( (*it) ); |
91 | } | 93 | } |
92 | void Manager::removeService( const QString& name ){ | 94 | void Manager::removeService( const QString& name ){ |
93 | OProcess prc; | 95 | OProcess prc; |
94 | prc << "sdptool" << "del" << name; | 96 | prc << "sdptool" << "del" << name; |
95 | bool bo = true; | 97 | bool bo = true; |
96 | if (!prc.start(OProcess::DontCare ) ) | 98 | if (!prc.start(OProcess::DontCare ) ) |
97 | bo = false; | 99 | bo = false; |
98 | emit removedService( name, bo ); | 100 | emit removedService( name, bo ); |
99 | } | 101 | } |
100 | void Manager::removeServices( const QStringList& list){ | 102 | void Manager::removeServices( const QStringList& list){ |
101 | QStringList::ConstIterator it; | 103 | QStringList::ConstIterator it; |
102 | for (it = list.begin(); it != list.end(); ++it ) | 104 | for (it = list.begin(); it != list.end(); ++it ) |
103 | removeService( (*it) ); | 105 | removeService( (*it) ); |
104 | } | 106 | } |
105 | void Manager::searchServices( const QString& remDevice ){ | 107 | void Manager::searchServices( const QString& remDevice ){ |
106 | OProcess *m_sdp =new OProcess(); | 108 | OProcess *m_sdp =new OProcess(); |
107 | *m_sdp << "sdptool" << "browse" << remDevice; | 109 | *m_sdp << "sdptool" << "browse" << remDevice; |
108 | m_sdp->setName( remDevice.latin1() ); | 110 | m_sdp->setName( remDevice.latin1() ); |
109 | qWarning("search Services for %s", remDevice.latin1() ); | 111 | qWarning("search Services for %s", remDevice.latin1() ); |
110 | connect(m_sdp, SIGNAL(processExited(OProcess*) ), | 112 | connect(m_sdp, SIGNAL(processExited(Opie::Core::OProcess*) ), |
111 | this, SLOT(slotSDPExited(OProcess* ) ) ); | 113 | this, SLOT(slotSDPExited(OProcess* ) ) ); |
112 | connect(m_sdp, SIGNAL(receivedStdout(OProcess*, char*, int ) ), | 114 | connect(m_sdp, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), |
113 | this, SLOT(slotSDPOut(OProcess*, char*, int) ) ); | 115 | this, SLOT(slotSDPOut(OProcess*, char*, int) ) ); |
114 | if (!m_sdp->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 116 | if (!m_sdp->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
115 | qWarning("could not start sdptool" ); | 117 | qWarning("could not start sdptool" ); |
116 | delete m_sdp; | 118 | delete m_sdp; |
117 | Services::ValueList list; | 119 | Services::ValueList list; |
118 | emit foundServices( remDevice, list ); | 120 | emit foundServices( remDevice, list ); |
119 | } | 121 | } |
120 | } | 122 | } |
121 | void Manager::searchServices( const RemoteDevice& dev){ | 123 | void Manager::searchServices( const RemoteDevice& dev){ |
122 | searchServices( dev.mac() ); | 124 | searchServices( dev.mac() ); |
123 | } | 125 | } |
124 | QString Manager::toDevice( const QString& /*mac*/ ){ | 126 | QString Manager::toDevice( const QString& /*mac*/ ){ |
125 | return QString::null; | 127 | return QString::null; |
126 | } | 128 | } |
127 | QString Manager::toMac( const QString &/*device*/ ){ | 129 | QString Manager::toMac( const QString &/*device*/ ){ |
128 | return QString::null; | 130 | return QString::null; |
129 | } | 131 | } |
130 | void Manager::slotProcessExited(OProcess* proc ) { | 132 | void Manager::slotProcessExited(OProcess* proc ) { |
131 | bool conn= false; | 133 | bool conn= false; |
132 | if (proc->normalExit() && proc->exitStatus() == 0 ) | 134 | if (proc->normalExit() && proc->exitStatus() == 0 ) |
133 | conn = true; | 135 | conn = true; |
134 | 136 | ||
135 | QString name = QString::fromLatin1(proc->name() ); | 137 | QString name = QString::fromLatin1(proc->name() ); |
136 | emit available( name, conn ); | 138 | emit available( name, conn ); |
@@ -225,51 +227,51 @@ RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) { | |||
225 | return list; | 227 | return list; |
226 | } | 228 | } |
227 | 229 | ||
228 | ////// hcitool cc and hcitool con | 230 | ////// hcitool cc and hcitool con |
229 | 231 | ||
230 | /** | 232 | /** |
231 | * Create it on the stack as don't care | 233 | * Create it on the stack as don't care |
232 | * so we don't need to care for it | 234 | * so we don't need to care for it |
233 | * cause hcitool gets reparented | 235 | * cause hcitool gets reparented |
234 | */ | 236 | */ |
235 | void Manager::connectTo( const QString& mac) { | 237 | void Manager::connectTo( const QString& mac) { |
236 | OProcess proc; | 238 | OProcess proc; |
237 | proc << "hcitool"; | 239 | proc << "hcitool"; |
238 | proc << "cc"; | 240 | proc << "cc"; |
239 | proc << mac; | 241 | proc << mac; |
240 | proc.start(OProcess::DontCare); // the lib does not care at this point | 242 | proc.start(OProcess::DontCare); // the lib does not care at this point |
241 | } | 243 | } |
242 | 244 | ||
243 | 245 | ||
244 | void Manager::searchConnections() { | 246 | void Manager::searchConnections() { |
245 | qWarning("searching connections?"); | 247 | qWarning("searching connections?"); |
246 | OProcess* proc = new OProcess(); | 248 | OProcess* proc = new OProcess(); |
247 | m_hcitoolCon = QString::null; | 249 | m_hcitoolCon = QString::null; |
248 | 250 | ||
249 | connect(proc, SIGNAL(processExited(OProcess*) ), | 251 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*) ), |
250 | this, SLOT(slotConnectionExited( OProcess*) ) ); | 252 | this, SLOT(slotConnectionExited( OProcess*) ) ); |
251 | connect(proc, SIGNAL(receivedStdout(OProcess*, char*, int) ), | 253 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ), |
252 | this, SLOT(slotConnectionOutput(OProcess*, char*, int) ) ); | 254 | this, SLOT(slotConnectionOutput(OProcess*, char*, int) ) ); |
253 | *proc << "hcitool"; | 255 | *proc << "hcitool"; |
254 | *proc << "con"; | 256 | *proc << "con"; |
255 | 257 | ||
256 | if (!proc->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 258 | if (!proc->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
257 | ConnectionState::ValueList list; | 259 | ConnectionState::ValueList list; |
258 | emit connections( list ); | 260 | emit connections( list ); |
259 | delete proc; | 261 | delete proc; |
260 | } | 262 | } |
261 | } | 263 | } |
262 | void Manager::slotConnectionExited( OProcess* proc ) { | 264 | void Manager::slotConnectionExited( OProcess* proc ) { |
263 | ConnectionState::ValueList list; | 265 | ConnectionState::ValueList list; |
264 | list = parseConnections( m_hcitoolCon ); | 266 | list = parseConnections( m_hcitoolCon ); |
265 | emit connections(list ); | 267 | emit connections(list ); |
266 | delete proc; | 268 | delete proc; |
267 | } | 269 | } |
268 | void Manager::slotConnectionOutput(OProcess* /*proc*/, char* cha, int len) { | 270 | void Manager::slotConnectionOutput(OProcess* /*proc*/, char* cha, int len) { |
269 | QCString str(cha, len ); | 271 | QCString str(cha, len ); |
270 | m_hcitoolCon.append( str ); | 272 | m_hcitoolCon.append( str ); |
271 | //delete proc; | 273 | //delete proc; |
272 | } | 274 | } |
273 | ConnectionState::ValueList Manager::parseConnections( const QString& out ) { | 275 | ConnectionState::ValueList Manager::parseConnections( const QString& out ) { |
274 | ConnectionState::ValueList list2; | 276 | ConnectionState::ValueList list2; |
275 | QStringList list = QStringList::split('\n', out ); | 277 | QStringList list = QStringList::split('\n', out ); |
@@ -284,51 +286,51 @@ ConnectionState::ValueList Manager::parseConnections( const QString& out ) { | |||
284 | qWarning("1: %s", value[1].latin1() ); | 286 | qWarning("1: %s", value[1].latin1() ); |
285 | qWarning("2: %s", value[2].latin1() ); | 287 | qWarning("2: %s", value[2].latin1() ); |
286 | qWarning("3: %s", value[3].latin1() ); | 288 | qWarning("3: %s", value[3].latin1() ); |
287 | qWarning("4: %s", value[4].latin1() ); | 289 | qWarning("4: %s", value[4].latin1() ); |
288 | qWarning("5: %s", value[5].latin1() ); | 290 | qWarning("5: %s", value[5].latin1() ); |
289 | qWarning("6: %s", value[6].latin1() ); | 291 | qWarning("6: %s", value[6].latin1() ); |
290 | qWarning("7: %s", value[7].latin1() ); | 292 | qWarning("7: %s", value[7].latin1() ); |
291 | qWarning("8: %s", value[8].latin1() ); | 293 | qWarning("8: %s", value[8].latin1() ); |
292 | ConnectionState con; | 294 | ConnectionState con; |
293 | con.setDirection( value[0] == QString::fromLatin1("<") ? Outgoing : Incoming ); | 295 | con.setDirection( value[0] == QString::fromLatin1("<") ? Outgoing : Incoming ); |
294 | con.setConnectionMode( value[1] ); | 296 | con.setConnectionMode( value[1] ); |
295 | con.setMac( value[2] ); | 297 | con.setMac( value[2] ); |
296 | con.setHandle( value[4].toInt() ); | 298 | con.setHandle( value[4].toInt() ); |
297 | con.setState( value[6].toInt() ); | 299 | con.setState( value[6].toInt() ); |
298 | con.setLinkMode( value[8] == QString::fromLatin1("MASTER") ? Master : Client ); | 300 | con.setLinkMode( value[8] == QString::fromLatin1("MASTER") ? Master : Client ); |
299 | list2.append( con ); | 301 | list2.append( con ); |
300 | } | 302 | } |
301 | return list2; | 303 | return list2; |
302 | } | 304 | } |
303 | 305 | ||
304 | void Manager::signalStrength( const QString &mac ) { | 306 | void Manager::signalStrength( const QString &mac ) { |
305 | 307 | ||
306 | OProcess* sig_proc = new OProcess(); | 308 | OProcess* sig_proc = new OProcess(); |
307 | 309 | ||
308 | connect(sig_proc, SIGNAL(processExited(OProcess*) ), | 310 | connect(sig_proc, SIGNAL(processExited(Opie::Core::OProcess*) ), |
309 | this, SLOT(slotSignalStrengthExited( OProcess*) ) ); | 311 | this, SLOT(slotSignalStrengthExited( OProcess*) ) ); |
310 | connect(sig_proc, SIGNAL(receivedStdout(OProcess*, char*, int) ), | 312 | connect(sig_proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ), |
311 | this, SLOT(slotSignalStrengthOutput(OProcess*, char*, int) ) ); | 313 | this, SLOT(slotSignalStrengthOutput(OProcess*, char*, int) ) ); |
312 | *sig_proc << "hcitool"; | 314 | *sig_proc << "hcitool"; |
313 | *sig_proc << "lq"; | 315 | *sig_proc << "lq"; |
314 | *sig_proc << mac; | 316 | *sig_proc << mac; |
315 | 317 | ||
316 | sig_proc->setName( mac.latin1() ); | 318 | sig_proc->setName( mac.latin1() ); |
317 | 319 | ||
318 | if (!sig_proc->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 320 | if (!sig_proc->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
319 | emit signalStrength( mac, "-1" ); | 321 | emit signalStrength( mac, "-1" ); |
320 | delete sig_proc; | 322 | delete sig_proc; |
321 | } | 323 | } |
322 | } | 324 | } |
323 | 325 | ||
324 | void Manager::slotSignalStrengthOutput(OProcess* proc, char* cha, int len) { | 326 | void Manager::slotSignalStrengthOutput(OProcess* proc, char* cha, int len) { |
325 | QCString str(cha, len ); | 327 | QCString str(cha, len ); |
326 | QString temp = QString(str).stripWhiteSpace(); | 328 | QString temp = QString(str).stripWhiteSpace(); |
327 | QStringList value = QStringList::split(' ', temp ); | 329 | QStringList value = QStringList::split(' ', temp ); |
328 | emit signalStrength( proc->name(), value[2].latin1() ); | 330 | emit signalStrength( proc->name(), value[2].latin1() ); |
329 | } | 331 | } |
330 | 332 | ||
331 | 333 | ||
332 | void Manager::slotSignalStrengthExited( OProcess* proc ) { | 334 | void Manager::slotSignalStrengthExited( OProcess* proc ) { |
333 | delete proc; | 335 | delete proc; |
334 | } | 336 | } |
diff --git a/noncore/net/opietooth/lib/manager.h b/noncore/net/opietooth/lib/manager.h index abc8ba1..9b1c714 100644 --- a/noncore/net/opietooth/lib/manager.h +++ b/noncore/net/opietooth/lib/manager.h | |||
@@ -1,38 +1,38 @@ | |||
1 | 1 | ||
2 | #ifndef OpieToothManager_H | 2 | #ifndef OpieToothManager_H |
3 | #define OpieToothManager_H | 3 | #define OpieToothManager_H |
4 | 4 | ||
5 | #include <qobject.h> | 5 | #include <qobject.h> |
6 | #include <qstring.h> | 6 | #include <qstring.h> |
7 | #include <qmap.h> | 7 | #include <qmap.h> |
8 | #include <qvaluelist.h> | 8 | #include <qvaluelist.h> |
9 | 9 | ||
10 | #include "connection.h" | 10 | #include "connection.h" |
11 | #include "remotedevice.h" | 11 | #include "remotedevice.h" |
12 | #include "services.h" | 12 | #include "services.h" |
13 | 13 | ||
14 | class OProcess; | 14 | namespace Opie {namespace Core {class Opie::Core::OProcess;}} |
15 | namespace OpieTooth { | 15 | namespace OpieTooth { |
16 | class Device; | 16 | class Device; |
17 | /** Manager manages a blueZ device (hci0 for example) | 17 | /** Manager manages a blueZ device (hci0 for example) |
18 | * without Manager you can control the things you | 18 | * without Manager you can control the things you |
19 | * could do from command line in a OO and asynchronus | 19 | * could do from command line in a OO and asynchronus |
20 | * way. | 20 | * way. |
21 | */ | 21 | */ |
22 | class Manager : public QObject { | 22 | class Manager : public QObject { |
23 | Q_OBJECT | 23 | Q_OBJECT |
24 | public: | 24 | public: |
25 | /** c'tor whichs create a new Manager | 25 | /** c'tor whichs create a new Manager |
26 | * @param device is the device to use. Either a mac or blueZ device name | 26 | * @param device is the device to use. Either a mac or blueZ device name |
27 | * | 27 | * |
28 | */ | 28 | */ |
29 | Manager( const QString &device ); | 29 | Manager( const QString &device ); |
30 | 30 | ||
31 | /** c'tor | 31 | /** c'tor |
32 | * @param dev The Device to be managed | 32 | * @param dev The Device to be managed |
33 | * We don't care of Device so you need to delete it | 33 | * We don't care of Device so you need to delete it |
34 | */ | 34 | */ |
35 | Manager( Device* dev ); | 35 | Manager( Device* dev ); |
36 | 36 | ||
37 | /** | 37 | /** |
38 | * c'tor | 38 | * c'tor |
@@ -121,53 +121,53 @@ namespace OpieTooth { | |||
121 | * Searches for active connections | 121 | * Searches for active connections |
122 | * the result is emitted with the | 122 | * the result is emitted with the |
123 | * connections signal | 123 | * connections signal |
124 | */ | 124 | */ |
125 | void searchConnections(); | 125 | void searchConnections(); |
126 | 126 | ||
127 | void signalStrength( const QString &mac ); | 127 | void signalStrength( const QString &mac ); |
128 | //// not implemented yet | 128 | //// not implemented yet |
129 | /*static*/ QString toDevice( const QString& mac ); | 129 | /*static*/ QString toDevice( const QString& mac ); |
130 | /*static*/ QString toMac( const QString &device ); | 130 | /*static*/ QString toMac( const QString &device ); |
131 | //// not implemented yet over | 131 | //// not implemented yet over |
132 | 132 | ||
133 | signals: | 133 | signals: |
134 | // device either mac or dev name | 134 | // device either mac or dev name |
135 | // the first device is the device which you access | 135 | // the first device is the device which you access |
136 | void available( const QString& device, bool connected ); | 136 | void available( const QString& device, bool connected ); |
137 | void addedService( const QString& service, bool added ); | 137 | void addedService( const QString& service, bool added ); |
138 | void removedService( const QString& service, bool removed ); | 138 | void removedService( const QString& service, bool removed ); |
139 | void foundServices( const QString& device, Services::ValueList ); | 139 | void foundServices( const QString& device, Services::ValueList ); |
140 | void foundDevices( const QString& device, RemoteDevice::ValueList ); | 140 | void foundDevices( const QString& device, RemoteDevice::ValueList ); |
141 | void connections( ConnectionState::ValueList ); | 141 | void connections( ConnectionState::ValueList ); |
142 | void signalStrength( const QString& mac, const QString& strengh ); | 142 | void signalStrength( const QString& mac, const QString& strengh ); |
143 | 143 | ||
144 | private slots: | 144 | private slots: |
145 | void slotProcessExited(OProcess* ); | 145 | void slotProcessExited(Opie::Core::OProcess* ); |
146 | 146 | ||
147 | void slotSDPExited(OProcess*); | 147 | void slotSDPExited(Opie::Core::OProcess*); |
148 | void slotSDPOut(OProcess*, char*, int); | 148 | void slotSDPOut(Opie::Core::OProcess*, char*, int); |
149 | 149 | ||
150 | void slotHCIExited(OProcess* ); | 150 | void slotHCIExited(Opie::Core::OProcess* ); |
151 | void slotHCIOut(OProcess*, char*, int ); | 151 | void slotHCIOut(Opie::Core::OProcess*, char*, int ); |
152 | 152 | ||
153 | void slotConnectionExited(OProcess* ); | 153 | void slotConnectionExited(Opie::Core::OProcess* ); |
154 | void slotConnectionOutput(OProcess*, char*, int ); | 154 | void slotConnectionOutput(Opie::Core::OProcess*, char*, int ); |
155 | 155 | ||
156 | void slotSignalStrengthOutput( OProcess*, char*, int ); | 156 | void slotSignalStrengthOutput( Opie::Core::OProcess*, char*, int ); |
157 | void slotSignalStrengthExited( OProcess* ); | 157 | void slotSignalStrengthExited( Opie::Core::OProcess* ); |
158 | private: | 158 | private: |
159 | Services::ValueList parseSDPOutput( const QString& ); | 159 | Services::ValueList parseSDPOutput( const QString& ); |
160 | RemoteDevice::ValueList parseHCIOutput( const QString& ); | 160 | RemoteDevice::ValueList parseHCIOutput( const QString& ); |
161 | ConnectionState::ValueList parseConnections( const QString& ); | 161 | ConnectionState::ValueList parseConnections( const QString& ); |
162 | OProcess *m_hcitool; | 162 | Opie::Core::OProcess *m_hcitool; |
163 | OProcess *m_sdp; // not only one | 163 | Opie::Core::OProcess *m_sdp; // not only one |
164 | QString m_device; | 164 | QString m_device; |
165 | QMap<QString, int> m_signalStrength; | 165 | QMap<QString, int> m_signalStrength; |
166 | QMap<QString, QString> m_out; | 166 | QMap<QString, QString> m_out; |
167 | QMap<QString, QString> m_devices; | 167 | QMap<QString, QString> m_devices; |
168 | QMap<OProcess*, QString> m_signalMac; | 168 | QMap<Opie::Core::OProcess*, QString> m_signalMac; |
169 | QString m_hcitoolCon; | 169 | QString m_hcitoolCon; |
170 | }; | 170 | }; |
171 | }; | 171 | }; |
172 | 172 | ||
173 | #endif | 173 | #endif |
diff --git a/noncore/net/opietooth/lib/startdunconnection.cpp b/noncore/net/opietooth/lib/startdunconnection.cpp index c3850eb..90ef04a 100644 --- a/noncore/net/opietooth/lib/startdunconnection.cpp +++ b/noncore/net/opietooth/lib/startdunconnection.cpp | |||
@@ -1,67 +1,69 @@ | |||
1 | 1 | ||
2 | #include "startdunconnection.h" | 2 | #include "startdunconnection.h" |
3 | 3 | ||
4 | using namespace OpieTooth; | 4 | using namespace OpieTooth; |
5 | 5 | ||
6 | 6 | ||
7 | using namespace Opie::Core; | ||
8 | using namespace Opie::Core; | ||
7 | StartDunConnection::StartDunConnection() { | 9 | StartDunConnection::StartDunConnection() { |
8 | m_dunConnect = 0l; | 10 | m_dunConnect = 0l; |
9 | setConnectionType(); | 11 | setConnectionType(); |
10 | } | 12 | } |
11 | 13 | ||
12 | StartDunConnection::~StartDunConnection() { | 14 | StartDunConnection::~StartDunConnection() { |
13 | delete m_dunConnect; | 15 | delete m_dunConnect; |
14 | } | 16 | } |
15 | 17 | ||
16 | StartDunConnection::StartDunConnection( QString mac ) { | 18 | StartDunConnection::StartDunConnection( QString mac ) { |
17 | m_dunConnect = 0l; | 19 | m_dunConnect = 0l; |
18 | m_mac = mac; | 20 | m_mac = mac; |
19 | setConnectionType(); | 21 | setConnectionType(); |
20 | } | 22 | } |
21 | 23 | ||
22 | void StartDunConnection::setName( QString name ) { | 24 | void StartDunConnection::setName( QString name ) { |
23 | m_name = name; | 25 | m_name = name; |
24 | } | 26 | } |
25 | 27 | ||
26 | QString StartDunConnection::name() { | 28 | QString StartDunConnection::name() { |
27 | return m_name; | 29 | return m_name; |
28 | } | 30 | } |
29 | 31 | ||
30 | void StartDunConnection::setConnectionType() { | 32 | void StartDunConnection::setConnectionType() { |
31 | m_connectionType = Pan; | 33 | m_connectionType = Pan; |
32 | } | 34 | } |
33 | 35 | ||
34 | StartConnection::ConnectionType StartDunConnection::type() { | 36 | StartConnection::ConnectionType StartDunConnection::type() { |
35 | return m_connectionType; | 37 | return m_connectionType; |
36 | } | 38 | } |
37 | 39 | ||
38 | void StartDunConnection::start() { | 40 | void StartDunConnection::start() { |
39 | m_dunConnect = new OProcess(); | 41 | m_dunConnect = new OProcess(); |
40 | *m_dunConnect << "dund" << "--listen" << "--connect" << m_mac; | 42 | *m_dunConnect << "dund" << "--listen" << "--connect" << m_mac; |
41 | 43 | ||
42 | connect( m_dunConnect, SIGNAL( processExited(OProcess*) ) , | 44 | connect( m_dunConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , |
43 | this, SLOT( slotExited(OProcess*) ) ); | 45 | this, SLOT( slotExited(OProcess*) ) ); |
44 | connect( m_dunConnect, SIGNAL( receivedStdout(OProcess*,char*,int) ), | 46 | connect( m_dunConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
45 | this, SLOT( slotStdOut(OProcess*,char*,int) ) ); | 47 | this, SLOT( slotStdOut(OProcess*,char*,int) ) ); |
46 | if (!m_dunConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 48 | if (!m_dunConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
47 | qWarning( "could not start" ); | 49 | qWarning( "could not start" ); |
48 | delete m_dunConnect; | 50 | delete m_dunConnect; |
49 | } | 51 | } |
50 | } | 52 | } |
51 | 53 | ||
52 | 54 | ||
53 | void StartDunConnection::slotExited( OProcess* proc ) { | 55 | void StartDunConnection::slotExited( OProcess* proc ) { |
54 | delete m_dunConnect; | 56 | delete m_dunConnect; |
55 | } | 57 | } |
56 | 58 | ||
57 | void StartDunConnection::slotStdOut(OProcess* proc, char* chars, int len) | 59 | void StartDunConnection::slotStdOut(OProcess* proc, char* chars, int len) |
58 | {} | 60 | {} |
59 | 61 | ||
60 | 62 | ||
61 | void StartDunConnection::stop() { | 63 | void StartDunConnection::stop() { |
62 | if ( m_dunConnect ) { | 64 | if ( m_dunConnect ) { |
63 | delete m_dunConnect; | 65 | delete m_dunConnect; |
64 | m_dunConnect = 0l; | 66 | m_dunConnect = 0l; |
65 | } | 67 | } |
66 | } | 68 | } |
67 | 69 | ||
diff --git a/noncore/net/opietooth/lib/startdunconnection.h b/noncore/net/opietooth/lib/startdunconnection.h index 43a852a..f6107f6 100644 --- a/noncore/net/opietooth/lib/startdunconnection.h +++ b/noncore/net/opietooth/lib/startdunconnection.h | |||
@@ -1,40 +1,40 @@ | |||
1 | #ifndef startdunconnection_h | 1 | #ifndef startdunconnection_h |
2 | #define startdunconnection_h | 2 | #define startdunconnection_h |
3 | 3 | ||
4 | #include <qobject.h> | 4 | #include <qobject.h> |
5 | #include "connection.h" | 5 | #include "connection.h" |
6 | #include <opie/oprocess.h> | 6 | #include <opie2/oprocess.h> |
7 | 7 | ||
8 | namespace OpieTooth { | 8 | namespace OpieTooth { |
9 | 9 | ||
10 | class StartDunConnection : StartConnection { | 10 | class StartDunConnection : StartConnection { |
11 | 11 | ||
12 | Q_OBJECT | 12 | Q_OBJECT |
13 | 13 | ||
14 | public: | 14 | public: |
15 | StartDunConnection(); | 15 | StartDunConnection(); |
16 | StartDunConnection( QString mac ); | 16 | StartDunConnection( QString mac ); |
17 | ~StartDunConnection(); | 17 | ~StartDunConnection(); |
18 | 18 | ||
19 | QString name(); | 19 | QString name(); |
20 | void setName( QString name ); | 20 | void setName( QString name ); |
21 | StartConnection::ConnectionType type(); | 21 | StartConnection::ConnectionType type(); |
22 | void setConnectionType( ); | 22 | void setConnectionType( ); |
23 | void start(); | 23 | void start(); |
24 | void stop(); | 24 | void stop(); |
25 | 25 | ||
26 | private: | 26 | private: |
27 | QString m_name; | 27 | QString m_name; |
28 | QString m_mac; | 28 | QString m_mac; |
29 | ConnectionType m_connectionType; | 29 | ConnectionType m_connectionType; |
30 | OProcess* m_dunConnect; | 30 | Opie::Core::OProcess* m_dunConnect; |
31 | 31 | ||
32 | private slots: | 32 | private slots: |
33 | void slotExited( OProcess* proc ); | 33 | void slotExited( Opie::Core::OProcess* proc ); |
34 | void slotStdOut( OProcess* proc, char* chars, int len ); | 34 | void slotStdOut( Opie::Core::OProcess* proc, char* chars, int len ); |
35 | }; | 35 | }; |
36 | 36 | ||
37 | 37 | ||
38 | } | 38 | } |
39 | 39 | ||
40 | #endif | 40 | #endif |
diff --git a/noncore/net/opietooth/lib/startpanconnection.cpp b/noncore/net/opietooth/lib/startpanconnection.cpp index a42b407..fef35d9 100644 --- a/noncore/net/opietooth/lib/startpanconnection.cpp +++ b/noncore/net/opietooth/lib/startpanconnection.cpp | |||
@@ -1,82 +1,84 @@ | |||
1 | 1 | ||
2 | #include "startpanconnection.h" | 2 | #include "startpanconnection.h" |
3 | 3 | ||
4 | using namespace OpieTooth; | 4 | using namespace OpieTooth; |
5 | 5 | ||
6 | 6 | ||
7 | using namespace Opie::Core; | ||
8 | using namespace Opie::Core; | ||
7 | StartPanConnection::StartPanConnection() { | 9 | StartPanConnection::StartPanConnection() { |
8 | m_panConnect = 0l; | 10 | m_panConnect = 0l; |
9 | setConnectionType(); | 11 | setConnectionType(); |
10 | } | 12 | } |
11 | 13 | ||
12 | StartPanConnection::~StartPanConnection() { | 14 | StartPanConnection::~StartPanConnection() { |
13 | delete m_panConnect; | 15 | delete m_panConnect; |
14 | } | 16 | } |
15 | 17 | ||
16 | StartPanConnection::StartPanConnection( QString mac ) { | 18 | StartPanConnection::StartPanConnection( QString mac ) { |
17 | m_panConnect = 0l; | 19 | m_panConnect = 0l; |
18 | m_mac = mac; | 20 | m_mac = mac; |
19 | setConnectionType(); | 21 | setConnectionType(); |
20 | } | 22 | } |
21 | 23 | ||
22 | void StartPanConnection::setName( QString name ) { | 24 | void StartPanConnection::setName( QString name ) { |
23 | m_name = name; | 25 | m_name = name; |
24 | } | 26 | } |
25 | 27 | ||
26 | QString StartPanConnection::name() { | 28 | QString StartPanConnection::name() { |
27 | return m_name; | 29 | return m_name; |
28 | } | 30 | } |
29 | 31 | ||
30 | void StartPanConnection::setConnectionType() { | 32 | void StartPanConnection::setConnectionType() { |
31 | m_connectionType = Pan; | 33 | m_connectionType = Pan; |
32 | } | 34 | } |
33 | 35 | ||
34 | StartConnection::ConnectionType StartPanConnection::type() { | 36 | StartConnection::ConnectionType StartPanConnection::type() { |
35 | return m_connectionType; | 37 | return m_connectionType; |
36 | } | 38 | } |
37 | 39 | ||
38 | void StartPanConnection::start() { | 40 | void StartPanConnection::start() { |
39 | m_panConnect = new OProcess(); | 41 | m_panConnect = new OProcess(); |
40 | qDebug( "IM START " + m_mac ); | 42 | qDebug( "IM START " + m_mac ); |
41 | *m_panConnect << "pand" << "--connect" << m_mac; | 43 | *m_panConnect << "pand" << "--connect" << m_mac; |
42 | 44 | ||
43 | connect( m_panConnect, SIGNAL( processExited(OProcess*) ) , | 45 | connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , |
44 | this, SLOT( slotExited(OProcess*) ) ); | 46 | this, SLOT( slotExited(OProcess*) ) ); |
45 | connect( m_panConnect, SIGNAL( receivedStdout(OProcess*,char*,int) ), | 47 | connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
46 | this, SLOT( slotStdOut(OProcess*,char*,int) ) ); | 48 | this, SLOT( slotStdOut(OProcess*,char*,int) ) ); |
47 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 49 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
48 | qWarning( "could not start" ); | 50 | qWarning( "could not start" ); |
49 | delete m_panConnect; | 51 | delete m_panConnect; |
50 | } | 52 | } |
51 | } | 53 | } |
52 | 54 | ||
53 | 55 | ||
54 | void StartPanConnection::slotExited( OProcess* proc ) { | 56 | void StartPanConnection::slotExited( OProcess* proc ) { |
55 | delete m_panConnect; | 57 | delete m_panConnect; |
56 | m_panConnect = 0l; | 58 | m_panConnect = 0l; |
57 | } | 59 | } |
58 | 60 | ||
59 | void StartPanConnection::slotStdOut(OProcess* proc, char* chars, int len) | 61 | void StartPanConnection::slotStdOut(OProcess* proc, char* chars, int len) |
60 | {} | 62 | {} |
61 | 63 | ||
62 | 64 | ||
63 | void StartPanConnection::stop() { | 65 | void StartPanConnection::stop() { |
64 | if ( m_panConnect ) { | 66 | if ( m_panConnect ) { |
65 | delete m_panConnect; | 67 | delete m_panConnect; |
66 | m_panConnect = 0l; | 68 | m_panConnect = 0l; |
67 | } | 69 | } |
68 | m_panConnect = new OProcess(); | 70 | m_panConnect = new OProcess(); |
69 | qDebug("IM STOP " + m_mac); | 71 | qDebug("IM STOP " + m_mac); |
70 | 72 | ||
71 | *m_panConnect << "pand" << "--kill" << m_mac; | 73 | *m_panConnect << "pand" << "--kill" << m_mac; |
72 | 74 | ||
73 | connect( m_panConnect, SIGNAL( processExited(OProcess*) ) , | 75 | connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , |
74 | this, SLOT( slotExited(OProcess*) ) ); | 76 | this, SLOT( slotExited(OProcess*) ) ); |
75 | connect( m_panConnect, SIGNAL( receivedStdout(OProcess*,char*,int) ), | 77 | connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
76 | this, SLOT( slotStdOut(OProcess*,char*,int) ) ); | 78 | this, SLOT( slotStdOut(OProcess*,char*,int) ) ); |
77 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 79 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
78 | qWarning( "could not stop" ); | 80 | qWarning( "could not stop" ); |
79 | delete m_panConnect; | 81 | delete m_panConnect; |
80 | } | 82 | } |
81 | } | 83 | } |
82 | 84 | ||
diff --git a/noncore/net/opietooth/lib/startpanconnection.h b/noncore/net/opietooth/lib/startpanconnection.h index 7e5bd95..e12dad0 100644 --- a/noncore/net/opietooth/lib/startpanconnection.h +++ b/noncore/net/opietooth/lib/startpanconnection.h | |||
@@ -1,40 +1,40 @@ | |||
1 | #ifndef startpanconnection_h | 1 | #ifndef startpanconnection_h |
2 | #define startpanconnection_h | 2 | #define startpanconnection_h |
3 | 3 | ||
4 | #include <qobject.h> | 4 | #include <qobject.h> |
5 | #include "connection.h" | 5 | #include "connection.h" |
6 | #include <opie/oprocess.h> | 6 | #include <opie2/oprocess.h> |
7 | 7 | ||
8 | namespace OpieTooth { | 8 | namespace OpieTooth { |
9 | 9 | ||
10 | class StartPanConnection : StartConnection { | 10 | class StartPanConnection : StartConnection { |
11 | 11 | ||
12 | Q_OBJECT | 12 | Q_OBJECT |
13 | 13 | ||
14 | public: | 14 | public: |
15 | StartPanConnection(); | 15 | StartPanConnection(); |
16 | StartPanConnection( QString mac ); | 16 | StartPanConnection( QString mac ); |
17 | ~StartPanConnection(); | 17 | ~StartPanConnection(); |
18 | 18 | ||
19 | QString name(); | 19 | QString name(); |
20 | void setName( QString name ); | 20 | void setName( QString name ); |
21 | StartConnection::ConnectionType type(); | 21 | StartConnection::ConnectionType type(); |
22 | void setConnectionType( ); | 22 | void setConnectionType( ); |
23 | void start(); | 23 | void start(); |
24 | void stop(); | 24 | void stop(); |
25 | 25 | ||
26 | private: | 26 | private: |
27 | QString m_name; | 27 | QString m_name; |
28 | QString m_mac; | 28 | QString m_mac; |
29 | ConnectionType m_connectionType; | 29 | ConnectionType m_connectionType; |
30 | OProcess* m_panConnect; | 30 | Opie::Core::OProcess* m_panConnect; |
31 | 31 | ||
32 | private slots: | 32 | private slots: |
33 | void slotExited( OProcess* proc ); | 33 | void slotExited( Opie::Core::OProcess* proc ); |
34 | void slotStdOut( OProcess* proc, char* chars, int len ); | 34 | void slotStdOut( Opie::Core::OProcess* proc, char* chars, int len ); |
35 | }; | 35 | }; |
36 | 36 | ||
37 | 37 | ||
38 | } | 38 | } |
39 | 39 | ||
40 | #endif | 40 | #endif |
diff --git a/noncore/net/opietooth/manager/main.cpp b/noncore/net/opietooth/manager/main.cpp index 82aeebd..a96f128 100644 --- a/noncore/net/opietooth/manager/main.cpp +++ b/noncore/net/opietooth/manager/main.cpp | |||
@@ -1,25 +1,27 @@ | |||
1 | /* | 1 | /* |
2 | using namespace Opie::Core; | ||
3 | using namespace Opie::Core; | ||
2 | * main.cpp | 4 | * main.cpp |
3 | * | 5 | * |
4 | * --------------------- | 6 | * --------------------- |
5 | * | 7 | * |
6 | * begin : Sun 10 17:20:00 CEST 2002 | 8 | * begin : Sun 10 17:20:00 CEST 2002 |
7 | * copyright : (c) 2002 by Maximilian Reiß | 9 | * copyright : (c) 2002 by Maximilian Reiß |
8 | * email : max.reiss@gmx.de | 10 | * email : max.reiss@gmx.de |
9 | * | 11 | * |
10 | */ | 12 | */ |
11 | /*************************************************************************** | 13 | /*************************************************************************** |
12 | * * | 14 | * * |
13 | * This program is free software; you can redistribute it and/or modify * | 15 | * This program is free software; you can redistribute it and/or modify * |
14 | * it under the terms of the GNU General Public License as published by * | 16 | * it under the terms of the GNU General Public License as published by * |
15 | * the Free Software Foundation; either version 2 of the License, or * | 17 | * the Free Software Foundation; either version 2 of the License, or * |
16 | * (at your option) any later version. * | 18 | * (at your option) any later version. * |
17 | * * | 19 | * * |
18 | ***************************************************************************/ | 20 | ***************************************************************************/ |
19 | 21 | ||
20 | #include "bluebase.h" | 22 | #include "bluebase.h" |
21 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
22 | #include <opie/oapplicationfactory.h> | 24 | #include <opie2/oapplicationfactory.h> |
23 | 25 | ||
24 | OPIE_EXPORT_APP( OApplicationFactory<OpieTooth::BlueBase> ) | 26 | OPIE_EXPORT_APP( OApplicationFactory<OpieTooth::BlueBase> ) |
25 | 27 | ||
diff --git a/noncore/net/opietooth/manager/obexdialog.cpp b/noncore/net/opietooth/manager/obexdialog.cpp index 46a0e3d..1ef862a 100644 --- a/noncore/net/opietooth/manager/obexdialog.cpp +++ b/noncore/net/opietooth/manager/obexdialog.cpp | |||
@@ -1,40 +1,43 @@ | |||
1 | 1 | ||
2 | #include "obexdialog.h" | 2 | #include "obexdialog.h" |
3 | #include <qpushbutton.h> | 3 | #include <qpushbutton.h> |
4 | #include <qmultilineedit.h> | 4 | #include <qmultilineedit.h> |
5 | #include <qlineedit.h> | 5 | #include <qlineedit.h> |
6 | #include <qlayout.h> | 6 | #include <qlayout.h> |
7 | #include <qlabel.h> | 7 | #include <qlabel.h> |
8 | #include <qfileinfo.h> | 8 | #include <qfileinfo.h> |
9 | 9 | ||
10 | #include <qpe/resource.h> | 10 | #include <qpe/resource.h> |
11 | 11 | ||
12 | #include <opie/oprocess.h> | 12 | #include <opie2/oprocess.h> |
13 | #include <opie/ofiledialog.h> | 13 | #include <opie2/ofiledialog.h> |
14 | 14 | ||
15 | using namespace OpieTooth; | 15 | using namespace OpieTooth; |
16 | 16 | ||
17 | using namespace Opie::Core; | ||
18 | using namespace Opie::Ui; | ||
19 | using namespace Opie::Core; | ||
17 | ObexDialog::ObexDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) | 20 | ObexDialog::ObexDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) |
18 | : QDialog( parent, name, modal, fl ) { | 21 | : QDialog( parent, name, modal, fl ) { |
19 | 22 | ||
20 | if ( !name ) | 23 | if ( !name ) |
21 | setName( "ObexDialog" ); | 24 | setName( "ObexDialog" ); |
22 | setCaption( tr( "beam files " ) ) ; | 25 | setCaption( tr( "beam files " ) ) ; |
23 | 26 | ||
24 | m_device = device; | 27 | m_device = device; |
25 | 28 | ||
26 | layout = new QVBoxLayout( this ); | 29 | layout = new QVBoxLayout( this ); |
27 | 30 | ||
28 | QLabel* info = new QLabel( this ); | 31 | QLabel* info = new QLabel( this ); |
29 | info->setText( tr("Which file should be beamed?") ); | 32 | info->setText( tr("Which file should be beamed?") ); |
30 | 33 | ||
31 | cmdLine = new QLineEdit( this ); | 34 | cmdLine = new QLineEdit( this ); |
32 | 35 | ||
33 | QPushButton *browserButton; | 36 | QPushButton *browserButton; |
34 | browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton"); | 37 | browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton"); |
35 | connect( browserButton, SIGNAL(released() ), this , SLOT(browse() ) ); | 38 | connect( browserButton, SIGNAL(released() ), this , SLOT(browse() ) ); |
36 | 39 | ||
37 | chNameLine = new QLineEdit( this ); | 40 | chNameLine = new QLineEdit( this ); |
38 | 41 | ||
39 | sendButton = new QPushButton( this ); | 42 | sendButton = new QPushButton( this ); |
40 | sendButton->setText( tr( "Send" ) ); | 43 | sendButton->setText( tr( "Send" ) ); |
diff --git a/noncore/net/opietooth/manager/obexdialog.h b/noncore/net/opietooth/manager/obexdialog.h index b3d5e6d..d5b5682 100644 --- a/noncore/net/opietooth/manager/obexdialog.h +++ b/noncore/net/opietooth/manager/obexdialog.h | |||
@@ -1,30 +1,30 @@ | |||
1 | #ifndef OBEXDIALOG_H | 1 | #ifndef OBEXDIALOG_H |
2 | #define OBEXDIALOG_H | 2 | #define OBEXDIALOG_H |
3 | 3 | ||
4 | 4 | ||
5 | #include <qdialog.h> | 5 | #include <qdialog.h> |
6 | #include <opie/oprocess.h> | 6 | #include <opie2/oprocess.h> |
7 | 7 | ||
8 | class QVBoxLayout; | 8 | class QVBoxLayout; |
9 | class QPushButton; | 9 | class QPushButton; |
10 | class QMultiLineEdit; | 10 | class QMultiLineEdit; |
11 | class QLineEdit; | 11 | class QLineEdit; |
12 | 12 | ||
13 | 13 | ||
14 | namespace OpieTooth { | 14 | namespace OpieTooth { |
15 | 15 | ||
16 | class ObexDialog : public QDialog { | 16 | class ObexDialog : public QDialog { |
17 | 17 | ||
18 | Q_OBJECT | 18 | Q_OBJECT |
19 | 19 | ||
20 | public: | 20 | public: |
21 | ObexDialog( QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0, const QString& device = 0); | 21 | ObexDialog( QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0, const QString& device = 0); |
22 | ~ObexDialog(); | 22 | ~ObexDialog(); |
23 | 23 | ||
24 | 24 | ||
25 | private slots: | 25 | private slots: |
26 | void browse(); | 26 | void browse(); |
27 | void sendData(); | 27 | void sendData(); |
28 | 28 | ||
29 | protected: | 29 | protected: |
30 | QVBoxLayout* layout; | 30 | QVBoxLayout* layout; |
diff --git a/noncore/net/opietooth/manager/pppdialog.cpp b/noncore/net/opietooth/manager/pppdialog.cpp index 4e58552..870e7fd 100644 --- a/noncore/net/opietooth/manager/pppdialog.cpp +++ b/noncore/net/opietooth/manager/pppdialog.cpp | |||
@@ -1,68 +1,70 @@ | |||
1 | 1 | ||
2 | #include "pppdialog.h" | 2 | #include "pppdialog.h" |
3 | #include <qpushbutton.h> | 3 | #include <qpushbutton.h> |
4 | #include <qmultilineedit.h> | 4 | #include <qmultilineedit.h> |
5 | #include <qlineedit.h> | 5 | #include <qlineedit.h> |
6 | #include <qlayout.h> | 6 | #include <qlayout.h> |
7 | #include <qlabel.h> | 7 | #include <qlabel.h> |
8 | #include <opie/oprocess.h> | 8 | #include <opie2/oprocess.h> |
9 | 9 | ||
10 | using namespace OpieTooth; | 10 | using namespace OpieTooth; |
11 | 11 | ||
12 | using namespace Opie::Core; | ||
13 | using namespace Opie::Core; | ||
12 | PPPDialog::PPPDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) | 14 | PPPDialog::PPPDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) |
13 | : QDialog( parent, name, modal, fl ) { | 15 | : QDialog( parent, name, modal, fl ) { |
14 | 16 | ||
15 | if ( !name ) | 17 | if ( !name ) |
16 | setName( "PPPDialog" ); | 18 | setName( "PPPDialog" ); |
17 | setCaption( tr( "ppp connection " ) ) ; | 19 | setCaption( tr( "ppp connection " ) ) ; |
18 | 20 | ||
19 | m_device = device; | 21 | m_device = device; |
20 | 22 | ||
21 | layout = new QVBoxLayout( this ); | 23 | layout = new QVBoxLayout( this ); |
22 | 24 | ||
23 | QLabel* info = new QLabel( this ); | 25 | QLabel* info = new QLabel( this ); |
24 | info->setText( tr("Enter an ppp script name:") ); | 26 | info->setText( tr("Enter an ppp script name:") ); |
25 | 27 | ||
26 | cmdLine = new QLineEdit( this ); | 28 | cmdLine = new QLineEdit( this ); |
27 | 29 | ||
28 | outPut = new QMultiLineEdit( this ); | 30 | outPut = new QMultiLineEdit( this ); |
29 | QFont outPut_font( outPut->font() ); | 31 | QFont outPut_font( outPut->font() ); |
30 | outPut_font.setPointSize( 8 ); | 32 | outPut_font.setPointSize( 8 ); |
31 | outPut->setFont( outPut_font ); | 33 | outPut->setFont( outPut_font ); |
32 | outPut->setWordWrap( QMultiLineEdit::WidgetWidth ); | 34 | outPut->setWordWrap( QMultiLineEdit::WidgetWidth ); |
33 | 35 | ||
34 | connectButton = new QPushButton( this ); | 36 | connectButton = new QPushButton( this ); |
35 | connectButton->setText( tr( "Connect" ) ); | 37 | connectButton->setText( tr( "Connect" ) ); |
36 | 38 | ||
37 | layout->addWidget(info); | 39 | layout->addWidget(info); |
38 | layout->addWidget(cmdLine); | 40 | layout->addWidget(cmdLine); |
39 | layout->addWidget(outPut); | 41 | layout->addWidget(outPut); |
40 | layout->addWidget(connectButton); | 42 | layout->addWidget(connectButton); |
41 | 43 | ||
42 | connect( connectButton, SIGNAL( clicked() ), this, SLOT( connectToDevice() ) ); | 44 | connect( connectButton, SIGNAL( clicked() ), this, SLOT( connectToDevice() ) ); |
43 | 45 | ||
44 | } | 46 | } |
45 | 47 | ||
46 | PPPDialog::~PPPDialog() { | 48 | PPPDialog::~PPPDialog() { |
47 | } | 49 | } |
48 | 50 | ||
49 | void PPPDialog::connectToDevice() { | 51 | void PPPDialog::connectToDevice() { |
50 | outPut->clear(); | 52 | outPut->clear(); |
51 | // vom popupmenu beziehen | 53 | // vom popupmenu beziehen |
52 | QString connectScript = "/etc/ppp/peers/" + cmdLine->text(); | 54 | QString connectScript = "/etc/ppp/peers/" + cmdLine->text(); |
53 | OProcess* pppDial = new OProcess(); | 55 | OProcess* pppDial = new OProcess(); |
54 | *pppDial << "pppd" << m_device << "call" << connectScript; | 56 | *pppDial << "pppd" << m_device << "call" << connectScript; |
55 | connect( pppDial, SIGNAL(receivedStdout(OProcess*,char*,int) ), | 57 | connect( pppDial, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int) ), |
56 | this, SLOT(fillOutPut(OProcess*,char*,int) ) ); | 58 | this, SLOT(fillOutPut(OProcess*,char*,int) ) ); |
57 | if (!pppDial->start(OProcess::DontCare, OProcess::AllOutput) ) { | 59 | if (!pppDial->start(OProcess::DontCare, OProcess::AllOutput) ) { |
58 | qWarning("could not start"); | 60 | qWarning("could not start"); |
59 | delete pppDial; | 61 | delete pppDial; |
60 | } | 62 | } |
61 | } | 63 | } |
62 | 64 | ||
63 | void PPPDialog::fillOutPut( OProcess* pppDial, char* cha, int len ) { | 65 | void PPPDialog::fillOutPut( OProcess* pppDial, char* cha, int len ) { |
64 | QCString str(cha, len ); | 66 | QCString str(cha, len ); |
65 | outPut->insertLine( str ); | 67 | outPut->insertLine( str ); |
66 | delete pppDial; | 68 | delete pppDial; |
67 | } | 69 | } |
68 | 70 | ||
diff --git a/noncore/net/opietooth/manager/pppdialog.h b/noncore/net/opietooth/manager/pppdialog.h index bb8b734..05894e2 100644 --- a/noncore/net/opietooth/manager/pppdialog.h +++ b/noncore/net/opietooth/manager/pppdialog.h | |||
@@ -1,37 +1,37 @@ | |||
1 | #ifndef PPPDIALOG_H | 1 | #ifndef PPPDIALOG_H |
2 | #define PPPDIALOG_H | 2 | #define PPPDIALOG_H |
3 | 3 | ||
4 | 4 | ||
5 | #include <qdialog.h> | 5 | #include <qdialog.h> |
6 | #include <opie/oprocess.h> | 6 | #include <opie2/oprocess.h> |
7 | 7 | ||
8 | class QVBoxLayout; | 8 | class QVBoxLayout; |
9 | class QPushButton; | 9 | class QPushButton; |
10 | class QMultiLineEdit; | 10 | class QMultiLineEdit; |
11 | class QLineEdit; | 11 | class QLineEdit; |
12 | 12 | ||
13 | 13 | ||
14 | namespace OpieTooth { | 14 | namespace OpieTooth { |
15 | 15 | ||
16 | class PPPDialog : public QDialog { | 16 | class PPPDialog : public QDialog { |
17 | 17 | ||
18 | Q_OBJECT | 18 | Q_OBJECT |
19 | 19 | ||
20 | public: | 20 | public: |
21 | PPPDialog( QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0, const QString& device = 0); | 21 | PPPDialog( QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0, const QString& device = 0); |
22 | ~PPPDialog(); | 22 | ~PPPDialog(); |
23 | 23 | ||
24 | private slots: | 24 | private slots: |
25 | void connectToDevice(); | 25 | void connectToDevice(); |
26 | void fillOutPut( OProcess* pppDial, char* cha, int len ); | 26 | void fillOutPut( Opie::Core::OProcess* pppDial, char* cha, int len ); |
27 | protected: | 27 | protected: |
28 | QVBoxLayout* layout; | 28 | QVBoxLayout* layout; |
29 | QLineEdit* cmdLine; | 29 | QLineEdit* cmdLine; |
30 | QPushButton* connectButton; | 30 | QPushButton* connectButton; |
31 | QMultiLineEdit* outPut; | 31 | QMultiLineEdit* outPut; |
32 | 32 | ||
33 | private: | 33 | private: |
34 | QString m_device; | 34 | QString m_device; |
35 | }; | 35 | }; |
36 | } | 36 | } |
37 | #endif | 37 | #endif |
diff --git a/noncore/net/ubrowser/main.cpp b/noncore/net/ubrowser/main.cpp index 0488cfd..0736f1f 100644 --- a/noncore/net/ubrowser/main.cpp +++ b/noncore/net/ubrowser/main.cpp | |||
@@ -1,24 +1,26 @@ | |||
1 | /* | 1 | /* |
2 | Opie-uBrowser. a very small web browser, using on QTextBrowser for html display/parsing | 2 | Opie-uBrowser. a very small web browser, using on QTextBrowser for html display/parsing |
3 | Copyright (C) 2002 Thomas Stephens | 3 | Copyright (C) 2002 Thomas Stephens |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public | 5 | This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public |
6 | License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later | 6 | License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later |
7 | version. | 7 | version. |
8 | 8 | ||
9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the | 9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the |
10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | 10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
11 | Public License for more details. | 11 | Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <qpe/qpeapplication.h> | 17 | #include <qpe/qpeapplication.h> |
18 | 18 | ||
19 | #include "mainview.h" | 19 | #include "mainview.h" |
20 | 20 | ||
21 | #include <opie/oapplicationfactory.h> | 21 | #include <opie2/oapplicationfactory.h> |
22 | 22 | ||
23 | |||
24 | using namespace Opie::Core; | ||
23 | OPIE_EXPORT_APP( OApplicationFactory<MainView> ) | 25 | OPIE_EXPORT_APP( OApplicationFactory<MainView> ) |
24 | 26 | ||
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp index 95b03d0..da39113 100644 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/noncore/net/wellenreiter/gui/configwindow.cpp | |||
@@ -22,48 +22,54 @@ | |||
22 | #ifdef QWS | 22 | #ifdef QWS |
23 | #include <opie2/oapplication.h> | 23 | #include <opie2/oapplication.h> |
24 | #include <opie2/oconfig.h> | 24 | #include <opie2/oconfig.h> |
25 | #include <opie2/odevice.h> | 25 | #include <opie2/odevice.h> |
26 | using namespace Opie; | 26 | using namespace Opie; |
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | /* QT */ | 29 | /* QT */ |
30 | #include <qapplication.h> | 30 | #include <qapplication.h> |
31 | #include <qcheckbox.h> | 31 | #include <qcheckbox.h> |
32 | #include <qcombobox.h> | 32 | #include <qcombobox.h> |
33 | #include <qfile.h> | 33 | #include <qfile.h> |
34 | #include <qlineedit.h> | 34 | #include <qlineedit.h> |
35 | #include <qlayout.h> | 35 | #include <qlayout.h> |
36 | #include <qmap.h> | 36 | #include <qmap.h> |
37 | #include <qpushbutton.h> | 37 | #include <qpushbutton.h> |
38 | #include <qtabwidget.h> | 38 | #include <qtabwidget.h> |
39 | #include <qtoolbutton.h> | 39 | #include <qtoolbutton.h> |
40 | #include <qspinbox.h> | 40 | #include <qspinbox.h> |
41 | #include <qtextstream.h> | 41 | #include <qtextstream.h> |
42 | 42 | ||
43 | /* POSIX */ | 43 | /* POSIX */ |
44 | #include <assert.h> | 44 | #include <assert.h> |
45 | 45 | ||
46 | using namespace Opie::Core; | ||
47 | using namespace Opie::Net; | ||
48 | using namespace Opie::Core; | ||
49 | using namespace Opie::Net; | ||
50 | using namespace Opie::Core; | ||
51 | using namespace Opie::Net; | ||
46 | WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0; | 52 | WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0; |
47 | 53 | ||
48 | WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f ) | 54 | WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f ) |
49 | :WellenreiterConfigBase( parent, name, true, f ) | 55 | :WellenreiterConfigBase( parent, name, true, f ) |
50 | { | 56 | { |
51 | _devicetype[ "cisco" ] = DEVTYPE_CISCO; | 57 | _devicetype[ "cisco" ] = DEVTYPE_CISCO; |
52 | _devicetype[ "wlan-ng" ] = DEVTYPE_WLAN_NG; | 58 | _devicetype[ "wlan-ng" ] = DEVTYPE_WLAN_NG; |
53 | _devicetype[ "hostap" ] = DEVTYPE_HOSTAP; | 59 | _devicetype[ "hostap" ] = DEVTYPE_HOSTAP; |
54 | _devicetype[ "orinoco" ] = DEVTYPE_ORINOCO; | 60 | _devicetype[ "orinoco" ] = DEVTYPE_ORINOCO; |
55 | _devicetype[ "<manual>" ] = DEVTYPE_MANUAL; | 61 | _devicetype[ "<manual>" ] = DEVTYPE_MANUAL; |
56 | _devicetype[ "<file>" ] = DEVTYPE_FILE; | 62 | _devicetype[ "<file>" ] = DEVTYPE_FILE; |
57 | 63 | ||
58 | // gather possible interface names from ONetwork | 64 | // gather possible interface names from ONetwork |
59 | ONetwork* net = ONetwork::instance(); | 65 | ONetwork* net = ONetwork::instance(); |
60 | ONetwork::InterfaceIterator it = net->iterator(); | 66 | ONetwork::InterfaceIterator it = net->iterator(); |
61 | while ( it.current() ) | 67 | while ( it.current() ) |
62 | { | 68 | { |
63 | if ( it.current()->isWireless() ) | 69 | if ( it.current()->isWireless() ) |
64 | interfaceName->insertItem( it.current()->name() ); | 70 | interfaceName->insertItem( it.current()->name() ); |
65 | ++it; | 71 | ++it; |
66 | } | 72 | } |
67 | 73 | ||
68 | load(); | 74 | load(); |
69 | 75 | ||
diff --git a/noncore/net/wellenreiter/gui/main.cpp b/noncore/net/wellenreiter/gui/main.cpp index 7dcc583..6bbc39b 100644 --- a/noncore/net/wellenreiter/gui/main.cpp +++ b/noncore/net/wellenreiter/gui/main.cpp | |||
@@ -8,48 +8,51 @@ | |||
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #include "mainwindow.h" | 16 | #include "mainwindow.h" |
17 | #ifdef QWS | 17 | #ifdef QWS |
18 | #include <opie2/oapplication.h> | 18 | #include <opie2/oapplication.h> |
19 | #include <opie2/oprocess.h> | 19 | #include <opie2/oprocess.h> |
20 | #else | 20 | #else |
21 | #include <qapplication.h> | 21 | #include <qapplication.h> |
22 | #endif | 22 | #endif |
23 | 23 | ||
24 | #include <qmessagebox.h> | 24 | #include <qmessagebox.h> |
25 | #include <qstringlist.h> | 25 | #include <qstringlist.h> |
26 | 26 | ||
27 | #include <errno.h> | 27 | #include <errno.h> |
28 | #include <signal.h> | 28 | #include <signal.h> |
29 | #include <string.h> | 29 | #include <string.h> |
30 | #include <unistd.h> | 30 | #include <unistd.h> |
31 | 31 | ||
32 | using namespace Opie::Core; | ||
33 | using namespace Opie::Core; | ||
34 | using namespace Opie::Core; | ||
32 | int main( int argc, char **argv ) | 35 | int main( int argc, char **argv ) |
33 | { | 36 | { |
34 | #ifdef QWS | 37 | #ifdef QWS |
35 | OApplication a( argc, argv, "Wellenreiter II" ); | 38 | OApplication a( argc, argv, "Wellenreiter II" ); |
36 | #else | 39 | #else |
37 | QApplication a( argc, argv ); | 40 | QApplication a( argc, argv ); |
38 | #endif | 41 | #endif |
39 | WellenreiterMainWindow* w = new WellenreiterMainWindow(); | 42 | WellenreiterMainWindow* w = new WellenreiterMainWindow(); |
40 | #ifdef QWS | 43 | #ifdef QWS |
41 | a.showMainWidget( w ); | 44 | a.showMainWidget( w ); |
42 | #else | 45 | #else |
43 | a.setMainWidget( w ); | 46 | a.setMainWidget( w ); |
44 | w->setCaption( "Wellenreiter II" ); | 47 | w->setCaption( "Wellenreiter II" ); |
45 | w->show(); | 48 | w->show(); |
46 | #endif | 49 | #endif |
47 | 50 | ||
48 | a.processEvents(); // show the window before doing the safety checks | 51 | a.processEvents(); // show the window before doing the safety checks |
49 | int result = -1; | 52 | int result = -1; |
50 | static int killed = false; | 53 | static int killed = false; |
51 | 54 | ||
52 | bool check = true; | 55 | bool check = true; |
53 | for ( int i = 1; i < argc; ++i ) | 56 | for ( int i = 1; i < argc; ++i ) |
54 | { | 57 | { |
55 | qDebug( "Wellenreiter::main() parsing argument %d = '%s'", i, argv[i] ); | 58 | qDebug( "Wellenreiter::main() parsing argument %d = '%s'", i, argv[i] ); |
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index 5cc0daf..7add6cd 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp | |||
@@ -30,48 +30,53 @@ | |||
30 | #include <qlineedit.h> | 30 | #include <qlineedit.h> |
31 | #include <qiconset.h> | 31 | #include <qiconset.h> |
32 | #include <qmenubar.h> | 32 | #include <qmenubar.h> |
33 | #include <qmessagebox.h> | 33 | #include <qmessagebox.h> |
34 | #include <qpopupmenu.h> | 34 | #include <qpopupmenu.h> |
35 | #include <qpushbutton.h> | 35 | #include <qpushbutton.h> |
36 | #include <qstatusbar.h> | 36 | #include <qstatusbar.h> |
37 | #include <qspinbox.h> | 37 | #include <qspinbox.h> |
38 | #include <qtextstream.h> | 38 | #include <qtextstream.h> |
39 | #include <qtoolbutton.h> | 39 | #include <qtoolbutton.h> |
40 | #include <qwhatsthis.h> | 40 | #include <qwhatsthis.h> |
41 | 41 | ||
42 | #ifdef QWS | 42 | #ifdef QWS |
43 | #include <qpe/resource.h> | 43 | #include <qpe/resource.h> |
44 | #include <opie2/ofiledialog.h> | 44 | #include <opie2/ofiledialog.h> |
45 | using namespace Opie; | 45 | using namespace Opie; |
46 | #else | 46 | #else |
47 | #include "resource.h" | 47 | #include "resource.h" |
48 | #include <qapplication.h> | 48 | #include <qapplication.h> |
49 | #include <qfiledialog.h> | 49 | #include <qfiledialog.h> |
50 | #endif | 50 | #endif |
51 | 51 | ||
52 | #include <unistd.h> | 52 | #include <unistd.h> |
53 | 53 | ||
54 | using namespace Opie::Ui; | ||
55 | using namespace Opie::Net; | ||
56 | using namespace Opie::Ui; | ||
57 | using namespace Opie::Net; | ||
58 | using namespace Opie::Net; | ||
54 | WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) | 59 | WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) |
55 | :QMainWindow( parent, name, f ) | 60 | :QMainWindow( parent, name, f ) |
56 | { | 61 | { |
57 | cw = new WellenreiterConfigWindow( this ); | 62 | cw = new WellenreiterConfigWindow( this ); |
58 | mw = new Wellenreiter( this ); | 63 | mw = new Wellenreiter( this ); |
59 | mw->setConfigWindow( cw ); | 64 | mw->setConfigWindow( cw ); |
60 | setCentralWidget( mw ); | 65 | setCentralWidget( mw ); |
61 | 66 | ||
62 | // setup application icon | 67 | // setup application icon |
63 | 68 | ||
64 | setIcon( Resource::loadPixmap( "wellenreiter/appicon-trans" ) ); | 69 | setIcon( Resource::loadPixmap( "wellenreiter/appicon-trans" ) ); |
65 | #ifndef QWS | 70 | #ifndef QWS |
66 | setIconText( "Wellenreiter/X11" ); | 71 | setIconText( "Wellenreiter/X11" ); |
67 | #endif | 72 | #endif |
68 | 73 | ||
69 | // setup tool buttons | 74 | // setup tool buttons |
70 | 75 | ||
71 | startButton = new QToolButton( 0 ); | 76 | startButton = new QToolButton( 0 ); |
72 | QWhatsThis::add( startButton, tr( "Click here to start scanning." ) ); | 77 | QWhatsThis::add( startButton, tr( "Click here to start scanning." ) ); |
73 | #ifdef QWS | 78 | #ifdef QWS |
74 | startButton->setAutoRaise( true ); | 79 | startButton->setAutoRaise( true ); |
75 | #endif | 80 | #endif |
76 | startButton->setIconSet( Resource::loadIconSet( "wellenreiter/SearchIcon" ) ); | 81 | startButton->setIconSet( Resource::loadIconSet( "wellenreiter/SearchIcon" ) ); |
77 | startButton->setEnabled( false ); | 82 | startButton->setEnabled( false ); |
diff --git a/noncore/net/wellenreiter/gui/packetview.cpp b/noncore/net/wellenreiter/gui/packetview.cpp index ef5d020..8312e71 100644 --- a/noncore/net/wellenreiter/gui/packetview.cpp +++ b/noncore/net/wellenreiter/gui/packetview.cpp | |||
@@ -4,48 +4,51 @@ | |||
4 | ** This file is part of Wellenreiter II. | 4 | ** This file is part of Wellenreiter II. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #include "packetview.h" | 16 | #include "packetview.h" |
17 | 17 | ||
18 | /* OPIE */ | 18 | /* OPIE */ |
19 | #include <opie2/opcap.h> | 19 | #include <opie2/opcap.h> |
20 | 20 | ||
21 | /* QT */ | 21 | /* QT */ |
22 | #include <qtextview.h> | 22 | #include <qtextview.h> |
23 | #include <qspinbox.h> | 23 | #include <qspinbox.h> |
24 | #include <qlabel.h> | 24 | #include <qlabel.h> |
25 | #include <qlayout.h> | 25 | #include <qlayout.h> |
26 | #include <qlist.h> | 26 | #include <qlist.h> |
27 | 27 | ||
28 | using namespace Opie::Net; | ||
29 | using namespace Opie::Net; | ||
30 | using namespace Opie::Net; | ||
28 | PacketView::PacketView( QWidget * parent, const char * name, WFlags f ) | 31 | PacketView::PacketView( QWidget * parent, const char * name, WFlags f ) |
29 | :QFrame( parent, name, f ) | 32 | :QFrame( parent, name, f ) |
30 | { | 33 | { |
31 | _number = new QSpinBox( this ); | 34 | _number = new QSpinBox( this ); |
32 | _number->setPrefix( "Packet # " ); | 35 | _number->setPrefix( "Packet # " ); |
33 | _label = new QLabel( this ); | 36 | _label = new QLabel( this ); |
34 | _label->setText( "eth0 2004/03/08 - 00:00:21" ); | 37 | _label->setText( "eth0 2004/03/08 - 00:00:21" ); |
35 | _list = new QLabel( this ); | 38 | _list = new QLabel( this ); |
36 | _hex = new QTextView( this ); | 39 | _hex = new QTextView( this ); |
37 | 40 | ||
38 | QVBoxLayout* vb = new QVBoxLayout( this, 2, 2 ); | 41 | QVBoxLayout* vb = new QVBoxLayout( this, 2, 2 ); |
39 | QHBoxLayout* hb = new QHBoxLayout( vb, 2 ); | 42 | QHBoxLayout* hb = new QHBoxLayout( vb, 2 ); |
40 | hb->addWidget( _label ); | 43 | hb->addWidget( _label ); |
41 | hb->addWidget( _number ); | 44 | hb->addWidget( _number ); |
42 | vb->addWidget( _list ); | 45 | vb->addWidget( _list ); |
43 | vb->addWidget( _hex ); | 46 | vb->addWidget( _hex ); |
44 | 47 | ||
45 | _packets.setAutoDelete( true ); | 48 | _packets.setAutoDelete( true ); |
46 | 49 | ||
47 | _list->setText( "<b>[ 802.11 [ LLC [ IP [ UDP [ DHCP ] ] ] ] ]</b>" ); | 50 | _list->setText( "<b>[ 802.11 [ LLC [ IP [ UDP [ DHCP ] ] ] ] ]</b>" ); |
48 | }; | 51 | }; |
49 | 52 | ||
50 | void PacketView::add( OPacket* p ) | 53 | void PacketView::add( OPacket* p ) |
51 | { | 54 | { |
diff --git a/noncore/net/wellenreiter/gui/packetview.h b/noncore/net/wellenreiter/gui/packetview.h index b5f2b26..1ac19bb 100644 --- a/noncore/net/wellenreiter/gui/packetview.h +++ b/noncore/net/wellenreiter/gui/packetview.h | |||
@@ -2,48 +2,48 @@ | |||
2 | ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. | 2 | ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Wellenreiter II. | 4 | ** This file is part of Wellenreiter II. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #ifndef PACKETVIEW_H | 16 | #ifndef PACKETVIEW_H |
17 | #define PACKETVIEW_H | 17 | #define PACKETVIEW_H |
18 | 18 | ||
19 | #include <qlist.h> | 19 | #include <qlist.h> |
20 | #include <qframe.h> | 20 | #include <qframe.h> |
21 | 21 | ||
22 | class QString; | 22 | class QString; |
23 | class QSpinBox; | 23 | class QSpinBox; |
24 | class QLabel; | 24 | class QLabel; |
25 | class QTextView; | 25 | class QTextView; |
26 | class OPacket; | 26 | namespace Opie {namespace Net {class Opie::Net::OPacket;}} |
27 | 27 | ||
28 | class PacketView: public QFrame | 28 | class PacketView: public QFrame |
29 | { | 29 | { |
30 | 30 | ||
31 | public: | 31 | public: |
32 | PacketView( QWidget * parent = 0, const char * name = "PacketView", WFlags f = 0 ); | 32 | PacketView( QWidget * parent = 0, const char * name = "PacketView", WFlags f = 0 ); |
33 | 33 | ||
34 | void add( OPacket* p ); | 34 | void add( Opie::Net::OPacket* p ); |
35 | const QString getLog() const; | 35 | const QString getLog() const; |
36 | void clear(); | 36 | void clear(); |
37 | 37 | ||
38 | protected: | 38 | protected: |
39 | 39 | ||
40 | QSpinBox* _number; | 40 | QSpinBox* _number; |
41 | QLabel* _label; | 41 | QLabel* _label; |
42 | QLabel* _list; | 42 | QLabel* _list; |
43 | QTextView* _hex; | 43 | QTextView* _hex; |
44 | QList<OPacket> _packets; | 44 | QList<Opie::Net::OPacket> _packets; |
45 | 45 | ||
46 | }; | 46 | }; |
47 | 47 | ||
48 | #endif | 48 | #endif |
49 | 49 | ||
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index 6005818..3b7120a 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp | |||
@@ -25,48 +25,54 @@ | |||
25 | 25 | ||
26 | #ifdef QWS | 26 | #ifdef QWS |
27 | #include <qpe/qpeapplication.h> | 27 | #include <qpe/qpeapplication.h> |
28 | #endif | 28 | #endif |
29 | 29 | ||
30 | #ifdef QWS | 30 | #ifdef QWS |
31 | #include <qpe/resource.h> | 31 | #include <qpe/resource.h> |
32 | #else | 32 | #else |
33 | #include "resource.h" | 33 | #include "resource.h" |
34 | #endif | 34 | #endif |
35 | 35 | ||
36 | const int col_type = 0; | 36 | const int col_type = 0; |
37 | const int col_essid = 0; | 37 | const int col_essid = 0; |
38 | const int col_sig = 1; | 38 | const int col_sig = 1; |
39 | const int col_ap = 2; | 39 | const int col_ap = 2; |
40 | const int col_channel = 3; | 40 | const int col_channel = 3; |
41 | const int col_wep = 4; | 41 | const int col_wep = 4; |
42 | const int col_traffic = 5; | 42 | const int col_traffic = 5; |
43 | const int col_ip = 6; | 43 | const int col_ip = 6; |
44 | const int col_manuf = 7; | 44 | const int col_manuf = 7; |
45 | const int col_firstseen = 8; | 45 | const int col_firstseen = 8; |
46 | const int col_lastseen = 9; | 46 | const int col_lastseen = 9; |
47 | const int col_location = 10; | 47 | const int col_location = 10; |
48 | 48 | ||
49 | using namespace Opie::Net; | ||
50 | using namespace Opie::Ui; | ||
51 | using namespace Opie::Net; | ||
52 | using namespace Opie::Ui; | ||
53 | using namespace Opie::Ui; | ||
54 | using namespace Opie::Net; | ||
49 | MScanListView::MScanListView( QWidget* parent, const char* name ) | 55 | MScanListView::MScanListView( QWidget* parent, const char* name ) |
50 | :OListView( parent, name ) | 56 | :OListView( parent, name ) |
51 | { | 57 | { |
52 | setFrameShape( QListView::StyledPanel ); | 58 | setFrameShape( QListView::StyledPanel ); |
53 | setFrameShadow( QListView::Sunken ); | 59 | setFrameShadow( QListView::Sunken ); |
54 | 60 | ||
55 | addColumn( tr( "Net/Station" ) ); | 61 | addColumn( tr( "Net/Station" ) ); |
56 | setColumnAlignment( col_essid, AlignLeft || AlignVCenter ); | 62 | setColumnAlignment( col_essid, AlignLeft || AlignVCenter ); |
57 | addColumn( tr( "#" ) ); | 63 | addColumn( tr( "#" ) ); |
58 | setColumnAlignment( col_sig, AlignCenter ); | 64 | setColumnAlignment( col_sig, AlignCenter ); |
59 | addColumn( tr( "MAC" ) ); | 65 | addColumn( tr( "MAC" ) ); |
60 | setColumnAlignment( col_ap, AlignCenter ); | 66 | setColumnAlignment( col_ap, AlignCenter ); |
61 | addColumn( tr( "Chn" ) ); | 67 | addColumn( tr( "Chn" ) ); |
62 | setColumnAlignment( col_channel, AlignCenter ); | 68 | setColumnAlignment( col_channel, AlignCenter ); |
63 | addColumn( tr( "W" ) ); | 69 | addColumn( tr( "W" ) ); |
64 | setColumnAlignment( col_wep, AlignCenter ); | 70 | setColumnAlignment( col_wep, AlignCenter ); |
65 | addColumn( tr( "T" ) ); | 71 | addColumn( tr( "T" ) ); |
66 | setColumnAlignment( col_traffic, AlignCenter ); | 72 | setColumnAlignment( col_traffic, AlignCenter ); |
67 | addColumn( tr( "IP" ) ); | 73 | addColumn( tr( "IP" ) ); |
68 | setColumnAlignment( col_ip, AlignCenter ); | 74 | setColumnAlignment( col_ip, AlignCenter ); |
69 | addColumn( tr( "Manufacturer" ) ); | 75 | addColumn( tr( "Manufacturer" ) ); |
70 | setColumnAlignment( col_manuf, AlignCenter ); | 76 | setColumnAlignment( col_manuf, AlignCenter ); |
71 | addColumn( tr( "First Seen" ) ); | 77 | addColumn( tr( "First Seen" ) ); |
72 | setColumnAlignment( col_firstseen, AlignCenter ); | 78 | setColumnAlignment( col_firstseen, AlignCenter ); |
diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h index ab870c2..6a80f70 100644 --- a/noncore/net/wellenreiter/gui/scanlist.h +++ b/noncore/net/wellenreiter/gui/scanlist.h | |||
@@ -7,134 +7,134 @@ | |||
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #ifndef SCANLIST_H | 16 | #ifndef SCANLIST_H |
17 | #define SCANLIST_H | 17 | #define SCANLIST_H |
18 | 18 | ||
19 | #include "gps.h" | 19 | #include "gps.h" |
20 | 20 | ||
21 | /* OPIE */ | 21 | /* OPIE */ |
22 | #include <opie2/olistview.h> | 22 | #include <opie2/olistview.h> |
23 | #include <opie2/onetutils.h> | 23 | #include <opie2/onetutils.h> |
24 | 24 | ||
25 | /* QT */ | 25 | /* QT */ |
26 | #include <qtextstream.h> | 26 | #include <qtextstream.h> |
27 | 27 | ||
28 | class QString; | 28 | class QString; |
29 | class MScanListItem; | 29 | class MScanListItem; |
30 | 30 | ||
31 | class MScanListView: public OListView | 31 | class MScanListView: public Opie::Ui::OListView |
32 | { | 32 | { |
33 | Q_OBJECT | 33 | Q_OBJECT |
34 | 34 | ||
35 | public: | 35 | public: |
36 | MScanListView( QWidget* parent = 0, const char* name = 0 ); | 36 | MScanListView( QWidget* parent = 0, const char* name = 0 ); |
37 | virtual ~MScanListView(); | 37 | virtual ~MScanListView(); |
38 | 38 | ||
39 | virtual OListViewItem* childFactory(); | 39 | virtual Opie::Ui::OListViewItem* childFactory(); |
40 | virtual void serializeTo( QDataStream& s ) const; | 40 | virtual void serializeTo( QDataStream& s ) const; |
41 | virtual void serializeFrom( QDataStream& s ); | 41 | virtual void serializeFrom( QDataStream& s ); |
42 | 42 | ||
43 | public slots: | 43 | public slots: |
44 | void addNewItem( const QString& type, const QString&, const OMacAddress&, bool, int, int, const GpsLocation&, bool = false ); | 44 | void addNewItem( const QString& type, const QString&, const Opie::Net::OMacAddress&, bool, int, int, const GpsLocation&, bool = false ); |
45 | void addService( const QString& name, const OMacAddress& macaddr, const QString& ip ); | 45 | void addService( const QString& name, const Opie::Net::OMacAddress& macaddr, const QString& ip ); |
46 | 46 | ||
47 | void fromDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via ); | 47 | void fromDStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& via ); |
48 | void toDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via ); | 48 | void toDStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& via ); |
49 | void WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo ); | 49 | void WDStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& viaFrom, const Opie::Net::OMacAddress& viaTo ); |
50 | void IBSStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via ); | 50 | void IBSStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& via ); |
51 | 51 | ||
52 | void identify( const OMacAddress&, const QString& ipaddr ); | 52 | void identify( const Opie::Net::OMacAddress&, const QString& ipaddr ); |
53 | 53 | ||
54 | void contextMenuRequested( QListViewItem* item, const QPoint&, int ); | 54 | void contextMenuRequested( QListViewItem* item, const QPoint&, int ); |
55 | 55 | ||
56 | signals: | 56 | signals: |
57 | void rightButtonClicked(QListViewItem*,const QPoint&,int); | 57 | void rightButtonClicked(QListViewItem*,const QPoint&,int); |
58 | void joinNetwork( const QString&, const QString&, int, const QString& ); | 58 | void joinNetwork( const QString&, const QString&, int, const QString& ); |
59 | 59 | ||
60 | protected: | 60 | protected: |
61 | void addIfNotExisting( MScanListItem* parent, const OMacAddress& addr, const QString& type = "station" ); | 61 | void addIfNotExisting( MScanListItem* parent, const Opie::Net::OMacAddress& addr, const QString& type = "station" ); |
62 | 62 | ||
63 | }; | 63 | }; |
64 | 64 | ||
65 | //****************************** MScanListItem **************************************************************** | 65 | //****************************** MScanListItem **************************************************************** |
66 | 66 | ||
67 | class MScanListItem: public OListViewItem | 67 | class MScanListItem: public Opie::Ui::OListViewItem |
68 | { | 68 | { |
69 | public: | 69 | public: |
70 | MScanListItem::MScanListItem( QListView* parent, | 70 | MScanListItem::MScanListItem( QListView* parent, |
71 | const QString& type = "unknown", | 71 | const QString& type = "unknown", |
72 | const QString& essid = "unknown", | 72 | const QString& essid = "unknown", |
73 | const QString& macaddr = "unknown", | 73 | const QString& macaddr = "unknown", |
74 | bool wep = false, | 74 | bool wep = false, |
75 | int channel = 0, | 75 | int channel = 0, |
76 | int signal = 0, | 76 | int signal = 0, |
77 | bool probed = false ); | 77 | bool probed = false ); |
78 | 78 | ||
79 | MScanListItem::MScanListItem( QListViewItem* parent, | 79 | MScanListItem::MScanListItem( QListViewItem* parent, |
80 | const QString& type = "unknown", | 80 | const QString& type = "unknown", |
81 | const QString& essid = "unknown", | 81 | const QString& essid = "unknown", |
82 | const QString& macaddr = "unknown", | 82 | const QString& macaddr = "unknown", |
83 | bool wep = false, | 83 | bool wep = false, |
84 | int channel = 0, | 84 | int channel = 0, |
85 | int signal = 0 ); | 85 | int signal = 0 ); |
86 | 86 | ||
87 | 87 | ||
88 | protected: | 88 | protected: |
89 | virtual void decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal, bool probed ); | 89 | virtual void decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal, bool probed ); |
90 | 90 | ||
91 | public: | 91 | public: |
92 | QString type; | 92 | QString type; |
93 | 93 | ||
94 | public: | 94 | public: |
95 | //const QString& type() { return _type; }; | 95 | //const QString& type() { return _type; }; |
96 | const QString& essid() const; | 96 | const QString& essid() const; |
97 | const QString& macaddr() { return _macaddr; }; | 97 | const QString& macaddr() { return _macaddr; }; |
98 | bool wep() { return _wep; }; | 98 | bool wep() { return _wep; }; |
99 | int channel() { return _channel; }; | 99 | int channel() { return _channel; }; |
100 | int signal() { return _signal; }; | 100 | int signal() { return _signal; }; |
101 | int beacons() { return _beacons; }; | 101 | int beacons() { return _beacons; }; |
102 | 102 | ||
103 | void setSignal( int signal ) { /* TODO */ }; | 103 | void setSignal( int signal ) { /* TODO */ }; |
104 | void receivedBeacon(); | 104 | void receivedBeacon(); |
105 | 105 | ||
106 | void setManufacturer( const QString& manufacturer ); | 106 | void setManufacturer( const QString& manufacturer ); |
107 | void setLocation( const QString& location ); | 107 | void setLocation( const QString& location ); |
108 | 108 | ||
109 | virtual OListViewItem* childFactory(); | 109 | virtual Opie::Ui::OListViewItem* childFactory(); |
110 | virtual void serializeTo( QDataStream& s ) const; | 110 | virtual void serializeTo( QDataStream& s ) const; |
111 | virtual void serializeFrom( QDataStream& s ); | 111 | virtual void serializeFrom( QDataStream& s ); |
112 | 112 | ||
113 | private: | 113 | private: |
114 | QString _type; | 114 | QString _type; |
115 | QString _essid; | 115 | QString _essid; |
116 | QString _macaddr; | 116 | QString _macaddr; |
117 | bool _wep; | 117 | bool _wep; |
118 | int _channel; | 118 | int _channel; |
119 | int _signal; | 119 | int _signal; |
120 | int _beacons; | 120 | int _beacons; |
121 | 121 | ||
122 | }; | 122 | }; |
123 | 123 | ||
124 | //****************************** MScanListViewFactory **************************************************************** | 124 | //****************************** MScanListViewFactory **************************************************************** |
125 | 125 | ||
126 | /* | 126 | /* |
127 | 127 | ||
128 | class MScanListViewFactory : public OListViewFactory | 128 | class MScanListViewFactory : public Opie::Ui::OListViewFactory |
129 | { | 129 | { |
130 | public: | 130 | public: |
131 | virtual QListView* listViewFactory(); | 131 | virtual QListView* listViewFactory(); |
132 | virtual QListViewItem* listViewItemFactory( QListView* lv ); | 132 | virtual QListViewItem* listViewItemFactory( QListView* lv ); |
133 | virtual QListViewItem* listViewItemFactory( QListViewItem* lvi ); | 133 | virtual QListViewItem* listViewItemFactory( QListViewItem* lvi ); |
134 | virtual void setColumnText( int depth, QListViewItem* lvi, int column, const QString& text ); | 134 | virtual void setColumnText( int depth, QListViewItem* lvi, int column, const QString& text ); |
135 | virtual void setCustomData( int depth, QListViewItem* lvi, const QString& text ); | 135 | virtual void setCustomData( int depth, QListViewItem* lvi, const QString& text ); |
136 | } | 136 | } |
137 | */ | 137 | */ |
138 | 138 | ||
139 | #endif | 139 | #endif |
140 | 140 | ||
diff --git a/noncore/net/wellenreiter/gui/statwindow.cpp b/noncore/net/wellenreiter/gui/statwindow.cpp index 48e4847..e3c6bbe 100644 --- a/noncore/net/wellenreiter/gui/statwindow.cpp +++ b/noncore/net/wellenreiter/gui/statwindow.cpp | |||
@@ -1,42 +1,45 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. | 2 | ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Wellenreiter II. | 4 | ** This file is part of Wellenreiter II. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #include "statwindow.h" | 16 | #include "statwindow.h" |
17 | #include <opie2/olistview.h> | 17 | #include <opie2/olistview.h> |
18 | 18 | ||
19 | using namespace Opie::Ui; | ||
20 | using namespace Opie::Ui; | ||
21 | using namespace Opie::Ui; | ||
19 | MStatWindow::MStatWindow( QWidget * parent, const char * name, WFlags f ) | 22 | MStatWindow::MStatWindow( QWidget * parent, const char * name, WFlags f ) |
20 | :QVBox( parent, name, f ) | 23 | :QVBox( parent, name, f ) |
21 | { | 24 | { |
22 | table = new OListView( this ); | 25 | table = new OListView( this ); |
23 | table->addColumn( tr( "Protocol" ) ); | 26 | table->addColumn( tr( "Protocol" ) ); |
24 | table->addColumn( tr( "Count" ) ); | 27 | table->addColumn( tr( "Count" ) ); |
25 | table->setItemMargin( 2 ); | 28 | table->setItemMargin( 2 ); |
26 | }; | 29 | }; |
27 | 30 | ||
28 | 31 | ||
29 | void MStatWindow::updateCounter( const QString& protocol, int counter ) | 32 | void MStatWindow::updateCounter( const QString& protocol, int counter ) |
30 | { | 33 | { |
31 | QListViewItemIterator it( table ); | 34 | QListViewItemIterator it( table ); |
32 | for ( ; it.current(); ++it ) | 35 | for ( ; it.current(); ++it ) |
33 | { | 36 | { |
34 | if ( it.current()->text( 0 ) == protocol ) | 37 | if ( it.current()->text( 0 ) == protocol ) |
35 | { | 38 | { |
36 | it.current()->setText( 1, QString::number( counter ) ); | 39 | it.current()->setText( 1, QString::number( counter ) ); |
37 | return; | 40 | return; |
38 | } | 41 | } |
39 | } | 42 | } |
40 | 43 | ||
41 | new OListViewItem( table, protocol, QString::number( counter ) ); | 44 | new OListViewItem( table, protocol, QString::number( counter ) ); |
42 | } | 45 | } |
diff --git a/noncore/net/wellenreiter/gui/statwindow.h b/noncore/net/wellenreiter/gui/statwindow.h index b9057e7..e11247b 100644 --- a/noncore/net/wellenreiter/gui/statwindow.h +++ b/noncore/net/wellenreiter/gui/statwindow.h | |||
@@ -1,43 +1,43 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. | 2 | ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Wellenreiter II. | 4 | ** This file is part of Wellenreiter II. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #ifndef STATWINDOW_H | 16 | #ifndef STATWINDOW_H |
17 | #define STATWINDOW_H | 17 | #define STATWINDOW_H |
18 | 18 | ||
19 | #include <qvbox.h> | 19 | #include <qvbox.h> |
20 | 20 | ||
21 | class QString; | 21 | class QString; |
22 | class OListView; | 22 | namespace Opie {namespace Ui {class Opie::Ui::OListView;}} |
23 | 23 | ||
24 | class MStatWindow: public QVBox | 24 | class MStatWindow: public QVBox |
25 | { | 25 | { |
26 | Q_OBJECT | 26 | Q_OBJECT |
27 | 27 | ||
28 | public: | 28 | public: |
29 | MStatWindow( QWidget * parent = 0, const char * name = "MStatWindow", WFlags f = 0 ); | 29 | MStatWindow( QWidget * parent = 0, const char * name = "MStatWindow", WFlags f = 0 ); |
30 | 30 | ||
31 | void log( QString text ); | 31 | void log( QString text ); |
32 | const QString getLog() const; | 32 | const QString getLog() const; |
33 | void clear(); | 33 | void clear(); |
34 | 34 | ||
35 | void updateCounter( const QString&, int ); | 35 | void updateCounter( const QString&, int ); |
36 | 36 | ||
37 | protected: | 37 | protected: |
38 | OListView* table; | 38 | Opie::Ui::OListView* table; |
39 | 39 | ||
40 | }; | 40 | }; |
41 | 41 | ||
42 | #endif | 42 | #endif |
43 | 43 | ||
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index ce416e5..e8d9de7 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -40,48 +40,54 @@ using namespace Opie; | |||
40 | // Qt | 40 | // Qt |
41 | 41 | ||
42 | #include <qcheckbox.h> | 42 | #include <qcheckbox.h> |
43 | #include <qcombobox.h> | 43 | #include <qcombobox.h> |
44 | #include <qdatetime.h> | 44 | #include <qdatetime.h> |
45 | #include <qpushbutton.h> | 45 | #include <qpushbutton.h> |
46 | #include <qlineedit.h> | 46 | #include <qlineedit.h> |
47 | #include <qmessagebox.h> | 47 | #include <qmessagebox.h> |
48 | #include <qobjectlist.h> | 48 | #include <qobjectlist.h> |
49 | #include <qregexp.h> | 49 | #include <qregexp.h> |
50 | #include <qspinbox.h> | 50 | #include <qspinbox.h> |
51 | #include <qtimer.h> | 51 | #include <qtimer.h> |
52 | #include <qtoolbutton.h> | 52 | #include <qtoolbutton.h> |
53 | #include <qmainwindow.h> | 53 | #include <qmainwindow.h> |
54 | 54 | ||
55 | // Standard | 55 | // Standard |
56 | 56 | ||
57 | #include <assert.h> | 57 | #include <assert.h> |
58 | #include <errno.h> | 58 | #include <errno.h> |
59 | #include <unistd.h> | 59 | #include <unistd.h> |
60 | #include <string.h> | 60 | #include <string.h> |
61 | #include <sys/types.h> | 61 | #include <sys/types.h> |
62 | #include <stdlib.h> | 62 | #include <stdlib.h> |
63 | 63 | ||
64 | using namespace Opie::Core; | ||
65 | using namespace Opie::Net; | ||
66 | using namespace Opie::Net; | ||
67 | using namespace Opie::Core; | ||
68 | using namespace Opie::Net; | ||
69 | using namespace Opie::Core; | ||
64 | Wellenreiter::Wellenreiter( QWidget* parent ) | 70 | Wellenreiter::Wellenreiter( QWidget* parent ) |
65 | : WellenreiterBase( parent, 0, 0 ), | 71 | : WellenreiterBase( parent, 0, 0 ), |
66 | sniffing( false ), iface( 0 ), configwindow( 0 ) | 72 | sniffing( false ), iface( 0 ), configwindow( 0 ) |
67 | { | 73 | { |
68 | 74 | ||
69 | logwindow->log( "(i) Wellenreiter has been started." ); | 75 | logwindow->log( "(i) Wellenreiter has been started." ); |
70 | 76 | ||
71 | // | 77 | // |
72 | // detect operating system | 78 | // detect operating system |
73 | // | 79 | // |
74 | 80 | ||
75 | #ifdef QWS | 81 | #ifdef QWS |
76 | QString sys; | 82 | QString sys; |
77 | sys.sprintf( "(i) Running on '%s'.", (const char*) ODevice::inst()->systemString() ); | 83 | sys.sprintf( "(i) Running on '%s'.", (const char*) ODevice::inst()->systemString() ); |
78 | _system = ODevice::inst()->system(); | 84 | _system = ODevice::inst()->system(); |
79 | logwindow->log( sys ); | 85 | logwindow->log( sys ); |
80 | #endif | 86 | #endif |
81 | 87 | ||
82 | netview->setColumnWidthMode( 1, QListView::Manual ); | 88 | netview->setColumnWidthMode( 1, QListView::Manual ); |
83 | connect( netview, SIGNAL( joinNetwork(const QString&,const QString&,int,const QString&) ), | 89 | connect( netview, SIGNAL( joinNetwork(const QString&,const QString&,int,const QString&) ), |
84 | this, SLOT( joinNetwork(const QString&,const QString&,int,const QString&) ) ); | 90 | this, SLOT( joinNetwork(const QString&,const QString&,int,const QString&) ) ); |
85 | pcap = new OPacketCapturer(); | 91 | pcap = new OPacketCapturer(); |
86 | 92 | ||
87 | gps = new GPS( this ); | 93 | gps = new GPS( this ); |
@@ -425,49 +431,49 @@ void Wellenreiter::receivePacket( OPacket* p ) | |||
425 | // check for an arp frame since arp frames come in two flavours: | 431 | // check for an arp frame since arp frames come in two flavours: |
426 | // 802.11 encapsulates ARP data within IP packets while wired ethernet doesn't. | 432 | // 802.11 encapsulates ARP data within IP packets while wired ethernet doesn't. |
427 | OARPPacket* arp = static_cast<OARPPacket*>( childIfToParse( p, "ARP" ) ); | 433 | OARPPacket* arp = static_cast<OARPPacket*>( childIfToParse( p, "ARP" ) ); |
428 | if ( arp ) | 434 | if ( arp ) |
429 | { | 435 | { |
430 | handleARPData( p, arp, source, dest ); | 436 | handleARPData( p, arp, source, dest ); |
431 | } | 437 | } |
432 | 438 | ||
433 | // check for a ip frame | 439 | // check for a ip frame |
434 | OIPPacket* ip = static_cast<OIPPacket*>( childIfToParse( p, "IP" ) ); | 440 | OIPPacket* ip = static_cast<OIPPacket*>( childIfToParse( p, "IP" ) ); |
435 | if ( ip ) | 441 | if ( ip ) |
436 | { | 442 | { |
437 | handleIPData( p, ip, source, dest ); | 443 | handleIPData( p, ip, source, dest ); |
438 | } | 444 | } |
439 | 445 | ||
440 | //handleNotification( p ); | 446 | //handleNotification( p ); |
441 | 447 | ||
442 | } | 448 | } |
443 | 449 | ||
444 | 450 | ||
445 | void Wellenreiter::stopClicked() | 451 | void Wellenreiter::stopClicked() |
446 | { | 452 | { |
447 | if ( iface ) | 453 | if ( iface ) |
448 | { | 454 | { |
449 | disconnect( SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) ); | 455 | disconnect( SIGNAL( receivedPacket(Opie::Net::OPacket*) ), this, SLOT( receivePacket(Opie::Net::OPacket*) ) ); |
450 | disconnect( SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) ); | 456 | disconnect( SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) ); |
451 | iface->setChannelHopping(); // stop hopping channels | 457 | iface->setChannelHopping(); // stop hopping channels |
452 | } | 458 | } |
453 | else | 459 | else |
454 | killTimers(); | 460 | killTimers(); |
455 | 461 | ||
456 | pcap->close(); | 462 | pcap->close(); |
457 | sniffing = false; | 463 | sniffing = false; |
458 | 464 | ||
459 | if ( iface ) | 465 | if ( iface ) |
460 | { | 466 | { |
461 | // switch off monitor mode | 467 | // switch off monitor mode |
462 | iface->setMode( "managed" ); | 468 | iface->setMode( "managed" ); |
463 | // switch off promisc flag | 469 | // switch off promisc flag |
464 | iface->setPromiscuousMode( false ); | 470 | iface->setPromiscuousMode( false ); |
465 | 471 | ||
466 | system( "cardctl reset; sleep 1" ); //FIXME: Use OProcess | 472 | system( "cardctl reset; sleep 1" ); //FIXME: Use OProcess |
467 | } | 473 | } |
468 | 474 | ||
469 | logwindow->log( "(i) Stopped Scanning." ); | 475 | logwindow->log( "(i) Stopped Scanning." ); |
470 | assert( parent() ); | 476 | assert( parent() ); |
471 | ( (QMainWindow*) parent() )->setCaption( "Wellenreiter II" ); | 477 | ( (QMainWindow*) parent() )->setCaption( "Wellenreiter II" ); |
472 | 478 | ||
473 | // message the user | 479 | // message the user |
@@ -590,49 +596,49 @@ void Wellenreiter::startClicked() | |||
590 | 596 | ||
591 | qDebug( "Wellenreiter:: dumping to %s", (const char*) dumpname ); | 597 | qDebug( "Wellenreiter:: dumping to %s", (const char*) dumpname ); |
592 | pcap->openDumpFile( dumpname ); | 598 | pcap->openDumpFile( dumpname ); |
593 | 599 | ||
594 | if ( !pcap->isOpen() ) | 600 | if ( !pcap->isOpen() ) |
595 | { | 601 | { |
596 | QMessageBox::warning( this, "Wellenreiter II", tr( "Can't open packet capturer for\n'%1':\n" ).arg( | 602 | QMessageBox::warning( this, "Wellenreiter II", tr( "Can't open packet capturer for\n'%1':\n" ).arg( |
597 | cardtype == DEVTYPE_FILE ? (const char*) interface : iface->name() ) + QString(strerror( errno ) )); | 603 | cardtype == DEVTYPE_FILE ? (const char*) interface : iface->name() ) + QString(strerror( errno ) )); |
598 | return; | 604 | return; |
599 | } | 605 | } |
600 | 606 | ||
601 | // set capturer to non-blocking mode | 607 | // set capturer to non-blocking mode |
602 | pcap->setBlocking( false ); | 608 | pcap->setBlocking( false ); |
603 | 609 | ||
604 | // start channel hopper | 610 | // start channel hopper |
605 | if ( cardtype != DEVTYPE_FILE ) | 611 | if ( cardtype != DEVTYPE_FILE ) |
606 | { | 612 | { |
607 | logwindow->log( QString().sprintf( "(i) Starting channel hopper (d=%d ms)", configwindow->hopInterval->value() ) ); | 613 | logwindow->log( QString().sprintf( "(i) Starting channel hopper (d=%d ms)", configwindow->hopInterval->value() ) ); |
608 | iface->setChannelHopping( configwindow->hopInterval->value() ); //use interval from config window | 614 | iface->setChannelHopping( configwindow->hopInterval->value() ); //use interval from config window |
609 | } | 615 | } |
610 | 616 | ||
611 | if ( cardtype != DEVTYPE_FILE ) | 617 | if ( cardtype != DEVTYPE_FILE ) |
612 | { | 618 | { |
613 | // connect socket notifier and start channel hopper | 619 | // connect socket notifier and start channel hopper |
614 | connect( pcap, SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) ); | 620 | connect( pcap, SIGNAL( receivedPacket(Opie::Net::OPacket*) ), this, SLOT( receivePacket(Opie::Net::OPacket*) ) ); |
615 | connect( iface->channelHopper(), SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) ); | 621 | connect( iface->channelHopper(), SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) ); |
616 | } | 622 | } |
617 | else | 623 | else |
618 | { | 624 | { |
619 | // start timer for reading packets | 625 | // start timer for reading packets |
620 | startTimer( 100 ); | 626 | startTimer( 100 ); |
621 | } | 627 | } |
622 | 628 | ||
623 | logwindow->log( "(i) Started Scanning." ); | 629 | logwindow->log( "(i) Started Scanning." ); |
624 | sniffing = true; | 630 | sniffing = true; |
625 | 631 | ||
626 | #ifdef QWS | 632 | #ifdef QWS |
627 | if ( WellenreiterConfigWindow::instance()->disablePM->isChecked() ) | 633 | if ( WellenreiterConfigWindow::instance()->disablePM->isChecked() ) |
628 | { | 634 | { |
629 | QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Disable; | 635 | QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Disable; |
630 | } | 636 | } |
631 | #else | 637 | #else |
632 | #warning FIXME: setScreenSaverMode is not operational on the X11 build | 638 | #warning FIXME: setScreenSaverMode is not operational on the X11 build |
633 | #endif | 639 | #endif |
634 | 640 | ||
635 | emit( startedSniffing() ); | 641 | emit( startedSniffing() ); |
636 | if ( cardtype != DEVTYPE_FILE ) channelHopped( 6 ); // set title | 642 | if ( cardtype != DEVTYPE_FILE ) channelHopped( 6 ); // set title |
637 | else | 643 | else |
638 | { | 644 | { |
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h index d02813b..83299c9 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.h +++ b/noncore/net/wellenreiter/gui/wellenreiter.h | |||
@@ -1,107 +1,107 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. | 2 | ** Copyright (C) 2002-2004 Michael 'Mickey' Lauer. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file may be distributed and/or modified under the terms of the | 4 | ** This file may be distributed and/or modified under the terms of the |
5 | ** GNU General Public License version 2 as published by the Free Software | 5 | ** GNU General Public License version 2 as published by the Free Software |
6 | ** Foundation and appearing in the file LICENSE.GPL included in the | 6 | ** Foundation and appearing in the file LICENSE.GPL included in the |
7 | ** packaging of this file. | 7 | ** packaging of this file. |
8 | ** | 8 | ** |
9 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 9 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
10 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 10 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
11 | ** | 11 | ** |
12 | **********************************************************************/ | 12 | **********************************************************************/ |
13 | 13 | ||
14 | #ifndef WELLENREITER_H | 14 | #ifndef WELLENREITER_H |
15 | #define WELLENREITER_H | 15 | #define WELLENREITER_H |
16 | 16 | ||
17 | #include "wellenreiterbase.h" | 17 | #include "wellenreiterbase.h" |
18 | 18 | ||
19 | #ifdef QWS | 19 | #ifdef QWS |
20 | #include <opie2/odevice.h> | 20 | #include <opie2/odevice.h> |
21 | using namespace Opie; | ||
22 | #endif | 21 | #endif |
23 | 22 | ||
24 | class QTimerEvent; | 23 | class QTimerEvent; |
25 | class QPixmap; | 24 | class QPixmap; |
26 | class OPacket; | 25 | namespace Opie {namespace Net {class Opie::Net::OPacket;}} |
27 | class OWaveLanManagementPacket; | 26 | namespace Opie {namespace Net {class Opie::Net::OWaveLanManagementPacket;}} |
28 | class OWaveLanControlPacket; | 27 | namespace Opie {namespace Net {class Opie::Net::OWaveLanControlPacket;}} |
29 | class OWaveLanDataPacket; | 28 | namespace Opie {namespace Net {class Opie::Net::OWaveLanDataPacket;}} |
30 | class OEthernetPacket; | 29 | namespace Opie {namespace Net {class Opie::Net::OEthernetPacket;}} |
31 | class OARPPacket; | 30 | namespace Opie {namespace Net {class Opie::Net::OARPPacket;}} |
32 | class OMacAddress; | 31 | namespace Opie {namespace Net {class Opie::Net::OMacAddress;}} |
33 | class OIPPacket; | 32 | namespace Opie {namespace Net {class Opie::Net::OIPPacket;}} |
34 | class OPacketCapturer; | 33 | namespace Opie {namespace Net {class Opie::Net::OPacket;}} |
35 | class OWirelessNetworkInterface; | 34 | namespace Opie {namespace Net {class Opie::Net::OWirelessNetworkInterface;}} |
35 | namespace Opie {namespace Net {class Opie::Net::OPacketCapturer;}} | ||
36 | class PacketView; | 36 | class PacketView; |
37 | class WellenreiterConfigWindow; | 37 | class WellenreiterConfigWindow; |
38 | class MLogWindow; | 38 | class MLogWindow; |
39 | class GPS; | 39 | class GPS; |
40 | 40 | ||
41 | class Wellenreiter : public WellenreiterBase { | 41 | class Wellenreiter : public WellenreiterBase { |
42 | Q_OBJECT | 42 | Q_OBJECT |
43 | 43 | ||
44 | public: | 44 | public: |
45 | Wellenreiter( QWidget* parent = 0 ); | 45 | Wellenreiter( QWidget* parent = 0 ); |
46 | ~Wellenreiter(); | 46 | ~Wellenreiter(); |
47 | 47 | ||
48 | void setConfigWindow( WellenreiterConfigWindow* cw ); | 48 | void setConfigWindow( WellenreiterConfigWindow* cw ); |
49 | MScanListView* netView() const { return netview; }; | 49 | MScanListView* netView() const { return netview; }; |
50 | MLogWindow* logWindow() const { return logwindow; }; | 50 | MLogWindow* logWindow() const { return logwindow; }; |
51 | PacketView* hexWindow() const { return hexwindow; }; | 51 | PacketView* hexWindow() const { return hexwindow; }; |
52 | bool isDaemonRunning() const { return sniffing; }; | 52 | bool isDaemonRunning() const { return sniffing; }; |
53 | QString captureFileName() const { return dumpname; }; | 53 | QString captureFileName() const { return dumpname; }; |
54 | 54 | ||
55 | public: | 55 | public: |
56 | bool sniffing; | 56 | bool sniffing; |
57 | 57 | ||
58 | protected: | 58 | protected: |
59 | virtual void timerEvent( QTimerEvent* ); | 59 | virtual void timerEvent( QTimerEvent* ); |
60 | 60 | ||
61 | public slots: | 61 | public slots: |
62 | void initialTimer(); | 62 | void initialTimer(); |
63 | 63 | ||
64 | void channelHopped(int); | 64 | void channelHopped(int); |
65 | void receivePacket(OPacket*); | 65 | void receivePacket(Opie::Net::OPacket*); |
66 | void startClicked(); | 66 | void startClicked(); |
67 | void stopClicked(); | 67 | void stopClicked(); |
68 | 68 | ||
69 | void joinNetwork(const QString&,const QString&,int,const QString&); | 69 | void joinNetwork(const QString&,const QString&,int,const QString&); |
70 | 70 | ||
71 | signals: | 71 | signals: |
72 | void startedSniffing(); | 72 | void startedSniffing(); |
73 | void stoppedSniffing(); | 73 | void stoppedSniffing(); |
74 | 74 | ||
75 | private: | 75 | private: |
76 | void handleManagementFrame( OPacket* p, OWaveLanManagementPacket* ); | 76 | void handleManagementFrame( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* ); |
77 | void handleManagementFrameBeacon( OPacket* p, OWaveLanManagementPacket* ); | 77 | void handleManagementFrameBeacon( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* ); |
78 | void handleManagementFrameProbeRequest( OPacket* p, OWaveLanManagementPacket* ); | 78 | void handleManagementFrameProbeRequest( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* ); |
79 | void handleManagementFrameProbeResponse( OPacket* p, OWaveLanManagementPacket* ); | 79 | void handleManagementFrameProbeResponse( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* ); |
80 | void handleControlFrame( OPacket* p, OWaveLanControlPacket* control ); | 80 | void handleControlFrame( Opie::Net::OPacket* p, Opie::Net::OWaveLanControlPacket* control ); |
81 | void handleWlanData( OPacket* p, OWaveLanDataPacket* data, OMacAddress& from, OMacAddress& to ); | 81 | void handleWlanData( Opie::Net::OPacket* p, Opie::Net::OWaveLanDataPacket* data, Opie::Net::OMacAddress& from, Opie::Net::OMacAddress& to ); |
82 | void handleEthernetData( OPacket* p, OEthernetPacket* data, OMacAddress& from, OMacAddress& to ); | 82 | void handleEthernetData( Opie::Net::OPacket* p, Opie::Net::OEthernetPacket* data, Opie::Net::OMacAddress& from, Opie::Net::OMacAddress& to ); |
83 | void handleARPData( OPacket* p, OARPPacket* arp, OMacAddress& from, OMacAddress& to ); | 83 | void handleARPData( Opie::Net::OPacket* p, Opie::Net::OARPPacket* arp, Opie::Net::OMacAddress& from, Opie::Net::OMacAddress& to ); |
84 | void handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& from, OMacAddress& to ); | 84 | void handleIPData( Opie::Net::OPacket* p, Opie::Net::OIPPacket* ip, Opie::Net::OMacAddress& from, Opie::Net::OMacAddress& to ); |
85 | void handleNotification( OPacket* p ); | 85 | void handleNotification( Opie::Net::OPacket* p ); |
86 | void doAction( const QString& action, const QString& protocol, OPacket* p ); | 86 | void doAction( const QString& action, const QString& protocol, Opie::Net::OPacket* p ); |
87 | QObject* childIfToParse( OPacket* p, const QString& protocol ); | 87 | QObject* childIfToParse( Opie::Net::OPacket* p, const QString& protocol ); |
88 | bool checkDumpPacket( OPacket* p ); | 88 | bool checkDumpPacket( Opie::Net::OPacket* p ); |
89 | 89 | ||
90 | private: | 90 | private: |
91 | #ifdef QWS | 91 | #ifdef QWS |
92 | OSystem _system; // Opie Operating System identifier | 92 | Opie::Core::OSystem _system; // Opie Operating System identifier |
93 | #endif | 93 | #endif |
94 | 94 | ||
95 | QString dumpname; | 95 | QString dumpname; |
96 | OWirelessNetworkInterface* iface; | 96 | Opie::Net::OWirelessNetworkInterface* iface; |
97 | OPacketCapturer* pcap; | 97 | Opie::Net::OPacketCapturer* pcap; |
98 | WellenreiterConfigWindow* configwindow; | 98 | WellenreiterConfigWindow* configwindow; |
99 | GPS* gps; | 99 | GPS* gps; |
100 | 100 | ||
101 | //void readConfig(); | 101 | //void readConfig(); |
102 | //void writeConfig(); | 102 | //void writeConfig(); |
103 | }; | 103 | }; |
104 | 104 | ||
105 | 105 | ||
106 | 106 | ||
107 | #endif | 107 | #endif |
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp index 3d0595d..f035e89 100644 --- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp | |||
@@ -17,48 +17,51 @@ | |||
17 | 17 | ||
18 | #include <qlabel.h> | 18 | #include <qlabel.h> |
19 | #include <qlayout.h> | 19 | #include <qlayout.h> |
20 | 20 | ||
21 | #include "logwindow.h" | 21 | #include "logwindow.h" |
22 | #include "packetview.h" | 22 | #include "packetview.h" |
23 | #include "scanlist.h" | 23 | #include "scanlist.h" |
24 | #include "statwindow.h" | 24 | #include "statwindow.h" |
25 | #include "graphwindow.h" | 25 | #include "graphwindow.h" |
26 | 26 | ||
27 | #ifdef QWS | 27 | #ifdef QWS |
28 | #include <qpe/resource.h> | 28 | #include <qpe/resource.h> |
29 | #include <opie2/otabwidget.h> | 29 | #include <opie2/otabwidget.h> |
30 | using namespace Opie; | 30 | using namespace Opie; |
31 | #else | 31 | #else |
32 | #include "resource.h" | 32 | #include "resource.h" |
33 | #include <qtabwidget.h> | 33 | #include <qtabwidget.h> |
34 | #endif | 34 | #endif |
35 | 35 | ||
36 | 36 | ||
37 | /* | 37 | /* |
38 | * Constructs a WellenreiterBase which is a child of 'parent', with the | 38 | * Constructs a WellenreiterBase which is a child of 'parent', with the |
39 | * name 'name' and widget flags set to 'f' | 39 | * name 'name' and widget flags set to 'f' |
40 | */ | 40 | */ |
41 | using namespace Opie::Ui; | ||
42 | using namespace Opie::Ui; | ||
43 | using namespace Opie::Ui; | ||
41 | WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags fl ) | 44 | WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags fl ) |
42 | : QWidget( parent, name, fl ) | 45 | : QWidget( parent, name, fl ) |
43 | { | 46 | { |
44 | //ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) ); | 47 | //ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) ); |
45 | //ani2 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot90" ) ); | 48 | //ani2 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot90" ) ); |
46 | //ani3 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot180" ) ); | 49 | //ani3 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot180" ) ); |
47 | //ani4 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot270" ) ); | 50 | //ani4 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot270" ) ); |
48 | 51 | ||
49 | if ( !name ) | 52 | if ( !name ) |
50 | setName( "WellenreiterBase" ); | 53 | setName( "WellenreiterBase" ); |
51 | resize( 191, 294 ); | 54 | resize( 191, 294 ); |
52 | #ifdef QWS | 55 | #ifdef QWS |
53 | setCaption( tr( "Wellenreiter/Opie" ) ); | 56 | setCaption( tr( "Wellenreiter/Opie" ) ); |
54 | #else | 57 | #else |
55 | setCaption( tr( "Wellenreiter/X11" ) ); | 58 | setCaption( tr( "Wellenreiter/X11" ) ); |
56 | #endif | 59 | #endif |
57 | WellenreiterBaseLayout = new QVBoxLayout( this ); | 60 | WellenreiterBaseLayout = new QVBoxLayout( this ); |
58 | WellenreiterBaseLayout->setSpacing( 2 ); | 61 | WellenreiterBaseLayout->setSpacing( 2 ); |
59 | WellenreiterBaseLayout->setMargin( 0 ); | 62 | WellenreiterBaseLayout->setMargin( 0 ); |
60 | #ifdef QWS | 63 | #ifdef QWS |
61 | TabWidget = new OTabWidget( this, "TabWidget", OTabWidget::Global ); | 64 | TabWidget = new OTabWidget( this, "TabWidget", OTabWidget::Global ); |
62 | #else | 65 | #else |
63 | TabWidget = new QTabWidget( this, "TabWidget" ); | 66 | TabWidget = new QTabWidget( this, "TabWidget" ); |
64 | #endif | 67 | #endif |
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.h b/noncore/net/wellenreiter/gui/wellenreiterbase.h index 126aad2..e40b699 100644 --- a/noncore/net/wellenreiter/gui/wellenreiterbase.h +++ b/noncore/net/wellenreiter/gui/wellenreiterbase.h | |||
@@ -25,49 +25,49 @@ class QLabel; | |||
25 | class MScanListView; | 25 | class MScanListView; |
26 | class MScanListItem; | 26 | class MScanListItem; |
27 | class QPushButton; | 27 | class QPushButton; |
28 | class MLogWindow; | 28 | class MLogWindow; |
29 | class MStatWindow; | 29 | class MStatWindow; |
30 | class MGraphWindow; | 30 | class MGraphWindow; |
31 | class PacketView; | 31 | class PacketView; |
32 | 32 | ||
33 | #ifdef QWS | 33 | #ifdef QWS |
34 | #include <opie2/otabwidget.h> | 34 | #include <opie2/otabwidget.h> |
35 | using namespace Opie; | 35 | using namespace Opie; |
36 | #else | 36 | #else |
37 | class QTabWidget; | 37 | class QTabWidget; |
38 | #endif | 38 | #endif |
39 | 39 | ||
40 | class WellenreiterBase : public QWidget | 40 | class WellenreiterBase : public QWidget |
41 | { | 41 | { |
42 | Q_OBJECT | 42 | Q_OBJECT |
43 | 43 | ||
44 | public: | 44 | public: |
45 | WellenreiterBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 45 | WellenreiterBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
46 | ~WellenreiterBase(); | 46 | ~WellenreiterBase(); |
47 | 47 | ||
48 | #ifdef QWS | 48 | #ifdef QWS |
49 | OTabWidget* TabWidget; | 49 | Opie::Ui::OTabWidget* TabWidget; |
50 | #else | 50 | #else |
51 | QTabWidget* TabWidget; | 51 | QTabWidget* TabWidget; |
52 | #endif | 52 | #endif |
53 | QWidget* ap; | 53 | QWidget* ap; |
54 | MScanListView* netview; | 54 | MScanListView* netview; |
55 | MLogWindow* logwindow; | 55 | MLogWindow* logwindow; |
56 | PacketView* hexwindow; | 56 | PacketView* hexwindow; |
57 | MStatWindow* statwindow; | 57 | MStatWindow* statwindow; |
58 | MGraphWindow* graphwindow; | 58 | MGraphWindow* graphwindow; |
59 | QWidget* about; | 59 | QWidget* about; |
60 | QLabel* PixmapLabel1_3_2; | 60 | QLabel* PixmapLabel1_3_2; |
61 | QLabel* TextLabel1_4_2; | 61 | QLabel* TextLabel1_4_2; |
62 | 62 | ||
63 | protected: | 63 | protected: |
64 | QVBoxLayout* WellenreiterBaseLayout; | 64 | QVBoxLayout* WellenreiterBaseLayout; |
65 | QVBoxLayout* apLayout; | 65 | QVBoxLayout* apLayout; |
66 | QGridLayout* aboutLayout; | 66 | QGridLayout* aboutLayout; |
67 | bool event( QEvent* ); | 67 | bool event( QEvent* ); |
68 | 68 | ||
69 | QPixmap* ani1; | 69 | QPixmap* ani1; |
70 | QPixmap* ani2; | 70 | QPixmap* ani2; |
71 | QPixmap* ani3; | 71 | QPixmap* ani3; |
72 | QPixmap* ani4; | 72 | QPixmap* ani4; |
73 | 73 | ||