From f6a7ef195c24517a025ac11c3156fdd23686562d Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 23 Oct 2012 18:25:59 +0200
Subject: Removed some porting FIXME and re-enabled old features

---
 src/application.cpp         |  8 +-------
 src/webtab/webpage.cpp      |  4 ++--
 src/webwindow/webwindow.cpp | 19 ++++++++++---------
 3 files changed, 13 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/application.cpp b/src/application.cpp
index a0e35964..957bee7f 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -148,9 +148,6 @@ int Application::newInstance()
 
             // just create History Manager...
             HistoryManager::self();
-
-            // WARNING: should this be removed?
-            AdBlockManager::self();
         }
 
         KStartupInfo::appStarted();
@@ -328,9 +325,6 @@ int Application::newInstance()
         // just create History Manager...
         HistoryManager::self();
 
-        // FIXME: should this be removed?
-        AdBlockManager::self();
-
         ReKonfig::setRecoverOnCrash(ReKonfig::recoverOnCrash() + 1);
         saveConfiguration();
     }
@@ -818,6 +812,6 @@ void Application::newTab()
 
 void Application::newPrivateBrowsingWindow()
 {
-    // FIXME: what about an "about:incognito" page?
+    // NOTE: what about an "about:incognito" page?
     loadUrl(KUrl("about:home"), Rekonq::NewPrivateWindow);
 }
diff --git a/src/webtab/webpage.cpp b/src/webtab/webpage.cpp
index a30ca804..7f681ee3 100644
--- a/src/webtab/webpage.cpp
+++ b/src/webtab/webpage.cpp
@@ -458,7 +458,7 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
         WebTab *tab = qobject_cast<WebTab *>(view->parent());
         tab->setPart(pa, replyUrl);
 
-        // FIXME: Is this enough?
+        // WARNING: Is this enough?
     }
     else
     {
@@ -569,7 +569,7 @@ void WebPage::manageNetworkErrors(QNetworkReply *reply)
             if (isMainFrameRequest)
             {
                 _isOnRekonqPage = true;
-                // FIXME: is this enough?
+                // WARNING: is this enough?
             }
         }
         break;
diff --git a/src/webwindow/webwindow.cpp b/src/webwindow/webwindow.cpp
index b38498d5..60eba237 100644
--- a/src/webwindow/webwindow.cpp
+++ b/src/webwindow/webwindow.cpp
@@ -504,7 +504,7 @@ void WebWindow::openPrevious(Qt::MouseButtons mouseButtons, Qt::KeyboardModifier
 
     if (mouseButtons == Qt::MidButton || keyboardModifiers == Qt::ControlModifier)
     {
-// FIXME        rApp->loadUrl(item->url(), Rekonq::NewTab);
+        rApp->loadUrl(item->url(), Rekonq::NewTab);
     }
     else
     {
@@ -537,7 +537,7 @@ void WebWindow::openNext(Qt::MouseButtons mouseButtons, Qt::KeyboardModifiers ke
 
     if (mouseButtons == Qt::MidButton || keyboardModifiers == Qt::ControlModifier)
     {
-// FIXME        rApp->loadUrl(item->url(), Rekonq::NewTab);
+        rApp->loadUrl(item->url(), Rekonq::NewTab);
     }
     else
     {
@@ -757,19 +757,20 @@ void WebWindow::viewPageSource()
     tmpFile.close();
     KUrl tmpUrl(tmpFile.fileName());
 
-    KParts::ReadOnlyPart *pa = KMimeTypeTrader::createPartInstanceFromQuery<KParts::ReadOnlyPart>(QL1S("text/plain"), _tab, this, QString());
-    if (pa)
-    {
-        // FIXME DO SOMETHING...
+    KRun::runUrl(tmpUrl, QL1S("text/plain"), this, false);
+
+//     FIXME: Implement "view-source" scheme
+//     KParts::ReadOnlyPart *pa = KMimeTypeTrader::createPartInstanceFromQuery<KParts::ReadOnlyPart>(QL1S("text/plain"), _tab, this, QString());
+//     if (pa)
+//     {
 //         WebTab *srcTab = m_view->newWebTab(true);
 //         srcTab->page()->setIsOnRekonqPage(true);
 //         srcTab->setPart(pa, tmpUrl);
 //         srcTab->urlBar()->setQUrl(url.pathOrUrl());
 //         m_view->setTabText(m_view->currentIndex(), i18n("Source of: ") + url.prettyUrl());
 //         updateHistoryActions();
-    }
-    else
-        KRun::runUrl(tmpUrl, QL1S("text/plain"), this, false);
+//     }
+
 }
 
 
-- 
cgit v1.2.1