1 files changed, 3 insertions, 0 deletions

diff --git a/noncore/apps/opie-console/keytrans.cpp b/noncore/apps/opie-console/keytrans.cpp
index d569ae0..5ea192e 100644
--- a/noncore/apps/opie-console/keytrans.cpp
+++ b/noncore/apps/opie-console/keytrans.cpp
@@ -534,173 +534,176 @@ void KeyTransSymbols::defKeySyms()
   defKeySym("F34",          Qt::Key_F34         );
   defKeySym("F35",          Qt::Key_F35         );
   defKeySym("Super_L",      Qt::Key_Super_L     );
   defKeySym("Super_R",      Qt::Key_Super_R     );
   defKeySym("Menu",         Qt::Key_Menu        );
   defKeySym("Hyper_L",      Qt::Key_Hyper_L     );
   defKeySym("Hyper_R",      Qt::Key_Hyper_R     );
 
   // Regular keys
   defKeySym("Space",        Qt::Key_Space       );
   defKeySym("Exclam",       Qt::Key_Exclam      );
   defKeySym("QuoteDbl",     Qt::Key_QuoteDbl    );
   defKeySym("NumberSign",   Qt::Key_NumberSign  );
   defKeySym("Dollar",       Qt::Key_Dollar      );
   defKeySym("Percent",      Qt::Key_Percent     );
   defKeySym("Ampersand",    Qt::Key_Ampersand   );
   defKeySym("Apostrophe",   Qt::Key_Apostrophe  );
   defKeySym("ParenLeft",    Qt::Key_ParenLeft   );
   defKeySym("ParenRight",   Qt::Key_ParenRight  );
   defKeySym("Asterisk",     Qt::Key_Asterisk    );
   defKeySym("Plus",         Qt::Key_Plus        );
   defKeySym("Comma",        Qt::Key_Comma       );
   defKeySym("Minus",        Qt::Key_Minus       );
   defKeySym("Period",       Qt::Key_Period      );
   defKeySym("Slash",        Qt::Key_Slash       );
   defKeySym("0",            Qt::Key_0           );
   defKeySym("1",            Qt::Key_1           );
   defKeySym("2",            Qt::Key_2           );
   defKeySym("3",            Qt::Key_3           );
   defKeySym("4",            Qt::Key_4           );
   defKeySym("5",            Qt::Key_5           );
   defKeySym("6",            Qt::Key_6           );
   defKeySym("7",            Qt::Key_7           );
   defKeySym("8",            Qt::Key_8           );
   defKeySym("9",            Qt::Key_9           );
   defKeySym("Colon",        Qt::Key_Colon       );
   defKeySym("Semicolon",    Qt::Key_Semicolon   );
   defKeySym("Less",         Qt::Key_Less        );
   defKeySym("Equal",        Qt::Key_Equal       );
   defKeySym("Greater",      Qt::Key_Greater     );
   defKeySym("Question",     Qt::Key_Question    );
   defKeySym("At",           Qt::Key_At          );
   defKeySym("A",            Qt::Key_A           );
   defKeySym("B",            Qt::Key_B           );
   defKeySym("C",            Qt::Key_C           );
   defKeySym("D",            Qt::Key_D           );
   defKeySym("E",            Qt::Key_E           );
   defKeySym("F",            Qt::Key_F           );
   defKeySym("G",            Qt::Key_G           );
   defKeySym("H",            Qt::Key_H           );
   defKeySym("I",            Qt::Key_I           );
   defKeySym("J",            Qt::Key_J           );
   defKeySym("K",            Qt::Key_K           );
   defKeySym("L",            Qt::Key_L           );
   defKeySym("M",            Qt::Key_M           );
   defKeySym("N",            Qt::Key_N           );
   defKeySym("O",            Qt::Key_O           );
   defKeySym("P",            Qt::Key_P           );
   defKeySym("Q",            Qt::Key_Q           );
   defKeySym("R",            Qt::Key_R           );
   defKeySym("S",            Qt::Key_S           );
   defKeySym("T",            Qt::Key_T           );
   defKeySym("U",            Qt::Key_U           );
   defKeySym("V",            Qt::Key_V           );
   defKeySym("W",            Qt::Key_W           );
   defKeySym("X",            Qt::Key_X           );
   defKeySym("Y",            Qt::Key_Y           );
   defKeySym("Z",            Qt::Key_Z           );
   defKeySym("BracketLeft",  Qt::Key_BracketLeft );
   defKeySym("Backslash",    Qt::Key_Backslash   );
   defKeySym("BracketRight", Qt::Key_BracketRight);
   defKeySym("AsciiCircum",  Qt::Key_AsciiCircum );
   defKeySym("Underscore",   Qt::Key_Underscore  );
   defKeySym("QuoteLeft",    Qt::Key_QuoteLeft   );
   defKeySym("BraceLeft",    Qt::Key_BraceLeft   );
   defKeySym("Bar",          Qt::Key_Bar         );
   defKeySym("BraceRight",   Qt::Key_BraceRight  );
   defKeySym("AsciiTilde",   Qt::Key_AsciiTilde  );
 }
 
 KeyTransSymbols::KeyTransSymbols()
 {
   defModSyms();
   defOprSyms();
   defKeySyms();
 }
 
 // Global material -----------------------------------------------------------
 
 static int keytab_serial = 0; //FIXME: remove,localize
 
 static QIntDict<KeyTrans> * numb2keymap = 0L;
 static QDict<KeyTrans>    * path2keymap = 0L;
 
 KeyTrans* KeyTrans::find(int numb)
 {
+  loadAll();
   KeyTrans* res = numb2keymap->find(numb);
   return res ? res : numb2keymap->find(0);
 }
 
 KeyTrans* KeyTrans::find(const char* path)
 {
+  loadAll();
   KeyTrans* res = path2keymap->find(path);
   return res ? res : numb2keymap->find(0);
 }
 
 int KeyTrans::count()
 {
+  loadAll();
   return numb2keymap->count();
 }
 
 void KeyTrans::addKeyTrans()
 {
   this->numb = keytab_serial ++;
   numb2keymap->insert(numb,this);
   path2keymap->insert(path,this);
 }
 
 void KeyTrans::loadAll()
 {
   if (!numb2keymap)
     numb2keymap = new QIntDict<KeyTrans>;
   if (!path2keymap)
     path2keymap = new QDict<KeyTrans>;
   if (!syms)
     syms = new KeyTransSymbols;
 
   defaultKeyTrans()->addKeyTrans();
 
 
   QString path = QPEApplication::qpeDir() + "etc/keytabs";
   QDir dir(path);
   QStringList lst = dir.entryList("*.keytab");
 
   for(QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) {
       QFile file(path + "/" + *it);
     KeyTrans* sc = KeyTrans::fromDevice(*it, file);
     if (sc) {
         sc->addKeyTrans();
     }
   }
 
 }
 
 // Debugging material -----------------------------------------------------------
 /*
 void TestTokenizer(QBuffer &buf)
 {
   // opening sequence
 
   buf.open(IO_ReadOnly);
   cc = buf.getch();
   lineno = 1;
 
   // Test tokenizer
 
   while (getSymbol(buf)) ReportToken();
 
   buf.close();
 }
 
 void test()
 {
   // Opening sequence
 
   QCString txt =
 #include "default.keytab.h"
   ;
   QBuffer buf(txt);
   if (0) TestTokenizer(buf);
   if (1) { KeyTrans kt; kt.scanTable(buf); }
 }
 */