-rw-r--r-- | library/qpeapplication.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 19e99f2..dcc1001 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -2146,129 +2146,129 @@ int QPEApplication::exec() | |||
2146 | return QApplication::exec(); | 2146 | return QApplication::exec(); |
2147 | 2147 | ||
2148 | #ifndef QT_NO_COP | 2148 | #ifndef QT_NO_COP |
2149 | 2149 | ||
2150 | { | 2150 | { |
2151 | QCopEnvelope e( "QPE/System", "closing(QString)" ); | 2151 | QCopEnvelope e( "QPE/System", "closing(QString)" ); |
2152 | e << d->appName; | 2152 | e << d->appName; |
2153 | } | 2153 | } |
2154 | #endif | 2154 | #endif |
2155 | processEvents(); | 2155 | processEvents(); |
2156 | return 0; | 2156 | return 0; |
2157 | } | 2157 | } |
2158 | 2158 | ||
2159 | /*! | 2159 | /*! |
2160 | \internal | 2160 | \internal |
2161 | External request for application to quit. Quits if possible without | 2161 | External request for application to quit. Quits if possible without |
2162 | loosing state. | 2162 | loosing state. |
2163 | */ | 2163 | */ |
2164 | void QPEApplication::tryQuit() | 2164 | void QPEApplication::tryQuit() |
2165 | { | 2165 | { |
2166 | if ( activeModalWidget() ) | 2166 | if ( activeModalWidget() ) |
2167 | return ; // Inside modal loop or konsole. Too hard to save state. | 2167 | return ; // Inside modal loop or konsole. Too hard to save state. |
2168 | #ifndef QT_NO_COP | 2168 | #ifndef QT_NO_COP |
2169 | 2169 | ||
2170 | { | 2170 | { |
2171 | QCopEnvelope e( "QPE/System", "closing(QString)" ); | 2171 | QCopEnvelope e( "QPE/System", "closing(QString)" ); |
2172 | e << d->appName; | 2172 | e << d->appName; |
2173 | } | 2173 | } |
2174 | #endif | 2174 | #endif |
2175 | if ( d->keep_running ) | 2175 | if ( d->keep_running ) |
2176 | d->store_widget_rect(d->qpe_main_widget, d->appName); | 2176 | d->store_widget_rect(d->qpe_main_widget, d->appName); |
2177 | processEvents(); | 2177 | processEvents(); |
2178 | 2178 | ||
2179 | quit(); | 2179 | quit(); |
2180 | } | 2180 | } |
2181 | 2181 | ||
2182 | 2182 | ||
2183 | /*! | 2183 | /*! |
2184 | \internal | 2184 | \internal |
2185 | User initiated quit. Makes the window 'Go Away'. If preloaded this means | 2185 | User initiated quit. Makes the window 'Go Away'. If preloaded this means |
2186 | hiding the window. If not it means quitting the application. | 2186 | hiding the window. If not it means quitting the application. |
2187 | As this is user initiated we don't need to check state. | 2187 | As this is user initiated we don't need to check state. |
2188 | */ | 2188 | */ |
2189 | void QPEApplication::hideOrQuit() | 2189 | void QPEApplication::hideOrQuit() |
2190 | { | 2190 | { |
2191 | if ( d->keep_running ) | 2191 | if ( d->keep_running ) |
2192 | d->store_widget_rect(d->qpe_main_widget, d->appName); | 2192 | d->store_widget_rect(d->qpe_main_widget, d->appName); |
2193 | processEvents(); | 2193 | processEvents(); |
2194 | 2194 | ||
2195 | // If we are a preloaded application we don't actually quit, so emit | 2195 | // If we are a preloaded application we don't actually quit, so emit |
2196 | // a System message indicating we're quasi-closing. | 2196 | // a System message indicating we're quasi-closing. |
2197 | if ( d->preloaded && d->qpe_main_widget ) | 2197 | if ( d->preloaded && d->qpe_main_widget ) |
2198 | #ifndef QT_NO_COP | 2198 | #ifndef QT_NO_COP |
2199 | 2199 | ||
2200 | { | 2200 | { |
2201 | QCopEnvelope e("QPE/System", "fastAppHiding(QString)" ); | 2201 | QCopEnvelope e("QPE/System", "fastAppHiding(QString)" ); |
2202 | e << d->appName; | 2202 | e << d->appName; |
2203 | d->qpe_main_widget->hide(); | 2203 | d->qpe_main_widget->hide(); |
2204 | } | 2204 | } |
2205 | #endif | 2205 | #endif |
2206 | else | 2206 | else |
2207 | quit(); | 2207 | quit(); |
2208 | } | 2208 | } |
2209 | 2209 | ||
2210 | #if (__GNUC__ > 2 ) | 2210 | #if (__GNUC__ > 2 ) && !defined(_OS_MACX_) |
2211 | extern "C" void __cxa_pure_virtual(); | 2211 | extern "C" void __cxa_pure_virtual(); |
2212 | 2212 | ||
2213 | void __cxa_pure_virtual() | 2213 | void __cxa_pure_virtual() |
2214 | { | 2214 | { |
2215 | fprintf( stderr, "Pure virtual called\n"); | 2215 | fprintf( stderr, "Pure virtual called\n"); |
2216 | abort(); | 2216 | abort(); |
2217 | 2217 | ||
2218 | } | 2218 | } |
2219 | 2219 | ||
2220 | #endif | 2220 | #endif |
2221 | 2221 | ||
2222 | 2222 | ||
2223 | #if defined(OPIE_NEW_MALLOC) | 2223 | #if defined(OPIE_NEW_MALLOC) |
2224 | 2224 | ||
2225 | // The libraries with the skiff package (and possibly others) have | 2225 | // The libraries with the skiff package (and possibly others) have |
2226 | // completely useless implementations of builtin new and delete that | 2226 | // completely useless implementations of builtin new and delete that |
2227 | // use about 50% of your CPU. Here we revert to the simple libc | 2227 | // use about 50% of your CPU. Here we revert to the simple libc |
2228 | // functions. | 2228 | // functions. |
2229 | 2229 | ||
2230 | void* operator new[]( size_t size ) | 2230 | void* operator new[]( size_t size ) |
2231 | { | 2231 | { |
2232 | return malloc( size ); | 2232 | return malloc( size ); |
2233 | } | 2233 | } |
2234 | 2234 | ||
2235 | void* operator new( size_t size ) | 2235 | void* operator new( size_t size ) |
2236 | { | 2236 | { |
2237 | return malloc( size ); | 2237 | return malloc( size ); |
2238 | } | 2238 | } |
2239 | 2239 | ||
2240 | void operator delete[]( void* p ) | 2240 | void operator delete[]( void* p ) |
2241 | { | 2241 | { |
2242 | if ( p ) | 2242 | if ( p ) |
2243 | free( p ); | 2243 | free( p ); |
2244 | } | 2244 | } |
2245 | 2245 | ||
2246 | void operator delete[]( void* p, size_t /*size*/ ) | 2246 | void operator delete[]( void* p, size_t /*size*/ ) |
2247 | { | 2247 | { |
2248 | if ( p ) | 2248 | if ( p ) |
2249 | free( p ); | 2249 | free( p ); |
2250 | } | 2250 | } |
2251 | 2251 | ||
2252 | 2252 | ||
2253 | void operator delete( void* p ) | 2253 | void operator delete( void* p ) |
2254 | { | 2254 | { |
2255 | if ( p ) | 2255 | if ( p ) |
2256 | free( p ); | 2256 | free( p ); |
2257 | } | 2257 | } |
2258 | 2258 | ||
2259 | void operator delete( void* p, size_t /*size*/ ) | 2259 | void operator delete( void* p, size_t /*size*/ ) |
2260 | { | 2260 | { |
2261 | if ( p ) | 2261 | if ( p ) |
2262 | free( p ); | 2262 | free( p ); |
2263 | } | 2263 | } |
2264 | 2264 | ||
2265 | #endif | 2265 | #endif |
2266 | 2266 | ||
2267 | #if ( QT_VERSION <= 230 ) && !defined(SINGLE_APP) | 2267 | #if ( QT_VERSION <= 230 ) && !defined(SINGLE_APP) |
2268 | #include <qwidgetlist.h> | 2268 | #include <qwidgetlist.h> |
2269 | #ifdef QWS | 2269 | #ifdef QWS |
2270 | #include <qgfx_qws.h> | 2270 | #include <qgfx_qws.h> |
2271 | extern QRect qt_maxWindowRect; | 2271 | extern QRect qt_maxWindowRect; |
2272 | void qt_setMaxWindowRect(const QRect& r ) | 2272 | void qt_setMaxWindowRect(const QRect& r ) |
2273 | { | 2273 | { |
2274 | qt_maxWindowRect = qt_screen->mapFromDevice( r, | 2274 | qt_maxWindowRect = qt_screen->mapFromDevice( r, |