summaryrefslogtreecommitdiff
path: root/library
Unidiff
Diffstat (limited to 'library') (more/less context) (ignore whitespace changes)
-rw-r--r--library/power.cpp2
-rw-r--r--library/qpeapplication.cpp10
-rw-r--r--library/storage.cpp2
3 files changed, 7 insertions, 7 deletions
diff --git a/library/power.cpp b/library/power.cpp
index 5310b47..e7e5b24 100644
--- a/library/power.cpp
+++ b/library/power.cpp
@@ -1,119 +1,119 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#include "power.h" 21#include "power.h"
22 22
23#ifdef QT_QWS_SL5XXX 23#if defined(QT_QWS_SL5XXX) || defined(QT_QWS_RAMSES)
24#include "custom.h" 24#include "custom.h"
25#endif 25#endif
26 26
27#include <unistd.h> 27#include <unistd.h>
28#include <stdlib.h> 28#include <stdlib.h>
29#include <stdio.h> 29#include <stdio.h>
30#include <fcntl.h> 30#include <fcntl.h>
31#include <sys/ioctl.h> 31#include <sys/ioctl.h>
32 32
33#ifdef QT_QWS_IPAQ_NO_APM 33#ifdef QT_QWS_IPAQ_NO_APM
34#include <linux/h3600_ts.h> 34#include <linux/h3600_ts.h>
35#endif 35#endif
36 36
37PowerStatusManager *PowerStatusManager::powerManager = 0; 37PowerStatusManager *PowerStatusManager::powerManager = 0;
38PowerStatus *PowerStatusManager::ps = 0; 38PowerStatus *PowerStatusManager::ps = 0;
39 39
40static bool haveProcApm = false; 40static bool haveProcApm = false;
41 41
42PowerStatusManager::PowerStatusManager() 42PowerStatusManager::PowerStatusManager()
43{ 43{
44 powerManager = this; 44 powerManager = this;
45 ps = new PowerStatus; 45 ps = new PowerStatus;
46 FILE *f = fopen("/proc/apm", "r"); 46 FILE *f = fopen("/proc/apm", "r");
47 if ( f ) { 47 if ( f ) {
48 fclose(f); 48 fclose(f);
49 haveProcApm = TRUE; 49 haveProcApm = TRUE;
50 } 50 }
51} 51}
52 52
53const PowerStatus &PowerStatusManager::readStatus() 53const PowerStatus &PowerStatusManager::readStatus()
54{ 54{
55 if ( !powerManager ) 55 if ( !powerManager )
56 (void)new PowerStatusManager; 56 (void)new PowerStatusManager;
57 57
58 powerManager->getStatus(); 58 powerManager->getStatus();
59 59
60 return *ps; 60 return *ps;
61} 61}
62 62
63// Standard /proc/apm reader 63// Standard /proc/apm reader
64bool PowerStatusManager::getProcApmStatus( int &ac, int &bs, int &bf, int &pc, int &sec ) 64bool PowerStatusManager::getProcApmStatus( int &ac, int &bs, int &bf, int &pc, int &sec )
65{ 65{
66 bool ok = false; 66 bool ok = false;
67 67
68 ac = 0xff; 68 ac = 0xff;
69 bs = 0xff; 69 bs = 0xff;
70 bf = 0xff; 70 bf = 0xff;
71 pc = -1; 71 pc = -1;
72 sec = -1; 72 sec = -1;
73 73
74 FILE *f = fopen("/proc/apm", "r"); 74 FILE *f = fopen("/proc/apm", "r");
75 if ( f ) { 75 if ( f ) {
76 //I 1.13 1.2 0x02 0x00 0xff 0xff 49% 147 sec 76 //I 1.13 1.2 0x02 0x00 0xff 0xff 49% 147 sec
77 char u; 77 char u;
78 fscanf(f, "%*[^ ] %*d.%*d 0x%*x 0x%x 0x%x 0x%x %d%% %i %c", 78 fscanf(f, "%*[^ ] %*d.%*d 0x%*x 0x%x 0x%x 0x%x %d%% %i %c",
79 &ac, &bs, &bf, &pc, &sec, &u); 79 &ac, &bs, &bf, &pc, &sec, &u);
80 fclose(f); 80 fclose(f);
81 switch ( u ) { 81 switch ( u ) {
82 case 'm': sec *= 60; 82 case 'm': sec *= 60;
83 case 's': break; // ok 83 case 's': break; // ok
84 default: sec = -1; // unknown 84 default: sec = -1; // unknown
85 } 85 }
86 86
87 // extract data 87 // extract data
88 switch ( bs ) { 88 switch ( bs ) {
89 case 0x00: 89 case 0x00:
90 ps->bs = PowerStatus::High; 90 ps->bs = PowerStatus::High;
91 break; 91 break;
92 case 0x01: 92 case 0x01:
93 ps->bs = PowerStatus::Low; 93 ps->bs = PowerStatus::Low;
94 break; 94 break;
95 case 0x7f: 95 case 0x7f:
96 ps->bs = PowerStatus::VeryLow; 96 ps->bs = PowerStatus::VeryLow;
97 break; 97 break;
98 case 0x02: 98 case 0x02:
99 ps->bs = PowerStatus::Critical; 99 ps->bs = PowerStatus::Critical;
100 break; 100 break;
101 case 0x03: 101 case 0x03:
102 ps->bs = PowerStatus::Charging; 102 ps->bs = PowerStatus::Charging;
103 break; 103 break;
104 case 0x04: 104 case 0x04:
105 case 0xff: // 0xff is Unknown but we map to NotPresent 105 case 0xff: // 0xff is Unknown but we map to NotPresent
106 default: 106 default:
107 ps->bs = PowerStatus::NotPresent; 107 ps->bs = PowerStatus::NotPresent;
108 break; 108 break;
109 } 109 }
110 110
111 switch ( ac ) { 111 switch ( ac ) {
112 case 0x00: 112 case 0x00:
113 ps->ac = PowerStatus::Offline; 113 ps->ac = PowerStatus::Offline;
114 break; 114 break;
115 case 0x01: 115 case 0x01:
116 ps->ac = PowerStatus::Online; 116 ps->ac = PowerStatus::Online;
117 break; 117 break;
118 case 0x02: 118 case 0x02:
119 ps->ac = PowerStatus::Backup; 119 ps->ac = PowerStatus::Backup;
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 22d222a..4bc08b3 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -59,197 +59,197 @@
59#else 59#else
60#include <qplatinumstyle.h> 60#include <qplatinumstyle.h>
61#include <qwindowsstyle.h> 61#include <qwindowsstyle.h>
62#include <qmotifstyle.h> 62#include <qmotifstyle.h>
63#include <qmotifplusstyle.h> 63#include <qmotifplusstyle.h>
64#include "lightstyle.h" 64#include "lightstyle.h"
65 65
66#include <qpe/qlibrary.h> 66#include <qpe/qlibrary.h>
67#endif 67#endif
68#include "global.h" 68#include "global.h"
69#include "resource.h" 69#include "resource.h"
70#if QT_VERSION <= 230 && defined(QT_NO_CODECS) 70#if QT_VERSION <= 230 && defined(QT_NO_CODECS)
71#include "qutfcodec.h" 71#include "qutfcodec.h"
72#endif 72#endif
73#include "config.h" 73#include "config.h"
74#include "network.h" 74#include "network.h"
75#ifdef QWS 75#ifdef QWS
76#include "fontmanager.h" 76#include "fontmanager.h"
77#endif 77#endif
78 78
79#include "alarmserver.h" 79#include "alarmserver.h"
80#include "applnk.h" 80#include "applnk.h"
81#include "qpemenubar.h" 81#include "qpemenubar.h"
82#include "textcodecinterface.h" 82#include "textcodecinterface.h"
83#include "imagecodecinterface.h" 83#include "imagecodecinterface.h"
84 84
85#include <unistd.h> 85#include <unistd.h>
86#include <sys/file.h> 86#include <sys/file.h>
87#include <sys/ioctl.h> 87#include <sys/ioctl.h>
88#include <sys/soundcard.h> 88#include <sys/soundcard.h>
89 89
90#include "qt_override_p.h" 90#include "qt_override_p.h"
91 91
92 92
93class QPEApplicationData 93class QPEApplicationData
94{ 94{
95public: 95public:
96 QPEApplicationData ( ) 96 QPEApplicationData ( )
97 : presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ), 97 : presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ),
98 notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ), 98 notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ),
99 keep_running( true ), qpe_main_widget( 0 ) 99 keep_running( true ), qpe_main_widget( 0 )
100 100
101 { 101 {
102 qcopq.setAutoDelete( TRUE ); 102 qcopq.setAutoDelete( TRUE );
103 } 103 }
104 104
105 int presstimer; 105 int presstimer;
106 QWidget* presswidget; 106 QWidget* presswidget;
107 QPoint presspos; 107 QPoint presspos;
108 108
109 bool rightpressed : 1; 109 bool rightpressed : 1;
110 bool kbgrabbed : 1; 110 bool kbgrabbed : 1;
111 bool notbusysent : 1; 111 bool notbusysent : 1;
112 bool preloaded : 1; 112 bool preloaded : 1;
113 bool forceshow : 1; 113 bool forceshow : 1;
114 bool nomaximize : 1; 114 bool nomaximize : 1;
115 bool keep_running : 1; 115 bool keep_running : 1;
116 116
117 QString appName; 117 QString appName;
118 struct QCopRec 118 struct QCopRec
119 { 119 {
120 QCopRec( const QCString &ch, const QCString &msg, 120 QCopRec( const QCString &ch, const QCString &msg,
121 const QByteArray &d ) : 121 const QByteArray &d ) :
122 channel( ch ), message( msg ), data( d ) 122 channel( ch ), message( msg ), data( d )
123 { } 123 { }
124 124
125 QCString channel; 125 QCString channel;
126 QCString message; 126 QCString message;
127 QByteArray data; 127 QByteArray data;
128 }; 128 };
129 QWidget* qpe_main_widget; 129 QWidget* qpe_main_widget;
130 QList<QCopRec> qcopq; 130 QList<QCopRec> qcopq;
131 131
132 void enqueueQCop( const QCString &ch, const QCString &msg, 132 void enqueueQCop( const QCString &ch, const QCString &msg,
133 const QByteArray &data ) 133 const QByteArray &data )
134 { 134 {
135 qcopq.append( new QCopRec( ch, msg, data ) ); 135 qcopq.append( new QCopRec( ch, msg, data ) );
136 } 136 }
137 void sendQCopQ() 137 void sendQCopQ()
138 { 138 {
139 QCopRec * r; 139 QCopRec * r;
140#ifndef QT_NO_COP 140#ifndef QT_NO_COP
141 141
142 for ( QListIterator<QCopRec> it( qcopq ); ( r = it.current() ); ++it ) 142 for ( QListIterator<QCopRec> it( qcopq ); ( r = it.current() ); ++it )
143 QCopChannel::sendLocally( r->channel, r->message, r->data ); 143 QCopChannel::sendLocally( r->channel, r->message, r->data );
144#endif 144#endif
145 145
146 qcopq.clear(); 146 qcopq.clear();
147 } 147 }
148 static void show_mx(QWidget* mw, bool nomaximize) 148 static void show_mx(QWidget* mw, bool nomaximize)
149 { 149 {
150 150
151 // ugly hack, remove that later after finding a sane solution 151 // ugly hack, remove that later after finding a sane solution
152 // Addendum: Only Sharp currently has models with high resolution but (physically) small displays, 152 // Addendum: Only Sharp currently has models with high resolution but (physically) small displays,
153 // so this is only useful if QT_QWS_SHARP is defined. E.g. SIMpad has 800x600 but has 153 // so this is only useful if QT_QWS_SHARP is defined. E.g. SIMpad has 800x600 but has
154 // a (physically) large enough display to use the small icons 154 // a (physically) large enough display to use the small icons
155 #ifdef QT_QWS_SHARP 155#ifdef QT_QWS_SHARP
156 if ( QPEApplication::desktop() ->width() >= 600 && ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") ) ) { 156 if ( QPEApplication::desktop() ->width() >= 600 && ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") ) ) {
157 ( ( QMainWindow* ) mw )->setUsesBigPixmaps( true ); 157 ( ( QMainWindow* ) mw )->setUsesBigPixmaps( true );
158 } 158 }
159 #endif 159#endif
160 160
161 if ( mw->layout() && mw->inherits("QDialog") ) { 161 if ( mw->layout() && mw->inherits("QDialog") ) {
162 QPEApplication::showDialog((QDialog*)mw, nomaximize); 162 QPEApplication::showDialog((QDialog*)mw, nomaximize);
163 } 163 }
164 else { 164 else {
165#ifdef Q_WS_QWS 165#ifdef Q_WS_QWS
166 if ( !nomaximize ) 166 if ( !nomaximize )
167 mw->showMaximized(); 167 mw->showMaximized();
168 else 168 else
169#endif 169#endif
170 170
171 mw->show(); 171 mw->show();
172 } 172 }
173 } 173 }
174 static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ ) 174 static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ )
175 { 175 {
176 /* 176 /*
177 // This works but disable it for now until it is safe to apply 177 // This works but disable it for now until it is safe to apply
178 // What is does is scan the .desktop files of all the apps for 178 // What is does is scan the .desktop files of all the apps for
179 // the applnk that has the corresponding argv[0] as this program 179 // the applnk that has the corresponding argv[0] as this program
180 // then it uses the name stored in the .desktop file as the caption 180 // then it uses the name stored in the .desktop file as the caption
181 // for the main widget. This saves duplicating translations for 181 // for the main widget. This saves duplicating translations for
182 // the app name in the program and in the .desktop files. 182 // the app name in the program and in the .desktop files.
183 183
184 AppLnkSet apps( appsPath ); 184 AppLnkSet apps( appsPath );
185 185
186 QList<AppLnk> appsList = apps.children(); 186 QList<AppLnk> appsList = apps.children();
187 for ( QListIterator<AppLnk> it(appsList); it.current(); ++it ) { 187 for ( QListIterator<AppLnk> it(appsList); it.current(); ++it ) {
188 if ( (*it)->exec() == appName ) { 188 if ( (*it)->exec() == appName ) {
189 mw->setCaption( (*it)->name() ); 189 mw->setCaption( (*it)->name() );
190 return TRUE; 190 return TRUE;
191 } 191 }
192 } 192 }
193 */ 193 */
194 return FALSE; 194 return FALSE;
195 } 195 }
196 196
197 197
198 void show(QWidget* mw, bool nomax) 198 void show(QWidget* mw, bool nomax)
199 { 199 {
200 setWidgetCaptionFromAppName( mw, appName, QPEApplication::qpeDir() + "apps" ); 200 setWidgetCaptionFromAppName( mw, appName, QPEApplication::qpeDir() + "apps" );
201 nomaximize = nomax; 201 nomaximize = nomax;
202 qpe_main_widget = mw; 202 qpe_main_widget = mw;
203#ifndef QT_NO_COP 203#ifndef QT_NO_COP
204 204
205 sendQCopQ(); 205 sendQCopQ();
206#endif 206#endif
207 207
208 if ( preloaded ) { 208 if ( preloaded ) {
209 if (forceshow) 209 if (forceshow)
210 show_mx(mw, nomax); 210 show_mx(mw, nomax);
211 } 211 }
212 else if ( keep_running ) { 212 else if ( keep_running ) {
213 show_mx(mw, nomax); 213 show_mx(mw, nomax);
214 } 214 }
215 } 215 }
216 216
217 void loadTextCodecs() 217 void loadTextCodecs()
218 { 218 {
219 QString path = QPEApplication::qpeDir() + "/plugins/textcodecs"; 219 QString path = QPEApplication::qpeDir() + "/plugins/textcodecs";
220 QDir dir( path, "lib*.so" ); 220 QDir dir( path, "lib*.so" );
221 QStringList list; 221 QStringList list;
222 if ( dir. exists ( )) 222 if ( dir. exists ( ))
223 list = dir.entryList(); 223 list = dir.entryList();
224 QStringList::Iterator it; 224 QStringList::Iterator it;
225 for ( it = list.begin(); it != list.end(); ++it ) { 225 for ( it = list.begin(); it != list.end(); ++it ) {
226 TextCodecInterface *iface = 0; 226 TextCodecInterface *iface = 0;
227 QLibrary *lib = new QLibrary( path + "/" + *it ); 227 QLibrary *lib = new QLibrary( path + "/" + *it );
228 if ( lib->queryInterface( IID_QtopiaTextCodec, (QUnknownInterface**)&iface ) == QS_OK && iface ) { 228 if ( lib->queryInterface( IID_QtopiaTextCodec, (QUnknownInterface**)&iface ) == QS_OK && iface ) {
229 QValueList<int> mibs = iface->mibEnums(); 229 QValueList<int> mibs = iface->mibEnums();
230 for (QValueList<int>::ConstIterator i = mibs.begin(); i != mibs.end(); ++i) { 230 for (QValueList<int>::ConstIterator i = mibs.begin(); i != mibs.end(); ++i) {
231 (void)iface->createForMib(*i); 231 (void)iface->createForMib(*i);
232 // ### it exists now; need to remember if we can delete it 232 // ### it exists now; need to remember if we can delete it
233 } 233 }
234 } 234 }
235 else { 235 else {
236 lib->unload(); 236 lib->unload();
237 delete lib; 237 delete lib;
238 } 238 }
239 } 239 }
240 } 240 }
241 241
242 void loadImageCodecs() 242 void loadImageCodecs()
243 { 243 {
244 QString path = QPEApplication::qpeDir() + "/plugins/imagecodecs"; 244 QString path = QPEApplication::qpeDir() + "/plugins/imagecodecs";
245 QDir dir( path, "lib*.so" ); 245 QDir dir( path, "lib*.so" );
246 QStringList list; 246 QStringList list;
247 if ( dir. exists ( )) 247 if ( dir. exists ( ))
248 list = dir.entryList(); 248 list = dir.entryList();
249 QStringList::Iterator it; 249 QStringList::Iterator it;
250 for ( it = list.begin(); it != list.end(); ++it ) { 250 for ( it = list.begin(); it != list.end(); ++it ) {
251 ImageCodecInterface *iface = 0; 251 ImageCodecInterface *iface = 0;
252 QLibrary *lib = new QLibrary( path + "/" + *it ); 252 QLibrary *lib = new QLibrary( path + "/" + *it );
253 if ( lib->queryInterface( IID_QtopiaImageCodec, (QUnknownInterface**)&iface ) == QS_OK && iface ) { 253 if ( lib->queryInterface( IID_QtopiaImageCodec, (QUnknownInterface**)&iface ) == QS_OK && iface ) {
254 QStringList formats = iface->keys(); 254 QStringList formats = iface->keys();
255 for (QStringList::ConstIterator i = formats.begin(); i != formats.end(); ++i) { 255 for (QStringList::ConstIterator i = formats.begin(); i != formats.end(); ++i) {
@@ -434,199 +434,199 @@ static void setTreble( int t = 0, int percent = -1 )
434/*! 434/*!
435 \fn void QPEApplication::timeChanged(); 435 \fn void QPEApplication::timeChanged();
436 This signal is emitted when the time changes outside the normal 436 This signal is emitted when the time changes outside the normal
437 passage of time, i.e. if the time is set backwards or forwards. 437 passage of time, i.e. if the time is set backwards or forwards.
438*/ 438*/
439 439
440/*! 440/*!
441 \fn void QPEApplication::clockChanged( bool ampm ); 441 \fn void QPEApplication::clockChanged( bool ampm );
442 442
443 This signal is emitted when the user changes the clock's style. If 443 This signal is emitted when the user changes the clock's style. If
444 \a ampm is TRUE, the user wants a 12-hour AM/PM clock, otherwise, 444 \a ampm is TRUE, the user wants a 12-hour AM/PM clock, otherwise,
445 they want a 24-hour clock. 445 they want a 24-hour clock.
446*/ 446*/
447 447
448/*! 448/*!
449 \fn void QPEApplication::volumeChanged( bool muted ) 449 \fn void QPEApplication::volumeChanged( bool muted )
450 450
451 This signal is emitted whenever the mute state is changed. If \a 451 This signal is emitted whenever the mute state is changed. If \a
452 muted is TRUE, then sound output has been muted. 452 muted is TRUE, then sound output has been muted.
453*/ 453*/
454 454
455/*! 455/*!
456 \fn void QPEApplication::weekChanged( bool startOnMonday ) 456 \fn void QPEApplication::weekChanged( bool startOnMonday )
457 457
458 This signal is emitted if the week start day is changed. If \a 458 This signal is emitted if the week start day is changed. If \a
459 startOnMonday is TRUE then the first day of the week is Monday; if 459 startOnMonday is TRUE then the first day of the week is Monday; if
460 \a startOnMonday is FALSE then the first day of the week is 460 \a startOnMonday is FALSE then the first day of the week is
461 Sunday. 461 Sunday.
462*/ 462*/
463 463
464/*! 464/*!
465 \fn void QPEApplication::dateFormatChanged(DateFormat) 465 \fn void QPEApplication::dateFormatChanged(DateFormat)
466 466
467 This signal is emitted whenever the date format is changed. 467 This signal is emitted whenever the date format is changed.
468*/ 468*/
469 469
470/*! 470/*!
471 \fn void QPEApplication::flush() 471 \fn void QPEApplication::flush()
472 472
473 ### 473 ###
474*/ 474*/
475 475
476/*! 476/*!
477 \fn void QPEApplication::reload() 477 \fn void QPEApplication::reload()
478 478
479*/ 479*/
480 480
481/*! 481/*!
482 \fn void QPEApplication::appMessage( const QCString& msg, const QByteArray& data ) 482 \fn void QPEApplication::appMessage( const QCString& msg, const QByteArray& data )
483 483
484 This signal is emitted when a message is received on this 484 This signal is emitted when a message is received on this
485 application's QPE/Application/<i>appname</i> \link qcop.html 485 application's QPE/Application/<i>appname</i> \link qcop.html
486 QCop\endlink channel. 486 QCop\endlink channel.
487 487
488 The slot to which you connect this signal uses \a msg and \a data 488 The slot to which you connect this signal uses \a msg and \a data
489 in the following way: 489 in the following way:
490 490
491\code 491\code
492 void MyWidget::receive( const QCString& msg, const QByteArray& data ) 492 void MyWidget::receive( const QCString& msg, const QByteArray& data )
493 { 493 {
494 QDataStream stream( data, IO_ReadOnly ); 494 QDataStream stream( data, IO_ReadOnly );
495 if ( msg == "someMessage(int,int,int)" ) { 495 if ( msg == "someMessage(int,int,int)" ) {
496 int a,b,c; 496 int a,b,c;
497 stream >> a >> b >> c; 497 stream >> a >> b >> c;
498 ... 498 ...
499 } else if ( msg == "otherMessage(QString)" ) { 499 } else if ( msg == "otherMessage(QString)" ) {
500 ... 500 ...
501 } 501 }
502 } 502 }
503\endcode 503\endcode
504 504
505 \sa qcop.html 505 \sa qcop.html
506 Note that messages received here may be processed by qpe application 506 Note that messages received here may be processed by qpe application
507 and emitted as signals, such as flush() and reload(). 507 and emitted as signals, such as flush() and reload().
508*/ 508*/
509 509
510/*! 510/*!
511 Constructs a QPEApplication just as you would construct 511 Constructs a QPEApplication just as you would construct
512 a QApplication, passing \a argc, \a argv, and \a t. 512 a QApplication, passing \a argc, \a argv, and \a t.
513 513
514 For applications, \a t should be the default, GuiClient. Only 514 For applications, \a t should be the default, GuiClient. Only
515 the Qtopia server passes GuiServer. 515 the Qtopia server passes GuiServer.
516*/ 516*/
517QPEApplication::QPEApplication( int & argc, char **argv, Type t ) 517QPEApplication::QPEApplication( int & argc, char **argv, Type t )
518 : QApplication( argc, argv, t ) 518 : QApplication( argc, argv, t )
519{ 519{
520 d = new QPEApplicationData; 520 d = new QPEApplicationData;
521 d->loadTextCodecs(); 521 d->loadTextCodecs();
522 d->loadImageCodecs(); 522 d->loadImageCodecs();
523 int dw = desktop() ->width(); 523 int dw = desktop() ->width();
524 524
525 if ( dw < 200 ) { 525 if ( dw < 200 ) {
526 setFont( QFont( "vera", 8 ) ); 526 setFont( QFont( "vera", 8 ) );
527 AppLnk::setSmallIconSize( 10 ); 527 AppLnk::setSmallIconSize( 10 );
528 AppLnk::setBigIconSize( 28 ); 528 AppLnk::setBigIconSize( 28 );
529 } 529 }
530 #ifdef QT_QWS_SHARP 530#ifdef QT_QWS_SHARP
531 else if ( dw > 600 ) { 531 else if ( dw > 600 ) {
532 setFont( QFont( "vera", 16 ) ); 532 setFont( QFont( "vera", 16 ) );
533 AppLnk::setSmallIconSize( 24 ); 533 AppLnk::setSmallIconSize( 24 );
534 AppLnk::setBigIconSize( 48 ); 534 AppLnk::setBigIconSize( 48 );
535 } 535 }
536 #endif 536#endif
537 else if ( dw > 200 ) { 537 else if ( dw > 200 ) {
538 setFont( QFont( "vera", 10 ) ); 538 setFont( QFont( "vera", 10 ) );
539 AppLnk::setSmallIconSize( 14 ); 539 AppLnk::setSmallIconSize( 14 );
540 AppLnk::setBigIconSize( 32 ); 540 AppLnk::setBigIconSize( 32 );
541 } 541 }
542 542
543 QMimeSourceFactory::setDefaultFactory( new ResourceMimeFactory ); 543 QMimeSourceFactory::setDefaultFactory( new ResourceMimeFactory );
544 544
545 connect( this, SIGNAL( lastWindowClosed() ), this, SLOT( hideOrQuit() ) ); 545 connect( this, SIGNAL( lastWindowClosed() ), this, SLOT( hideOrQuit() ) );
546#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 546#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
547 547
548 QString qcopfn( "/tmp/qcop-msg-" ); 548 QString qcopfn( "/tmp/qcop-msg-" );
549 qcopfn += QString( argv[ 0 ] ); // append command name 549 qcopfn += QString( argv[ 0 ] ); // append command name
550 550
551 QFile f( qcopfn ); 551 QFile f( qcopfn );
552 if ( f.open( IO_ReadOnly ) ) { 552 if ( f.open( IO_ReadOnly ) ) {
553 flock( f.handle(), LOCK_EX ); 553 flock( f.handle(), LOCK_EX );
554 } 554 }
555 555
556 sysChannel = new QCopChannel( "QPE/System", this ); 556 sysChannel = new QCopChannel( "QPE/System", this );
557 connect( sysChannel, SIGNAL( received( const QCString &, const QByteArray & ) ), 557 connect( sysChannel, SIGNAL( received( const QCString &, const QByteArray & ) ),
558 this, SLOT( systemMessage( const QCString &, const QByteArray & ) ) ); 558 this, SLOT( systemMessage( const QCString &, const QByteArray & ) ) );
559 559
560 QCString channel = QCString( argv[ 0 ] ); 560 QCString channel = QCString( argv[ 0 ] );
561 channel.replace( QRegExp( ".*/" ), "" ); 561 channel.replace( QRegExp( ".*/" ), "" );
562 d->appName = channel; 562 d->appName = channel;
563 channel = "QPE/Application/" + channel; 563 channel = "QPE/Application/" + channel;
564 pidChannel = new QCopChannel( channel, this ); 564 pidChannel = new QCopChannel( channel, this );
565 connect( pidChannel, SIGNAL( received( const QCString &, const QByteArray & ) ), 565 connect( pidChannel, SIGNAL( received( const QCString &, const QByteArray & ) ),
566 this, SLOT( pidMessage( const QCString &, const QByteArray & ) ) ); 566 this, SLOT( pidMessage( const QCString &, const QByteArray & ) ) );
567 567
568 if ( f.isOpen() ) { 568 if ( f.isOpen() ) {
569 d->keep_running = FALSE; 569 d->keep_running = FALSE;
570 QDataStream ds( &f ); 570 QDataStream ds( &f );
571 QCString channel, message; 571 QCString channel, message;
572 QByteArray data; 572 QByteArray data;
573 while ( !ds.atEnd() ) { 573 while ( !ds.atEnd() ) {
574 ds >> channel >> message >> data; 574 ds >> channel >> message >> data;
575 d->enqueueQCop( channel, message, data ); 575 d->enqueueQCop( channel, message, data );
576 } 576 }
577 577
578 flock( f.handle(), LOCK_UN ); 578 flock( f.handle(), LOCK_UN );
579 f.close(); 579 f.close();
580 f.remove(); 580 f.remove();
581 } 581 }
582 582
583 for ( int a = 0; a < argc; a++ ) { 583 for ( int a = 0; a < argc; a++ ) {
584 if ( qstrcmp( argv[ a ], "-preload" ) == 0 ) { 584 if ( qstrcmp( argv[ a ], "-preload" ) == 0 ) {
585 argv[ a ] = argv[ a + 1 ]; 585 argv[ a ] = argv[ a + 1 ];
586 a++; 586 a++;
587 d->preloaded = TRUE; 587 d->preloaded = TRUE;
588 argc -= 1; 588 argc -= 1;
589 } 589 }
590 else if ( qstrcmp( argv[ a ], "-preload-show" ) == 0 ) { 590 else if ( qstrcmp( argv[ a ], "-preload-show" ) == 0 ) {
591 argv[ a ] = argv[ a + 1 ]; 591 argv[ a ] = argv[ a + 1 ];
592 a++; 592 a++;
593 d->preloaded = TRUE; 593 d->preloaded = TRUE;
594 d->forceshow = TRUE; 594 d->forceshow = TRUE;
595 argc -= 1; 595 argc -= 1;
596 } 596 }
597 } 597 }
598 598
599 /* overide stored arguments */ 599 /* overide stored arguments */
600 setArgs( argc, argv ); 600 setArgs( argc, argv );
601 601
602#endif 602#endif
603 603
604 // qwsSetDecoration( new QPEDecoration() ); 604 // qwsSetDecoration( new QPEDecoration() );
605 605
606#ifndef QT_NO_TRANSLATION 606#ifndef QT_NO_TRANSLATION
607 607
608 QStringList langs = Global::languageList(); 608 QStringList langs = Global::languageList();
609 for ( QStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it ) { 609 for ( QStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it ) {
610 QString lang = *it; 610 QString lang = *it;
611 611
612 installTranslation( lang + "/libopie.qm"); 612 installTranslation( lang + "/libopie.qm");
613 installTranslation( lang + "/libqpe.qm" ); 613 installTranslation( lang + "/libqpe.qm" );
614 installTranslation( lang + "/" + d->appName + ".qm" ); 614 installTranslation( lang + "/" + d->appName + ".qm" );
615 615
616 616
617 //###language/font hack; should look it up somewhere 617 //###language/font hack; should look it up somewhere
618#ifdef QWS 618#ifdef QWS
619 619
620 if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) { 620 if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) {
621 QFont fn = FontManager::unicodeFont( FontManager::Proportional ); 621 QFont fn = FontManager::unicodeFont( FontManager::Proportional );
622 setFont( fn ); 622 setFont( fn );
623 } 623 }
624#endif 624#endif
625 625
626 } 626 }
627#endif 627#endif
628 628
629 applyStyle(); 629 applyStyle();
630 630
631 if ( type() == GuiServer ) { 631 if ( type() == GuiServer ) {
632 setVolume(); 632 setVolume();
@@ -1666,160 +1666,160 @@ void QPEApplication::ungrabKeyboard()
1666 Grabs the physical keyboard keys, e.g. the application's launching 1666 Grabs the physical keyboard keys, e.g. the application's launching
1667 keys. Instead of launching applications when these keys are pressed 1667 keys. Instead of launching applications when these keys are pressed
1668 the signals emitted are sent to this application instead. Some games 1668 the signals emitted are sent to this application instead. Some games
1669 programs take over the launch keys in this way to make interaction 1669 programs take over the launch keys in this way to make interaction
1670 easier. 1670 easier.
1671 1671
1672 \sa ungrabKeyboard() 1672 \sa ungrabKeyboard()
1673*/ 1673*/
1674void QPEApplication::grabKeyboard() 1674void QPEApplication::grabKeyboard()
1675{ 1675{
1676 ((QPEApplication *) qApp )-> d-> kbgrabbed = true; 1676 ((QPEApplication *) qApp )-> d-> kbgrabbed = true;
1677} 1677}
1678 1678
1679/*! 1679/*!
1680 \reimp 1680 \reimp
1681*/ 1681*/
1682int QPEApplication::exec() 1682int QPEApplication::exec()
1683{ 1683{
1684#ifndef QT_NO_COP 1684#ifndef QT_NO_COP
1685 d->sendQCopQ(); 1685 d->sendQCopQ();
1686#endif 1686#endif
1687 1687
1688 if ( d->keep_running ) 1688 if ( d->keep_running )
1689 //|| d->qpe_main_widget && d->qpe_main_widget->isVisible() ) 1689 //|| d->qpe_main_widget && d->qpe_main_widget->isVisible() )
1690 return QApplication::exec(); 1690 return QApplication::exec();
1691 1691
1692#ifndef QT_NO_COP 1692#ifndef QT_NO_COP
1693 1693
1694 { 1694 {
1695 QCopEnvelope e( "QPE/System", "closing(QString)" ); 1695 QCopEnvelope e( "QPE/System", "closing(QString)" );
1696 e << d->appName; 1696 e << d->appName;
1697 } 1697 }
1698#endif 1698#endif
1699 processEvents(); 1699 processEvents();
1700 return 0; 1700 return 0;
1701} 1701}
1702 1702
1703/*! 1703/*!
1704 \internal 1704 \internal
1705 External request for application to quit. Quits if possible without 1705 External request for application to quit. Quits if possible without
1706 loosing state. 1706 loosing state.
1707*/ 1707*/
1708void QPEApplication::tryQuit() 1708void QPEApplication::tryQuit()
1709{ 1709{
1710 if ( activeModalWidget() || strcmp( argv() [ 0 ], "embeddedkonsole" ) == 0 ) 1710 if ( activeModalWidget() || strcmp( argv() [ 0 ], "embeddedkonsole" ) == 0 )
1711 return ; // Inside modal loop or konsole. Too hard to save state. 1711 return ; // Inside modal loop or konsole. Too hard to save state.
1712#ifndef QT_NO_COP 1712#ifndef QT_NO_COP
1713 1713
1714 { 1714 {
1715 QCopEnvelope e( "QPE/System", "closing(QString)" ); 1715 QCopEnvelope e( "QPE/System", "closing(QString)" );
1716 e << d->appName; 1716 e << d->appName;
1717 } 1717 }
1718#endif 1718#endif
1719 processEvents(); 1719 processEvents();
1720 1720
1721 quit(); 1721 quit();
1722} 1722}
1723 1723
1724/*! 1724/*!
1725 \internal 1725 \internal
1726*/ 1726*/
1727void QPEApplication::installTranslation( const QString& baseName ) { 1727void QPEApplication::installTranslation( const QString& baseName ) {
1728 QTranslator* trans = new QTranslator(this); 1728 QTranslator* trans = new QTranslator(this);
1729 QString tfn = qpeDir() + "/i18n/"+baseName; 1729 QString tfn = qpeDir() + "/i18n/"+baseName;
1730 if ( trans->load( tfn ) ) 1730 if ( trans->load( tfn ) )
1731 installTranslator( trans ); 1731 installTranslator( trans );
1732 else 1732 else
1733 delete trans; 1733 delete trans;
1734} 1734}
1735 1735
1736/*! 1736/*!
1737 \internal 1737 \internal
1738 User initiated quit. Makes the window 'Go Away'. If preloaded this means 1738 User initiated quit. Makes the window 'Go Away'. If preloaded this means
1739 hiding the window. If not it means quitting the application. 1739 hiding the window. If not it means quitting the application.
1740 As this is user initiated we don't need to check state. 1740 As this is user initiated we don't need to check state.
1741*/ 1741*/
1742void QPEApplication::hideOrQuit() 1742void QPEApplication::hideOrQuit()
1743{ 1743{
1744 processEvents(); 1744 processEvents();
1745 1745
1746 // If we are a preloaded application we don't actually quit, so emit 1746 // If we are a preloaded application we don't actually quit, so emit
1747 // a System message indicating we're quasi-closing. 1747 // a System message indicating we're quasi-closing.
1748 if ( d->preloaded && d->qpe_main_widget ) 1748 if ( d->preloaded && d->qpe_main_widget )
1749#ifndef QT_NO_COP 1749#ifndef QT_NO_COP
1750 1750
1751 { 1751 {
1752 QCopEnvelope e("QPE/System", "fastAppHiding(QString)" ); 1752 QCopEnvelope e("QPE/System", "fastAppHiding(QString)" );
1753 e << d->appName; 1753 e << d->appName;
1754 d->qpe_main_widget->hide(); 1754 d->qpe_main_widget->hide();
1755 } 1755 }
1756#endif 1756#endif
1757 else 1757 else
1758 quit(); 1758 quit();
1759} 1759}
1760 1760
1761 1761
1762#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) 1762#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_RAMSES)
1763 1763
1764// The libraries with the skiff package (and possibly others) have 1764// The libraries with the skiff package (and possibly others) have
1765// completely useless implementations of builtin new and delete that 1765// completely useless implementations of builtin new and delete that
1766// use about 50% of your CPU. Here we revert to the simple libc 1766// use about 50% of your CPU. Here we revert to the simple libc
1767// functions. 1767// functions.
1768 1768
1769void* operator new[]( size_t size ) 1769void* operator new[]( size_t size )
1770{ 1770{
1771 return malloc( size ); 1771 return malloc( size );
1772} 1772}
1773 1773
1774void* operator new( size_t size ) 1774void* operator new( size_t size )
1775{ 1775{
1776 return malloc( size ); 1776 return malloc( size );
1777} 1777}
1778 1778
1779void operator delete[]( void* p ) 1779void operator delete[]( void* p )
1780{ 1780{
1781 free( p ); 1781 free( p );
1782} 1782}
1783 1783
1784void operator delete[]( void* p, size_t /*size*/ ) 1784void operator delete[]( void* p, size_t /*size*/ )
1785{ 1785{
1786 free( p ); 1786 free( p );
1787} 1787}
1788 1788
1789 1789
1790void operator delete( void* p ) 1790void operator delete( void* p )
1791{ 1791{
1792 free( p ); 1792 free( p );
1793} 1793}
1794 1794
1795void operator delete( void* p, size_t /*size*/ ) 1795void operator delete( void* p, size_t /*size*/ )
1796{ 1796{
1797 free( p ); 1797 free( p );
1798} 1798}
1799 1799
1800#endif 1800#endif
1801 1801
1802#if ( QT_VERSION <= 230 ) && !defined(SINGLE_APP) 1802#if ( QT_VERSION <= 230 ) && !defined(SINGLE_APP)
1803#include <qwidgetlist.h> 1803#include <qwidgetlist.h>
1804#ifdef QWS 1804#ifdef QWS
1805#include <qgfx_qws.h> 1805#include <qgfx_qws.h>
1806extern QRect qt_maxWindowRect; 1806extern QRect qt_maxWindowRect;
1807void qt_setMaxWindowRect(const QRect& r ) 1807void qt_setMaxWindowRect(const QRect& r )
1808{ 1808{
1809 qt_maxWindowRect = qt_screen->mapFromDevice( r, 1809 qt_maxWindowRect = qt_screen->mapFromDevice( r,
1810 qt_screen->mapToDevice( QSize( qt_screen->width(), qt_screen->height() ) ) ); 1810 qt_screen->mapToDevice( QSize( qt_screen->width(), qt_screen->height() ) ) );
1811 // Re-resize any maximized windows 1811 // Re-resize any maximized windows
1812 QWidgetList* l = QApplication::topLevelWidgets(); 1812 QWidgetList* l = QApplication::topLevelWidgets();
1813 if ( l ) { 1813 if ( l ) {
1814 QWidget * w = l->first(); 1814 QWidget * w = l->first();
1815 while ( w ) { 1815 while ( w ) {
1816 if ( w->isVisible() && w->isMaximized() ) { 1816 if ( w->isVisible() && w->isMaximized() ) {
1817 w->showMaximized(); 1817 w->showMaximized();
1818 } 1818 }
1819 w = l->next(); 1819 w = l->next();
1820 } 1820 }
1821 delete l; 1821 delete l;
1822 } 1822 }
1823} 1823}
1824#endif 1824#endif
1825#endif 1825#endif
diff --git a/library/storage.cpp b/library/storage.cpp
index 12f9df9..4e07ec6 100644
--- a/library/storage.cpp
+++ b/library/storage.cpp
@@ -1,120 +1,120 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) Holger 'zecke' Freyther <freyther@kde.org> 2** Copyright (C) Holger 'zecke' Freyther <freyther@kde.org>
3** Copyright (C) Lorn Potter <llornkcor@handhelds.org> 3** Copyright (C) Lorn Potter <llornkcor@handhelds.org>
4** Copyright (C) 2000 Trolltech AS. All rights reserved. 4** Copyright (C) 2000 Trolltech AS. All rights reserved.
5** 5**
6** This file is part of Opie Environment. 6** This file is part of Opie Environment.
7** 7**
8** This file may be distributed and/or modified under the terms of the 8** This file may be distributed and/or modified under the terms of the
9** GNU General Public License version 2 as published by the Free Software 9** GNU General Public License version 2 as published by the Free Software
10** Foundation and appearing in the file LICENSE.GPL included in the 10** Foundation and appearing in the file LICENSE.GPL included in the
11** packaging of this file. 11** packaging of this file.
12** 12**
13** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 13** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
14** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 14** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
15** 15**
16** See http://www.trolltech.com/gpl/ for GPL licensing information. 16** See http://www.trolltech.com/gpl/ for GPL licensing information.
17** 17**
18** Contact info@trolltech.com if any conditions of this licensing are 18** Contact info@trolltech.com if any conditions of this licensing are
19** not clear to you. 19** not clear to you.
20** 20**
21**********************************************************************/ 21**********************************************************************/
22 22
23#include <qpe/storage.h> 23#include <qpe/storage.h>
24#ifdef QT_QWS_SL5XXX 24#if defined(QT_QWS_SL5XXX)
25#include <qpe/custom.h> 25#include <qpe/custom.h>
26#endif 26#endif
27 27
28#include <qfile.h> 28#include <qfile.h>
29#include <qtimer.h> 29#include <qtimer.h>
30#include <qcopchannel_qws.h> 30#include <qcopchannel_qws.h>
31 31
32#include <stdio.h> 32#include <stdio.h>
33 33
34#if defined(_OS_LINUX_) || defined(Q_OS_LINUX) 34#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
35#include <sys/vfs.h> 35#include <sys/vfs.h>
36#include <mntent.h> 36#include <mntent.h>
37#endif 37#endif
38 38
39#include <qstringlist.h> 39#include <qstringlist.h>
40 40
41#include <sys/vfs.h> 41#include <sys/vfs.h>
42#include <mntent.h> 42#include <mntent.h>
43 43
44 44
45static bool isCF(const QString& m) 45static bool isCF(const QString& m)
46{ 46{
47 FILE* f = fopen("/var/run/stab", "r"); 47 FILE* f = fopen("/var/run/stab", "r");
48 if (!f) f = fopen("/var/state/pcmcia/stab", "r"); 48 if (!f) f = fopen("/var/state/pcmcia/stab", "r");
49 if (!f) f = fopen("/var/lib/pcmcia/stab", "r"); 49 if (!f) f = fopen("/var/lib/pcmcia/stab", "r");
50 if ( f ) { 50 if ( f ) {
51 char line[1024]; 51 char line[1024];
52 char devtype[80]; 52 char devtype[80];
53 char devname[80]; 53 char devname[80];
54 while ( fgets( line, 1024, f ) ) { 54 while ( fgets( line, 1024, f ) ) {
55 // 0 ide ide-cs 0 hda 3 0 55 // 0 ide ide-cs 0 hda 3 0
56 if ( sscanf(line,"%*d %s %*s %*s %s", devtype, devname )==2 ) 56 if ( sscanf(line,"%*d %s %*s %*s %s", devtype, devname )==2 )
57 { 57 {
58 if ( QString(devtype) == "ide" && m.find(devname)>0 ) { 58 if ( QString(devtype) == "ide" && m.find(devname)>0 ) {
59 fclose(f); 59 fclose(f);
60 return TRUE; 60 return TRUE;
61 } 61 }
62 } 62 }
63 } 63 }
64 fclose(f); 64 fclose(f);
65 } 65 }
66 return FALSE; 66 return FALSE;
67} 67}
68 68
69StorageInfo::StorageInfo( QObject *parent ) 69StorageInfo::StorageInfo( QObject *parent )
70 : QObject( parent ) 70 : QObject( parent )
71{ 71{
72 mFileSystems.setAutoDelete( TRUE ); 72 mFileSystems.setAutoDelete( TRUE );
73 channel = new QCopChannel( "QPE/Card", this ); 73 channel = new QCopChannel( "QPE/Card", this );
74 connect( channel, SIGNAL(received(const QCString &, const QByteArray &)), 74 connect( channel, SIGNAL(received(const QCString &, const QByteArray &)),
75 this, SLOT(cardMessage( const QCString &, const QByteArray &)) ); 75 this, SLOT(cardMessage( const QCString &, const QByteArray &)) );
76 update(); 76 update();
77} 77}
78 78
79const FileSystem *StorageInfo::fileSystemOf( const QString &filename ) 79const FileSystem *StorageInfo::fileSystemOf( const QString &filename )
80{ 80{
81 for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) { 81 for (QListIterator<FileSystem> i(mFileSystems); i.current(); ++i) {
82 if ( filename.startsWith( (*i)->path() ) ) 82 if ( filename.startsWith( (*i)->path() ) )
83 return (*i); 83 return (*i);
84 } 84 }
85 return 0; 85 return 0;
86} 86}
87 87
88 88
89void StorageInfo::cardMessage( const QCString& msg, const QByteArray& ) 89void StorageInfo::cardMessage( const QCString& msg, const QByteArray& )
90{ 90{
91 if ( msg == "mtabChanged()" ) 91 if ( msg == "mtabChanged()" )
92 update(); 92 update();
93} 93}
94// cause of the lack of a d pointer we need 94// cause of the lack of a d pointer we need
95// to store informations in a config file :( 95// to store informations in a config file :(
96void StorageInfo::update() 96void StorageInfo::update()
97{ 97{
98 //qDebug("StorageInfo::updating"); 98 //qDebug("StorageInfo::updating");
99#if defined(_OS_LINUX_) || defined(Q_OS_LINUX) 99#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
100 struct mntent *me; 100 struct mntent *me;
101 FILE *mntfp = setmntent( "/etc/mtab", "r" ); 101 FILE *mntfp = setmntent( "/etc/mtab", "r" );
102 102
103 QStringList curdisks; 103 QStringList curdisks;
104 QStringList curopts; 104 QStringList curopts;
105 QStringList curfs; 105 QStringList curfs;
106 bool rebuild = FALSE; 106 bool rebuild = FALSE;
107 int n=0; 107 int n=0;
108 if ( mntfp ) { 108 if ( mntfp ) {
109 while ( (me = getmntent( mntfp )) != 0 ) { 109 while ( (me = getmntent( mntfp )) != 0 ) {
110 QString fs = me->mnt_fsname; 110 QString fs = me->mnt_fsname;
111 if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd" 111 if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd"
112 || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd" 112 || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd"
113 || fs.left( 14 ) == "/dev/mmc/part1" 113 || fs.left( 14 ) == "/dev/mmc/part1"
114 || fs.left(5)=="tmpfs" || fs.left(9)=="/dev/root" ) 114 || fs.left(5)=="tmpfs" || fs.left(9)=="/dev/root" )
115 { 115 {
116 n++; 116 n++;
117 curdisks.append(fs); 117 curdisks.append(fs);
118 curopts.append( me->mnt_opts ); 118 curopts.append( me->mnt_opts );
119 //qDebug("-->fs %s opts %s", fs.latin1(), me->mnt_opts ); 119 //qDebug("-->fs %s opts %s", fs.latin1(), me->mnt_opts );
120 curfs.append( me->mnt_dir ); 120 curfs.append( me->mnt_dir );