summaryrefslogtreecommitdiff
path: root/noncore/settings
Unidiff
Diffstat (limited to 'noncore/settings') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sysinfo/devicesinfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/settings/sysinfo/devicesinfo.cpp b/noncore/settings/sysinfo/devicesinfo.cpp
index 945edea..4940286 100644
--- a/noncore/settings/sysinfo/devicesinfo.cpp
+++ b/noncore/settings/sysinfo/devicesinfo.cpp
@@ -187,49 +187,49 @@ void InputCategory::populate()
187 while ( it.current() ) 187 while ( it.current() )
188 { 188 {
189 new InputDevice( this, it.current()->identity() ); 189 new InputDevice( this, it.current()->identity() );
190 ++it; 190 ++it;
191 } 191 }
192} 192}
193 193
194//================================================================================================= 194//=================================================================================================
195CardsCategory::CardsCategory( DevicesView* parent ) 195CardsCategory::CardsCategory( DevicesView* parent )
196 :Category( parent, "3. Removable Cards" ) 196 :Category( parent, "3. Removable Cards" )
197{ 197{
198} 198}
199 199
200CardsCategory::~CardsCategory() 200CardsCategory::~CardsCategory()
201{ 201{
202} 202}
203 203
204void CardsCategory::populate() 204void CardsCategory::populate()
205{ 205{
206 odebug << "CardsCategory::populate()" << oendl; 206 odebug << "CardsCategory::populate()" << oendl;
207 OPcmciaSystem* sys = OPcmciaSystem::instance(); 207 OPcmciaSystem* sys = OPcmciaSystem::instance();
208 OPcmciaSystem::CardIterator it = sys->iterator(); 208 OPcmciaSystem::CardIterator it = sys->iterator();
209 while ( it.current() ) 209 while ( it.current() )
210 { 210 {
211 new CardDevice( this, (const char*) it.currentKey() ); 211 new CardDevice( this, it.current()->identity() );
212 ++it; 212 ++it;
213 } 213 }
214} 214}
215 215
216//================================================================================================= 216//=================================================================================================
217UsbCategory::UsbCategory( DevicesView* parent ) 217UsbCategory::UsbCategory( DevicesView* parent )
218 :Category( parent, "4. Universal Serial Bus" ) 218 :Category( parent, "4. Universal Serial Bus" )
219{ 219{
220} 220}
221 221
222UsbCategory::~UsbCategory() 222UsbCategory::~UsbCategory()
223{ 223{
224} 224}
225 225
226void UsbCategory::populate() 226void UsbCategory::populate()
227{ 227{
228 odebug << "UsbCategory::populate()" << oendl; 228 odebug << "UsbCategory::populate()" << oendl;
229 QFile usbinfofile( "/proc/bus/usb/devices" ); 229 QFile usbinfofile( "/proc/bus/usb/devices" );
230 if ( !usbinfofile.exists() || !usbinfofile.open( IO_ReadOnly ) ) 230 if ( !usbinfofile.exists() || !usbinfofile.open( IO_ReadOnly ) )
231 { 231 {
232 new UsbDevice( this, "ERROR: /proc/bus/usb/devices not found or unaccessible" ); 232 new UsbDevice( this, "ERROR: /proc/bus/usb/devices not found or unaccessible" );
233 return; 233 return;
234 } 234 }
235 QTextStream usbinfo( &usbinfofile ); 235 QTextStream usbinfo( &usbinfofile );