-rw-r--r-- | libopie2/opiecore/device/odevice.cpp | 4 | ||||
-rw-r--r-- | libopie2/opiedb/osqlresult.cpp | 8 | ||||
-rw-r--r-- | libopie2/opiedb/osqlresult.h | 4 | ||||
-rw-r--r-- | libopie2/opiepim/TODO | 1 |
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 | |||
@@ -756,11 +756,14 @@ void ODevice::remPreHandler(QWSServer::KeyboardFilter*aFilter) | |||
756 | void ODevice::playingStopped() { | 756 | void ODevice::playingStopped() { |
757 | const_cast<QObject*>(sender())->disconnect( this ); | 757 | const_cast<QObject*>(sender())->disconnect( this ); |
758 | #ifndef QT_NO_SOUND | ||
758 | if ( d->m_sound >= 0 ) { | 759 | if ( d->m_sound >= 0 ) { |
759 | ::ioctl ( d->m_sound, MIXER_WRITE( d->m_mixer ), &d->m_vol ); | 760 | ::ioctl ( d->m_sound, MIXER_WRITE( d->m_mixer ), &d->m_vol ); |
760 | ::close ( d->m_sound ); | 761 | ::close ( d->m_sound ); |
761 | } | 762 | } |
763 | #endif | ||
762 | } | 764 | } |
763 | 765 | ||
764 | void ODevice::changeMixerForAlarm( int mixer, const char* file, Sound *snd ) { | 766 | void ODevice::changeMixerForAlarm( int mixer, const char* file, Sound *snd ) { |
767 | #ifndef QT_NO_SOUND | ||
765 | if (( d->m_sound = ::open ( file, O_RDWR )) >= 0 ) { | 768 | if (( d->m_sound = ::open ( file, O_RDWR )) >= 0 ) { |
766 | if ( ::ioctl ( d->m_sound, MIXER_READ( mixer ), &d->m_vol ) >= 0 ) { | 769 | if ( ::ioctl ( d->m_sound, MIXER_READ( mixer ), &d->m_vol ) >= 0 ) { |
@@ -780,4 +783,5 @@ void ODevice::changeMixerForAlarm( int mixer, const char* file, Sound *snd ) { | |||
780 | d->m_mixer = mixer; | 783 | d->m_mixer = mixer; |
781 | } | 784 | } |
785 | #endif | ||
782 | } | 786 | } |
783 | 787 | ||
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 | |||
@@ -26,6 +26,6 @@ OSQLResultItem::TableInt OSQLResultItem::tableInt()const { | |||
26 | return m_int; | 26 | return m_int; |
27 | } | 27 | } |
28 | QString OSQLResultItem::data( const QString& columnName, bool *ok ) { | 28 | QString OSQLResultItem::data( const QString& columnName, bool *ok ) const { |
29 | TableString::Iterator it = m_string.find( columnName ); | 29 | TableString::ConstIterator it = m_string.find( columnName ); |
30 | 30 | ||
31 | /* if found */ | 31 | /* if found */ |
@@ -39,6 +39,6 @@ QString OSQLResultItem::data( const QString& columnName, bool *ok ) { | |||
39 | 39 | ||
40 | } | 40 | } |
41 | QString OSQLResultItem::data( int column, bool *ok ) { | 41 | QString OSQLResultItem::data( int column, bool *ok ) const { |
42 | TableInt::Iterator it = m_int.find( column ); | 42 | TableInt::ConstIterator it = m_int.find( column ); |
43 | 43 | ||
44 | /* if found */ | 44 | /* if found */ |
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 | |||
@@ -52,10 +52,10 @@ public: | |||
52 | * | 52 | * |
53 | */ | 53 | */ |
54 | QString data( const QString& columnName, bool *ok = 0); | 54 | QString data( const QString& columnName, bool *ok = 0) const; |
55 | 55 | ||
56 | /** | 56 | /** |
57 | * QString for column number | 57 | * QString for column number |
58 | */ | 58 | */ |
59 | QString data(int columnNumber, bool *ok = 0); | 59 | QString data(int columnNumber, bool *ok = 0) const; |
60 | 60 | ||
61 | /** | 61 | /** |
diff --git a/libopie2/opiepim/TODO b/libopie2/opiepim/TODO index c3420cf..b520370 100644 --- a/libopie2/opiepim/TODO +++ b/libopie2/opiepim/TODO | |||
@@ -6,4 +6,5 @@ As to popular request.... | |||
6 | 6 | ||
7 | Rename ODateBookAccess* to OPimDateBookAccess* | 7 | Rename ODateBookAccess* to OPimDateBookAccess* |
8 | Rename OContactAccess* to OpimContactAccess* | ||
8 | Fix filenames to OPim* ... | 9 | Fix filenames to OPim* ... |
9 | 10 | ||