summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/inputmethods.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/core/launcher/inputmethods.cpp b/core/launcher/inputmethods.cpp
index acd0d59..765dfe9 100644
--- a/core/launcher/inputmethods.cpp
+++ b/core/launcher/inputmethods.cpp
@@ -61,102 +61,102 @@ static const char * tri_xpm[]={
"...aaa...",
"..aaaaa..",
".aaaaaaa.",
".........",
"........."};
static const int inputWidgetStyle = QWidget::WStyle_Customize |
QWidget::WStyle_Tool |
QWidget::WStyle_StaysOnTop |
QWidget::WGroupLeader;
InputMethods::InputMethods( QWidget *parent ) :
QWidget( parent, "InputMethods", WStyle_Tool | WStyle_Customize )
{
method = NULL;
setBackgroundMode ( PaletteBackground );
QHBoxLayout *hbox = new QHBoxLayout( this );
kbdButton = new QToolButton( this );
kbdButton->setFocusPolicy(NoFocus);
kbdButton->setToggleButton( TRUE );
kbdButton->setFixedHeight( 17 );
kbdButton->setFixedWidth( 32 );
kbdButton->setAutoRaise( TRUE );
kbdButton->setUsesBigPixmap( TRUE );
hbox->addWidget( kbdButton );
connect( kbdButton, SIGNAL(toggled(bool)), this, SLOT(showKbd(bool)) );
kbdChoice = new QToolButton( this );
kbdChoice->setFocusPolicy(NoFocus);
kbdChoice->setPixmap( QPixmap( (const char **)tri_xpm ) );
kbdChoice->setFixedHeight( 17 );
kbdChoice->setFixedWidth( 12 );
kbdChoice->setAutoRaise( TRUE );
hbox->addWidget( kbdChoice );
connect( kbdChoice, SIGNAL(clicked()), this, SLOT(chooseKbd()) );
connect( (QPEApplication*)qApp, SIGNAL(clientMoused()),
this, SLOT(resetStates()) );
loadInputMethods();
}
InputMethods::~InputMethods()
{
#ifndef SINGLE_APP
- QValueList<InputMethod>::Iterator mit;
- for ( mit = inputMethodList.begin(); mit != inputMethodList.end(); ++mit ) {
- int i = (*mit).interface->release();
- (*mit).library->unload();
- delete (*mit).library;
- }
+ QValueList<InputMethod>::Iterator mit;
+ for ( mit = inputMethodList.begin(); mit != inputMethodList.end(); ++mit ) {
+ (void) (*mit).interface->release();
+ (*mit).library->unload();
+ delete (*mit).library;
+ }
#endif
}
void InputMethods::hideInputMethod()
{
kbdButton->setOn( FALSE );
}
void InputMethods::showInputMethod()
{
kbdButton->setOn( TRUE );
}
void InputMethods::showInputMethod(const QString& name)
{
int i = 0;
QValueList<InputMethod>::Iterator it;
InputMethod *im = 0;
for ( it = inputMethodList.begin(); it != inputMethodList.end(); ++it, i++ ) {
if ( (*it).interface->name() == name ) {
im = &(*it);
break;
}
}
if ( im )
chooseMethod(im);
}
void InputMethods::resetStates()
{
if ( method )
method->interface->resetState();
}
QRect InputMethods::inputRect() const
{
if ( !method || !method->widget->isVisible() )
return QRect();
else
return method->widget->geometry();
}
void InputMethods::loadInputMethods()
{
#ifndef SINGLE_APP
hideInputMethod();
method = 0;