author | eilers <eilers> | 2003-08-08 14:45:49 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-08-08 14:45:49 (UTC) |
commit | 14d394e6c107b037a09a31a92605034fe50f7813 (patch) (unidiff) | |
tree | 800699cf4dc9681c3eb023340634dd6a15fd04c8 /library/categoryselect.h | |
parent | dbc6ea35f5535a1f69deb7ebbafc0f721721dbf2 (diff) | |
download | opie-14d394e6c107b037a09a31a92605034fe50f7813.zip opie-14d394e6c107b037a09a31a92605034fe50f7813.tar.gz opie-14d394e6c107b037a09a31a92605034fe50f7813.tar.bz2 |
Merged branches from BRANCH_1_0
-rw-r--r-- | library/categoryselect.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/library/categoryselect.h b/library/categoryselect.h index 7a8e491..8ec1941 100644 --- a/library/categoryselect.h +++ b/library/categoryselect.h | |||
@@ -1,6 +1,7 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2001 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2001 Trolltech AS. All rights reserved. |
3 | ** Copyright (C) 2003 zecke Introduce Sharp to the glory of default arguments | ||
3 | ** | 4 | ** |
4 | ** This file is part of Qtopia Environment. | 5 | ** This file is part of Qtopia Environment. |
5 | ** | 6 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 7 | ** This file may be distributed and/or modified under the terms of the |
@@ -35,9 +36,9 @@ class CategoryCombo : public QComboBox | |||
35 | { | 36 | { |
36 | Q_OBJECT | 37 | Q_OBJECT |
37 | 38 | ||
38 | public: | 39 | public: |
39 | CategoryCombo( QWidget *parent, const char* name = 0, int width=0); | 40 | CategoryCombo( QWidget *parent, const char* name = 0, int width = 0); |
40 | 41 | ||
41 | ~CategoryCombo(); | 42 | ~CategoryCombo(); |
42 | 43 | ||
43 | int currentCategory() const; | 44 | int currentCategory() const; |
@@ -68,12 +69,19 @@ class CategorySelect : public QHBox | |||
68 | Q_OBJECT | 69 | Q_OBJECT |
69 | public: | 70 | public: |
70 | // we need two constructors, the first gets around designer limitations | 71 | // we need two constructors, the first gets around designer limitations |
71 | 72 | ||
72 | CategorySelect( QWidget *parent = 0, const char *name = 0, int width = 0 ); | 73 | /* |
74 | * The Sharp libqpe does have two c'tor and no default argument for int width | ||
75 | * to stay BC cause the Kompany have the original headers and don't compile | ||
76 | * against the normal SDK we need to provide the two symbols as well | ||
77 | * -zecke | ||
78 | */ | ||
79 | CategorySelect( QWidget* parent = 0, const char* name = 0 ); | ||
80 | CategorySelect( QWidget *parent /*= 0 */, const char *name/* = 0*/ , int width /* = 0 if we break bc -zecke */ ); | ||
73 | 81 | ||
74 | CategorySelect( const QArray<int> &vlCats, const QString &appName, | 82 | CategorySelect( const QArray<int> &vlCats, const QString &appName, |
75 | QWidget *parent = 0, const char *name = 0, | 83 | QWidget *parent = 0, const char *name = 0, |
76 | int width = 0); | 84 | int width = 0); |
77 | CategorySelect( const QArray<int> &vlCats, const QString &appName, | 85 | CategorySelect( const QArray<int> &vlCats, const QString &appName, |
78 | const QString &visibleName, QWidget *parent = 0, | 86 | const QString &visibleName, QWidget *parent = 0, |
79 | const char *name = 0 , int width = 0); | 87 | const char *name = 0 , int width = 0); |