diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index 75924cf3dcf..0c32cb28953 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -734,27 +734,19 @@ QString BookmarkManager::bookmarkToString(const Bookmark *b) /* Saves the bookmarks to the session settings. */ void BookmarkManager::saveBookmarks() { - SessionManager *s = sessionManager(); - if (!s) - return; - QStringList list; foreach (const FileNameBookmarksMap *bookmarksMap, m_bookmarksMap) foreach (const Bookmark *bookmark, *bookmarksMap) list << bookmarkToString(bookmark); - s->setValue("Bookmarks", list); + sessionManager()->setValue("Bookmarks", list); } /* Loads the bookmarks from the session settings. */ void BookmarkManager::loadBookmarks() { removeAllBookmarks(); - SessionManager *s = sessionManager(); - if (!s) - return; - - const QStringList &list = s->value("Bookmarks").toStringList(); + const QStringList &list = sessionManager()->value("Bookmarks").toStringList(); foreach (const QString &bookmarkString, list) addBookmark(bookmarkString); diff --git a/src/plugins/designer/resourcehandler.cpp b/src/plugins/designer/resourcehandler.cpp index 1f1824f031a..d9a329c5a94 100644 --- a/src/plugins/designer/resourcehandler.cpp +++ b/src/plugins/designer/resourcehandler.cpp @@ -104,9 +104,7 @@ void ResourceHandler::ensureInitialized() if (m_sessionNode) return; ProjectExplorer::ProjectExplorerPlugin *pe = ProjectExplorer::ProjectExplorerPlugin::instance(); - ProjectExplorer::SessionManager *session = pe->session(); - - m_sessionNode = session->sessionNode(); + m_sessionNode = pe->session()->sessionNode(); m_sessionWatcher = new ProjectExplorer::NodesWatcher(); connect(m_sessionWatcher, SIGNAL(filesAdded()), this, SLOT(updateResources()));