less includes

3 files changed, 0 insertions, 3 deletions

diff --git a/core/settings/button/buttonsettings.cpp b/core/settings/button/buttonsettings.cpp
index b6a07a8..523e295 100644
--- a/core/settings/button/buttonsettings.cpp
+++ b/core/settings/button/buttonsettings.cpp
@@ -1,128 +1,127 @@
 /*
                =.            This file is part of the OPIE Project
              .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU 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 file 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 General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qtimer.h>
 
-#include <qpe/qpeapplication.h>
 
 #include <opie/odevice.h>
 
 #include "buttonsettings.h"
 #include "buttonutils.h"
 #include "remapdlg.h"
 
 using namespace Opie;
 
 struct buttoninfo {
 	const ODeviceButton *m_button;
 	int          m_index;
 
 	OQCopMessage m_pmsg;
 	QLabel      *m_picon;
 	QLabel      *m_plabel;
 
 	OQCopMessage m_hmsg;
 	QLabel      *m_hicon;
 	QLabel      *m_hlabel;
 
 	bool        m_pdirty : 1;
 	bool        m_hdirty : 1;
 };
 
 
 ButtonSettings::ButtonSettings ( QWidget *parent , const char *name,  bool modal, WFlags f )
 	: QDialog ( 0, "ButtonSettings", false, WStyle_ContextHelp )
 {
 	const QValueList <ODeviceButton> &buttons = ODevice::inst ( )-> buttons ( );
 	(void) ButtonUtils::inst ( ); // initialise
 
 	setCaption ( tr( "Button Settings" ));
 
 	QVBoxLayout *toplay = new QVBoxLayout ( this, 3, 3 );
 
 	QLabel *l = new QLabel ( tr( "<center>Press or hold the button you want to remap.</center>" ), this );
 	toplay-> addWidget ( l );
 
 	QGridLayout *lay = new QGridLayout ( toplay );
 	lay-> setMargin ( 0 );
 	lay-> setColStretch ( 0, 0 );
 	lay-> setColStretch ( 1, 0 );
 	lay-> setColStretch ( 2, 0 );
 	lay-> setColStretch ( 3, 10 );
 
 	m_infos. setAutoDelete ( true );
 
 	int i = 1;
 	int index = 0;
 	for ( QValueList<ODeviceButton>::ConstIterator it = buttons. begin ( ); it != buttons. end ( ); it++ ) {
 		if ( it != buttons. begin ( )) {
 			QFrame *f = new QFrame ( this );
 			f-> setFrameStyle ( QFrame::Sunken | QFrame::VLine );
 			lay-> addMultiCellWidget ( f, i, i, 0, 3 );
 			i++;
 		}
 
 		buttoninfo *bi = new buttoninfo ( );
 		bi-> m_button = &(*it);
 		bi-> m_index = index++;
 		bi-> m_pmsg = (*it). pressedAction ( );
 		bi-> m_hmsg = (*it). heldAction ( );
 		bi-> m_pdirty = false;
 		bi-> m_hdirty = false;
 
 		l = new QLabel ( this );
 		l-> setPixmap (( *it ). pixmap ( ));
 
 		lay-> addMultiCellWidget ( l, i, i + 1, 0, 0 );
 
 		l = new QLabel ( tr( "Press:" ), this );
 		lay-> addWidget ( l, i, 1, AlignLeft | AlignBottom );
 		l = new QLabel ( tr( "Hold:" ), this );
 		lay-> addWidget ( l, i + 1, 1, AlignLeft | AlignTop );
 
 		l = new QLabel ( this );
 		l-> setFixedSize ( 16, 16 );
 		lay-> addWidget ( l, i, 2, AlignLeft | AlignBottom );
 		bi-> m_picon = l;
 
 		l = new QLabel ( this );
 		l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine );
 		lay-> addWidget ( l, i, 3, AlignLeft | AlignBottom );
 		bi-> m_plabel = l;
 
 		l = new QLabel ( this );
 		l-> setFixedSize ( 16, 16 );
 		lay-> addWidget ( l, i + 1, 2, AlignLeft | AlignTop );
 		bi-> m_hicon = l;
 
 		l = new QLabel ( this );
 		l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine );
 		lay-> addWidget ( l, i + 1, 3, AlignLeft | AlignTop );
 		bi-> m_hlabel = l;
 
diff --git a/core/settings/button/main.cpp b/core/settings/button/main.cpp
index c063c3c..e7c5bf9 100644
--- a/core/settings/button/main.cpp
+++ b/core/settings/button/main.cpp
@@ -1,33 +1,32 @@
 /*
                =.            This file is part of the OPIE Project
              .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU 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 file 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 General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "buttonsettings.h"
 
-#include <qpe/qpeapplication.h>
 #include <opie/oapplicationfactory.h>
 
 OPIE_EXPORT_APP( OApplicationFactory<ButtonSettings> )
diff --git a/core/settings/button/remapdlg.cpp b/core/settings/button/remapdlg.cpp
index 939a6bf..7dabe68 100644
--- a/core/settings/button/remapdlg.cpp
+++ b/core/settings/button/remapdlg.cpp
@@ -1,98 +1,97 @@
 #include <qlistview.h>
-#include <qlabel.h>
 #include <qcombobox.h>
 #include <qtimer.h>
 
 #include "remapdlg.h"
 #include "buttonutils.h"
 
 using namespace Opie;
 
 class NoSortItem : public QListViewItem {
 public:
   NoSortItem ( QListView *lv, uint pos, const QString &str, const QCString &s1 = 0, const QCString &s2 = 0 )
     : QListViewItem ( lv, str, s1, s2 )
   {
     m_key = QString ( QChar ( 'a' + pos ));
     m_def = false;
   }
   
   void setDefault ( bool b )
   {
     m_def = b;
   }
   
   virtual QString key ( int /*column*/, bool /*ascending*/ ) const
   {
     return m_key;
   }
   
   virtual void paintCell ( QPainter * p, const QColorGroup & cg, int column, int width, int align ) 
   {
     if ( m_def ) {
       QFont f ( listView ( )-> font ( ));     
       f. setBold ( true );    
       p-> setFont ( f );
     }
     QListViewItem::paintCell ( p, cg, column, width, align ); 
   }
   
 private:
   QString m_key;
   bool m_def;
 };
 
 
 RemapDlg::RemapDlg ( const Opie::ODeviceButton *b, bool hold, QWidget *parent, const char *name )
   : RemapDlgBase ( parent, name, true, WStyle_ContextHelp )
 {
   setCaption ( tr( "%1 %2", "(hold|press) buttoname" ). arg( hold ? tr( "Held" ) : tr( "Pressed" )). arg ( b-> userText ( )));
 
   m_current = 0;
   
   static const char * const def_channels [] = { "QPE/Application/", "QPE/Launcher", "QPE/System", "QPE/TaskBar", "QPE/", 0 };
   w_channel-> insertStrList ((const char **) def_channels );
   
   m_msg = hold ? b-> heldAction ( ) : b-> pressedAction ( );
   m_msg_preset = hold ? b-> factoryPresetHeldAction ( ) : b-> factoryPresetPressedAction ( );
   
   m_map_none   = new NoSortItem ( w_list, 0, tr( "No mapping" ));
   m_map_preset = new NoSortItem ( w_list, 1, tr( "Default" ), m_msg_preset. channel ( ), m_msg_preset. message ( ));
   ((NoSortItem *) m_map_preset )-> setDefault ( true );
   
   if (m_msg. channel ( ) == "ignore")
   {
     m_map_custom = new NoSortItem ( w_list, 2, tr( "Custom" ), m_msg_preset. channel ( ), m_msg_preset. message ( ));
     
     m_current = m_map_none;
   }
   else
   {
     m_map_custom = new NoSortItem ( w_list, 2, tr( "Custom" ), m_msg. channel ( ), m_msg. message ( ));
     m_current = m_map_custom;
   }
   
   QListViewItem *it = new NoSortItem ( w_list, 3, tr( "Actions" )); 
   ButtonUtils::inst ( )-> insertActions ( it );
   it-> setOpen ( true );
   
   m_map_show = new NoSortItem ( w_list, 4, tr( "Show" )); 
   
   w_list-> setCurrentItem ( m_current );
   
   QTimer::singleShot ( 0, this, SLOT( delayedInit ( )));
 }
 
 RemapDlg::~RemapDlg ( )
 {
 }
 
 void RemapDlg::delayedInit ( )
 {
   bool b = w_list-> viewport ( )-> isUpdatesEnabled ( );
   w_list-> viewport ( )-> setUpdatesEnabled ( false );
   
   ButtonUtils::inst ( )-> insertAppLnks ( m_map_show );
   
   w_list-> viewport ( )-> setUpdatesEnabled ( b );