-rw-r--r-- | x11/libqpe-x11/qpe/qpeapplication.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/x11/libqpe-x11/qpe/qpeapplication.cpp b/x11/libqpe-x11/qpe/qpeapplication.cpp index eb01e50..0a98481 100644 --- a/x11/libqpe-x11/qpe/qpeapplication.cpp +++ b/x11/libqpe-x11/qpe/qpeapplication.cpp | |||
@@ -726,65 +726,65 @@ void QPEApplication::prepareForTermination( bool willrestart ) | |||
726 | sleep( 1 ); // You have 1 second to comply. | 726 | sleep( 1 ); // You have 1 second to comply. |
727 | #endif | 727 | #endif |
728 | } | 728 | } |
729 | int QPEApplication::x11ClientMessage(QWidget* w, XEvent* event, bool b ) { | 729 | int QPEApplication::x11ClientMessage(QWidget* w, XEvent* event, bool b ) { |
730 | qWarning("X11 ClientMessage %d %d", event->type, ClientMessage); | 730 | qWarning("X11 ClientMessage %d %d", event->type, ClientMessage); |
731 | if ( event->type == ClientMessage ) { | 731 | if ( event->type == ClientMessage ) { |
732 | if ( (event->xclient.message_type == d->wm_protocols) && | 732 | if ( (event->xclient.message_type == d->wm_protocols) && |
733 | (event->xclient.data.l[0] == d->wm_context_accept ) ) { | 733 | (event->xclient.data.l[0] == d->wm_context_accept ) ) { |
734 | qWarning("accepted!!!"); | 734 | qWarning("accepted!!!"); |
735 | /* | 735 | /* |
736 | * I'm not sure if we should use activeWidget | 736 | * I'm not sure if we should use activeWidget |
737 | * or activeModalWidget | 737 | * or activeModalWidget |
738 | * a QDialog could be not modal too | 738 | * a QDialog could be not modal too |
739 | */ | 739 | */ |
740 | if ( w->inherits("QDialog" ) ) { | 740 | if ( w->inherits("QDialog" ) ) { |
741 | qWarning("inherits QDialog!!!"); | 741 | qWarning("inherits QDialog!!!"); |
742 | QDialog* dia = (QDialog*)w; | 742 | QDialog* dia = (QDialog*)w; |
743 | /* | 743 | /* |
744 | * call it directly or via QTimer::singleShot? | 744 | * call it directly or via QTimer::singleShot? |
745 | */ | 745 | */ |
746 | QTimer::singleShot(0, dia, SLOT(accept() ) ); | 746 | QTimer::singleShot(0, dia, SLOT(accept() ) ); |
747 | return 0; | 747 | return 0; |
748 | } | 748 | } |
749 | 749 | ||
750 | } | 750 | } |
751 | } | 751 | } |
752 | return QApplication::x11ClientMessage(w, event, b ); | 752 | return QApplication::x11ClientMessage(w, event, b ); |
753 | } | 753 | } |
754 | 754 | ||
755 | #define KeyPress XKeyPress | 755 | #define KeyPress XKeyPress |
756 | #define KeyRelease XKeyRelease | 756 | #define KeyRelease XKeyRelease |
757 | 757 | ||
758 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) | 758 | #if defined(OPIE_NEW_MALLOC) |
759 | 759 | ||
760 | // The libraries with the skiff package (and possibly others) have | 760 | // The libraries with the skiff package (and possibly others) have |
761 | // completely useless implementations of builtin new and delete that | 761 | // completely useless implementations of builtin new and delete that |
762 | // use about 50% of your CPU. Here we revert to the simple libc | 762 | // use about 50% of your CPU. Here we revert to the simple libc |
763 | // functions. | 763 | // functions. |
764 | 764 | ||
765 | void* operator new[]( size_t size ) | 765 | void* operator new[]( size_t size ) |
766 | { | 766 | { |
767 | return malloc( size ); | 767 | return malloc( size ); |
768 | } | 768 | } |
769 | 769 | ||
770 | void* operator new( size_t size ) | 770 | void* operator new( size_t size ) |
771 | { | 771 | { |
772 | return malloc( size ); | 772 | return malloc( size ); |
773 | } | 773 | } |
774 | 774 | ||
775 | void operator delete[]( void* p ) | 775 | void operator delete[]( void* p ) |
776 | { | 776 | { |
777 | free( p ); | 777 | free( p ); |
778 | } | 778 | } |
779 | 779 | ||
780 | void operator delete[]( void* p, size_t /*size*/ ) | 780 | void operator delete[]( void* p, size_t /*size*/ ) |
781 | { | 781 | { |
782 | free( p ); | 782 | free( p ); |
783 | } | 783 | } |
784 | 784 | ||
785 | void operator delete( void* p ) | 785 | void operator delete( void* p ) |
786 | { | 786 | { |
787 | free( p ); | 787 | free( p ); |
788 | } | 788 | } |
789 | 789 | ||
790 | void operator delete( void* p, size_t /*size*/ ) | 790 | void operator delete( void* p, size_t /*size*/ ) |