merge core/settings/*

- light-and-power and security were a bit ugly, so I recommend someone
  who actually dealt with these files looking into if I got it right
  (not to tell about the frustratation about the fact that the ones who
  dealt with these files didn't do the merge in the first place :(

1 files changed, 1 insertions, 1 deletions

diff --git a/core/settings/button/buttonsettings.cpp b/core/settings/button/buttonsettings.cpp
index 942d5e4..b6a07a8 100644
--- a/core/settings/button/buttonsettings.cpp
+++ b/core/settings/button/buttonsettings.cpp
@@ -11,97 +11,97 @@
     .%`+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 ( ) 
+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 );