-rw-r--r-- | library/global.cpp | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/library/global.cpp b/library/global.cpp index 9b908bf..d02e711 100644 --- a/library/global.cpp +++ b/library/global.cpp | |||
@@ -26,7 +26,5 @@ | |||
26 | #include <qpe/storage.h> | 26 | #include <qpe/storage.h> |
27 | #include <qpe/applnk.h> | 27 | #include <qpe/applnk.h> |
28 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 28 | #include <qpe/qcopenvelope_qws.h> |
29 | #include "qpe/qcopenvelope_qws.h" | ||
30 | #endif | ||
31 | 29 | ||
32 | #include <qfile.h> | 30 | #include <qfile.h> |
@@ -46,7 +44,5 @@ | |||
46 | #include <unistd.h> | 44 | #include <unistd.h> |
47 | 45 | ||
48 | #ifdef QWS | ||
49 | #include <qwindowsystem_qws.h> // for qwsServer | 46 | #include <qwindowsystem_qws.h> // for qwsServer |
50 | #endif | ||
51 | #include <qdatetime.h> | 47 | #include <qdatetime.h> |
52 | 48 | ||
@@ -111,5 +107,4 @@ StartingAppList::StartingAppList( QObject *parent, const char* name ) | |||
111 | :QObject( parent, name ) | 107 | :QObject( parent, name ) |
112 | { | 108 | { |
113 | #ifdef QWS | ||
114 | #if QT_VERSION >= 232 && !defined(QT_NO_COP) | 109 | #if QT_VERSION >= 232 && !defined(QT_NO_COP) |
115 | connect( qwsServer, SIGNAL( newChannel(const QString&)), | 110 | connect( qwsServer, SIGNAL( newChannel(const QString&)), |
@@ -117,5 +112,4 @@ StartingAppList::StartingAppList( QObject *parent, const char* name ) | |||
117 | dict.setAutoDelete( TRUE ); | 112 | dict.setAutoDelete( TRUE ); |
118 | #endif | 113 | #endif |
119 | #endif | ||
120 | } | 114 | } |
121 | 115 | ||
@@ -394,5 +388,5 @@ void Global::createDocDir() | |||
394 | void Global::statusMessage(const QString& message) | 388 | void Global::statusMessage(const QString& message) |
395 | { | 389 | { |
396 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 390 | #if!defined(QT_NO_COP) |
397 | QCopEnvelope e( "QPE/TaskBar", "message(QString)" ); | 391 | QCopEnvelope e( "QPE/TaskBar", "message(QString)" ); |
398 | e << message; | 392 | e << message; |
@@ -405,5 +399,5 @@ void Global::statusMessage(const QString& message) | |||
405 | void Global::applyStyle() | 399 | void Global::applyStyle() |
406 | { | 400 | { |
407 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 401 | #if !defined(QT_NO_COP) |
408 | QCopChannel::send( "QPE/System", "applyStyle()" ); | 402 | QCopChannel::send( "QPE/System", "applyStyle()" ); |
409 | #else | 403 | #else |
@@ -417,5 +411,5 @@ void Global::applyStyle() | |||
417 | QWidget *Global::shutdown( bool ) | 411 | QWidget *Global::shutdown( bool ) |
418 | { | 412 | { |
419 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 413 | #if !defined(QT_NO_COP) |
420 | QCopChannel::send( "QPE/System", "shutdown()" ); | 414 | QCopChannel::send( "QPE/System", "shutdown()" ); |
421 | #endif | 415 | #endif |
@@ -428,5 +422,5 @@ QWidget *Global::shutdown( bool ) | |||
428 | QWidget *Global::restart( bool ) | 422 | QWidget *Global::restart( bool ) |
429 | { | 423 | { |
430 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 424 | #if !defined(QT_NO_COP) |
431 | QCopChannel::send( "QPE/System", "restart()" ); | 425 | QCopChannel::send( "QPE/System", "restart()" ); |
432 | #endif | 426 | #endif |
@@ -446,5 +440,5 @@ QWidget *Global::restart( bool ) | |||
446 | void Global::showInputMethod() | 440 | void Global::showInputMethod() |
447 | { | 441 | { |
448 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 442 | #if !defined(QT_NO_COP) |
449 | QCopChannel::send( "QPE/TaskBar", "showInputMethod()" ); | 443 | QCopChannel::send( "QPE/TaskBar", "showInputMethod()" ); |
450 | #endif | 444 | #endif |
@@ -461,5 +455,5 @@ void Global::showInputMethod() | |||
461 | void Global::hideInputMethod() | 455 | void Global::hideInputMethod() |
462 | { | 456 | { |
463 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 457 | #if !defined(QT_NO_COP) |
464 | QCopChannel::send( "QPE/TaskBar", "hideInputMethod()" ); | 458 | QCopChannel::send( "QPE/TaskBar", "hideInputMethod()" ); |
465 | #endif | 459 | #endif |
@@ -560,5 +554,5 @@ void Global::invoke(const QString &c) | |||
560 | QStringList list = QStringList::split(QRegExp(" *"),c); | 554 | QStringList list = QStringList::split(QRegExp(" *"),c); |
561 | 555 | ||
562 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 556 | #if !defined(QT_NO_COP) |
563 | QString ap=list[0]; | 557 | QString ap=list[0]; |
564 | // see if the application is already running | 558 | // see if the application is already running |
@@ -596,5 +590,5 @@ void Global::invoke(const QString &c) | |||
596 | args[j] = NULL; | 590 | args[j] = NULL; |
597 | 591 | ||
598 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 592 | #if !defined(QT_NO_COP) |
599 | // an attempt to show a wait... | 593 | // an attempt to show a wait... |
600 | // more logic should be used, but this will be fine for the moment... | 594 | // more logic should be used, but this will be fine for the moment... |
@@ -637,5 +631,5 @@ void Global::execute( const QString &c, const QString& document ) | |||
637 | if ( qApp->type() != QApplication::GuiServer ) { | 631 | if ( qApp->type() != QApplication::GuiServer ) { |
638 | // ask the server to do the work | 632 | // ask the server to do the work |
639 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 633 | #if !defined(QT_NO_COP) |
640 | if ( document.isNull() ) { | 634 | if ( document.isNull() ) { |
641 | QCopEnvelope e( "QPE/System", "execute(QString)" ); | 635 | QCopEnvelope e( "QPE/System", "execute(QString)" ); |
@@ -677,5 +671,5 @@ void Global::execute( const QString &c, const QString& document ) | |||
677 | QStringList list = QStringList::split(QRegExp(" *"),c); | 671 | QStringList list = QStringList::split(QRegExp(" *"),c); |
678 | 672 | ||
679 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 673 | #if !defined(QT_NO_COP) |
680 | QString ap=list[0]; | 674 | QString ap=list[0]; |
681 | 675 | ||