peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes for gcc4

Browse Source
This commit is contained in:
Uwe Rathmann 2018-03-31 18:34:51 +02:00
parent 0fea82dfff
commit 897f6c520b
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
inputcontext/QskInputContext.cpp
View File

@ -314,38 +314,37 @@ void QskInputContext::setInputPanel( QskVirtualKeyboard* inputPanel )
if ( m_inputPanel == inputPanel ) if ( m_inputPanel == inputPanel )
return; return;
auto compositionModel = currentInputCompositionModel();
if ( m_inputPanel ) if ( m_inputPanel )
{ {
QObject::disconnect( m_inputPanel, &QskVirtualKeyboard::visibleChanged, m_inputPanel->disconnect( this );
this, &QPlatformInputContext::emitInputPanelVisibleChanged );
QObject::disconnect( m_inputPanel, &QskVirtualKeyboard::keyboardRectChanged, if ( compositionModel )
this, &QPlatformInputContext::emitKeyboardRectChanged ); compositionModel->disconnect( m_inputPanel );
QObject::disconnect( m_inputPanel, &QskVirtualKeyboard::localeChanged,
this, &QPlatformInputContext::emitLocaleChanged );
if ( currentInputCompositionModel() )
m_inputPanel->disconnect( currentInputCompositionModel() );
} }
m_inputPanel = inputPanel; m_inputPanel = inputPanel;
if ( !m_inputPanel )
return;
// call it once when it has been set: if ( inputPanel )
if( currentInputCompositionModel() )
{ {
m_inputPanel->setCandidateBarVisible( currentInputCompositionModel()->supportsSuggestions() ); connect( inputPanel, &QskVirtualKeyboard::visibleChanged,
} this, &QPlatformInputContext::emitInputPanelVisibleChanged );
QObject::connect( m_inputPanel, &QskVirtualKeyboard::visibleChanged,
this, &QPlatformInputContext::emitInputPanelVisibleChanged ); connect( inputPanel, &QskVirtualKeyboard::keyboardRectChanged,
QObject::connect( m_inputPanel, &QskVirtualKeyboard::keyboardRectChanged, this, &QPlatformInputContext::emitKeyboardRectChanged );
this, &QPlatformInputContext::emitKeyboardRectChanged );
QObject::connect( m_inputPanel, &QskVirtualKeyboard::localeChanged, connect( inputPanel, &QskVirtualKeyboard::localeChanged,
this, &QPlatformInputContext::emitLocaleChanged ); this, &QPlatformInputContext::emitLocaleChanged );
if ( currentInputCompositionModel() )
{ if ( compositionModel )
QObject::connect( {
currentInputCompositionModel(), &QskInputCompositionModel::groupsChanged, inputPanel->setCandidateBarVisible(
m_inputPanel.data(), &QskVirtualKeyboard::setPreeditGroups ); compositionModel->supportsSuggestions() );
connect( compositionModel, &QskInputCompositionModel::groupsChanged,
inputPanel, &QskVirtualKeyboard::setPreeditGroups );
}
} }
} }