[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: 2009-05-11 21:26:24
Message-ID: 1242077184.482367.21599.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 966798 by uwolfer:
Coding style cleanup.
Done by astyle; reviewed.
Patch by Paweł Prażak, thanks.
CCMAIL:kojot350@gmail.com
M +2 -2 kdewebkit/kwebpage.cpp
M +6 -6 kdewebkit/kwebpluginfactory.cpp
M +5 -3 kdewebkit/kwebview.cpp
M +9 -8 kdewebkit/searchbar_p.cpp
M +6 -6 part/webkitpart.cpp
M +4 -4 part/webpage.cpp
M +3 -4 part/webview.cpp
--- trunk/playground/libs/webkitkde/kdewebkit/kwebpage.cpp #966797:966798
@@ -121,7 +121,7 @@
}
KWebPage::KWebPage(QObject *parent)
- : QWebPage(parent), d(new KWebPage::KWebPagePrivate())
+ : QWebPage(parent), d(new KWebPage::KWebPagePrivate())
{
#if KDE_IS_VERSION(4, 2, 70)
d->accessManager = new KIO::AccessManager(this);
@@ -306,7 +306,7 @@
QString errMsgEx = i18n("Try to reinstall it. \n\nThe \
integration with Konqueror will be disabled."); \
KMessageBox::detailedSorry(view(), errMsg, errMsgEx); \
cfg.writePathEntry("DownloadManager", QString());
- cfg.sync ();
+ cfg.sync();
} else {
downloadViaKIO = false;
cmd += ' ' + KShell::quoteArg(url.url());
--- trunk/playground/libs/webkitkde/kdewebkit/kwebpluginfactory.cpp \
#966797:966798 @@ -43,14 +43,14 @@
};
KWebPluginFactory::KWebPluginFactory(QObject *parent)
- : QWebPluginFactory(parent)
- , d(new KWebPluginFactory::KWebPluginFactoryPrivate(0))
+ : QWebPluginFactory(parent)
+ , d(new KWebPluginFactory::KWebPluginFactoryPrivate(0))
{
}
KWebPluginFactory::KWebPluginFactory(QWebPluginFactory *delegate, QObject \
*parent)
- : QWebPluginFactory(parent)
- , d(new KWebPluginFactory::KWebPluginFactoryPrivate(delegate))
+ : QWebPluginFactory(parent)
+ , d(new KWebPluginFactory::KWebPluginFactoryPrivate(delegate))
{
}
@@ -91,7 +91,7 @@
openUrlArgs.metaData() = metaData;
openUrlArgs.setMimeType(mimeType);
part->setArguments(openUrlArgs);
- kDebug()<< part->arguments().metaData();
+ kDebug() << part->arguments().metaData();
part->openUrl(url);
}
kDebug() << "Asked for" << mimeType << "plugin, got" << part;
@@ -123,7 +123,7 @@
mime.name = servicetypes.at(z);
KMimeType::Ptr kmime = KMimeType::mimeType(mime.name);
if (kmime) {
- mime.fileExtensions = \
kmime->patterns().replaceInStrings("*.",""); + \
mime.fileExtensions = kmime->patterns().replaceInStrings("*.", ""); }
mimes.append(mime);
}
--- trunk/playground/libs/webkitkde/kdewebkit/kwebview.cpp #966797:966798
@@ -128,8 +128,9 @@
{
const QWebHitTestResult result = \
page()->mainFrame()->hitTestContent(event->pos()); const QUrl url = \
result.linkUrl();
- if (!url.isEmpty() && ((d->pressedButtons & Qt::MidButton) ||
- ((d->pressedButtons & Qt::LeftButton) && (d->keyboardModifiers & \
Qt::ControlModifier)))) { + if (!url.isEmpty()
+ && ((d->pressedButtons & Qt::MidButton)
+ || ((d->pressedButtons & Qt::LeftButton) && \
(d->keyboardModifiers & Qt::ControlModifier)))) { kDebug() << "middle \
clicked or ctrl-clicked url" << url; emit openUrlInNewTab(url);
return;
@@ -191,7 +192,8 @@
d->searchBar->setFoundMatch(status);
}
-void KWebView::load(const KUrl &url, const KParts::OpenUrlArguments &args, \
const KParts::BrowserArguments &bargs) { +void KWebView::load(const KUrl \
&url, const KParts::OpenUrlArguments &args, const KParts::BrowserArguments \
&bargs) +{
QNetworkRequest req;
req.setUrl(url);
--- trunk/playground/libs/webkitkde/kdewebkit/searchbar_p.cpp \
#966797:966798 @@ -32,10 +32,11 @@
namespace KDEPrivate {
-class SearchBar::SearchBarPrivate {
+class SearchBar::SearchBarPrivate
+{
public:
- SearchBarPrivate(SearchBar* searchBar, QWidget* widget, QTimeLine* \
timeLine)
- : widget(widget), timeLine(timeLine), m_searchBar(searchBar) {}
+ SearchBarPrivate(SearchBar* searchBar, QWidget* widget, QTimeLine* \
timeLine) + : widget(widget), timeLine(timeLine), \
m_searchBar(searchBar) {} void initializeSearchWidget() {
widget = new QWidget(m_searchBar);
widget->setContentsMargins(0, 0, 0, 0);
@@ -47,8 +48,8 @@
ui.nextButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
ui.searchInfo->setText(QString());
if (ui.searchAsYouType->checkState() == Qt::Checked) {
- connect(ui.searchLineEdit, SIGNAL(textChanged(const QString&)),
- m_searchBar, SIGNAL(searchChanged(const QString&)));
+ connect(ui.searchLineEdit, SIGNAL(textChanged(const \
QString&)), + m_searchBar, SIGNAL(searchChanged(const \
QString&))); }
connect(ui.searchAsYouType, SIGNAL(stateChanged(int)), \
m_searchBar, SLOT(searchAsYouTypeChanged(int))); connect(ui.nextButton, \
SIGNAL(clicked()), @@ -71,7 +72,7 @@
};
SearchBar::SearchBar(QWidget *parent)
- : QWidget(parent)
+ : QWidget(parent)
{
d = new SearchBarPrivate(this, 0, new QTimeLine(150, this));
d->initializeSearchWidget();
@@ -79,7 +80,7 @@
// we start off hidden
setMaximumHeight(0);
d->widget->setGeometry(0, -1 * d->widget->height(),
- d->widget->width(), d->widget->height());
+ d->widget->width(), d->widget->height());
QWidget::hide();
connect(d->timeLine, SIGNAL(frameChanged(int)),
@@ -179,7 +180,7 @@
this, SIGNAL(searchChanged(const QString&)));
} else {
connect(d->ui.searchLineEdit, SIGNAL(textChanged(const QString&)),
- this, SIGNAL(searchChanged(const QString&)));
+ this, SIGNAL(searchChanged(const QString&)));
}
}
--- trunk/playground/libs/webkitkde/part/webkitpart.cpp #966797:966798
@@ -51,13 +51,13 @@
#include <QPrintPreviewDialog>
WebKitPart::WebKitPart(QWidget *parentWidget, QObject *parent, const \
QStringList &/*args*/)
- : KParts::ReadOnlyPart(parent)
+ : KParts::ReadOnlyPart(parent)
{
KAboutData about = KAboutData("webkitpart", "webkitkde", ki18n("WebKit \
HTML Component"),
- /*version*/ "0.1", \
/*ki18n("shortDescription")*/ KLocalizedString(),
- KAboutData::License_LGPL,
- ki18n("(c) 2008 - 2009, Urs Wolfer\n"
- "(c) 2007 Trolltech ASA"));
+ /*version*/ "0.1", \
/*ki18n("shortDescription")*/ KLocalizedString(), + \
KAboutData::License_LGPL, + ki18n("(c) \
2008 - 2009, Urs Wolfer\n" + "(c) \
2007 Trolltech ASA"));
about.addAuthor(ki18n("Laurent Montel"), KLocalizedString(), \
"montel@kde.org");
about.addAuthor(ki18n("Michael Howell"), KLocalizedString(), \
"mhowell123@gmail.com"); @@ -222,7 +222,7 @@
WebKitBrowserExtension::WebKitBrowserExtension(WebKitPart *parent)
- : KParts::BrowserExtension(parent), part(parent)
+ : KParts::BrowserExtension(parent), part(parent)
{
connect(part->view()->page(), SIGNAL(selectionChanged()),
this, SLOT(updateEditActions()));
--- trunk/playground/libs/webkitkde/part/webpage.cpp #966797:966798
@@ -47,8 +47,8 @@
#include <QtNetwork/QNetworkReply>
WebPage::WebPage(WebKitPart *wpart, QWidget *parent)
- : KWebPage(parent)
- , m_part(wpart)
+ : KWebPage(parent)
+ , m_part(wpart)
{
connect(this, SIGNAL(geometryChangeRequested(const QRect &)),
this, SLOT(slotGeometryChangeRequested(const QRect &)));
@@ -130,8 +130,8 @@
moveByX = - right + sg.right(); // always <0
if (bottom > sg.bottom())
moveByY = - bottom + sg.bottom(); // always <0
- if ((moveByX || moveByY) &&
- WebKitSettings::self()->windowMovePolicy(host) == \
WebKitSettings::KJSWindowMoveAllow) { + if ((moveByX || moveByY)
+ && WebKitSettings::self()->windowMovePolicy(host) == \
WebKitSettings::KJSWindowMoveAllow) {
emit m_part->browserExtension()->moveTopLevelWidget(view()->x() + \
moveByX, view()->y() + moveByY); }
}
--- trunk/playground/libs/webkitkde/part/webview.cpp #966797:966798
@@ -45,8 +45,7 @@
{
public:
WebViewPrivate(WebView *webView)
- : webView(webView)
- {}
+ : webView(webView) {}
void addSearchActions(QList<QAction *>& selectActions);
QString selectedTextAsOneLine() const;
@@ -68,7 +67,7 @@
WebView::WebView(WebKitPart *wpart, QWidget *parent)
- : KWebView(parent), d(new WebViewPrivate(this))
+ : KWebView(parent), d(new WebViewPrivate(this))
{
d->part = wpart;
d->actionCollection = new KActionCollection(this);
@@ -315,7 +314,7 @@
while (!text.isEmpty() && text[0].isSpace())
text = text.mid(1);
while (!text.isEmpty() && text[text.length()-1].isSpace())
- text.truncate(text.length()-1);
+ text.truncate(text.length() - 1);
return text;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic