From 6f4a6454e49db703bd6336f575bbbeff95388404 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Thu, 21 Jan 2010 22:24:16 +0100 Subject: [PATCH] fixes 898 --- src/client/networkmodel.cpp | 2 +- src/client/selectionmodelsynchronizer.cpp | 2 +- src/client/treemodel.cpp | 8 ++++---- src/core/postgresqlstorage.cpp | 8 ++++---- src/uisupport/flatproxymodel.cpp | 4 ++-- src/uisupport/nickviewfilter.cpp | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp index bb0eca5e..d7454316 100644 --- a/src/client/networkmodel.cpp +++ b/src/client/networkmodel.cpp @@ -108,7 +108,7 @@ BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) { newChild(bufferItem); - // postprocess... this is necessary because Qt doesn't seem to like adding childs which already have childs on their own + // postprocess... this is necessary because Qt doesn't seem to like adding children which already have children on their own switch(bufferInfo.type()) { case BufferInfo::ChannelBuffer: { diff --git a/src/client/selectionmodelsynchronizer.cpp b/src/client/selectionmodelsynchronizer.cpp index f503d92c..625ec3f3 100644 --- a/src/client/selectionmodelsynchronizer.cpp +++ b/src/client/selectionmodelsynchronizer.cpp @@ -55,7 +55,7 @@ bool SelectionModelSynchronizer::checkBaseModel(QItemSelectionModel *selectionMo void SelectionModelSynchronizer::synchronizeSelectionModel(QItemSelectionModel *selectionModel) { if(!checkBaseModel(selectionModel)) { - qWarning() << "cannot Syncronize SelectionModel" << selectionModel << "which has a different baseModel()"; + qWarning() << "cannot Synchronize SelectionModel" << selectionModel << "which has a different baseModel()"; return; } diff --git a/src/client/treemodel.cpp b/src/client/treemodel.cpp index 000eaaa2..cc1b08a8 100644 --- a/src/client/treemodel.cpp +++ b/src/client/treemodel.cpp @@ -459,7 +459,7 @@ void TreeModel::connectItem(AbstractTreeItem *item) { void TreeModel::beginAppendChilds(int firstRow, int lastRow) { AbstractTreeItem *parentItem = qobject_cast(sender()); if(!parentItem) { - qWarning() << "TreeModel::beginAppendChilds(): cannot append Childs to unknown parent"; + qWarning() << "TreeModel::beginAppendChilds(): cannot append Children to unknown parent"; return; } @@ -474,7 +474,7 @@ void TreeModel::beginAppendChilds(int firstRow, int lastRow) { void TreeModel::endAppendChilds() { AbstractTreeItem *parentItem = qobject_cast(sender()); if(!parentItem) { - qWarning() << "TreeModel::endAppendChilds(): cannot append Childs to unknown parent"; + qWarning() << "TreeModel::endAppendChilds(): cannot append Children to unknown parent"; return; } Q_ASSERT(_aboutToRemoveOrInsert); @@ -493,7 +493,7 @@ void TreeModel::endAppendChilds() { void TreeModel::beginRemoveChilds(int firstRow, int lastRow) { AbstractTreeItem *parentItem = qobject_cast(sender()); if(!parentItem) { - qWarning() << "TreeModel::beginRemoveChilds(): cannot append Childs to unknown parent"; + qWarning() << "TreeModel::beginRemoveChilds(): cannot append Children to unknown parent"; return; } @@ -515,7 +515,7 @@ void TreeModel::beginRemoveChilds(int firstRow, int lastRow) { void TreeModel::endRemoveChilds() { AbstractTreeItem *parentItem = qobject_cast(sender()); if(!parentItem) { - qWarning() << "TreeModel::endRemoveChilds(): cannot remove Childs from unknown parent"; + qWarning() << "TreeModel::endRemoveChilds(): cannot remove Children from unknown parent"; return; } diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp index 0ae2d6d2..27c28668 100644 --- a/src/core/postgresqlstorage.cpp +++ b/src/core/postgresqlstorage.cpp @@ -338,7 +338,7 @@ IdentityId PostgreSqlStorage::createIdentity(UserId user, CoreIdentity &identity } if(!db.commit()) { - qWarning() << "PostgreSqlStorage::createIdentity(): commiting data failed!"; + qWarning() << "PostgreSqlStorage::createIdentity(): committing data failed!"; qWarning() << " -" << qPrintable(db.lastError().text()); return IdentityId(); } @@ -421,7 +421,7 @@ bool PostgreSqlStorage::updateIdentity(UserId user, const CoreIdentity &identity } if(!db.commit()) { - qWarning() << "PostgreSqlStorage::updateIdentity(): commiting data failed!"; + qWarning() << "PostgreSqlStorage::updateIdentity(): committing data failed!"; qWarning() << " -" << qPrintable(db.lastError().text()); return false; } @@ -550,7 +550,7 @@ NetworkId PostgreSqlStorage::createNetwork(UserId user, const NetworkInfo &info) } if(!db.commit()) { - qWarning() << "PostgreSqlStorage::createNetwork(): commiting data failed!"; + qWarning() << "PostgreSqlStorage::createNetwork(): committing data failed!"; qWarning() << " -" << qPrintable(db.lastError().text()); return NetworkId(); } @@ -640,7 +640,7 @@ bool PostgreSqlStorage::updateNetwork(UserId user, const NetworkInfo &info) { } if(!db.commit()) { - qWarning() << "PostgreSqlStorage::updateNetwork(): commiting data failed!"; + qWarning() << "PostgreSqlStorage::updateNetwork(): committing data failed!"; qWarning() << " -" << qPrintable(db.lastError().text()); return false; } diff --git a/src/uisupport/flatproxymodel.cpp b/src/uisupport/flatproxymodel.cpp index b8fdc2f4..19f543ba 100644 --- a/src/uisupport/flatproxymodel.cpp +++ b/src/uisupport/flatproxymodel.cpp @@ -506,7 +506,7 @@ void FlatProxyModel::on_rowsAboutToBeRemoved(const QModelIndex &parent, int star // sanity check - if that check fails our indexes would be messed up for(int row = start; row <= end; row++) { if(sourceItem->child(row)->childCount() > 0) { - qWarning() << "on_rowsAboutToBeRemoved(): sourceModel() removed rows which have childs on their own!" << sourceModel()->index(row, 0, parent); + qWarning() << "on_rowsAboutToBeRemoved(): sourceModel() removed rows which have children on their own!" << sourceModel()->index(row, 0, parent); Q_ASSERT(false); } } @@ -524,7 +524,7 @@ void FlatProxyModel::on_rowsInserted(const QModelIndex &parent, int start, int e for(int row = start; row <= end; row++) { QModelIndex child = sourceModel()->index(row, 0, parent); if(sourceModel()->rowCount(child) > 0) { - qWarning() << "on_rowsInserted(): sourceModel() inserted rows which already have childs on their own!" << child; + qWarning() << "on_rowsInserted(): sourceModel() inserted rows which already have children on their own!" << child; Q_ASSERT(false); } } diff --git a/src/uisupport/nickviewfilter.cpp b/src/uisupport/nickviewfilter.cpp index ea336605..72f9caad 100644 --- a/src/uisupport/nickviewfilter.cpp +++ b/src/uisupport/nickviewfilter.cpp @@ -40,7 +40,7 @@ NickViewFilter::NickViewFilter(const BufferId &bufferId, NetworkModel *parent) } bool NickViewFilter::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const { - // root node, networkindexes, the bufferindex of the buffer this filter is active for and it's childs are accepted + // root node, networkindexes, the bufferindex of the buffer this filter is active for and it's children are accepted if(!source_parent.isValid()) return true; -- 2.20.1