summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/application.h5
-rw-r--r--src/mainview.cpp1
-rw-r--r--src/mainview.h1
-rw-r--r--src/mainwindow.h1
-rw-r--r--src/urlbar.cpp14
-rw-r--r--src/webpage.cpp2
-rw-r--r--src/webpage.h3
-rw-r--r--src/webview.cpp5
-rw-r--r--src/webview.h1
9 files changed, 17 insertions, 16 deletions
diff --git a/src/application.h b/src/application.h
index cd617b7a..44173373 100644
--- a/src/application.h
+++ b/src/application.h
@@ -26,11 +26,10 @@
* ============================================================ */
-
-
#ifndef APPLICATION_H
#define APPLICATION_H
+
// KDE Includes
#include <KUniqueApplication>
#include <KIcon>
@@ -120,7 +119,6 @@ public slots:
const Rekonq::OpenType& type = Rekonq::CurrentTab
);
-
private slots:
/**
@@ -128,7 +126,6 @@ private slots:
*/
void postLaunch();
-
private:
KUrl guessUrlFromString(const QString &url);
diff --git a/src/mainview.cpp b/src/mainview.cpp
index ef4d869b..2b6d294c 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -295,6 +295,7 @@ void MainView::slotReloadTab(int index)
}
+// TODO need some extra comments to better understand what happens here..
void MainView::slotCurrentChanged(int index)
{
WebView *webView = this->webView(index);
diff --git a/src/mainview.h b/src/mainview.h
index 6343bcf1..82655475 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -69,7 +69,6 @@ public:
WebView *webView(int index) const;
QToolButton *addTabButton() const;
- // inlines
TabBar *tabBar() const;
WebView *currentWebView() const;
int webViewIndex(WebView *webView) const;
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 14c59cce..b7f9bae1 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -29,6 +29,7 @@
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
+
// Local Includes
#include "bookmarks.h"
#include "mainview.h"
diff --git a/src/urlbar.cpp b/src/urlbar.cpp
index 6ece4783..4b253773 100644
--- a/src/urlbar.cpp
+++ b/src/urlbar.cpp
@@ -51,6 +51,7 @@
QColor UrlBar::s_defaultBaseColor;
+
UrlBar::UrlBar(QWidget *parent)
: KHistoryComboBox(true, parent)
, m_lineEdit(new LineEdit)
@@ -149,6 +150,7 @@ void UrlBar::setProgress(int progress)
repaint();
}
+
void UrlBar::slotUpdateUrl()
{
if (count())
@@ -172,7 +174,7 @@ void UrlBar::slotUpdateUrl()
}
-inline void UrlBar::slotActivated(const QString& url)
+void UrlBar::slotActivated(const QString& url)
{
if (url.isEmpty())
return;
@@ -185,7 +187,7 @@ inline void UrlBar::slotActivated(const QString& url)
}
-inline void UrlBar::slotCleared()
+void UrlBar::slotCleared()
{
// clear the history on user's request from context menu
clear();
@@ -193,7 +195,7 @@ inline void UrlBar::slotCleared()
}
-inline void UrlBar::slotLoadFinished(bool)
+void UrlBar::slotLoadFinished(bool)
{
// reset progress bar after small delay
m_progress = 0;
@@ -201,7 +203,7 @@ inline void UrlBar::slotLoadFinished(bool)
}
-inline void UrlBar::slotUpdateProgress(int progress)
+void UrlBar::slotUpdateProgress(int progress)
{
m_progress = progress;
repaint();
@@ -290,7 +292,6 @@ bool UrlBar::isLoading()
}
-
KCompletion *UrlBar::completion()
{
// make sure completion was created
@@ -321,6 +322,7 @@ KCompletion *UrlBar::completion()
return m_completion;
}
+
HistoryCompletionModel *UrlBar::completionModel()
{
if (!m_completionModel)
@@ -329,4 +331,4 @@ HistoryCompletionModel *UrlBar::completionModel()
m_completionModel->setSourceModel(Application::historyManager()->historyFilterModel());
}
return m_completionModel;
-} \ No newline at end of file
+}
diff --git a/src/webpage.cpp b/src/webpage.cpp
index c81d93da..1968c751 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -65,7 +65,7 @@
#include <QtGui/QClipboard>
#include <QtGui/QKeyEvent>
-#include <QUiLoader>
+#include <QtUiTools/QUiLoader>
WebPage::WebPage(QObject *parent)
diff --git a/src/webpage.h b/src/webpage.h
index d1642966..7137da3d 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -32,8 +32,6 @@
#define WEBPAGE_H
-// KDE Includes
-
// Qt Includes
#include <QWebPage>
#include <QUrl>
@@ -43,6 +41,7 @@ class QWebFrame;
class QNetworkReply;
class QUrl;
+
class WebPage : public QWebPage
{
Q_OBJECT
diff --git a/src/webview.cpp b/src/webview.cpp
index 96c3cef5..1c9440f4 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -55,8 +55,6 @@
#include <QtGui/QAction>
-
-
WebView::WebView(QWidget* parent)
: QWebView(parent)
, m_page(new WebPage(this))
@@ -86,11 +84,13 @@ KUrl WebView::url() const
return KUrl(QWebView::url());
}
+
int WebView::progress()
{
return m_progress;
}
+
QString WebView::lastStatusBarText() const
{
return m_statusBarText;
@@ -338,6 +338,7 @@ void WebView::slotUpdateProgress(int p)
m_progress=p;
}
+
void WebView::slotLoadFinished(bool)
{
m_progress=0;
diff --git a/src/webview.h b/src/webview.h
index 85619fd8..4f283aae 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -28,6 +28,7 @@
#ifndef WEBVIEW_H
#define WEBVIEW_H
+
// KDE Includes
#include <KUrl>