Commit 0152d70e authored by David Faure's avatar David Faure
Browse files

Ah, doh, empty string is actually allowed here.

svn path=/trunk/KDE/kdebase/apps/; revision=680317
parent 0b6b9041
...@@ -231,7 +231,7 @@ void XBELImportCommand::doCreateHoldingFolder(KBookmarkGroup &) { ...@@ -231,7 +231,7 @@ void XBELImportCommand::doCreateHoldingFolder(KBookmarkGroup &) {
void XBELImportCommand::doExecute(const KBookmarkGroup &/*bkGroup*/) { void XBELImportCommand::doExecute(const KBookmarkGroup &/*bkGroup*/) {
// check if already open first??? // check if already open first???
KBookmarkManager *pManager = KBookmarkManager::managerForFile(m_fileName, "xbelimport"); KBookmarkManager *pManager = KBookmarkManager::managerForFile(m_fileName, QString());
QDomDocument doc = CurrentMgr::self()->mgr()->internalDocument(); QDomDocument doc = CurrentMgr::self()->mgr()->internalDocument();
......
...@@ -117,14 +117,14 @@ int main( int argc, char**argv ) ...@@ -117,14 +117,14 @@ int main( int argc, char**argv )
} }
const QString absPath = extraBookmarksDir.filePath( fileName ); const QString absPath = extraBookmarksDir.filePath( fileName );
KBookmarkManager *mgr = KBookmarkManager::managerForFile( absPath, "keditbookmarks" ); KBookmarkManager *mgr = KBookmarkManager::managerForFile( absPath, QString() );
KBookmarkGroup root = mgr->root(); KBookmarkGroup root = mgr->root();
for ( KBookmark bm = root.first(); !bm.isNull(); bm = root.next( bm ) ) { for ( KBookmark bm = root.first(); !bm.isNull(); bm = root.next( bm ) ) {
if ( bm.isGroup() ) { if ( bm.isGroup() ) {
continue; continue;
} }
bm.setMetaDataItem( "merged_from", fileName ); bm.setMetaDataItem( "merged_from", fileName );
konqBookmarks->root().addBookmark( konqBookmarks, bm , false ); konqBookmarks->root().addBookmark( konqBookmarks, bm, false );
didMergeBookmark = true; didMergeBookmark = true;
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment