regedit-registry2elektra_tmp_hack.patch

   1 diff -Nurb b/compile.sh n/compile.sh
   2 --- b/compile.sh        2004-07-24 19:34:54.000000000 +0200
   3 +++ n/compile.sh        2004-11-09 18:08:04.683558608 +0100
   4 @@ -26,5 +26,5 @@
   5  moc newkeydialogimpl.h > newkeydialogimpl.moc.cpp
   6  moc newdialog.h > newdialog.moc.cpp
   7
   8 -cc -I . -I $QTDIR/include -L $QTDIR/lib/ -L /lib  -l $QTLIB -lregistry -o regedit main.cpp mainwindowimpl.cpp mainwidget.cpp mainwindowimpl.moc.cpp mainwidget.moc.cpp newkeydialogimpl.moc.cpp newkeydialogimpl.cpp newdialog.moc.cpp newdialog.cpp
   9 +cc -I . -I $QTDIR/include -L $QTDIR/lib/ -L /lib  -l $QTLIB -lregistry -lkdb -o regedit main.cpp mainwindowimpl.cpp mainwidget.cpp mainwindowimpl.moc.cpp mainwidget.moc.cpp newkeydialogimpl.moc.cpp newkeydialogimpl.cpp newdialog.moc.cpp newdialog.cpp
  10
  11 diff -Nurb b/src/keyaddcommand.cpp n/src/keyaddcommand.cpp
  12 --- b/src/keyaddcommand.cpp     2004-08-11 11:25:19.000000000 +0200
  13 +++ n/src/keyaddcommand.cpp     2004-11-09 18:10:04.390360408 +0100
  14 @@ -50,19 +50,19 @@
  15
  16         switch (newDialog->getType())
  17         {
  18 -               case RG_KEY_TYPE_STRING:
  19 +               case KEY_TYPE_STRING:
  20                         item->setPixmap(0, mainWidget->stringIcon);
  21                         if (vlength) keySetString(key, strdup(newDialog->getValue()));
  22                         break;
  23 -               case RG_KEY_TYPE_BINARY:
  24 +               case KEY_TYPE_BINARY:
  25                         item->setPixmap(0, mainWidget->binaryIcon);
  26                         if (vlength) keySetBinary(key, strdup(newDialog->getValue()), vlength);
  27                         break;
  28 -               case RG_KEY_TYPE_LINK:
  29 +               case KEY_TYPE_LINK:
  30                         item->setPixmap(0, mainWidget->linkOverlay);
  31                         if (vlength) keySetLink(key, strdup(newDialog->getValue()));
  32                         break;
  33 -               case RG_KEY_TYPE_DIR:
  34 +               case KEY_TYPE_DIR:
  35                         item->setPixmap(0, mainWidget->dirIcon);
  36                         break;
  37         }
  38 @@ -71,17 +71,17 @@
  39
  40  KeyAddCommand::~KeyAddCommand()
  41  {
  42 -       registryOpen();
  43 +       kdbOpen();
  44         keyClose(key);
  45         delete key;
  46         delete item;
  47 -       registryClose();
  48 +       kdbClose();
  49  }
  50
  51  bool KeyAddCommand::execute()
  52  {
  53 -       registryOpen();
  54 -       if (registrySetKey(key))
  55 +       kdbOpen();
  56 +       if (kdbSetKey(key))
  57         {
  58                 mainWidget()->showInStatusBar(strerror(errno));
  59                 return false;
  60 @@ -92,15 +92,15 @@
  61                 //mainWidget()->keyTree->setSelected(item, true);
  62                 return true;
  63         }
  64 -       registryClose();
  65 +       kdbClose();
  66  }
  67
  68  bool KeyAddCommand::unexecute()
  69  {
  70 -       registryOpen();
  71 +       kdbOpen();
  72         char *name = new char[keyGetNameSize(key)];
  73         keyGetName(key, name, keyGetNameSize(key));
  74 -       if (registryRemove(name))
  75 +       if (kdbRemove(name))
  76         {
  77                 mainWidget()->showInStatusBar(strerror(errno));
  78                 return false;
  79 @@ -111,5 +111,5 @@
  80                 return true;
  81
  82         }
  83 -       registryClose();
  84 +       kdbClose();
  85  }
  86 diff -Nurb b/src/keyaddcommand.h n/src/keyaddcommand.h
  87 --- b/src/keyaddcommand.h       2004-08-11 10:15:06.000000000 +0200
  88 +++ n/src/keyaddcommand.h       2004-11-09 18:10:04.390360408 +0100
  89 @@ -24,7 +24,7 @@
  90
  91  extern "C"
  92  {
  93 -       #include <registry.h>
  94 +       #include <kdb.h>
  95  }
  96
  97  /**
  98 diff -Nurb b/src/keymodifycommand.cpp n/src/keymodifycommand.cpp
  99 --- b/src/keymodifycommand.cpp  2004-08-11 11:25:19.000000000 +0200
 100 +++ n/src/keymodifycommand.cpp  2004-11-09 18:10:04.391360256 +0100
 101 @@ -32,7 +32,7 @@
 102  KeyModifyCommand::KeyModifyCommand(MainWidgetImpl *mainWidget, const char *name)
 103   : Command(mainWidget, name), item(mainWidget->keyTree->currentItem())
 104  {
 105 -       registryOpen();
 106 +       kdbOpen();
 107
 108         ::Key *selected = this->mainWidget()->getSelected();
 109
 110 @@ -75,7 +75,7 @@
 111                         break;
 112         }
 113
 114 -       registryClose();
 115 +       kdbClose();
 116  }
 117
 118
 119 @@ -90,8 +90,8 @@
 120
 121  bool KeyModifyCommand::execute()
 122  {
 123 -       registryOpen();
 124 -       if (registrySetKey(newKey))
 125 +       kdbOpen();
 126 +       if (kdbSetKey(newKey))
 127         {
 128                 mainWidget()->showInStatusBar(strerror(errno));
 129                 mainWidget()->showKeyValues(true);
 130 @@ -104,8 +104,8 @@
 131
 132  bool KeyModifyCommand::unexecute()
 133  {
 134 -       registryOpen();
 135 -       if (registrySetKey(oldKey))
 136 +       kdbOpen();
 137 +       if (kdbSetKey(oldKey))
 138         {
 139                 mainWidget()->showInStatusBar(strerror(errno));
 140                 mainWidget()->showKeyValues(true);
 141 @@ -113,7 +113,7 @@
 142         }
 143         item->setPixmap(0, oldIcon);
 144         mainWidget()->changeSelected(item);
 145 -       registryClose();
 146 +       kdbClose();
 147         return true;
 148  }
 149
 150 diff -Nurb b/src/keymodifycommand.h n/src/keymodifycommand.h
 151 --- b/src/keymodifycommand.h    2004-08-11 10:15:06.000000000 +0200
 152 +++ n/src/keymodifycommand.h    2004-11-09 18:10:04.392360104 +0100
 153 @@ -25,7 +25,7 @@
 154
 155  extern "C"
 156  {
 157 -       #include <registry.h>
 158 +       #include <kdb.h>
 159  }
 160  /**
 161  @author Gregor Burger
 162 diff -Nurb b/src/keyremovecommand.cpp n/src/keyremovecommand.cpp
 163 --- b/src/keyremovecommand.cpp  2004-08-11 10:15:06.000000000 +0200
 164 +++ n/src/keyremovecommand.cpp  2004-11-09 18:10:04.392360104 +0100
 165 @@ -39,33 +39,33 @@
 166
 167  bool KeyRemoveCommand::execute( )
 168  {
 169 -       registryOpen();
 170 +       kdbOpen();
 171
 172         char *name = new char[keyGetNameSize(key)];
 173         keyGetName(key, name, keyGetNameSize(key));
 174
 175 -       if (registryRemove(name))
 176 +       if (kdbRemove(name))
 177         {
 178                 mainWidget()->showInStatusBar(strerror(errno));
 179                 return false;
 180         }
 181
 182         item->setVisible(false);
 183 -       registryClose();
 184 +       kdbClose();
 185         return true;
 186  }
 187
 188  bool KeyRemoveCommand::unexecute( )
 189  {
 190 -       registryOpen();
 191 -       if (registrySetKey(key))
 192 +       kdbOpen();
 193 +       if (kdbSetKey(key))
 194         {
 195                 mainWidget()->showInStatusBar(strerror(errno));
 196                 return false;
 197         }
 198
 199         item->setVisible(true);
 200 -       registryClose();
 201 +       kdbClose();
 202         return true;
 203  }
 204
 205 diff -Nurb b/src/keyremovecommand.h n/src/keyremovecommand.h
 206 --- b/src/keyremovecommand.h    2004-08-11 10:15:06.000000000 +0200
 207 +++ n/src/keyremovecommand.h    2004-11-09 18:10:04.393359952 +0100
 208 @@ -24,7 +24,7 @@
 209
 210  extern "C"
 211  {
 212 -#include <registry.h>
 213 +#include <kdb.h>
 214  }
 215
 216  class QListViewItem;
 217 diff -Nurb b/src/mainwidgetimpl.cpp n/src/mainwidgetimpl.cpp
 218 --- b/src/mainwidgetimpl.cpp    2004-08-10 14:41:29.000000000 +0200
 219 +++ n/src/mainwidgetimpl.cpp    2004-11-09 18:10:04.396359496 +0100
 220 @@ -64,11 +64,11 @@
 221         : MainWidget(parent, name, fl), ignoreTextChanges(false), selected(0), selectedAccess(0), parent( (MainWindowImpl *) parentWidget())
 222  {
 223         types = new int[5];
 224 -       types[0] = RG_KEY_TYPE_UNDEFINED;
 225 -       types[1] = RG_KEY_TYPE_LINK;
 226 -       types[2] = RG_KEY_TYPE_STRING;
 227 -       types[3] = RG_KEY_TYPE_BINARY;
 228 -       types[4] = RG_KEY_TYPE_DIR;
 229 +       types[0] = KEY_TYPE_UNDEFINED;
 230 +       types[1] = KEY_TYPE_LINK;
 231 +       types[2] = KEY_TYPE_STRING;
 232 +       types[3] = KEY_TYPE_BINARY;
 233 +       types[4] = KEY_TYPE_DIR;
 234         int *t;
 235         t = new int[4];
 236         ignoreTextChanges = false;              //a flag to indicate wheater the program or the user has edited the fields
 237 @@ -128,12 +128,12 @@
 238  void MainWidgetImpl::updateKeyTree()
 239  {
 240         keyTree->clear();
 241 -       registryOpen();
 242 +       kdbOpen();
 243
 244         KeySet roots;
 245         ksInit(&roots);
 246
 247 -       registryGetRootKeys(&roots);
 248 +       kdbGetRootKeys(&roots);
 249         ::Key *mover;
 250
 251         mover = roots.start;
 252 @@ -145,23 +145,23 @@
 253
 254                 switch (keyGetType(mover))
 255                 {
 256 -                       case RG_KEY_TYPE_DIR:
 257 +                       case KEY_TYPE_DIR:
 258                                 item->setPixmap(0, dirIcon);
 259                                 break;
 260 -                       case RG_KEY_TYPE_LINK:
 261 +                       case KEY_TYPE_LINK:
 262                                 item->setPixmap(0, linkOverlay);
 263                                 break;
 264 -                       case RG_KEY_TYPE_STRING:
 265 +                       case KEY_TYPE_STRING:
 266                                 item->setPixmap(0, stringIcon);
 267                                 break;
 268 -                       case RG_KEY_TYPE_BINARY:
 269 +                       case KEY_TYPE_BINARY:
 270                                 item->setPixmap(0, binaryIcon);
 271                 }
 272                 mover = mover->next;
 273         }
 274
 275         ksClose(&roots);
 276 -       registryClose();
 277 +       kdbClose();
 278  }
 279
 280  /**
 281 @@ -175,7 +175,7 @@
 282
 283         ksInit(&keys);
 284
 285 -       registryGetChildKeys(root->key, &keys, RG_O_DIR|RG_O_SORT);
 286 +       kdbGetChildKeys(root->key, &keys, KDB_O_DIR|KDB_O_SORT);
 287
 288         ::Key *mover = keys.start;
 289
 290 @@ -192,17 +192,17 @@
 291
 292                         switch (type)
 293                         {
 294 -                               case RG_KEY_TYPE_DIR:
 295 +                               case KEY_TYPE_DIR:
 296                                         subItem->setPixmap(0, dirIcon);
 297                                         isDir = true;
 298                                         break;
 299 -                               case RG_KEY_TYPE_LINK:
 300 +                               case KEY_TYPE_LINK:
 301                                         subItem->setPixmap(0, linkOverlay);
 302                                         break;
 303 -                               case RG_KEY_TYPE_STRING:
 304 +                               case KEY_TYPE_STRING:
 305                                         subItem->setPixmap(0, stringIcon);
 306                                         break;
 307 -                               case RG_KEY_TYPE_BINARY:
 308 +                               case KEY_TYPE_BINARY:
 309                                         subItem->setPixmap(0, binaryIcon);
 310                                         break;
 311                                 default:
 312 @@ -282,29 +282,29 @@
 313
 314         switch (keyGetType(selected))
 315         {
 316 -               case RG_KEY_TYPE_BINARY:
 317 +               case KEY_TYPE_BINARY:
 318                         typeCombo->setCurrentItem(COMBO_POS_BIN);
 319                         keyValue->setEnabled(true);
 320                         keyComment->setEnabled(true);
 321                         typeCombo->setEnabled(true);
 322                         break;
 323 -               case RG_KEY_TYPE_STRING:
 324 +               case KEY_TYPE_STRING:
 325                         typeCombo->setCurrentItem(COMBO_POS_STR);
 326                         keyValue->setEnabled(true);
 327                         keyComment->setEnabled(true);
 328                         typeCombo->setEnabled(true);
 329                         break;
 330 -               case RG_KEY_TYPE_DIR:
 331 +               case KEY_TYPE_DIR:
 332                         typeCombo->insertItem("Directory");
 333                         typeCombo->setCurrentItem(COMBO_POS_DIR);
 334                         typeCombo->setEnabled(false);
 335                         keyValue->setEnabled(false);
 336                         keyComment->setEnabled(false);
 337                         break;
 338 -               case RG_KEY_TYPE_LINK:
 339 +               case KEY_TYPE_LINK:
 340                         typeCombo->setCurrentItem(COMBO_POS_LNK);
 341                         break;
 342 -               case RG_KEY_TYPE_UNDEFINED:
 343 +               case KEY_TYPE_UNDEFINED:
 344                         typeCombo->setCurrentItem(COMBO_POS_UND);
 345                         keyValue->setEnabled(false);
 346                         keyName->setEnabled(false);
 347 @@ -321,17 +321,17 @@
 348                 int size = keyGetDataSize(selected);
 349                 switch (keyGetType(selected))
 350                 {
 351 -                       case RG_KEY_TYPE_BINARY:
 352 +                       case KEY_TYPE_BINARY:
 353                                 keyGetBinary(selected, buffer, size);
 354                                 break;
 355 -                       case RG_KEY_TYPE_STRING:
 356 +                       case KEY_TYPE_STRING:
 357                                 keyGetString(selected, buffer, size);
 358                                 break;
 359 -                       case RG_KEY_TYPE_DIR:
 360 +                       case KEY_TYPE_DIR:
 361                                 break;
 362 -                       case RG_KEY_TYPE_LINK:
 363 +                       case KEY_TYPE_LINK:
 364                                 break;
 365 -                       case RG_KEY_TYPE_UNDEFINED:
 366 +                       case KEY_TYPE_UNDEFINED:
 367                                 break;
 368                         default:
 369                                 buffer = "";
 370 @@ -413,7 +413,7 @@
 371
 372  void MainWidgetImpl::changeSelected(QListViewItem *item)
 373  {
 374 -       registryOpen();
 375 +       kdbOpen();
 376         if (!item)
 377                 return;
 378
 379 @@ -428,7 +428,7 @@
 380         keyInit(selected);
 381         keySetName(selected, strdup(getKeyNameFromItem(item)));
 382
 383 -       if (registryGetKey(selected))
 384 +       if (kdbGetKey(selected))
 385         {
 386                 showInStatusBar(strerror(errno));
 387                 delete selected;
 388 @@ -439,7 +439,7 @@
 389
 390         selectedAccess = keyGetAccess(selected);
 391
 392 -       registryClose();
 393 +       kdbClose();
 394         emit keyChanged();
 395
 396  }
 397 @@ -604,17 +604,17 @@
 398
 399  void MainWidgetImpl::copyValueToClipboard()
 400  {
 401 -       registryOpen();
 402 +       kdbOpen();
 403         char *name = strdup(getKeyNameFromItem(keyTree->currentItem()));
 404         char *buf;
 405         ::Key key;
 406         keySetName(&key, name);
 407
 408 -       registryGetKey(&key);
 409 +       kdbGetKey(&key);
 410
 411         buf = new char[keyGetDataSize(&key)];
 412
 413 -       if (keyGetType(&key) == RG_KEY_TYPE_STRING)
 414 +       if (keyGetType(&key) == KEY_TYPE_STRING)
 415                 keyGetString(&key, buf, keyGetDataSize(&key));
 416         else
 417                 keyGetBinary(&key, (void *)buf, keyGetDataSize(&key));
 418 @@ -622,7 +622,7 @@
 419         QClipboard *cp = QApplication::clipboard();
 420         cp->setText(buf, QClipboard::Clipboard);
 421         keyClose(&key);
 422 -       registryClose();
 423 +       kdbClose();
 424  }
 425
 426  bool MainWidgetImpl::canUndo()
 427 diff -Nurb b/src/mainwidgetimpl.h n/src/mainwidgetimpl.h
 428 --- b/src/mainwidgetimpl.h      2004-08-10 14:41:29.000000000 +0200
 429 +++ n/src/mainwidgetimpl.h      2004-11-09 18:10:04.397359344 +0100
 430 @@ -23,7 +23,7 @@
 431
 432  extern "C"
 433  {
 434 -       #include <registry.h>
 435 +       #include <kdb.h>
 436  }
 437  #include <stack>
 438
 439 diff -Nurb b/src/mainwindowimpl.cpp n/src/mainwindowimpl.cpp
 440 --- b/src/mainwindowimpl.cpp    2004-08-11 11:25:19.000000000 +0200
 441 +++ n/src/mainwindowimpl.cpp    2004-11-09 18:10:04.401358736 +0100
 442 @@ -23,7 +23,7 @@
 443
 444  extern "C"
 445  {
 446 -       #include <registry.h>
 447 +       #include <kdb.h>
 448  }
 449  #include <errno.h>
 450  #include <string.h>
 451 @@ -69,7 +69,7 @@
 452  {
 453         statusBar()->clear();
 454
 455 -       registryOpen();
 456 +       kdbOpen();
 457
 458         ::Key width;
 459         ::Key height;
 460 @@ -89,11 +89,11 @@
 461         keySetName(&y, strdup(keyPrefix + "/gui/y"));
 462         //keySetName(&splitter, strdup(keyPrefix + "/gui/splitter"));
 463
 464 -       checkKeyMake(&width, RG_KEY_TYPE_STRING);
 465 -       checkKeyMake(&height, RG_KEY_TYPE_STRING);
 466 -       checkKeyMake(&x, RG_KEY_TYPE_STRING);
 467 -       checkKeyMake(&y, RG_KEY_TYPE_STRING);
 468 -       //checkKeyMake(&splitter, RG_KEY_TYPE_STRING);
 469 +       checkKeyMake(&width, KEY_TYPE_STRING);
 470 +       checkKeyMake(&height, KEY_TYPE_STRING);
 471 +       checkKeyMake(&x, KEY_TYPE_STRING);
 472 +       checkKeyMake(&y, KEY_TYPE_STRING);
 473 +       //checkKeyMake(&splitter, KEY_TYPE_STRING);
 474
 475         int vwidth = this->width();
 476         int vheight = this->height();
 477 @@ -136,12 +136,12 @@
 478                 char *w = new char[keyGetDataSize(&splitter)];
 479                 splitter->moveSplitter(atoi(keyGetString(&splitter, w, keyGetSize(&splitter),
 480         }*/
 481 -       registryClose();
 482 +       kdbClose();
 483  }
 484
 485  void MainWindowImpl::closeEvent(QCloseEvent *e)
 486  {
 487 -       registryOpen();
 488 +       kdbOpen();
 489
 490         ::Key width;
 491         ::Key height;
 492 @@ -160,31 +160,31 @@
 493         keySetName(&x, strdup(guiKeyPrefix + "x"));
 494         keySetName(&y, strdup(guiKeyPrefix + "y"));
 495
 496 -       registryGetKey(&width);
 497 +       kdbGetKey(&width);
 498         keySetString(&width, strdup(QString().setNum(this->width())));
 499         keySetComment(&width, "This is where regedit stores the width of the window");
 500 -       registrySetKey(&width);
 501 +       kdbSetKey(&width);
 502         keyClose(&width);
 503
 504 -       registryGetKey(&height);
 505 +       kdbGetKey(&height);
 506         keySetString(&height, strdup(QString().setNum(this->height())));
 507         keySetComment(&height, "This is where regedit stores the height of the window");
 508 -       registrySetKey(&height);
 509 +       kdbSetKey(&height);
 510         keyClose(&height);
 511
 512 -       registryGetKey(&x);
 513 +       kdbGetKey(&x);
 514         keySetString(&x, strdup(QString().setNum(this->x())));
 515         keySetComment(&x, "This is where regedit stores the x position of the window");
 516 -       registrySetKey(&x);
 517 +       kdbSetKey(&x);
 518         keyClose(&x);
 519
 520 -       registryGetKey(&y);
 521 +       kdbGetKey(&y);
 522         keySetString(&y, strdup(QString().setNum(this->y())));
 523         keySetComment(&y, "This is where regedit stores the y position of the window");
 524 -       registrySetKey(&y);
 525 +       kdbSetKey(&y);
 526         keyClose(&y);
 527
 528 -       registryClose();
 529 +       kdbClose();
 530
 531         QMainWindow::closeEvent(e);
 532  }
 533 @@ -211,14 +211,14 @@
 534
 535         ::Key *selected = mainWidget->getSelected();
 536
 537 -       if (keyGetType(selected) == RG_KEY_TYPE_DIR)
 538 +       if (keyGetType(selected) == KEY_TYPE_DIR)
 539         {
 540
 541                 newkey->setEnabled(true);
 542
 543                 KeySet childs;
 544                 ksInit(&childs);
 545 -               if (registryGetChildKeys(selected->key, &childs, RG_O_DIR|RG_O_SORT))
 546 +               if (kdbGetChildKeys(selected->key, &childs, KDB_O_DIR|KDB_O_SORT))
 547                 {
 548                         statusBar()->message(strerror(errno));
 549                 }
 550 @@ -276,9 +276,9 @@
 551         QPixmap undoIcon(iconDir + "/undo.png");
 552         QPixmap redoIcon(iconDir + "/redo.png");
 553
 554 -       newkey = new QAction(QString("add new key to registry"), QIconSet(newIcon), QString("new key"), QKeySequence(CTRL + Key_N), this, "newkey action");
 555 -       del = new QAction(QString("delete key from registry"), QIconSet(delIcon), QString("delet key"), QKeySequence(Key_Delete), this, "delete action");
 556 -       reload = new QAction(QString("load the registry"), QIconSet(reloadIcon), QString("refresh"), QKeySequence(Key_F5), this, "refresh action");
 557 +       newkey = new QAction(QString("add new key to kdb"), QIconSet(newIcon), QString("new key"), QKeySequence(CTRL + Key_N), this, "newkey action");
 558 +       del = new QAction(QString("delete key from kdb"), QIconSet(delIcon), QString("delet key"), QKeySequence(Key_Delete), this, "delete action");
 559 +       reload = new QAction(QString("load the kdb"), QIconSet(reloadIcon), QString("refresh"), QKeySequence(Key_F5), this, "refresh action");
 560         undo = new QAction(QString("undo last modification"), QIconSet(undoIcon), QString("undo"), QKeySequence(CTRL + Key_Z), this, "undo action");
 561         redo = new QAction(QString("redo last modification"), QIconSet(redoIcon), QString("redo"), QKeySequence(CTRL + Key_R), this, "redo action");
 562
 563 diff -Nurb b/src/newkeydialogimpl.cpp n/src/newkeydialogimpl.cpp
 564 --- b/src/newkeydialogimpl.cpp  2004-08-11 11:25:19.000000000 +0200
 565 +++ n/src/newkeydialogimpl.cpp  2004-11-09 18:10:04.404358280 +0100
 566 @@ -29,7 +29,7 @@
 567  using namespace std;
 568
 569  NewKeyDialogImpl::NewKeyDialogImpl(QString parentKey, QWidget *parent)
 570 -: NewKeyDialog(parent, "new key dialog2", true), type(RG_KEY_TYPE_STRING)
 571 +: NewKeyDialog(parent, "new key dialog2", true), type(KEY_TYPE_STRING)
 572  {
 573         keyName->setText(parentKey + RG_KEY_DELIM);
 574
 575 @@ -88,22 +88,22 @@
 576         switch (id)
 577         {
 578                 case 0:
 579 -                       type = RG_KEY_TYPE_BINARY;
 580 +                       type = KEY_TYPE_BINARY;
 581                         keyComment->setEnabled(true);
 582                         keyValue->setEnabled(true);
 583                         break;
 584                 case 1:
 585 -                       type = RG_KEY_TYPE_STRING;
 586 +                       type = KEY_TYPE_STRING;
 587                         keyComment->setEnabled(true);
 588                         keyValue->setEnabled(true);
 589                         break;
 590                 case 2:
 591 -                       type = RG_KEY_TYPE_LINK;
 592 +                       type = KEY_TYPE_LINK;
 593                         keyComment->setEnabled(false);
 594                         keyValue->setEnabled(true);
 595                         break;
 596                 case 3:
 597 -                       type = RG_KEY_TYPE_DIR;
 598 +                       type = KEY_TYPE_DIR;
 599                         keyComment->setEnabled(false);
 600                         keyValue->setEnabled(false);
 601         }
 602 diff -Nurb b/src/newkeydialogimpl.h n/src/newkeydialogimpl.h
 603 --- b/src/newkeydialogimpl.h    2004-07-24 19:34:54.000000000 +0200
 604 +++ n/src/newkeydialogimpl.h    2004-11-09 18:10:04.404358280 +0100
 605 @@ -21,7 +21,7 @@
 606  #define NEWDIALOGIMPL_H
 607
 608
 609 -#include <registry.h>
 610 +#include <kdb.h>
 611
 612  #include <qdialog.h>
 613  #include "newdialog.h"
 614 diff -Nurb b/src/regedit_globals.cpp n/src/regedit_globals.cpp
 615 --- b/src/regedit_globals.cpp   2004-08-09 14:08:06.000000000 +0200
 616 +++ n/src/regedit_globals.cpp   2004-11-09 18:10:04.408357672 +0100
 617 @@ -10,25 +10,25 @@
 618
 619  void checkKeyMake(Key *key, u_int8_t type)
 620  {
 621 -       int ret = registryGetKey(key);
 622 +       int ret = kdbGetKey(key);
 623
 624 -       if (errno == RG_KEY_RET_NOTFOUND)
 625 +       if (errno == KDB_RET_NOTFOUND)
 626         {
 627                 keySetType(key, type);
 628 -               registrySetKey(key);
 629 +               kdbSetKey(key);
 630         }
 631  }
 632
 633  QString getIconDir()
 634  {
 635 -       registryOpen();
 636 +       kdbOpen();
 637         ::Key iconDir;
 638
 639         keyInit(&iconDir);
 640
 641         keySetName(&iconDir, "system/sw/regedit/gui/iconDir");
 642
 643 -       int ret = registryGetKey(&iconDir);
 644 +       int ret = kdbGetKey(&iconDir);
 645
 646         if (ret)
 647         {
 648 @@ -36,7 +36,7 @@
 649                 keyClose(&iconDir);
 650                 keyInit(&iconDir);
 651                 keySetName(&iconDir, "user/sw/regedit/gui/iconDir");
 652 -               checkKeyMake(&iconDir, RG_KEY_TYPE_STRING);
 653 +               checkKeyMake(&iconDir, KEY_TYPE_STRING);
 654         }
 655         else
 656                 //cout << "using system namespace iconDir" << endl;
 657 @@ -47,12 +47,12 @@
 658                 keyGetString(&iconDir, buf, keyGetDataSize(&iconDir));
 659
 660                 keyClose(&iconDir);
 661 -               registryClose();
 662 +               kdbClose();
 663                 return QString(buf);
 664         }
 665
 666         keyClose(&iconDir);
 667 -       registryClose();
 668 +       kdbClose();
 669         return QString::null;
 670
 671  }
 672 diff -Nurb b/src/regedit_globals.h n/src/regedit_globals.h
 673 --- b/src/regedit_globals.h     2004-08-09 14:08:06.000000000 +0200
 674 +++ n/src/regedit_globals.h     2004-11-09 18:10:04.408357672 +0100
 675 @@ -23,7 +23,7 @@
 676
 677  extern "C"
 678  {
 679 -       #include <registry.h>
 680 +       #include <kdb.h>
 681  }
 682  #include <qstring.h>
 683
 684 diff -Nurb b/src/src.pro n/src/src.pro
 685 --- b/src/src.pro       2004-08-09 14:08:06.000000000 +0200
 686 +++ n/src/src.pro       2004-11-09 18:10:04.479346880 +0100
 687 @@ -3,7 +3,7 @@
 688  # Subdir relative project main directory: ./src
 689  # Target is an application:  regedit
 690
 691 -LIBS += -lregistry
 692 +LIBS += -lregistry -lkdb
 693  TARGET = regedit
 694  CONFIG += debug \
 695            warn_on \