summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-03-19 05:38:25 (UTC)
committer kergoth <kergoth>2003-03-19 05:38:25 (UTC)
commit234f974bea8f93213fa43bb8b501dee5db43cbdc (patch) (unidiff)
treefc9c441bbbb1d12d1fc929cecfd323c03fafb48c
parentf35989ef21fb5a27ebe6f6924ee2cc601318c1b8 (diff)
downloadopie-234f974bea8f93213fa43bb8b501dee5db43cbdc.zip
opie-234f974bea8f93213fa43bb8b501dee5db43cbdc.tar.gz
opie-234f974bea8f93213fa43bb8b501dee5db43cbdc.tar.bz2
Goodbye QT_QWS_EBX and QT_QWS_SHARP.. hello QT_QWS_SL5XXX!
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/calibrate/main.cpp2
-rw-r--r--core/apps/embeddedkonsole/TEWidget.cpp2
-rw-r--r--core/launcher/desktop.cpp2
-rw-r--r--core/launcher/main.cpp8
-rw-r--r--core/launcher/taskbar.cpp4
-rw-r--r--core/multimedia/opieplayer/loopcontrol_threaded.cpp2
-rw-r--r--core/opie-login/main.cpp2
-rw-r--r--library/power.cpp2
-rw-r--r--library/qpeapplication.cpp2
-rw-r--r--library/storage.cpp2
-rw-r--r--mkspecs/qws/linux-sharp-g++/qmake.conf2
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp6
-rw-r--r--noncore/settings/sound/soundsettings.cpp2
-rw-r--r--noncore/tools/formatter/formatter.cpp4
-rw-r--r--qt/qconfig-qpe.h2
-rw-r--r--x11/libqpe-x11/qpe/qpeapplication.cpp2
16 files changed, 23 insertions, 23 deletions
diff --git a/core/apps/calibrate/main.cpp b/core/apps/calibrate/main.cpp
index cb041c9..d1ad083 100644
--- a/core/apps/calibrate/main.cpp
+++ b/core/apps/calibrate/main.cpp
@@ -28,7 +28,7 @@ int main( int argc, char ** argv )
28 QPEApplication a( argc, argv ); 28 QPEApplication a( argc, argv );
29 int retval = 0; 29 int retval = 0;
30 30
31#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) 31#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
32 if ( !QFile::exists( "/etc/pointercal" ) ) { 32 if ( !QFile::exists( "/etc/pointercal" ) ) {
33 // Make sure calibration widget starts on top. 33 // Make sure calibration widget starts on top.
34 Calibrate *cal = new Calibrate; 34 Calibrate *cal = new Calibrate;
diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp
index 8214e7d..d0850e3 100644
--- a/core/apps/embeddedkonsole/TEWidget.cpp
+++ b/core/apps/embeddedkonsole/TEWidget.cpp
@@ -1110,7 +1110,7 @@ void TEWidget::frameChanged()
1110 1110
1111void TEWidget::Bell() 1111void TEWidget::Bell()
1112{ 1112{
1113//#ifdef QT_QWS_SHARP 1113//#ifdef QT_QWS_SL5XXX
1114//# ifndef QT_NO_COP 1114//# ifndef QT_NO_COP
1115 if(useBeep) 1115 if(useBeep)
1116 QCopEnvelope( "QPE/TaskBar", "soundAlarm()" ); 1116 QCopEnvelope( "QPE/TaskBar", "soundAlarm()" );
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index ba4fd66..59f2aea 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -42,7 +42,7 @@
42#include <qpe/network.h> 42#include <qpe/network.h>
43#include <qpe/global.h> 43#include <qpe/global.h>
44 44
45#if defined( QT_QWS_SHARP ) || defined( QT_QWS_IPAQ ) 45#if defined( QT_QWS_SL5XXX ) || defined( QT_QWS_IPAQ )
46#include <qpe/custom.h> 46#include <qpe/custom.h>
47#endif 47#endif
48 48
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 49b41d6..8eaea17 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -25,7 +25,7 @@
25#include <qpe/qpeapplication.h> 25#include <qpe/qpeapplication.h>
26#include <qpe/network.h> 26#include <qpe/network.h>
27#include <qpe/config.h> 27#include <qpe/config.h>
28#if defined( QT_QWS_SHARP ) || defined( QT_QWS_IPAQ ) 28#if defined( QT_QWS_SL5XXX ) || defined( QT_QWS_IPAQ )
29#include <qpe/custom.h> 29#include <qpe/custom.h>
30#endif 30#endif
31 31
@@ -43,7 +43,7 @@
43#include <signal.h> 43#include <signal.h>
44#include <unistd.h> 44#include <unistd.h>
45 45
46#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) 46#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
47#include "../calibrate/calibrate.h" 47#include "../calibrate/calibrate.h"
48#endif 48#endif
49 49
@@ -73,7 +73,7 @@ int initApplication( int argc, char ** argv )
73{ 73{
74 initEnvironment(); 74 initEnvironment();
75 75
76#if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_EBX) 76#if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX)
77 setenv( "QWS_SIZE", "240x320", 0 ); 77 setenv( "QWS_SIZE", "240x320", 0 );
78#endif 78#endif
79 79
@@ -102,7 +102,7 @@ int initApplication( int argc, char ** argv )
102 (void)new SysFileMonitor(d); 102 (void)new SysFileMonitor(d);
103 Network::createServer(d); 103 Network::createServer(d);
104 104
105#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) 105#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
106 if ( !QFile::exists( "/etc/pointercal" ) ) { 106 if ( !QFile::exists( "/etc/pointercal" ) ) {
107 // Make sure calibration widget starts on top. 107 // Make sure calibration widget starts on top.
108 Calibrate *cal = new Calibrate; 108 Calibrate *cal = new Calibrate;
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp
index 77035a3..8af568d 100644
--- a/core/launcher/taskbar.cpp
+++ b/core/launcher/taskbar.cpp
@@ -33,7 +33,7 @@
33#include <qpe/qcopenvelope_qws.h> 33#include <qpe/qcopenvelope_qws.h>
34#include <qpe/global.h> 34#include <qpe/global.h>
35 35
36#if defined( QT_QWS_SHARP ) || defined( QT_QWS_IPAQ ) 36#if defined( QT_QWS_SL5XXX ) || defined( QT_QWS_IPAQ )
37#include <qpe/custom.h> 37#include <qpe/custom.h>
38#endif 38#endif
39 39
@@ -82,7 +82,7 @@ static Global::Command builtins[] = {
82#undef APP 82#undef APP
83#endif 83#endif
84 84
85#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SHARP) 85#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX)
86 { "calibrate", TaskBar::calibrate, 1, 0 }, 86 { "calibrate", TaskBar::calibrate, 1, 0 },
87#endif 87#endif
88#if !defined(QT_QWS_CASSIOPEIA) 88#if !defined(QT_QWS_CASSIOPEIA)
diff --git a/core/multimedia/opieplayer/loopcontrol_threaded.cpp b/core/multimedia/opieplayer/loopcontrol_threaded.cpp
index 1b89bc8..6817d5b 100644
--- a/core/multimedia/opieplayer/loopcontrol_threaded.cpp
+++ b/core/multimedia/opieplayer/loopcontrol_threaded.cpp
@@ -39,7 +39,7 @@
39#include "mediaplayerstate.h" 39#include "mediaplayerstate.h"
40 40
41 41
42#if defined(QT_QWS_SHARP) || defined(QT_QWS_IPAQ) 42#if defined(QT_QWS_SL5XXX) || defined(QT_QWS_IPAQ)
43#define USE_REALTIME_AUDIO_THREAD 43#define USE_REALTIME_AUDIO_THREAD
44#endif 44#endif
45 45
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 81f4d1e..1800be0 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -323,7 +323,7 @@ int login_main ( int argc, char **argv, pid_t ppid )
323 323
324 ODevice::inst ( )-> setSoftSuspend ( true ); 324 ODevice::inst ( )-> setSoftSuspend ( true );
325 325
326#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) 326#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
327 if ( !QFile::exists ( "/etc/pointercal" )) { 327 if ( !QFile::exists ( "/etc/pointercal" )) {
328 // Make sure calibration widget starts on top. 328 // Make sure calibration widget starts on top.
329 Calibrate *cal = new Calibrate; 329 Calibrate *cal = new Calibrate;
diff --git a/library/power.cpp b/library/power.cpp
index 21c8960..5310b47 100644
--- a/library/power.cpp
+++ b/library/power.cpp
@@ -20,7 +20,7 @@
20 20
21#include "power.h" 21#include "power.h"
22 22
23#ifdef QT_QWS_SHARP 23#ifdef QT_QWS_SL5XXX
24#include "custom.h" 24#include "custom.h"
25#endif 25#endif
26 26
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 95c4a1b..7463074 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1741,7 +1741,7 @@ void QPEApplication::hideOrQuit()
1741} 1741}
1742 1742
1743 1743
1744#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SHARP) 1744#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
1745 1745
1746// The libraries with the skiff package (and possibly others) have 1746// The libraries with the skiff package (and possibly others) have
1747// completely useless implementations of builtin new and delete that 1747// completely useless implementations of builtin new and delete that
diff --git a/library/storage.cpp b/library/storage.cpp
index 3668d29..a7c466d 100644
--- a/library/storage.cpp
+++ b/library/storage.cpp
@@ -20,7 +20,7 @@
20**********************************************************************/ 20**********************************************************************/
21 21
22#include <qpe/storage.h> 22#include <qpe/storage.h>
23#ifdef QT_QWS_SHARP 23#ifdef QT_QWS_SL5XXX
24#include <qpe/custom.h> 24#include <qpe/custom.h>
25#endif 25#endif
26 26
diff --git a/mkspecs/qws/linux-sharp-g++/qmake.conf b/mkspecs/qws/linux-sharp-g++/qmake.conf
index 06bf445..814b4fc 100644
--- a/mkspecs/qws/linux-sharp-g++/qmake.conf
+++ b/mkspecs/qws/linux-sharp-g++/qmake.conf
@@ -22,7 +22,7 @@ QMAKE_CFLAGS_SHLIB = -fPIC
22 QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses 22 QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
23 QMAKE_CFLAGS_THREAD= -D_REENTRANT 23 QMAKE_CFLAGS_THREAD= -D_REENTRANT
24 24
25 QMAKE_CXX = arm-linux-g++ -DQT_QWS_SHARP -DQT_QWS_EBX 25 QMAKE_CXX = arm-linux-g++ -DQT_QWS_SL5XXX -DQT_QWS_SHARP -DQT_QWS_EBX -DQT_QWS_CUSTOM
26 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) 26 QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
27 QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON 27 QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
28 QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF 28 QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 0ec6fad..d4396d2 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -293,13 +293,13 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
293 293
294void MediaPlayer::blank( bool b ) { 294void MediaPlayer::blank( bool b ) {
295 fd=open("/dev/fb0",O_RDWR); 295 fd=open("/dev/fb0",O_RDWR);
296#ifdef QT_QWS_EBX 296#ifdef QT_QWS_SL5XXX
297 fl= open( "/dev/fl", O_RDWR ); 297 fl= open( "/dev/fl", O_RDWR );
298#endif 298#endif
299 if (fd != -1) { 299 if (fd != -1) {
300 if ( b ) { 300 if ( b ) {
301 qDebug("do blanking"); 301 qDebug("do blanking");
302#ifdef QT_QWS_EBX 302#ifdef QT_QWS_SL5XXX
303 ioctl( fd, FBIOBLANK, 1 ); 303 ioctl( fd, FBIOBLANK, 1 );
304 if(fl !=-1) { 304 if(fl !=-1) {
305 ioctl( fl, 2 ); 305 ioctl( fl, 2 );
@@ -312,7 +312,7 @@ void MediaPlayer::blank( bool b ) {
312 } else { 312 } else {
313 qDebug("do unblanking"); 313 qDebug("do unblanking");
314 ioctl( fd, FBIOBLANK, 0); 314 ioctl( fd, FBIOBLANK, 0);
315#ifdef QT_QWS_EBX 315#ifdef QT_QWS_SL5XXX
316 if(fl != -1) { 316 if(fl != -1) {
317 ioctl( fl, 1); 317 ioctl( fl, 1);
318 ::close(fl); 318 ::close(fl);
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp
index dd341c0..afcdd49 100644
--- a/noncore/settings/sound/soundsettings.cpp
+++ b/noncore/settings/sound/soundsettings.cpp
@@ -69,7 +69,7 @@ SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl )
69 stereoCheckBox->setChecked(cfg.readNumEntry("Stereo", 0)); 69 stereoCheckBox->setChecked(cfg.readNumEntry("Stereo", 0));
70//TODO hide if zaurus- mono only 70//TODO hide if zaurus- mono only
71 71
72#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) 72#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
73//since ipaq and zaurus have particular 73//since ipaq and zaurus have particular
74//devices 74//devices
75 bool systemZaurus=FALSE; 75 bool systemZaurus=FALSE;
diff --git a/noncore/tools/formatter/formatter.cpp b/noncore/tools/formatter/formatter.cpp
index f275fbe..79a7f9e 100644
--- a/noncore/tools/formatter/formatter.cpp
+++ b/noncore/tools/formatter/formatter.cpp
@@ -183,7 +183,7 @@ void FormatterApp::doFormat() {
183 QString diskName = currentText.left(currentText.find(" -> ",0,TRUE)); 183 QString diskName = currentText.left(currentText.find(" -> ",0,TRUE));
184 QString fs = fileSystemsCombo->currentText(); 184 QString fs = fileSystemsCombo->currentText();
185 185
186#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) // lets test on something cheap 186#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) // lets test on something cheap
187#else 187#else
188 currentText = diskDevice = "/dev/fd0"; 188 currentText = diskDevice = "/dev/fd0";
189 umountS = "umount -v /floppy 2>&1"; 189 umountS = "umount -v /floppy 2>&1";
@@ -473,7 +473,7 @@ bool FormatterApp::doFsck() {
473 473
474 Output *outDlg; 474 Output *outDlg;
475 QString selectedDevice; 475 QString selectedDevice;
476// #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) 476// #if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
477 selectedDevice = deviceComboBox->currentText(); 477 selectedDevice = deviceComboBox->currentText();
478 QString mountPoint = mountPointLineEdit->text(); 478 QString mountPoint = mountPointLineEdit->text();
479 QString umountS = "umount -v "+mountPoint+" 2>&1"; 479 QString umountS = "umount -v "+mountPoint+" 2>&1";
diff --git a/qt/qconfig-qpe.h b/qt/qconfig-qpe.h
index 2b05f90..30d8190 100644
--- a/qt/qconfig-qpe.h
+++ b/qt/qconfig-qpe.h
@@ -31,7 +31,7 @@
31#define QT_DLL // Internal 31#define QT_DLL // Internal
32#endif 32#endif
33 33
34#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_EBX) 34#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX)
35# define QT_NO_QWS_CURSOR 35# define QT_NO_QWS_CURSOR
36# define QT_NO_QWS_MOUSE_AUTO 36# define QT_NO_QWS_MOUSE_AUTO
37#endif 37#endif
diff --git a/x11/libqpe-x11/qpe/qpeapplication.cpp b/x11/libqpe-x11/qpe/qpeapplication.cpp
index ed815f8..eb01e50 100644
--- a/x11/libqpe-x11/qpe/qpeapplication.cpp
+++ b/x11/libqpe-x11/qpe/qpeapplication.cpp
@@ -755,7 +755,7 @@ int QPEApplication::x11ClientMessage(QWidget* w, XEvent* event, bool b ) {
755#define KeyPress XKeyPress 755#define KeyPress XKeyPress
756#define KeyRelease XKeyRelease 756#define KeyRelease XKeyRelease
757 757
758#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) 758#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
759 759
760// The libraries with the skiff package (and possibly others) have 760// The libraries with the skiff package (and possibly others) have
761// completely useless implementations of builtin new and delete that 761// completely useless implementations of builtin new and delete that