summaryrefslogtreecommitdiff
path: root/noncore
Unidiff
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/accountitem.cpp1
-rw-r--r--noncore/net/mail/addresspicker.cpp2
-rw-r--r--noncore/net/mail/libmailwrapper/abstractmail.cpp2
-rw-r--r--noncore/net/mail/libmailwrapper/sendmailprogress.cpp1
-rw-r--r--noncore/net/mail/libmailwrapper/smtpwrapper.cpp2
-rw-r--r--noncore/net/mail/libmailwrapper/statusmail.cpp1
-rw-r--r--noncore/net/mail/mainwindow.cpp2
-rw-r--r--noncore/net/mail/newmaildir.cpp2
-rw-r--r--noncore/net/mail/opiemail.cpp4
-rw-r--r--noncore/net/mail/selectsmtp.cpp7
-rw-r--r--noncore/net/mail/viewmail.cpp3
-rw-r--r--noncore/net/mail/viewmailbase.cpp1
-rw-r--r--noncore/net/opietooth/applet/bluezapplet.cpp3
-rw-r--r--noncore/net/opietooth/blue-pin/main.cc1
-rw-r--r--noncore/net/opietooth/blue-pin/pindlg.cc1
-rw-r--r--noncore/net/opietooth/manager/bticonloader.cpp1
-rw-r--r--noncore/net/opietooth/manager/btserviceitem.cpp1
-rw-r--r--noncore/net/opietooth/manager/hciconfwrapper.cpp1
-rw-r--r--noncore/net/opietooth/manager/rfcommassigndialogitem.cpp1
-rw-r--r--noncore/net/wellenreiter/gui/protolistview.cpp4
-rw-r--r--noncore/net/wellenreiter/gui/resource.cpp1
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.cpp1
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiterbase.cpp9
23 files changed, 1 insertions, 51 deletions
diff --git a/noncore/net/mail/accountitem.cpp b/noncore/net/mail/accountitem.cpp
index 32a96ff..e925d8d 100644
--- a/noncore/net/mail/accountitem.cpp
+++ b/noncore/net/mail/accountitem.cpp
@@ -1,16 +1,15 @@
1 1
2#include "accountitem.h" 2#include "accountitem.h"
3#include "accountview.h" 3#include "accountview.h"
4#include "selectstore.h"
5#include "newmaildir.h" 4#include "newmaildir.h"
6#include "defines.h" 5#include "defines.h"
7 6
8/* OPIE */ 7/* OPIE */
9#include <libmailwrapper/mailtypes.h> 8#include <libmailwrapper/mailtypes.h>
10#include <libmailwrapper/abstractmail.h> 9#include <libmailwrapper/abstractmail.h>
11#include <libmailwrapper/mailwrapper.h> 10#include <libmailwrapper/mailwrapper.h>
12#include <qpe/qpeapplication.h> 11#include <qpe/qpeapplication.h>
13 12
14/* QT */ 13/* QT */
15#include <qpopupmenu.h> 14#include <qpopupmenu.h>
16#include <qmessagebox.h> 15#include <qmessagebox.h>
diff --git a/noncore/net/mail/addresspicker.cpp b/noncore/net/mail/addresspicker.cpp
index 35f9cd4..50c82e5 100644
--- a/noncore/net/mail/addresspicker.cpp
+++ b/noncore/net/mail/addresspicker.cpp
@@ -1,27 +1,25 @@
1 1
2#include "composemail.h" 2#include "composemail.h"
3 3
4/* OPIE */ 4/* OPIE */
5#include <opie2/ocontactaccess.h> 5#include <opie2/ocontactaccess.h>
6#include <opie2/opimcontact.h> 6#include <opie2/opimcontact.h>
7#include <qpe/resource.h> 7#include <qpe/resource.h>
8#include <qpe/qpeapplication.h> 8#include <qpe/qpeapplication.h>
9 9
10/* QT */ 10/* QT */
11#include <qpushbutton.h> 11#include <qpushbutton.h>
12#include <qmessagebox.h> 12#include <qmessagebox.h>
13#include <qtextstream.h>
14#include <qlistbox.h> 13#include <qlistbox.h>
15#include <qfile.h>
16 14
17/* STD */ 15/* STD */
18#include <stdlib.h> 16#include <stdlib.h>
19 17
20AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFlags flags ) 18AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFlags flags )
21 : AddressPickerUI( parent, name, modal, flags ) 19 : AddressPickerUI( parent, name, modal, flags )
22{ 20{
23 okButton->setIconSet( Resource::loadPixmap( "enter" ) ); 21 okButton->setIconSet( Resource::loadPixmap( "enter" ) );
24 cancelButton->setIconSet( Resource::loadPixmap( "editdelete" ) ); 22 cancelButton->setIconSet( Resource::loadPixmap( "editdelete" ) );
25 23
26 connect(okButton, SIGNAL(clicked()), SLOT(accept())); 24 connect(okButton, SIGNAL(clicked()), SLOT(accept()));
27 connect(cancelButton, SIGNAL(clicked()), SLOT(close())); 25 connect(cancelButton, SIGNAL(clicked()), SLOT(close()));
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.cpp b/noncore/net/mail/libmailwrapper/abstractmail.cpp
index 741a8e1..9960f88 100644
--- a/noncore/net/mail/libmailwrapper/abstractmail.cpp
+++ b/noncore/net/mail/libmailwrapper/abstractmail.cpp
@@ -1,21 +1,19 @@
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 "mboxwrapper.h"
7#include "mailtypes.h" 6#include "mailtypes.h"
8 7
9#include <qstring.h>
10#include <qfile.h> 8#include <qfile.h>
11#include <qtextstream.h> 9#include <qtextstream.h>
12#include <stdlib.h> 10#include <stdlib.h>
13#include <libetpan/mailmime_content.h> 11#include <libetpan/mailmime_content.h>
14#include <libetpan/mailmime.h> 12#include <libetpan/mailmime.h>
15 13
16AbstractMail* AbstractMail::getWrapper(IMAPaccount *a) 14AbstractMail* AbstractMail::getWrapper(IMAPaccount *a)
17{ 15{
18 return new IMAPwrapper(a); 16 return new IMAPwrapper(a);
19} 17}
20 18
21AbstractMail* AbstractMail::getWrapper(POP3account *a) 19AbstractMail* AbstractMail::getWrapper(POP3account *a)
diff --git a/noncore/net/mail/libmailwrapper/sendmailprogress.cpp b/noncore/net/mail/libmailwrapper/sendmailprogress.cpp
index ef22750..dc0c75a 100644
--- a/noncore/net/mail/libmailwrapper/sendmailprogress.cpp
+++ b/noncore/net/mail/libmailwrapper/sendmailprogress.cpp
@@ -1,16 +1,15 @@
1#include "sendmailprogress.h" 1#include "sendmailprogress.h"
2#include <qprogressbar.h> 2#include <qprogressbar.h>
3#include <qlabel.h> 3#include <qlabel.h>
4#include <qstring.h>
5 4
6progressMailSend::progressMailSend(QWidget*parent, const char * name) 5progressMailSend::progressMailSend(QWidget*parent, const char * name)
7 :progressMailSendUI(parent,name,true),m_current_mail(0),m_current_single(0),m_max_mail(0),m_max_single(0) 6 :progressMailSendUI(parent,name,true),m_current_mail(0),m_current_single(0),m_max_mail(0),m_max_single(0)
8{ 7{
9} 8}
10 9
11progressMailSend::~progressMailSend() 10progressMailSend::~progressMailSend()
12{ 11{
13} 12}
14 13
15void progressMailSend::setMaxMails(unsigned int aMaxMails) 14void progressMailSend::setMaxMails(unsigned int aMaxMails)
16{ 15{
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
index d75d52a..d7a005e 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
@@ -1,21 +1,19 @@
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>
8#include <qt.h> 7#include <qt.h>
9#include <qmessagebox.h>
10 8
11#include <qpe/config.h> 9#include <qpe/config.h>
12#include <qpe/qcopenvelope_qws.h> 10#include <qpe/qcopenvelope_qws.h>
13 11
14#include <libetpan/libetpan.h> 12#include <libetpan/libetpan.h>
15 13
16#include "smtpwrapper.h" 14#include "smtpwrapper.h"
17#include "mailwrapper.h" 15#include "mailwrapper.h"
18#include "abstractmail.h" 16#include "abstractmail.h"
19#include "logindialog.h" 17#include "logindialog.h"
20#include "mailtypes.h" 18#include "mailtypes.h"
21#include "sendmailprogress.h" 19#include "sendmailprogress.h"
diff --git a/noncore/net/mail/libmailwrapper/statusmail.cpp b/noncore/net/mail/libmailwrapper/statusmail.cpp
index 172c58f..4134e79 100644
--- a/noncore/net/mail/libmailwrapper/statusmail.cpp
+++ b/noncore/net/mail/libmailwrapper/statusmail.cpp
@@ -1,14 +1,13 @@
1#include "statusmail.h" 1#include "statusmail.h"
2#include <qlist.h>
3 2
4StatusMail::StatusMail(QList<Account>&list) 3StatusMail::StatusMail(QList<Account>&list)
5{ 4{
6 currentImapStat.message_count=0; 5 currentImapStat.message_count=0;
7 currentImapStat.message_unseen=0; 6 currentImapStat.message_unseen=0;
8 currentImapStat.message_recent=0; 7 currentImapStat.message_recent=0;
9 lastPop3Stat = currentImapStat; 8 lastPop3Stat = currentImapStat;
10 currentPop3Stat = currentImapStat; 9 currentPop3Stat = currentImapStat;
11 connectionList.setAutoDelete(true); 10 connectionList.setAutoDelete(true);
12 connectionList.clear(); 11 connectionList.clear();
13 initAccounts(list); 12 initAccounts(list);
14} 13}
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 3f34fe7..bcf0866 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -1,21 +1,19 @@
1#include <qlabel.h> 1#include <qlabel.h>
2#include <qvbox.h> 2#include <qvbox.h>
3#include <qheader.h> 3#include <qheader.h>
4#include <qtimer.h> 4#include <qtimer.h>
5#include <qlayout.h> 5#include <qlayout.h>
6#include <qmessagebox.h>
7 6
8#include <qpe/qpeapplication.h> 7#include <qpe/qpeapplication.h>
9#include <qpe/resource.h>
10 8
11#include "defines.h" 9#include "defines.h"
12#include "mainwindow.h" 10#include "mainwindow.h"
13 11
14 12
15MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) 13MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
16 : QMainWindow( parent, name, flags ) 14 : QMainWindow( parent, name, flags )
17{ 15{
18 16
19 setCaption( tr( "Mail" ) ); 17 setCaption( tr( "Mail" ) );
20 setToolBarsMovable( false ); 18 setToolBarsMovable( false );
21 19
diff --git a/noncore/net/mail/newmaildir.cpp b/noncore/net/mail/newmaildir.cpp
index ab0d4e3..e6e9dc7 100644
--- a/noncore/net/mail/newmaildir.cpp
+++ b/noncore/net/mail/newmaildir.cpp
@@ -1,15 +1,13 @@
1#include "newmaildir.h" 1#include "newmaildir.h"
2#include <qdialog.h>
3#include <qvariant.h>
4#include <qlineedit.h> 2#include <qlineedit.h>
5#include <qcheckbox.h> 3#include <qcheckbox.h>
6 4
7Newmdirdlg::Newmdirdlg( QWidget* parent, const char* name,bool no_sub) 5Newmdirdlg::Newmdirdlg( QWidget* parent, const char* name,bool no_sub)
8 : Newmdirdlgui(parent,name,true),ndir(""),possible_subs(false) 6 : Newmdirdlgui(parent,name,true),ndir(""),possible_subs(false)
9{ 7{
10 if (no_sub) { 8 if (no_sub) {
11 subdirsPossibleBox->setChecked(false); 9 subdirsPossibleBox->setChecked(false);
12 subdirsPossibleBox->hide(); 10 subdirsPossibleBox->hide();
13 } 11 }
14} 12}
15 13
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index abf93dc..6bfc824 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -3,32 +3,28 @@
3#include "opiemail.h" 3#include "opiemail.h"
4#include "editaccounts.h" 4#include "editaccounts.h"
5#include "composemail.h" 5#include "composemail.h"
6#include "mailistviewitem.h" 6#include "mailistviewitem.h"
7#include "viewmail.h" 7#include "viewmail.h"
8#include "selectstore.h" 8#include "selectstore.h"
9#include "selectsmtp.h" 9#include "selectsmtp.h"
10 10
11/* OPIE */ 11/* OPIE */
12#include <libmailwrapper/smtpwrapper.h> 12#include <libmailwrapper/smtpwrapper.h>
13#include <libmailwrapper/mailtypes.h> 13#include <libmailwrapper/mailtypes.h>
14#include <libmailwrapper/abstractmail.h> 14#include <libmailwrapper/abstractmail.h>
15#include <qpe/qcopenvelope_qws.h>
16#include <qpe/resource.h> 15#include <qpe/resource.h>
17#include <qpe/qpeapplication.h> 16#include <qpe/qpeapplication.h>
18 17
19/* QT */ 18/* QT */
20#include <qmessagebox.h>
21#include <qaction.h>
22#include <qapplication.h>
23 19
24OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) 20OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags )
25 : MainWindow( parent, name, WStyle_ContextHelp ) 21 : MainWindow( parent, name, WStyle_ContextHelp )
26{ 22{
27 settings = new Settings(); 23 settings = new Settings();
28 24
29 folderView->populate( settings->getAccounts() ); 25 folderView->populate( settings->getAccounts() );
30} 26}
31 27
32OpieMail::~OpieMail() 28OpieMail::~OpieMail()
33{ 29{
34 if (settings) delete settings; 30 if (settings) delete settings;
diff --git a/noncore/net/mail/selectsmtp.cpp b/noncore/net/mail/selectsmtp.cpp
index 79b10ef..82e8a0b 100644
--- a/noncore/net/mail/selectsmtp.cpp
+++ b/noncore/net/mail/selectsmtp.cpp
@@ -1,21 +1,14 @@
1#include "selectsmtp.h" 1#include "selectsmtp.h"
2#include <libmailwrapper/mailwrapper.h> 2#include <libmailwrapper/mailwrapper.h>
3#include <qlist.h>
4#include <qlabel.h>
5#include <qlayout.h>
6#include <qcheckbox.h>
7#include <qframe.h>
8#include <qlineedit.h>
9#include <qcombobox.h>
10 3
11selectsmtp::selectsmtp(QWidget* parent, const char* name, bool modal, WFlags fl) 4selectsmtp::selectsmtp(QWidget* parent, const char* name, bool modal, WFlags fl)
12 : selectstoreui(parent,name,modal,fl) 5 : selectstoreui(parent,name,modal,fl)
13{ 6{
14 //m_smtpList.setAutoDelete(false); 7 //m_smtpList.setAutoDelete(false);
15 m_smtpList = 0; 8 m_smtpList = 0;
16 //headlabel->setText(tr("<center>Select SMTP account to use</center>")); 9 //headlabel->setText(tr("<center>Select SMTP account to use</center>"));
17 headlabel->hide(); 10 headlabel->hide();
18 folderSelection->hide(); 11 folderSelection->hide();
19 folderLabel->hide(); 12 folderLabel->hide();
20 accountlabel->setText("<center>SMTP Accounts</center>"); 13 accountlabel->setText("<center>SMTP Accounts</center>");
21 Line1->hide(); 14 Line1->hide();
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index 8636957..ec93f8d 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -1,34 +1,31 @@
1#include "composemail.h" 1#include "composemail.h"
2#include "viewmail.h" 2#include "viewmail.h"
3#include "accountview.h"
4 3
5/* OPIE */ 4/* OPIE */
6#include <libmailwrapper/settings.h> 5#include <libmailwrapper/settings.h>
7#include <libmailwrapper/abstractmail.h> 6#include <libmailwrapper/abstractmail.h>
8#include <libmailwrapper/mailtypes.h> 7#include <libmailwrapper/mailtypes.h>
9 8
10#include <opie2/ofiledialog.h> 9#include <opie2/ofiledialog.h>
11#include <qpe/config.h> 10#include <qpe/config.h>
12#include <qpe/qpeapplication.h> 11#include <qpe/qpeapplication.h>
13 12
14/* QT */ 13/* QT */
15#include <qtextbrowser.h> 14#include <qtextbrowser.h>
16#include <qmessagebox.h> 15#include <qmessagebox.h>
17#include <qtextstream.h> 16#include <qtextstream.h>
18#include <qaction.h> 17#include <qaction.h>
19#include <qpopupmenu.h> 18#include <qpopupmenu.h>
20#include <qfile.h> 19#include <qfile.h>
21#include <qapplication.h>
22#include <qvaluelist.h>
23 20
24AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, 21AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
25 const QString&fsize,int num,const QValueList<int>&path) 22 const QString&fsize,int num,const QValueList<int>&path)
26 : QListViewItem(parent,after),_partNum(num) 23 : QListViewItem(parent,after),_partNum(num)
27{ 24{
28 _path=path; 25 _path=path;
29 setText(0, mime); 26 setText(0, mime);
30 setText(1, desc); 27 setText(1, desc);
31 setText(2, file); 28 setText(2, file);
32 setText(3, fsize); 29 setText(3, fsize);
33} 30}
34 31
diff --git a/noncore/net/mail/viewmailbase.cpp b/noncore/net/mail/viewmailbase.cpp
index 7f1d8a0..c2bf08c 100644
--- a/noncore/net/mail/viewmailbase.cpp
+++ b/noncore/net/mail/viewmailbase.cpp
@@ -1,18 +1,17 @@
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#include <qpopupmenu.h>
7 6
8#include <qpe/qpetoolbar.h> 7#include <qpe/qpetoolbar.h>
9#include <qmenubar.h> 8#include <qmenubar.h>
10#include <qpe/resource.h> 9#include <qpe/resource.h>
11 10
12#include "viewmailbase.h" 11#include "viewmailbase.h"
13//#include "opendiag.h" 12//#include "opendiag.h"
14 13
15ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) 14ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
16 : QMainWindow(parent, name, fl) 15 : QMainWindow(parent, name, fl)
17{ 16{
18 setCaption(tr("E-Mail by %1")); 17 setCaption(tr("E-Mail by %1"));
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp
index b76b397..817936d 100644
--- a/noncore/net/opietooth/applet/bluezapplet.cpp
+++ b/noncore/net/opietooth/applet/bluezapplet.cpp
@@ -21,28 +21,27 @@
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/resource.h>
34#include <qpe/qcopenvelope_qws.h> 33#include <qpe/qcopenvelope_qws.h>
35#include <qpe/resource.h>
36#include <qpe/config.h> 34#include <qpe/config.h>
35#include <qpe/resource.h>
37 36
38#include <opie/odevice.h> 37#include <opie/odevice.h>
39 38
40#include <qpoint.h> 39#include <qpoint.h>
41#include <qpainter.h> 40#include <qpainter.h>
42#include <qlayout.h> 41#include <qlayout.h>
43#include <qframe.h> 42#include <qframe.h>
44#include <qpixmap.h> 43#include <qpixmap.h>
45#include <qstring.h> 44#include <qstring.h>
46#include <qtimer.h> 45#include <qtimer.h>
47#include <qpopupmenu.h> 46#include <qpopupmenu.h>
48 47
diff --git a/noncore/net/opietooth/blue-pin/main.cc b/noncore/net/opietooth/blue-pin/main.cc
index 1b7daec..aa360aa 100644
--- a/noncore/net/opietooth/blue-pin/main.cc
+++ b/noncore/net/opietooth/blue-pin/main.cc
@@ -1,18 +1,17 @@
1#include <stdio.h> 1#include <stdio.h>
2#include <stdlib.h> 2#include <stdlib.h>
3 3
4 4
5#include <qpe/qpeapplication.h> 5#include <qpe/qpeapplication.h>
6#include <qpe/config.h>
7 6
8#include "pindlg.h" 7#include "pindlg.h"
9 8
10 9
11int main( int argc, char* argv[] ) 10int main( int argc, char* argv[] )
12{ 11{
13 if (argc < 2 ) { 12 if (argc < 2 ) {
14 printf("ERR\n"); 13 printf("ERR\n");
15 exit(0); 14 exit(0);
16 } 15 }
17 QCString dir(argv[1] ); 16 QCString dir(argv[1] );
18 QCString bdaddr( argv[2] ); 17 QCString bdaddr( argv[2] );
diff --git a/noncore/net/opietooth/blue-pin/pindlg.cc b/noncore/net/opietooth/blue-pin/pindlg.cc
index 9418a20..f0b2309 100644
--- a/noncore/net/opietooth/blue-pin/pindlg.cc
+++ b/noncore/net/opietooth/blue-pin/pindlg.cc
@@ -1,24 +1,23 @@
1 1
2#include "pindlg.h" 2#include "pindlg.h"
3 3
4/* OPIE */ 4/* OPIE */
5#include <qpe/config.h> 5#include <qpe/config.h>
6#include <qpe/qpeapplication.h> 6#include <qpe/qpeapplication.h>
7 7
8/* QT */ 8/* QT */
9#include <qcheckbox.h> 9#include <qcheckbox.h>
10#include <qlabel.h> 10#include <qlabel.h>
11#include <qlineedit.h> 11#include <qlineedit.h>
12#include <qtimer.h>
13 12
14/* STD */ 13/* STD */
15#include <stdio.h> 14#include <stdio.h>
16 15
17using namespace OpieTooth; 16using namespace OpieTooth;
18 17
19PinDlg::PinDlg( const QString& status, 18PinDlg::PinDlg( const QString& status,
20 const QString& mac, QWidget* parent, 19 const QString& mac, QWidget* parent,
21 const char* name ) 20 const char* name )
22 : PinDlgBase( parent, name, WType_Modal ) 21 : PinDlgBase( parent, name, WType_Modal )
23{ 22{
24 m_mac = mac; 23 m_mac = mac;
diff --git a/noncore/net/opietooth/manager/bticonloader.cpp b/noncore/net/opietooth/manager/bticonloader.cpp
index e5d8092..6bac256 100644
--- a/noncore/net/opietooth/manager/bticonloader.cpp
+++ b/noncore/net/opietooth/manager/bticonloader.cpp
@@ -1,16 +1,15 @@
1 1
2#include "bticonloader.h" 2#include "bticonloader.h"
3 3
4#include <qpixmap.h>
5#include <qpe/resource.h> 4#include <qpe/resource.h>
6 5
7namespace OpieTooth { 6namespace OpieTooth {
8 7
9 8
10 BTIconLoader::BTIconLoader() { 9 BTIconLoader::BTIconLoader() {
11 10
12 // still need to find out real ids 11 // still need to find out real ids
13 deviceIcons.insert( 100 , "computer_16" ); 12 deviceIcons.insert( 100 , "computer_16" );
14 deviceIcons.insert( 101 , "phone_16" ); 13 deviceIcons.insert( 101 , "phone_16" );
15 deviceIcons.insert( 102 , "brain_16" ); 14 deviceIcons.insert( 102 , "brain_16" );
16 deviceIcons.insert( 103 , "conduit_16" ); 15 deviceIcons.insert( 103 , "conduit_16" );
diff --git a/noncore/net/opietooth/manager/btserviceitem.cpp b/noncore/net/opietooth/manager/btserviceitem.cpp
index 7db93c9..fb5f21e 100644
--- a/noncore/net/opietooth/manager/btserviceitem.cpp
+++ b/noncore/net/opietooth/manager/btserviceitem.cpp
@@ -1,14 +1,13 @@
1 1
2#include <qobject.h>
3#include "btserviceitem.h" 2#include "btserviceitem.h"
4 3
5using namespace OpieTooth; 4using namespace OpieTooth;
6 5
7BTServiceItem::BTServiceItem( QListViewItem* item, const Services& serv ) 6BTServiceItem::BTServiceItem( QListViewItem* item, const Services& serv )
8 : BTListItem( item ) { 7 : BTListItem( item ) {
9 m_service = serv; 8 m_service = serv;
10 setText(0, QObject::tr(serv.serviceName() ) ); 9 setText(0, QObject::tr(serv.serviceName() ) );
11} 10}
12BTServiceItem::~BTServiceItem() { 11BTServiceItem::~BTServiceItem() {
13 12
14} 13}
diff --git a/noncore/net/opietooth/manager/hciconfwrapper.cpp b/noncore/net/opietooth/manager/hciconfwrapper.cpp
index 46eed42..35e9cd9 100644
--- a/noncore/net/opietooth/manager/hciconfwrapper.cpp
+++ b/noncore/net/opietooth/manager/hciconfwrapper.cpp
@@ -1,17 +1,16 @@
1#include "hciconfwrapper.h" 1#include "hciconfwrapper.h"
2 2
3#include <qfile.h> 3#include <qfile.h>
4#include <qtextstream.h> 4#include <qtextstream.h>
5#include <qstringlist.h>
6#include <qregexp.h> 5#include <qregexp.h>
7 6
8namespace OpieTooth { 7namespace OpieTooth {
9 8
10 9
11 HciConfWrapper::HciConfWrapper( const QString &fileName) { 10 HciConfWrapper::HciConfWrapper( const QString &fileName) {
12 m_fileName = fileName; 11 m_fileName = fileName;
13 } 12 }
14 13
15 HciConfWrapper::~HciConfWrapper() { 14 HciConfWrapper::~HciConfWrapper() {
16 } 15 }
17 16
diff --git a/noncore/net/opietooth/manager/rfcommassigndialogitem.cpp b/noncore/net/opietooth/manager/rfcommassigndialogitem.cpp
index 1e7130f..a41f304 100644
--- a/noncore/net/opietooth/manager/rfcommassigndialogitem.cpp
+++ b/noncore/net/opietooth/manager/rfcommassigndialogitem.cpp
@@ -1,18 +1,17 @@
1 1
2#include "rfcommassigndialogitem.h" 2#include "rfcommassigndialogitem.h"
3 3
4#include <qlineedit.h> 4#include <qlineedit.h>
5#include <qcombobox.h> 5#include <qcombobox.h>
6#include <qlabel.h>
7#include <qgroupbox.h> 6#include <qgroupbox.h>
8 7
9using namespace OpieTooth; 8using namespace OpieTooth;
10 9
11 10
12RfcommDialogItem::RfcommDialogItem( QWidget* parent, const char* name, WFlags fl ) 11RfcommDialogItem::RfcommDialogItem( QWidget* parent, const char* name, WFlags fl )
13 : RfcommDialogItemBase( parent, name, fl ) { 12 : RfcommDialogItemBase( parent, name, fl ) {
14 13
15} 14}
16 15
17RfcommDialogItem::~RfcommDialogItem() { 16RfcommDialogItem::~RfcommDialogItem() {
18} 17}
diff --git a/noncore/net/wellenreiter/gui/protolistview.cpp b/noncore/net/wellenreiter/gui/protolistview.cpp
index daca095..ed22bdd 100644
--- a/noncore/net/wellenreiter/gui/protolistview.cpp
+++ b/noncore/net/wellenreiter/gui/protolistview.cpp
@@ -9,30 +9,26 @@
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/* LOCAL */ 16/* LOCAL */
17#include "protolistview.h" 17#include "protolistview.h"
18 18
19#include <qcheckbox.h> 19#include <qcheckbox.h>
20#include <qcombobox.h> 20#include <qcombobox.h>
21#include <qhbox.h>
22#include <qvbox.h> 21#include <qvbox.h>
23#include <qpalette.h>
24#include <qcolor.h>
25#include <qlabel.h> 22#include <qlabel.h>
26#include <qframe.h>
27 23
28ProtocolListView::ProtocolListView( QWidget* parent, const char* name, WFlags f ) 24ProtocolListView::ProtocolListView( QWidget* parent, const char* name, WFlags f )
29 :QScrollView( parent, name, f ) 25 :QScrollView( parent, name, f )
30{ 26{
31 parse = ( QString( "parsePackets" ) == QString( name ) ); 27 parse = ( QString( "parsePackets" ) == QString( name ) );
32 28
33 setMargins( 3, 3, 0, 0 ); 29 setMargins( 3, 3, 0, 0 );
34 viewport()->setBackgroundColor( QCheckBox(0).palette().color( QPalette::Active, QColorGroup::Background ) ); 30 viewport()->setBackgroundColor( QCheckBox(0).palette().color( QPalette::Active, QColorGroup::Background ) );
35 31
36 vbox = new QVBox( viewport() ); 32 vbox = new QVBox( viewport() );
37 vbox->setSpacing( 1 ); 33 vbox->setSpacing( 1 );
38 addChild( vbox ); 34 addChild( vbox );
diff --git a/noncore/net/wellenreiter/gui/resource.cpp b/noncore/net/wellenreiter/gui/resource.cpp
index a39bbcc..5e5ddc6 100644
--- a/noncore/net/wellenreiter/gui/resource.cpp
+++ b/noncore/net/wellenreiter/gui/resource.cpp
@@ -8,25 +8,24 @@
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 "resource.h" 16#include "resource.h"
17 17
18#define PIXMAPPATH "/usr/local/share" 18#define PIXMAPPATH "/usr/local/share"
19 19
20#include <qpixmap.h>
21#include <qiconset.h> 20#include <qiconset.h>
22 21
23namespace Resource 22namespace Resource
24{ 23{
25 24
26QPixmap loadPixmap( const QString& pix ) 25QPixmap loadPixmap( const QString& pix )
27{ 26{
28 QString filename; 27 QString filename;
29 filename.sprintf( "%s/%s.png", (const char*) PIXMAPPATH, (const char*) pix ); 28 filename.sprintf( "%s/%s.png", (const char*) PIXMAPPATH, (const char*) pix );
30 QPixmap pixmap( filename ); 29 QPixmap pixmap( filename );
31 if ( pixmap.isNull() ) 30 if ( pixmap.isNull() )
32 { 31 {
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index b42f1df..c75f9b1 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -11,25 +11,24 @@
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 "scanlist.h" 16#include "scanlist.h"
17#include "configwindow.h" 17#include "configwindow.h"
18#include "logwindow.h" 18#include "logwindow.h"
19 19
20#include <assert.h> 20#include <assert.h>
21#include <qcursor.h> 21#include <qcursor.h>
22#include <qdatetime.h> 22#include <qdatetime.h>
23#include <qtextstream.h>
24#include <qpopupmenu.h> 23#include <qpopupmenu.h>
25#include <qcheckbox.h> 24#include <qcheckbox.h>
26 25
27#ifdef QWS 26#ifdef QWS
28#include <qpe/qpeapplication.h> 27#include <qpe/qpeapplication.h>
29#endif 28#endif
30 29
31#ifdef QWS 30#ifdef QWS
32#include <qpe/resource.h> 31#include <qpe/resource.h>
33#else 32#else
34#include "resource.h" 33#include "resource.h"
35#endif 34#endif
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
index c2413dc..b8b6730 100644
--- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
@@ -6,35 +6,26 @@
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 "wellenreiterbase.h" 16#include "wellenreiterbase.h"
17 17
18#include <qheader.h>
19#include <qlabel.h> 18#include <qlabel.h>
20#include <qlistview.h>
21#include <qmultilineedit.h>
22#include <qpushbutton.h>
23#include <qlayout.h> 19#include <qlayout.h>
24#include <qvariant.h>
25#include <qtooltip.h>
26#include <qwhatsthis.h>
27#include <qimage.h>
28#include <qpixmap.h>
29 20
30#include "logwindow.h" 21#include "logwindow.h"
31#include "hexwindow.h" 22#include "hexwindow.h"
32#include "scanlist.h" 23#include "scanlist.h"
33#include "statwindow.h" 24#include "statwindow.h"
34#include "graphwindow.h" 25#include "graphwindow.h"
35 26
36#ifdef QWS 27#ifdef QWS
37#include <qpe/resource.h> 28#include <qpe/resource.h>
38#include <opie2/otabwidget.h> 29#include <opie2/otabwidget.h>
39using namespace Opie; 30using namespace Opie;
40#else 31#else