1 files changed, 13 insertions, 7 deletions

diff --git a/core/launcher/inputmethods.cpp b/core/launcher/inputmethods.cpp
index a0e8939..7e99796 100644
--- a/core/launcher/inputmethods.cpp
+++ b/core/launcher/inputmethods.cpp
@@ -80,29 +80,25 @@ int InputMethod::operator <=(const InputMethod& o) const
 class IMToolButton : public QToolButton
 {
 public:
     IMToolButton::IMToolButton( QWidget *parent ) : QToolButton( parent )
     { setWFlags( WStyle_Tool ); }
 };
 
 
 InputMethods::InputMethods( QWidget *parent ) :
     QWidget( parent, "InputMethods", WStyle_Tool | WStyle_Customize ),
     mkeyboard(0), imethod(0)
 {
-    Config cfg( "Launcher" );
-    cfg.setGroup( "InputMethods" );
-    inputWidgetStyle = QWidget::WStyle_Customize | QWidget::WStyle_StaysOnTop | QWidget::WGroupLeader | QWidget::WStyle_Tool;
-    inputWidgetStyle |= cfg.readBoolEntry( "Float", false ) ? QWidget::WStyle_DialogBorder : 0;
-    inputWidgetWidth = cfg.readNumEntry( "Width", 100 );
+    readConfig();
 
     setBackgroundMode( PaletteBackground );
     QHBoxLayout *hbox = new QHBoxLayout( this );
 
     kbdButton = new IMToolButton( this);
     kbdButton->setFocusPolicy(NoFocus);
     kbdButton->setToggleButton( TRUE );
     if (parent->sizeHint().height() > 0)
 	kbdButton->setFixedHeight( parent->sizeHint().height() );
     kbdButton->setFixedWidth( 32 );
     kbdButton->setAutoRaise( TRUE );
     kbdButton->setUsesBigPixmap( TRUE );
@@ -523,25 +519,25 @@ void InputMethods::qcopReceive( const QCString &msg, const QByteArray &data )
 
 
 void InputMethods::showKbd( bool on )
 {
     if ( !mkeyboard )
         return;
 
     if ( on )
     {
         mkeyboard->resetState();
 
         int height = QMIN( mkeyboard->widget->sizeHint().height(), 134 );
-        int width = qApp->desktop()->width() * (inputWidgetWidth*0.01);
+        int width = static_cast<int>( qApp->desktop()->width() * (inputWidgetWidth*0.01) );
         int left = 0;
         int top = mapToGlobal( QPoint() ).y() - height;
 
         if ( inputWidgetStyle & QWidget::WStyle_DialogBorder )
         {
             odebug << "InputMethods: reading geometry." << oendl;
             Config cfg( "Launcher" );
             cfg.setGroup( "InputMethods" );
             int l = cfg.readNumEntry( "absX", -1 );
             int t = cfg.readNumEntry( "absY", -1 );
             int w = cfg.readNumEntry( "absWidth", -1 );
             int h = cfg.readNumEntry( "absHeight", -1 );
@@ -599,23 +595,33 @@ QString InputMethods::currentShown() const
 {
     return mkeyboard && mkeyboard->widget->isVisible()
 	? mkeyboard->name() : QString::null;
 }
 
 void InputMethods::sendKey( ushort unicode, ushort scancode, ushort mod, bool press, bool repeat )
 {
 #if defined(Q_WS_QWS)
     QWSServer::sendKeyEvent( unicode, scancode, mod, press, repeat );
 #endif
 }
 
-bool InputMethods::eventFilter( QObject* o, QEvent* e )
+bool InputMethods::eventFilter( QObject* , QEvent* e )
 {
     if ( e->type() == QEvent::Close )
     {
         ( (QCloseEvent*) e )->ignore();
         showKbd( false );
         kbdButton->setOn( false );
         return true;
     }
     return false;
 }
+
+void InputMethods::readConfig() {
+    Config cfg( "Launcher" );
+    cfg.setGroup( "InputMethods" );
+
+    inputWidgetStyle = QWidget::WStyle_Customize | QWidget::WStyle_StaysOnTop | QWidget::WGroupLeader | QWidget::WStyle_Tool;
+    inputWidgetStyle |= cfg.readBoolEntry( "Float", false ) ?
+                        QWidget::WStyle_DialogBorder : 0;
+    inputWidgetWidth = cfg.readNumEntry( "Width", 100 );
+}