2 files changed, 18 insertions, 14 deletions

diff --git a/noncore/applets/pcmcia/configdialog.cpp b/noncore/applets/pcmcia/configdialog.cpp
index f94edde..3b1b40c 100644
--- a/noncore/applets/pcmcia/configdialog.cpp
+++ b/noncore/applets/pcmcia/configdialog.cpp
@@ -44,21 +44,21 @@ using namespace Opie::Core;
 #include <qtextstream.h>
 
 ConfigDialog::ConfigDialog( const OPcmciaSocket* card, QWidget* parent )
              :ConfigDialogBase( parent, "pcmcia config dialog", true )
 {
     gbDetails->setTitle( QString( "Details for card in socket #%1" ).arg( card->number() ) );
-    txtCardName->setText( card->productIdentity().join( " " ) );
+    txtCardName->setText( card->productIdentity() );
     txtManfid->setText( card->manufacturerIdentity() );
     txtFunction->setText( card->function() );
 
     QString insertAction = preferredAction( card, "insert" );
     QString resumeAction = preferredAction( card, "resume" );
 
-    odebug << "pcmcia: preferred insertion action for card '" << card->name() << "' seems to be '" << insertAction << "'" << oendl;
-    odebug << "pcmcia: preferred resume    action for card '" << card->name() << "' seems to be '" << resumeAction << "'" << oendl;
+    odebug << "pcmcia: preferred insertion action for card '" << card->productIdentity() << "' seems to be '" << insertAction << "'" << oendl;
+    odebug << "pcmcia: preferred resume    action for card '" << card->productIdentity() << "' seems to be '" << resumeAction << "'" << oendl;
 
     if ( !insertAction.isEmpty() )
     {
         for ( int i; i < cbInsertAction->count(); ++i )
             if ( cbInsertAction->text( i ) == insertAction ) cbInsertAction->setCurrentItem( i );
     }
@@ -129,13 +129,13 @@ ConfigDialog::~ConfigDialog()
 
 void ConfigDialog::writeConfigEntry( const OPcmciaSocket* card, const QString& key, const QString& value )
 {
     OConfig cfg( "PCMCIA" );
     cfg.setGroup( "Global" );
     int nCards = cfg.readNumEntry( "nCards", 0 );
-    QString cardName = card->productIdentity().join( " " ).stripWhiteSpace();
+    QString cardName = card->productIdentity();
     QString action;
 
     for ( int i = 0; i < nCards; ++i )
     {
         QString cardSection = QString( "Card_%1" ).arg( i );
         cfg.setGroup( cardSection );
@@ -151,13 +151,13 @@ void ConfigDialog::writeConfigEntry( const OPcmciaSocket* card, const QString& k
 
 QString ConfigDialog::readConfigEntry( const OPcmciaSocket* card, const QString& key, const QString& defaultValue )
 {
     OConfig cfg( "PCMCIA" );
     cfg.setGroup( "Global" );
     int nCards = cfg.readNumEntry( "nCards", 0 );
-    QString cardName = card->productIdentity().join( " " ).stripWhiteSpace();
+    QString cardName = card->productIdentity();
     QString value;
 
     for ( int i = 0; i < nCards; ++i )
     {
         QString cardSection = QString( "Card_%1" ).arg( i );
         cfg.setGroup( cardSection );
diff --git a/noncore/applets/pcmcia/pcmcia.cpp b/noncore/applets/pcmcia/pcmcia.cpp
index af23f58..c6386cb 100644
--- a/noncore/applets/pcmcia/pcmcia.cpp
+++ b/noncore/applets/pcmcia/pcmcia.cpp
@@ -73,13 +73,13 @@ PcmciaManager::PcmciaManager( QWidget * parent ) : QWidget( parent ), popupMenu(
              SIGNAL( received(const QCString&,const QByteArray&) ), this,
              SLOT( cardMessage(const QCString&,const QByteArray&) ) );
 
     setFocusPolicy( NoFocus );
     setFixedWidth ( AppLnk::smallIconSize() );
     setFixedHeight ( AppLnk::smallIconSize() );
-    pm = Opie::Core::OResource::loadPixmap( "pcmcia/pcmcia", Opie::Core::OResource::SmallIcon );
+    pm = Opie::Core::OResource::loadPixmap( "pcmcia", Opie::Core::OResource::SmallIcon );
     configuring = false;
 
     QCopChannel *channel = new QCopChannel( "QPE/System", this );
     connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
                 this, SLOT(handleSystemChannel(const QCString&,const QByteArray&)) );
 }
@@ -160,17 +160,21 @@ void PcmciaManager::mousePressEvent( QMouseEvent* )
         submenu->insertItem( "&Insert",    INSERT+i*100 );
         submenu->insertItem( "&Suspend",   SUSPEND+i*100 );
         submenu->insertItem( "&Resume",    RESUME+i*100 );
         submenu->insertItem( "Rese&t",     RESET+i*100 );
         submenu->insertItem( "&Configure", CONFIGURE+i*100 );
 
-        submenu->setItemEnabled( EJECT+i*100, !it.current()->isEmpty() );
-        submenu->setItemEnabled( INSERT+i*100, it.current()->isEmpty() );
-        submenu->setItemEnabled( SUSPEND+i*100, !it.current()->isEmpty() && it.current()->isSuspended() );
-        submenu->setItemEnabled( RESUME+i*100, !it.current()->isEmpty() && !it.current()->isSuspended() );
-        submenu->setItemEnabled( CONFIGURE+i*100, !it.current()->isEmpty() && !configuring );
+        bool isSuspended = it.current()->isSuspended();
+        bool isEmpty = it.current()->isEmpty();
+
+        submenu->setItemEnabled( EJECT+i*100, !isEmpty );
+        submenu->setItemEnabled( INSERT+i*100, isEmpty );
+        submenu->setItemEnabled( SUSPEND+i*100, !isEmpty && !isSuspended );
+        submenu->setItemEnabled( RESUME+i*100, !isEmpty && isSuspended );
+        submenu->setItemEnabled( RESET+i*100, !isEmpty && !isSuspended );
+        submenu->setItemEnabled( CONFIGURE+i*100, !isEmpty && !configuring );
 
         connect( submenu, SIGNAL(activated(int)), this, SLOT(userCardAction(int)) );
         menu->insertItem( tr( "%1: %2" ).arg( i++ ).arg( it.current()->identity() ), submenu, 1 );
         ++it;
     }
 
@@ -210,13 +214,13 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
             ++it;
             continue;
         }
         else
         {
             theCard = it.current();
-            QString cardName = theCard->productIdentity().join( " " ).stripWhiteSpace();
+            QString cardName = theCard->productIdentity();
             for ( int i = 0; i < nCards; ++i )
             {
                 QString cardSection = QString( "Card_%1" ).arg( i );
                 cfg.setGroup( cardSection );
                 QString name = cfg.readEntry( "name" );
                 odebug << "pcmcia: comparing card '" << cardName << "' with known card '" << name << "'" << oendl;
@@ -231,13 +235,13 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
             if ( !newCard ) ++it; else break;
         }
     }
     if ( newCard )
     {
         odebug << "pcmcia: unconfigured card detected" << oendl;
-        QString newCardName = theCard->productIdentity().join( " " ).stripWhiteSpace();
+        QString newCardName = theCard->productIdentity();
         int result = QMessageBox::information( qApp->desktop(),
                                            tr( "PCMCIA/CF Subsystem" ),
                                            tr( "<qt>You have inserted the card<br/><b>%1</b><br/>This card is not yet configured. Do you want to configure it now?</qt>" ).arg( newCardName ),
                                            tr( "Yes" ), tr( "No" ), 0, 0, 1 );
         odebug << "pcmcia: result = " << result << oendl;
         if ( result == 0 )
@@ -258,13 +262,13 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
 
                 QFile confFile( conf );
                 if ( confFile.open( IO_ReadWrite | IO_Append ) )
                 {
                     QString entryCard = QString( "card \"%1\"" ).arg( newCardName );
                     QString entryVersion( "    version " );
-                    for ( QStringList::Iterator it = theCard->productIdentity().begin(); it != theCard->productIdentity().end(); ++it )
+                    for ( QStringList::Iterator it = theCard->productIdentityVector().begin(); it != theCard->productIdentityVector().end(); ++it )
                     {
                         entryVersion += QString( "\"%1\", " ).arg( *it );
                     }
                     QString entryBind = QString( "    bind %1" ).arg( driver );
                     QString entry = QString( "\n%1\n%2\n%3\n" ).arg( entryCard ).arg( entryVersion ).arg( entryBind );
                     odebug << "pcmcia: writing entry...:" << entry << oendl;