This affects mostly iterators.
26 files changed:
currentIds += CoreAccountSettings().bufferViewOverlay();
QSet<int>::const_iterator iter;
currentIds += CoreAccountSettings().bufferViewOverlay();
QSet<int>::const_iterator iter;
- for (iter = currentIds.constBegin(); iter != currentIds.constEnd(); iter++) {
+ for (iter = currentIds.constBegin(); iter != currentIds.constEnd(); ++iter) {
else {
if (!config->isInitialized())
_uninitializedViewCount++;
else {
if (!config->isInitialized())
_uninitializedViewCount++;
if (Client::bufferViewManager()) {
BufferViewConfig *config = 0;
QSet<int>::const_iterator viewIter;
if (Client::bufferViewManager()) {
BufferViewConfig *config = 0;
QSet<int>::const_iterator viewIter;
- for (viewIter = _bufferViewIds.constBegin(); viewIter != _bufferViewIds.constEnd(); viewIter++) {
+ for (viewIter = _bufferViewIds.constBegin(); viewIter != _bufferViewIds.constEnd(); ++viewIter) {
config = Client::bufferViewManager()->bufferViewConfig(*viewIter);
if (!config)
continue;
config = Client::bufferViewManager()->bufferViewConfig(*viewIter);
if (!config)
continue;
QVariantList channelVar = iter->toList();
ChannelDescription channelDescription(channelVar[0].toString(), channelVar[1].toUInt(), channelVar[2].toString());
channelList << channelDescription;
QVariantList channelVar = iter->toList();
ChannelDescription channelDescription(channelVar[0].toString(), channelVar[1].toUInt(), channelVar[2].toString());
channelList << channelDescription;
}
emit channelListReceived(netId, channelFilters, channelList);
}
emit channelListReceived(netId, channelFilters, channelList);
{
QSet<int> viewIds;
QVariantList variants = accountValue("BufferViewOverlay").toList();
{
QSet<int> viewIds;
QVariantList variants = accountValue("BufferViewOverlay").toList();
- for (QVariantList::const_iterator iter = variants.constBegin(); iter != variants.constEnd(); iter++) {
+ for (QVariantList::const_iterator iter = variants.constBegin(); iter != variants.constEnd(); ++iter) {
viewIds << iter->toInt();
}
return viewIds;
viewIds << iter->toInt();
}
return viewIds;
while (idIter != _validBuffers.constEnd()) {
if (Client::networkModel()->bufferType(*idIter) == BufferInfo::StatusBuffer)
return true;
while (idIter != _validBuffers.constEnd()) {
if (Client::networkModel()->bufferType(*idIter) == BufferInfo::StatusBuffer)
return true;
QSet<BufferId>::const_iterator bufferIdIter = _validBuffers.constBegin();
while (bufferIdIter != _validBuffers.constEnd()) {
Client::messageModel()->requestBacklog(*bufferIdIter);
QSet<BufferId>::const_iterator bufferIdIter = _validBuffers.constBegin();
while (bufferIdIter != _validBuffers.constEnd()) {
Client::messageModel()->requestBacklog(*bufferIdIter);
QList<Message>::const_iterator iter;
if (inOrder) {
iter = msglist.constEnd();
QList<Message>::const_iterator iter;
if (inOrder) {
iter = msglist.constEnd();
- iter--; // this op is safe as we've allready passed an empty check
+ --iter; // this op is safe as we've allready passed an empty check
}
else {
iter = msglist.constBegin();
}
else {
iter = msglist.constBegin();
if (inOrder) {
while (iter != msglist.constBegin()) {
if (inOrder) {
while (iter != msglist.constBegin()) {
if (!fastForward && (*iter).msgId() <= minId)
break;
if (!fastForward && (*iter).msgId() <= minId)
break;
dupeId = (*iter).msgId();
grouplist.prepend(*iter);
}
dupeId = (*iter).msgId();
grouplist.prepend(*iter);
}
QHash<UserCategoryItem *, QList<IrcUser *> >::const_iterator catIter = categories.constBegin();
while (catIter != categories.constEnd()) {
catIter.key()->addUsers(catIter.value());
QHash<UserCategoryItem *, QList<IrcUser *> >::const_iterator catIter = categories.constBegin();
while (catIter != categories.constEnd()) {
catIter.key()->addUsers(catIter.value());
iter = _selectionModels.erase(iter);
}
else {
iter = _selectionModels.erase(iter);
}
else {
QSet<QItemSelectionModel *>::iterator iter = _selectionModels.begin();
while (iter != _selectionModels.end()) {
(*iter)->setCurrentIndex(mapFromSource(current, (*iter)), QItemSelectionModel::Current);
QSet<QItemSelectionModel *>::iterator iter = _selectionModels.begin();
while (iter != _selectionModels.end()) {
(*iter)->setCurrentIndex(mapFromSource(current, (*iter)), QItemSelectionModel::Current);
}
_changeCurrentEnabled = true;
}
}
_changeCurrentEnabled = true;
}
QSet<QItemSelectionModel *>::iterator iter = _selectionModels.begin();
while (iter != _selectionModels.end()) {
(*iter)->select(mapSelectionFromSource(currentSelection(), (*iter)), QItemSelectionModel::ClearAndSelect);
QSet<QItemSelectionModel *>::iterator iter = _selectionModels.begin();
while (iter != _selectionModels.end()) {
(*iter)->select(mapSelectionFromSource(currentSelection(), (*iter)), QItemSelectionModel::ClearAndSelect);
}
_changeSelectionEnabled = true;
}
}
_changeSelectionEnabled = true;
}
child = *childIter;
child->setTreeItemFlags(0); // disable self deletion, as this would only fuck up consitency and the child gets deleted anyways
child->removeAllChilds();
child = *childIter;
child->setTreeItemFlags(0); // disable self deletion, as this would only fuck up consitency and the child gets deleted anyways
child->removeAllChilds();
}
emit beginRemoveChilds(0, numChilds - 1);
}
emit beginRemoveChilds(0, numChilds - 1);
while (childIter != _childItems.constEnd()) {
child = *childIter;
qDebug() << "Row:" << child->row() << child << child->data(0, Qt::DisplayRole);
while (childIter != _childItems.constEnd()) {
child = *childIter;
qDebug() << "Row:" << child->row() << child << child->data(0, Qt::DisplayRole);
}
}
qDebug() << "==== End Of Childlist ====";
}
}
qDebug() << "==== End Of Childlist ====";
BufferViewConfigHash::const_iterator iterEnd = _bufferViewConfigs.constEnd();
while (iter != iterEnd) {
bufferViewIds << (*iter)->bufferViewId();
BufferViewConfigHash::const_iterator iterEnd = _bufferViewConfigs.constEnd();
while (iter != iterEnd) {
bufferViewIds << (*iter)->bufferViewId();
}
return bufferViewIds;
}
}
return bufferViewIds;
}
QVariantList::const_iterator iterEnd = bufferViewIds.constEnd();
while (iter != iterEnd) {
newBufferViewConfig((*iter).value<int>());
QVariantList::const_iterator iterEnd = bufferViewIds.constEnd();
while (iter != iterEnd) {
newBufferViewConfig((*iter).value<int>());
else value = currentArg->toLocal8Bit();
name = currentArg->mid(1).toLatin1().at(0);
// we took one argument as argument to an option so skip it next time
else value = currentArg->toLocal8Bit();
name = currentArg->mid(1).toLatin1().at(0);
// we took one argument as argument to an option so skip it next time
- if (skipNext) currentArg++;
+ if (skipNext) ++currentArg;
if (!addShortArg(CliParserArg::CliArgOption, name, value)) return false;
}
}
if (!addShortArg(CliParserArg::CliArgOption, name, value)) return false;
}
}
QHash<IrcUser *, QString>::const_iterator iter = _userModes.constBegin();
while (iter != _userModes.constEnd()) {
usermodes[iter.key()->nick()] = iter.value();
QHash<IrcUser *, QString>::const_iterator iter = _userModes.constBegin();
while (iter != _userModes.constEnd()) {
usermodes[iter.key()->nick()] = iter.value();
while (iter != usermodes.constEnd()) {
users << network()->newIrcUser(iter.key());
modes << iter.value().toString();
while (iter != usermodes.constEnd()) {
users << network()->newIrcUser(iter.key());
modes << iter.value().toString();
}
joinIrcUsers(users, modes);
}
}
joinIrcUsers(users, modes);
}
QHash<QChar, QStringList>::const_iterator A_iter = _A_channelModes.constBegin();
while (A_iter != _A_channelModes.constEnd()) {
A_modes[A_iter.key()] = A_iter.value();
QHash<QChar, QStringList>::const_iterator A_iter = _A_channelModes.constBegin();
while (A_iter != _A_channelModes.constEnd()) {
A_modes[A_iter.key()] = A_iter.value();
}
channelModes["A"] = A_modes;
}
channelModes["A"] = A_modes;
QHash<QChar, QString>::const_iterator B_iter = _B_channelModes.constBegin();
while (B_iter != _B_channelModes.constEnd()) {
B_modes[B_iter.key()] = B_iter.value();
QHash<QChar, QString>::const_iterator B_iter = _B_channelModes.constBegin();
while (B_iter != _B_channelModes.constEnd()) {
B_modes[B_iter.key()] = B_iter.value();
}
channelModes["B"] = B_modes;
}
channelModes["B"] = B_modes;
QHash<QChar, QString>::const_iterator C_iter = _C_channelModes.constBegin();
while (C_iter != _C_channelModes.constEnd()) {
C_modes[C_iter.key()] = C_iter.value();
QHash<QChar, QString>::const_iterator C_iter = _C_channelModes.constBegin();
while (C_iter != _C_channelModes.constEnd()) {
C_modes[C_iter.key()] = C_iter.value();
}
channelModes["C"] = C_modes;
}
channelModes["C"] = C_modes;
QSet<QChar>::const_iterator D_iter = _D_channelModes.constBegin();
while (D_iter != _D_channelModes.constEnd()) {
D_modes += *D_iter;
QSet<QChar>::const_iterator D_iter = _D_channelModes.constBegin();
while (D_iter != _D_channelModes.constEnd()) {
D_modes += *D_iter;
}
channelModes["D"] = D_modes;
}
channelModes["D"] = D_modes;
QVariantMap::const_iterator iterEnd = channelModes["A"].toMap().constEnd();
while (iter != iterEnd) {
_A_channelModes[iter.key()[0]] = iter.value().toStringList();
QVariantMap::const_iterator iterEnd = channelModes["A"].toMap().constEnd();
while (iter != iterEnd) {
_A_channelModes[iter.key()[0]] = iter.value().toStringList();
}
iter = channelModes["B"].toMap().constBegin();
iterEnd = channelModes["B"].toMap().constEnd();
while (iter != iterEnd) {
_B_channelModes[iter.key()[0]] = iter.value().toString();
}
iter = channelModes["B"].toMap().constBegin();
iterEnd = channelModes["B"].toMap().constEnd();
while (iter != iterEnd) {
_B_channelModes[iter.key()[0]] = iter.value().toString();
}
iter = channelModes["C"].toMap().constBegin();
iterEnd = channelModes["C"].toMap().constEnd();
while (iter != iterEnd) {
_C_channelModes[iter.key()[0]] = iter.value().toString();
}
iter = channelModes["C"].toMap().constBegin();
iterEnd = channelModes["C"].toMap().constEnd();
while (iter != iterEnd) {
_C_channelModes[iter.key()[0]] = iter.value().toString();
}
QString D_modes = channelModes["D"].toString();
}
QString D_modes = channelModes["D"].toString();
QSet<QChar>::const_iterator D_iter = _D_channelModes.constBegin();
while (D_iter != _D_channelModes.constEnd()) {
modeString += *D_iter;
QSet<QChar>::const_iterator D_iter = _D_channelModes.constBegin();
while (D_iter != _D_channelModes.constEnd()) {
modeString += *D_iter;
}
QHash<QChar, QString>::const_iterator BC_iter = _C_channelModes.constBegin();
while (BC_iter != _C_channelModes.constEnd()) {
modeString += BC_iter.key();
params << BC_iter.value();
}
QHash<QChar, QString>::const_iterator BC_iter = _C_channelModes.constBegin();
while (BC_iter != _C_channelModes.constEnd()) {
modeString += BC_iter.key();
params << BC_iter.value();
}
BC_iter = _B_channelModes.constBegin();
while (BC_iter != _B_channelModes.constEnd()) {
modeString += BC_iter.key();
params << BC_iter.value();
}
BC_iter = _B_channelModes.constBegin();
while (BC_iter != _B_channelModes.constEnd()) {
modeString += BC_iter.key();
params << BC_iter.value();
}
if (modeString.isEmpty())
return modeString;
}
if (modeString.isEmpty())
return modeString;
objIter = classIter->erase(objIter);
obj->stopSynchronize(this);
}
objIter = classIter->erase(objIter);
obj->stopSynchronize(this);
}
slotIter = _attachedSlots.erase(slotIter);
}
else
slotIter = _attachedSlots.erase(slotIter);
}
else
classIter->remove(obj->objectName());
break;
}
classIter->remove(obj->objectName());
break;
}
}
obj->stopSynchronize(this);
}
}
obj->stopSynchronize(this);
}
while (iterator != properties.constEnd()) {
propName = iterator.key();
if (propName == "objectName") {
while (iterator != properties.constEnd()) {
propName = iterator.key();
if (propName == "objectName") {
else
setProperty(propName.toLatin1(), iterator.value());
// qDebug() << "<<< SYNC:" << name << iterator.value();
else
setProperty(propName.toLatin1(), iterator.value());
// qDebug() << "<<< SYNC:" << name << iterator.value();
{
// disconnect the connections, so their deletion is no longer interessting for us
QHash<QThread *, Connection *>::iterator conIter;
{
// disconnect the connections, so their deletion is no longer interessting for us
QHash<QThread *, Connection *>::iterator conIter;
- for (conIter = _connectionPool.begin(); conIter != _connectionPool.end(); conIter++) {
+ for (conIter = _connectionPool.begin(); conIter != _connectionPool.end(); ++conIter) {
QSqlDatabase::removeDatabase(conIter.value()->name());
disconnect(conIter.value(), 0, this, 0);
}
QSqlDatabase::removeDatabase(conIter.value()->name());
disconnect(conIter.value(), 0, this, 0);
}
QVariantMap boundValues = query.boundValues();
QStringList valueStrings;
QVariantMap::const_iterator iter;
QVariantMap boundValues = query.boundValues();
QStringList valueStrings;
QVariantMap::const_iterator iter;
- for (iter = boundValues.constBegin(); iter != boundValues.constEnd(); iter++) {
+ for (iter = boundValues.constBegin(); iter != boundValues.constEnd(); ++iter) {
QString value;
QSqlField field;
if (query.driver()) {
QString value;
QSqlField field;
if (query.driver()) {
QList<Message>::const_iterator msgListEnd = msgList.constEnd();
while (msgIter != msgListEnd) {
backlog << qVariantFromValue(*msgIter);
QList<Message>::const_iterator msgListEnd = msgList.constEnd();
while (msgIter != msgListEnd) {
backlog << qVariantFromValue(*msgIter);
}
if (additional && limit != 0) {
}
if (additional && limit != 0) {
msgListEnd = msgList.constEnd();
while (msgIter != msgListEnd) {
backlog << qVariantFromValue(*msgIter);
msgListEnd = msgList.constEnd();
while (msgIter != msgListEnd) {
backlog << qVariantFromValue(*msgIter);
QList<Message>::const_iterator msgListEnd = msgList.constEnd();
while (msgIter != msgListEnd) {
backlog << qVariantFromValue(*msgIter);
QList<Message>::const_iterator msgListEnd = msgList.constEnd();
while (msgIter != msgListEnd) {
backlog << qVariantFromValue(*msgIter);
msgListEnd = msgList.constEnd();
while (msgIter != msgListEnd) {
backlog << qVariantFromValue(*msgIter);
msgListEnd = msgList.constEnd();
while (msgIter != msgListEnd) {
backlog << qVariantFromValue(*msgIter);
while (iter != iterEnd) {
config = new CoreBufferViewConfig(iter.key().toInt(), iter.value().toMap(), this);
addBufferViewConfig(config);
while (iter != iterEnd) {
config = new CoreBufferViewConfig(iter.key().toInt(), iter.value().toMap(), this);
addBufferViewConfig(config);
BufferViewConfigHash::const_iterator iterEnd = bufferViewConfigHash().constEnd();
while (iter != iterEnd) {
views[QString::number((*iter)->bufferViewId())] = (*iter)->toVariantMap();
BufferViewConfigHash::const_iterator iterEnd = bufferViewConfigHash().constEnd();
while (iter != iterEnd) {
views[QString::number((*iter)->bufferViewId())] = (*iter)->toVariantMap();
}
Core::setUserSetting(_coreSession->user(), "BufferViews", views);
}
Core::setUserSetting(_coreSession->user(), "BufferViews", views);
if ((*iter)->bufferViewId() > maxId)
maxId = (*iter)->bufferViewId();
if ((*iter)->bufferViewId() > maxId)
maxId = (*iter)->bufferViewId();
QVariantList::const_iterator iterEnd = properties.constEnd();
while (iter != iterEnd) {
requestCreateBufferView((*iter).toMap());
QVariantList::const_iterator iterEnd = properties.constEnd();
while (iter != iterEnd) {
requestCreateBufferView((*iter).toMap());
networkIter = networkInfos.erase(networkIter);
}
else {
networkIter = networkInfos.erase(networkIter);
}
else {
}
}
s.removeIdentity(id);
}
}
s.removeIdentity(id);
messageIter = _messageQueue.erase(messageIter);
}
else {
messageIter = _messageQueue.erase(messageIter);
}
else {
}
}
// remove buffers from syncer
}
}
// remove buffers from syncer
IrcUser *me = 0;
while (netIter != _networks.end()) {
net = *netIter;
IrcUser *me = 0;
while (netIter != _networks.end()) {
net = *netIter;
if (!net->isConnected())
continue;
if (!net->isConnected())
continue;
QString awayReason;
while (netIter != _networks.end()) {
net = *netIter;
QString awayReason;
while (netIter != _networks.end()) {
net = *netIter;
if (!net->isConnected())
continue;
if (!net->isConnected())
continue;
CoreNetwork *net = 0;
while (netIter != _networks.end()) {
net = *netIter;
CoreNetwork *net = 0;
while (netIter != _networks.end()) {
net = *netIter;
if (!net->isConnected())
continue;
if (!net->isConnected())
continue;
QHash<QByteArray, QByteArray>::const_iterator quoteIter = quoteHash.constBegin();
while (quoteIter != quoteHash.constEnd()) {
quotedMessage.replace(quoteIter.value(), quoteIter.key());
QHash<QByteArray, QByteArray>::const_iterator quoteIter = quoteHash.constBegin();
while (quoteIter != quoteHash.constEnd()) {
quotedMessage.replace(quoteIter.value(), quoteIter.key());
}
return quotedMessage;
}
}
return quotedMessage;
}
QHash<QByteArray, QByteArray>::const_iterator quoteIter = _ctcpXDelimDequoteHash.constBegin();
while (quoteIter != _ctcpXDelimDequoteHash.constEnd()) {
quotedMessage.replace(quoteIter.value(), quoteIter.key());
QHash<QByteArray, QByteArray>::const_iterator quoteIter = _ctcpXDelimDequoteHash.constBegin();
while (quoteIter != _ctcpXDelimDequoteHash.constEnd()) {
quotedMessage.replace(quoteIter.value(), quoteIter.key());
}
return quotedMessage;
}
}
return quotedMessage;
}
<< Sequence("quasseluser", "userid")
<< Sequence("sender", "senderid");
QList<Sequence>::const_iterator iter;
<< Sequence("quasseluser", "userid")
<< Sequence("sender", "senderid");
QList<Sequence>::const_iterator iter;
- for (iter = sequences.constBegin(); iter != sequences.constEnd(); iter++) {
+ for (iter = sequences.constBegin(); iter != sequences.constEnd(); ++iter) {
resetQuery();
newQuery(QString("SELECT setval('%1_%2_seq', max(%2)) FROM %1").arg(iter->table, iter->field), db);
if (!exec())
resetQuery();
newQuery(QString("SELECT setval('%1_%2_seq', max(%2)) FROM %1").arg(iter->table, iter->field), db);
if (!exec())
QPointF senderPos(firstColumnHandle()->sceneRight(), 0);
while (lineIter != lineIterBegin) {
QPointF senderPos(firstColumnHandle()->sceneRight(), 0);
while (lineIter != lineIterBegin) {
(*lineIter)->setFirstColumn(timestampWidth, senderWidth, senderPos);
}
//setItemIndexMethod(QGraphicsScene::BspTreeIndex);
(*lineIter)->setFirstColumn(timestampWidth, senderWidth, senderPos);
}
//setItemIndexMethod(QGraphicsScene::BspTreeIndex);
qreal contentsWidth = _sceneRect.width() - secondColumnHandle()->sceneRight();
QPointF contentsPos(secondColumnHandle()->sceneRight(), 0);
while (lineIter != lineIterBegin) {
qreal contentsWidth = _sceneRect.width() - secondColumnHandle()->sceneRight();
QPointF contentsPos(secondColumnHandle()->sceneRight(), 0);
while (lineIter != lineIterBegin) {
(*lineIter)->setSecondColumn(senderWidth, contentsWidth, contentsPos, linePos);
}
//setItemIndexMethod(QGraphicsScene::BspTreeIndex);
(*lineIter)->setSecondColumn(senderWidth, contentsWidth, contentsPos, linePos);
}
//setItemIndexMethod(QGraphicsScene::BspTreeIndex);
while (msgIter != msgIterEnd) {
checkForHighlight(*msgIter);
preProcess(*msgIter);
while (msgIter != msgIterEnd) {
checkForHighlight(*msgIter);
preProcess(*msgIter);
}
Client::messageModel()->insertMessages(msgs);
return;
}
Client::messageModel()->insertMessages(msgs);
return;
rule["CS"].toBool() ? Qt::CaseSensitive : Qt::CaseInsensitive,
rule["RegEx"].toBool(),
rule["Channel"].toString());
rule["CS"].toBool() ? Qt::CaseSensitive : Qt::CaseInsensitive,
rule["RegEx"].toBool(),
rule["Channel"].toString());
_editSsl = true;
QHash<IdentityId, CertIdentity *>::iterator idIter;
_editSsl = true;
QHash<IdentityId, CertIdentity *>::iterator idIter;
- for (idIter = identities.begin(); idIter != identities.end(); idIter++) {
+ for (idIter = identities.begin(); idIter != identities.end(); ++idIter) {
idIter.value()->enableEditSsl();
}
idIter.value()->enableEditSsl();
}
if (enable == false) {
addBuffers(QList<BufferId>::fromSet(_toAdd));
QSet<BufferId>::const_iterator iter;
if (enable == false) {
addBuffers(QList<BufferId>::fromSet(_toAdd));
QSet<BufferId>::const_iterator iter;
- for (iter = _toTempRemove.constBegin(); iter != _toTempRemove.constEnd(); iter++) {
+ for (iter = _toTempRemove.constBegin(); iter != _toTempRemove.constEnd(); ++iter) {
if (config()->temporarilyRemovedBuffers().contains(*iter))
continue;
config()->requestRemoveBuffer(*iter);
}
if (config()->temporarilyRemovedBuffers().contains(*iter))
continue;
config()->requestRemoveBuffer(*iter);
}
- for (iter = _toRemove.constBegin(); iter != _toRemove.constEnd(); iter++) {
+ for (iter = _toRemove.constBegin(); iter != _toRemove.constEnd(); ++iter) {
if (config()->removedBuffers().contains(*iter))
continue;
config()->requestRemoveBufferPermanently(*iter);
if (config()->removedBuffers().contains(*iter))
continue;
config()->requestRemoveBufferPermanently(*iter);
ignoreMenu->addAction(act);
}
counter++;
ignoreMenu->addAction(act);
}
counter++;
}
if (counter)
ignoreMenu->addSeparator();
}
if (counter)
ignoreMenu->addSeparator();