summaryrefslogtreecommitdiff
path: root/src/history
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2012-05-27 22:58:44 +0200
committerAndrea Diamantini <adjam7@gmail.com>2012-05-27 23:34:32 +0200
commit807e20570cbfef6e258313565598905564f1bb86 (patch)
tree695b3c940bce02305224e5781a7c48b5a6fdab94 /src/history
parentRuntime Nepomuk tagging check (diff)
downloadrekonq-807e20570cbfef6e258313565598905564f1bb86.tar.xz
Kitchen sink clean up
- astyle - copyrights - (some) includes
Diffstat (limited to 'src/history')
-rw-r--r--src/history/historymanager.cpp4
-rw-r--r--src/history/historymodels.cpp48
2 files changed, 26 insertions, 26 deletions
diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp
index e55e8a98..5acb180e 100644
--- a/src/history/historymanager.cpp
+++ b/src/history/historymanager.cpp
@@ -104,7 +104,7 @@ void HistoryManager::addHistoryEntry(const KUrl &url, const QString &title)
{
if (ReKonfig::expireHistory() == 5) // DON'T STORE HISTORY!
return;
-
+
QWebSettings *globalSettings = QWebSettings::globalSettings();
if (globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
return;
@@ -169,7 +169,7 @@ void HistoryManager::setHistory(const QList<HistoryItem> &history, bool loadedAn
m_lastSavedUrl.clear();
m_saveTimer->changeOccurred();
}
-
+
emit historyReset();
}
diff --git a/src/history/historymodels.cpp b/src/history/historymodels.cpp
index 90886cac..93a7b941 100644
--- a/src/history/historymodels.cpp
+++ b/src/history/historymodels.cpp
@@ -224,12 +224,12 @@ void HistoryFilterModel::setSourceModel(QAbstractItemModel *newSourceModel)
if (sourceModel())
{
disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
- disconnect(sourceModel(), SIGNAL(dataChanged(QModelIndex,QModelIndex)),
- this, SLOT(dataChanged(QModelIndex,QModelIndex)));
- disconnect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
- this, SLOT(sourceRowsInserted(QModelIndex,int,int)));
- disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
- this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
+ disconnect(sourceModel(), SIGNAL(dataChanged(QModelIndex, QModelIndex)),
+ this, SLOT(dataChanged(QModelIndex, QModelIndex)));
+ disconnect(sourceModel(), SIGNAL(rowsInserted(QModelIndex, int, int)),
+ this, SLOT(sourceRowsInserted(QModelIndex, int, int)));
+ disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)),
+ this, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
}
QAbstractProxyModel::setSourceModel(newSourceModel);
@@ -238,12 +238,12 @@ void HistoryFilterModel::setSourceModel(QAbstractItemModel *newSourceModel)
{
m_loaded = false;
connect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
- connect(sourceModel(), SIGNAL(dataChanged(QModelIndex,QModelIndex)),
- this, SLOT(sourceDataChanged(QModelIndex,QModelIndex)));
- connect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
- this, SLOT(sourceRowsInserted(QModelIndex,int,int)));
- connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
- this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
+ connect(sourceModel(), SIGNAL(dataChanged(QModelIndex, QModelIndex)),
+ this, SLOT(sourceDataChanged(QModelIndex, QModelIndex)));
+ connect(sourceModel(), SIGNAL(rowsInserted(QModelIndex, int, int)),
+ this, SLOT(sourceRowsInserted(QModelIndex, int, int)));
+ connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)),
+ this, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
}
}
@@ -405,16 +405,16 @@ bool HistoryFilterModel::removeRows(int row, int count, const QModelIndex &paren
if (row < 0 || count <= 0 || row + count > rowCount(parent) || parent.isValid())
return false;
int lastRow = row + count - 1;
- disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
- this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
+ disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)),
+ this, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
beginRemoveRows(parent, row, lastRow);
int oldCount = rowCount();
int start = sourceModel()->rowCount() - m_sourceRow.value(row);
int end = sourceModel()->rowCount() - m_sourceRow.value(lastRow);
sourceModel()->removeRows(start, end - start + 1);
endRemoveRows();
- connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
- this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
+ connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)),
+ this, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
m_loaded = false;
if (oldCount - count != rowCount())
reset();
@@ -625,10 +625,10 @@ void HistoryTreeModel::setSourceModel(QAbstractItemModel *newSourceModel)
{
disconnect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
disconnect(sourceModel(), SIGNAL(layoutChanged()), this, SLOT(sourceReset()));
- disconnect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
- this, SLOT(sourceRowsInserted(QModelIndex,int,int)));
- disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
- this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
+ disconnect(sourceModel(), SIGNAL(rowsInserted(QModelIndex, int, int)),
+ this, SLOT(sourceRowsInserted(QModelIndex, int, int)));
+ disconnect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)),
+ this, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
}
QAbstractProxyModel::setSourceModel(newSourceModel);
@@ -637,10 +637,10 @@ void HistoryTreeModel::setSourceModel(QAbstractItemModel *newSourceModel)
{
connect(sourceModel(), SIGNAL(modelReset()), this, SLOT(sourceReset()));
connect(sourceModel(), SIGNAL(layoutChanged()), this, SLOT(sourceReset()));
- connect(sourceModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
- this, SLOT(sourceRowsInserted(QModelIndex,int,int)));
- connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)),
- this, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
+ connect(sourceModel(), SIGNAL(rowsInserted(QModelIndex, int, int)),
+ this, SLOT(sourceRowsInserted(QModelIndex, int, int)));
+ connect(sourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)),
+ this, SLOT(sourceRowsRemoved(QModelIndex, int, int)));
}
reset();