-rw-r--r-- | library/power.cpp | 2 | ||||
-rw-r--r-- | library/qpeapplication.cpp | 10 | ||||
-rw-r--r-- | library/storage.cpp | 2 |
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,47 +1,47 @@ | |||
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 | ||
37 | PowerStatusManager *PowerStatusManager::powerManager = 0; | 37 | PowerStatusManager *PowerStatusManager::powerManager = 0; |
38 | PowerStatus *PowerStatusManager::ps = 0; | 38 | PowerStatus *PowerStatusManager::ps = 0; |
39 | 39 | ||
40 | static bool haveProcApm = false; | 40 | static bool haveProcApm = false; |
41 | 41 | ||
42 | PowerStatusManager::PowerStatusManager() | 42 | PowerStatusManager::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 ) { |
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 22d222a..4bc08b3 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -131,53 +131,53 @@ public: | |||
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 | ||
@@ -506,55 +506,55 @@ static void setTreble( int t = 0, int percent = -1 ) | |||
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 | */ |
517 | QPEApplication::QPEApplication( int & argc, char **argv, Type t ) | 517 | QPEApplication::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 ] ); |
@@ -1738,49 +1738,49 @@ void QPEApplication::installTranslation( const QString& baseName ) { | |||
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 | */ |
1742 | void QPEApplication::hideOrQuit() | 1742 | void 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 | ||
1769 | void* operator new[]( size_t size ) | 1769 | void* operator new[]( size_t size ) |
1770 | { | 1770 | { |
1771 | return malloc( size ); | 1771 | return malloc( size ); |
1772 | } | 1772 | } |
1773 | 1773 | ||
1774 | void* operator new( size_t size ) | 1774 | void* operator new( size_t size ) |
1775 | { | 1775 | { |
1776 | return malloc( size ); | 1776 | return malloc( size ); |
1777 | } | 1777 | } |
1778 | 1778 | ||
1779 | void operator delete[]( void* p ) | 1779 | void operator delete[]( void* p ) |
1780 | { | 1780 | { |
1781 | free( p ); | 1781 | free( p ); |
1782 | } | 1782 | } |
1783 | 1783 | ||
1784 | void operator delete[]( void* p, size_t /*size*/ ) | 1784 | void operator delete[]( void* p, size_t /*size*/ ) |
1785 | { | 1785 | { |
1786 | free( p ); | 1786 | free( p ); |
diff --git a/library/storage.cpp b/library/storage.cpp index 12f9df9..4e07ec6 100644 --- a/library/storage.cpp +++ b/library/storage.cpp | |||
@@ -1,48 +1,48 @@ | |||
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 | ||
45 | static bool isCF(const QString& m) | 45 | static 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"); |