From d6c022a8b01715f50d227c938beed680ac40ace0 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 28 Dec 2012 18:32:05 +0100 Subject: Krazy fixes, second shot (normalize) --- src/adblock/adblockmanager.cpp | 2 +- src/adblock/adblocksettingwidget.cpp | 2 +- src/application.cpp | 2 +- src/bookmarks/bookmarkmanager.cpp | 6 ++--- src/bookmarks/bookmarkstoolbar.cpp | 2 +- src/download/downloaditem.cpp | 2 +- src/history/historymodels.cpp | 48 ++++++++++++++++++------------------ src/sync/operasynchandler.cpp | 8 +++--- src/sync/synccheckwidget.cpp | 2 +- src/tabwindow/tabbar.cpp | 2 +- src/tabwindow/tabwindow.cpp | 6 ++--- src/urlbar/completionwidget.cpp | 8 +++--- src/urlbar/listitem.cpp | 4 +-- src/urlbar/resourcelinkdialog.cpp | 4 +-- src/urlbar/urlbar.cpp | 2 +- src/webtab/webtab.cpp | 4 +-- src/webtab/webview.cpp | 16 ++++++------ src/webwindow/webwindow.cpp | 14 +++++------ 18 files changed, 67 insertions(+), 67 deletions(-) (limited to 'src') diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp index f30a997c..30fcb0d0 100644 --- a/src/adblock/adblockmanager.cpp +++ b/src/adblock/adblockmanager.cpp @@ -309,7 +309,7 @@ void AdBlockManager::updateSubscription(int i) job->metaData().insert("cookies", "none"); job->metaData().insert("no-auth", "true"); - connect(job, SIGNAL(finished(KJob *)), this, SLOT(slotFinished(KJob *))); + connect(job, SIGNAL(finished(KJob*)), this, SLOT(slotFinished(KJob*))); } diff --git a/src/adblock/adblocksettingwidget.cpp b/src/adblock/adblocksettingwidget.cpp index 55b48046..4b72f20a 100644 --- a/src/adblock/adblocksettingwidget.cpp +++ b/src/adblock/adblocksettingwidget.cpp @@ -74,7 +74,7 @@ AdBlockSettingWidget::AdBlockSettingWidget(KSharedConfig::Ptr config, QWidget *p connect(checkHideAds, SIGNAL(stateChanged(int)), this, SLOT(hasChanged())); connect(spinBox, SIGNAL(valueChanged(int)), this, SLOT(hasChanged())); - connect(automaticFiltersListWidget, SIGNAL(itemChanged(QListWidgetItem *)), this, SLOT(hasChanged())); + connect(automaticFiltersListWidget, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(hasChanged())); } diff --git a/src/application.cpp b/src/application.cpp index 9d1e3fea..9aa7693d 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -138,7 +138,7 @@ int Application::newInstance() kDebug() << "URL: " << u; WebTab *tab = newWebApp(); - connect(tab->page(), SIGNAL(pageCreated(WebPage *)), this, SLOT(pageCreated(WebPage *))); + connect(tab->page(), SIGNAL(pageCreated(WebPage*)), this, SLOT(pageCreated(WebPage*))); tab->view()->load(u); if (isFirstLoad) diff --git a/src/bookmarks/bookmarkmanager.cpp b/src/bookmarks/bookmarkmanager.cpp index 42ae4c33..30a7772a 100644 --- a/src/bookmarks/bookmarkmanager.cpp +++ b/src/bookmarks/bookmarkmanager.cpp @@ -85,14 +85,14 @@ BookmarkManager::BookmarkManager(QObject *parent) delete tempManager; } - connect(m_manager, SIGNAL(changed(QString, 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(KUrl, Rekonq::OpenType)), this, SIGNAL(openUrl(KUrl, Rekonq::OpenType))); + connect(m_owner, SIGNAL(openUrl(KUrl,Rekonq::OpenType)), this, SIGNAL(openUrl(KUrl,Rekonq::OpenType))); // bookmarks loading - connect(this, SIGNAL(openUrl(KUrl, Rekonq::OpenType)), rApp, SLOT(loadUrl(KUrl, Rekonq::OpenType))); + connect(this, SIGNAL(openUrl(KUrl,Rekonq::OpenType)), rApp, SLOT(loadUrl(KUrl,Rekonq::OpenType))); } diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp index b101e293..6c6218ef 100644 --- a/src/bookmarks/bookmarkstoolbar.cpp +++ b/src/bookmarks/bookmarkstoolbar.cpp @@ -156,7 +156,7 @@ BookmarkToolBar::BookmarkToolBar(QWidget *parent) setContextMenuPolicy(Qt::CustomContextMenu); connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenu(QPoint))); - connect(BookmarkManager::self()->manager(), SIGNAL(changed(QString, QString)), this, SLOT(hideMenu())); + connect(BookmarkManager::self()->manager(), SIGNAL(changed(QString,QString)), this, SLOT(hideMenu())); setAcceptDrops(true); installEventFilter(this); diff --git a/src/download/downloaditem.cpp b/src/download/downloaditem.cpp index 38edbf1e..29917fba 100644 --- a/src/download/downloaditem.cpp +++ b/src/download/downloaditem.cpp @@ -59,7 +59,7 @@ DownloadItem::DownloadItem(KIO::CopyJob *job, const QDateTime &d, QObject *paren , m_job(job) , m_state(0) { - QObject::connect(job, SIGNAL(percent(KJob*, ulong)), this, SLOT(updateProgress(KJob*, ulong))); + QObject::connect(job, SIGNAL(percent(KJob*,ulong)), this, SLOT(updateProgress(KJob*,ulong))); QObject::connect(job, SIGNAL(finished(KJob*)), this, SLOT(onFinished(KJob*))); QObject::connect(job, SIGNAL(suspended(KJob*)), this, SLOT(onSuspended(KJob*))); } diff --git a/src/history/historymodels.cpp b/src/history/historymodels.cpp index 48cdc78e..4888ca42 100644 --- a/src/history/historymodels.cpp +++ b/src/history/historymodels.cpp @@ -223,12 +223,12 @@ void HistoryFilterModel::setSourceModel(QAbstractItemModel *newSourceModel) if (sourceModel()) { disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset())); - 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))); + 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); @@ -237,12 +237,12 @@ void HistoryFilterModel::setSourceModel(QAbstractItemModel *newSourceModel) { m_loaded = false; connect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset())); - 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))); + 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))); } } @@ -404,16 +404,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(QModelIndex, int, int)), - this, SLOT(sourceRowsRemoved(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(QModelIndex, int, int)), - this, SLOT(sourceRowsRemoved(QModelIndex, int, int))); + connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)), + this, SLOT(sourceRowsRemoved(QModelIndex,int,int))); m_loaded = false; if (oldCount - count != rowCount()) reset(); @@ -624,10 +624,10 @@ void HistoryTreeModel::setSourceModel(QAbstractItemModel *newSourceModel) { disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset())); disconnect(sourceModel(), SIGNAL(layoutChanged()), this, SLOT(sourceReset())); - 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))); + 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); @@ -636,10 +636,10 @@ void HistoryTreeModel::setSourceModel(QAbstractItemModel *newSourceModel) { connect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset())); connect(sourceModel(), SIGNAL(layoutChanged()), this, SLOT(sourceReset())); - 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))); + 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/sync/operasynchandler.cpp b/src/sync/operasynchandler.cpp index 085f5693..d603f381 100644 --- a/src/sync/operasynchandler.cpp +++ b/src/sync/operasynchandler.cpp @@ -307,7 +307,7 @@ void OperaSyncHandler::getBookmarks() KIO::TransferJob *job = KIO::get(KUrl(fetchBookmarksUrl), KIO::Reload, KIO::HideProgressInfo); connect(job, SIGNAL(result(KJob*)), this, SLOT(fetchBookmarksResultSlot(KJob*))); - connect(job, SIGNAL(data(KIO::Job*, QByteArray)), this, SLOT(fetchBookmarksDataSlot(KIO::Job*, QByteArray))); + connect(job, SIGNAL(data(KIO::Job*,QByteArray)), this, SLOT(fetchBookmarksDataSlot(KIO::Job*,QByteArray))); } void OperaSyncHandler::fetchBookmarksDataSlot(KIO::Job* job, QByteArray data) @@ -689,7 +689,7 @@ void OperaSyncHandler::addBookmarkOnServer(QString title, QString url, QString p job->addMetaData("Content-Type", "application/x-www-form-urlencoded"); connect(job, SIGNAL(result(KJob*)), this, SLOT(createBookmarkResultSlot(KJob*))); - connect(job, SIGNAL(data(KIO::Job*, QByteArray)), this, SLOT(createBookmarkDataSlot(KIO::Job*, QByteArray))); + connect(job, SIGNAL(data(KIO::Job*,QByteArray)), this, SLOT(createBookmarkDataSlot(KIO::Job*,QByteArray))); ++_requestCount; } @@ -716,7 +716,7 @@ KJob *OperaSyncHandler::addBookmarkFolderOnServer(QString title, QString parent) _jobToResponseMap.insert(job, ""); connect(job, SIGNAL(result(KJob*)), this, SLOT(createBookmarkFolderResultSlot(KJob*))); - connect(job, SIGNAL(data(KIO::Job*, QByteArray)), this, SLOT(createBookmarkFolderDataSlot(KIO::Job*, QByteArray))); + connect(job, SIGNAL(data(KIO::Job*,QByteArray)), this, SLOT(createBookmarkFolderDataSlot(KIO::Job*,QByteArray))); ++_requestCount; return job; @@ -745,7 +745,7 @@ void OperaSyncHandler::deleteResourceOnServer(QString id) job->addMetaData("Content-Type", "application/x-www-form-urlencoded"); connect(job, SIGNAL(result(KJob*)), this, SLOT(deleteResourceResultSlot(KJob*))); - connect(job, SIGNAL(data(KIO::Job*, QByteArray)), this, SLOT(deleteResourceDataSlot(KIO::Job*, QByteArray))); + connect(job, SIGNAL(data(KIO::Job*,QByteArray)), this, SLOT(deleteResourceDataSlot(KIO::Job*,QByteArray))); ++_requestCount; } diff --git a/src/sync/synccheckwidget.cpp b/src/sync/synccheckwidget.cpp index c7ccdeb4..4c5986dd 100644 --- a/src/sync/synccheckwidget.cpp +++ b/src/sync/synccheckwidget.cpp @@ -103,7 +103,7 @@ void SyncCheckWidget::initializePage() return; } - connect(h, SIGNAL(syncStatus(Rekonq::SyncData, bool, QString)), this, SLOT(updateWidget(Rekonq::SyncData, bool, QString))); + connect(h, SIGNAL(syncStatus(Rekonq::SyncData,bool,QString)), this, SLOT(updateWidget(Rekonq::SyncData,bool,QString))); // bookmarks diff --git a/src/tabwindow/tabbar.cpp b/src/tabwindow/tabbar.cpp index 24494f15..09368fef 100644 --- a/src/tabwindow/tabbar.cpp +++ b/src/tabwindow/tabbar.cpp @@ -77,7 +77,7 @@ TabBar::TabBar(QWidget *parent) // context menu(s) setContextMenuPolicy(Qt::CustomContextMenu); - connect(this, SIGNAL(contextMenu(int, QPoint)), this, SLOT(contextMenu(int, QPoint))); + connect(this, SIGNAL(contextMenu(int,QPoint)), this, SLOT(contextMenu(int,QPoint))); connect(this, SIGNAL(emptyAreaContextMenu(QPoint)), this, SLOT(emptyAreaContextMenu(QPoint))); // Highlight effect diff --git a/src/tabwindow/tabwindow.cpp b/src/tabwindow/tabwindow.cpp index 7fa7439d..f05d8142 100644 --- a/src/tabwindow/tabwindow.cpp +++ b/src/tabwindow/tabwindow.cpp @@ -224,7 +224,7 @@ WebWindow *TabWindow::prepareNewTab(WebPage *page) connect(tab, SIGNAL(loadStarted()), this, SLOT(tabLoadStarted())); connect(tab, SIGNAL(loadFinished(bool)), this, SLOT(tabLoadFinished(bool))); - connect(tab, SIGNAL(pageCreated(WebPage *)), this, SLOT(pageCreated(WebPage *))); + connect(tab, SIGNAL(pageCreated(WebPage*)), this, SLOT(pageCreated(WebPage*))); connect(tab, SIGNAL(setFullScreen(bool)), this, SLOT(setFullScreen(bool))); @@ -579,7 +579,7 @@ void TabWindow::detachTab(int index, TabWindow *toWindow) disconnect(tab, SIGNAL(titleChanged(QString)), this, SLOT(tabTitleChanged(QString))); disconnect(tab, SIGNAL(loadStarted()), this, SLOT(tabLoadStarted())); disconnect(tab, SIGNAL(loadFinished(bool)), this, SLOT(tabLoadFinished(bool))); - disconnect(tab, SIGNAL(pageCreated(WebPage *)), this, SLOT(pageCreated(WebPage *))); + disconnect(tab, SIGNAL(pageCreated(WebPage*)), this, SLOT(pageCreated(WebPage*))); // reconnect signals to new tabwindow // WARNING: Code copied from prepareNewTab method. @@ -587,7 +587,7 @@ void TabWindow::detachTab(int index, TabWindow *toWindow) connect(tab, SIGNAL(titleChanged(QString)), w, SLOT(tabTitleChanged(QString))); connect(tab, SIGNAL(loadStarted()), w, SLOT(tabLoadStarted())); connect(tab, SIGNAL(loadFinished(bool)), w, SLOT(tabLoadFinished(bool))); - connect(tab, SIGNAL(pageCreated(WebPage *)), w, SLOT(pageCreated(WebPage *))); + connect(tab, SIGNAL(pageCreated(WebPage*)), w, SLOT(pageCreated(WebPage*))); w->show(); } diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp index 02f0bc7e..f745afae 100644 --- a/src/urlbar/completionwidget.cpp +++ b/src/urlbar/completionwidget.cpp @@ -75,9 +75,9 @@ void CompletionWidget::insertItems(const UrlSuggestionList &list, const QString& 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())); @@ -394,8 +394,8 @@ void CompletionWidget::suggestUrls(const QString &text) } UrlSuggester *res = new UrlSuggester(text); - connect(res, SIGNAL(suggestionsReady(UrlSuggestionList, QString)), - this, SLOT(updateSuggestionList(UrlSuggestionList, QString))); + connect(res, SIGNAL(suggestionsReady(UrlSuggestionList,QString)), + this, SLOT(updateSuggestionList(UrlSuggestionList,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 e5adeec4..e1eac250 100644 --- a/src/urlbar/listitem.cpp +++ b/src/urlbar/listitem.cpp @@ -393,8 +393,8 @@ 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*, QByteArray)), - this, SLOT(slotData(KJob*, QByteArray))); + connect(job, SIGNAL(data(KIO::Job*,QByteArray)), + this, SLOT(slotData(KJob*,QByteArray))); connect(job, SIGNAL(result(KJob*)), this, SLOT(slotResult(KJob*))); } diff --git a/src/urlbar/resourcelinkdialog.cpp b/src/urlbar/resourcelinkdialog.cpp index b300c8ec..799171f2 100644 --- a/src/urlbar/resourcelinkdialog.cpp +++ b/src/urlbar/resourcelinkdialog.cpp @@ -166,9 +166,9 @@ Nepomuk::ResourceLinkDialog::ResourceLinkDialog(Nepomuk::Resource &nfoResource, d->m_linkedResources->setContextMenuPolicy(Qt::CustomContextMenu); - connect(d->m_resourceView->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + connect(d->m_resourceView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(_k_selectionChanged())); - connect(d->m_linkedResources->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + connect(d->m_linkedResources->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(_k_selectionChanged())); connect(this, SIGNAL(user1Clicked()), this, SLOT(linkResourceSlot())); connect(this, SIGNAL(user2Clicked()), this, SLOT(unlinkResourceSlot())); diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp index 1e572ea6..4aeec1b2 100644 --- a/src/urlbar/urlbar.cpp +++ b/src/urlbar/urlbar.cpp @@ -160,7 +160,7 @@ UrlBar::UrlBar(QWidget *parent) connect(BookmarkManager::self(), SIGNAL(bookmarksUpdated()), this, SLOT(updateRightIcons())); // suggestions - connect(_box.data(), SIGNAL(chosenUrl(KUrl, Rekonq::OpenType)), this, SLOT(loadRequestedUrl(KUrl, Rekonq::OpenType))); + connect(_box.data(), SIGNAL(chosenUrl(KUrl,Rekonq::OpenType)), this, SLOT(loadRequestedUrl(KUrl,Rekonq::OpenType))); connect(this, SIGNAL(textEdited(QString)), this, SLOT(detectTypedString(QString))); _suggestionTimer->setSingleShot(true); diff --git a/src/webtab/webtab.cpp b/src/webtab/webtab.cpp index ba4c9c7c..f1928880 100644 --- a/src/webtab/webtab.cpp +++ b/src/webtab/webtab.cpp @@ -100,8 +100,8 @@ WebTab::WebTab(QWidget *parent, bool isPrivateBrowsing) if (wallet) { - connect(wallet, SIGNAL(saveFormDataRequested(QString, QUrl)), - this, SLOT(createWalletBar(QString, QUrl))); + connect(wallet, SIGNAL(saveFormDataRequested(QString,QUrl)), + this, SLOT(createWalletBar(QString,QUrl))); } connect(view(), SIGNAL(loadProgress(int)), this, SLOT(updateProgress(int))); diff --git a/src/webtab/webview.cpp b/src/webtab/webview.cpp index 986f8484..4c6520cd 100644 --- a/src/webtab/webview.cpp +++ b/src/webtab/webview.cpp @@ -103,7 +103,7 @@ WebView::WebView(QWidget* parent, bool isPrivateBrowsing) , m_isPrivateBrowsing(isPrivateBrowsing) { // loadUrl signal - connect(this, SIGNAL(loadUrl(KUrl, Rekonq::OpenType)), rApp, SLOT(loadUrl(KUrl, 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())); @@ -413,25 +413,25 @@ void WebView::contextMenuEvent(QContextMenuEvent *event) a = new KAction(KIcon("view-preview"), i18n("&View Image"), &menu); a->setData(m_contextMenuHitResult.imageUrl()); - connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), - this, SLOT(viewImage(Qt::MouseButtons, Qt::KeyboardModifiers))); + connect(a, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), + this, SLOT(viewImage(Qt::MouseButtons,Qt::KeyboardModifiers))); menu.addAction(a); a = new KAction(KIcon("document-save"), i18n("Save image as..."), &menu); a->setData(m_contextMenuHitResult.imageUrl()); - connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(saveImage())); + connect(a, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(saveImage())); menu.addAction(a); a = new KAction(KIcon("view-media-visualization"), i18n("&Copy Image Location"), &menu); a->setData(m_contextMenuHitResult.imageUrl()); - connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(slotCopyImageLocation())); + connect(a, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(slotCopyImageLocation())); menu.addAction(a); if (AdBlockManager::self()->isEnabled()) { a = new KAction(KIcon("preferences-web-browser-adblock"), i18n("Block image"), &menu); a->setData(m_contextMenuHitResult.imageUrl()); - connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(blockImage())); + connect(a, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(blockImage())); menu.addAction(a); } } @@ -1429,8 +1429,8 @@ void WebView::spellCheck() spellDialog->setAttribute(Qt::WA_DeleteOnClose, true); spellDialog->showSpellCheckCompletionMessage(true); - connect(spellDialog, SIGNAL(replace(QString, int, QString)), this, SLOT(spellCheckerCorrected(QString, int, QString))); - connect(spellDialog, SIGNAL(misspelling(QString, int)), this, SLOT(spellCheckerMisspelling(QString, int))); + connect(spellDialog, SIGNAL(replace(QString,int,QString)), this, SLOT(spellCheckerCorrected(QString,int,QString))); + connect(spellDialog, SIGNAL(misspelling(QString,int)), this, SLOT(spellCheckerMisspelling(QString,int))); if (m_contextMenuHitResult.isContentSelected()) connect(spellDialog, SIGNAL(done(QString)), this, SLOT(slotSpellCheckDone(QString))); spellDialog->setBuffer(text); diff --git a/src/webwindow/webwindow.cpp b/src/webwindow/webwindow.cpp index 74d1eda7..1a492b5b 100644 --- a/src/webwindow/webwindow.cpp +++ b/src/webwindow/webwindow.cpp @@ -129,7 +129,7 @@ WebWindow::WebWindow(QWidget *parent, bool isPrivateBrowsing, WebPage *pg) connect(_bar, SIGNAL(focusIn()), this, SLOT(urlbarFocused())); // page signals - connect(page(), SIGNAL(pageCreated(WebPage *)), this, SIGNAL(pageCreated(WebPage *))); + connect(page(), SIGNAL(pageCreated(WebPage*)), this, SIGNAL(pageCreated(WebPage*))); // message popup m_popup->setAutoFillBackground(true); @@ -137,7 +137,7 @@ WebWindow::WebWindow(QWidget *parent, bool isPrivateBrowsing, WebPage *pg) m_popup->raise(); m_popup->hide(); connect(m_hidePopupTimer, SIGNAL(timeout()), m_popup, SLOT(hide())); - connect(_tab->page(), SIGNAL(linkHovered(QString, QString, QString)), this, SLOT(notifyMessage(QString))); + connect(_tab->page(), SIGNAL(linkHovered(QString,QString,QString)), this, SLOT(notifyMessage(QString))); connect(_tab, SIGNAL(infoToShow(QString)), this, SLOT(notifyMessage(QString))); updateHistoryActions(); @@ -168,8 +168,8 @@ void WebWindow::setupActions() // ========================= History related actions ============================== a = actionCollection()->addAction(KStandardAction::Back); - connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), - this, SLOT(openPrevious(Qt::MouseButtons, Qt::KeyboardModifiers))); + connect(a, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), + this, SLOT(openPrevious(Qt::MouseButtons,Qt::KeyboardModifiers))); m_historyBackMenu = new KMenu(this); a->setMenu(m_historyBackMenu); @@ -177,8 +177,8 @@ void WebWindow::setupActions() connect(m_historyBackMenu, SIGNAL(triggered(QAction*)), this, SLOT(openActionUrl(QAction*))); a = actionCollection()->addAction(KStandardAction::Forward); - connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), - this, SLOT(openNext(Qt::MouseButtons, Qt::KeyboardModifiers))); + connect(a, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), + this, SLOT(openNext(Qt::MouseButtons,Qt::KeyboardModifiers))); m_historyForwardMenu = new KMenu(this); a->setMenu(m_historyForwardMenu); @@ -218,7 +218,7 @@ void WebWindow::setupActions() // Open Home page a = actionCollection()->addAction(KStandardAction::Home); - connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(openHomePage(Qt::MouseButtons, Qt::KeyboardModifiers))); + connect(a, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(openHomePage(Qt::MouseButtons,Qt::KeyboardModifiers))); // Open Downloads page a = new KAction(KIcon("download"), i18n("Downloads page"), this); -- cgit v1.2.1