diff options
Diffstat (limited to 'src/history.h')
| -rw-r--r-- | src/history.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/history.h b/src/history.h index ecae00c3..1b504333 100644 --- a/src/history.h +++ b/src/history.h @@ -48,8 +48,15 @@ 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 @@ -159,7 +166,11 @@ 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; @@ -185,7 +196,11 @@ 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 { @@ -236,7 +251,11 @@ 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; @@ -328,7 +347,11 @@ 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; |