Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

1 files changed, 5 insertions, 6 deletions

diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.h
index 1a048f4e4..e46f124c0 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.h
@@ -35,8 +35,8 @@ namespace WebCore {
 }
 
 class QWebHistoryItemPrivate;
-class QWEBKIT_EXPORT QWebHistoryItem
-{
+
+class QWEBKIT_EXPORT QWebHistoryItem {
 public:
     QWebHistoryItem(const QWebHistoryItem &other);
     QWebHistoryItem &operator=(const QWebHistoryItem &other);
@@ -74,18 +74,17 @@ private:
 
 
 class QWebHistoryPrivate;
-class QWEBKIT_EXPORT QWebHistory
-{
+class QWEBKIT_EXPORT QWebHistory {
 public:
     enum HistoryStateVersion {
         HistoryVersion_1,
         /*, HistoryVersion_2, */
         DefaultHistoryVersion = HistoryVersion_1
     };
-    
+
     bool restoreState(const QByteArray& buffer);
     QByteArray saveState(HistoryStateVersion version = DefaultHistoryVersion) const;
-    
+
     void clear();
 
     QList<QWebHistoryItem> items() const;