4 files changed, 11 insertions, 6 deletions

diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index 26c6dca..129215b 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -752,19 +752,22 @@ void ODevice::remPreHandler(QWSServer::KeyboardFilter*aFilter)
 {
     Opie::Core::OKeyFilter::inst()->remPreHandler(aFilter);
 }
 
 void ODevice::playingStopped() {
     const_cast<QObject*>(sender())->disconnect( this );
+#ifndef QT_NO_SOUND
     if ( d->m_sound >= 0 ) {
         ::ioctl ( d->m_sound, MIXER_WRITE( d->m_mixer ), &d->m_vol );
         ::close ( d->m_sound );
     }
+#endif
 }
 
 void ODevice::changeMixerForAlarm( int mixer, const char* file, Sound *snd ) {
+#ifndef QT_NO_SOUND
     if (( d->m_sound = ::open ( file, O_RDWR )) >= 0 ) {
         if ( ::ioctl ( d->m_sound, MIXER_READ( mixer ), &d->m_vol ) >= 0 ) {
             Config cfg ( "qpe" );
             cfg. setGroup ( "Volume" );
 
             int volalarm = cfg. readNumEntry ( "AlarmPercent", 50 );
@@ -776,10 +779,11 @@ void ODevice::changeMixerForAlarm( int mixer, const char* file, Sound *snd ) {
 
             if ( ::ioctl ( d->m_sound, MIXER_WRITE( mixer ), &volalarm ) >= 0 )
                 register_qpe_sound_finished(snd, this, SLOT(playingStopped()));
         }
         d->m_mixer = mixer;
     }
+#endif
 }
 
 }
 }
diff --git a/libopie2/opiedb/osqlresult.cpp b/libopie2/opiedb/osqlresult.cpp
index bad7d8b..268ac8e 100644
--- a/libopie2/opiedb/osqlresult.cpp
+++ b/libopie2/opiedb/osqlresult.cpp
@@ -22,27 +22,27 @@ OSQLResultItem &OSQLResultItem::operator=( const OSQLResultItem& other) {
 OSQLResultItem::TableString OSQLResultItem::tableString()const{
     return m_string;
 }
 OSQLResultItem::TableInt OSQLResultItem::tableInt()const {
     return m_int;
 }
-QString OSQLResultItem::data( const QString& columnName, bool *ok ) {
-    TableString::Iterator it = m_string.find( columnName );
+QString OSQLResultItem::data( const QString& columnName, bool *ok ) const {
+    TableString::ConstIterator it = m_string.find( columnName );
 
     /* if found */
     if ( it != m_string.end() ) {
         if ( ok ) *ok = true;
         return it.data();
     }else{
         if ( ok )  *ok = false;
         return QString::null;
     }
 
 }
-QString OSQLResultItem::data( int column, bool *ok ) {
-    TableInt::Iterator it = m_int.find( column );
+QString OSQLResultItem::data( int column, bool *ok ) const {
+    TableInt::ConstIterator it = m_int.find( column );
 
     /* if found */
     if ( it != m_int.end() ) {
         if ( ok ) *ok = true;
         return it.data();
     }else{
diff --git a/libopie2/opiedb/osqlresult.h b/libopie2/opiedb/osqlresult.h
index fc6f01a..92b65a0 100644
--- a/libopie2/opiedb/osqlresult.h
+++ b/libopie2/opiedb/osqlresult.h
@@ -48,18 +48,18 @@ public:
     TableInt tableInt() const;
 
     /**
      * retrieves the Data from columnName
      *
      */
-    QString data( const QString& columnName, bool *ok = 0);
+    QString data( const QString& columnName, bool *ok = 0) const;
 
     /**
      * QString for column number
      */
-    QString data(int columnNumber, bool *ok = 0);
+    QString data(int columnNumber, bool *ok = 0) const;
 
     /**
      * Date conversion from columnName
      */
     QDate dataToDate( const QString& columnName, bool *ok = 0 );
 
diff --git a/libopie2/opiepim/TODO b/libopie2/opiepim/TODO
index c3420cf..b520370 100644
--- a/libopie2/opiepim/TODO
+++ b/libopie2/opiepim/TODO
@@ -2,12 +2,13 @@ As to popular request....
 
 1.) fix up the core/backend mess.
     The actual Backend Implementation + Interface should be there
     The API frontend used by the developer should not be used
 
         Rename ODateBookAccess* to OPimDateBookAccess*
+        Rename OContactAccess* to OpimContactAccess*
         Fix filenames to OPim* ...    
 
 2.) Move sorting, Query By Example, Exposing of Attributes of a Record
     available to the Ptr base class and have sane implementation
     on the template level