Merge branch 'master' into local-svn

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@973966 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 3 insertions, 13 deletions

diff --git a/src/urlbar.h b/src/urlbar.h
index d8fb9029..02d709bb 100644
--- a/src/urlbar.h
+++ b/src/urlbar.h
@@ -49,15 +49,8 @@ public:
     UrlBar(QWidget *parent = 0);
     ~UrlBar();
 
-    void selectAll() const
-    {
-        lineEdit()->selectAll();
-    }
-    KUrl url() const
-    {
-        return m_currentUrl;
-    }
-
+    void selectAll() const;
+    KUrl url() const;
     QSize sizeHint() const;
 
 signals:
@@ -80,10 +73,7 @@ protected:
 private:
     void setupLineEdit();
 
-    KLineEdit *lineEdit() const
-    {
-        return m_lineEdit;
-    }
+    KLineEdit *lineEdit() const;
 
     static QLinearGradient generateGradient(const QColor &color, int height);