added the future super-nice-and-cool-widget oxyframe and removed some

obsolte #include<>

7 files changed, 52 insertions, 12 deletions

diff --git a/noncore/apps/oxygen/dataTable.cpp b/noncore/apps/oxygen/dataTable.cpp
index 6c6b9dc..bb786ea 100644
--- a/noncore/apps/oxygen/dataTable.cpp
+++ b/noncore/apps/oxygen/dataTable.cpp
@@ -6,10 +6,8 @@
  * ( at your option ) any later version.                                   *
  *                                                                         *
  **************************************************************************/
-#include "oxygen.h"
 
 #include "dataTable.h"
-#include <qtable.h>
 
 OxydataTable::OxydataTable(int numRows, int numCols, QWidget *parent,
         const char *name) : QTable(numRows, numRows, parent, name)
@@ -22,9 +20,6 @@ void OxydataTable::paintCell(  QPainter *p, int row, int col, const QRect &cr, b
         return;
     selected = FALSE;
 
-    int w = cr.width();
-    int h = cr.height();
-
     QTableItem *itm = item( row, col );
     QColorGroup colgrp = colorGroup();
     if ( itm ) 
diff --git a/noncore/apps/oxygen/dataTable.h b/noncore/apps/oxygen/dataTable.h
index 5adbcc2..908d241 100644
--- a/noncore/apps/oxygen/dataTable.h
+++ b/noncore/apps/oxygen/dataTable.h
@@ -11,7 +11,6 @@
 #ifndef _DATATABLE_H
 #define _DATATABLE_H
 
-
 #include <qtable.h>
 
 class OxydataTable : public QTable
@@ -19,7 +18,6 @@ class OxydataTable : public QTable
 	Q_OBJECT
 	
     public:
-		OxydataTable();
         OxydataTable( int numRows, int numCols,
                             QWidget *parent = 0, const char *name = 0 );
 
diff --git a/noncore/apps/oxygen/oxyframe.cpp b/noncore/apps/oxygen/oxyframe.cpp
new file mode 100644
index 0000000..060f9ca
--- a/dev/null
+++ b/noncore/apps/oxygen/oxyframe.cpp
@@ -0,0 +1,16 @@
+/***************************************************************************
+ *                                                                         *
+ * 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 <qpe/config.h>
+#include "oxyframe.h"
+
+OxyFrame::OxyFrame(QWidget *parent, const char *name) : QFrame(parent,name)
+{
+}
diff --git a/noncore/apps/oxygen/oxyframe.h b/noncore/apps/oxygen/oxyframe.h
new file mode 100644
index 0000000..01f888d
--- a/dev/null
+++ b/noncore/apps/oxygen/oxyframe.h
@@ -0,0 +1,26 @@
+
+/***************************************************************************
+ *                                                                         *
+ * 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.                                   *
+ *                                                                         *
+ **************************************************************************/
+#ifndef _OXYFRAME_H
+#define _OXYFRAME_H
+
+
+#include <qframe.h>
+
+class OxyFrame : public QFrame
+{
+	Q_OBJECT
+	
+    public:
+        OxyFrame(  QWidget *parent=0, const char *name=0);
+        
+
+};
+
+#endif
diff --git a/noncore/apps/oxygen/oxygen.pro b/noncore/apps/oxygen/oxygen.pro
index c447330..8f9e4ea 100644
--- a/noncore/apps/oxygen/oxygen.pro
+++ b/noncore/apps/oxygen/oxygen.pro
@@ -6,6 +6,7 @@ HEADERS		= oxygen.h \
             calcdlgui.h \
             dataTable.h \
             psewidget.h \
+            oxyframe.h \
             datawidgetui.h
 
 SOURCES		= main.cpp \
@@ -15,6 +16,7 @@ SOURCES		= main.cpp \
           kmolelements.cpp \
           dataTable.cpp \
           psewidget.cpp \
+          oxyframe.cpp \
           datawidgetui.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
diff --git a/noncore/apps/oxygen/psewidget.cpp b/noncore/apps/oxygen/psewidget.cpp
index 66450be..f48cebe 100644
--- a/noncore/apps/oxygen/psewidget.cpp
+++ b/noncore/apps/oxygen/psewidget.cpp
@@ -6,11 +6,14 @@
  * ( at your option ) any later version.                                   *
  *                                                                         *
  **************************************************************************/
-#include "oxygen.h"
 
 #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);
 }
diff --git a/noncore/apps/oxygen/psewidget.h b/noncore/apps/oxygen/psewidget.h
index ebdec94..a0ab701 100644
--- a/noncore/apps/oxygen/psewidget.h
+++ b/noncore/apps/oxygen/psewidget.h
@@ -12,10 +12,7 @@
 
 #include <qwidget.h>
 
-class QTable;
-class QComboBox;
-class QLabel;
-
+class QGridLayout;
 
 class PSEWidget : public QWidget
 {
@@ -24,6 +21,9 @@ class PSEWidget : public QWidget
     public:
 		PSEWidget();
 
+    private:
+        QGridLayout *maingrid;
+
 };
 
 #endif