[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/konqueror/keditbookmarks
From:       Alexander Kellett <lypanov () kde ! org>
Date:       2003-02-22 2:34:59
[Download RAW message or body]

CVS commit by lypanov: 

doh, galeon/xbel uses a node called desc not an attribute...


  M +7 -5      commands.cpp   1.61
  M +3 -4      listview.cpp   1.36


--- kdebase/konqueror/keditbookmarks/commands.cpp  #1.60:1.61
@@ -167,6 +167,6 @@ QString NodeEditCommand::name() const {
 QString NodeEditCommand::getNodeText(KBookmark bk, const QString &nodename) {
    QDomNode subnode = bk.internalElement().namedItem(nodename);
-   Q_ASSERT(!subnode.isNull());
-   return subnode.firstChild().isNull() ? QString::null
+   return subnode.isNull() || subnode.firstChild().isNull() 
+        ? QString::null
                                         : subnode.firstChild().toText().data();
 }
@@ -177,8 +177,10 @@ void NodeEditCommand::execute() {
 
    QDomNode subnode = bk.internalElement().namedItem(m_nodename);
-   Q_ASSERT(!subnode.isNull());
+   if (subnode.isNull()) {
+      subnode = bk.internalElement().ownerDocument().createElement(m_nodename);
+      bk.internalElement().appendChild(subnode);
+   }
 
    if (subnode.firstChild().isNull()) {
-      // no text child yet
       QDomText domtext = subnode.ownerDocument().createTextNode("");
       subnode.appendChild(domtext);

--- kdebase/konqueror/keditbookmarks/listview.cpp  #1.35:1.36
@@ -448,7 +448,6 @@ void ListView::slotItemRenamed(QListView
 
       case KEBListView::CommentColumn:
-         if (bk.internalElement().attribute("desc") != newText) {
-            cmd = new EditCommand(bk.address(), EditCommand::Edition("desc", newText), i18n("Comment"));
-            cmd = new NodeEditCommand(bk.address(), newText, "title");
+         if (NodeEditCommand::getNodeText(bk, "desc") != newText) {
+            cmd = new NodeEditCommand(bk.address(), newText, "desc");
          }
          break;
@@ -569,5 +568,5 @@ void KEBListViewItem::normalConstruct(co
    setText(KEBListView::AddressColumn, bk.address());
 #endif
-   setText(KEBListView::CommentColumn, bk.internalElement().attribute("desc"));
+   setText(KEBListView::CommentColumn, NodeEditCommand::getNodeText(bk, "desc"));
    setPixmap(0, SmallIcon(bk.icon()));
    modUpdate();


[prev in list] [next in list] [prev in thread] [next in thread]