[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/libs/webkitkde
From: Urs Wolfer <uwolfer () kde ! org>
Date: 2008-12-21 12:05:27
Message-ID: 1229861127.853247.2840.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 899604 by uwolfer:
* fix dptr ussage
* constify some vars
M +3 -3 kdenetwork/knetworkreply.cpp
M +14 -10 kdewebkit/kwebpage.cpp
M +0 -1 kdewebkit/kwebpage.h
M +4 -4 kdewebkit/kwebview.cpp
M +1 -1 kdewebkit/searchbar.cpp
M +2 -2 part/webkitpart.cpp
M +3 -3 part/webpage.cpp
--- trunk/playground/libs/webkitkde/kdenetwork/knetworkreply.cpp #899603:899604
@@ -71,7 +71,7 @@
qint64 KNetworkReply::readData(char *data, qint64 maxSize)
{
// kDebug();
- qint64 length = qMin(qint64(d->m_data.length()), maxSize);
+ const qint64 length = qMin(qint64(d->m_data.length()), maxSize);
if (length) {
qMemCopy(data, d->m_data.constData(), length);
d->m_data.remove(0, length);
@@ -85,11 +85,11 @@
// kDebug();
if (!d->m_metaDataRead) {
- QString headers = kioJob->queryMetaData("HTTP-Headers");
+ const QString headers = kioJob->queryMetaData("HTTP-Headers");
if (!headers.isEmpty()) {
QStringList headerList = headers.split('\n');
Q_FOREACH(const QString &header, headerList) {
- QStringList headerPair = header.split(": ");
+ const QStringList headerPair = header.split(": ");
if (headerPair.size() == 2) {
// kDebug() << headerPair.at(0) << headerPair.at(1);
setRawHeader(headerPair.at(0).toUtf8(), \
headerPair.at(1).toUtf8());
--- trunk/playground/libs/webkitkde/kdewebkit/kwebpage.cpp #899603:899604
@@ -63,7 +63,11 @@
class KWebPage::KWebPagePrivate
{
public:
- KWebPagePrivate() {}
+ KWebPagePrivate()
+ : unsupportedContent(false)
+ {}
+
+ bool unsupportedContent;
};
KWebPage::KWebPage(QObject *parent)
@@ -153,11 +157,11 @@
QString KWebPage::userAgentForUrl(const QUrl& _url) const
{
- KUrl url(_url);
- QString host = url.isLocalFile() ? "localhost" : url.host();
+ const KUrl url(_url);
+ const QString host = url.isLocalFile() ? "localhost" : url.host();
QString userAgent = KProtocolManager::userAgentForHost(host);
- int indexOfKhtml = userAgent.indexOf("KHTML/");
+ const int indexOfKhtml = userAgent.indexOf("KHTML/");
if (indexOfKhtml == -1) // not a KHTML user agent, so no need to "update" it
return userAgent;
@@ -178,7 +182,7 @@
if (customUnsupportedContent()) {
return customUnsupportedContent(reply);
}
- KUrl url(reply->request().url());
+ const KUrl url(reply->request().url());
kDebug() << "title:" << url;
kDebug() << "error:" << reply->errorString();
@@ -210,7 +214,7 @@
void KWebPage::slotDownloadRequested(const QNetworkRequest &request)
{
- KUrl url(request.url());
+ const KUrl url(request.url());
kDebug() << url;
// parts of following code are based on khtml_ext.cpp
@@ -221,7 +225,7 @@
bool downloadViaKIO = true;
if (!url.isLocalFile()) {
KConfigGroup cfg = KSharedConfig::openConfig("konquerorrc", \
KConfig::NoGlobals)->group("HTML Settings");
- QString downloadManger = cfg.readPathEntry("DownloadManager", QString());
+ const QString downloadManger = cfg.readPathEntry("DownloadManager", \
QString()); if (!downloadManger.isEmpty()) {
// then find the download manager location
kDebug() << "Using: " << downloadManger << " as Download Manager";
@@ -242,7 +246,7 @@
}
if (downloadViaKIO) {
- QString destUrl = KFileDialog::getOpenFileName(url.fileName(), QString(), \
view()); + const QString destUrl = \
KFileDialog::getOpenFileName(url.fileName(), QString(), view());
KIO::Job *job = KIO::file_copy(url, KUrl(destUrl), -1, KIO::Overwrite);
//job->setMetaData(metadata); //TODO: add metadata from request
job->addMetaData("MaxCacheSize", "0"); // Don't store in http cache.
@@ -266,11 +270,11 @@
void KWebPage::setCustomUnsupportedContent(bool forward)
{
- m_unsup = forward;
+ d->unsupportedContent = forward;
}
bool KWebPage::customUnsupportedContent() const
{
- return m_unsup;
+ return d->unsupportedContent;
}
--- trunk/playground/libs/webkitkde/kdewebkit/kwebpage.h #899603:899604
@@ -60,7 +60,6 @@
private:
class KWebPagePrivate;
KWebPagePrivate* const d;
- bool m_unsup;
};
#endif // KWEBPAGE_H
--- trunk/playground/libs/webkitkde/kdewebkit/kwebview.cpp #899603:899604
@@ -88,8 +88,8 @@
void KWebView::wheelEvent(QWheelEvent *event)
{
if (QApplication::keyboardModifiers() & Qt::ControlModifier) {
- int numDegrees = event->delta() / 8;
- int numSteps = numDegrees / 15;
+ const int numDegrees = event->delta() / 8;
+ const int numSteps = numDegrees / 15;
#if QT_VERSION < 0x040500
setTextSizeMultiplier(textSizeMultiplier() + numSteps * 0.1);
#else
@@ -121,7 +121,7 @@
QWebView::mouseReleaseEvent(event);
if (!event->isAccepted() && (d->pressedButtons & Qt::MidButton)) {
- KUrl url(QApplication::clipboard()->text(QClipboard::Selection));
+ const KUrl url(QApplication::clipboard()->text(QClipboard::Selection));
if (!url.isEmpty() && url.isValid() && !url.scheme().isEmpty()) {
emit openUrl(url);
}
@@ -165,7 +165,7 @@
{
if (d->searchBar->caseSensitive())
flags |= KWebPage::FindCaseSensitively;
- bool status = page()->findText(d->searchBar->searchText(), flags);
+ const bool status = page()->findText(d->searchBar->searchText(), flags);
d->searchBar->setFoundMatch(status);
}
--- trunk/playground/libs/webkitkde/kdewebkit/searchbar.cpp #899603:899604
@@ -125,7 +125,7 @@
if (!m_widget)
return;
m_widget->move(0, frame);
- int height = qMax(0, m_widget->y() + m_widget->height());
+ const int height = qMax(0, m_widget->y() + m_widget->height());
setMinimumHeight(height);
setMaximumHeight(height);
}
--- trunk/playground/libs/webkitkde/part/webkitpart.cpp #899603:899604
@@ -248,7 +248,7 @@
if (!KUriFilter::self()->filterUri(data, list)) {
KDesktopFile file("services", "searchproviders/google.desktop");
- QString encodedSearchTerm = QUrl::toPercentEncoding(text);
+ const QString encodedSearchTerm = QUrl::toPercentEncoding(text);
KConfigGroup cg(file.desktopGroup());
data.setData(cg.readEntry("Query").replace("\\{@}", encodedSearchTerm));
}
@@ -322,7 +322,7 @@
{
QStringList urls;
urls.append(part->view()->contextMenuResult().imageUrl().path());
- QString subject = part->view()->contextMenuResult().imageUrl().path();
+ const QString subject = part->view()->contextMenuResult().imageUrl().path();
KToolInvocation::invokeMailer(QString(), QString(), QString(), subject,
QString(), //body
QString(),
--- trunk/playground/libs/webkitkde/part/webpage.cpp #899603:899604
@@ -120,8 +120,8 @@
// If the window is out of the desktop, move it up/left
// (maybe we should use workarea instead of sg, otherwise the window ends up \
below kicker)
- int right = view()->x() + view()->frameGeometry().width();
- int bottom = view()->y() + view()->frameGeometry().height();
+ const int right = view()->x() + view()->frameGeometry().width();
+ const int bottom = view()->y() + view()->frameGeometry().height();
int moveByX = 0;
int moveByY = 0;
if (right > sg.right())
@@ -155,7 +155,7 @@
void WebPage::slotHandleUnsupportedContent(QNetworkReply *reply)
{
- KUrl url(reply->request().url());
+ const KUrl url(reply->request().url());
KParts::OpenUrlArguments args;
args.setMimeType(reply->header(QNetworkRequest::ContentTypeHeader).toString());
emit m_part->browserExtension()->openUrlRequest(url, args, \
KParts::BrowserArguments());
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic