--- a/browsercore/appfw/Api/Managers/BookmarksManager_p.h Fri May 14 15:40:36 2010 +0300
+++ b/browsercore/appfw/Api/Managers/BookmarksManager_p.h Tue Jun 29 00:46:29 2010 -0400
@@ -1,27 +1,32 @@
/*
* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License for more details.
*
-* Contributors:
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program. If not,
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
*
-* Description:
+* Description:
*
*/
-
#ifndef BOOKMARKS_MANAGER_P_H
#define BOOKMARKS_MANAGER_P_H
#include <QtGui/QUndoStack>
#include <browsercontentdll.h>
-class QSortFilterProxyModel;
+#include <QAction>
+
+class ActionJSObject;
namespace WRT {
class BookmarksManager;
@@ -39,21 +44,14 @@
//! flag to indicate was able to connect to book marks
bool m_connectedToBookmarks;
//! flag to indicate bookmarks are loaded from data base
- bool m_loadedBookmarks;
- //! flag to indicate history is loaded from data base
- bool m_loadedHistory;
- //! Root node for bookmark
- BookmarkNode *m_bookmarkRootNode; // owned
- //! Root node for history
- BookmarkNode *m_historyRootNode; // owned
-
- //! Root node for history proxy model
- BookmarkNode *m_historyRootNodeProxy; // owned
int m_maxUrls;
BrowserContent* m_bookmarkSession;
//flag to indicate importing bookmarks
bool m_import;
-
+
+ QAction * m_actionClearHistory;
+ QObject* m_actionsParent;
+ ActionJSObject *m_actionClearJSO;
};
}
#endif //BOOKMARKS_MANAGER_P_H