From c3eb16b87eb8641b71693e8d76c3e3d0ec010c7f Mon Sep 17 00:00:00 2001
From: Matthew Horan <matt@matthoran.com>
Date: Thu, 22 Nov 2012 01:38:29 -0500
Subject: [PATCH] Remove Qt 4.7 compatibility code from CurrentUrl

---
 src/CurrentUrl.cpp | 15 ---------------
 src/CurrentUrl.h   |  6 ------
 src/WebPage.cpp    |  1 -
 3 files changed, 22 deletions(-)

diff --git a/src/CurrentUrl.cpp b/src/CurrentUrl.cpp
index 9331005..f892d1a 100644
--- a/src/CurrentUrl.cpp
+++ b/src/CurrentUrl.cpp
@@ -6,24 +6,9 @@ CurrentUrl::CurrentUrl(WebPageManager *manager, QStringList &arguments, QObject
 }
 
 void CurrentUrl::start() {
-#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)
   QStringList arguments;
   QVariant result = page()->invokeCapybaraFunction("currentUrl", arguments);
   QString url = result.toString();
   emit finished(new Response(true, url));
-#else
-  QUrl humanUrl = wasRedirectedAndNotModifiedByJavascript() ?
-    page()->currentFrame()->url() : page()->currentFrame()->requestedUrl();
-  QByteArray encodedBytes = humanUrl.toEncoded();
-  emit finished(new Response(true, encodedBytes));
-}
-
-bool CurrentUrl::wasRegularLoad() {
-  return page()->currentFrame()->url() == page()->currentFrame()->requestedUrl();
-}
-
-bool CurrentUrl::wasRedirectedAndNotModifiedByJavascript() {
-  return !wasRegularLoad() && page()->currentFrame()->url() == page()->history()->currentItem().url();
-#endif
 }
 
diff --git a/src/CurrentUrl.h b/src/CurrentUrl.h
index 14794be..2448ab9 100644
--- a/src/CurrentUrl.h
+++ b/src/CurrentUrl.h
@@ -6,11 +6,5 @@ class CurrentUrl : public SocketCommand {
   public:
     CurrentUrl(WebPageManager *, QStringList &arguments, QObject *parent = 0);
     virtual void start();
-#if QT_VERSION < QT_VERSION_CHECK(4, 8, 0)
-
-    private:
-      bool wasRegularLoad();
-      bool wasRedirectedAndNotModifiedByJavascript();
-#endif
 };
 
diff --git a/src/WebPage.cpp b/src/WebPage.cpp
index cf7b55d..8148a71 100644
--- a/src/WebPage.cpp
+++ b/src/WebPage.cpp
@@ -34,7 +34,6 @@ WebPage::WebPage(WebPageManager *manager, QObject *parent) : QWebPage(parent) {
   resetWindowSize();
 
   settings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, true);
-  currentFrame()->setUrl(QUrl("about:blank"));
 }
 
 void WebPage::resetWindowSize() {