summaryrefslogtreecommitdiff
path: root/noncore
authorkergoth <kergoth>2003-03-19 05:38:25 (UTC)
committer kergoth <kergoth>2003-03-19 05:38:25 (UTC)
commit234f974bea8f93213fa43bb8b501dee5db43cbdc (patch) (unidiff)
treefc9c441bbbb1d12d1fc929cecfd323c03fafb48c /noncore
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 (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp6
-rw-r--r--noncore/settings/sound/soundsettings.cpp2
-rw-r--r--noncore/tools/formatter/formatter.cpp4
3 files changed, 6 insertions, 6 deletions
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";