<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[24823] trunk/WebKitQt</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/24823">24823</a></dd>
<dt>Author</dt> <dd>staikos</dd>
<dt>Date</dt> <dd>2007-08-02 04:56:59 -0700 (Thu, 02 Aug 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add an interface for the useragent string</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitQtApiqwebpagecpp">trunk/WebKitQt/Api/qwebpage.cpp</a></li>
<li><a href="#trunkWebKitQtApiqwebpageh">trunk/WebKitQt/Api/qwebpage.h</a></li>
<li><a href="#trunkWebKitQtChangeLog">trunk/WebKitQt/ChangeLog</a></li>
<li><a href="#trunkWebKitQtWebCoreSupportFrameLoaderClientQtcpp">trunk/WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitQtApiqwebpagecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKitQt/Api/qwebpage.cpp (24822 => 24823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitQt/Api/qwebpage.cpp 2007-08-02 10:01:46 UTC (rev 24822)
+++ trunk/WebKitQt/Api/qwebpage.cpp 2007-08-02 11:56:59 UTC (rev 24823)
</span><span class="lines">@@ -670,3 +670,9 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+QString QWebPage::userAgentStringForUrl(const QUrl& forUrl) const {
+ Q_UNUSED(forUrl)
+ return QLatin1String("Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en) AppleWebKit/418.9.1 (KHTML, like Gecko) Safari/419.3 Qt");
+}
+
+
</ins></span></pre></div>
<a id="trunkWebKitQtApiqwebpageh"></a>
<div class="modfile"><h4>Modified: trunk/WebKitQt/Api/qwebpage.h (24822 => 24823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitQt/Api/qwebpage.h 2007-08-02 10:01:46 UTC (rev 24822)
+++ trunk/WebKitQt/Api/qwebpage.h 2007-08-02 11:56:59 UTC (rev 24823)
</span><span class="lines">@@ -178,6 +178,7 @@
</span><span class="cx"> virtual bool javaScriptConfirm(QWebFrame *frame, const QString& msg);
</span><span class="cx"> virtual bool javaScriptPrompt(QWebFrame *frame, const QString& msg, const QString& defaultValue, QString* result);
</span><span class="cx"> virtual void javaScriptConsoleMessage(const QString& message, unsigned int lineNumber, const QString& sourceID);
</span><ins>+ virtual QString userAgentStringForUrl(const QUrl& forUrl) const;
</ins><span class="cx">
</span><span class="cx"> virtual void resizeEvent(QResizeEvent*);
</span><span class="cx"> virtual void paintEvent(QPaintEvent*);
</span></span></pre></div>
<a id="trunkWebKitQtChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitQt/ChangeLog (24822 => 24823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitQt/ChangeLog 2007-08-02 10:01:46 UTC (rev 24822)
+++ trunk/WebKitQt/ChangeLog 2007-08-02 11:56:59 UTC (rev 24823)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2007-08-02 George Staikos <staikos@kde.org>
+
+ Reviewed by Simon.
+
+ Add an interface for the useragent string.
+
+ * Api/qwebpage.cpp:
+ (QWebPage::userAgentStringForUrl):
+ * Api/qwebpage.h:
+ * WebCoreSupport/FrameLoaderClientQt.cpp:
+ (WebCore::FrameLoaderClientQt::userAgent):
+
</ins><span class="cx"> 2007-08-01 Adam Treat <treat@kde.org>
</span><span class="cx">
</span><span class="cx"> Reviewed by George Staikos.
</span></span></pre></div>
<a id="trunkWebKitQtWebCoreSupportFrameLoaderClientQtcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp (24822 => 24823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp 2007-08-02 10:01:46 UTC (rev 24822)
+++ trunk/WebKitQt/WebCoreSupport/FrameLoaderClientQt.cpp 2007-08-02 11:56:59 UTC (rev 24823)
</span><span class="lines">@@ -545,9 +545,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-String FrameLoaderClientQt::userAgent(const KURL&)
</del><ins>+String FrameLoaderClientQt::userAgent(const KURL& url)
</ins><span class="cx"> {
</span><del>- return "Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en) AppleWebKit/418.9.1 (KHTML, like Gecko) Safari/419.3 Qt";
</del><ins>+ if (m_webFrame) {
+ return m_webFrame->page()->userAgentStringForUrl(QUrl((QString)url.url()));
+ }
+ return String();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FrameLoaderClientQt::dispatchDidReceiveIcon()
</span></span></pre>
</div>
</div>
</body>
</html>