1 files changed, 12 insertions, 7 deletions

diff --git a/inputmethods/pickboard/pickboardcfg.h b/inputmethods/pickboard/pickboardcfg.h
index b1913df..92c6420 100644
--- a/inputmethods/pickboard/pickboardcfg.h
+++ b/inputmethods/pickboard/pickboardcfg.h
@@ -1,6 +1,6 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
@@ -77,5 +77,6 @@ private:
 };
 
-class PickboardConfig : QObject {
+class PickboardConfig : public QObject {
+    Q_OBJECT
 public:
     PickboardConfig(PickboardPicks* p) : parent(p), nrows(2), pressx(-1) { }
@@ -105,4 +106,5 @@ private:
 
 class StringConfig : public PickboardConfig {
+    Q_OBJECT
 public:
     StringConfig(PickboardPicks* p) : PickboardConfig(p) { }
@@ -113,5 +115,5 @@ protected:
     virtual QString text(int r, int i)=0;
     virtual bool spreadRow(int i)=0;
-    virtual QColor rowColor(int) { return ::Qt::black; }
+    virtual QColor rowColor(int) { return Qt::black; }
     virtual void pickInRow(int r, int xpos, bool press);
     virtual void updateItem(int r, int i);
@@ -120,4 +122,5 @@ protected:
 
 class CharStringConfig : public StringConfig {
+    Q_OBJECT
     QString input;
     QStringList chars;
@@ -135,5 +138,7 @@ protected:
 
 class DictFilterConfig : public StringConfig {
+    Q_OBJECT
     QStringList matches;
+    QStringList sets_a;
     QStringList sets;
     QStringList othermodes;
@@ -153,5 +158,5 @@ public:
     }
 
-    void addSet(const QString& s);
+    void addSet(const QString& apperance, const QString& set);
     void addMode(const QString& s);
 
@@ -176,4 +181,5 @@ protected:
 
 class CharConfig : public StringConfig {
+    Q_OBJECT
     QStringList chars1;
     QStringList chars2;
@@ -193,6 +199,5 @@ class KeycodeConfig : public PickboardConfig {
     QValueList<QPixmap> keypm1;
     QValueList<QPixmap> keypm2;
-    static const int xw = 8;
-    static const int xmarg = 8;
+    enum { xw = 8, xmarg = 8 };
 
 public: