Renamed QWebPage::userAgentStringForUrl(url) to QWebPage::userAgentFor(url);
authorhausmann <hausmann@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Nov 2007 14:31:49 +0000 (14:31 +0000)
committerhausmann <hausmann@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Nov 2007 14:31:49 +0000 (14:31 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27559 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/qt/Api/qwebpage.cpp
WebKit/qt/Api/qwebpage.h
WebKit/qt/ChangeLog
WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

index 9e4c56784ca2d9dc8557077647a938e74c053bcf..c39b0e576f0f2757566d3df774f011ea489784e9 100644 (file)
@@ -1157,8 +1157,8 @@ QNetworkProxy QWebPage::networkProxy() const
 }
 #endif
 
-QString QWebPage::userAgentStringForUrl(const QUrl& forUrl) const {
-    Q_UNUSED(forUrl)
+QString QWebPage::userAgentFor(const QUrl& url) const {
+    Q_UNUSED(url)
     return QLatin1String("Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en) AppleWebKit/418.9.1 (KHTML, like Gecko) Safari/419.3 Qt");
 }
 
index 3b638343f7c8bfc16166977131fa8d4456d36923..db539d6ef9f46a1d964d86f789fc1a90888577ba 100644 (file)
@@ -237,8 +237,7 @@ protected:
     virtual bool javaScriptPrompt(QWebFrame *frame, const QString& msg, const QString& defaultValue, QString* result);
     virtual void javaScriptConsoleMessage(const QString& message, unsigned int lineNumber, const QString& sourceID);
 
-    // ### should the be here?
-    virtual QString userAgentStringForUrl(const QUrl& forUrl) const;
+    virtual QString userAgentFor(const QUrl& url) const;
 
     virtual void resizeEvent(QResizeEvent*);
     virtual void paintEvent(QPaintEvent*);
index 49d43600b34c4faa9161a6111728b119f75aea76..d83ceb8056821afbbf9a859c6a928be577b50a65 100644 (file)
@@ -1,3 +1,14 @@
+2007-11-07  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by Lars.
+
+        Renamed QWebPage::userAgentStringForUrl(url) to QWebPage::userAgentFor(url);
+
+        * Api/qwebpage.cpp:
+        * Api/qwebpage.h:
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::userAgent):
+
 2007-11-07  Simon Hausmann  <hausmann@kde.org>
 
         Reviewed by Lars.
index 9a7923a36ef34cda763083eee77db7d3a16af7e6..933ae7bb5f7b35504086120399491022b3490ed9 100644 (file)
@@ -553,7 +553,7 @@ void FrameLoaderClientQt::setTitle(const String&, const KURL&)
 String FrameLoaderClientQt::userAgent(const KURL& url)
 {
     if (m_webFrame) {
-        return m_webFrame->page()->userAgentStringForUrl(QUrl((QString)url.url()));
+        return m_webFrame->page()->userAgentFor(QUrl((QString)url.url()));
     }
     return String();
 }