author | cniehaus <cniehaus> | 2002-09-17 21:57:22 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2002-09-17 21:57:22 (UTC) |
commit | 01d31aeaa8d513bde8237a07ea0a48ac1b85c3c0 (patch) (unidiff) | |
tree | 7a4df143ed5acaedf41eb5b4399117fdaf18bb38 /noncore/apps/oxygen | |
parent | d09947cc7ead59747feb10679ba6ba0a9db20a74 (diff) | |
download | opie-01d31aeaa8d513bde8237a07ea0a48ac1b85c3c0.zip opie-01d31aeaa8d513bde8237a07ea0a48ac1b85c3c0.tar.gz opie-01d31aeaa8d513bde8237a07ea0a48ac1b85c3c0.tar.bz2 |
added the future super-nice-and-cool-widget oxyframe and removed some
obsolte #include<>
-rw-r--r-- | noncore/apps/oxygen/dataTable.cpp | 5 | ||||
-rw-r--r-- | noncore/apps/oxygen/dataTable.h | 2 | ||||
-rw-r--r-- | noncore/apps/oxygen/oxyframe.cpp | 16 | ||||
-rw-r--r-- | noncore/apps/oxygen/oxyframe.h | 26 | ||||
-rw-r--r-- | noncore/apps/oxygen/oxygen.pro | 2 | ||||
-rw-r--r-- | noncore/apps/oxygen/psewidget.cpp | 5 | ||||
-rw-r--r-- | noncore/apps/oxygen/psewidget.h | 8 |
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 | |||
@@ -7,8 +7,6 @@ | |||
7 | * * | 7 | * * |
8 | **************************************************************************/ | 8 | **************************************************************************/ |
9 | #include "oxygen.h" | ||
10 | 9 | ||
11 | #include "dataTable.h" | 10 | #include "dataTable.h" |
12 | #include <qtable.h> | ||
13 | 11 | ||
14 | OxydataTable::OxydataTable(int numRows, int numCols, QWidget *parent, | 12 | OxydataTable::OxydataTable(int numRows, int numCols, QWidget *parent, |
@@ -23,7 +21,4 @@ void OxydataTable::paintCell( QPainter *p, int row, int col, const QRect &cr, b | |||
23 | selected = FALSE; | 21 | selected = FALSE; |
24 | 22 | ||
25 | int w = cr.width(); | ||
26 | int h = cr.height(); | ||
27 | |||
28 | QTableItem *itm = item( row, col ); | 23 | QTableItem *itm = item( row, col ); |
29 | QColorGroup colgrp = colorGroup(); | 24 | QColorGroup colgrp = colorGroup(); |
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 | |||
@@ -12,5 +12,4 @@ | |||
12 | #define _DATATABLE_H | 12 | #define _DATATABLE_H |
13 | 13 | ||
14 | |||
15 | #include <qtable.h> | 14 | #include <qtable.h> |
16 | 15 | ||
@@ -20,5 +19,4 @@ class OxydataTable : public QTable | |||
20 | 19 | ||
21 | public: | 20 | public: |
22 | OxydataTable(); | ||
23 | OxydataTable( int numRows, int numCols, | 21 | OxydataTable( int numRows, int numCols, |
24 | QWidget *parent = 0, const char *name = 0 ); | 22 | 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 @@ | |||
1 | /*************************************************************************** | ||
2 | * * | ||
3 | * This program is free software; you can redistribute it and/or modify * | ||
4 | * it under the terms of the GNU General Public License as published by * | ||
5 | * the Free Software Foundation; either version 2 of the License, or * | ||
6 | * ( at your option ) any later version. * | ||
7 | * * | ||
8 | **************************************************************************/ | ||
9 | #include "oxygen.h" | ||
10 | |||
11 | #include <qpe/config.h> | ||
12 | #include "oxyframe.h" | ||
13 | |||
14 | OxyFrame::OxyFrame(QWidget *parent, const char *name) : QFrame(parent,name) | ||
15 | { | ||
16 | } | ||
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 @@ | |||
1 | |||
2 | /*************************************************************************** | ||
3 | * * | ||
4 | * This program is free software; you can redistribute it and/or modify * | ||
5 | * it under the terms of the GNU General Public License as published by * | ||
6 | * the Free Software Foundation; either version 2 of the License, or * | ||
7 | * ( at your option ) any later version. * | ||
8 | * * | ||
9 | **************************************************************************/ | ||
10 | #ifndef _OXYFRAME_H | ||
11 | #define _OXYFRAME_H | ||
12 | |||
13 | |||
14 | #include <qframe.h> | ||
15 | |||
16 | class OxyFrame : public QFrame | ||
17 | { | ||
18 | Q_OBJECT | ||
19 | |||
20 | public: | ||
21 | OxyFrame( QWidget *parent=0, const char *name=0); | ||
22 | |||
23 | |||
24 | }; | ||
25 | |||
26 | #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 | |||
@@ -7,4 +7,5 @@ HEADERS = oxygen.h \ | |||
7 | dataTable.h \ | 7 | dataTable.h \ |
8 | psewidget.h \ | 8 | psewidget.h \ |
9 | oxyframe.h \ | ||
9 | datawidgetui.h | 10 | datawidgetui.h |
10 | 11 | ||
@@ -16,4 +17,5 @@ SOURCES = main.cpp \ | |||
16 | dataTable.cpp \ | 17 | dataTable.cpp \ |
17 | psewidget.cpp \ | 18 | psewidget.cpp \ |
19 | oxyframe.cpp \ | ||
18 | datawidgetui.cpp | 20 | datawidgetui.cpp |
19 | INCLUDEPATH += $(OPIEDIR)/include | 21 | INCLUDEPATH += $(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 | |||
@@ -7,10 +7,13 @@ | |||
7 | * * | 7 | * * |
8 | **************************************************************************/ | 8 | **************************************************************************/ |
9 | #include "oxygen.h" | ||
10 | 9 | ||
11 | #include <qpe/config.h> | 10 | #include <qpe/config.h> |
11 | #include <qlayout.h> | ||
12 | #include "psewidget.h" | 12 | #include "psewidget.h" |
13 | #include "oxyframe.h" | ||
13 | 14 | ||
14 | PSEWidget::PSEWidget() : QWidget() | 15 | PSEWidget::PSEWidget() : QWidget() |
15 | { | 16 | { |
17 | maingrid = new QGridLayout( 18 , 10 , -1 , "maingridlayout" ); | ||
18 | OxyFrame *test = new OxyFrame(this); | ||
16 | } | 19 | } |
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 | |||
@@ -13,8 +13,5 @@ | |||
13 | #include <qwidget.h> | 13 | #include <qwidget.h> |
14 | 14 | ||
15 | class QTable; | 15 | class QGridLayout; |
16 | class QComboBox; | ||
17 | class QLabel; | ||
18 | |||
19 | 16 | ||
20 | class PSEWidget : public QWidget | 17 | class PSEWidget : public QWidget |
@@ -25,4 +22,7 @@ class PSEWidget : public QWidget | |||
25 | PSEWidget(); | 22 | PSEWidget(); |
26 | 23 | ||
24 | private: | ||
25 | QGridLayout *maingrid; | ||
26 | |||
27 | }; | 27 | }; |
28 | 28 | ||