-rw-r--r-- | library/qpeapplication.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 86aa53d..4d0b0ea 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -93,34 +93,36 @@ | |||
93 | 93 | ||
94 | 94 | ||
95 | class QPEApplicationData | 95 | class QPEApplicationData |
96 | { | 96 | { |
97 | public: | 97 | public: |
98 | QPEApplicationData ( ) | 98 | QPEApplicationData ( ) |
99 | : presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ), | 99 | : presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ), |
100 | notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ), | 100 | notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ), |
101 | keep_running( true ), qpe_main_widget( 0 ) | 101 | keep_running( true ), qpe_main_widget( 0 ), qcopQok( false ) |
102 | 102 | ||
103 | { | 103 | { |
104 | qcopq.setAutoDelete( TRUE ); | 104 | qcopq.setAutoDelete( TRUE ); |
105 | } | 105 | } |
106 | 106 | ||
107 | int presstimer; | 107 | int presstimer; |
108 | QWidget* presswidget; | 108 | QWidget* presswidget; |
109 | QPoint presspos; | 109 | QPoint presspos; |
110 | 110 | ||
111 | bool rightpressed : 1; | 111 | bool rightpressed : 1; |
112 | bool kbgrabbed : 1; | 112 | bool kbgrabbed : 1; |
113 | bool notbusysent : 1; | 113 | bool notbusysent : 1; |
114 | bool preloaded : 1; | 114 | bool preloaded : 1; |
115 | bool forceshow : 1; | 115 | bool forceshow : 1; |
116 | bool nomaximize : 1; | 116 | bool nomaximize : 1; |
117 | bool qcopQok : 1; | ||
117 | bool keep_running : 1; | 118 | bool keep_running : 1; |
118 | 119 | ||
120 | |||
119 | QStringList langs; | 121 | QStringList langs; |
120 | QString appName; | 122 | QString appName; |
121 | struct QCopRec | 123 | struct QCopRec |
122 | { | 124 | { |
123 | QCopRec( const QCString &ch, const QCString &msg, | 125 | QCopRec( const QCString &ch, const QCString &msg, |
124 | const QByteArray &d ) : | 126 | const QByteArray &d ) : |
125 | channel( ch ), message( msg ), data( d ) | 127 | channel( ch ), message( msg ), data( d ) |
126 | { } | 128 | { } |
@@ -137,16 +139,19 @@ public: | |||
137 | 139 | ||
138 | void enqueueQCop( const QCString &ch, const QCString &msg, | 140 | void enqueueQCop( const QCString &ch, const QCString &msg, |
139 | const QByteArray &data ) | 141 | const QByteArray &data ) |
140 | { | 142 | { |
141 | qcopq.append( new QCopRec( ch, msg, data ) ); | 143 | qcopq.append( new QCopRec( ch, msg, data ) ); |
142 | } | 144 | } |
143 | void sendQCopQ() | 145 | void sendQCopQ() |
144 | { | 146 | { |
147 | if (!qcopQok ) | ||
148 | return; | ||
149 | |||
145 | QCopRec * r; | 150 | QCopRec * r; |
146 | #ifndef QT_NO_COP | 151 | #ifndef QT_NO_COP |
147 | 152 | ||
148 | for ( QListIterator<QCopRec> it( qcopq ); ( r = it.current() ); ++it ) | 153 | for ( QListIterator<QCopRec> it( qcopq ); ( r = it.current() ); ++it ) |
149 | QCopChannel::sendLocally( r->channel, r->message, r->data ); | 154 | QCopChannel::sendLocally( r->channel, r->message, r->data ); |
150 | #endif | 155 | #endif |
151 | 156 | ||
152 | qcopq.clear(); | 157 | qcopq.clear(); |
@@ -1888,16 +1893,17 @@ void QPEApplication::grabKeyboard() | |||
1888 | ((QPEApplication *) qApp )-> d-> kbgrabbed = true; | 1893 | ((QPEApplication *) qApp )-> d-> kbgrabbed = true; |
1889 | } | 1894 | } |
1890 | 1895 | ||
1891 | /*! | 1896 | /*! |
1892 | \reimp | 1897 | \reimp |
1893 | */ | 1898 | */ |
1894 | int QPEApplication::exec() | 1899 | int QPEApplication::exec() |
1895 | { | 1900 | { |
1901 | d->qcopQok = true; | ||
1896 | #ifndef QT_NO_COP | 1902 | #ifndef QT_NO_COP |
1897 | d->sendQCopQ(); | 1903 | d->sendQCopQ(); |
1898 | #endif | 1904 | #endif |
1899 | 1905 | ||
1900 | if ( d->keep_running ) | 1906 | if ( d->keep_running ) |
1901 | //|| d->qpe_main_widget && d->qpe_main_widget->isVisible() ) | 1907 | //|| d->qpe_main_widget && d->qpe_main_widget->isVisible() ) |
1902 | return QApplication::exec(); | 1908 | return QApplication::exec(); |
1903 | 1909 | ||