- 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
@@ -63,202 +63,193 @@ protected:
   void timerEvent( QTimerEvent *te );
 private:
     QString atfilename;
 };
 
 TimerReceiverObject *timerEventReceiver = NULL;
 QList<timerEventItem> timerEventList;
 timerEventItem *nearestTimerEvent = NULL;
 
 
 // set the timer to go off on the next event in the list
 void setNearestTimerEvent()
 {
     nearestTimerEvent = NULL;
     QListIterator<timerEventItem> it( timerEventList );
     if ( *it )
 	nearestTimerEvent = *it;
     for ( ; *it; ++it )
 	if ( (*it)->UTCtime < nearestTimerEvent->UTCtime )
 	    nearestTimerEvent = *it;
     if (nearestTimerEvent)
 	timerEventReceiver->resetTimer();
     else
 	timerEventReceiver->deleteTimer();
 }
 
 
 //store current state to file
 //Simple implementation. Should run on a timer.
 
 static void saveState()
 {
     QString savefilename = Global::applicationFileName( "AlarmServer", "saveFile" );
     if ( timerEventList.isEmpty() ) {
 	unlink( savefilename );
 	return;
     }
 
     QFile savefile(savefilename+".new");
     if ( savefile.open(IO_WriteOnly) ) {
 	QDataStream ds( &savefile );
 
 	//save
 
 	QListIterator<timerEventItem> it( timerEventList );
 	for ( ; *it; ++it ) {
 	    ds << it.current()->UTCtime;
 	    ds << it.current()->channel;
 	    ds << it.current()->message;
 	    ds << it.current()->data;
 	}
 
 
 	savefile.close();
 	unlink( savefilename );
 	QDir d; d.rename(savefilename+".new",savefilename);
 
     }
 }
 
 /*!
   Sets up the alarm server. Restoring to previous state (session management).
  */
 void AlarmServer::initialize()
 {
     //read autosave file and put events in timerEventList
 
     QString savefilename = Global::applicationFileName( "AlarmServer", "saveFile" );
 
     QFile savefile(savefilename);
     if ( savefile.open(IO_ReadOnly) ) {
 	QDataStream ds( &savefile );
 	while ( !ds.atEnd() ) {
 	    timerEventItem *newTimerEventItem = new timerEventItem;
 	    ds >> newTimerEventItem->UTCtime;
 	    ds >> newTimerEventItem->channel;
 	    ds >> newTimerEventItem->message;
 	    ds >> newTimerEventItem->data;
 	    timerEventList.append( newTimerEventItem );
 	}
 	savefile.close();
 	if (!timerEventReceiver)
 	    timerEventReceiver = new TimerReceiverObject;
 	setNearestTimerEvent();
     }
 }
 
 
 
 
 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()
 {
     if ( !atfilename.isEmpty() ) {
 	unlink( atfilename );
 	atfilename = QString::null;
 	triggerAtd( FALSE );
     }
 }
 
 void TimerReceiverObject::resetTimer()
 {
     const int maxsecs = 2147000;
     int total_written;
     QDateTime nearest = TimeConversion::fromUTC(nearestTimerEvent->UTCtime);
     QDateTime now = QDateTime::currentDateTime();
     if ( nearest < now )
 	nearest = now;
     int secs = TimeConversion::secsTo( now, nearest );
     if ( secs > maxsecs ) {
 	// too far for millisecond timing
 	secs = maxsecs;
     }
 
     // System timer (needed so that we wake from deep sleep),
     // from the Epoch in seconds.
     //
     int at_secs = TimeConversion::toUTC(nearest);
     // qDebug("reset timer to %d seconds from Epoch",at_secs);
     QString fn = atdir + QString::number(at_secs) + "."
 		 + QString::number(getpid());
     if ( fn != atfilename ) {
 	QFile atfile(fn+".new");
 	if ( atfile.open(IO_WriteOnly|IO_Raw) ) {
 	    // just wake up and delete the at file
 	    QString cmd = "#!/bin/sh\nrm " + fn;
 	    total_written = atfile.writeBlock(cmd.latin1(),cmd.length());
 	    if ( total_written != int(cmd.length()) ) {
 		QMessageBox::critical( 0, tr("Out of Space"),
 				       tr("Unable to schedule alarm.\n"
 					  "Please free up space and try again") );
 		atfile.close();
 		QFile::remove( atfile.name() );
 		return;
 	    }
 	    atfile.close();
 	    unlink( atfilename );
 	    QDir d; d.rename(fn+".new",fn);
 	    chmod(fn.latin1(),0755);
 	    atfilename = fn;
 	    triggerAtd( FALSE );
 	} else {
 	    qWarning("Cannot open atd file %s",fn.latin1());
 	}
     }
     // Qt timers (does the actual alarm)
     // from now in milliseconds
     //
     qDebug("AlarmServer waiting %d seconds",secs);
     startTimer( 1000 * secs + 500 );
 }
 
 void TimerReceiverObject::timerEvent( QTimerEvent * )
 {
     bool needSave = FALSE;
     killTimers();
     if (nearestTimerEvent) {
         if ( nearestTimerEvent->UTCtime
 	     <= TimeConversion::toUTC(QDateTime::currentDateTime()) ) {
 #ifndef QT_NO_COP
 	    QCopEnvelope e( nearestTimerEvent->channel,
 			    nearestTimerEvent->message );
 	    e << TimeConversion::fromUTC( nearestTimerEvent->UTCtime )
 	      << nearestTimerEvent->data;
 #endif
 	    timerEventList.remove( nearestTimerEvent );
 	    needSave = TRUE;
 	}
         setNearestTimerEvent();
     } else {
         resetTimer();
     }
     if ( needSave )
 	saveState();
 }
 
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 65fac84..efa65bc 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1544,159 +1544,159 @@ void QPEApplication::ungrabKeyboard()
 }
 
 /*!
   Grabs the physical keyboard keys, e.g. the application's launching
   keys. Instead of launching applications when these keys are pressed
   the signals emitted are sent to this application instead. Some games
   programs take over the launch keys in this way to make interaction
   easier.
  
   \sa ungrabKeyboard()
 */
 void QPEApplication::grabKeyboard()
 {
 	QPEApplicationData * d = ( ( QPEApplication* ) qApp ) ->d;
 	if ( qApp->type() == QApplication::GuiServer )
 		d->kbgrabber = 0;
 	else {
 #ifndef QT_NO_COP
 		QCopEnvelope e( "QPE/System", "grabKeyboard(QString)" );
 		e << d->appName;
 #endif
 
 		d->kbgrabber = 2; // me
 	}
 }
 
 /*!
   \reimp
 */
 int QPEApplication::exec()
 {
 #ifndef QT_NO_COP
 	d->sendQCopQ();
 #endif
 
 	if ( d->keep_running )
 		//|| d->qpe_main_widget && d->qpe_main_widget->isVisible() )
 		return QApplication::exec();
 
 #ifndef QT_NO_COP
 
 	{
 		QCopEnvelope e( "QPE/System", "closing(QString)" );
 		e << d->appName;
 	}
 #endif
 	processEvents();
 	return 0;
 }
 
 /*!
   \internal
   External request for application to quit.  Quits if possible without
   loosing state.
 */
 void QPEApplication::tryQuit()
 {
 	if ( activeModalWidget() || strcmp( argv() [ 0 ], "embeddedkonsole" ) == 0 )
 		return ; // Inside modal loop or konsole. Too hard to save state.
 #ifndef QT_NO_COP
 
 	{
 		QCopEnvelope e( "QPE/System", "closing(QString)" );
 		e << d->appName;
 	}
 #endif
 	processEvents();
 
 	quit();
 }
 
 /*!
   \internal
   User initiated quit.  Makes the window 'Go Away'.  If preloaded this means
   hiding the window.  If not it means quitting the application.
   As this is user initiated we don't need to check state.
 */
 void QPEApplication::hideOrQuit()
 {
 	processEvents();
 
 	// If we are a preloaded application we don't actually quit, so emit
 	// a System message indicating we're quasi-closing.
 	if ( d->preloaded && d->qpe_main_widget )
 #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 )
 {
 	return malloc( size );
 }
 
 void operator delete[]( void* p )
 {
 	free( p );
 }
 
 void operator delete[]( void* p, size_t /*size*/ )
 {
 	free( p );
 }
 
 void operator delete( void* p )
 {
 	free( p );
 }
 
 void operator delete( void* p, size_t /*size*/ )
 {
 	free( p );
 }
 
 #endif
 
 #if ( QT_VERSION <= 230 ) && !defined(SINGLE_APP)
 #include <qwidgetlist.h>
 #ifdef QWS
 #include <qgfx_qws.h>
 extern QRect qt_maxWindowRect;
 void qt_setMaxWindowRect(const QRect& r )
 {
 	qt_maxWindowRect = qt_screen->mapFromDevice( r,
 	                   qt_screen->mapToDevice( QSize( qt_screen->width(), qt_screen->height() ) ) );
 	// Re-resize any maximized windows
 	QWidgetList* l = QApplication::topLevelWidgets();
 	if ( l ) {
 		QWidget * w = l->first();
 		while ( w ) {
 			if ( w->isVisible() && w->isMaximized() ) {
 				w->showMaximized();
 			}
 			w = l->next();
 		}
 		delete l;
 	}
 }
 #endif
 #endif