summaryrefslogtreecommitdiff
authoreilers <eilers>2004-07-27 13:26:12 (UTC)
committer eilers <eilers>2004-07-27 13:26:12 (UTC)
commitfd0d353abb2fd89a91eca830dbb814984647c1f7 (patch) (unidiff)
treed5328db46863e4d3fbda5fe85fd3b1ddb1951f80
parent2f332574ddbd31fe9709c1ec93049ecef9bd00a4 (diff)
downloadopie-fd0d353abb2fd89a91eca830dbb814984647c1f7.zip
opie-fd0d353abb2fd89a91eca830dbb814984647c1f7.tar.gz
opie-fd0d353abb2fd89a91eca830dbb814984647c1f7.tar.bz2
Replacing an ugly QString.sprintf() with QString().arg() which fixes wrong format handling.
This is a reason, why we have odebug instead of qDebug.. Thanks to mickeyl for code review!
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_jornada.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libopie2/opiecore/device/odevice_jornada.cpp b/libopie2/opiecore/device/odevice_jornada.cpp
index 5d32901..60736a1 100644
--- a/libopie2/opiecore/device/odevice_jornada.cpp
+++ b/libopie2/opiecore/device/odevice_jornada.cpp
@@ -106,103 +106,103 @@ struct j_button jornada56x_buttons [] = {
106 "devicebuttons/jornada56x_record", 106 "devicebuttons/jornada56x_record",
107 "QPE/VMemo", "toggleRecord()", 107 "QPE/VMemo", "toggleRecord()",
108 "sound", "raise()" }, 108 "sound", "raise()" },
109}; 109};
110 110
111void Jornada::init(const QString&) 111void Jornada::init(const QString&)
112{ 112{
113 d->m_vendorstr = "HP"; 113 d->m_vendorstr = "HP";
114 d->m_vendor = Vendor_HP; 114 d->m_vendor = Vendor_HP;
115 d->m_modelstr = "Jornada 56x"; 115 d->m_modelstr = "Jornada 56x";
116 d->m_model = Model_Jornada_56x; 116 d->m_model = Model_Jornada_56x;
117 d->m_rotation = Rot0; 117 d->m_rotation = Rot0;
118 //Distribution detecting code is now in base class 118 //Distribution detecting code is now in base class
119} 119}
120 120
121void Jornada::initButtons() 121void Jornada::initButtons()
122{ 122{
123 if ( d->m_buttons ) 123 if ( d->m_buttons )
124 return; 124 return;
125 125
126 d->m_buttons = new QValueList <ODeviceButton>; 126 d->m_buttons = new QValueList <ODeviceButton>;
127 127
128 for ( uint i = 0; i < ( sizeof( jornada56x_buttons ) / sizeof( j_button )); i++ ) { 128 for ( uint i = 0; i < ( sizeof( jornada56x_buttons ) / sizeof( j_button )); i++ ) {
129 j_button *ib = jornada56x_buttons + i; 129 j_button *ib = jornada56x_buttons + i;
130 ODeviceButton b; 130 ODeviceButton b;
131 131
132 if (( ib->model & d->m_model ) == d->m_model ) { 132 if (( ib->model & d->m_model ) == d->m_model ) {
133 b. setKeycode ( ib->code ); 133 b. setKeycode ( ib->code );
134 b. setUserText ( QObject::tr ( "Button", ib->utext )); 134 b. setUserText ( QObject::tr ( "Button", ib->utext ));
135 b. setPixmap ( Resource::loadPixmap ( ib->pix )); 135 b. setPixmap ( Resource::loadPixmap ( ib->pix ));
136 b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib->fpressedservice ), ib->fpressedaction )); 136 b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib->fpressedservice ), ib->fpressedaction ));
137 b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib->fheldservice ), ib->fheldaction )); 137 b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib->fheldservice ), ib->fheldaction ));
138 138
139 d->m_buttons->append ( b ); 139 d->m_buttons->append ( b );
140 } 140 }
141 } 141 }
142 reloadButtonMapping(); 142 reloadButtonMapping();
143 143
144 QCopChannel *sysch = new QCopChannel ( "QPE/System", this ); 144 QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
145 connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&))); 145 connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&)));
146} 146}
147 147
148int Jornada::displayBrightnessResolution() const 148int Jornada::displayBrightnessResolution() const
149{ 149{
150 return 255; 150 return 255;
151} 151}
152 152
153 153
154bool Jornada::setDisplayBrightness( int bright ) 154bool Jornada::setDisplayBrightness( int bright )
155{ 155{
156 bool res = false; 156 bool res = false;
157 157
158 if ( bright > 255 ) 158 if ( bright > 255 )
159 bright = 255; 159 bright = 255;
160 if ( bright < 0 ) 160 if ( bright < 0 )
161 bright = 0; 161 bright = 0;
162 162
163 QString cmdline; 163 QString cmdline;
164 164
165 int value = 255 - bright; 165 int value = 255 - bright;
166 if ( !bright ) 166 if ( !bright )
167 cmdline = QString().sprintf( "echo 4 > /sys/class/backlight/sa1100fb/power"); 167 cmdline = QString().sprintf( "echo 4 > /sys/class/backlight/sa1100fb/power");
168 else 168 else
169 cmdline = QString().sprintf( "echo 0 > /sys/class/backlight/sa1100fb/power; echo %d > /sys/class/backlight/sa1100fb/brightness", value ); 169 cmdline = QString().sprintf( "echo 0 > /sys/class/backlight/sa1100fb/power; echo %d > /sys/class/backlight/sa1100fb/brightness", value );
170 170
171 res = ( ::system( (const char*) cmdline ) == 0 ); 171 res = ( ::system( (const char*) cmdline ) == 0 );
172 172
173 return res; 173 return res;
174} 174}
175 175
176 176
177bool Jornada::suspend( ) 177bool Jornada::suspend( )
178{ 178{
179 qDebug("ODevice::suspend"); 179 qDebug("ODevice::suspend");
180 if ( !isQWS( ) ) // only qwsserver is allowed to suspend 180 if ( !isQWS( ) ) // only qwsserver is allowed to suspend
181 return false; 181 return false;
182 182
183 if ( d->m_model == Model_Unknown ) // better don't suspend in qvfb / on unkown devices 183 if ( d->m_model == Model_Unknown ) // better don't suspend in qvfb / on unkown devices
184 return false; 184 return false;
185 185
186 bool res = false; 186 bool res = false;
187 ODevice::sendSuspendmsg(); 187 ODevice::sendSuspendmsg();
188 188
189 struct timeval tvs; 189 struct timeval tvs;
190 ::gettimeofday ( &tvs, 0 ); 190 ::gettimeofday ( &tvs, 0 );
191 191
192 ::sync(); // flush fs caches 192 ::sync(); // flush fs caches
193 res = ( ::system ( "apm --suspend" ) == 0 ); 193 res = ( ::system ( "apm --suspend" ) == 0 );
194 194
195 return res; 195 return res;
196} 196}
197 197
198bool Jornada::setDisplayStatus ( bool on ) 198bool Jornada::setDisplayStatus ( bool on )
199{ 199{
200 bool res = false; 200 bool res = false;
201 201
202 QString cmdline = QString().sprintf( "echo %d > /sys/class/lcd/sa1100fb/power; echo %d > /sys/class/backlight/sa1100fb/power", on ? "0" : "4", on? "0" : "4" ); 202 QString cmdline = QString( "echo %1 > /sys/class/lcd/sa1100fb/power; echo %2 > /sys/class/backlight/sa1100fb/power").arg( on ? "0" : "4" ).arg( on ? "0" : "4" );
203 203
204 res = ( ::system( (const char*) cmdline ) == 0 ); 204 res = ( ::system( (const char*) cmdline ) == 0 );
205 205
206 return res; 206 return res;
207} 207}
208 208