author | kergoth <kergoth> | 2003-03-14 20:40:06 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-03-14 20:40:06 (UTC) |
commit | 2c53d85583ebece42b3b4c155540cd6a01542731 (patch) (unidiff) | |
tree | e30be18a7d98d9ebee5ac4a30bbe703b3a34cc28 | |
parent | 2d20b81186bd9a4795af736710d0cb205ead9a77 (diff) | |
download | opie-2c53d85583ebece42b3b4c155540cd6a01542731.zip opie-2c53d85583ebece42b3b4c155540cd6a01542731.tar.gz opie-2c53d85583ebece42b3b4c155540cd6a01542731.tar.bz2 |
Simplification.
-rw-r--r-- | core/launcher/desktop.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index 5ecc8bf..ba4fd66 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp | |||
@@ -695,109 +695,109 @@ void Desktop::togglePower() | |||
695 | 695 | ||
696 | excllock = false; | 696 | excllock = false; |
697 | } | 697 | } |
698 | 698 | ||
699 | void Desktop::toggleLight() | 699 | void Desktop::toggleLight() |
700 | { | 700 | { |
701 | QCopEnvelope e( "QPE/System", "setBacklight(int)" ); | 701 | QCopEnvelope e( "QPE/System", "setBacklight(int)" ); |
702 | e << -2; // toggle | 702 | e << -2; // toggle |
703 | } | 703 | } |
704 | 704 | ||
705 | void Desktop::toggleSymbolInput() | 705 | void Desktop::toggleSymbolInput() |
706 | { | 706 | { |
707 | tb->toggleSymbolInput(); | 707 | tb->toggleSymbolInput(); |
708 | } | 708 | } |
709 | 709 | ||
710 | void Desktop::toggleNumLockState() | 710 | void Desktop::toggleNumLockState() |
711 | { | 711 | { |
712 | tb->toggleNumLockState(); | 712 | tb->toggleNumLockState(); |
713 | } | 713 | } |
714 | 714 | ||
715 | void Desktop::toggleCapsLockState() | 715 | void Desktop::toggleCapsLockState() |
716 | { | 716 | { |
717 | tb->toggleCapsLockState(); | 717 | tb->toggleCapsLockState(); |
718 | } | 718 | } |
719 | 719 | ||
720 | void Desktop::styleChange( QStyle &s ) | 720 | void Desktop::styleChange( QStyle &s ) |
721 | { | 721 | { |
722 | QWidget::styleChange( s ); | 722 | QWidget::styleChange( s ); |
723 | int displayw = qApp->desktop() ->width(); | 723 | int displayw = qApp->desktop() ->width(); |
724 | int displayh = qApp->desktop() ->height(); | 724 | int displayh = qApp->desktop() ->height(); |
725 | 725 | ||
726 | QSize sz = tb->sizeHint(); | 726 | QSize sz = tb->sizeHint(); |
727 | 727 | ||
728 | tb->setGeometry( 0, displayh - sz.height(), displayw, sz.height() ); | 728 | tb->setGeometry( 0, displayh - sz.height(), displayw, sz.height() ); |
729 | } | 729 | } |
730 | 730 | ||
731 | void DesktopApplication::shutdown() | 731 | void DesktopApplication::shutdown() |
732 | { | 732 | { |
733 | if ( type() != GuiServer ) | 733 | if ( type() != GuiServer ) |
734 | return ; | 734 | return ; |
735 | ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose ); | 735 | ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose ); |
736 | connect( sd, SIGNAL( shutdown( ShutdownImpl::Type ) ), | 736 | connect( sd, SIGNAL( shutdown( ShutdownImpl::Type ) ), |
737 | this, SLOT( shutdown( ShutdownImpl::Type ) ) ); | 737 | this, SLOT( shutdown( ShutdownImpl::Type ) ) ); |
738 | sd->showMaximized(); | 738 | sd->showMaximized(); |
739 | } | 739 | } |
740 | 740 | ||
741 | void DesktopApplication::shutdown( ShutdownImpl::Type t ) | 741 | void DesktopApplication::shutdown( ShutdownImpl::Type t ) |
742 | { | 742 | { |
743 | char *path[] = { "/sbin", "/usr/sbin", 0 }; | ||
744 | char *opt = 0; | 743 | char *opt = 0; |
745 | 744 | ||
746 | switch ( t ) { | 745 | switch ( t ) { |
747 | case ShutdownImpl::ShutdownSystem: | 746 | case ShutdownImpl::ShutdownSystem: |
748 | opt = "-h"; | 747 | opt = "-h"; |
749 | // fall through | 748 | // fall through |
750 | case ShutdownImpl::RebootSystem: | 749 | case ShutdownImpl::RebootSystem: |
751 | if ( opt == 0 ) | 750 | if ( opt == 0 ) |
752 | opt = "-r"; | 751 | opt = "-r"; |
753 | 752 | ||
754 | if ( execle( "shutdown", "shutdown", opt, "now", ( void* ) 0, path ) < 0 ) | 753 | if ( execl( "/sbin/shutdown", "shutdown", opt, "now", ( void* ) 0) < 0 ) |
755 | ::syslog ( LOG_ERR, "Erroring execing shutdown\n" ); | 754 | perror("shutdown"); |
755 | // ::syslog ( LOG_ERR, "Erroring execing shutdown\n" ); | ||
756 | 756 | ||
757 | break; | 757 | break; |
758 | case ShutdownImpl::RestartDesktop: | 758 | case ShutdownImpl::RestartDesktop: |
759 | restart(); | 759 | restart(); |
760 | break; | 760 | break; |
761 | case ShutdownImpl::TerminateDesktop: | 761 | case ShutdownImpl::TerminateDesktop: |
762 | prepareForTermination( FALSE ); | 762 | prepareForTermination( FALSE ); |
763 | 763 | ||
764 | // This is a workaround for a Qt bug | 764 | // This is a workaround for a Qt bug |
765 | // clipboard applet has to stop its poll timer, or Qt/E | 765 | // clipboard applet has to stop its poll timer, or Qt/E |
766 | // will hang on quit() right before it emits aboutToQuit() | 766 | // will hang on quit() right before it emits aboutToQuit() |
767 | emit aboutToQuit ( ); | 767 | emit aboutToQuit ( ); |
768 | 768 | ||
769 | quit(); | 769 | quit(); |
770 | break; | 770 | break; |
771 | } | 771 | } |
772 | } | 772 | } |
773 | 773 | ||
774 | void DesktopApplication::restart() | 774 | void DesktopApplication::restart() |
775 | { | 775 | { |
776 | prepareForTermination( TRUE ); | 776 | prepareForTermination( TRUE ); |
777 | 777 | ||
778 | #ifdef Q_WS_QWS | 778 | #ifdef Q_WS_QWS |
779 | 779 | ||
780 | for ( int fd = 3; fd < 100; fd++ ) | 780 | for ( int fd = 3; fd < 100; fd++ ) |
781 | close( fd ); | 781 | close( fd ); |
782 | #if defined(QT_DEMO_SINGLE_FLOPPY) | 782 | #if defined(QT_DEMO_SINGLE_FLOPPY) |
783 | 783 | ||
784 | execl( "/sbin/init", "qpe", 0 ); | 784 | execl( "/sbin/init", "qpe", 0 ); |
785 | #elif defined(QT_QWS_CASSIOPEIA) | 785 | #elif defined(QT_QWS_CASSIOPEIA) |
786 | 786 | ||
787 | execl( "/bin/sh", "sh", 0 ); | 787 | execl( "/bin/sh", "sh", 0 ); |
788 | #else | 788 | #else |
789 | 789 | ||
790 | execl( ( qpeDir() + "/bin/qpe" ).latin1(), "qpe", 0 ); | 790 | execl( ( qpeDir() + "/bin/qpe" ).latin1(), "qpe", 0 ); |
791 | #endif | 791 | #endif |
792 | 792 | ||
793 | exit( 1 ); | 793 | exit( 1 ); |
794 | #endif | 794 | #endif |
795 | } | 795 | } |
796 | 796 | ||
797 | void Desktop::startTransferServer() | 797 | void Desktop::startTransferServer() |
798 | { | 798 | { |
799 | // start qcop bridge server | 799 | // start qcop bridge server |
800 | qcopBridge = new QCopBridge( 4243 ); | 800 | qcopBridge = new QCopBridge( 4243 ); |
801 | if ( !qcopBridge->ok() ) { | 801 | if ( !qcopBridge->ok() ) { |
802 | delete qcopBridge; | 802 | delete qcopBridge; |
803 | qcopBridge = 0; | 803 | qcopBridge = 0; |