Backing out unintentional merge from TT branch.

1 files changed, 17 insertions, 9 deletions

diff --git a/library/categoryselect.h b/library/categoryselect.h
index 5c6b565..7a8e491 100644
--- a/library/categoryselect.h
+++ b/library/categoryselect.h
@@ -38,3 +38,4 @@ class CategoryCombo : public QComboBox
 public:
-    CategoryCombo( QWidget *parent, const char* name = 0 );
+    CategoryCombo( QWidget *parent, const char* name = 0, int width=0);
+
     ~CategoryCombo();
@@ -48,2 +49,4 @@ public:
 
+    QArray<int> initComboWithRefind( const QArray<int> &recCats, const QString &appName );
+
 signals:
@@ -67,9 +70,12 @@ public:
     // we need two constructors, the first gets around designer limitations
-    CategorySelect( QWidget *parent = 0, const char *name = 0 );
+
+    CategorySelect( QWidget *parent = 0, const char *name = 0, int width = 0 );
 
     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 );
+		    const char *name = 0 , int width = 0);
+
     ~CategorySelect();
@@ -82,7 +88,6 @@ public:
     // however this call is depreciated...
-    void setCategories( const QArray<int> &vlCats, const QString &appName );
-    // use this one instead (for translating )
-    void setCategories( const QArray<int> &vlCats, const QString &appName,
-			const QString &visibleName );
 
+    QString setCategories( const QArray<int> &vlCats, const QString &appName );
+    QString setCategories( const QArray<int> &vlCats, const QString &appName,
+			const QString &visibleName );
     // these were added for find dialog.
@@ -91,2 +96,3 @@ public:
 
+    void setFixedWidth(int width);
 signals:
@@ -96,2 +102,4 @@ private slots:
     void slotDialog();
+
+public slots:
     void slotNewCat( int id );
@@ -99,3 +107,3 @@ private slots:
 private:
-    void init();
+    void init(int width=0);
     QString mStrAppName;