-rw-r--r-- | library/global.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/global.cpp b/library/global.cpp index e1bbf3e..e5fc2b3 100644 --- a/library/global.cpp +++ b/library/global.cpp | |||
@@ -73,129 +73,129 @@ public: | |||
73 | static bool isStarting( const QString name ); | 73 | static bool isStarting( const QString name ); |
74 | private slots: | 74 | private slots: |
75 | void handleNewChannel( const QString &); | 75 | void handleNewChannel( const QString &); |
76 | private: | 76 | private: |
77 | StartingAppList( QObject *parent=0, const char* name=0 ) ; | 77 | StartingAppList( QObject *parent=0, const char* name=0 ) ; |
78 | 78 | ||
79 | QDict<QTime> dict; | 79 | QDict<QTime> dict; |
80 | static StartingAppList *appl; | 80 | static StartingAppList *appl; |
81 | }; | 81 | }; |
82 | 82 | ||
83 | StartingAppList* StartingAppList::appl = 0; | 83 | StartingAppList* StartingAppList::appl = 0; |
84 | 84 | ||
85 | StartingAppList::StartingAppList( QObject *parent, const char* name ) | 85 | StartingAppList::StartingAppList( QObject *parent, const char* name ) |
86 | :QObject( parent, name ) | 86 | :QObject( parent, name ) |
87 | { | 87 | { |
88 | #if QT_VERSION >= 232 && !defined(QT_NO_COP) | 88 | #if QT_VERSION >= 232 && !defined(QT_NO_COP) |
89 | connect( qwsServer, SIGNAL( newChannel(const QString&)), | 89 | connect( qwsServer, SIGNAL( newChannel(const QString&)), |
90 | this, SLOT( handleNewChannel(const QString&)) ); | 90 | this, SLOT( handleNewChannel(const QString&)) ); |
91 | dict.setAutoDelete( TRUE ); | 91 | dict.setAutoDelete( TRUE ); |
92 | #endif | 92 | #endif |
93 | } | 93 | } |
94 | 94 | ||
95 | void StartingAppList::add( const QString& name ) | 95 | void StartingAppList::add( const QString& name ) |
96 | { | 96 | { |
97 | #if QT_VERSION >= 232 && !defined(QT_NO_COP) | 97 | #if QT_VERSION >= 232 && !defined(QT_NO_COP) |
98 | if ( !appl ) | 98 | if ( !appl ) |
99 | appl = new StartingAppList; | 99 | appl = new StartingAppList; |
100 | QTime *t = new QTime; | 100 | QTime *t = new QTime; |
101 | t->start(); | 101 | t->start(); |
102 | appl->dict.insert( "QPE/Application/" + name, t ); | 102 | appl->dict.insert( "QPE/Application/" + name, t ); |
103 | #endif | 103 | #endif |
104 | } | 104 | } |
105 | 105 | ||
106 | bool StartingAppList::isStarting( const QString name ) | 106 | bool StartingAppList::isStarting( const QString name ) |
107 | { | 107 | { |
108 | #if QT_VERSION >= 232 && !defined(QT_NO_COP) | 108 | #if QT_VERSION >= 232 && !defined(QT_NO_COP) |
109 | if ( appl ) { | 109 | if ( appl ) { |
110 | QTime *t = appl->dict.find( "QPE/Application/" + name ); | 110 | QTime *t = appl->dict.find( "QPE/Application/" + name ); |
111 | if ( !t ) | 111 | if ( !t ) |
112 | return FALSE; | 112 | return FALSE; |
113 | if ( t->elapsed() > 10000 ) { | 113 | if ( t->elapsed() > 10000 ) { |
114 | // timeout in case of crash or something | 114 | // timeout in case of crash or something |
115 | appl->dict.remove( "QPE/Application/" + name ); | 115 | appl->dict.remove( "QPE/Application/" + name ); |
116 | return FALSE; | 116 | return FALSE; |
117 | } | 117 | } |
118 | return TRUE; | 118 | return TRUE; |
119 | } | 119 | } |
120 | #endif | 120 | #endif |
121 | return FALSE; | 121 | return FALSE; |
122 | } | 122 | } |
123 | 123 | ||
124 | void StartingAppList::handleNewChannel( const QString & name ) | 124 | void StartingAppList::handleNewChannel( const QString & name ) |
125 | { | 125 | { |
126 | #if QT_VERSION >= 232 && !defined(QT_NO_COP) | 126 | #if QT_VERSION >= 232 && !defined(QT_NO_COP) |
127 | dict.remove( name ); | 127 | dict.remove( name ); |
128 | #endif | 128 | #endif |
129 | } | 129 | } |
130 | 130 | ||
131 | static bool docDirCreated = FALSE; | 131 | static bool docDirCreated = FALSE; |
132 | static QDawg* fixed_dawg = 0; | 132 | static QDawg* fixed_dawg = 0; |
133 | static QDict<QDawg> *named_dawg = 0; | 133 | static QDict<QDawg> *named_dawg = 0; |
134 | 134 | ||
135 | static QString qpeDir() | 135 | static QString qpeDir() |
136 | { | 136 | { |
137 | QString dir = getenv("QPEDIR"); | 137 | QString dir = getenv("OPIEDIR"); |
138 | if ( dir.isEmpty() ) dir = ".."; | 138 | if ( dir.isEmpty() ) dir = ".."; |
139 | return dir; | 139 | return dir; |
140 | } | 140 | } |
141 | 141 | ||
142 | static QString dictDir() | 142 | static QString dictDir() |
143 | { | 143 | { |
144 | return qpeDir() + "/etc/dict"; | 144 | return qpeDir() + "/etc/dict"; |
145 | } | 145 | } |
146 | 146 | ||
147 | /*! | 147 | /*! |
148 | \class Global global.h | 148 | \class Global global.h |
149 | \brief The Global class collects application-wide global functions. | 149 | \brief The Global class collects application-wide global functions. |
150 | */ | 150 | */ |
151 | 151 | ||
152 | /*! | 152 | /*! |
153 | \internal | 153 | \internal |
154 | */ | 154 | */ |
155 | Global::Global() | 155 | Global::Global() |
156 | { | 156 | { |
157 | } | 157 | } |
158 | 158 | ||
159 | /*! | 159 | /*! |
160 | Returns the unchangeable QDawg that contains general | 160 | Returns the unchangeable QDawg that contains general |
161 | words for the current locale. | 161 | words for the current locale. |
162 | 162 | ||
163 | \sa addedDawg() | 163 | \sa addedDawg() |
164 | */ | 164 | */ |
165 | const QDawg& Global::fixedDawg() | 165 | const QDawg& Global::fixedDawg() |
166 | { | 166 | { |
167 | if ( !fixed_dawg ) { | 167 | if ( !fixed_dawg ) { |
168 | if ( !docDirCreated ) | 168 | if ( !docDirCreated ) |
169 | createDocDir(); | 169 | createDocDir(); |
170 | 170 | ||
171 | fixed_dawg = new QDawg; | 171 | fixed_dawg = new QDawg; |
172 | QString dawgfilename = dictDir() + "/dawg"; | 172 | QString dawgfilename = dictDir() + "/dawg"; |
173 | QString lang = getenv( "LANG" ); | 173 | QString lang = getenv( "LANG" ); |
174 | QString dawgfilename_lang = dawgfilename + "." + lang; | 174 | QString dawgfilename_lang = dawgfilename + "." + lang; |
175 | QString words_lang = dictDir() + "/words." + lang; | 175 | QString words_lang = dictDir() + "/words." + lang; |
176 | if ( QFile::exists(dawgfilename_lang) || | 176 | if ( QFile::exists(dawgfilename_lang) || |
177 | QFile::exists(words_lang) ) | 177 | QFile::exists(words_lang) ) |
178 | dawgfilename = dawgfilename_lang; | 178 | dawgfilename = dawgfilename_lang; |
179 | QFile dawgfile(dawgfilename); | 179 | QFile dawgfile(dawgfilename); |
180 | 180 | ||
181 | if ( !dawgfile.exists() ) { | 181 | if ( !dawgfile.exists() ) { |
182 | QString fn = dictDir() + "/words"; | 182 | QString fn = dictDir() + "/words"; |
183 | if ( QFile::exists(words_lang) ) | 183 | if ( QFile::exists(words_lang) ) |
184 | fn = words_lang; | 184 | fn = words_lang; |
185 | QFile in(fn); | 185 | QFile in(fn); |
186 | if ( in.open(IO_ReadOnly) ) { | 186 | if ( in.open(IO_ReadOnly) ) { |
187 | fixed_dawg->createFromWords(&in); | 187 | fixed_dawg->createFromWords(&in); |
188 | dawgfile.open(IO_WriteOnly); | 188 | dawgfile.open(IO_WriteOnly); |
189 | fixed_dawg->write(&dawgfile); | 189 | fixed_dawg->write(&dawgfile); |
190 | dawgfile.close(); | 190 | dawgfile.close(); |
191 | } | 191 | } |
192 | } else { | 192 | } else { |
193 | fixed_dawg->readFile(dawgfilename); | 193 | fixed_dawg->readFile(dawgfilename); |
194 | } | 194 | } |
195 | } | 195 | } |
196 | 196 | ||
197 | return *fixed_dawg; | 197 | return *fixed_dawg; |
198 | } | 198 | } |
199 | 199 | ||
200 | /*! | 200 | /*! |
201 | Returns the changeable QDawg that contains general | 201 | Returns the changeable QDawg that contains general |