-rw-r--r-- | library/qpeapplication.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 4c93111..b5dff3a 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -1633,99 +1633,96 @@ int QPEApplication::exec() | |||
1633 | 1633 | ||
1634 | /*! | 1634 | /*! |
1635 | \internal | 1635 | \internal |
1636 | External request for application to quit. Quits if possible without | 1636 | External request for application to quit. Quits if possible without |
1637 | loosing state. | 1637 | loosing state. |
1638 | */ | 1638 | */ |
1639 | void QPEApplication::tryQuit() | 1639 | void QPEApplication::tryQuit() |
1640 | { | 1640 | { |
1641 | if ( activeModalWidget() || strcmp( argv() [ 0 ], "embeddedkonsole" ) == 0 ) | 1641 | if ( activeModalWidget() || strcmp( argv() [ 0 ], "embeddedkonsole" ) == 0 ) |
1642 | return ; // Inside modal loop or konsole. Too hard to save state. | 1642 | return ; // Inside modal loop or konsole. Too hard to save state. |
1643 | #ifndef QT_NO_COP | 1643 | #ifndef QT_NO_COP |
1644 | 1644 | ||
1645 | { | 1645 | { |
1646 | QCopEnvelope e( "QPE/System", "closing(QString)" ); | 1646 | QCopEnvelope e( "QPE/System", "closing(QString)" ); |
1647 | e << d->appName; | 1647 | e << d->appName; |
1648 | } | 1648 | } |
1649 | #endif | 1649 | #endif |
1650 | processEvents(); | 1650 | processEvents(); |
1651 | 1651 | ||
1652 | quit(); | 1652 | quit(); |
1653 | } | 1653 | } |
1654 | 1654 | ||
1655 | /*! | 1655 | /*! |
1656 | \internal | 1656 | \internal |
1657 | User initiated quit. Makes the window 'Go Away'. If preloaded this means | 1657 | User initiated quit. Makes the window 'Go Away'. If preloaded this means |
1658 | hiding the window. If not it means quitting the application. | 1658 | hiding the window. If not it means quitting the application. |
1659 | As this is user initiated we don't need to check state. | 1659 | As this is user initiated we don't need to check state. |
1660 | */ | 1660 | */ |
1661 | void QPEApplication::hideOrQuit() | 1661 | void QPEApplication::hideOrQuit() |
1662 | { | 1662 | { |
1663 | processEvents(); | 1663 | processEvents(); |
1664 | 1664 | ||
1665 | // If we are a preloaded application we don't actually quit, so emit | 1665 | // If we are a preloaded application we don't actually quit, so emit |
1666 | // a System message indicating we're quasi-closing. | 1666 | // a System message indicating we're quasi-closing. |
1667 | if ( d->preloaded && d->qpe_main_widget ) | 1667 | if ( d->preloaded && d->qpe_main_widget ) |
1668 | #ifndef QT_NO_COP | 1668 | #ifndef QT_NO_COP |
1669 | 1669 | ||
1670 | { | 1670 | { |
1671 | QCopEnvelope e("QPE/System", "fastAppHiding(QString)" ); | 1671 | QCopEnvelope e("QPE/System", "fastAppHiding(QString)" ); |
1672 | e << d->appName; | 1672 | e << d->appName; |
1673 | d->qpe_main_widget->hide(); | 1673 | d->qpe_main_widget->hide(); |
1674 | } | 1674 | } |
1675 | #endif | 1675 | #endif |
1676 | else | 1676 | else |
1677 | quit(); | 1677 | quit(); |
1678 | } | 1678 | } |
1679 | 1679 | ||
1680 | 1680 | ||
1681 | // These 6 stubs below need 1.5K in the binary and besides that - | ||
1682 | // we are not using ancient toolchains anymore - sandman | ||
1683 | |||
1684 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_SHARP) | 1681 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_SHARP) |
1685 | 1682 | ||
1686 | // The libraries with the skiff package (and possibly others) have | 1683 | // The libraries with the skiff package (and possibly others) have |
1687 | // completely useless implementations of builtin new and delete that | 1684 | // completely useless implementations of builtin new and delete that |
1688 | // use about 50% of your CPU. Here we revert to the simple libc | 1685 | // use about 50% of your CPU. Here we revert to the simple libc |
1689 | // functions. | 1686 | // functions. |
1690 | 1687 | ||
1691 | void* operator new[]( size_t size ) | 1688 | void* operator new[]( size_t size ) |
1692 | { | 1689 | { |
1693 | return malloc( size ); | 1690 | return malloc( size ); |
1694 | } | 1691 | } |
1695 | 1692 | ||
1696 | void* operator new( size_t size ) | 1693 | void* operator new( size_t size ) |
1697 | { | 1694 | { |
1698 | return malloc( size ); | 1695 | return malloc( size ); |
1699 | } | 1696 | } |
1700 | 1697 | ||
1701 | void operator delete[]( void* p ) | 1698 | void operator delete[]( void* p ) |
1702 | { | 1699 | { |
1703 | free( p ); | 1700 | free( p ); |
1704 | } | 1701 | } |
1705 | 1702 | ||
1706 | void operator delete[]( void* p, size_t /*size*/ ) | 1703 | void operator delete[]( void* p, size_t /*size*/ ) |
1707 | { | 1704 | { |
1708 | free( p ); | 1705 | free( p ); |
1709 | } | 1706 | } |
1710 | 1707 | ||
1711 | void operator delete( void* p ) | 1708 | void operator delete( void* p ) |
1712 | { | 1709 | { |
1713 | free( p ); | 1710 | free( p ); |
1714 | } | 1711 | } |
1715 | 1712 | ||
1716 | void operator delete( void* p, size_t /*size*/ ) | 1713 | void operator delete( void* p, size_t /*size*/ ) |
1717 | { | 1714 | { |
1718 | free( p ); | 1715 | free( p ); |
1719 | } | 1716 | } |
1720 | 1717 | ||
1721 | #endif | 1718 | #endif |
1722 | 1719 | ||
1723 | #if ( QT_VERSION <= 230 ) && !defined(SINGLE_APP) | 1720 | #if ( QT_VERSION <= 230 ) && !defined(SINGLE_APP) |
1724 | #include <qwidgetlist.h> | 1721 | #include <qwidgetlist.h> |
1725 | #ifdef QWS | 1722 | #ifdef QWS |
1726 | #include <qgfx_qws.h> | 1723 | #include <qgfx_qws.h> |
1727 | extern QRect qt_maxWindowRect; | 1724 | extern QRect qt_maxWindowRect; |
1728 | void qt_setMaxWindowRect(const QRect& r ) | 1725 | void qt_setMaxWindowRect(const QRect& r ) |
1729 | { | 1726 | { |
1730 | qt_maxWindowRect = qt_screen->mapFromDevice( r, | 1727 | qt_maxWindowRect = qt_screen->mapFromDevice( r, |
1731 | qt_screen->mapToDevice( QSize( qt_screen->width(), qt_screen->height() ) ) ); | 1728 | qt_screen->mapToDevice( QSize( qt_screen->width(), qt_screen->height() ) ) ); |