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
@@ -757,2 +757,3 @@ void ODevice::playingStopped() {
     const_cast<QObject*>(sender())->disconnect( this );
+#ifndef QT_NO_SOUND
     if ( d->m_sound >= 0 ) {
@@ -761,2 +762,3 @@ void ODevice::playingStopped() {
     }
+#endif
 }
@@ -764,2 +766,3 @@ void ODevice::playingStopped() {
 void ODevice::changeMixerForAlarm( int mixer, const char* file, Sound *snd ) {
+#ifndef QT_NO_SOUND
     if (( d->m_sound = ::open ( file, O_RDWR )) >= 0 ) {
@@ -781,2 +784,3 @@ void ODevice::changeMixerForAlarm( int mixer, const char* file, Sound *snd ) {
     }
+#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
@@ -27,4 +27,4 @@ OSQLResultItem::TableInt OSQLResultItem::tableInt()const {
 }
-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 );
 
@@ -40,4 +40,4 @@ QString OSQLResultItem::data( const QString& columnName, bool *ok ) {
 }
-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 );
 
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
@@ -53,3 +53,3 @@ public:
      */
-    QString data( const QString& columnName, bool *ok = 0);
+    QString data( const QString& columnName, bool *ok = 0) const;
 
@@ -58,3 +58,3 @@ public:
      */
-    QString data(int columnNumber, bool *ok = 0);
+    QString data(int columnNumber, bool *ok = 0) const;
 
diff --git a/libopie2/opiepim/TODO b/libopie2/opiepim/TODO
index c3420cf..b520370 100644
--- a/libopie2/opiepim/TODO
+++ b/libopie2/opiepim/TODO
@@ -7,2 +7,3 @@ As to popular request....
         Rename ODateBookAccess* to OPimDateBookAccess*
+        Rename OContactAccess* to OpimContactAccess*
         Fix filenames to OPim* ...