2 files changed, 4 insertions, 7 deletions

diff --git a/noncore/apps/oxygen/dataTable.cpp b/noncore/apps/oxygen/dataTable.cpp
index 951788b..46eaeba 100644
--- a/noncore/apps/oxygen/dataTable.cpp
+++ b/noncore/apps/oxygen/dataTable.cpp
@@ -26,13 +26,10 @@
 #include <qpe/qpeapplication.h>
 
 #include <qstringlist.h>
 
-OxydataWidget::OxydataWidget(QWidget *parent, const char *name, const QStringList &list ) : QWidget( parent,name )
+OxydataWidget::OxydataWidget(QWidget *parent, const char *name, const QStringList &list ) : QWidget( parent,name ), names( list )
 {
-        names = list;
-        QStringList::ConstIterator it = names.at(10);
-        qDebug( *it );
     QGridLayout *qgrid = new QGridLayout( this, 2,1 );
 
     QHBox *hbox = new QHBox( this );
     left = new QLabel( hbox );
@@ -55,10 +52,9 @@ OxydataWidget::OxydataWidget(QWidget *parent, const char *name, const QStringLis
 }
 
 void OxydataWidget::setElement( int el )
 {
-        QStringList::ConstIterator it = names.at(el+1);
-        qDebug( *it );
+        QStringList::ConstIterator it = names.at(el);
     Config configobj( QPEApplication::qpeDir() +"share/oxygen/oxygendata", Config::File );
 
     configobj.setGroup( QString::number( el+1 ));
 
diff --git a/noncore/apps/oxygen/datawidgetui.cpp b/noncore/apps/oxygen/datawidgetui.cpp
index e28ee4d..91d669f 100644
--- a/noncore/apps/oxygen/datawidgetui.cpp
+++ b/noncore/apps/oxygen/datawidgetui.cpp
@@ -42,9 +42,9 @@ dataWidgetUI::dataWidgetUI() : QWidget()
     for ( QStringList::ConstIterator it =  names.begin() ; it != names.end() ; ++it,i++)
     {
         dataCombo->insertItem( QString::number( i+1 )+" - "+*it );
     }
-
+        QStringList::ConstIterator it = names.begin();
     OxydataWidget *oxyDW = new OxydataWidget(this, "OxydataWidget_oxyDW", names);
     connect ( dataCombo, SIGNAL( activated(int) ), oxyDW, SLOT( setElement(int) ) );
     oxyDW->setElement( 0 );
     oxyDW->setLayout();
@@ -54,8 +54,9 @@ dataWidgetUI::dataWidgetUI() : QWidget()
 }
 
 void dataWidgetUI::loadNames()
 {
+        names.clear();
         names.append( tr("Hydrogen") );
         names.append( tr("Helium") );
         names.append( tr("Lithium") );
         names.append( tr("Beryllium") );