summaryrefslogtreecommitdiff
path: root/noncore/applets/pcmcia/configdialog.cpp
Side-by-side diff
Diffstat (limited to 'noncore/applets/pcmcia/configdialog.cpp') (more/less context) (show whitespace changes)
-rw-r--r--noncore/applets/pcmcia/configdialog.cpp10
1 files changed, 5 insertions, 5 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 );