Cleaned up code

1 files changed, 6 insertions, 8 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index b42fb7e..6306f62 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -36,7 +36,7 @@ MainWindow::MainWindow(QUrl defaultUrl, QWidget *parent) :
     navigationToolBar(new QToolBar(tr("Navigation"), this)),
     tabToolBar(new QToolBar(tr("Tab bar"), this)),
     tabBar(new WebViewTabBar(nullptr, this)),
-    urlLineEdit(new UrlLineEdit(navigationToolBar)),
+    m_addressBar(new AddressBar(navigationToolBar)),
     m_progressBar(new LoadingBar(this))
 {
     // set up UI
@@ -87,14 +87,14 @@ MainWindow::MainWindow(QUrl defaultUrl, QWidget *parent) :
     navigationToolBar->addWidget(forwardButton);
     navigationToolBar->addWidget(reloadButton);
     navigationToolBar->addWidget(homepageButton);
-    navigationToolBar->addWidget(urlLineEdit);
+    navigationToolBar->addWidget(m_addressBar);
     this->addToolBar(Qt::TopToolBarArea, navigationToolBar);
 
     // connect signals
-    connect(urlLineEdit, &UrlLineEdit::addressEntered, [&](const QUrl &url){
+    connect(m_addressBar, &AddressBar::addressEntered, [&](const QUrl &url){
         tabBar->currentView()->load(url);
     });
-    connect(urlLineEdit, &UrlLineEdit::searchTermEntered, [&](const QString &string){
+    connect(m_addressBar, &AddressBar::searchTermEntered, [&](const QString &string){
         QString term = string.mid(1);
         term.replace(' ', '+');
         tabBar->currentView()->load(QUrl::fromUserInput(qApp->settings()->value("general.search").toString().replace("$term", term)));
@@ -168,8 +168,7 @@ void MainWindow::newTab(const QUrl &url)
 
 void MainWindow::focusAddress()
 {
-    urlLineEdit->setFocus();
-    urlLineEdit->selectAll();
+    m_addressBar->setFocus();
 }
 
 void MainWindow::closeEvent(QCloseEvent *event)
@@ -227,14 +226,13 @@ void MainWindow::handleTabChanged(WebView *view)
     setCentralWidget(view);
 
     // connect signals
-    connect(view, SIGNAL(urlChanged(QUrl)), urlLineEdit, SLOT(setUrl(QUrl)));
+    m_addressBar->setWebView(view);
     connect(view, SIGNAL(titleChanged(QString)), this, SLOT(handleTitleUpdated(QString)));
     connect(view, SIGNAL(linkHovered(QString)), ui->statusBar, SLOT(showMessage(QString)));
 
     m_progressBar->connectWebView(view);
 
     // update UI
-    urlLineEdit->setUrl(view->url());
     this->handleTitleUpdated(view->title());
     centralWidget()->setFocus();
 }