-rw-r--r-- | library/qpeapplication.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index f0a68cf..70ffec1 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -761,69 +761,69 @@ bool QPEApplication::qwsEventFilter( QWSEvent *e ) | |||
761 | if ( d->kbregrab ) { | 761 | if ( d->kbregrab ) { |
762 | grabKeyboard(); | 762 | grabKeyboard(); |
763 | d->kbregrab = FALSE; | 763 | d->kbregrab = FALSE; |
764 | } | 764 | } |
765 | } | 765 | } |
766 | if ( fe->simpleData.get_focus && inputMethodDict ) { | 766 | if ( fe->simpleData.get_focus && inputMethodDict ) { |
767 | InputMethodHint m = inputMethodHint( QWidget::find(e->window()) ); | 767 | InputMethodHint m = inputMethodHint( QWidget::find(e->window()) ); |
768 | if ( m == AlwaysOff ) | 768 | if ( m == AlwaysOff ) |
769 | Global::hideInputMethod(); | 769 | Global::hideInputMethod(); |
770 | if ( m == AlwaysOn ) | 770 | if ( m == AlwaysOn ) |
771 | Global::showInputMethod(); | 771 | Global::showInputMethod(); |
772 | } | 772 | } |
773 | } | 773 | } |
774 | return QApplication::qwsEventFilter( e ); | 774 | return QApplication::qwsEventFilter( e ); |
775 | } | 775 | } |
776 | 776 | ||
777 | /*! | 777 | /*! |
778 | Destroys the QPEApplication. | 778 | Destroys the QPEApplication. |
779 | */ | 779 | */ |
780 | QPEApplication::~QPEApplication() | 780 | QPEApplication::~QPEApplication() |
781 | { | 781 | { |
782 | ungrabKeyboard(); | 782 | ungrabKeyboard(); |
783 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 783 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
784 | // Need to delete QCopChannels early, since the display will | 784 | // Need to delete QCopChannels early, since the display will |
785 | // be gone by the time we get to ~QObject(). | 785 | // be gone by the time we get to ~QObject(). |
786 | delete sysChannel; | 786 | delete sysChannel; |
787 | delete pidChannel; | 787 | delete pidChannel; |
788 | #endif | 788 | #endif |
789 | delete d; | 789 | delete d; |
790 | } | 790 | } |
791 | 791 | ||
792 | /*! | 792 | /*! |
793 | Returns <tt>$QPEDIR/</tt>. | 793 | Returns <tt>$OPIEDIR/</tt>. |
794 | */ | 794 | */ |
795 | QString QPEApplication::qpeDir() | 795 | QString QPEApplication::qpeDir() |
796 | { | 796 | { |
797 | const char *base = getenv( "QPEDIR" ); | 797 | const char *base = getenv( "OPIEDIR" ); |
798 | if ( base ) | 798 | if ( base ) |
799 | return QString( base ) + "/"; | 799 | return QString( base ) + "/"; |
800 | 800 | ||
801 | return QString( "../" ); | 801 | return QString( "../" ); |
802 | } | 802 | } |
803 | 803 | ||
804 | /*! | 804 | /*! |
805 | Returns the user's current Document directory. There is a trailing "/". | 805 | Returns the user's current Document directory. There is a trailing "/". |
806 | */ | 806 | */ |
807 | QString QPEApplication::documentDir() | 807 | QString QPEApplication::documentDir() |
808 | { | 808 | { |
809 | const char *base = getenv( "HOME" ); | 809 | const char *base = getenv( "HOME" ); |
810 | if ( base ) | 810 | if ( base ) |
811 | return QString( base ) + "/Documents/"; | 811 | return QString( base ) + "/Documents/"; |
812 | 812 | ||
813 | return QString( "../Documents/" ); | 813 | return QString( "../Documents/" ); |
814 | } | 814 | } |
815 | 815 | ||
816 | static int deforient=-1; | 816 | static int deforient=-1; |
817 | 817 | ||
818 | /*! | 818 | /*! |
819 | \internal | 819 | \internal |
820 | */ | 820 | */ |
821 | int QPEApplication::defaultRotation() | 821 | int QPEApplication::defaultRotation() |
822 | { | 822 | { |
823 | if ( deforient < 0 ) { | 823 | if ( deforient < 0 ) { |
824 | QString d = getenv("QWS_DISPLAY"); | 824 | QString d = getenv("QWS_DISPLAY"); |
825 | if ( d.contains("Rot90") ) { | 825 | if ( d.contains("Rot90") ) { |
826 | deforient = 90; | 826 | deforient = 90; |
827 | } else if ( d.contains("Rot180") ) { | 827 | } else if ( d.contains("Rot180") ) { |
828 | deforient = 180; | 828 | deforient = 180; |
829 | } else if ( d.contains("Rot270") ) { | 829 | } else if ( d.contains("Rot270") ) { |