author | alwin <alwin> | 2004-02-19 11:44:25 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-02-19 11:44:25 (UTC) |
commit | 51992ef09a92db868234936484fcc3aec0d2d4ad (patch) (unidiff) | |
tree | 0e73af3768da5a5c6e3fa0a5c2ed615e4bdbb399 | |
parent | f388f1777ff1c83a483b20cebbafedd566628d12 (diff) | |
download | opie-51992ef09a92db868234936484fcc3aec0d2d4ad.zip opie-51992ef09a92db868234936484fcc3aec0d2d4ad.tar.gz opie-51992ef09a92db868234936484fcc3aec0d2d4ad.tar.bz2 |
aboutSuspend -> aboutToSuspend
I knew all the time - zecke is Mr. Muentefering in real live ;)
-rw-r--r-- | libopie2/opiecore/device/odevice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp index 7d67efe..b8d48fe 100644 --- a/libopie2/opiecore/device/odevice.cpp +++ b/libopie2/opiecore/device/odevice.cpp | |||
@@ -531,98 +531,98 @@ uint ODevice::buttonHoldTime() const | |||
531 | * or 0 if no special hardware button is available for the device | 531 | * or 0 if no special hardware button is available for the device |
532 | * | 532 | * |
533 | * @return The devicebutton or 0l | 533 | * @return The devicebutton or 0l |
534 | * @see ODeviceButton | 534 | * @see ODeviceButton |
535 | */ | 535 | */ |
536 | const ODeviceButton *ODevice::buttonForKeycode ( ushort code ) | 536 | const ODeviceButton *ODevice::buttonForKeycode ( ushort code ) |
537 | { | 537 | { |
538 | initButtons(); | 538 | initButtons(); |
539 | 539 | ||
540 | for ( QValueListConstIterator<ODeviceButton> it = d->m_buttons->begin(); it != d->m_buttons->end(); ++it ) { | 540 | for ( QValueListConstIterator<ODeviceButton> it = d->m_buttons->begin(); it != d->m_buttons->end(); ++it ) { |
541 | if ( (*it). keycode() == code ) | 541 | if ( (*it). keycode() == code ) |
542 | return &(*it); | 542 | return &(*it); |
543 | } | 543 | } |
544 | return 0; | 544 | return 0; |
545 | } | 545 | } |
546 | 546 | ||
547 | void ODevice::reloadButtonMapping() | 547 | void ODevice::reloadButtonMapping() |
548 | { | 548 | { |
549 | initButtons(); | 549 | initButtons(); |
550 | 550 | ||
551 | Config cfg ( "ButtonSettings" ); | 551 | Config cfg ( "ButtonSettings" ); |
552 | 552 | ||
553 | for ( uint i = 0; i < d->m_buttons->count(); i++ ) { | 553 | for ( uint i = 0; i < d->m_buttons->count(); i++ ) { |
554 | ODeviceButton &b = ( *d->m_buttons ) [i]; | 554 | ODeviceButton &b = ( *d->m_buttons ) [i]; |
555 | QString group = "Button" + QString::number ( i ); | 555 | QString group = "Button" + QString::number ( i ); |
556 | 556 | ||
557 | QCString pch, hch; | 557 | QCString pch, hch; |
558 | QCString pm, hm; | 558 | QCString pm, hm; |
559 | QByteArray pdata, hdata; | 559 | QByteArray pdata, hdata; |
560 | 560 | ||
561 | if ( cfg. hasGroup ( group )) { | 561 | if ( cfg. hasGroup ( group )) { |
562 | cfg. setGroup ( group ); | 562 | cfg. setGroup ( group ); |
563 | pch = cfg. readEntry ( "PressedActionChannel" ). latin1(); | 563 | pch = cfg. readEntry ( "PressedActionChannel" ). latin1(); |
564 | pm = cfg. readEntry ( "PressedActionMessage" ). latin1(); | 564 | pm = cfg. readEntry ( "PressedActionMessage" ). latin1(); |
565 | // pdata = decodeBase64 ( buttonFile. readEntry ( "PressedActionArgs" )); | 565 | // pdata = decodeBase64 ( buttonFile. readEntry ( "PressedActionArgs" )); |
566 | 566 | ||
567 | hch = cfg. readEntry ( "HeldActionChannel" ). latin1(); | 567 | hch = cfg. readEntry ( "HeldActionChannel" ). latin1(); |
568 | hm = cfg. readEntry ( "HeldActionMessage" ). latin1(); | 568 | hm = cfg. readEntry ( "HeldActionMessage" ). latin1(); |
569 | // hdata = decodeBase64 ( buttonFile. readEntry ( "HeldActionArgs" )); | 569 | // hdata = decodeBase64 ( buttonFile. readEntry ( "HeldActionArgs" )); |
570 | } | 570 | } |
571 | 571 | ||
572 | b. setPressedAction ( OQCopMessage ( pch, pm, pdata )); | 572 | b. setPressedAction ( OQCopMessage ( pch, pm, pdata )); |
573 | 573 | ||
574 | b. setHeldAction ( OQCopMessage ( hch, hm, hdata )); | 574 | b. setHeldAction ( OQCopMessage ( hch, hm, hdata )); |
575 | } | 575 | } |
576 | } | 576 | } |
577 | 577 | ||
578 | void ODevice::remapPressedAction ( int button, const OQCopMessage &action ) | 578 | void ODevice::remapPressedAction ( int button, const OQCopMessage &action ) |
579 | { | 579 | { |
580 | initButtons(); | 580 | initButtons(); |
581 | 581 | ||
582 | QString mb_chan; | 582 | QString mb_chan; |
583 | 583 | ||
584 | if ( button >= (int) d->m_buttons->count()) | 584 | if ( button >= (int) d->m_buttons->count()) |
585 | return; | 585 | return; |
586 | 586 | ||
587 | ODeviceButton &b = ( *d->m_buttons ) [button]; | 587 | ODeviceButton &b = ( *d->m_buttons ) [button]; |
588 | b. setPressedAction ( action ); | 588 | b. setPressedAction ( action ); |
589 | 589 | ||
590 | mb_chan=b. pressedAction(). channel(); | 590 | mb_chan=b. pressedAction(). channel(); |
591 | 591 | ||
592 | Config buttonFile ( "ButtonSettings" ); | 592 | Config buttonFile ( "ButtonSettings" ); |
593 | buttonFile. setGroup ( "Button" + QString::number ( button )); | 593 | buttonFile. setGroup ( "Button" + QString::number ( button )); |
594 | buttonFile. writeEntry ( "PressedActionChannel", (const char*) mb_chan); | 594 | buttonFile. writeEntry ( "PressedActionChannel", (const char*) mb_chan); |
595 | buttonFile. writeEntry ( "PressedActionMessage", (const char*) b. pressedAction(). message()); | 595 | buttonFile. writeEntry ( "PressedActionMessage", (const char*) b. pressedAction(). message()); |
596 | 596 | ||
597 | //buttonFile. writeEntry ( "PressedActionArgs", encodeBase64 ( b. pressedAction(). data())); | 597 | //buttonFile. writeEntry ( "PressedActionArgs", encodeBase64 ( b. pressedAction(). data())); |
598 | 598 | ||
599 | QCopEnvelope ( "QPE/System", "deviceButtonMappingChanged()" ); | 599 | QCopEnvelope ( "QPE/System", "deviceButtonMappingChanged()" ); |
600 | } | 600 | } |
601 | 601 | ||
602 | void ODevice::remapHeldAction ( int button, const OQCopMessage &action ) | 602 | void ODevice::remapHeldAction ( int button, const OQCopMessage &action ) |
603 | { | 603 | { |
604 | initButtons(); | 604 | initButtons(); |
605 | 605 | ||
606 | if ( button >= (int) d->m_buttons->count()) | 606 | if ( button >= (int) d->m_buttons->count()) |
607 | return; | 607 | return; |
608 | 608 | ||
609 | ODeviceButton &b = ( *d->m_buttons ) [button]; | 609 | ODeviceButton &b = ( *d->m_buttons ) [button]; |
610 | b. setHeldAction ( action ); | 610 | b. setHeldAction ( action ); |
611 | 611 | ||
612 | Config buttonFile ( "ButtonSettings" ); | 612 | Config buttonFile ( "ButtonSettings" ); |
613 | buttonFile. setGroup ( "Button" + QString::number ( button )); | 613 | buttonFile. setGroup ( "Button" + QString::number ( button )); |
614 | buttonFile. writeEntry ( "HeldActionChannel", (const char *) b. heldAction(). channel()); | 614 | buttonFile. writeEntry ( "HeldActionChannel", (const char *) b. heldAction(). channel()); |
615 | buttonFile. writeEntry ( "HeldActionMessage", (const char *) b. heldAction(). message()); | 615 | buttonFile. writeEntry ( "HeldActionMessage", (const char *) b. heldAction(). message()); |
616 | 616 | ||
617 | //buttonFile. writeEntry ( "HeldActionArgs", decodeBase64 ( b. heldAction(). data())); | 617 | //buttonFile. writeEntry ( "HeldActionArgs", decodeBase64 ( b. heldAction(). data())); |
618 | 618 | ||
619 | QCopEnvelope ( "QPE/System", "deviceButtonMappingChanged()" ); | 619 | QCopEnvelope ( "QPE/System", "deviceButtonMappingChanged()" ); |
620 | } | 620 | } |
621 | void ODevice::virtual_hook(int, void* ){ | 621 | void ODevice::virtual_hook(int, void* ){ |
622 | 622 | ||
623 | } | 623 | } |
624 | 624 | ||
625 | void ODevice::sendSuspendmsg() | 625 | void ODevice::sendSuspendmsg() |
626 | { | 626 | { |
627 | QCopEnvelope ( "QPE/System", "aboutSuspend()" ); | 627 | QCopEnvelope ( "QPE/System", "aboutToSuspend()" ); |
628 | } | 628 | } |