- another QT_QWS_EBX -> QT_QWS_SHARP

- since OZ is going to use opieatd/opiealarm, we can ditch the "custom atd"
  support

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
@@ -147,34 +147,25 @@ void AlarmServer::initialize()
     }
 }
 
 
 
 
 static const char* atdir = "/var/spool/at/";
 
 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();
             QFile::remove( trigger.name() );
             return FALSE;
         }
         return TRUE;
     }
     return FALSE;
 }
 
 void TimerReceiverObject::deleteTimer()
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 65fac84..efa65bc 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1628,25 +1628,25 @@ void QPEApplication::hideOrQuit()
 #ifndef QT_NO_COP
 
         {
                 QCopEnvelope e("QPE/System", "fastAppHiding(QString)" );
                 e << d->appName;
                 d->qpe_main_widget->hide();
         }
 #endif
         else
                 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
 // use about 50% of your CPU. Here we revert to the simple libc
 // functions.
 
 void* operator new[]( size_t size )
 {
         return malloc( size );
 }
 
 void* operator new( size_t size )