summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libqtaux/qcolordialog.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/libqtaux/qcolordialog.cpp b/libqtaux/qcolordialog.cpp
index 907c2aa..ccef0ad 100644
--- a/libqtaux/qcolordialog.cpp
+++ b/libqtaux/qcolordialog.cpp
@@ -23,64 +23,68 @@
23** Agreement provided with the Software. 23** Agreement provided with the Software.
24** 24**
25** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 25** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
26** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 26** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
27** 27**
28** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for 28** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
29** information about Qt Commercial License Agreements. 29** information about Qt Commercial License Agreements.
30** See http://www.trolltech.com/qpl/ for QPL licensing information. 30** See http://www.trolltech.com/qpl/ for QPL licensing information.
31** See http://www.trolltech.com/gpl/ for GPL licensing information. 31** See http://www.trolltech.com/gpl/ for GPL licensing information.
32** 32**
33** Contact info@trolltech.com if any conditions of this licensing are 33** Contact info@trolltech.com if any conditions of this licensing are
34** not clear to you. 34** not clear to you.
35** 35**
36**********************************************************************/ 36**********************************************************************/
37 37
38#include "qcolordialog.h" 38#include "qcolordialog.h"
39 39
40#include "qpainter.h" 40#include "qpainter.h"
41#include "qlayout.h" 41#include "qlayout.h"
42#include "qlabel.h" 42#include "qlabel.h"
43#include "qpushbutton.h" 43#include "qpushbutton.h"
44#include "qlineedit.h" 44#include "qlineedit.h"
45#include "qimage.h" 45#include "qimage.h"
46#include "qpixmap.h" 46#include "qpixmap.h"
47#include "qdrawutil.h" 47#include "qdrawutil.h"
48#include "qvalidator.h" 48#include "qvalidator.h"
49#include "qapplication.h" 49#include "qapplication.h"
50 50
51//////////// QWellArray BEGIN 51//////////// QWellArray BEGIN
52 52
53#include "qobjectdict.h" 53#include "qobjectdict.h"
54 54
55#ifndef QT_NO_DRAGANDDROP
56#include "qdragobject.h"
57#endif
58
55// 59//
56// W A R N I N G 60// W A R N I N G
57// ------------- 61// -------------
58// 62//
59// This file is not part of the Qt API. It exists for the convenience 63// This file is not part of the Qt API. It exists for the convenience
60// of qwellarray.cpp and qcolordialog.cpp. 64// of qwellarray.cpp and qcolordialog.cpp.
61// This header file may change from version to version without notice, 65// This header file may change from version to version without notice,
62// or even be removed. 66// or even be removed.
63// 67//
64// 68//
65 69
66 70
67#include "qtableview.h" 71#include "qtableview.h"
68 72
69 73
70struct QWellArrayData; 74struct QWellArrayData;
71 75
72class QWellArray : public QTableView 76class QWellArray : public QTableView
73{ 77{
74 Q_OBJECT 78 Q_OBJECT
75 Q_PROPERTY( int numCols READ numCols ) 79 Q_PROPERTY( int numCols READ numCols )
76 Q_PROPERTY( int numRows READ numRows ) 80 Q_PROPERTY( int numRows READ numRows )
77 Q_PROPERTY( int selectedColumn READ selectedColumn ) 81 Q_PROPERTY( int selectedColumn READ selectedColumn )
78 Q_PROPERTY( int selectedRow READ selectedRow ) 82 Q_PROPERTY( int selectedRow READ selectedRow )
79 83
80public: 84public:
81 QWellArray( QWidget *parent=0, const char *name=0, bool popup = FALSE ); 85 QWellArray( QWidget *parent=0, const char *name=0, bool popup = FALSE );
82 86
83 ~QWellArray() {} 87 ~QWellArray() {}
84 QString cellContent( int row, int col ) const; 88 QString cellContent( int row, int col ) const;
85 // ### Paul !!! virtual void setCellContent( int row, int col, const QString &); 89 // ### Paul !!! virtual void setCellContent( int row, int col, const QString &);
86 90