catch up with pcmcia changes

2 files changed, 18 insertions, 8 deletions

diff --git a/noncore/applets/pcmcia/pcmcia.cpp b/noncore/applets/pcmcia/pcmcia.cpp
index 5183572..7f24371 100644
--- a/noncore/applets/pcmcia/pcmcia.cpp
+++ b/noncore/applets/pcmcia/pcmcia.cpp
@@ -113,5 +113,5 @@ void PcmciaManager::popupTimeout()
 void PcmciaManager::mousePressEvent( QMouseEvent* )
 {
-    QPopupMenu * menu = new QPopupMenu( this );
+    QPopupMenu* menu = new QPopupMenu( this );
     QStringList cmd;
     bool execute = true;
@@ -124,9 +124,18 @@ void PcmciaManager::mousePressEvent( QMouseEvent* )
     while ( it.current() )
     {
-        menu->insertItem( tr( "Eject card %1: %2" ).arg( i++ ).arg( it.currentKey() ), 1 );
+
+        QPopupMenu* submenu = new QPopupMenu( menu );
+        submenu->insertItem( "Eject" );
+        submenu->insertItem( "Insert" );
+        submenu->insertItem( "Suspend" );
+        submenu->insertItem( "Resume" );
+        submenu->insertItem( "Configure" );
+
+        menu->insertItem( tr( "%1: %2" ).arg( i++ ).arg( it.current()->identity() ), submenu, 1 );
         ++it;
     }
 
 
+
     /* insert items depending on number of cards etc.
 
@@ -136,5 +145,5 @@ void PcmciaManager::mousePressEvent( QMouseEvent* )
     }
 
-    
+
 
     if ( cardInPcmcia0 ) {
@@ -169,5 +178,5 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
     OPcmciaSystem::instance()->synchronize();
 
-    if ( !OPcmciaSystem::instance()->count() ) return;
+    if ( !OPcmciaSystem::instance()->cardCount() ) return;
 
     OConfig cfg( "PCMCIA" );
@@ -179,7 +188,8 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
 
     bool newCard = true;
-    while ( it.current() && newCard )
+
+    while ( it.current() && !it.current()->isEmpty() && newCard )
     {
-        QString name = it.currentKey();
+        QString name = it.current()->identity();
         for ( int i = 0; i < nCards; ++i )
         {
@@ -196,8 +206,8 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
         if ( !newCard ) ++it; else break;
     }
-    QString newCardName = it.currentKey();
 
     if ( newCard )
     {
+        QString newCardName = it.current()->identity();
         odebug << "pcmcia: new card detected" << oendl;
         cfg.setGroup( QString( "Card_%1" ).arg( nCards ) );
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
@@ -209,5 +209,5 @@ void CardsCategory::populate()
     while ( it.current() )
     {
-        new CardDevice( this, (const char*) it.currentKey() );
+        new CardDevice( this, it.current()->identity() );
         ++it;
     }