author | groucho <groucho> | 2003-03-19 11:36:34 (UTC) |
---|---|---|
committer | groucho <groucho> | 2003-03-19 11:36:34 (UTC) |
commit | 28be0fcc9bda71175c3ee17e79fce2ac24340ff2 (patch) (unidiff) | |
tree | f09c80460e4f0219eb308d612a2e67df57f2c254 /libopie/odevicebutton.cpp | |
parent | 18c6c51705de3b1897f671e54b25929e74d11f23 (diff) | |
download | opie-28be0fcc9bda71175c3ee17e79fce2ac24340ff2.zip opie-28be0fcc9bda71175c3ee17e79fce2ac24340ff2.tar.gz opie-28be0fcc9bda71175c3ee17e79fce2ac24340ff2.tar.bz2 |
Fixed bug #744 where non mapped buttons in buttonsettings were not saved by introducing the "
ignore" statement.
Also removed unsed debug code
-rw-r--r-- | libopie/odevicebutton.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libopie/odevicebutton.cpp b/libopie/odevicebutton.cpp index 2270343..4b22358 100644 --- a/libopie/odevicebutton.cpp +++ b/libopie/odevicebutton.cpp | |||
@@ -61,25 +61,25 @@ OQCopMessage::OQCopMessage ( const QCString &ch, const QCString &m, const QByteA | |||
61 | 61 | ||
62 | void OQCopMessage::init ( const QCString &ch, const QCString &m, const QByteArray &arg ) | 62 | void OQCopMessage::init ( const QCString &ch, const QCString &m, const QByteArray &arg ) |
63 | { | 63 | { |
64 | if ( !d ) | 64 | if ( !d ) |
65 | d = new OQCopMessageData ( ); | 65 | d = new OQCopMessageData ( ); |
66 | d-> m_channel = ch; | 66 | d-> m_channel = ch; |
67 | d-> m_message = m; | 67 | d-> m_message = m; |
68 | d-> m_data = arg; | 68 | d-> m_data = arg; |
69 | } | 69 | } |
70 | 70 | ||
71 | bool OQCopMessage::send ( ) | 71 | bool OQCopMessage::send ( ) |
72 | { | 72 | { |
73 | if ( d-> m_channel. isEmpty ( ) || d-> m_message. isEmpty ( )) | 73 | if ( d-> m_channel. isEmpty ( ) || d-> m_message. isEmpty ( ) ) |
74 | return false; | 74 | return false; |
75 | 75 | ||
76 | QCopEnvelope e ( d-> m_channel, d-> m_message ); | 76 | QCopEnvelope e ( d-> m_channel, d-> m_message ); |
77 | 77 | ||
78 | if ( d-> m_data. size ( )) | 78 | if ( d-> m_data. size ( )) |
79 | e. writeRawBytes ( d-> m_data. data ( ), d-> m_data. size ( )); | 79 | e. writeRawBytes ( d-> m_data. data ( ), d-> m_data. size ( )); |
80 | 80 | ||
81 | return true; | 81 | return true; |
82 | } | 82 | } |
83 | 83 | ||
84 | QCString OQCopMessage::channel ( ) const | 84 | QCString OQCopMessage::channel ( ) const |
85 | { | 85 | { |
@@ -209,24 +209,25 @@ void ODeviceButton::setUserText(const QString& text) | |||
209 | } | 209 | } |
210 | 210 | ||
211 | void ODeviceButton::setPixmap(const QPixmap& picture) | 211 | void ODeviceButton::setPixmap(const QPixmap& picture) |
212 | { | 212 | { |
213 | m_Pixmap = picture; | 213 | m_Pixmap = picture; |
214 | } | 214 | } |
215 | 215 | ||
216 | void ODeviceButton::setFactoryPresetPressedAction(const OQCopMessage& action) | 216 | void ODeviceButton::setFactoryPresetPressedAction(const OQCopMessage& action) |
217 | { | 217 | { |
218 | m_FactoryPresetPressedAction = action; | 218 | m_FactoryPresetPressedAction = action; |
219 | } | 219 | } |
220 | 220 | ||
221 | |||
221 | void ODeviceButton::setPressedAction(const OQCopMessage& action) | 222 | void ODeviceButton::setPressedAction(const OQCopMessage& action) |
222 | { | 223 | { |
223 | m_PressedAction = action; | 224 | m_PressedAction = action; |
224 | } | 225 | } |
225 | 226 | ||
226 | void ODeviceButton::setFactoryPresetHeldAction(const OQCopMessage& action) | 227 | void ODeviceButton::setFactoryPresetHeldAction(const OQCopMessage& action) |
227 | { | 228 | { |
228 | m_FactoryPresetHeldAction = action; | 229 | m_FactoryPresetHeldAction = action; |
229 | } | 230 | } |
230 | 231 | ||
231 | void ODeviceButton::setHeldAction(const OQCopMessage& action) | 232 | void ODeviceButton::setHeldAction(const OQCopMessage& action) |
232 | { | 233 | { |