From 4e574b8a94031ffb3214e9ee811096da15a53893 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 7 May 2009 01:35:48 +0200
Subject: Fixing forgotten merging issues..
---
src/autosaver.h | 2 --
src/findbar.cpp | 1 +
src/history.h | 25 +++----------------------
src/mainview.cpp | 4 ----
src/webview.cpp | 11 ++---------
5 files changed, 6 insertions(+), 37 deletions(-)
(limited to 'src')
diff --git a/src/autosaver.h b/src/autosaver.h
index b486fcb9..7ce44f78 100644
--- a/src/autosaver.h
+++ b/src/autosaver.h
@@ -38,7 +38,6 @@
*
*/
->>>>>>> master:src/autosaver.h
class AutoSaver : public QObject
{
Q_OBJECT
@@ -61,4 +60,3 @@ private:
};
#endif // AUTOSAVER_H
-
diff --git a/src/findbar.cpp b/src/findbar.cpp
index bc22a04c..0e312e04 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -28,6 +28,7 @@
#include <KIcon>
#include <KPushButton>
#include <klocalizedstring.h>
+#include <KXmlGuiWindow>
// Qt Includes
#include <QtGui/QWidget>
diff --git a/src/history.h b/src/history.h
index 1b504333..dabd6883 100644
--- a/src/history.h
+++ b/src/history.h
@@ -48,15 +48,10 @@ class HistoryItem
{
public:
HistoryItem() {}
-<<<<<<< HEAD:src/history.h
- HistoryItem(const QString &u,
- const QDateTime &d = QDateTime(), const QString &t = QString())
-=======
explicit HistoryItem(const QString &u,
const QDateTime &d = QDateTime(),
const QString &t = QString()
)
->>>>>>> master:src/history.h
: title(t), url(u), dateTime(d) {}
inline bool operator==(const HistoryItem &other) const
@@ -166,11 +161,8 @@ public:
UrlStringRole = Qt::UserRole + 4
};
-<<<<<<< HEAD:src/history.h
- HistoryModel(HistoryManager *history, QObject *parent = 0);
-=======
explicit HistoryModel(HistoryManager *history, QObject *parent = 0);
->>>>>>> master:src/history.h
+
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
int columnCount(const QModelIndex &parent = QModelIndex()) const;
@@ -196,11 +188,7 @@ class HistoryFilterModel : public QAbstractProxyModel
Q_OBJECT
public:
-<<<<<<< HEAD:src/history.h
- HistoryFilterModel(QAbstractItemModel *sourceModel, QObject *parent = 0);
-=======
explicit HistoryFilterModel(QAbstractItemModel *sourceModel, QObject *parent = 0);
->>>>>>> master:src/history.h
inline bool historyContains(const QString &url) const
{
@@ -251,11 +239,8 @@ class HistoryMenuModel : public QAbstractProxyModel
Q_OBJECT
public:
-<<<<<<< HEAD:src/history.h
- HistoryMenuModel(HistoryTreeModel *sourceModel, QObject *parent = 0);
-=======
explicit HistoryMenuModel(HistoryTreeModel *sourceModel, QObject *parent = 0);
->>>>>>> master:src/history.h
+
int columnCount(const QModelIndex &parent) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const;
QModelIndex mapFromSource(const QModelIndex & sourceIndex) const;
@@ -347,11 +332,8 @@ class HistoryTreeModel : public QAbstractProxyModel
Q_OBJECT
public:
-<<<<<<< HEAD:src/history.h
- HistoryTreeModel(QAbstractItemModel *sourceModel, QObject *parent = 0);
-=======
explicit HistoryTreeModel(QAbstractItemModel *sourceModel, QObject *parent = 0);
->>>>>>> master:src/history.h
+
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
int columnCount(const QModelIndex &parent) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const;
@@ -422,4 +404,3 @@ private slots:
};
#endif // HISTORY_H
-
diff --git a/src/mainview.cpp b/src/mainview.cpp
index 71f81d66..5432fa51 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -713,8 +713,4 @@ void MainView::mouseDoubleClickEvent(QMouseEvent *event)
return;
}
KTabWidget::mouseDoubleClickEvent(event);
-<<<<<<< HEAD:src/mainview.cpp
}
-=======
-}
->>>>>>> master:src/mainview.cpp
diff --git a/src/webview.cpp b/src/webview.cpp
index c015a941..5842ae4f 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -91,11 +91,12 @@ bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &r
// An HTML form was submitted a second time.
case QWebPage::NavigationTypeFormResubmitted:
kDebug() << "NavigationTypeFormResubmitted";
-
+ break;
// A navigation to another document using a method not listed above.
case QWebPage::NavigationTypeOther:
kDebug() << "NavigationTypeOther";
+ break;
// user clicked on a link or pressed return on a focused link.
case QWebPage::NavigationTypeLinkClicked:
@@ -129,14 +130,6 @@ bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &r
break;
- // An HTML form was submitted a second time.
- case QWebPage::NavigationTypeFormResubmitted:
- break;
-
- // A navigation to another document using a method not listed above.
- case QWebPage::NavigationTypeOther:
- break;
-
// should be nothing..
default:
kDebug() << "Default NON existant case..";
--
cgit v1.2.1