summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/adblock/adblockmanager.cpp2
-rw-r--r--src/adblock/adblockwidget.cpp4
-rw-r--r--src/adblock/adblockwidget.h2
-rw-r--r--src/analyzer/analyzerpanel.cpp10
-rw-r--r--src/analyzer/analyzerpanel.h2
-rw-r--r--src/analyzer/networkanalyzer.cpp6
-rw-r--r--src/analyzer/networkanalyzer.h2
-rw-r--r--src/application.cpp4
-rw-r--r--src/bookmarks/bookmarkmanager.cpp8
-rw-r--r--src/bookmarks/bookmarkmanager.h2
-rw-r--r--src/bookmarks/bookmarkowner.cpp24
-rw-r--r--src/bookmarks/bookmarkowner.h2
-rw-r--r--src/bookmarks/bookmarkspanel.cpp6
-rw-r--r--src/bookmarks/bookmarkspanel.h2
-rw-r--r--src/bookmarks/bookmarkstoolbar.cpp4
-rw-r--r--src/bookmarks/bookmarkstoolbar.h2
-rw-r--r--src/bookmarks/bookmarkstreemodel.cpp6
-rw-r--r--src/bookmarks/bookmarkstreemodel.h2
-rw-r--r--src/downloadmanager.cpp6
-rw-r--r--src/downloadmanager.h1
-rw-r--r--src/findbar.cpp4
-rw-r--r--src/findbar.h2
-rw-r--r--src/history/historymanager.cpp6
-rw-r--r--src/history/historymanager.h2
-rw-r--r--src/history/historymodels.cpp54
-rw-r--r--src/history/historymodels.h2
-rw-r--r--src/mainview.cpp22
-rw-r--r--src/mainwindow.cpp34
-rw-r--r--src/opensearch/opensearchmanager.cpp10
-rw-r--r--src/opensearch/opensearchmanager.h2
-rw-r--r--src/paneltreeview.cpp5
-rw-r--r--src/paneltreeview.h1
-rw-r--r--src/protocolhandler.cpp4
-rw-r--r--src/settings/adblockwidget.cpp200
-rw-r--r--src/settings/appearancewidget.cpp16
-rw-r--r--src/sslinfodialog.cpp2
-rw-r--r--src/sync/ftpsynchandler.cpp24
-rw-r--r--src/tabbar.cpp10
-rw-r--r--src/tests/mainview_test.cpp52
-rw-r--r--src/urlbar/completionwidget.cpp8
-rw-r--r--src/urlbar/listitem.cpp8
-rw-r--r--src/urlbar/sslwidget.cpp2
-rw-r--r--src/urlbar/urlbar.cpp10
-rw-r--r--src/urlbar/urlresolver.cpp4
-rw-r--r--src/urlbar/webshortcutwidget.cpp2
-rw-r--r--src/urlpanel.cpp6
-rw-r--r--src/webpage.cpp8
-rw-r--r--src/webtab.cpp24
-rw-r--r--src/webview.cpp8
49 files changed, 216 insertions, 413 deletions
diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index 0f91c02f..a4af34cb 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -283,7 +283,7 @@ void AdBlockManager::updateNextSubscription()
job->metaData().insert("cookies", "none");
job->metaData().insert("no-auth", "true");
- connect(job, SIGNAL(data(KIO::Job*, const QByteArray&)), this, SLOT(subscriptionData(KIO::Job*, const QByteArray&)));
+ connect(job, SIGNAL(data(KIO::Job*, QByteArray)), this, SLOT(subscriptionData(KIO::Job*, QByteArray)));
connect(job, SIGNAL(result(KJob*)), this, SLOT(slotResult(KJob*)));
return;
diff --git a/src/adblock/adblockwidget.cpp b/src/adblock/adblockwidget.cpp
index c5f09d5a..c26e31f4 100644
--- a/src/adblock/adblockwidget.cpp
+++ b/src/adblock/adblockwidget.cpp
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
@@ -49,7 +49,7 @@ AdBlockWidget::AdBlockWidget(QWidget *parent)
setupUi(this);
hintLabel->setText(i18n("<qt>Filter expression (e.g. <tt>http://www.example.com/ad/*</tt>, <a href=\"filterhelp\">more information</a>):"));
- connect(hintLabel, SIGNAL(linkActivated(const QString &)), this, SLOT(slotInfoLinkActivated(const QString &)));
+ connect(hintLabel, SIGNAL(linkActivated(QString)), this, SLOT(slotInfoLinkActivated(QString)));
listWidget->setSortingEnabled(true);
listWidget->setSelectionMode(QAbstractItemView::SingleSelection);
diff --git a/src/adblock/adblockwidget.h b/src/adblock/adblockwidget.h
index aff8a007..3c7c667b 100644
--- a/src/adblock/adblockwidget.h
+++ b/src/adblock/adblockwidget.h
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
diff --git a/src/analyzer/analyzerpanel.cpp b/src/analyzer/analyzerpanel.cpp
index 5be5aa27..3ecc57d3 100644
--- a/src/analyzer/analyzerpanel.cpp
+++ b/src/analyzer/analyzerpanel.cpp
@@ -3,7 +3,7 @@
* This file is a part of the rekonq project
*
* Copyright (C) 2010-2011 by Matthieu Gicquel <matgic78 at gmail dot com>
-* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
@@ -73,14 +73,14 @@ void NetworkAnalyzerPanel::toggle(bool enable)
if (enable)
{
connect(page, SIGNAL(loadStarted()), _viewer, SLOT(clear()));
- connect(manager, SIGNAL(networkData(QNetworkAccessManager::Operation, const QNetworkRequest &, QNetworkReply *)),
- _viewer, SLOT(addRequest(QNetworkAccessManager::Operation, const QNetworkRequest &, QNetworkReply *)));
+ connect(manager, SIGNAL(networkData(QNetworkAccessManager::Operation, QNetworkRequest, QNetworkReply*)),
+ _viewer, SLOT(addRequest(QNetworkAccessManager::Operation, QNetworkRequest, QNetworkReply*)));
}
else
{
disconnect(page, SIGNAL(loadStarted()), _viewer, SLOT(clear()));
- disconnect(manager, SIGNAL(networkData(QNetworkAccessManager::Operation, const QNetworkRequest &, QNetworkReply *)),
- _viewer, SLOT(addRequest(QNetworkAccessManager::Operation, const QNetworkRequest &, QNetworkReply *)));
+ disconnect(manager, SIGNAL(networkData(QNetworkAccessManager::Operation, QNetworkRequest, QNetworkReply*)),
+ _viewer, SLOT(addRequest(QNetworkAccessManager::Operation, QNetworkRequest, QNetworkReply*)));
}
setVisible(enable);
diff --git a/src/analyzer/analyzerpanel.h b/src/analyzer/analyzerpanel.h
index 5dc98d15..8441a395 100644
--- a/src/analyzer/analyzerpanel.h
+++ b/src/analyzer/analyzerpanel.h
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
diff --git a/src/analyzer/networkanalyzer.cpp b/src/analyzer/networkanalyzer.cpp
index 0cfae040..166555ef 100644
--- a/src/analyzer/networkanalyzer.cpp
+++ b/src/analyzer/networkanalyzer.cpp
@@ -3,7 +3,7 @@
* This file is a part of the rekonq project
*
* Copyright (C) 2009-2010 by Richard J. Moore <rich@kde.org>
-* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
@@ -67,8 +67,8 @@ NetworkAnalyzer::NetworkAnalyzer(QWidget *parent)
lay->addWidget(_requestList);
_requestList->setContextMenuPolicy(Qt::CustomContextMenu);
- connect(_mapper, SIGNAL(mapped(QObject *)), this, SLOT(requestFinished(QObject *)));
- connect(_requestList, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)), this, SLOT(showItemDetails(QTreeWidgetItem *)));
+ connect(_mapper, SIGNAL(mapped(QObject*)), this, SLOT(requestFinished(QObject*)));
+ connect(_requestList, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)), this, SLOT(showItemDetails(QTreeWidgetItem*)));
connect(_requestList, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(popupContextMenu(QPoint)));
}
diff --git a/src/analyzer/networkanalyzer.h b/src/analyzer/networkanalyzer.h
index 7b9e17da..f5824b07 100644
--- a/src/analyzer/networkanalyzer.h
+++ b/src/analyzer/networkanalyzer.h
@@ -3,7 +3,7 @@
* This file is a part of the rekonq project
*
* Copyright (C) 2009-2010 by Richard J. Moore <rich@kde.org>
-* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
diff --git a/src/application.cpp b/src/application.cpp
index e868116d..2f716463 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -311,8 +311,8 @@ int Application::newInstance()
historyManager();
// bookmarks loading
- connect(bookmarkManager(), SIGNAL(openUrl(const KUrl&, const Rekonq::OpenType&)),
- instance(), SLOT(loadUrl(const KUrl&, const Rekonq::OpenType&)));
+ connect(bookmarkManager(), SIGNAL(openUrl(KUrl, Rekonq::OpenType)),
+ instance(), SLOT(loadUrl(KUrl, Rekonq::OpenType)));
ReKonfig::setRecoverOnCrash(ReKonfig::recoverOnCrash() + 1);
saveConfiguration();
diff --git a/src/bookmarks/bookmarkmanager.cpp b/src/bookmarks/bookmarkmanager.cpp
index 066e0681..43f4dd3a 100644
--- a/src/bookmarks/bookmarkmanager.cpp
+++ b/src/bookmarks/bookmarkmanager.cpp
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2008-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2012 by Andrea Diamantini <adjam7 at gmail dot com>
* Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
@@ -69,12 +69,12 @@ BookmarkManager::BookmarkManager(QObject *parent)
delete tempManager;
}
- connect(m_manager, SIGNAL(changed(const QString &, const QString &)), this, SLOT(slotBookmarksChanged()));
+ connect(m_manager, SIGNAL(changed(QString, QString)), this, SLOT(slotBookmarksChanged()));
// setup menu
m_owner = new BookmarkOwner(m_manager, this);
- connect(m_owner, SIGNAL(openUrl(const KUrl&, const Rekonq::OpenType&)),
- this, SIGNAL(openUrl(const KUrl&, const Rekonq::OpenType&)));
+ connect(m_owner, SIGNAL(openUrl(KUrl, Rekonq::OpenType)),
+ this, SIGNAL(openUrl(KUrl, Rekonq::OpenType)));
KAction *a = KStandardAction::addBookmark(m_owner, SLOT(bookmarkCurrentPage()), this);
m_actionCollection->addAction(QL1S("rekonq_add_bookmark"), a);
diff --git a/src/bookmarks/bookmarkmanager.h b/src/bookmarks/bookmarkmanager.h
index 0254b19f..0de128a7 100644
--- a/src/bookmarks/bookmarkmanager.h
+++ b/src/bookmarks/bookmarkmanager.h
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2008-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2012 by Andrea Diamantini <adjam7 at gmail dot com>
* Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp
index 0d3894e5..a53b888b 100644
--- a/src/bookmarks/bookmarkowner.cpp
+++ b/src/bookmarks/bookmarkowner.cpp
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2008-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2012 by Andrea Diamantini <adjam7 at gmail dot com>
* Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
@@ -61,34 +61,34 @@ KAction* BookmarkOwner::createAction(const KBookmark &bookmark, const BookmarkAc
{
case OPEN:
return createAction(i18n("Open"), "tab-new",
- i18n("Open bookmark in current tab"), SLOT(openBookmark(const KBookmark &)), bookmark);
+ i18n("Open bookmark in current tab"), SLOT(openBookmark(KBookmark)), bookmark);
case OPEN_IN_TAB:
return createAction(i18n("Open in New Tab"), "tab-new",
- i18n("Open bookmark in new tab"), SLOT(openBookmarkInNewTab(const KBookmark &)), bookmark);
+ i18n("Open bookmark in new tab"), SLOT(openBookmarkInNewTab(KBookmark)), bookmark);
case OPEN_IN_WINDOW:
return createAction(i18n("Open in New Window"), "window-new",
- i18n("Open bookmark in new window"), SLOT(openBookmarkInNewWindow(const KBookmark &)), bookmark);
+ i18n("Open bookmark in new window"), SLOT(openBookmarkInNewWindow(KBookmark)), bookmark);
case OPEN_FOLDER:
return createAction(i18n("Open Folder in Tabs"), "tab-new",
- i18n("Open all the bookmarks in folder in tabs"), SLOT(openBookmarkFolder(const KBookmark &)), bookmark);
+ i18n("Open all the bookmarks in folder in tabs"), SLOT(openBookmarkFolder(KBookmark)), bookmark);
case BOOKMARK_PAGE:
return createAction(i18n("Add Bookmark"), "bookmark-new",
- i18n("Bookmark current page"), SLOT(bookmarkCurrentPage(const KBookmark &)), bookmark);
+ i18n("Bookmark current page"), SLOT(bookmarkCurrentPage(KBookmark)), bookmark);
case NEW_FOLDER:
return createAction(i18n("New Folder"), "folder-new",
- i18n("Create a new bookmark folder"), SLOT(newBookmarkFolder(const KBookmark &)), bookmark);
+ i18n("Create a new bookmark folder"), SLOT(newBookmarkFolder(KBookmark)), bookmark);
case NEW_SEPARATOR:
return createAction(i18n("New Separator"), "edit-clear",
- i18n("Create a new bookmark separator"), SLOT(newSeparator(const KBookmark &)), bookmark);
+ i18n("Create a new bookmark separator"), SLOT(newSeparator(KBookmark)), bookmark);
case COPY:
return createAction(i18n("Copy Link"), "edit-copy",
- i18n("Copy the bookmark's link address"), SLOT(copyLink(const KBookmark &)), bookmark);
+ i18n("Copy the bookmark's link address"), SLOT(copyLink(KBookmark)), bookmark);
case EDIT:
return createAction(i18n("Edit"), "configure",
- i18n("Edit the bookmark"), SLOT(editBookmark(const KBookmark &)), bookmark);
+ i18n("Edit the bookmark"), SLOT(editBookmark(KBookmark)), bookmark);
case DELETE:
return createAction(i18n("Delete"), "edit-delete",
- i18n("Delete the bookmark"), SLOT(deleteBookmark(const KBookmark &)), bookmark);
+ i18n("Delete the bookmark"), SLOT(deleteBookmark(KBookmark)), bookmark);
case SET_TOOLBAR_FOLDER:
return createAction(i18n("Set as toolbar folder"), "bookmark-toolbar",
"", SLOT(setToolBarFolder(KBookmark)), bookmark);
@@ -370,7 +370,7 @@ KAction* BookmarkOwner::createAction(const QString &text, const QString &icon,
{
CustomBookmarkAction *act = new CustomBookmarkAction(bookmark, KIcon(icon), text, this);
act->setHelpText(help);
- connect(act, SIGNAL(triggered(const KBookmark &)), this, slot);
+ connect(act, SIGNAL(triggered(KBookmark)), this, slot);
return act;
}
diff --git a/src/bookmarks/bookmarkowner.h b/src/bookmarks/bookmarkowner.h
index a414963b..c362fe5e 100644
--- a/src/bookmarks/bookmarkowner.h
+++ b/src/bookmarks/bookmarkowner.h
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2008-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2012 by Andrea Diamantini <adjam7 at gmail dot com>
* Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
* Copyright (C) 2009-2010 by Lionel Chauvin <megabigbug@yahoo.fr>
* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
diff --git a/src/bookmarks/bookmarkspanel.cpp b/src/bookmarks/bookmarkspanel.cpp
index 85d75402..2b2a7ea9 100644
--- a/src/bookmarks/bookmarkspanel.cpp
+++ b/src/bookmarks/bookmarkspanel.cpp
@@ -3,7 +3,7 @@
* This file is a part of the rekonq project
*
* Copyright (C) 2009 by Nils Weigel <nehlsen at gmail dot com>
-* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010-2012 by Andrea Diamantini <adjam7 at gmail dot com>
* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
*
* This program is free software; you can redistribute it and/or
@@ -118,8 +118,8 @@ void BookmarksPanel::setup()
UrlPanel::setup();
connect(panelTreeView(), SIGNAL(delKeyPressed()), this, SLOT(deleteBookmark()));
- connect(panelTreeView(), SIGNAL(collapsed(const QModelIndex &)), this, SLOT(onCollapse(const QModelIndex &)));
- connect(panelTreeView(), SIGNAL(expanded(const QModelIndex &)), this, SLOT(onExpand(const QModelIndex &)));
+ connect(panelTreeView(), SIGNAL(collapsed(QModelIndex)), this, SLOT(onCollapse(QModelIndex)));
+ connect(panelTreeView(), SIGNAL(expanded(QModelIndex)), this, SLOT(onExpand(QModelIndex)));
loadFoldedState();
}
diff --git a/src/bookmarks/bookmarkspanel.h b/src/bookmarks/bookmarkspanel.h
index 7fdcda92..796b8315 100644
--- a/src/bookmarks/bookmarkspanel.h
+++ b/src/bookmarks/bookmarkspanel.h
@@ -3,7 +3,7 @@
* This file is a part of the rekonq project
*
* Copyright (C) 2009 by Nils Weigel <nehlsen at gmail dot com>
-* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010-2012 by Andrea Diamantini <adjam7 at gmail dot com>
* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
*
*
diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp
index 1c184055..9a94f938 100644
--- a/src/bookmarks/bookmarkstoolbar.cpp
+++ b/src/bookmarks/bookmarkstoolbar.cpp
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2008-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2012 by Andrea Diamantini <adjam7 at gmail dot com>
* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
*
*
@@ -163,7 +163,7 @@ BookmarkToolBar::BookmarkToolBar(KToolBar *toolBar, QObject *parent)
, m_filled(false)
{
toolBar->setContextMenuPolicy(Qt::CustomContextMenu);
- connect(toolBar, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(contextMenu(const QPoint &)));
+ connect(toolBar, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenu(QPoint)));
connect(rApp->bookmarkManager()->manager(), SIGNAL(changed(QString, QString)), this, SLOT(hideMenu()));
toolBar->setAcceptDrops(true);
toolBar->installEventFilter(this);
diff --git a/src/bookmarks/bookmarkstoolbar.h b/src/bookmarks/bookmarkstoolbar.h
index 5cc28305..b96085ee 100644
--- a/src/bookmarks/bookmarkstoolbar.h
+++ b/src/bookmarks/bookmarkstoolbar.h
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2008-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2012 by Andrea Diamantini <adjam7 at gmail dot com>
* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
*
*
diff --git a/src/bookmarks/bookmarkstreemodel.cpp b/src/bookmarks/bookmarkstreemodel.cpp
index 56cab7bf..4121a6ee 100644
--- a/src/bookmarks/bookmarkstreemodel.cpp
+++ b/src/bookmarks/bookmarkstreemodel.cpp
@@ -3,7 +3,7 @@
* This file is a part of the rekonq project
*
* Copyright (C) 2009 by Nils Weigel <nehlsen at gmail dot com>
-* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
@@ -167,8 +167,8 @@ BookmarksTreeModel::BookmarksTreeModel(QObject *parent)
, m_root(0)
{
resetModel();
- connect(rApp->bookmarkManager()->manager(), SIGNAL(changed(const QString &, const QString &)),
- this, SLOT(bookmarksChanged(const QString &)));
+ connect(rApp->bookmarkManager()->manager(), SIGNAL(changed(QString, QString)),
+ this, SLOT(bookmarksChanged(QString)));
}
diff --git a/src/bookmarks/bookmarkstreemodel.h b/src/bookmarks/bookmarkstreemodel.h
index 38579b0a..f433ccaf 100644
--- a/src/bookmarks/bookmarkstreemodel.h
+++ b/src/bookmarks/bookmarkstreemodel.h
@@ -3,7 +3,7 @@
* This file is a part of the rekonq project
*
* Copyright (C) 2009 by Nils Weigel <nehlsen at gmail dot com>
-* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index 3980cc05..6241394a 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2012 by Andrea Diamantini <adjam7 at gmail dot com>
* Copyright (C) 2011 by Pierre Rossi <pierre dot rossi at gmail dot com>
*
*
@@ -189,8 +189,8 @@ bool DownloadManager::downloadResource(const KUrl &srcUrl, const KIO::MetaData &
KIO::Job *job = KIO::copy(srcUrl, destUrl, KIO::Overwrite);
if (item)
{
- QObject::connect(job, SIGNAL(percent(KJob *, unsigned long)), item, SLOT(updateProgress(KJob *, unsigned long)));
- QObject::connect(job, SIGNAL(finished(KJob *)), item, SLOT(onFinished(KJob*)));
+ QObject::connect(job, SIGNAL(percent(KJob*, ulong)), item, SLOT(updateProgress(KJob*, ulong)));
+ QObject::connect(job, SIGNAL(finished(KJob*)), item, SLOT(onFinished(KJob*)));
}
if (!metaData.isEmpty())
diff --git a/src/downloadmanager.h b/src/downloadmanager.h
index e450d261..2eee1924 100644
--- a/src/downloadmanager.h
+++ b/src/downloadmanager.h
@@ -3,6 +3,7 @@
* This file is a part of the rekonq project
*
* Copyright (C) 2011 by Pierre Rossi <pierre dot rossi at gmail dot com>
+* Copyright (C) 2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
diff --git a/src/findbar.cpp b/src/findbar.cpp
index 26ec37a3..889d3921 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2008-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2012 by Andrea Diamantini <adjam7 at gmail dot com>
* Copyright (C) 2009-2011 by Lionel Chauvin <megabigbug@yahoo.fr>
*
*
@@ -84,7 +84,7 @@ FindBar::FindBar(MainWindow *window)
// lineEdit, focusProxy
setFocusProxy(m_lineEdit);
m_lineEdit->setMaximumWidth(250);
- connect(m_lineEdit, SIGNAL(textChanged(const QString &)), window, SLOT(find(const QString &)));
+ connect(m_lineEdit, SIGNAL(textChanged(QString)), window, SLOT(find(QString)));
layout->addWidget(m_lineEdit);
// buttons
diff --git a/src/findbar.h b/src/findbar.h
index 117e2e3c..2b1ec602 100644
--- a/src/findbar.h
+++ b/src/findbar.h
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2008-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2012 by Andrea Diamantini <adjam7 at gmail dot com>
* Copyright (C) 2009-2011 by Lionel Chauvin <megabigbug@yahoo.fr>
*
*
diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp
index d4cb0f24..602e4606 100644
--- a/src/history/historymanager.cpp
+++ b/src/history/historymanager.cpp
@@ -4,7 +4,7 @@
*
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 Benjamin C. Meyer <ben@meyerhome.net>
-* Copyright (C) 2008-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
@@ -68,8 +68,8 @@ HistoryManager::HistoryManager(QObject *parent)
, m_historyLimit(0)
, m_historyTreeModel(0)
{
- connect(this, SIGNAL(entryAdded(const HistoryItem &)), m_saveTimer, SLOT(changeOccurred()));
- connect(this, SIGNAL(entryRemoved(const HistoryItem &)), m_saveTimer, SLOT(changeOccurred()));
+ connect(this, SIGNAL(entryAdded(HistoryItem)), m_saveTimer, SLOT(changeOccurred()));
+ connect(this, SIGNAL(entryRemoved(HistoryItem)), m_saveTimer, SLOT(changeOccurred()));
connect(m_saveTimer, SIGNAL(saveNeeded()), this, SLOT(save()));
load();
diff --git a/src/history/historymanager.h b/src/history/historymanager.h
index cfc875af..b28dfcdc 100644
--- a/src/history/historymanager.h
+++ b/src/history/historymanager.h
@@ -4,7 +4,7 @@
*
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 Benjamin C. Meyer <ben@meyerhome.net>
-* Copyright (C) 2008-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
diff --git a/src/history/historymodels.cpp b/src/history/historymodels.cpp
index cb8ee20c..f31d90d3 100644
--- a/src/history/historymodels.cpp
+++ b/src/history/historymodels.cpp
@@ -4,7 +4,7 @@
*
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 Benjamin C. Meyer <ben@meyerhome.net>
-* Copyright (C) 2008-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
@@ -64,8 +64,8 @@ HistoryModel::HistoryModel(HistoryManager *history, QObject *parent)
{
Q_ASSERT(m_historyManager);
connect(m_historyManager, SIGNAL(historyReset()), this, SLOT(historyReset()));
- connect(m_historyManager, SIGNAL(entryRemoved(const HistoryItem &)), this, SLOT(historyReset()));
- connect(m_historyManager, SIGNAL(entryAdded(const HistoryItem &)), this, SLOT(entryAdded()));
+ connect(m_historyManager, SIGNAL(entryRemoved(HistoryItem)), this, SLOT(historyReset()));
+ connect(m_historyManager, SIGNAL(entryAdded(HistoryItem)), this, SLOT(entryAdded()));
connect(m_historyManager, SIGNAL(entryUpdated(int)), this, SLOT(entryUpdated(int)));
}
@@ -230,12 +230,12 @@ void HistoryFilterModel::setSourceModel(QAbstractItemModel *newSourceModel)
if (sourceModel())
{
disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
- disconnect(sourceModel(), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
- this, SLOT(dataChanged(const QModelIndex &, const QModelIndex &)));
- disconnect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
- this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
- disconnect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
- this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
+ disconnect(sourceModel(), SIGNAL(dataChanged(QModelIndex, QModelIndex)),
+ this, SLOT(dataChanged(QModelIndex, QModelIndex)));
+ disconnect(sourceModel(), SIGNAL(rowsInserted(QModelIndex, int, int)),
+ this, SLOT(sourceRowsInserted(QModelIndex, int, int)));
+ disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)),
+ this, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
}
QAbstractProxyModel::setSourceModel(newSourceModel);
@@ -244,12 +244,12 @@ void HistoryFilterModel::setSourceModel(QAbstractItemModel *newSourceModel)
{
m_loaded = false;
connect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
- connect(sourceModel(), SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
- this, SLOT(sourceDataChanged(const QModelIndex &, const QModelIndex &)));
- connect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
- this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
- connect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
- this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
+ connect(sourceModel(), SIGNAL(dataChanged(QModelIndex, QModelIndex)),
+ this, SLOT(sourceDataChanged(QModelIndex, QModelIndex)));
+ connect(sourceModel(), SIGNAL(rowsInserted(QModelIndex, int, int)),
+ this, SLOT(sourceRowsInserted(QModelIndex, int, int)));
+ connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)),
+ this, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
}
}
@@ -411,16 +411,16 @@ bool HistoryFilterModel::removeRows(int row, int count, const QModelIndex &paren
if (row < 0 || count <= 0 || row + count > rowCount(parent) || parent.isValid())
return false;
int lastRow = row + count - 1;
- disconnect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
- this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
+ disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)),
+ this, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
beginRemoveRows(parent, row, lastRow);
int oldCount = rowCount();
int start = sourceModel()->rowCount() - m_sourceRow.value(row);
int end = sourceModel()->rowCount() - m_sourceRow.value(lastRow);
sourceModel()->removeRows(start, end - start + 1);
endRemoveRows();
- connect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
- this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
+ connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)),
+ this, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
m_loaded = false;
if (oldCount - count != rowCount())
reset();
@@ -631,10 +631,10 @@ void HistoryTreeModel::setSourceModel(QAbstractItemModel *newSourceModel)
{
disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
disconnect(sourceModel(), SIGNAL(layoutChanged()), this, SLOT(sourceReset()));
- disconnect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
- this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
- disconnect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
- this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
+ disconnect(sourceModel(), SIGNAL(rowsInserted(QModelIndex, int, int)),
+ this, SLOT(sourceRowsInserted(QModelIndex, int, int)));
+ disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)),
+ this, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
}
QAbstractProxyModel::setSourceModel(newSourceModel);
@@ -643,10 +643,10 @@ void HistoryTreeModel::setSourceModel(QAbstractItemModel *newSourceModel)
{
connect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
connect(sourceModel(), SIGNAL(layoutChanged()), this, SLOT(sourceReset()));
- connect(sourceModel(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),
- this, SLOT(sourceRowsInserted(const QModelIndex &, int, int)));
- connect(sourceModel(), SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
- this, SLOT(sourceRowsRemoved(const QModelIndex &, int, int)));
+ connect(sourceModel(), SIGNAL(rowsInserted(QModelIndex, int, int)),
+ this, SLOT(sourceRowsInserted(QModelIndex, int, int)));
+ connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)),
+ this, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
}
reset();
diff --git a/src/history/historymodels.h b/src/history/historymodels.h
index 7388cef5..9c3bfc36 100644
--- a/src/history/historymodels.h
+++ b/src/history/historymodels.h
@@ -4,7 +4,7 @@
*
* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
* Copyright (C) 2008 Benjamin C. Meyer <ben@meyerhome.net>
-* Copyright (C) 2008-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
diff --git a/src/mainview.cpp b/src/mainview.cpp
index c7cfce0c..438f885a 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -246,16 +246,16 @@ void MainView::currentChanged(int index)
if (oldTab)
{
// disconnecting webpage from mainview
- disconnect(oldTab->page(), SIGNAL(statusBarMessage(const QString&)),
- this, SIGNAL(showStatusBarMessage(const QString&)));
- disconnect(oldTab->page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)),
- this, SIGNAL(linkHovered(const QString&)));
+ disconnect(oldTab->page(), SIGNAL(statusBarMessage(QString)),
+ this, SIGNAL(showStatusBarMessage(QString)));
+ disconnect(oldTab->page(), SIGNAL(linkHovered(QString, QString, QString)),
+ this, SIGNAL(linkHovered(QString)));
}
- connect(tab->page(), SIGNAL(statusBarMessage(const QString&)),
- this, SIGNAL(showStatusBarMessage(const QString&)));
- connect(tab->page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)),
- this, SIGNAL(linkHovered(const QString&)));
+ connect(tab->page(), SIGNAL(statusBarMessage(QString)),
+ this, SIGNAL(showStatusBarMessage(QString)));
+ connect(tab->page(), SIGNAL(linkHovered(QString, QString, QString)),
+ this, SIGNAL(linkHovered(QString)));
emit currentTitle(tab->view()->title());
m_widgetBar->setCurrentIndex(index);
@@ -296,15 +296,15 @@ WebTab *MainView::newWebTab(bool focused)
// connecting webview with mainview
connect(tab->view(), SIGNAL(loadStarted()), this, SLOT(webViewLoadStarted()));
connect(tab->view(), SIGNAL(loadFinished(bool)), this, SLOT(webViewLoadFinished(bool)));
- connect(tab, SIGNAL(titleChanged(const QString &)), this, SLOT(webViewTitleChanged(const QString &)));
- connect(tab->view(), SIGNAL(urlChanged(const QUrl &)), this, SLOT(webViewUrlChanged(const QUrl &)));
+ connect(tab, SIGNAL(titleChanged(QString)), this, SLOT(webViewTitleChanged(QString)));
+ connect(tab->view(), SIGNAL(urlChanged(QUrl)), this, SLOT(webViewUrlChanged(QUrl)));
connect(tab->view(), SIGNAL(iconChanged()), this, SLOT(webViewIconChanged()));
connect(tab->view(), SIGNAL(openPreviousInHistory()), this, SIGNAL(openPreviousInHistory()));
connect(tab->view(), SIGNAL(openNextInHistory()), this, SIGNAL(openNextInHistory()));
// connecting webPage signals with mainview
connect(tab->page(), SIGNAL(windowCloseRequested()), this, SLOT(windowCloseRequested()));
- connect(tab->page(), SIGNAL(printRequested(QWebFrame *)), this, SIGNAL(printRequested(QWebFrame *)));
+ connect(tab->page(), SIGNAL(printRequested(QWebFrame*)), this, SIGNAL(printRequested(QWebFrame*)));
bool openNearCurrent = true;
if (sender())
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 76495aff..6bb394c6 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -180,14 +180,14 @@ MainWindow::MainWindow()
connect(m_hidePopupTimer, SIGNAL(timeout()), m_popup, SLOT(hide()));
// notification system
- connect(m_view, SIGNAL(showStatusBarMessage(const QString&, Rekonq::Notify)), this, SLOT(notifyMessage(const QString&, Rekonq::Notify)));
- connect(m_view, SIGNAL(linkHovered(const QString&)), this, SLOT(notifyMessage(const QString&)));
- connect(rApp->downloadManager(), SIGNAL(notifyDownload(const QString&, Rekonq::Notify)),
- this, SLOT(notifyMessage(const QString&, Rekonq::Notify)));
+ connect(m_view, SIGNAL(showStatusBarMessage(QString, Rekonq::Notify)), this, SLOT(notifyMessage(QString, Rekonq::Notify)));
+ connect(m_view, SIGNAL(linkHovered(QString)), this, SLOT(notifyMessage(QString)));
+ connect(rApp->downloadManager(), SIGNAL(notifyDownload(QString, Rekonq::Notify)),
+ this, SLOT(notifyMessage(QString, Rekonq::Notify)));
// connect signals and slots
- connect(m_view, SIGNAL(currentTitle(const QString &)), this, SLOT(updateWindowTitle(const QString &)));
- connect(m_view, SIGNAL(printRequested(QWebFrame *)), this, SLOT(printRequested(QWebFrame *)));
+ connect(m_view, SIGNAL(currentTitle(QString)), this, SLOT(updateWindowTitle(QString)));
+ connect(m_view, SIGNAL(printRequested(QWebFrame*)), this, SLOT(printRequested(QWebFrame*)));
connect(m_view, SIGNAL(closeWindow()), this, SLOT(close()));
// (shift +) ctrl + tab switching
@@ -206,7 +206,7 @@ MainWindow::MainWindow()
connect(m_view, SIGNAL(currentChanged(int)), this, SLOT(changeWindowIcon(int)));
// Find Bar signal
- connect(m_findBar, SIGNAL(searchString(const QString &)), this, SLOT(find(const QString &)));
+ connect(m_findBar, SIGNAL(searchString(QString)), this, SLOT(find(QString)));
// Zoom Bar signal
connect(m_view, SIGNAL(currentChanged(int)), m_zoomBar, SLOT(updateSlider(int)));
@@ -422,7 +422,7 @@ void MainWindow::setupActions()
m_historyBackMenu = new KMenu(this);
a->setMenu(m_historyBackMenu);
connect(m_historyBackMenu, SIGNAL(aboutToShow()), this, SLOT(aboutToShowBackMenu()));
- connect(m_historyBackMenu, SIGNAL(triggered(QAction *)), this, SLOT(openActionUrl(QAction *)));
+ connect(m_historyBackMenu, SIGNAL(triggered(QAction*)), this, SLOT(openActionUrl(QAction*)));
a = actionCollection()->addAction(KStandardAction::Forward);
connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)),
@@ -431,7 +431,7 @@ void MainWindow::setupActions()
m_historyForwardMenu = new KMenu(this);
a->setMenu(m_historyForwardMenu);
connect(m_historyForwardMenu, SIGNAL(aboutToShow()), this, SLOT(aboutToShowForwardMenu()));
- connect(m_historyForwardMenu, SIGNAL(triggered(QAction *)), this, SLOT(openActionUrl(QAction*)));
+ connect(m_historyForwardMenu, SIGNAL(triggered(QAction*)), this, SLOT(openActionUrl(QAction*)));
// ============================== General Tab Actions ====================================
a = new KAction(KIcon("tab-new"), i18n("New &Tab"), this);
@@ -469,7 +469,7 @@ void MainWindow::setupActions()
connect(a, SIGNAL(triggered(bool)), tabSignalMapper, SLOT(map()));
tabSignalMapper->setMapping(a, i);
}
- connect(tabSignalMapper, SIGNAL(mapped(const int)), m_view, SLOT(switchToTab(const int)));
+ connect(tabSignalMapper, SIGNAL(mapped(int)), m_view, SLOT(switchToTab(int)));
// shortcuts for loading favorite pages
QSignalMapper *favoritesSignalMapper = new QSignalMapper(this);
@@ -481,7 +481,7 @@ void MainWindow::setupActions()
connect(a, SIGNAL(triggered(bool)), favoritesSignalMapper, SLOT(map()));
favoritesSignalMapper->setMapping(a, i);
}
- connect(favoritesSignalMapper, SIGNAL(mapped(const int)), m_view, SLOT(loadFavorite(const int)));
+ connect(favoritesSignalMapper, SIGNAL(mapped(int)), m_view, SLOT(loadFavorite(int)));
// ============================== Indexed Tab Actions ====================================
a = new KAction(KIcon("tab-close"), i18n("&Close Tab"), this);
@@ -571,8 +571,8 @@ void MainWindow::setupPanels()
// Setup history panel
const QString historyTitle = i18n("History Panel");
m_historyPanel = new HistoryPanel(historyTitle, this);
- connect(m_historyPanel, SIGNAL(openUrl(const KUrl&, const Rekonq::OpenType &)),
- rApp, SLOT(loadUrl(const KUrl&, const Rekonq::OpenType &)));
+ connect(m_historyPanel, SIGNAL(openUrl(KUrl, Rekonq::OpenType)),
+ rApp, SLOT(loadUrl(KUrl, Rekonq::OpenType)));
connect(m_historyPanel, SIGNAL(itemHovered(QString)), this, SLOT(notifyMessage(QString)));
connect(m_historyPanel, SIGNAL(destroyed()), rApp, SLOT(saveConfiguration()));
@@ -589,8 +589,8 @@ void MainWindow::setupPanels()
// Setup bookmarks panel
const QString bookmarksTitle = i18n("Bookmarks Panel");
m_bookmarksPanel = new BookmarksPanel(bookmarksTitle, this);
- connect(m_bookmarksPanel, SIGNAL(openUrl(const KUrl&, const Rekonq::OpenType &)),
- rApp, SLOT(loadUrl(const KUrl&, const Rekonq::OpenType &)));
+ connect(m_bookmarksPanel, SIGNAL(openUrl(KUrl, Rekonq::OpenType)),
+ rApp, SLOT(loadUrl(KUrl, Rekonq::OpenType)));
connect(m_bookmarksPanel, SIGNAL(itemHovered(QString)), this, SLOT(notifyMessage(QString)));
connect(m_bookmarksPanel, SIGNAL(destroyed()), rApp, SLOT(saveConfiguration()));
@@ -732,7 +732,7 @@ void MainWindow::preferences()
QPointer<SettingsDialog> s = new SettingsDialog(this);
// keep us informed when the user changes settings
- connect(s, SIGNAL(settingsChanged(const QString&)), rApp, SLOT(updateConfiguration()));
+ connect(s, SIGNAL(settingsChanged(QString)), rApp, SLOT(updateConfiguration()));
s->exec();
delete s;
@@ -834,7 +834,7 @@ void MainWindow::printRequested(QWebFrame *frame)
QPrinter printer;
QPrintPreviewDialog previewdlg(&printer, this);
- connect(&previewdlg, SIGNAL(paintRequested(QPrinter *)), printFrame, SLOT(print(QPrinter *)));
+ connect(&previewdlg, SIGNAL(paintRequested(QPrinter*)), printFrame, SLOT(print(QPrinter*)));
previewdlg.exec();
}
diff --git a/src/opensearch/opensearchmanager.cpp b/src/opensearch/opensearchmanager.cpp
index 916ac80e..7eea3c7b 100644
--- a/src/opensearch/opensearchmanager.cpp
+++ b/src/opensearch/opensearchmanager.cpp
@@ -4,7 +4,7 @@
*
* Copyright (C) 2009 by Fredy Yanardi <fyanardi@gmail.com>
* Copyright (C) 2010-2011 by Lionel Chauvin <megabigbug@yahoo.fr>
-* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
@@ -127,8 +127,8 @@ void OpenSearchManager::addOpenSearchEngine(const KUrl &url, const QString &titl
m_currentJob = KIO::get(url, KIO::NoReload, KIO::HideProgressInfo);
m_jobUrl = url;
m_state = REQ_DESCRIPTION;
- connect(m_currentJob, SIGNAL(data(KIO::Job *, const QByteArray &)), this, SLOT(dataReceived(KIO::Job *, const QByteArray &)));
- connect(m_currentJob, SIGNAL(result(KJob *)), this, SLOT(jobFinished(KJob *)));
+ connect(m_currentJob, SIGNAL(data(KIO::Job*, QByteArray)), this, SLOT(dataReceived(KIO::Job*, QByteArray)));
+ connect(m_currentJob, SIGNAL(result(KJob*)), this, SLOT(jobFinished(KJob*)));
}
void OpenSearchManager::requestSuggestion(const QString &searchText)
@@ -155,8 +155,8 @@ void OpenSearchManager::requestSuggestion(const QString &searchText)
_typedText = searchText;
m_currentJob = KIO::get(url, KIO::NoReload, KIO::HideProgressInfo);
m_state = REQ_SUGGESTION;
- connect(m_currentJob, SIGNAL(data(KIO::Job *, const QByteArray &)), this, SLOT(dataReceived(KIO::Job *, const QByteArray &)));
- connect(m_currentJob, SIGNAL(result(KJob *)), this, SLOT(jobFinished(KJob *)));
+ connect(m_currentJob, SIGNAL(data(KIO::Job*, QByteArray)), this, SLOT(dataReceived(KIO::Job*, QByteArray)));
+ connect(m_currentJob, SIGNAL(result(KJob*)), this, SLOT(jobFinished(KJob*)));
}
}
diff --git a/src/opensearch/opensearchmanager.h b/src/opensearch/opensearchmanager.h
index 6f4f4190..84272f26 100644
--- a/src/opensearch/opensearchmanager.h
+++ b/src/opensearch/opensearchmanager.h
@@ -4,7 +4,7 @@
*
* Copyright (C) 2009 by Fredy Yanardi <fyanardi@gmail.com>
* Copyright (C) 2010-2011 by Lionel Chauvin <megabigbug@yahoo.fr>
-* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010-2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
diff --git a/src/paneltreeview.cpp b/src/paneltreeview.cpp
index d183035a..575b4412 100644
--- a/src/paneltreeview.cpp
+++ b/src/paneltreeview.cpp
@@ -3,6 +3,7 @@
* This file is a part of the rekonq project
*
* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
+* Copyright (C) 2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
@@ -42,8 +43,8 @@
PanelTreeView::PanelTreeView(QWidget *parent)
: QTreeView(parent)
{
- connect(this, SIGNAL(itemHovered(const QString &)), parent, SIGNAL(itemHovered(const QString &)));
- connect(this, SIGNAL(openUrl(const KUrl &, Rekonq::OpenType)), parent, SIGNAL(openUrl(const KUrl &, Rekonq::OpenType)));
+ connect(this, SIGNAL(itemHovered(QString)), parent, SIGNAL(itemHovered(QString)));
+ connect(this, SIGNAL(openUrl(KUrl, Rekonq::OpenType)), parent, SIGNAL(openUrl(KUrl, Rekonq::OpenType)));
setMouseTracking(true);
setExpandsOnDoubleClick(false);
}
diff --git a/src/paneltreeview.h b/src/paneltreeview.h
index ba499e14..921fe3f2 100644
--- a/src/paneltreeview.h
+++ b/src/paneltreeview.h
@@ -3,6 +3,7 @@
* This file is a part of the rekonq project
*
* Copyright (C) 2010-2011 by Yoann Laissus <yoann dot laissus at gmail dot com>
+* Copyright (C) 2012 by Andrea Diamantini <adjam7 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index 9489f025..bade99cb 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -222,7 +222,7 @@ bool ProtocolHandler::postHandling(const QNetworkRequest &request, QWebFrame *fr
QFileInfo fileInfo(_url.path());
if (fileInfo.isDir())
{
- connect(_lister, SIGNAL(newItems(const KFileItemList &)), this, SLOT(showResults(const KFileItemList &)));
+ connect(_lister, SIGNAL(newItems(KFileItemList)), this, SLOT(showResults(KFileItemList)));
_lister->openUrl(_url);
return true;
@@ -349,7 +349,7 @@ void ProtocolHandler::slotMostLocalUrlResult(KJob *job)
KIO::UDSEntry entry = statJob->statResult();
if (entry.isDir())
{
- connect(_lister, SIGNAL(newItems(const KFileItemList &)), this, SLOT(showResults(const KFileItemList &)));
+ connect(_lister, SIGNAL(newItems(KFileItemList)), this, SLOT(showResults(KFileItemList)));
_lister->openUrl(_url);
}
else
diff --git a/src/settings/adblockwidget.cpp b/src/settings/adblockwidget.cpp
deleted file mode 100644
index 17f05e75..00000000
--- a/src/settings/adblockwidget.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-/* ============================================================
-*
-* This file is a part of the rekonq project
-*
-* Copyright (C) 2010-2011 by Andrea Diamantini <adjam7 at gmail dot com>
-*
-*
-* 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 <http://www.gnu.org/licenses/>.
-*
-* ============================================================ */
-
-
-// Self Includes
-#include "adblockwidget.h"
-#include "adblockwidget.moc"
-
-// Auto Includes
-#include "rekonq.h"
-
-// KDE Includes
-#include <KSharedConfig>
-#include <KIcon>
-#include <KDebug>
-
-// Qt Includes
-#include <QString>
-#include <QWhatsThis>
-#include <QListWidgetItem>
-
-
-AdBlockWidget::AdBlockWidget(QWidget *parent)
- : QWidget(parent)
- , _changed(false)
-{
- setupUi(this);
-
- hintLabel->setText(i18n("<qt>Filter expression (e.g. <tt>http://www.example.com/ad/*</tt>, <a href=\"filterhelp\">more information</a>):"));
- connect(hintLabel, SIGNAL(linkActivated(const QString &)), this, SLOT(slotInfoLinkActivated(const QString &)));
-
- listWidget->setSortingEnabled(true);
- listWidget->setSelectionMode(QAbstractItemView::SingleSelection);
-
- searchLine->setListWidget(listWidget);
-
- insertButton->setIcon(KIcon("list-add"));
- connect(insertButton, SIGNAL(clicked()), this, SLOT(insertRule()));
-
- removeButton->setIcon(KIcon("list-remove"));
- connect(removeButton, SIGNAL(clicked()), this, SLOT(removeRule()));
-
- load();
-
- spinBox->setSuffix(ki18np(" day", " days"));
-
- // emit changed signal
- connect(insertButton, SIGNAL(clicked()), this, SLOT(hasChanged()));
- connect(removeButton, SIGNAL(clicked()), this, SLOT(hasChanged()));
- connect(checkEnableAdblock, SIGNAL(stateChanged(int)), this, SLOT(hasChanged()));
- connect(checkHideAds, SIGNAL(stateChanged(int)), this, SLOT(hasChanged()));
- connect(spinBox, SIGNAL(valueChanged(int)), this, SLOT(hasChanged()));
-}
-
-
-void AdBlockWidget::slotInfoLinkActivated(const QString &url)
-{
- Q_UNUSED(url)
-
- QString hintHelpString = i18n("<qt><p>Enter an expression to filter. Filters can be defined as either:"
- "<ul><li>a shell-style wildcard, e.g. <tt>http://www.example.com/ads*</tt>, the wildcards <tt>*?[]</tt> may be used</li>"
- "<li>a full regular expression by surrounding the string with '<tt>/</tt>', e.g. <tt>/\\/(ad|banner)\\./</tt></li></ul>"
- "<p>Any filter string can be preceded by '<tt>@@</tt>' to whitelist (allow) any matching URL, "
- "which takes priority over any blacklist (blocking) filter.");
-
- QWhatsThis::showText(QCursor::pos(), hintHelpString);
-}
-
-
-void AdBlockWidget::insertRule()
-{
- QString rule = addFilterLineEdit->text();
- if (rule.isEmpty())
- return;
-
- listWidget->addItem(rule);
- addFilterLineEdit->clear();
-}
-
-
-void AdBlockWidget::removeRule()
-{
- listWidget->takeItem(listWidget->currentRow());
-}
-
-
-void AdBlockWidget::load()
-{
- bool isAdBlockEnabled = ReKonfig::adBlockEnabled();
- checkEnableAdblock->setChecked(isAdBlockEnabled);
- // update enabled status
- checkHideAds->setEnabled(checkEnableAdblock->isChecked());
- tabWidget->setEnabled(checkEnableAdblock->isChecked());
-
- bool areImageFiltered = ReKonfig::hideAdsEnabled();
- checkHideAds->setChecked(areImageFiltered);
-
- int days = ReKonfig::updateInterval();
- spinBox->setValue(days);
-
- QStringList subscriptions = ReKonfig::subscriptionTitles();
-
- // load automatic rules
- Q_FOREACH(const QString & sub, subscriptions)
- {
- QTreeWidgetItem *subItem = new QTreeWidgetItem(treeWidget);
- subItem->setText(0, sub);
- loadRules(subItem);
- }
-
- // load local rules
- KSharedConfig::Ptr config = KSharedConfig::openConfig("adblock", KConfig::SimpleConfig, "appdata");
- KConfigGroup localGroup(config, "rules");
- QStringList rules = localGroup.readEntry("local-rules" , QStringList());
- Q_FOREACH(const QString & rule, rules)
- {
- listWidget->addItem(rule);
- }
-}
-
-
-void AdBlockWidget::loadRules(QTreeWidgetItem *item)
-{
- KSharedConfig::Ptr config = KSharedConfig::openConfig("adblock", KConfig::SimpleConfig, "appdata");
- KConfigGroup localGroup(config, "rules");
-
- QString str = item->text(0) + "-rules";
- QStringList rules = localGroup.readEntry(str , QStringList());
-
- Q_FOREACH(const QString & rule, rules)
- {
- QTreeWidgetItem *subItem = new QTreeWidgetItem(item);
- subItem->setText(0, rule);
- }
-}
-
-
-void AdBlockWidget::save()
-{
- int n;
-
- // local rules
- KSharedConfig::Ptr config = KSharedConfig::openConfig("adblock", KConfig::SimpleConfig, "appdata");
- KConfigGroup localGroup(config , "rules");
-
- QStringList localRules;
-
- n = listWidget->count();
- for (int i = 0; i < n; ++i)
- {
- QListWidgetItem *item = listWidget->item(i);
- localRules << item->text();
- }
- localGroup.writeEntry("local-rules" , localRules);
-
- ReKonfig::setAdBlockEnabled(checkEnableAdblock->isChecked()); // TODO: REMOVE ME!!!!
- ReKonfig::setHideAdsEnabled(checkHideAds->isChecked());
- ReKonfig::setUpdateInterval(spinBox->value());
-
- _changed = false;
- emit changed(false);
-}
-
-
-void AdBlockWidget::hasChanged()
-{
- // update enabled status
- checkHideAds->setEnabled(checkEnableAdblock->isChecked());
- tabWidget->setEnabled(checkEnableAdblock->isChecked());
- _changed = true;
- emit changed(true);
-}
-
-
-bool AdBlockWidget::changed()
-{
- return _changed;
-}
diff --git a/src/settings/appearancewidget.cpp b/src/settings/appearancewidget.cpp
index df28989e..42c9db14 100644
--- a/src/settings/appearancewidget.cpp
+++ b/src/settings/appearancewidget.cpp
@@ -50,12 +50,12 @@ AppearanceWidget::AppearanceWidget(QWidget *parent)
cursiveFontChooser->setCurrentFont(QFont(ReKonfig::cursiveFontFamily()));
fantasyFontChooser->setCurrentFont(QFont(ReKonfig::fantasyFontFamily()));
- connect(standardFontChooser, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(hasChanged()));
- connect(fixedFontChooser, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(hasChanged()));
- connect(serifFontChooser, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(hasChanged()));
- connect(sansSerifFontChooser, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(hasChanged()));
- connect(cursiveFontChooser, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(hasChanged()));
- connect(fantasyFontChooser, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(hasChanged()));
+ connect(standardFontChooser, SIGNAL(currentFontChanged(QFont)), this, SLOT(hasChanged()));
+ connect(fixedFontChooser, SIGNAL(currentFontChanged(QFont)), this, SLOT(hasChanged()));
+ connect(serifFontChooser, SIGNAL(currentFontChanged(QFont)), this, SLOT(hasChanged()));
+ connect(sansSerifFontChooser, SIGNAL(currentFontChanged(QFont)), this, SLOT(hasChanged()));
+ connect(cursiveFontChooser, SIGNAL(currentFontChanged(QFont)), this, SLOT(hasChanged()));
+ connect(fantasyFontChooser, SIGNAL(currentFontChanged(QFont)), this, SLOT(hasChanged()));
populateEncodingMenu();
}
@@ -104,8 +104,8 @@ void AppearanceWidget::populateEncodingMenu()
encodingCombo->setWhatsThis(i18n("Select the default encoding to be used; normally, you will be fine with 'Use language encoding' "
"and should not have to change this."));
- connect(encodingCombo, SIGNAL(activated(const QString &)), this, SLOT(setEncoding(const QString &)));
- connect(encodingCombo, SIGNAL(activated(const QString &)), this, SLOT(hasChanged()));
+ connect(encodingCombo, SIGNAL(activated(QString)), this, SLOT(setEncoding(QString)));
+ connect(encodingCombo, SIGNAL(activated(QString)), this, SLOT(hasChanged()));
QString enc = ReKonfig::defaultEncoding();
int indexOfEnc = encodings.indexOf(enc);
diff --git a/src/sslinfodialog.cpp b/src/sslinfodialog.cpp
index f4c7d871..892bae27 100644
--- a/src/sslinfodialog.cpp
+++ b/src/sslinfodialog.cpp
@@ -154,7 +154,7 @@ QList<QStringList> SslInfoDialog::errorsFromString(const QString &s)
Q_FOREACH(const QString & certErrors, sl1)
{
QStringList errors;
- QStringList sl = certErrors.split("\t", QString::SkipEmptyParts);
+ QStringList sl = certErrors.split('\t', QString::SkipEmptyParts);
Q_FOREACH(const QString & s, sl)
{
bool didConvert;
diff --git a/src/sync/ftpsynchandler.cpp b/src/sync/ftpsynchandler.cpp
index fc4bdd4c..dcff4eb5 100644
--- a/src/sync/ftpsynchandler.cpp
+++ b/src/sync/ftpsynchandler.cpp
@@ -70,7 +70,7 @@ void FTPSyncHandler::initialLoadAndCheck()
kDebug() << "LOCAL BK URL: " << _localBookmarksUrl;
KIO::StatJob *job = KIO::stat(_remoteBookmarksUrl, KIO::StatJob::DestinationSide, 0, KIO::HideProgressInfo);
- connect(job, SIGNAL(finished(KJob *)), this, SLOT(onBookmarksStatFinished(KJob *)));
+ connect(job, SIGNAL(finished(KJob*)), this, SLOT(onBookmarksStatFinished(KJob*)));
}
// History
@@ -90,7 +90,7 @@ void FTPSyncHandler::initialLoadAndCheck()
kDebug() << "LOCAL HISTORY URL: " << _localHistoryUrl;
KIO::StatJob *job = KIO::stat(_remoteHistoryUrl, KIO::StatJob::DestinationSide, 0, KIO::HideProgressInfo);
- connect(job, SIGNAL(finished(KJob *)), this, SLOT(onHistoryStatFinished(KJob *)));
+ connect(job, SIGNAL(finished(KJob*)), this, SLOT(onHistoryStatFinished(KJob*)));
}
// Passwords
@@ -110,7 +110,7 @@ void FTPSyncHandler::initialLoadAndCheck()
kDebug() << "LOCAL PSWD URL: " << _localPasswordsUrl;
KIO::StatJob *job = KIO::stat(_remotePasswordsUrl, KIO::StatJob::DestinationSide, 0, KIO::HideProgressInfo);
- connect(job, SIGNAL(finished(KJob *)), this, SLOT(onPasswordsStatFinished(KJob *)));
+ connect(job, SIGNAL(finished(KJob*)), this, SLOT(onPasswordsStatFinished(KJob*)));
}
}
@@ -138,7 +138,7 @@ void FTPSyncHandler::syncBookmarks()
return;
KIO::Job *job = KIO::file_copy(_localBookmarksUrl, _remoteBookmarksUrl, -1, KIO::HideProgressInfo | KIO::Overwrite);
- connect(job, SIGNAL(finished(KJob *)), this, SLOT(onBookmarksSyncFinished(KJob *)));
+ connect(job, SIGNAL(finished(KJob*)), this, SLOT(onBookmarksSyncFinished(KJob*)));
}
@@ -149,7 +149,7 @@ void FTPSyncHandler::onBookmarksStatFinished(KJob *job)
if (job->error() == KIO::ERR_DOES_NOT_EXIST)
{
KIO::Job *job = KIO::file_copy(_localBookmarksUrl, _remoteBookmarksUrl, -1, KIO::HideProgressInfo | KIO::Overwrite);
- connect(job, SIGNAL(finished(KJob *)), this, SLOT(onBookmarksSyncFinished(KJob *)));
+ connect(job, SIGNAL(finished(KJob*)), this, SLOT(onBookmarksSyncFinished(KJob*)));
emit syncStatus(Rekonq::Bookmarks, true, i18n("Remote bookmarks file does NOT exists. Exporting local copy..."));
_firstTimeSynced = true;
@@ -162,7 +162,7 @@ void FTPSyncHandler::onBookmarksStatFinished(KJob *job)
else
{
KIO::Job *job = KIO::file_copy(_remoteBookmarksUrl, _localBookmarksUrl, -1, KIO::HideProgressInfo | KIO::Overwrite);
- connect(job, SIGNAL(finished(KJob *)), this, SLOT(onBookmarksSyncFinished(KJob *)));
+ connect(job, SIGNAL(finished(KJob*)), this, SLOT(onBookmarksSyncFinished(KJob*)));
emit syncStatus(Rekonq::Bookmarks, true, i18n("Remote bookmarks file exists! Syncing local copy..."));
_firstTimeSynced = true;
@@ -194,7 +194,7 @@ void FTPSyncHandler::syncHistory()
return;
KIO::Job *job = KIO::file_copy(_localHistoryUrl, _remoteHistoryUrl, -1, KIO::HideProgressInfo | KIO::Overwrite);
- connect(job, SIGNAL(finished(KJob *)), this, SLOT(onHistorySyncFinished(KJob *)));
+ connect(job, SIGNAL(finished(KJob*)), this, SLOT(onHistorySyncFinished(KJob*)));
}
@@ -205,7 +205,7 @@ void FTPSyncHandler::onHistoryStatFinished(KJob *job)
if (job->error() == KIO::ERR_DOES_NOT_EXIST)
{
KIO::Job *job = KIO::file_copy(_localHistoryUrl, _remoteHistoryUrl, -1, KIO::HideProgressInfo | KIO::Overwrite);
- connect(job, SIGNAL(finished(KJob *)), this, SLOT(onHistorySyncFinished(KJob *)));
+ connect(job, SIGNAL(finished(KJob*)), this, SLOT(onHistorySyncFinished(KJob*)));
emit syncStatus(Rekonq::History, true, i18n("Remote history file does NOT exists. Exporting local copy..."));
_firstTimeSynced = true;
@@ -218,7 +218,7 @@ void FTPSyncHandler::onHistoryStatFinished(KJob *job)
else
{
KIO::Job *job = KIO::file_copy(_remoteHistoryUrl, _localHistoryUrl, -1, KIO::HideProgressInfo | KIO::Overwrite);
- connect(job, SIGNAL(finished(KJob *)), this, SLOT(onHistorySyncFinished(KJob *)));
+ connect(job, SIGNAL(finished(KJob*)), this, SLOT(onHistorySyncFinished(KJob*)));
emit syncStatus(Rekonq::History, true, i18n("Remote history file exists! Syncing local copy..."));
_firstTimeSynced = true;
@@ -250,7 +250,7 @@ void FTPSyncHandler::syncPasswords()
return;
KIO::Job *job = KIO::file_copy(_localPasswordsUrl, _remotePasswordsUrl, -1, KIO::HideProgressInfo | KIO::Overwrite);
- connect(job, SIGNAL(finished(KJob *)), this, SLOT(onPasswordsSyncFinished(KJob *)));
+ connect(job, SIGNAL(finished(KJob*)), this, SLOT(onPasswordsSyncFinished(KJob*)));
}
@@ -261,7 +261,7 @@ void FTPSyncHandler::onPasswordsStatFinished(KJob *job)
if (job->error() == KIO::ERR_DOES_NOT_EXIST)
{
KIO::Job *job = KIO::file_copy(_localPasswordsUrl, _remotePasswordsUrl, -1, KIO::HideProgressInfo | KIO::Overwrite);
- connect(job, SIGNAL(finished(KJob *)), this, SLOT(onPasswordsSyncFinished(KJob *)));
+ connect(job, SIGNAL(finished(KJob*)), this, SLOT(onPasswordsSyncFinished(KJob*)));
emit syncStatus(Rekonq::Passwords, true, i18n("Remote passwords file does NOT exists. Exporting local copy..."));
_firstTimeSynced = true;
@@ -274,7 +274,7 @@ void FTPSyncHandler::onPasswordsStatFinished(KJob *job)
else
{
KIO::Job *job = KIO::file_copy(_remotePasswordsUrl, _localPasswordsUrl, -1, KIO::HideProgressInfo | KIO::Overwrite);
- connect(job, SIGNAL(finished(KJob *)), this, SLOT(onPasswordsSyncFinished(KJob *)));
+ connect(job, SIGNAL(finished(KJob*)), this, SLOT(onPasswordsSyncFinished(KJob*)));
emit syncStatus(Rekonq::Passwords, true, i18n("Remote passwords file exists! Syncing local copy..."));
_firstTimeSynced = true;
diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index c0cfa896..74e549e5 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -82,8 +82,8 @@ TabBar::TabBar(QWidget *parent)
setContextMenuPolicy(Qt::CustomContextMenu);
- connect(this, SIGNAL(contextMenu(int, const QPoint &)), this, SLOT(contextMenu(int, const QPoint &)));
- connect(this, SIGNAL(emptyAreaContextMenu(const QPoint &)), this, SLOT(emptyAreaContextMenu(const QPoint &)));
+ connect(this, SIGNAL(contextMenu(int, QPoint)), this, SLOT(contextMenu(int, QPoint)));
+ connect(this, SIGNAL(emptyAreaContextMenu(QPoint)), this, SLOT(emptyAreaContextMenu(QPoint)));
connect(m_animationMapper, SIGNAL(mapped(int)), this, SLOT(removeAnimation(int)));
setGraphicsEffect(m_tabHighlightEffect);
@@ -498,7 +498,7 @@ void TabBar::dropEvent(QDropEvent* event)
int urlCount = event->mimeData()->urls().count();
if (urlCount > 1)
{
- Q_FOREACH(const QUrl url, event->mimeData()->urls())
+ Q_FOREACH(const QUrl & url, event->mimeData()->urls())
rApp->loadUrl(url, Rekonq::NewTab);
}
else
@@ -533,9 +533,9 @@ bool TabBar::isURLValid(const QString &url)
{
QString editedURL = url;
bool isValid = false;
- if (editedURL.startsWith("http://") || editedURL.startsWith("https://") || editedURL.startsWith("ftp://"))
+ if (editedURL.startsWith(QL1S("http://")) || editedURL.startsWith(QL1S("https://")) || editedURL.startsWith(QL1S("ftp://")))
editedURL = editedURL.remove(QRegExp("(http|https|ftp)://"));
- if (editedURL.contains('.') && editedURL.indexOf('.') > 0 && editedURL.indexOf('.') < editedURL.length() && !editedURL.trimmed().contains(" ")
+ if (editedURL.contains(QL1C('.')) && editedURL.indexOf(QL1C('.')) > 0 && editedURL.indexOf(QL1C('.')) < editedURL.length() && !editedURL.trimmed().contains(QL1C(' '))
&& QUrl::fromUserInput(editedURL).isValid())
isValid = true;
return isValid;
diff --git a/src/tests/mainview_test.cpp b/src/tests/mainview_test.cpp
index 141490ea..8426dba1 100644
--- a/src/tests/mainview_test.cpp
+++ b/src/tests/mainview_test.cpp
@@ -128,8 +128,8 @@ void MainViewTest::closeTab()
{
// QFETCH(int, index);
//
-// QSignalSpy spy1(view, SIGNAL(linkHovered(const QString &)));
-// QSignalSpy spy2(view, SIGNAL(setCurrentTitle(const QString &)));
+// QSignalSpy spy1(view, SIGNAL(linkHovered(QString)));
+// QSignalSpy spy2(view, SIGNAL(setCurrentTitle(QString)));
// QSignalSpy spy3(view, SIGNAL(tabsChanged()));
// QSignalSpy spy4(view, SIGNAL(lastTabClosed()));
//
@@ -162,10 +162,10 @@ void MainViewTest::currentWebView()
SubMainView widget;
- QSignalSpy spy0(view, SIGNAL(linkHovered(const QString &)));
+ QSignalSpy spy0(view, SIGNAL(linkHovered(QString)));
QSignalSpy spy2(view, SIGNAL(loadProgress(int)));
- QSignalSpy spy3(view, SIGNAL(setCurrentTitle(const QString &)));
- QSignalSpy spy4(view, SIGNAL(showStatusBarMessage(const QString &)));
+ QSignalSpy spy3(view, SIGNAL(setCurrentTitle(QString)));
+ QSignalSpy spy4(view, SIGNAL(showStatusBarMessage(QString)));
QSignalSpy spy5(view, SIGNAL(tabsChanged()));
QSignalSpy spy6(view, SIGNAL(lastTabClosed()));
@@ -194,9 +194,9 @@ void MainViewTest::newTab()
{
// QFETCH(int, foo);
//
-// QSignalSpy spy0(view, SIGNAL(linkHovered(const QString &)));
-// QSignalSpy spy1(view, SIGNAL(setCurrentTitle(const QString &)));
-// QSignalSpy spy2(view, SIGNAL(showStatusBarMessage(const QString &)));
+// QSignalSpy spy0(view, SIGNAL(linkHovered(QString)));
+// QSignalSpy spy1(view, SIGNAL(setCurrentTitle(QString)));
+// QSignalSpy spy2(view, SIGNAL(showStatusBarMessage(QString)));
// QSignalSpy spy3(view, SIGNAL(tabsChanged()));
// QSignalSpy spy4(view, SIGNAL(lastTabClosed()));
//
@@ -225,10 +225,10 @@ void MainViewTest::nextTab()
SubMainView widget;
- QSignalSpy spy0(view, SIGNAL(linkHovered(const QString &)));
+ QSignalSpy spy0(view, SIGNAL(linkHovered(QString)));
QSignalSpy spy2(view, SIGNAL(loadProgress(int)));
- QSignalSpy spy3(view, SIGNAL(setCurrentTitle(const QString &)));
- QSignalSpy spy4(view, SIGNAL(showStatusBarMessage(const QString &)));
+ QSignalSpy spy3(view, SIGNAL(setCurrentTitle(QString)));
+ QSignalSpy spy4(view, SIGNAL(showStatusBarMessage(QString)));
QSignalSpy spy5(view, SIGNAL(tabsChanged()));
QSignalSpy spy6(view, SIGNAL(lastTabClosed()));
@@ -261,10 +261,10 @@ void MainViewTest::previousTab()
SubMainView widget;
- QSignalSpy spy0(view, SIGNAL(linkHovered(const QString &)));
+ QSignalSpy spy0(view, SIGNAL(linkHovered(QString)));
QSignalSpy spy2(view, SIGNAL(loadProgress(int)));
- QSignalSpy spy3(view, SIGNAL(setCurrentTitle(const QString &)));
- QSignalSpy spy4(view, SIGNAL(showStatusBarMessage(const QString &)));
+ QSignalSpy spy3(view, SIGNAL(setCurrentTitle(QString)));
+ QSignalSpy spy4(view, SIGNAL(showStatusBarMessage(QString)));
QSignalSpy spy5(view, SIGNAL(tabsChanged()));
QSignalSpy spy6(view, SIGNAL(lastTabClosed()));
@@ -291,10 +291,10 @@ void MainViewTest::recentlyClosedTabs()
/*
SubMainView widget;
- QSignalSpy spy0(view, SIGNAL(linkHovered(const QString &)));
+ QSignalSpy spy0(view, SIGNAL(linkHovered(QString)));
QSignalSpy spy2(view, SIGNAL(loadProgress(int)));
- QSignalSpy spy3(view, SIGNAL(setCurrentTitle(const QString &)));
- QSignalSpy spy4(view, SIGNAL(showStatusBarMessage(const QString &)));
+ QSignalSpy spy3(view, SIGNAL(setCurrentTitle(QString)));
+ QSignalSpy spy4(view, SIGNAL(showStatusBarMessage(QString)));
QSignalSpy spy5(view, SIGNAL(tabsChanged()));
QSignalSpy spy6(view, SIGNAL(lastTabClosed()));
@@ -324,10 +324,10 @@ void MainViewTest::setCurrentTitle(const QString &)
SubMainView widget;
- QSignalSpy spy0(view, SIGNAL(linkHovered(const QString &)));
+ QSignalSpy spy0(view, SIGNAL(linkHovered(QString)));
QSignalSpy spy2(view, SIGNAL(loadProgress(int)));
- QSignalSpy spy3(view, SIGNAL(setCurrentTitle(const QString &)));
- QSignalSpy spy4(view, SIGNAL(showStatusBarMessage(const QString &)));
+ QSignalSpy spy3(view, SIGNAL(setCurrentTitle(QString)));
+ QSignalSpy spy4(view, SIGNAL(showStatusBarMessage(QString)));
QSignalSpy spy5(view, SIGNAL(tabsChanged()));
QSignalSpy spy6(view, SIGNAL(lastTabClosed()));
@@ -359,10 +359,10 @@ void MainViewTest::showStatusBarMessage(const QString &)
SubMainView widget;
- QSignalSpy spy0(view, SIGNAL(linkHovered(const QString &)));
+ QSignalSpy spy0(view, SIGNAL(linkHovered(QString)));
QSignalSpy spy2(view, SIGNAL(loadProgress(int)));
- QSignalSpy spy3(view, SIGNAL(setCurrentTitle(const QString &)));
- QSignalSpy spy4(view, SIGNAL(showStatusBarMessage(const QString &)));
+ QSignalSpy spy3(view, SIGNAL(setCurrentTitle(QString)));
+ QSignalSpy spy4(view, SIGNAL(showStatusBarMessage(QString)));
QSignalSpy spy5(view, SIGNAL(tabsChanged()));
QSignalSpy spy6(view, SIGNAL(lastTabClosed()));
@@ -393,10 +393,10 @@ void MainViewTest::currentChanged()
SubMainView widget;
- QSignalSpy spy0(view, SIGNAL(linkHovered(const QString &)));
+ QSignalSpy spy0(view, SIGNAL(linkHovered(QString)));
QSignalSpy spy2(view, SIGNAL(loadProgress(int)));
- QSignalSpy spy3(view, SIGNAL(setCurrentTitle(const QString &)));
- QSignalSpy spy4(view, SIGNAL(showStatusBarMessage(const QString &)));
+ QSignalSpy spy3(view, SIGNAL(setCurrentTitle(QString)));
+ QSignalSpy spy4(view, SIGNAL(showStatusBarMessage(QString)));
QSignalSpy spy5(view, SIGNAL(tabsChanged()));
QSignalSpy spy6(view, SIGNAL(lastTabClosed()));
diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index b349041d..33b2f3fb 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -73,9 +73,9 @@ void CompletionWidget::insertItems(const UrlSearchList &list, const QString& tex
ListItem *suggestion = ListItemFactory::create(item, text, this);
suggestion->setBackgroundRole(offset % 2 ? QPalette::AlternateBase : QPalette::Base);
connect(suggestion,
- SIGNAL(itemClicked(ListItem *, Qt::MouseButton, Qt::KeyboardModifiers)),
+ SIGNAL(itemClicked(ListItem*, Qt::MouseButton, Qt::KeyboardModifiers)),
this,
- SLOT(itemChosen(ListItem *, Qt::MouseButton, Qt::KeyboardModifiers)));
+ SLOT(itemChosen(ListItem*, Qt::MouseButton, Qt::KeyboardModifiers)));
connect(suggestion, SIGNAL(updateList()), this, SLOT(updateList()));
connect(this, SIGNAL(nextItemSubChoice()), suggestion, SLOT(nextItemSubChoice()));
@@ -384,8 +384,8 @@ void CompletionWidget::suggestUrls(const QString &text)
}
UrlResolver *res = new UrlResolver(text);
- connect(res, SIGNAL(suggestionsReady(const UrlSearchList &, const QString &)),
- this, SLOT(updateSearchList(const UrlSearchList &, const QString &)));
+ connect(res, SIGNAL(suggestionsReady(UrlSearchList, QString)),
+ this, SLOT(updateSearchList(UrlSearchList, QString)));
_resList = res->orderedSearchItems();
// NOTE: It's important to call this AFTER orderedSearchItems() to let everything work
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index b6cec8b5..d285e395 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -391,10 +391,10 @@ ImageLabel::ImageLabel(const QString &url, int width, int height, QWidget *paren
else
{
KIO::TransferJob *job = KIO::get(KUrl(url), KIO::NoReload, KIO::HideProgressInfo);
- connect(job, SIGNAL(data(KIO::Job *, const QByteArray &)),
- this, SLOT(slotData(KIO::Job*, const QByteArray&)));
- connect(job, SIGNAL(result(KJob *)),
- this, SLOT(slotResult(KJob *)));
+ connect(job, SIGNAL(data(KIO::Job*, QByteArray)),
+ this, SLOT(slotData(KIO::Job*, QByteArray)));
+ connect(job, SIGNAL(result(KJob*)),
+ this, SLOT(slotResult(KJob*)));
}
}
diff --git a/src/urlbar/sslwidget.cpp b/src/urlbar/sslwidget.cpp
index 708c1259..4dd5a4bf 100644
--- a/src/urlbar/sslwidget.cpp
+++ b/src/urlbar/sslwidget.cpp
@@ -113,7 +113,7 @@ SSLWidget::SSLWidget(const QUrl &url, const WebSslInfo &info, QWidget *parent)
label = new QLabel(this);
label->setWordWrap(true);
label->setText(QL1S("\"<a href=\"moresslinfos\">") + i18n("Certificate Information") + QL1S("</a>"));
- connect(label, SIGNAL(linkActivated(const QString &)), this, SLOT(showMoreSslInfos(const QString &)));
+ connect(label, SIGNAL(linkActivated(QString)), this, SLOT(showMoreSslInfos(QString)));
layout->addWidget(label, rows++, 1);
}
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index f8fb7d0c..ef3b3997 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -127,13 +127,13 @@ UrlBar::UrlBar(QWidget *parent)
connect(_tab, SIGNAL(loadProgressing()), this, SLOT(update()));
- connect(_tab->view(), SIGNAL(urlChanged(const QUrl &)), this, SLOT(setQUrl(const QUrl &)));
+ connect(_tab->view(), SIGNAL(urlChanged(QUrl)), this, SLOT(setQUrl(QUrl)));
connect(_tab->view(), SIGNAL(loadFinished(bool)), this, SLOT(loadFinished()));
connect(_tab->view(), SIGNAL(loadStarted()), this, SLOT(clearRightIcons()));
connect(_tab->view(), SIGNAL(iconChanged()), this, SLOT(refreshFavicon()));
// search icon
- connect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(const QString &, const QString &, const QString &)),
+ connect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(QString, QString, QString)),
this, SLOT(updateRightIcons()));
_suggestionTimer->setSingleShot(true);
@@ -447,15 +447,15 @@ void UrlBar::activateSuggestions(bool b)
{
_box = new CompletionWidget(this);
installEventFilter(_box.data());
- connect(_box.data(), SIGNAL(chosenUrl(const KUrl &, Rekonq::OpenType)), this, SLOT(loadRequestedUrl(const KUrl &, Rekonq::OpenType)));
+ connect(_box.data(), SIGNAL(chosenUrl(KUrl, Rekonq::OpenType)), this, SLOT(loadRequestedUrl(KUrl, Rekonq::OpenType)));
// activate suggestions on edit text
- connect(this, SIGNAL(textChanged(const QString &)), this, SLOT(detectTypedString(const QString &)));
+ connect(this, SIGNAL(textChanged(QString)), this, SLOT(detectTypedString(QString)));
}
}
else
{
- disconnect(this, SIGNAL(textChanged(const QString &)), this, SLOT(detectTypedString(const QString &)));
+ disconnect(this, SIGNAL(textChanged(QString)), this, SLOT(detectTypedString(QString)));
removeEventFilter(_box.data());
if (!_box.isNull())
_box.data()->deleteLater();
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index 5bf2ee6a..2c62914b 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -337,9 +337,9 @@ void UrlResolver::computeSuggestions()
// }
//
// connect(rApp->opensearchManager(),
-// SIGNAL(suggestionsReceived(const QString &, const ResponseList &)),
+// SIGNAL(suggestionsReceived(QString,ResponseList)),
// this,
-// SLOT(suggestionsReceived(const QString &, const ResponseList &)));
+// SLOT(suggestionsReceived(QString,ResponseList)));
//
// _typedQuery = query;
// rApp->opensearchManager()->requestSuggestion(query);
diff --git a/src/urlbar/webshortcutwidget.cpp b/src/urlbar/webshortcutwidget.cpp
index 6fe22fbb..d44f6f1a 100644
--- a/src/urlbar/webshortcutwidget.cpp
+++ b/src/urlbar/webshortcutwidget.cpp
@@ -71,7 +71,7 @@ WebShortcutWidget::WebShortcutWidget(QWidget *parent)
// Shortcuts
QLabel *shortcutsLabel = new QLabel(i18n("Shortcuts:"), this);
layout->addRow(shortcutsLabel, m_wsLineEdit);
- connect(m_wsLineEdit, SIGNAL(textChanged(QString)), SLOT(shortcutsChanged(const QString&)));
+ connect(m_wsLineEdit, SIGNAL(textChanged(QString)), SLOT(shortcutsChanged(QString)));
// Note
m_noteLabel->setWordWrap(true);
diff --git a/src/urlpanel.cpp b/src/urlpanel.cpp
index c4860bfd..b4359148 100644
--- a/src/urlpanel.cpp
+++ b/src/urlpanel.cpp
@@ -99,9 +99,9 @@ void UrlPanel::setup()
connect(search, SIGNAL(textChanged(QString)), proxy, SLOT(setFilterFixedString(QString)));
connect(search, SIGNAL(textChanged(QString)), this, SLOT(expandTreeView()));
- connect(_treeView, SIGNAL(contextMenuItemRequested(const QPoint &)), this, SLOT(contextMenuItem(const QPoint &)));
- connect(_treeView, SIGNAL(contextMenuGroupRequested(const QPoint &)), this, SLOT(contextMenuGroup(const QPoint &)));
- connect(_treeView, SIGNAL(contextMenuEmptyRequested(const QPoint &)), this, SLOT(contextMenuEmpty(const QPoint &)));
+ connect(_treeView, SIGNAL(contextMenuItemRequested(QPoint)), this, SLOT(contextMenuItem(QPoint)));
+ connect(_treeView, SIGNAL(contextMenuGroupRequested(QPoint)), this, SLOT(contextMenuGroup(QPoint)));
+ connect(_treeView, SIGNAL(contextMenuEmptyRequested(QPoint)), this, SLOT(contextMenuEmpty(QPoint)));
}
void UrlPanel::expandTreeView()
diff --git a/src/webpage.cpp b/src/webpage.cpp
index 43d81053..7e2214fa 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -127,7 +127,7 @@ WebPage::WebPage(QWidget *parent)
{
// ----- handling unsupported content...
setForwardUnsupportedContent(true);
- connect(this, SIGNAL(unsupportedContent(QNetworkReply *)), this, SLOT(handleUnsupportedContent(QNetworkReply *)));
+ connect(this, SIGNAL(unsupportedContent(QNetworkReply*)), this, SLOT(handleUnsupportedContent(QNetworkReply*)));
// ----- rekonq Network Manager
NetworkAccessManager *manager = new NetworkAccessManager(this);
@@ -153,12 +153,12 @@ WebPage::WebPage(QWidget *parent)
// ----- last stuffs
connect(manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(manageNetworkErrors(QNetworkReply*)));
- connect(this, SIGNAL(downloadRequested(const QNetworkRequest &)), this, SLOT(downloadRequest(const QNetworkRequest &)));
+ connect(this, SIGNAL(downloadRequested(QNetworkRequest)), this, SLOT(downloadRequest(QNetworkRequest)));
connect(this, SIGNAL(loadStarted()), this, SLOT(loadStarted()));
connect(this, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool)));
// protocol handler signals
- connect(&_protHandler, SIGNAL(downloadUrl(const KUrl &)), this, SLOT(downloadUrl(const KUrl &)));
+ connect(&_protHandler, SIGNAL(downloadUrl(KUrl)), this, SLOT(downloadUrl(KUrl)));
connect(rApp->iconManager(), SIGNAL(iconChanged()), mainFrame(), SIGNAL(iconChanged()));
}
@@ -348,7 +348,7 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
destUrl.setPath(tempFile.fileName());
KIO::Job *job = KIO::file_copy(_loadingUrl, destUrl, 0600, KIO::Overwrite);
job->ui()->setWindow(rApp->mainWindow());
- connect(job, SIGNAL(result(KJob *)), this, SLOT(copyToTempFileResult(KJob*)));
+ connect(job, SIGNAL(result(KJob*)), this, SLOT(copyToTempFileResult(KJob*)));
return;
}
diff --git a/src/webtab.cpp b/src/webtab.cpp
index 27b0fe8a..8b140866 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -81,13 +81,13 @@ WebTab::WebTab(QWidget *parent)
if (wallet)
{
- connect(wallet, SIGNAL(saveFormDataRequested(const QString &, const QUrl &)),
- this, SLOT(createWalletBar(const QString &, const QUrl &)));
+ connect(wallet, SIGNAL(saveFormDataRequested(QString, QUrl)),
+ this, SLOT(createWalletBar(QString, QUrl)));
}
connect(m_webView, SIGNAL(loadProgress(int)), this, SLOT(updateProgress(int)));
connect(m_webView, SIGNAL(loadStarted()), this, SLOT(resetProgress()));
- connect(m_webView, SIGNAL(titleChanged(const QString &)), this, SIGNAL(titleChanged(const QString &)));
+ connect(m_webView, SIGNAL(titleChanged(QString)), this, SIGNAL(titleChanged(QString)));
// Session Manager
connect(m_webView, SIGNAL(loadFinished(bool)), rApp->sessionManager(), SLOT(saveSession()));
@@ -156,13 +156,13 @@ void WebTab::createWalletBar(const QString &key, const QUrl &url)
m_walletBar.data()->animatedShow();
}
- connect(m_walletBar.data(), SIGNAL(saveFormDataAccepted(const QString &)),
- wallet, SLOT(acceptSaveFormDataRequest(const QString &)), Qt::UniqueConnection);
- connect(m_walletBar.data(), SIGNAL(saveFormDataRejected(const QString &)),
- wallet, SLOT(rejectSaveFormDataRequest(const QString &)), Qt::UniqueConnection);
+ connect(m_walletBar.data(), SIGNAL(saveFormDataAccepted(QString)),
+ wallet, SLOT(acceptSaveFormDataRequest(QString)), Qt::UniqueConnection);
+ connect(m_walletBar.data(), SIGNAL(saveFormDataRejected(QString)),
+ wallet, SLOT(rejectSaveFormDataRequest(QString)), Qt::UniqueConnection);
// sync passwords
- connect(m_walletBar.data(), SIGNAL(saveFormDataAccepted(const QString &)),
+ connect(m_walletBar.data(), SIGNAL(saveFormDataAccepted(QString)),
rApp->syncManager(), SLOT(syncPasswords()), Qt::UniqueConnection);
}
@@ -298,9 +298,9 @@ void WebTab::showSearchEngine(const QPoint &pos)
WebShortcutWidget *widget = new WebShortcutWidget(window());
widget->setWindowFlags(Qt::Popup);
- connect(widget, SIGNAL(webShortcutSet(const KUrl &, const QString &, const QString &)),
- rApp->opensearchManager(), SLOT(addOpenSearchEngine(const KUrl &, const QString &, const QString &)));
- connect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(const QString &, const QString &, const QString &)),
+ connect(widget, SIGNAL(webShortcutSet(KUrl, QString, QString)),
+ rApp->opensearchManager(), SLOT(addOpenSearchEngine(KUrl, QString, QString)));
+ connect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(QString, QString, QString)),
this, SLOT(openSearchEngineAdded()));
widget->show(extractOpensearchUrl(e), title, pos);
@@ -313,7 +313,7 @@ void WebTab::openSearchEngineAdded()
// If the providers changed, tell sycoca to rebuild its database...
KBuildSycocaProgressDialog::rebuildKSycoca(this);
- disconnect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(const QString &, const QString &, const QString &)),
+ disconnect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(QString, QString, QString)),
this, SLOT(openSearchEngineAdded()));
}
diff --git a/src/webview.cpp b/src/webview.cpp
index 740024c2..f4884743 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -82,14 +82,14 @@ WebView::WebView(QWidget* parent)
setPage(page);
// download system
- connect(this, SIGNAL(linkShiftClicked(const KUrl &)), page, SLOT(downloadUrl(const KUrl &)));
+ connect(this, SIGNAL(linkShiftClicked(KUrl)), page, SLOT(downloadUrl(KUrl)));
// middle click || ctrl + click signal
- connect(this, SIGNAL(linkMiddleOrCtrlClicked(const KUrl &)), this, SLOT(loadUrlInNewTab(const KUrl &)));
+ connect(this, SIGNAL(linkMiddleOrCtrlClicked(KUrl)), this, SLOT(loadUrlInNewTab(KUrl)));
// loadUrl signal
- connect(this, SIGNAL(loadUrl(const KUrl &, const Rekonq::OpenType &)),
- rApp, SLOT(loadUrl(const KUrl &, const Rekonq::OpenType &)));
+ connect(this, SIGNAL(loadUrl(KUrl, Rekonq::OpenType)),
+ rApp, SLOT(loadUrl(KUrl, Rekonq::OpenType)));
// Auto scroll timer
connect(m_autoScrollTimer, SIGNAL(timeout()), this, SLOT(scrollFrameChanged()));