From 6db73b6c1a5b3c1b9ba467c7521edd5036feecb0 Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Tue, 19 Apr 2011 18:15:36 +0200
Subject: [PATCH] Add all tabs to bookmarks now don't add pinned tabs

---
 src/bookmarks/bookmarksmanager.cpp | 6 +++---
 src/plugins/clicktoflash.cpp       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index e1bc3f8a5..2b6e86d25 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -397,9 +397,9 @@ void BookmarksManager::insertAllTabs()
     if (dialog->result() == QDialog::Rejected)
         return;
 
-    for (int i = 0; i<getQupZilla()->tabWidget()->count(); i++) {
-        WebView* view = getQupZilla()->weView(i);
-        if (!view || view->url().isEmpty())
+    foreach (WebTab* tab, getQupZilla()->tabWidget()->allTabs(false)) {
+        WebView* view = tab->view();
+        if (view->url().isEmpty())
             continue;
 
         m_bookmarksModel->saveBookmark(view->url(), view->title(), BookmarksModel::fromTranslatedFolder(combo->currentText()));
diff --git a/src/plugins/clicktoflash.cpp b/src/plugins/clicktoflash.cpp
index a71797755..dbe6c4756 100644
--- a/src/plugins/clicktoflash.cpp
+++ b/src/plugins/clicktoflash.cpp
@@ -47,9 +47,9 @@
 
 ClickToFlash::ClickToFlash(const QUrl &pluginUrl, const QStringList &argumentNames, const QStringList &argumentValues, QWidget* parent)
         : QWidget(parent)
-        , m_url(pluginUrl)
         , m_argumentNames(argumentNames)
         , m_argumentValues(argumentValues)
+        , m_url(pluginUrl)
 {
     //AdBlock
     AdBlockManager* manager = AdBlockManager::instance();