Merged branches from BRANCH_1_0

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,8 +1,9 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 2003 zecke Introduce Sharp to the glory of default arguments
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
@@ -33,13 +34,13 @@ class QToolButton;
 class CategoryComboPrivate;
 class CategoryCombo : public QComboBox
 {
     Q_OBJECT
 
 public:
-    CategoryCombo( QWidget *parent, const char* name = 0, int width=0);
+    CategoryCombo( QWidget *parent, const char* name = 0, int width = 0);
 
     ~CategoryCombo();
 
     int currentCategory() const;
     void setCurrentCategory( int id );
     // depreciated.
@@ -66,16 +67,23 @@ class CategorySelectPrivate;
 class CategorySelect : public QHBox
 {
     Q_OBJECT
 public:
     // we need two constructors, the first gets around designer limitations
 
-    CategorySelect( QWidget *parent = 0, const char *name = 0, int width = 0 );
+    /*
+     * The Sharp libqpe does have two c'tor and no default argument for int width
+     * to stay BC cause the Kompany have the original headers and don't compile
+     * against the normal SDK we need to provide the two symbols as well
+     * -zecke
+     */
+    CategorySelect( QWidget* parent  =  0, const char* name = 0 );
+    CategorySelect( QWidget *parent /*= 0 */, const char *name/* = 0*/ , int width /* = 0 if we break bc -zecke */ );
 
     CategorySelect( const QArray<int> &vlCats, const QString &appName,
-		    QWidget *parent = 0, const char *name = 0, 
+		    QWidget *parent = 0, const char *name = 0,
 		    int width = 0);
     CategorySelect( const QArray<int> &vlCats, const QString &appName,
 		    const QString &visibleName, QWidget *parent = 0,
 		    const char *name = 0 , int width = 0);
 
     ~CategorySelect();