From 06fdf013b318c3d8f5efb3d2f87dedcdb507b8bc Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Thu, 24 Aug 2017 15:38:33 +0200
Subject: Cleaned up code

---
 src/lib/navigation/urllineedit.cpp | 32 +++-----------------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

(limited to 'src/lib/navigation/urllineedit.cpp')

diff --git a/src/lib/navigation/urllineedit.cpp b/src/lib/navigation/urllineedit.cpp
index f3fcccd..85bcacc 100644
--- a/src/lib/navigation/urllineedit.cpp
+++ b/src/lib/navigation/urllineedit.cpp
@@ -57,10 +57,10 @@ UrlLineEdit::UrlLineEdit(QWidget *parent) :
     listWidget->addItem("neueland.iserlohn-fortress.net");
 
     connect(listWidget, &QListWidget::itemSelectionChanged, [this](){
-        setUrl(urlFromUserInput(listWidget->currentItem()->text()));
+        setText(listWidget->currentItem()->text());
     });
     connect(listWidget, &QListWidget::itemActivated, [this](QListWidgetItem *item){
-        setUrl(urlFromUserInput(item->text()));
+        setText(listWidget->currentItem()->text());;
         this->m_menu->hide();
     });
 
@@ -73,11 +73,6 @@ UrlLineEdit::UrlLineEdit(QWidget *parent) :
     // connect signals
     connect(this, SIGNAL(textEdited(QString)), this, SLOT(showCompleter(QString)));
     connect(this, &QLineEdit::returnPressed, [this](){
-        if(text().startsWith('#')) {
-            emit searchTermEntered(text());
-        } else {
-            emit addressEntered(url());
-        }
         m_menu->hide();
     });
 
@@ -97,11 +92,6 @@ void UrlLineEdit::setUrl(const QUrl &url)
     setText(urlText);
 }
 
-QUrl UrlLineEdit::url()
-{
-    return urlFromUserInput(text());
-}
-
 void UrlLineEdit::focusInEvent(QFocusEvent *event)
 {
     clearTextFormat();
@@ -112,15 +102,6 @@ void UrlLineEdit::focusInEvent(QFocusEvent *event)
     // http://stackoverflow.com/a/35725950/1054406
     // mousePressEvent triggers right after focusInEvent so text selected in focusInEvent unselects by mousePressEvent
     QTimer::singleShot(0, this, SLOT(selectAll()));
-
-    //QTimer::singleShot(0, this, SLOT(showCompleter()));
-}
-
-void UrlLineEdit::focusOutEvent(QFocusEvent *event)
-{
-    wasFocused = false;
-    setUrl(urlFromUserInput(text()));
-    QLineEdit::focusOutEvent(event);
 }
 
 void UrlLineEdit::resizeEvent(QResizeEvent *event)
@@ -170,17 +151,12 @@ void UrlLineEdit::clearTextFormat()
     setTextFormat(QTextLayout::FormatRange());
 }
 
-QUrl UrlLineEdit::urlFromUserInput(const QString &input)
-{
-    return QUrl::fromUserInput(input);
-}
-
 // Completer
 
 void UrlLineEdit::showCompleter(const QString &text)
 {
     m_menu->move(mapToGlobal(QPoint(0, height())));
-    listWidget->setCurrentRow(0, QItemSelectionModel::SelectCurrent);
+    //listWidget->setCurrentRow(0, QItemSelectionModel::SelectCurrent);
     m_menu->exec();
 }
 
@@ -202,14 +178,12 @@ void UrlLineEdit::pasteUrl()
 {
     clear();
     paste();
-    setUrl(urlFromUserInput(text()));
 }
 
 void UrlLineEdit::pasteUrlAndGo()
 {
     clear();
     paste();
-    setUrl(urlFromUserInput(text()));
     emit returnPressed();
 }
 
-- 
cgit v1.2.1