author | sandman <sandman> | 2002-11-17 02:32:39 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-11-17 02:32:39 (UTC) |
commit | 22108a3617e8b79acaddea61c1f7f6a0a5117306 (patch) (side-by-side diff) | |
tree | 84d896d80e1228b1c39b48cc732bb17cf9960053 | |
parent | 9ed0a6022d4c3bcd8428096cdf28cad1e0355ab2 (diff) | |
download | opie-22108a3617e8b79acaddea61c1f7f6a0a5117306.zip opie-22108a3617e8b79acaddea61c1f7f6a0a5117306.tar.gz opie-22108a3617e8b79acaddea61c1f7f6a0a5117306.tar.bz2 |
- another QT_QWS_EBX -> QT_QWS_SHARP
- since OZ is going to use opieatd/opiealarm, we can ditch the "custom atd"
support
-rw-r--r-- | library/alarmserver.cpp | 11 | ||||
-rw-r--r-- | library/qpeapplication.cpp | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/library/alarmserver.cpp b/library/alarmserver.cpp index 7e6e515..5e4dd18 100644 --- a/library/alarmserver.cpp +++ b/library/alarmserver.cpp @@ -156,16 +156,7 @@ static bool triggerAtd( bool writeHWClock = FALSE ) { QFile trigger(QString(atdir) + "trigger"); if ( trigger.open(IO_WriteOnly|IO_Raw) ) { - - const char* data = -#ifdef QT_QWS_SHARP - //custom atd only writes HW Clock if we write a 'W' - ( writeHWClock ) ? "W\n" : -#endif - data = "\n"; - int len = strlen(data); - int total_written = trigger.writeBlock(data,len); - if ( total_written != len ) { + if ( trigger.writeBlock("\n",2) != 2 ) { QMessageBox::critical( 0, QObject::tr( "Out of Space" ), QObject::tr( "Unable to schedule alarm.\nFree some memory and try again." ) ); trigger.close(); diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 65fac84..efa65bc 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -1637,7 +1637,7 @@ void QPEApplication::hideOrQuit() quit(); } -#if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) +#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SHARP) // The libraries with the skiff package (and possibly others) have // completely useless implementations of builtin new and delete that |