Commit 0b6b9041 authored by David Faure's avatar David Faure
Browse files

We really don't need to import kde1 bookmarks anymore :)

This removes a nasty bool argument in managerForFile().

svn path=/trunk/KDE/kdebase/apps/; revision=680309
parent eae30b11
...@@ -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,"", false); KBookmarkManager *pManager = KBookmarkManager::managerForFile(m_fileName, "xbelimport");
QDomDocument doc = CurrentMgr::self()->mgr()->internalDocument(); QDomDocument doc = CurrentMgr::self()->mgr()->internalDocument();
......
...@@ -117,7 +117,7 @@ int main( int argc, char**argv ) ...@@ -117,7 +117,7 @@ int main( int argc, char**argv )
} }
const QString absPath = extraBookmarksDir.filePath( fileName ); const QString absPath = extraBookmarksDir.filePath( fileName );
KBookmarkManager *mgr = KBookmarkManager::managerForFile( absPath, "", false ); KBookmarkManager *mgr = KBookmarkManager::managerForFile( absPath, "keditbookmarks" );
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() ) {
......
...@@ -137,7 +137,7 @@ void CurrentMgr::createManager(const QString &filename, const QString &dbusObjec ...@@ -137,7 +137,7 @@ void CurrentMgr::createManager(const QString &filename, const QString &dbusObjec
} }
kDebug()<<"DBus Object name: "<<dbusObjectName<<endl; kDebug()<<"DBus Object name: "<<dbusObjectName<<endl;
m_mgr = KBookmarkManager::managerForFile(filename, dbusObjectName, false); m_mgr = KBookmarkManager::managerForFile(filename, dbusObjectName);
connect(m_mgr, SIGNAL( changed(const QString &, const QString &) ), connect(m_mgr, SIGNAL( changed(const QString &, const QString &) ),
SLOT( slotBookmarksChanged(const QString &, const QString &) )); SLOT( slotBookmarksChanged(const QString &, const QString &) ));
......
...@@ -251,4 +251,9 @@ void ViewMgrTest::testDuplicateSplittedTab() ...@@ -251,4 +251,9 @@ void ViewMgrTest::testDuplicateSplittedTab()
QCOMPARE( DebugFrameVisitor::inspect(&mainWindow), QString("MT[C(FF)].") ); // mainWindow, tab widget, one tab QCOMPARE( DebugFrameVisitor::inspect(&mainWindow), QString("MT[C(FF)].") ); // mainWindow, tab widget, one tab
} }
void ViewMgrTest::testLoadProfile()
{
// TODO
}
#include "konqviewmgrtest.moc" #include "konqviewmgrtest.moc"
...@@ -39,6 +39,8 @@ private Q_SLOTS: ...@@ -39,6 +39,8 @@ private Q_SLOTS:
void testDuplicateTab(); void testDuplicateTab();
void testDuplicateSplittedTab(); void testDuplicateSplittedTab();
void testLoadProfile();
private: private:
KComponentData m_konqComponentData; KComponentData m_konqComponentData;
}; };
......
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