From 9b0dc8d98fb232cabb683d5681dc0252b9532c32 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 19 Jan 2012 09:32:07 +0100 Subject: Krazy fixes - QL1S/QL1C - single-char QString efficiency - explicit ctors - normalized signals & slots --- src/urlbar/completionwidget.cpp | 8 ++++---- src/urlbar/listitem.cpp | 8 ++++---- src/urlbar/sslwidget.cpp | 2 +- src/urlbar/urlbar.cpp | 10 +++++----- src/urlbar/urlresolver.cpp | 4 ++-- src/urlbar/webshortcutwidget.cpp | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src/urlbar') 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("\"") + i18n("Certificate Information") + QL1S("")); - 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); -- cgit v1.2.1