From 3e1ac6fb3f9865bf5bb0c156e985c1a4577b20e0 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 14 Feb 2010 11:23:37 +0100 Subject: Krazy issues (1st branch) --- src/adblock/adblockmanager.cpp | 6 +-- src/adblock/adblocknetworkreply.cpp | 2 +- src/bookmarks/bookmarksproxy.h | 8 ++-- src/bookmarks/bookmarkstreemodel.cpp | 2 +- src/clicktoflash.cpp | 75 ++++++++++++----------------------- src/clicktoflash.h | 77 ++++++++++++------------------------ src/filterurljob.cpp | 3 -- src/mainwindow.cpp | 4 +- src/settings/settings_webkit.ui | 2 +- src/settings/settingsdialog.cpp | 2 +- src/walletbar.h | 6 +-- src/webpage.cpp | 2 +- 12 files changed, 68 insertions(+), 121 deletions(-) (limited to 'src') diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp index bcb5b556..06f0d164 100644 --- a/src/adblock/adblockmanager.cpp +++ b/src/adblock/adblockmanager.cpp @@ -83,10 +83,10 @@ void AdBlockManager::loadSettings() if (name.startsWith(QLatin1String("Filter"))) { - if(!url.startsWith("!")) + if(!url.startsWith('!')) { // white rules - if(url.startsWith("@@")) + if( url.startsWith( QLatin1String("@@") ) ) { AdBlockRule rule( url.mid(2) ); _whiteList << rule; @@ -94,7 +94,7 @@ void AdBlockManager::loadSettings() } // hide (CSS) rules - if(url.startsWith("##")) + if( url.startsWith( QLatin1String("##") ) ) { _hideList << url.mid(2); continue; diff --git a/src/adblock/adblocknetworkreply.cpp b/src/adblock/adblocknetworkreply.cpp index 804524b3..3b73b8a0 100644 --- a/src/adblock/adblocknetworkreply.cpp +++ b/src/adblock/adblocknetworkreply.cpp @@ -68,7 +68,7 @@ AdBlockNetworkReply::AdBlockNetworkReply(const QNetworkRequest &request, const Q setOperation(QNetworkAccessManager::GetOperation); setRequest(request); setUrl(request.url()); - setError(QNetworkReply::ContentAccessDenied, i18n("Blocked by AdBlockRule: %1").arg(urlString)); + setError(QNetworkReply::ContentAccessDenied, i18n("Blocked by AdBlockRule: %1", urlString) ); QTimer::singleShot(0, this, SLOT(delayedFinished())); } diff --git a/src/bookmarks/bookmarksproxy.h b/src/bookmarks/bookmarksproxy.h index fcd49673..a1444218 100644 --- a/src/bookmarks/bookmarksproxy.h +++ b/src/bookmarks/bookmarksproxy.h @@ -37,13 +37,13 @@ class BookmarksProxy : public QSortFilterProxyModel Q_DISABLE_COPY(BookmarksProxy) public: - BookmarksProxy( QObject *parent = 0 ); + BookmarksProxy( QObject *parent = 0 ); protected: - virtual bool filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const; + virtual bool filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const; - // returns true if any child(or childs-child...) matches filter - bool recursiveMatch( const QModelIndex &index ) const; + // returns true if any child(or children-child...) matches filter + bool recursiveMatch( const QModelIndex &index ) const; }; #endif // BOOKMARKSPROXY_H diff --git a/src/bookmarks/bookmarkstreemodel.cpp b/src/bookmarks/bookmarkstreemodel.cpp index f80fdc74..95e5ad41 100644 --- a/src/bookmarks/bookmarkstreemodel.cpp +++ b/src/bookmarks/bookmarkstreemodel.cpp @@ -268,7 +268,7 @@ void BookmarksTreeModel::bookmarksChanged( const QString &groupAddress ) QModelIndex nodeIndex; QStringList indexChain( groupAddress.split( '/', QString::SkipEmptyParts) ); - foreach( QString sIndex, indexChain ) + foreach( const QString &sIndex, indexChain ) { bool ok; int i = sIndex.toInt( &ok ); diff --git a/src/clicktoflash.cpp b/src/clicktoflash.cpp index 509202fb..64dff19d 100644 --- a/src/clicktoflash.cpp +++ b/src/clicktoflash.cpp @@ -1,53 +1,28 @@ -/* - * Copyright (c) 2009, Benjamin C. Meyer - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ============================================================ - * - * This file is a part of the rekonq project - * - * Copyright (C) 2010 by Matthieu Gicquel - * - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License or (at your option) version 3 or any later version - * accepted by the membership of KDE e.V. (or its successor approved - * by the membership of KDE e.V.), which shall act as a proxy - * defined in Section 14 of version 3 of the license. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * ============================================================ */ +/* ============================================================ +* +* This file is a part of the rekonq project +* +* Copyright (c) 2009, Benjamin C. Meyer +* Copyright (C) 2010 by Matthieu Gicquel +* +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License or (at your option) version 3 or any later version +* accepted by the membership of KDE e.V. (or its successor approved +* by the membership of KDE e.V.), which shall act as a proxy +* defined in Section 14 of version 3 of the license. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* ============================================================ */ // Self Includes diff --git a/src/clicktoflash.h b/src/clicktoflash.h index d519e047..8565f80f 100644 --- a/src/clicktoflash.h +++ b/src/clicktoflash.h @@ -1,53 +1,28 @@ -/* - * Copyright (c) 2009, Benjamin C. Meyer - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ============================================================ - * - * This file is a part of the rekonq project - * - * Copyright (C) 2010 by Matthieu Gicquel - * - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License or (at your option) version 3 or any later version - * accepted by the membership of KDE e.V. (or its successor approved - * by the membership of KDE e.V.), which shall act as a proxy - * defined in Section 14 of version 3 of the license. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * ============================================================ */ +/* ============================================================ +* +* This file is a part of the rekonq project +* +* Copyright (c) 2009, Benjamin C. Meyer +* Copyright (C) 2010 by Matthieu Gicquel +* +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License or (at your option) version 3 or any later version +* accepted by the membership of KDE e.V. (or its successor approved +* by the membership of KDE e.V.), which shall act as a proxy +* defined in Section 14 of version 3 of the license. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* ============================================================ */ #ifndef CLICKTOFLASH_H @@ -63,7 +38,7 @@ class ClickToFlash : public QWidget { Q_OBJECT public: - ClickToFlash(QUrl pluginUrl, QWidget *parent = 0); + explicit ClickToFlash(QUrl pluginUrl, QWidget *parent = 0); signals: void signalLoadClickToFlash(bool); diff --git a/src/filterurljob.cpp b/src/filterurljob.cpp index 00bdee36..e74f8ec8 100644 --- a/src/filterurljob.cpp +++ b/src/filterurljob.cpp @@ -31,9 +31,6 @@ #include #include -// Qt Includes -#include - FilterUrlJob::FilterUrlJob(WebView *view, const QString &urlString, QObject *parent) : Job(parent) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 96b4569c..f1999d4f 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -664,7 +664,7 @@ void MainWindow::updateWindowTitle(const QString &title) { if(settings->testAttribute(QWebSettings::PrivateBrowsingEnabled)) { - setWindowTitle("rekonq (" + i18n("Private Browsing") + ")"); + setWindowTitle("rekonq (" + i18n("Private Browsing") + ')'); } else { @@ -675,7 +675,7 @@ void MainWindow::updateWindowTitle(const QString &title) { if(settings->testAttribute(QWebSettings::PrivateBrowsingEnabled)) { - setWindowTitle(title + " - rekonq (" + i18n("Private Browsing") + ")"); + setWindowTitle(title + " - rekonq (" + i18n("Private Browsing") + ')'); } else { diff --git a/src/settings/settings_webkit.ui b/src/settings/settings_webkit.ui index 5074522b..75776d95 100644 --- a/src/settings/settings_webkit.ui +++ b/src/settings/settings_webkit.ui @@ -148,7 +148,7 @@ - + 0 diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp index 2c04fac0..a3bf7359 100644 --- a/src/settings/settingsdialog.cpp +++ b/src/settings/settingsdialog.cpp @@ -138,7 +138,7 @@ Private::Private(SettingsDialog *parent) pageItem->setIcon(KIcon(ebrowsingInfo.icon())); // WARNING remember wheh changing here that the smaller netbooks - // have a 1024x576 resolution. So DONT bother that limits!! + // have a 1024x576 resolution. So DON'T bother that limits!! parent->setMinimumSize(700,525); } diff --git a/src/walletbar.h b/src/walletbar.h index d2e39373..77257f69 100644 --- a/src/walletbar.h +++ b/src/walletbar.h @@ -24,8 +24,8 @@ * ============================================================ */ -#ifndef WALLET_WIDGET_H -#define WALLET_WIDGET_H +#ifndef WALLET_BAR_H +#define WALLET_BAR_H // Qt Includes @@ -65,4 +65,4 @@ private: QLabel *m_label; }; -#endif // WALLET_WIDGET_H +#endif // WALLET_BAR_H diff --git a/src/webpage.cpp b/src/webpage.cpp index a0a4fe21..0f66ae93 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -283,7 +283,7 @@ void WebPage::downloadRequest(const QNetworkRequest &request) { if (ReKonfig::kgetDownload()) { - //*Copy of kwebpage code (Shouldn't be done in kwepage ?) + //*Copy of kwebpage code (Shouldn't be done in kwebpage ?) KUrl destUrl; KUrl srcUrl (request.url()); -- cgit v1.2.1