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,36 +1,35 @@
 
 #include "accountitem.h"
 #include "accountview.h"
-#include "selectstore.h"
 #include "newmaildir.h"
 #include "defines.h"
 
 /* OPIE */
 #include <libmailwrapper/mailtypes.h>
 #include <libmailwrapper/abstractmail.h>
 #include <libmailwrapper/mailwrapper.h>
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qpopupmenu.h>
 #include <qmessagebox.h>
 
 #define SETPIX(x) if (!account->getOffline()) {setPixmap( 0,x);} else {setPixmap( 0, PIXMAP_OFFLINE );}
 /**
  * POP3 Account stuff
  */
 POP3viewItem::POP3viewItem( POP3account *a, AccountView *parent )
         : AccountViewItem( parent )
 {
     account = a;
     wrapper = AbstractMail::getWrapper( account );
     SETPIX(PIXMAP_POP3FOLDER);
 #if 0
     if (!account->getOffline())
     {
         setPixmap( 0,  );
     }
     else
     {
         setPixmap( 0, PIXMAP_OFFLINE );
     }
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,47 +1,45 @@
 
 #include "composemail.h"
 
 /* OPIE */
 #include <opie2/ocontactaccess.h>
 #include <opie2/opimcontact.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qpushbutton.h>
 #include <qmessagebox.h>
-#include <qtextstream.h>
 #include <qlistbox.h>
-#include <qfile.h>
 
 /* STD */
 #include <stdlib.h>
 
 AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFlags flags )
         : AddressPickerUI( parent, name, modal, flags )
 {
     okButton->setIconSet( Resource::loadPixmap( "enter" ) );
     cancelButton->setIconSet( Resource::loadPixmap( "editdelete" ) );
 
     connect(okButton, SIGNAL(clicked()), SLOT(accept()));
     connect(cancelButton, SIGNAL(clicked()), SLOT(close()));
     Opie::OPimContactAccess::List::Iterator it;
 
     QString lineEmail, lineName, contactLine;
     /* what name has to set here???? */
     Opie::OPimContactAccess m_contactdb("opiemail");
 
     QStringList mails;
     QString pre,suf;
     Opie::OPimContactAccess::List m_list = m_contactdb.sorted( true, 0, 0, 0 );
     for ( it = m_list.begin(); it != m_list.end(); ++it )
     {
         if ((*it).defaultEmail().length()!=0)
         {
             mails = (*it).emailList();
             if ((*it).fileAs().length()>0)
             {
                 pre = "\""+(*it).firstName()+" "+(*it).lastName()+"\" <";
                 suf = ">";
             }
             else
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,41 +1,39 @@
 #include "abstractmail.h"
 #include "imapwrapper.h"
 #include "pop3wrapper.h"
 #include "nntpwrapper.h"
 #include "mhwrapper.h"
-#include "mboxwrapper.h"
 #include "mailtypes.h"
 
-#include <qstring.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <stdlib.h>
 #include <libetpan/mailmime_content.h>
 #include <libetpan/mailmime.h>
 
 AbstractMail* AbstractMail::getWrapper(IMAPaccount *a)
 {
     return new IMAPwrapper(a);
 }
 
 AbstractMail* AbstractMail::getWrapper(POP3account *a)
 {
     return new POP3wrapper(a);
 }
 
 AbstractMail* AbstractMail::getWrapper(NNTPaccount *a)
 {
     return new NNTPwrapper(a);
 }
 
 AbstractMail* AbstractMail::getWrapper(const QString&a,const QString&name)
 {
     return new MHwrapper(a,name);
 }
 
 encodedString* AbstractMail::decode_String(const encodedString*text,const QString&enc)
 {
     qDebug("Decode string start");
     char*result_text;
     size_t index = 0;
     /* reset for recursive use! */
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,36 +1,35 @@
 #include "sendmailprogress.h"
 #include <qprogressbar.h>
 #include <qlabel.h>
-#include <qstring.h>
 
 progressMailSend::progressMailSend(QWidget*parent, const char * name)
     :progressMailSendUI(parent,name,true),m_current_mail(0),m_current_single(0),m_max_mail(0),m_max_single(0)
 {
 }
 
 progressMailSend::~progressMailSend()
 {
 }
 
 void progressMailSend::setMaxMails(unsigned int aMaxMails)
 {
     m_max_mail = aMaxMails;
     allMailProgressBar->setTotalSteps(aMaxMails);
     setMails();
 }
 
 void progressMailSend::setCurrentMails(unsigned int aCurrent)
 {
     m_current_mail = aCurrent;
     allMailProgressBar->setProgress(aCurrent);
     setMails();
 }
     
 void progressMailSend::setSingleMail(unsigned int aCurrent,unsigned int aMax)
 {
     m_current_single = aCurrent;
     m_max_single = aMax;
     setSingle();
 }
 
 void progressMailSend::setSingle()
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,41 +1,39 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
-#include <qdir.h>
 #include <qt.h>
-#include <qmessagebox.h>
 
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <libetpan/libetpan.h>
 
 #include "smtpwrapper.h"
 #include "mailwrapper.h"
 #include "abstractmail.h"
 #include "logindialog.h"
 #include "mailtypes.h"
 #include "sendmailprogress.h"
 
 const char* SMTPwrapper::USER_AGENT="OpieMail v0.4";
 
 progressMailSend*SMTPwrapper::sendProgress = 0;
 
 SMTPwrapper::SMTPwrapper(SMTPaccount * aSmtp )
     : QObject()
 {
     m_SmtpAccount = aSmtp;
     Config cfg( "mail" );
     cfg.setGroup( "Status" );
     m_queuedMail =  cfg.readNumEntry( "outgoing", 0 );
     emit queuedMails( m_queuedMail );
     connect( this, SIGNAL( queuedMails(int) ), this, SLOT( emitQCop(int) )  );
     m_smtp = 0;
 }
 
 SMTPwrapper::~SMTPwrapper()
 {
     disc_server();
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,34 +1,33 @@
 #include "statusmail.h"
-#include <qlist.h>
 
 StatusMail::StatusMail(QList<Account>&list)
 {
     currentImapStat.message_count=0;
     currentImapStat.message_unseen=0;
     currentImapStat.message_recent=0;
     lastPop3Stat = currentImapStat;
     currentPop3Stat = currentImapStat;
     connectionList.setAutoDelete(true);
     connectionList.clear();
     initAccounts(list);
 }
 
 StatusMail::~StatusMail()
 {
 }
 
 void StatusMail::initAccounts(QList<Account>&accounts)
 {
 
     Account *it;
     folderStat currentStat;
     AbstractMail * current = 0;
     currentPop3Stat.message_count=0;
     currentPop3Stat.message_recent=0;
     currentPop3Stat.message_unseen=0;
     for ( it = accounts.first(); it; it = accounts.next() ) {
         if ( it->getType().compare( "IMAP" ) == 0 && !it->getOffline() ) {
             IMAPaccount*ima = static_cast<IMAPaccount *>(it);
             current = AbstractMail::getWrapper(ima);
             connectionList.append(current);
             current->statusFolder(currentStat);
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,41 +1,39 @@
 #include <qlabel.h>
 #include <qvbox.h>
 #include <qheader.h>
 #include <qtimer.h>
 #include <qlayout.h>
-#include <qmessagebox.h>
 
 #include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
 
 #include "defines.h"
 #include "mainwindow.h"
 
 
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     : QMainWindow( parent, name, flags )
 {
 
     setCaption( tr( "Mail" ) );
     setToolBarsMovable( false );
 
     toolBar = new QToolBar( this );
     menuBar = new QMenuBar( toolBar );
     mailMenu = new QPopupMenu( menuBar );
     menuBar->insertItem( tr( "Mail" ), mailMenu );
     settingsMenu = new QPopupMenu( menuBar );
     menuBar->insertItem( tr( "Settings" ), settingsMenu );
 
     addToolBar( toolBar );
     toolBar->setHorizontalStretchable( true );
 
     QLabel *spacer = new QLabel( toolBar );
     spacer->setBackgroundMode( QWidget::PaletteButton );
     toolBar->setStretchableWidget( spacer );
 
     composeMail = new QAction( tr( "Compose new mail" ), ICON_COMPOSEMAIL,
                                0, 0, this );
     composeMail->addTo( toolBar );
     composeMail->addTo( mailMenu );
 
     sendQueued = new QAction( tr( "Send queued mails" ), ICON_SENDQUEUED,
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,35 +1,33 @@
 #include "newmaildir.h"
-#include <qdialog.h>
-#include <qvariant.h>
 #include <qlineedit.h>
 #include <qcheckbox.h>
 
 Newmdirdlg::Newmdirdlg( QWidget* parent, const char* name,bool no_sub)
     : Newmdirdlgui(parent,name,true),ndir(""),possible_subs(false)
 {
     if (no_sub) {
         subdirsPossibleBox->setChecked(false);
         subdirsPossibleBox->hide();
     }
 }
 
 Newmdirdlg::~Newmdirdlg()
 {
 }
 
 void Newmdirdlg::accept()
 {
     ndir = dirnameEdit->text();
     possible_subs = subdirsPossibleBox->isChecked();
     if (ndir.isEmpty()) {
         return;
     }
     Newmdirdlgui::accept();
 }
 
 const QString&Newmdirdlg::Newdir()const
 {
     return ndir;
 }
 
 const bool Newmdirdlg::subpossible()const
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
@@ -1,54 +1,50 @@
 
 #include "settingsdialog.h"
 #include "opiemail.h"
 #include "editaccounts.h"
 #include "composemail.h"
 #include "mailistviewitem.h"
 #include "viewmail.h"
 #include "selectstore.h"
 #include "selectsmtp.h"
 
 /* OPIE */
 #include <libmailwrapper/smtpwrapper.h>
 #include <libmailwrapper/mailtypes.h>
 #include <libmailwrapper/abstractmail.h>
-#include <qpe/qcopenvelope_qws.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 
 /* QT */
-#include <qmessagebox.h>
-#include <qaction.h>
-#include <qapplication.h>
 
 OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags )
         : MainWindow( parent, name, WStyle_ContextHelp )
 {
     settings = new Settings();
 
     folderView->populate( settings->getAccounts() );
 }
 
 OpieMail::~OpieMail()
 {
     if (settings) delete settings;
 }
 
 void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
 {
     // copied from old mail2
     if (msg == "writeMail(QString,QString)")
     {
         QDataStream stream(data,IO_ReadOnly);
         QString name, email;
         stream >> name >> email;
         // removing the whitespaces at beginning and end is needed!
         slotwriteMail(name.stripWhiteSpace(),email.stripWhiteSpace());
     }
     else if (msg == "newMail()")
     {
         slotComposeMail();
     }
 }
 
 void OpieMail::slotwriteMail(const QString&name,const QString&email)
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,41 +1,34 @@
 #include "selectsmtp.h"
 #include <libmailwrapper/mailwrapper.h>
-#include <qlist.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
-#include <qframe.h>
-#include <qlineedit.h>
-#include <qcombobox.h>
 
 selectsmtp::selectsmtp(QWidget* parent, const char* name, bool modal, WFlags fl)
     : selectstoreui(parent,name,modal,fl)
 {
     //m_smtpList.setAutoDelete(false);
     m_smtpList = 0;
     //headlabel->setText(tr("<center>Select SMTP account to use</center>"));
     headlabel->hide();
     folderSelection->hide();
     folderLabel->hide();
     accountlabel->setText("<center>SMTP Accounts</center>");
     Line1->hide();
     newFoldersel->hide();
     newFolderedit->hide();
     newFolderLabel->hide();
     Line2->hide();
     selMove->hide();
     m_current_smtp = 0;
     setCaption(tr("Select SMTP Account"));
 }
 
 selectsmtp::~selectsmtp()
 {
 }
 
 void selectsmtp::slotAccountselected(int which)
 {
     if (!m_smtpList || (unsigned)which>=m_smtpList->count() || which < 0) {
         m_current_smtp = 0;
         return;
     }
     m_current_smtp = m_smtpList->at(which);
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,54 +1,51 @@
 #include "composemail.h"
 #include "viewmail.h"
-#include "accountview.h"
 
 /* OPIE */
 #include <libmailwrapper/settings.h>
 #include <libmailwrapper/abstractmail.h>
 #include <libmailwrapper/mailtypes.h>
 
 #include <opie2/ofiledialog.h>
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qtextbrowser.h>
 #include <qmessagebox.h>
 #include <qtextstream.h>
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qfile.h>
-#include <qapplication.h>
-#include <qvaluelist.h>
 
 AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
                        const QString&fsize,int num,const QValueList<int>&path)
         : QListViewItem(parent,after),_partNum(num)
 {
     _path=path;
     setText(0, mime);
     setText(1, desc);
     setText(2, file);
     setText(3, fsize);
 }
 
 AttachItem::AttachItem(QListViewItem * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
                        const QString&fsize,int num,const QValueList<int>&path)
         : QListViewItem(parent,after),_partNum(num)
 {
     _path=path;
     setText(0, mime);
     setText(1, desc);
     setText(2, file);
     setText(3, fsize);
 }
 
 bool AttachItem::isParentof(const QValueList<int>&path)
 {
     /* if not set, then no parent */
     if (path.count()==0||_path.count()==0) return false;
     /* the parent must have one digit less then a child */
     if (path.count()!=_path.count()+1) return false;
     for (unsigned int i=0; i < _path.count();++i)
     {
         if (_path[i]!=path[i]) return false;
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,38 +1,37 @@
 #include <qtextbrowser.h>
 #include <qlistview.h>
 #include <qaction.h>
 #include <qlabel.h>
 #include <qvbox.h>
-#include <qpopupmenu.h>
 
 #include <qpe/qpetoolbar.h>
 #include <qmenubar.h>
 #include <qpe/resource.h>
 
 #include "viewmailbase.h"
 //#include "opendiag.h"
 
 ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
         : QMainWindow(parent, name, fl)
 {
         setCaption(tr("E-Mail by %1"));
         setToolBarsMovable(false);
 
         toolbar = new QToolBar(this);
   menubar = new QMenuBar( toolbar );
   mailmenu = new QPopupMenu( menubar );
   menubar->insertItem( tr( "Mail" ), mailmenu );
 
         toolbar->setHorizontalStretchable(true);
         addToolBar(toolbar);
 
         QLabel *spacer = new QLabel(toolbar);
         spacer->setBackgroundMode(QWidget::PaletteButton);
         toolbar->setStretchableWidget(spacer);
 
         reply = new QAction(tr("Reply"), QIconSet(Resource::loadPixmap("mail/reply")), 0, 0, this);
         reply->addTo(toolbar);
          reply->addTo(mailmenu);
 
         forward = new QAction(tr("Forward"), QIconSet(Resource::loadPixmap("mail/forward")), 0, 0, this);
         forward->addTo(toolbar);
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
@@ -1,68 +1,67 @@
 /*
                =.            This file is part of the OPIE Project
              .=l.            Copyright (c)  2002 Maximilian Reiss <max.reiss@gmx.de>
            .>+-=
  _;:,     .>    :=|.         This library is free software; you can
 .> <,   >  .   <=          redistribute it and/or  modify it under
 :=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%+i>       _;_.
     .i_,=:_.      -<s.       This library is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 
 #include "bluezapplet.h"
 #include <qapplication.h>
 
-#include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
-#include <qpe/resource.h>
 #include <qpe/config.h>
+#include <qpe/resource.h>
 
 #include <opie/odevice.h>
 
 #include <qpoint.h>
 #include <qpainter.h>
 #include <qlayout.h>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qstring.h>
 #include <qtimer.h>
 #include <qpopupmenu.h>
 
 #include <device.h>
 
 using namespace Opie;
 
 namespace OpieTooth {
 
     BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) {
         setFixedHeight( 18 );
         setFixedWidth( 14 );
         bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" );
         bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" );
         //    bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass" );
         startTimer(4000);
         btDevice = 0;
         bluezactive = false;
         bluezDiscoveryActive = false;
 
     }
 
     BluezApplet::~BluezApplet() {
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,38 +1,37 @@
 #include <stdio.h>
 #include <stdlib.h>
 
 
 #include <qpe/qpeapplication.h>
-#include <qpe/config.h>
 
 #include "pindlg.h"
 
 
 int main( int argc, char* argv[] )
 {
     if (argc < 2 ) {
         printf("ERR\n");
         exit(0);
     }
     QCString dir(argv[1] );
     QCString bdaddr( argv[2] );
     QCString name;
     if ( argc > 3 ) {
         name = argv[3];
     }
     QPEApplication a(argc, argv );
     QString status;
     if (dir == "out" ) {
         status = QObject::tr("Outgoing connection to ");
     }else
         status = QObject::tr("Incoming connection from ");
     status += name;
     status += "<br>";
     status += "[" + bdaddr + "]";
     OpieTooth::PinDlg dlg( status, bdaddr );
     if ( dlg.exec() ) {
         printf("PIN:%s\n",  dlg.pin().stripWhiteSpace().latin1() );
     }else
         printf("ERR\n");
     return 0;
 }
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,44 +1,43 @@
 
 #include "pindlg.h"
 
 /* OPIE */
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlineedit.h>
-#include <qtimer.h>
 
 /* STD */
 #include <stdio.h>
 
 using namespace OpieTooth;
 
 PinDlg::PinDlg( const QString& status,
                 const QString& mac, QWidget* parent,
                 const char* name )
         : PinDlgBase( parent, name, WType_Modal )
 {
     m_mac = mac;
     test( mac );
     txtStatus->setText(status);
     QPEApplication::showDialog( this );
 }
 
 PinDlg::~PinDlg()
 {}
 void PinDlg::setMac( const QString& mac )
 {
     txtStatus->setText( mac );
 }
 QString PinDlg::pin() const
 {
     return lnePin->text();
 }
 
 void PinDlg::test( const QString& mac )
 {
     if (!mac.isEmpty() )
     {
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,36 +1,35 @@
 
 #include "bticonloader.h"
 
-#include <qpixmap.h>
 #include <qpe/resource.h>
 
 namespace OpieTooth {
 
 
     BTIconLoader::BTIconLoader() {
 
         // still need to find out real ids
         deviceIcons.insert( 100 , "computer_16" );
         deviceIcons.insert( 101 , "phone_16" );
         deviceIcons.insert( 102 , "brain_16" );
         deviceIcons.insert( 103 , "conduit_16" );
 
 
         serviceIcons.insert( 4357 , "obex_16" ); //OBEXObjectPush
         serviceIcons.insert( 4358 , "obex_16" ); //OBEXFileTransfer
         serviceIcons.insert( 4369 , "print_16" ); //Fax
         serviceIcons.insert( 4353 , "serial_16" ); //SerialPort
         serviceIcons.insert( 4356 , "sync_16" ); //IrMCSync
         serviceIcons.insert( 4359 , "sync_16" ); //IrMCSyncCommand
         serviceIcons.insert( 4354 , "network_16" ); //LANAccessUsingPPP
         serviceIcons.insert( 4355 , "network_16"); //DialupNetworking
         serviceIcons.insert( 4360 , "phone_16"); // Headset
         serviceIcons.insert( 4370 , "audio_16");  //HeadsetAudioGateway
         serviceIcons.insert( 4374 , "network_16"); // Network Access Point
         serviceIcons.insert( 4361 , "phone_16"); // CordlessTelephony
         serviceIcons.insert( 4362 , "audio_16"); // AudioSource
         serviceIcons.insert( 4363 , "audio_16"); // AudioSink
         serviceIcons.insert( 4390 , "print_16" ); //HCR_Print
         serviceIcons.insert( 4392 , "phone_16" ); //Common_ISDN_Access
 
         serviceIcons.insert( 4609 , "network_16" );  //GenericNetworking
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,26 +1,25 @@
 
-#include <qobject.h>
 #include "btserviceitem.h"
 
 using namespace OpieTooth;
 
 BTServiceItem::BTServiceItem( QListViewItem* item,  const Services& serv )
     : BTListItem( item ) {
     m_service = serv;
     setText(0, QObject::tr(serv.serviceName() ) );
 }
 BTServiceItem::~BTServiceItem() {
 
 }
 QString BTServiceItem::type() const {
     return QString::fromLatin1("service");
 }
 int BTServiceItem::typeId() const {
     return Service;
 }
 Services BTServiceItem::services() const {
     return m_service;
 }
 int BTServiceItem::serviceId() const {
     return m_service.recHandle();
 };
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,37 +1,36 @@
 #include "hciconfwrapper.h"
 
 #include <qfile.h>
 #include <qtextstream.h>
-#include <qstringlist.h>
 #include <qregexp.h>
 
 namespace OpieTooth {
 
 
     HciConfWrapper::HciConfWrapper( const QString &fileName) {
         m_fileName = fileName;
     }
 
     HciConfWrapper::~HciConfWrapper() {
     }
 
 
     void HciConfWrapper::setPinHelper( const QString& app  ) {
         setValue( "pin_helper"  , app  );
     }
 
     void HciConfWrapper::setName( const QString &name ) {
         qDebug ("NAME : " + name);
         setValue( "name" , "\"" +  name + "\"" );
     }
 
     void HciConfWrapper::setIscan( bool enable) {
 
         if ( enable ) {
             setValue( "iscan" , "enable" );
         } else {
             setValue( "iscan" , "disable" );
         }
     }
 
     void HciConfWrapper::setPscan( bool enable) {
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,38 +1,37 @@
 
 #include "rfcommassigndialogitem.h"
 
 #include <qlineedit.h>
 #include <qcombobox.h>
-#include <qlabel.h>
 #include <qgroupbox.h>
 
 using namespace OpieTooth;
 
 
 RfcommDialogItem::RfcommDialogItem( QWidget* parent,  const char* name, WFlags fl )
     : RfcommDialogItemBase( parent, name, fl ) {
 
 }
 
 RfcommDialogItem::~RfcommDialogItem()  {
 }
 
 
 int RfcommDialogItem::ident()  {
     return m_ident;
 }
 
 QString RfcommDialogItem::mac()  {
     return m_macAddress->text();
 }
 
 int RfcommDialogItem::channel()  {
     return m_channelDropdown->currentItem();
 }
 
 QString RfcommDialogItem::comment()  {
     return m_commentLine->text();
 }
 
 void RfcommDialogItem::setIdent( int ident )  {
     m_ident = ident;
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
@@ -1,58 +1,54 @@
 /**********************************************************************
 ** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Opie Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 /* LOCAL */
 #include "protolistview.h"
 
 #include <qcheckbox.h>
 #include <qcombobox.h>
-#include <qhbox.h>
 #include <qvbox.h>
-#include <qpalette.h>
-#include <qcolor.h>
 #include <qlabel.h>
-#include <qframe.h>
 
 ProtocolListView::ProtocolListView( QWidget* parent, const char* name, WFlags f )
                  :QScrollView( parent, name, f )
 {
     parse = ( QString( "parsePackets" ) == QString( name ) );
 
     setMargins( 3, 3, 0, 0 );
     viewport()->setBackgroundColor( QCheckBox(0).palette().color( QPalette::Active, QColorGroup::Background ) );
 
     vbox = new QVBox( viewport() );
     vbox->setSpacing( 1 );
     addChild( vbox );
 
     QHBox* hbox = new QHBox( vbox );
     hbox->setSpacing( 40 );
     new QLabel( tr( "Protocol Family" ), hbox );
     new QLabel( tr( "Perform Action" ), hbox );
     QFrame* frame = new QFrame( vbox );
     frame->setFrameStyle( QFrame::HLine + QFrame::Sunken );
 
     //TODO: hardcoded for now...a protocol database would be nice!?
 
     //addProtocol(  "Ethernet" );
     addProtocol(  "Prism" );
     //addProtocol(  "802.11" );
     addProtocol(  "802.11 Management" );
     addProtocol(  "802.11 SSID" );
     addProtocol(  "802.11 Rates" );
     addProtocol(  "802.11 CF" );
     addProtocol(  "802.11 FH" );
     addProtocol(  "802.11 DS" );
     addProtocol(  "802.11 Tim" );
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
@@ -1,50 +1,49 @@
 /**********************************************************************
 ** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Opie Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "resource.h"
 
 #define PIXMAPPATH "/usr/local/share"
 
-#include <qpixmap.h>
 #include <qiconset.h>
 
 namespace Resource
 {
 
 QPixmap loadPixmap( const QString& pix )
 {
     QString filename;
     filename.sprintf( "%s/%s.png", (const char*) PIXMAPPATH, (const char*) pix );
     QPixmap pixmap( filename );
     if ( pixmap.isNull() )
     {
         qDebug( "Wellenreiter::Resource: can't find pixmap " + filename );
     }
     return pixmap;
 };
 
 QIconSet loadIconSet( const QString& pix )
 {
     QString filename;
     filename.sprintf( "%s/%s.png", (const char*) PIXMAPPATH, (const char*) pix );
     QPixmap pixmap( filename );
     if ( pixmap.isNull() )
     {
         qDebug( "Wellenreiter::Resource: can't find pixmap " + filename );
     }
     return QIconSet( pixmap );
 };
 
 };
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
@@ -1,55 +1,54 @@
 /**********************************************************************
 ** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Opie Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "scanlist.h"
 #include "configwindow.h"
 #include "logwindow.h"
 
 #include <assert.h>
 #include <qcursor.h>
 #include <qdatetime.h>
-#include <qtextstream.h>
 #include <qpopupmenu.h>
 #include <qcheckbox.h>
 
 #ifdef QWS
 #include <qpe/qpeapplication.h>
 #endif
 
 #ifdef QWS
 #include <qpe/resource.h>
 #else
 #include "resource.h"
 #endif
 
 const int col_type = 0;
 const int col_essid = 0;
 const int col_sig = 1;
 const int col_ap = 2;
 const int col_channel = 3;
 const int col_wep = 4;
 const int col_traffic = 5;
 const int col_ip = 6;
 const int col_manuf = 7;
 const int col_firstseen = 8;
 const int col_lastseen = 9;
 const int col_location = 10;
 
 MScanListView::MScanListView( QWidget* parent, const char* name )
               :OListView( parent, name )
 {
 
     setFrameShape( QListView::StyledPanel );
     setFrameShadow( QListView::Sunken );
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
@@ -1,60 +1,51 @@
 /**********************************************************************
 ** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
 **
 ** This file is part of Opie Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ***********************************************************************/
 
 #include "wellenreiterbase.h"
 
-#include <qheader.h>
 #include <qlabel.h>
-#include <qlistview.h>
-#include <qmultilineedit.h>
-#include <qpushbutton.h>
 #include <qlayout.h>
-#include <qvariant.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qimage.h>
-#include <qpixmap.h>
 
 #include "logwindow.h"
 #include "hexwindow.h"
 #include "scanlist.h"
 #include "statwindow.h"
 #include "graphwindow.h"
 
 #ifdef QWS
 #include <qpe/resource.h>
 #include <opie2/otabwidget.h>
 using namespace Opie;
 #else
 #include "resource.h"
 #include <qtabwidget.h>
 #endif
 
 
 /*
  *  Constructs a WellenreiterBase which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f' 
  */
 WellenreiterBase::WellenreiterBase( QWidget* parent,  const char* name, WFlags fl )
     : QWidget( parent, name, fl )
 {
     //ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) );
     //ani2 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot90" ) );
     //ani3 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot180" ) );
     //ani4 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot270" ) );
     
     if ( !name )
         setName( "WellenreiterBase" );
     resize( 191, 294 );