summaryrefslogtreecommitdiff
authorzecke <zecke>2002-11-08 18:09:37 (UTC)
committer zecke <zecke>2002-11-08 18:09:37 (UTC)
commit028753a6a3857cdcf7476e537de1cd5c471424c4 (patch) (unidiff)
tree29ea6ac56b0a0310d74096101b37cce6ec9430ef
parent24da3ab5dd821dd552f13fa7b22f5b3c2986eecd (diff)
downloadopie-028753a6a3857cdcf7476e537de1cd5c471424c4.zip
opie-028753a6a3857cdcf7476e537de1cd5c471424c4.tar.gz
opie-028753a6a3857cdcf7476e537de1cd5c471424c4.tar.bz2
qwsServer belongs to QWS
and not to !QT_NO_COP
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/global.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/library/global.cpp b/library/global.cpp
index d02e711..9b3c51e 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -85,53 +85,53 @@ public:
85signals: 85signals:
86 void setDocument(const QString&); 86 void setDocument(const QString&);
87}; 87};
88 88
89 89
90class StartingAppList : public QObject { 90class StartingAppList : public QObject {
91 Q_OBJECT 91 Q_OBJECT
92public: 92public:
93 static void add( const QString& name ); 93 static void add( const QString& name );
94 static bool isStarting( const QString name ); 94 static bool isStarting( const QString name );
95private slots: 95private slots:
96 void handleNewChannel( const QString &); 96 void handleNewChannel( const QString &);
97private: 97private:
98 StartingAppList( QObject *parent=0, const char* name=0 ) ; 98 StartingAppList( QObject *parent=0, const char* name=0 ) ;
99 99
100 QDict<QTime> dict; 100 QDict<QTime> dict;
101 static StartingAppList *appl; 101 static StartingAppList *appl;
102}; 102};
103 103
104StartingAppList* StartingAppList::appl = 0; 104StartingAppList* StartingAppList::appl = 0;
105 105
106StartingAppList::StartingAppList( QObject *parent, const char* name ) 106StartingAppList::StartingAppList( QObject *parent, const char* name )
107 :QObject( parent, name ) 107 :QObject( parent, name )
108{ 108{
109#if QT_VERSION >= 232 && !defined(QT_NO_COP) 109#if QT_VERSION >= 232 && defined(QWS)
110 connect( qwsServer, SIGNAL( newChannel(const QString&)), 110 connect( qwsServer, SIGNAL( newChannel(const QString&)),
111 this, SLOT( handleNewChannel(const QString&)) ); 111 this, SLOT( handleNewChannel(const QString&)) );
112 #endif
112 dict.setAutoDelete( TRUE ); 113 dict.setAutoDelete( TRUE );
113#endif
114} 114}
115 115
116void StartingAppList::add( const QString& name ) 116void StartingAppList::add( const QString& name )
117{ 117{
118#if QT_VERSION >= 232 && !defined(QT_NO_COP) 118#if QT_VERSION >= 232 && !defined(QT_NO_COP)
119 if ( !appl ) 119 if ( !appl )
120 appl = new StartingAppList; 120 appl = new StartingAppList;
121 QTime *t = new QTime; 121 QTime *t = new QTime;
122 t->start(); 122 t->start();
123 appl->dict.insert( "QPE/Application/" + name, t ); 123 appl->dict.insert( "QPE/Application/" + name, t );
124#endif 124#endif
125} 125}
126 126
127bool StartingAppList::isStarting( const QString name ) 127bool StartingAppList::isStarting( const QString name )
128{ 128{
129#if QT_VERSION >= 232 && !defined(QT_NO_COP) 129#if QT_VERSION >= 232 && !defined(QT_NO_COP)
130 if ( appl ) { 130 if ( appl ) {
131 QTime *t = appl->dict.find( "QPE/Application/" + name ); 131 QTime *t = appl->dict.find( "QPE/Application/" + name );
132 if ( !t ) 132 if ( !t )
133 return FALSE; 133 return FALSE;
134 if ( t->elapsed() > 10000 ) { 134 if ( t->elapsed() > 10000 ) {
135 // timeout in case of crash or something 135 // timeout in case of crash or something
136 appl->dict.remove( "QPE/Application/" + name ); 136 appl->dict.remove( "QPE/Application/" + name );
137 return FALSE; 137 return FALSE;