projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5e28ac5
)
fixes 898
author
Thomas Mueller
<thomas.mueller@tmit.eu>
Thu, 21 Jan 2010 21:24:16 +0000
(22:24 +0100)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Thu, 11 Mar 2010 17:58:50 +0000
(18:58 +0100)
src/client/networkmodel.cpp
patch
|
blob
|
history
src/client/selectionmodelsynchronizer.cpp
patch
|
blob
|
history
src/client/treemodel.cpp
patch
|
blob
|
history
src/core/postgresqlstorage.cpp
patch
|
blob
|
history
src/uisupport/flatproxymodel.cpp
patch
|
blob
|
history
src/uisupport/nickviewfilter.cpp
patch
|
blob
|
history
diff --git
a/src/client/networkmodel.cpp
b/src/client/networkmodel.cpp
index
bb0eca5
..
d745431
100644
(file)
--- a/
src/client/networkmodel.cpp
+++ b/
src/client/networkmodel.cpp
@@
-108,7
+108,7
@@
BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) {
newChild(bufferItem);
newChild(bufferItem);
- // postprocess... this is necessary because Qt doesn't seem to like adding child
s which already have childs
on their own
+ // postprocess... this is necessary because Qt doesn't seem to like adding child
ren which already have children
on their own
switch(bufferInfo.type()) {
case BufferInfo::ChannelBuffer:
{
switch(bufferInfo.type()) {
case BufferInfo::ChannelBuffer:
{
diff --git
a/src/client/selectionmodelsynchronizer.cpp
b/src/client/selectionmodelsynchronizer.cpp
index
f503d92
..
625ec3f
100644
(file)
--- 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)) {
void SelectionModelSynchronizer::synchronizeSelectionModel(QItemSelectionModel *selectionModel) {
if(!checkBaseModel(selectionModel)) {
- qWarning() << "cannot Syncronize SelectionModel" << selectionModel << "which has a different baseModel()";
+ qWarning() << "cannot Sync
h
ronize SelectionModel" << selectionModel << "which has a different baseModel()";
return;
}
return;
}
diff --git
a/src/client/treemodel.cpp
b/src/client/treemodel.cpp
index
000eaaa
..
cc1b08a
100644
(file)
--- 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<AbstractTreeItem *>(sender());
if(!parentItem) {
void TreeModel::beginAppendChilds(int firstRow, int lastRow) {
AbstractTreeItem *parentItem = qobject_cast<AbstractTreeItem *>(sender());
if(!parentItem) {
- qWarning() << "TreeModel::beginAppendChilds(): cannot append Child
s
to unknown parent";
+ qWarning() << "TreeModel::beginAppendChilds(): cannot append Child
ren
to unknown parent";
return;
}
return;
}
@@
-474,7
+474,7
@@
void TreeModel::beginAppendChilds(int firstRow, int lastRow) {
void TreeModel::endAppendChilds() {
AbstractTreeItem *parentItem = qobject_cast<AbstractTreeItem *>(sender());
if(!parentItem) {
void TreeModel::endAppendChilds() {
AbstractTreeItem *parentItem = qobject_cast<AbstractTreeItem *>(sender());
if(!parentItem) {
- qWarning() << "TreeModel::endAppendChilds(): cannot append Child
s
to unknown parent";
+ qWarning() << "TreeModel::endAppendChilds(): cannot append Child
ren
to unknown parent";
return;
}
Q_ASSERT(_aboutToRemoveOrInsert);
return;
}
Q_ASSERT(_aboutToRemoveOrInsert);
@@
-493,7
+493,7
@@
void TreeModel::endAppendChilds() {
void TreeModel::beginRemoveChilds(int firstRow, int lastRow) {
AbstractTreeItem *parentItem = qobject_cast<AbstractTreeItem *>(sender());
if(!parentItem) {
void TreeModel::beginRemoveChilds(int firstRow, int lastRow) {
AbstractTreeItem *parentItem = qobject_cast<AbstractTreeItem *>(sender());
if(!parentItem) {
- qWarning() << "TreeModel::beginRemoveChilds(): cannot append Child
s
to unknown parent";
+ qWarning() << "TreeModel::beginRemoveChilds(): cannot append Child
ren
to unknown parent";
return;
}
return;
}
@@
-515,7
+515,7
@@
void TreeModel::beginRemoveChilds(int firstRow, int lastRow) {
void TreeModel::endRemoveChilds() {
AbstractTreeItem *parentItem = qobject_cast<AbstractTreeItem *>(sender());
if(!parentItem) {
void TreeModel::endRemoveChilds() {
AbstractTreeItem *parentItem = qobject_cast<AbstractTreeItem *>(sender());
if(!parentItem) {
- qWarning() << "TreeModel::endRemoveChilds(): cannot remove Child
s
from unknown parent";
+ qWarning() << "TreeModel::endRemoveChilds(): cannot remove Child
ren
from unknown parent";
return;
}
return;
}
diff --git
a/src/core/postgresqlstorage.cpp
b/src/core/postgresqlstorage.cpp
index
0ae2d6d
..
27c2866
100644
(file)
--- a/
src/core/postgresqlstorage.cpp
+++ b/
src/core/postgresqlstorage.cpp
@@
-338,7
+338,7
@@
IdentityId PostgreSqlStorage::createIdentity(UserId user, CoreIdentity &identity
}
if(!db.commit()) {
}
if(!db.commit()) {
- qWarning() << "PostgreSqlStorage::createIdentity(): commiting data failed!";
+ qWarning() << "PostgreSqlStorage::createIdentity(): commit
t
ing data failed!";
qWarning() << " -" << qPrintable(db.lastError().text());
return IdentityId();
}
qWarning() << " -" << qPrintable(db.lastError().text());
return IdentityId();
}
@@
-421,7
+421,7
@@
bool PostgreSqlStorage::updateIdentity(UserId user, const CoreIdentity &identity
}
if(!db.commit()) {
}
if(!db.commit()) {
- qWarning() << "PostgreSqlStorage::updateIdentity(): commiting data failed!";
+ qWarning() << "PostgreSqlStorage::updateIdentity(): commit
t
ing data failed!";
qWarning() << " -" << qPrintable(db.lastError().text());
return false;
}
qWarning() << " -" << qPrintable(db.lastError().text());
return false;
}
@@
-550,7
+550,7
@@
NetworkId PostgreSqlStorage::createNetwork(UserId user, const NetworkInfo &info)
}
if(!db.commit()) {
}
if(!db.commit()) {
- qWarning() << "PostgreSqlStorage::createNetwork(): commiting data failed!";
+ qWarning() << "PostgreSqlStorage::createNetwork(): commit
t
ing data failed!";
qWarning() << " -" << qPrintable(db.lastError().text());
return NetworkId();
}
qWarning() << " -" << qPrintable(db.lastError().text());
return NetworkId();
}
@@
-640,7
+640,7
@@
bool PostgreSqlStorage::updateNetwork(UserId user, const NetworkInfo &info) {
}
if(!db.commit()) {
}
if(!db.commit()) {
- qWarning() << "PostgreSqlStorage::updateNetwork(): commiting data failed!";
+ qWarning() << "PostgreSqlStorage::updateNetwork(): commit
t
ing data failed!";
qWarning() << " -" << qPrintable(db.lastError().text());
return false;
}
qWarning() << " -" << qPrintable(db.lastError().text());
return false;
}
diff --git
a/src/uisupport/flatproxymodel.cpp
b/src/uisupport/flatproxymodel.cpp
index
b8fdc2f
..
19f543b
100644
(file)
--- 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) {
// 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 child
s
on their own!" << sourceModel()->index(row, 0, parent);
+ qWarning() << "on_rowsAboutToBeRemoved(): sourceModel() removed rows which have child
ren
on their own!" << sourceModel()->index(row, 0, parent);
Q_ASSERT(false);
}
}
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) {
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 child
s
on their own!" << child;
+ qWarning() << "on_rowsInserted(): sourceModel() inserted rows which already have child
ren
on their own!" << child;
Q_ASSERT(false);
}
}
Q_ASSERT(false);
}
}
diff --git
a/src/uisupport/nickviewfilter.cpp
b/src/uisupport/nickviewfilter.cpp
index
ea33660
..
72f9caa
100644
(file)
--- 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 {
}
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 child
s
are accepted
+ // root node, networkindexes, the bufferindex of the buffer this filter is active for and it's child
ren
are accepted
if(!source_parent.isValid())
return true;
if(!source_parent.isValid())
return true;