summaryrefslogtreecommitdiffstats
path: root/tdeio/bookmarks
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-12-04 09:03:25 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-12-04 09:03:25 -0600
commite0b1bfb0140e1d484f71683e820731abdd0779d5 (patch)
treecf49f872577733fabde2d5b38c8c045e78dee9eb /tdeio/bookmarks
parentd80ccaf94ce31d24834bf3051fb9438adf23e4fd (diff)
downloadtdelibs-e0b1bfb0140e1d484f71683e820731abdd0779d5.tar.gz
tdelibs-e0b1bfb0140e1d484f71683e820731abdd0779d5.zip
Fix a number of build warnings
Diffstat (limited to 'tdeio/bookmarks')
-rw-r--r--tdeio/bookmarks/kbookmark.cc15
-rw-r--r--tdeio/bookmarks/kbookmarkmanager.cc6
2 files changed, 16 insertions, 5 deletions
diff --git a/tdeio/bookmarks/kbookmark.cc b/tdeio/bookmarks/kbookmark.cc
index 8bbaa5e43..0da05be4f 100644
--- a/tdeio/bookmarks/kbookmark.cc
+++ b/tdeio/bookmarks/kbookmark.cc
@@ -296,16 +296,21 @@ KURL KBookmark::url() const
TQString KBookmark::icon() const
{
TQString icon = element.attribute("icon");
- if ( icon.isEmpty() )
+ if ( icon.isEmpty() ) {
// Default icon depends on URL for bookmarks, and is default directory
// icon for groups.
- if ( isGroup() )
+ if ( isGroup() ) {
icon = "bookmark_folder";
- else
- if ( isSeparator() )
+ }
+ else {
+ if ( isSeparator() ) {
icon = "eraser"; // whatever
- else
+ }
+ else {
icon = KMimeType::iconForURL( url() );
+ }
+ }
+ }
return icon;
}
diff --git a/tdeio/bookmarks/kbookmarkmanager.cc b/tdeio/bookmarks/kbookmarkmanager.cc
index 60d4f2932..47f8c152a 100644
--- a/tdeio/bookmarks/kbookmarkmanager.cc
+++ b/tdeio/bookmarks/kbookmarkmanager.cc
@@ -255,6 +255,7 @@ void KBookmarkManager::convertToXBEL( TQDomElement & group )
{
TQDomElement e = n.toElement();
if ( !e.isNull() )
+ {
if ( e.tagName() == "TEXT" )
{
e.setTagName("title");
@@ -280,6 +281,7 @@ void KBookmarkManager::convertToXBEL( TQDomElement & group )
convertToXBEL( e );
}
else
+ {
if ( e.tagName() == "BOOKMARK" )
{
e.setTagName("bookmark"); // so much difference :-)
@@ -294,7 +296,11 @@ void KBookmarkManager::convertToXBEL( TQDomElement & group )
titleElem.appendChild( e.ownerDocument().createTextNode( text ) );
}
else
+ {
kdWarning(7043) << "Unknown tag " << e.tagName() << endl;
+ }
+ }
+ }
n = n.nextSibling();
}
}