* nothing is hardcoded anylonger (thanks Max for the .conf-hint)

* removing obsolete includes
* making the PSE-data-widget a QWidget instead of a QDialog
* removing one obsolete slot
* making oxyDW private

4 files changed, 21 insertions, 32 deletions

diff --git a/noncore/apps/oxygen/dataTable.cpp b/noncore/apps/oxygen/dataTable.cpp
index 642a8be..5c7b35c 100644
--- a/noncore/apps/oxygen/dataTable.cpp
+++ b/noncore/apps/oxygen/dataTable.cpp
@@ -1,90 +1,89 @@
 /***************************************************************************
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
  * it under the terms of the GNU General Public License as published by    *
  * the Free Software Foundation; either version 2 of the License, or       *
  * ( at your option ) any later version.                                   *
  *                                                                         *
  **************************************************************************/
 
 #include <qpe/config.h>
 
 #include "dataTable.h"
 #include <qwidget.h>
 #include <qhbox.h>
-#include <qvbox.h>
 #include <qlabel.h>
 #include <qfont.h>
 #include <qlayout.h>
 
 OxydataWidget::OxydataWidget(QWidget *parent) : QWidget(parent)
 {
     QGridLayout *qgrid = new QGridLayout( this, 2,1 );
     QHBox *hbox = new QHBox( this );
     left = new QLabel( hbox );
     middle = new QLabel( hbox );
     right = new QLabel( hbox );
     
     DataTable = new OxydataTable( 9,2, this );
 
     QFont bf;
     bf.setBold( true );
     bf.setPointSize( bf.pointSize()+2 );
     middle->setFont( bf );
 
     setTable();
 
     qgrid->addWidget( hbox,0,0 );    
     qgrid->addWidget( DataTable,1,0 );    
 }
 
 void OxydataWidget::setElement( int el )
 {
-    Config test( "/home/opie/Settings/oxygendata", Config::File );
-    test.setGroup( QString::number( el+1 ));
+    Config configobj( "oxygendata" );
+    configobj.setGroup( QString::number( el+1 ));
     
-    left->setText( test.readEntry( "Symbol" ) );
-    middle->setText( test.readEntry( "Name" ) );
+    left->setText( configobj.readEntry( "Symbol" ) );
+    middle->setText( configobj.readEntry( "Name" ) );
     right->setText( QString::number( el+1 ) );
 
-    QString weight = test.readEntry( "Weight" );
+    QString weight = configobj.readEntry( "Weight" );
     DataTable->setText( 0,1,weight ); 
-    QString block = test.readEntry( "Block" );
+    QString block = configobj.readEntry( "Block" );
     DataTable->setText( 1,1,block ); 
-    QString grp = test.readEntry( "Group" );
+    QString grp = configobj.readEntry( "Group" );
     DataTable->setText( 2,1,grp ); 
-    QString en = test.readEntry( "EN" );
+    QString en = configobj.readEntry( "EN" );
     DataTable->setText( 3,1,en ); 
-    QString ar = test.readEntry( "AR" );
+    QString ar = configobj.readEntry( "AR" );
     DataTable->setText( 4,1,ar ) ; 
-    QString ion = test.readEntry( "IE" );
+    QString ion = configobj.readEntry( "IE" );
     DataTable->setText( 5,1,ion ); 
-    QString dens = test.readEntry( "Density" );
+    QString dens = configobj.readEntry( "Density" );
     DataTable->setText( 6,1,dens ); 
-    QString bp = test.readEntry( "BP" );
+    QString bp = configobj.readEntry( "BP" );
     DataTable->setText( 7,1,bp ); 
-    QString mp = test.readEntry( "MP" );
+    QString mp = configobj.readEntry( "MP" );
     DataTable->setText( 8,1,mp ); 
 }
 
 void OxydataWidget::setTable()
 {
     DataTable->setText( 0,0, tr( "Weight:" ) );
     DataTable->setText( 1,0, tr( "Block" )) ;
     DataTable->setText( 2,0, tr( "Group" )) ;
     DataTable->setText( 3,0, tr( "Electronegativity" )) ;
     DataTable->setText( 4,0, tr( "Atomic radius" )) ;
     DataTable->setText( 5,0, tr( "Ionizationenergie" )) ;
     DataTable->setText( 6,0, tr( "Density" )) ;
     DataTable->setText( 7,0, tr( "Boilingpoint" ) );
     DataTable->setText( 8,0, tr( "Meltingpoint" ) );
 }
 
 OxydataTable::OxydataTable(int numRows, int numCols, QWidget *parent,
         const char *name) : QTable(numRows, numRows, parent, name)
 {
     this->setShowGrid( false );
     this->setHScrollBarMode(QScrollView::AlwaysOff);
     this->horizontalHeader()->hide();
     this->verticalHeader()->hide();
     this->setTopMargin( 0 );
diff --git a/noncore/apps/oxygen/datawidgetui.cpp b/noncore/apps/oxygen/datawidgetui.cpp
index fa3f40d..8188515 100644
--- a/noncore/apps/oxygen/datawidgetui.cpp
+++ b/noncore/apps/oxygen/datawidgetui.cpp
@@ -1,48 +1,42 @@
 /***************************************************************************
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
  * it under the terms of the GNU General Public License as published by    *
  * the Free Software Foundation; either version 2 of the License, or       *
  * ( at your option ) any later version.                                   *
  *                                                                         *
  **************************************************************************/
-#include "oxygen.h"
+
 #include "datawidgetui.h"
 
 #include <qpe/config.h>
 #include <qstring.h>
 #include <qcombobox.h>
 #include <qlayout.h>
-#include <qtable.h>
 #include <qhbox.h>
 #include <qlabel.h>
 
-dataWidgetUI::dataWidgetUI() : QDialog()
+dataWidgetUI::dataWidgetUI() : QWidget()
 {
     this->setCaption("Chemical Data");
     
     QGridLayout *qgrid = new QGridLayout( this, 2,1 );
     
     dataCombo = new QComboBox( this );
     OxydataWidget *oxyDW = new OxydataWidget(this);
     oxyDW->setElement( 1 );
     qgrid->addWidget(  dataCombo, 0,0);
     qgrid->addWidget(  oxyDW , 1,0 );
     
     connect ( dataCombo, SIGNAL( activated(int) ), oxyDW, SLOT( setElement(int) ) );
-    Config test( "/home/opie/Settings/oxygendata", Config::File );
+    Config configobj( "oxygendata" );
     
     //read in all names of the 118 elements
     for ( int i = 1 ; i < 119 ; i++ )
     {
-        test.setGroup( QString::number( i ) );
-        QString foo = test.readEntry( "Name" );
+        configobj.setGroup( QString::number( i ) );
+        QString foo = configobj.readEntry( "Name" );
         dataCombo->insertItem( foo );
     }
 }
 
-
-
-void dataWidgetUI::slotShowData(int number){
-    oxyDW->setElement( 6 );
-}
diff --git a/noncore/apps/oxygen/datawidgetui.h b/noncore/apps/oxygen/datawidgetui.h
index 20622db..5399c81 100644
--- a/noncore/apps/oxygen/datawidgetui.h
+++ b/noncore/apps/oxygen/datawidgetui.h
@@ -1,29 +1,25 @@
 
 /***************************************************************************
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
  * it under the terms of the GNU General Public License as published by    *
  * the Free Software Foundation; either version 2 of the License, or       *
  * ( at your option ) any later version.                                   *
  *                                                                         *
  **************************************************************************/
 #include "dataTable.h"
-#include <qdialog.h>
 
 class QComboBox;
 
-class dataWidgetUI : public QDialog
+class dataWidgetUI : public QWidget
 {
 	Q_OBJECT
 	
     public:
 		dataWidgetUI();
-        OxydataWidget *oxyDW;
 
     private:
         OxydataTable *DataTable;
         QComboBox *dataCombo;
-
-    private slots:
-        void slotShowData(int);
+        OxydataWidget *oxyDW;
 };
diff --git a/noncore/apps/oxygen/psewidget.cpp b/noncore/apps/oxygen/psewidget.cpp
index f48cebe..cf55635 100644
--- a/noncore/apps/oxygen/psewidget.cpp
+++ b/noncore/apps/oxygen/psewidget.cpp
@@ -1,19 +1,19 @@
 /***************************************************************************
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
  * it under the terms of the GNU General Public License as published by    *
  * the Free Software Foundation; either version 2 of the License, or       *
  * ( at your option ) any later version.                                   *
  *                                                                         *
  **************************************************************************/
 
 #include <qpe/config.h>
 #include <qlayout.h>
 #include "psewidget.h"
 #include "oxyframe.h"
 
 PSEWidget::PSEWidget() : QWidget()
 {
     maingrid = new QGridLayout(  18 , 10 , -1 , "maingridlayout" );
-    OxyFrame *test = new OxyFrame(this);
+    OxyFrame *configobj = new OxyFrame(this);
 }