add the virtual hook in HEAD as well

2 files changed, 5 insertions, 1 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index d6e6892..993aedf 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -772,33 +772,33 @@ int ODevice::readLightSensor ( )
 int ODevice::lightSensorResolution ( ) const
 {
 	return 0;
 }
 
 /**
  * @return a list with CPU frequencies supported by the hardware
  */
 const QStrList &ODevice::allowedCpuFrequencies ( ) const
 {
 	return *d->m_cpu_frequencies;
 }
 
 
 /**
  * Set desired CPU frequency
- * 
+ *
  * @param index index into d->m_cpu_frequencies of the frequency to be set
  */
 bool ODevice::setCurrentCpuFrequency(uint index)
 {
 	if (index >= d->m_cpu_frequencies->count())
 		return false;
 
 	char *freq = d->m_cpu_frequencies->at(index);
 	qWarning("set freq to %s", freq);
 
 	int fd;
 
 	if ((fd = ::open("/proc/sys/cpu/0/speed", O_WRONLY)) >= 0) {
 		char writeCommand[50];
 		const int count = sprintf(writeCommand, "%s\n", freq);
 		int res = (::write(fd, writeCommand, count) != -1);
@@ -907,33 +907,35 @@ void ODevice::remapHeldAction ( int button, const OQCopMessage &action )
 
 	if ( button >= (int) d-> m_buttons-> count ( ))
 		return;
 
 	ODeviceButton &b = ( *d-> m_buttons ) [button];
     	b. setHeldAction ( action );
 
 	Config buttonFile ( "ButtonSettings" );
 	buttonFile. setGroup ( "Button" + QString::number ( button ));
 	buttonFile. writeEntry ( "HeldActionChannel", (const char *) b. heldAction ( ). channel ( ));
 	buttonFile. writeEntry ( "HeldActionMessage", (const char *) b. heldAction ( ). message ( ));
 
 //	buttonFile. writeEntry ( "HeldActionArgs", decodeBase64 ( b. heldAction ( ). data ( )));
 
 	QCopEnvelope ( "QPE/System", "deviceButtonMappingChanged()" );
 }
+void ODevice::virtual_hook( int id, void* data ) {
 
+}
 
 
 
 /**************************************************
  *
  * iPAQ
  *
  **************************************************/
 
 void iPAQ::init ( )
 {
 	d-> m_vendorstr = "HP";
 	d-> m_vendor = Vendor_HP;
 
 	QFile f ( "/proc/hal/model" );
 
diff --git a/libopie/odevice.h b/libopie/odevice.h
index f2f6467..a232d69 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -227,22 +227,24 @@ public:
 	 */
 	void remapHeldAction ( int button, const OQCopMessage &qcopMessage );
 
 	/**
 	 * How long (in ms) you have to press a button for a "hold" action
 	 */
 	uint buttonHoldTime ( ) const;
 
 signals:
 	void buttonMappingChanged ( );
 
 private slots:
 	void systemMessage ( const QCString &, const QByteArray & );
 
 protected:
 	void reloadButtonMapping ( );
+        /*  ugly virtual hook */
+        virtual void virtual_hook( int id, void* data );
 };
 
 }
 
 #endif