summaryrefslogtreecommitdiff
path: root/src/urlbar
diff options
context:
space:
mode:
Diffstat (limited to 'src/urlbar')
-rw-r--r--src/urlbar/completionwidget.cpp4
-rw-r--r--src/urlbar/listitem.cpp10
-rw-r--r--src/urlbar/urlbar.cpp5
-rw-r--r--src/urlbar/urlresolver.cpp30
-rw-r--r--src/urlbar/urlresolver.h1
5 files changed, 5 insertions, 45 deletions
diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index 1f697b19..00a04bda 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -299,9 +299,6 @@ bool CompletionWidget::eventFilter(QObject *obj, QEvent *ev)
child = findChild<ListItem *>(QString::number(_currentIndex));
if(child && _currentIndex != 0) //the completionwidget is visible and the user had press down
{
- kDebug() << "USING LISTITEM URL: " << child->url();
- kDebug() << "USING LISTITEM TITLE: " << child->text();
-
//we can use the url of the listitem
emit chosenUrl(child->url(), Rekonq::CurrentTab);
}
@@ -311,7 +308,6 @@ bool CompletionWidget::eventFilter(QObject *obj, QEvent *ev)
UrlSearchList list = res.orderedSearchItems();
if(list.isEmpty())
{
- kDebug() << "Url Search List EMPTY!!!";
emit chosenUrl(KUrl(_typedString), Rekonq::CurrentTab);
}
else
diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp
index f268442f..150cc0a9 100644
--- a/src/urlbar/listitem.cpp
+++ b/src/urlbar/listitem.cpp
@@ -150,7 +150,7 @@ QString ListItem::text()
void ListItem::nextItemSubChoice()
{
- //will be override
+ // will be override
}
@@ -629,41 +629,33 @@ ListItem *ListItemFactory::create(const UrlSearchItem &item, const QString &text
{
if(item.type & UrlSearchItem::Search)
{
- kDebug() << "Search";
return new SearchListItem(item, text, parent);
}
if(item.type & UrlSearchItem::Browse)
{
- kDebug() << "Browse";
return new BrowseListItem(item, text, parent);
}
if(item.type & UrlSearchItem::History)
{
- kDebug() << "History";
return new PreviewListItem(item, text, parent);
}
if(item.type & UrlSearchItem::Bookmark)
{
- kDebug() << "Bookmark";
return new PreviewListItem(item, text, parent);
}
if(item.type & UrlSearchItem::Suggestion)
{
- kDebug() << "ITEM URL: " << item.url;
if(item.description.isEmpty())
{
- kDebug() << "Suggestion";
return new SuggestionListItem(item, text, parent);
}
- kDebug() << "Visual Suggestion";
return new VisualSuggestionListItem(item, text, parent);
}
- kDebug() << "Undefined";
return new PreviewListItem(item, text, parent);
}
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index ea60f474..37c085e6 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -308,7 +308,7 @@ void UrlBar::focusInEvent(QFocusEvent *event)
void UrlBar::dropEvent(QDropEvent *event)
{
- //handles only plain-text with url format
+ // handles only plain-text with url format
if(event->mimeData()->hasFormat("text/plain") && event->source() != this)
{
QUrl url = QUrl::fromUserInput(event->mimeData()->data("text/plain"));
@@ -321,7 +321,7 @@ void UrlBar::dropEvent(QDropEvent *event)
}
}
- //handles everything else
+ // handles everything else
KLineEdit::dropEvent(event);
activated(text());
}
@@ -371,7 +371,6 @@ void UrlBar::loadFinished()
// we need to update urlbar after the right icon settings
// removing this code (where setStyleSheet automatically calls update) needs adding again
// an update call
- kDebug() << "resetting stylesheet";
int rightIconWidth = 25 * (_rightIconsList.count());
setStyleSheet(QString("UrlBar { padding: 0 %2px 0 %1px;} ").arg(_icon->sizeHint().width()).arg(rightIconWidth));
}
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index 0d8ecc12..0ff00bba 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -76,8 +76,8 @@ UrlResolver::UrlResolver(const QString &typedUrl)
if(_browseRegexp.isEmpty())
{
- kDebug() << "browse regexp empty. Setting value..";
-
+ // FIXME move to use QL1S here!!!
+
QString protocol = QString("^(%1)").arg(KProtocolInfo::protocols().join("|"));
QString localhost = "^localhost";
@@ -253,8 +253,6 @@ UrlSearchList UrlResolver::orderLists()
bookmarksCount = _bookmarks.count();
commonCount = common.count();
- kDebug() << "HISTORY COUNT: " << historyCount;
-
//now fill the list to MAX_ELEMENTS
if(availableEntries > 0)
{
@@ -291,8 +289,6 @@ UrlSearchList UrlResolver::orderLists()
}
list = list + _history + common + _bookmarks + _suggestions;
- qWarning() << "orderedSearchItems leave: " << " elapsed: " << myTime.elapsed();
-
return list;
}
@@ -357,7 +353,6 @@ void UrlResolver::computeHistory()
void UrlResolver::computeBookmarks()
{
QList<KBookmark> found = rApp->bookmarkProvider()->find(_typedString);
- kDebug() << "FOUND: " << found.count();
Q_FOREACH(const KBookmark & b, found)
{
UrlSearchItem gItem(UrlSearchItem::Bookmark, b.url().url(), b.fullText());
@@ -417,24 +412,3 @@ void UrlResolver::suggestionsReceived(const QString &text, const ResponseList &s
emit suggestionsReady(sugList, _typedString);
this->deleteLater();
}
-
-
-// UrlSearchItem UrlResolver::privilegedItem(UrlSearchList* list)
-// {
-// UrlSearchItem item;
-// QString dot = QString(QL1C('.'));
-// QString test1 = QString(QL1C('/')) + _typedString + dot;
-// QString test2 = dot + _typedString + dot;
-//
-// for (int i = 0; i < list->count(); i++)
-// {
-// item = list->at(i);
-// //TODO: move this to AwesomeUrlCompletion::substringCompletion and add a priviledged flag to UrlSearchItem
-// if (item.url.contains(test1) || item.url.contains(test2))
-// {
-// list->removeAt(i);
-// return item;
-// }
-// }
-// return UrlSearchItem();
-// }
diff --git a/src/urlbar/urlresolver.h b/src/urlbar/urlresolver.h
index 48ffece0..510ab328 100644
--- a/src/urlbar/urlresolver.h
+++ b/src/urlbar/urlresolver.h
@@ -150,7 +150,6 @@ private:
void computeQurlFromUserInput();
void computeBookmarks();
-// UrlSearchItem privilegedItem(UrlSearchList* list);
UrlSearchList orderLists();
QString _typedString;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-02 21:50:57 +0000