summaryrefslogtreecommitdiff
path: root/library/global.cpp
authorkergoth <kergoth>2002-01-28 23:28:04 (UTC)
committer kergoth <kergoth>2002-01-28 23:28:04 (UTC)
commitf7b3193e5d2d9a211ce0b963dca571d82adecb71 (patch) (unidiff)
tree44f49bdc076dc299bba1a4dc8d5d517114be5701 /library/global.cpp
parent77d110d35f75d63f5dc66c1dd2427daf7dc2e214 (diff)
downloadopie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.zip
opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.tar.gz
opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.tar.bz2
Committing in .
Modified Files: configure mkipks addressbook/Makefile.in addressbook/addressbook.pro calc2/calc.pro calc2/binary/binary.pro calc2/simple/simple.pro calculator/Makefile.in calculator/calculator.pro cardmon/Makefile.in cardmon/cardmon.pro chess/chess.pro citytime/Makefile.in citytime/citytime.pro clock/Makefile.in clock/clock.pro datebook/Makefile.in datebook/datebook.pro dictionary/dictionary.pro doc/qcop.doc doc/start.doc embeddedkonsole/Makefile.in embeddedkonsole/embeddedkonsole.pro etc/init.d/qpe example/example.pro fifteen/Makefile.in fifteen/fifteen.pro filebrowser/Makefile.in filebrowser/filebrowser.pro freetype/freetype.pro go/Makefile.in go/go.pro helpbrowser/Makefile.in helpbrowser/helpbrowser.pro inputmethods/handwriting/Makefile.in inputmethods/handwriting/handwriting.pro inputmethods/keyboard/Makefile.in inputmethods/keyboard/keyboard.pro inputmethods/pickboard/Makefile.in inputmethods/pickboard/pickboard.pro inputmethods/unikeyboard/Makefile.in inputmethods/unikeyboard/unikeyboard.pro keypebble/Makefile.in keypebble/keypebble.pro library/Makefile.in library/global.cpp library/library.pro library/qpeapplication.cpp mindbreaker/Makefile.in mindbreaker/mindbreaker.pro minesweep/Makefile.in minesweep/minesweep.pro mpegplayer/Makefile.in mpegplayer/mpegplayer.pro mpegplayer/libflash/libflash.pro mpegplayer/libmad/Makefile.in mpegplayer/libmad/libmad.pro mpegplayer/libmpeg3/Makefile.in mpegplayer/libmpeg3/libmpeg3.pro mpegplayer/libmpeg3/audio/Makefile mpegplayer/libmpeg3/video/Makefile mpegplayer/wavplugin/Makefile.in mpegplayer/wavplugin/wavplugin.pro netsetup/Makefile.in netsetup/README netsetup/netsetup.pro netsetup/dialup/Makefile.in netsetup/dialup/dialup.pro netsetup/lan/Makefile.in netsetup/lan/lan.pro parashoot/Makefile.in parashoot/parashoot.pro qasteroids/Makefile.in qasteroids/qasteroids.pro qcop/Makefile.in qcop/qcop.pro qipkg/Makefile.in qipkg/qipkg.pro scripts/q_functions settings/appearance/Makefile.in settings/appearance/appearance.pro settings/language/Makefile.in settings/language/language.pro settings/light-and-power/Makefile.in settings/light-and-power/light-and-power.pro settings/rotation/Makefile.in settings/rotation/rotation.pro settings/security/Makefile.in settings/security/security.pro settings/sound/Makefile.in settings/sound/sound.pro settings/systemtime/Makefile.in settings/systemtime/systemtime.pro showimg/Makefile.in showimg/showimg.pro single/Makefile.in single/single.pro snake/Makefile.in snake/snake.pro solitaire/Makefile.in solitaire/solitaire.pro spreadsheet/Makefile.in spreadsheet/spreadsheet.pro sysinfo/Makefile.in sysinfo/sysinfo.pro tableviewer/tableviewer.pro taskbar/Makefile.in taskbar/main.cpp taskbar/taskbar.pro taskbar/batteryapplet/Makefile.in taskbar/batteryapplet/batteryapplet.pro taskbar/clipboardapplet/clipboardapplet.pro taskbar/clockapplet/Makefile.in taskbar/clockapplet/clockapplet.pro taskbar/netmonapplet/Makefile.in taskbar/netmonapplet/netmonapplet.pro taskbar/volumeapplet/Makefile.in taskbar/volumeapplet/volumeapplet.pro tetrix/Makefile.in tetrix/tetrix.pro textedit/Makefile.in textedit/textedit.pro todo/Makefile.in todo/todo.pro tux/Makefile.in tux/tux.pro website/htdocs/build.html website/htdocs/development.html website/htdocs/refman/qcop.html website/htdocs/refman/qpeapplication.html wordgame/Makefile.in wordgame/wordgame.pro Log Message: Changed QPEDIR to OPIEDIR in .pro files, and documentation, and regenerated all Makefile.in's that were affected.
Diffstat (limited to 'library/global.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--library/global.cpp2
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
@@ -89,97 +89,97 @@ StartingAppList::StartingAppList( QObject *parent, const char* name )
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
95void StartingAppList::add( const QString& name ) 95void 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
106bool StartingAppList::isStarting( const QString name ) 106bool 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
124void StartingAppList::handleNewChannel( const QString & name ) 124void 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
131static bool docDirCreated = FALSE; 131static bool docDirCreated = FALSE;
132static QDawg* fixed_dawg = 0; 132static QDawg* fixed_dawg = 0;
133static QDict<QDawg> *named_dawg = 0; 133static QDict<QDawg> *named_dawg = 0;
134 134
135static QString qpeDir() 135static 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
142static QString dictDir() 142static 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*/
155Global::Global() 155Global::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*/
165const QDawg& Global::fixedDawg() 165const 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);