Diffstat (limited to 'libopie2/opiecore/device/odevice.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opiecore/device/odevice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp index 67cae1c..e57cdef 100644 --- a/libopie2/opiecore/device/odevice.cpp +++ b/libopie2/opiecore/device/odevice.cpp | |||
@@ -635,29 +635,29 @@ const ODeviceButton *ODevice::buttonForKeycode ( ushort code ) | |||
635 | { | 635 | { |
636 | initButtons(); | 636 | initButtons(); |
637 | 637 | ||
638 | for ( QValueListConstIterator<ODeviceButton> it = d->m_buttons->begin(); it != d->m_buttons->end(); ++it ) { | 638 | for ( QValueListConstIterator<ODeviceButton> it = d->m_buttons->begin(); it != d->m_buttons->end(); ++it ) { |
639 | if ( (*it). keycode() == code ) | 639 | if ( (*it). keycode() == code ) |
640 | return &(*it); | 640 | return &(*it); |
641 | } | 641 | } |
642 | return 0; | 642 | return 0; |
643 | } | 643 | } |
644 | 644 | ||
645 | void ODevice::reloadButtonMapping() | 645 | void ODevice::reloadButtonMapping() |
646 | { | 646 | { |
647 | if(!d->m_buttons) | ||
647 | initButtons(); | 648 | initButtons(); |
648 | 649 | ||
649 | if(!d->m_initializedButtonQcop) { | 650 | if(!d->m_initializedButtonQcop) { |
650 | QCopChannel *chan = new QCopChannel("QPE/System", this, "ODevice button channel"); | 651 | connect(qApp,SIGNAL(systemMessageSignal(const QCString&,const QByteArray&)), |
651 | connect(chan,SIGNAL(received(const QCString&,const QByteArray&)), | ||
652 | this,SLOT(systemMessage(const QCString&,const QByteArray&))); | 652 | this,SLOT(systemMessage(const QCString&,const QByteArray&))); |
653 | d->m_initializedButtonQcop = true; | 653 | d->m_initializedButtonQcop = true; |
654 | } | 654 | } |
655 | 655 | ||
656 | Config cfg ( "ButtonSettings" ); | 656 | Config cfg ( "ButtonSettings" ); |
657 | 657 | ||
658 | for ( uint i = 0; i < d->m_buttons->count(); i++ ) { | 658 | for ( uint i = 0; i < d->m_buttons->count(); i++ ) { |
659 | ODeviceButton &b = ( *d->m_buttons ) [i]; | 659 | ODeviceButton &b = ( *d->m_buttons ) [i]; |
660 | QString group = "Button" + QString::number ( i ); | 660 | QString group = "Button" + QString::number ( i ); |
661 | 661 | ||
662 | QCString pch, hch; | 662 | QCString pch, hch; |
663 | QCString pm, hm; | 663 | QCString pm, hm; |