New gcc seems to be better at finding issues like unused (but set) variables,
so fix those.
QSet<int> CoreAccountSettings::bufferViewOverlay() {
QSet<int> viewIds;
QVariantList variants = accountValue("BufferViewOverlay").toList();
QSet<int> CoreAccountSettings::bufferViewOverlay() {
QSet<int> viewIds;
QVariantList variants = accountValue("BufferViewOverlay").toList();
- QVariantList::const_iterator iter = variants.constBegin();
for(QVariantList::const_iterator iter = variants.constBegin(); iter != variants.constEnd(); iter++) {
viewIds << iter->toInt();
}
for(QVariantList::const_iterator iter = variants.constBegin(); iter != variants.constEnd(); iter++) {
viewIds << iter->toInt();
}
- MsgId msgId = sourceIdx.data(MessageModel::MsgIdRole).value<MsgId>();
+ // MsgId msgId = sourceIdx.data(MessageModel::MsgIdRole).value<MsgId>();
Message::Flags flags = (Message::Flags)sourceIdx.data(MessageModel::FlagsRole).toInt();
NetworkId myNetworkId = networkId();
Message::Flags flags = (Message::Flags)sourceIdx.data(MessageModel::FlagsRole).toInt();
NetworkId myNetworkId = networkId();
switch(messageType) {
case Message::Notice:
if(Client::networkModel()->bufferType(bufferId) != BufferInfo::ChannelBuffer) {
switch(messageType) {
case Message::Notice:
if(Client::networkModel()->bufferType(bufferId) != BufferInfo::ChannelBuffer) {
- if(flags & Message::ServerMsg) {
- // server notice
- redirectionTarget = _serverNoticesTarget;
- } else {
- redirectionTarget = _userNoticesTarget;
- }
+ if(flags & Message::ServerMsg) {
+ // server notice
+ redirectionTarget = _serverNoticesTarget;
+ } else {
+ redirectionTarget = _userNoticesTarget;
+ }
}
break;
case Message::Error:
}
break;
case Message::Error:
if(redirectionTarget & BufferSettings::CurrentBuffer && !(flags & Message::Backlog)) {
BufferId redirectedTo = sourceModel()->data(sourceIdx, MessageModel::RedirectedToRole).value<BufferId>();
if(!redirectedTo.isValid()) {
if(redirectionTarget & BufferSettings::CurrentBuffer && !(flags & Message::Backlog)) {
BufferId redirectedTo = sourceModel()->data(sourceIdx, MessageModel::RedirectedToRole).value<BufferId>();
if(!redirectedTo.isValid()) {
- BufferId redirectedTo = Client::bufferModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>();
- if(redirectedTo.isValid())
- sourceModel()->setData(sourceIdx, QVariant::fromValue<BufferId>(redirectedTo), MessageModel::RedirectedToRole);
+ BufferId redirectedTo = Client::bufferModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>();
+ if(redirectedTo.isValid())
+ sourceModel()->setData(sourceIdx, QVariant::fromValue<BufferId>(redirectedTo), MessageModel::RedirectedToRole);
}
if(_validBuffers.contains(redirectedTo))
}
if(_validBuffers.contains(redirectedTo))
}
if(redirectionTarget & BufferSettings::StatusBuffer) {
QSet<BufferId>::const_iterator idIter = _validBuffers.constBegin();
while(idIter != _validBuffers.constEnd()) {
}
if(redirectionTarget & BufferSettings::StatusBuffer) {
QSet<BufferId>::const_iterator idIter = _validBuffers.constBegin();
while(idIter != _validBuffers.constEnd()) {
- if(Client::networkModel()->bufferType(*idIter) == BufferInfo::StatusBuffer)
- return true;
- idIter++;
+ if(Client::networkModel()->bufferType(*idIter) == BufferInfo::StatusBuffer)
+ return true;
+ idIter++;
qDebug() << "debug_rowsAboutToBeRemoved" << parent << parentItem << parent.data().toString() << rowCount(parent) << start << end;
QModelIndex child;
qDebug() << "debug_rowsAboutToBeRemoved" << parent << parentItem << parent.data().toString() << rowCount(parent) << start << end;
QModelIndex child;
- AbstractTreeItem *childItem;
for(int i = end; i >= start; i--) {
child = parent.child(i, 0);
for(int i = end; i >= start; i--) {
child = parent.child(i, 0);
- childItem = parentItem->child(i);
- Q_ASSERT(childItem);
+ Q_ASSERT(parentItem->child(i));
qDebug() << ">>>" << i << child << child.data().toString();
}
}
qDebug() << ">>>" << i << child << child.data().toString();
}
}
qDebug() << "debug_rowsInserted:" << parent << parentItem << parent.data().toString() << rowCount(parent) << start << end;
QModelIndex child;
qDebug() << "debug_rowsInserted:" << parent << parentItem << parent.data().toString() << rowCount(parent) << start << end;
QModelIndex child;
- AbstractTreeItem *childItem;
for(int i = start; i <= end; i++) {
child = parent.child(i, 0);
for(int i = start; i <= end; i++) {
child = parent.child(i, 0);
- childItem = parentItem->child(i);
- Q_ASSERT(childItem);
+ Q_ASSERT(parentItem->child(i));
qDebug() << "<<<" << i << child << child.data().toString();
}
}
qDebug() << "<<<" << i << child << child.data().toString();
}
}
bool atTop = (start == 0);
bool atBottom = (end == _lines.count() - 1);
bool atTop = (start == 0);
bool atBottom = (end == _lines.count() - 1);
// clear selection
if(_selectingItem) {
// clear selection
if(_selectingItem) {
if(_selectionStart >= 0) {
int offset = end - start + 1;
if(_selectionStart >= start)
if(_selectionStart >= 0) {
int offset = end - start + 1;
if(_selectionStart >= start)
- _selectionStart = qMax(_selectionStart -= offset, start);
+ _selectionStart = qMax(_selectionStart - offset, start);
if(_selectionEnd >= start)
_selectionEnd -= offset;
if(_firstSelectionRow >= start)
if(_selectionEnd >= start)
_selectionEnd -= offset;
if(_firstSelectionRow >= start)
int moveEnd = _lines.count() - 1;
if(start < _lines.count() - start) {
// move top part
int moveEnd = _lines.count() - 1;
if(start < _lines.count() - start) {
// move top part
moveEnd = start - 1;
} else {
// move bottom part
moveEnd = start - 1;
} else {
// move bottom part
void QtUiApplication::saveState(QSessionManager & manager) {
//qDebug() << QString("saving session state to id %1").arg(manager.sessionId());
void QtUiApplication::saveState(QSessionManager & manager) {
//qDebug() << QString("saving session state to id %1").arg(manager.sessionId());
- AccountId activeCore = Client::currentCoreAccount().accountId(); // FIXME store this!
+ // AccountId activeCore = Client::currentCoreAccount().accountId(); // FIXME store this!
SessionSettings s(manager.sessionId());
s.setSessionAge(0);
QtUi::mainWindow()->saveStateToSettings(s);
SessionSettings s(manager.sessionId());
s.setSessionAge(0);
QtUi::mainWindow()->saveStateToSettings(s);
void NetworksSettingsPage::setWidgetStates() {
// network list
if(ui.networkList->selectedItems().count()) {
void NetworksSettingsPage::setWidgetStates() {
// network list
if(ui.networkList->selectedItems().count()) {
- NetworkId id = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value<NetworkId>();
- const Network *net = 0;
- if(id > 0) net = Client::network(id);
ui.detailsBox->setEnabled(true);
ui.renameNetwork->setEnabled(true);
ui.deleteNetwork->setEnabled(true);
ui.detailsBox->setEnabled(true);
ui.renameNetwork->setEnabled(true);
ui.deleteNetwork->setEnabled(true);
/* button disabled for now
/* button disabled for now
+ NetworkId id = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value<NetworkId>();
+ const Network *net = id > 0 ? Client::network(id) : 0;
ui.connectNow->setEnabled(net);
// && (Client::network(id)->connectionState() == Network::Initialized
// || Client::network(id)->connectionState() == Network::Disconnected));
ui.connectNow->setEnabled(net);
// && (Client::network(id)->connectionState() == Network::Initialized
// || Client::network(id)->connectionState() == Network::Disconnected));
setDynamicSortFilter(true);
connect(this, SIGNAL(_dataChanged(const QModelIndex &, const QModelIndex &)),
setDynamicSortFilter(true);
connect(this, SIGNAL(_dataChanged(const QModelIndex &, const QModelIndex &)),
- this, SLOT(_q_sourceDataChanged(QModelIndex,QModelIndex)));
+ this, SLOT(_q_sourceDataChanged(QModelIndex,QModelIndex)));
_enableEditMode.setCheckable(true);
_enableEditMode.setChecked(_editMode);
_enableEditMode.setCheckable(true);
_enableEditMode.setChecked(_editMode);
QSet<BufferId>::const_iterator iter;
for(iter = _toTempRemove.constBegin(); iter != _toTempRemove.constEnd(); iter++) {
if(config()->temporarilyRemovedBuffers().contains(*iter))
QSet<BufferId>::const_iterator iter;
for(iter = _toTempRemove.constBegin(); iter != _toTempRemove.constEnd(); iter++) {
if(config()->temporarilyRemovedBuffers().contains(*iter))
config()->requestRemoveBuffer(*iter);
}
for(iter = _toRemove.constBegin(); iter != _toRemove.constEnd(); iter++) {
if(config()->removedBuffers().contains(*iter))
config()->requestRemoveBuffer(*iter);
}
for(iter = _toRemove.constBegin(); iter != _toRemove.constEnd(); iter++) {
if(config()->removedBuffers().contains(*iter))
config()->requestRemoveBufferPermanently(*iter);
}
}
config()->requestRemoveBufferPermanently(*iter);
}
}
if(bufferType != BufferInfo::QueryBuffer) {
ClientBufferViewConfig *clientConf = qobject_cast<ClientBufferViewConfig *>(config());
if(clientConf && clientConf->isLocked()) {
if(bufferType != BufferInfo::QueryBuffer) {
ClientBufferViewConfig *clientConf = qobject_cast<ClientBufferViewConfig *>(config());
if(clientConf && clientConf->isLocked()) {
- flags &= ~(Qt::ItemIsDropEnabled | Qt::ItemIsDragEnabled);
+ flags &= ~(Qt::ItemIsDropEnabled | Qt::ItemIsDragEnabled);
bufferId = bufferList[i].second;
if(droppedNetworkId == networkId) {
if(row < 0)
bufferId = bufferList[i].second;
if(droppedNetworkId == networkId) {
if(row < 0)
if(row < rowCount(parent)) {
if(row < rowCount(parent)) {
- QModelIndex source_child = mapToSource(index(row, 0, parent));
- BufferId beforeBufferId = sourceModel()->data(source_child, NetworkModel::BufferIdRole).value<BufferId>();
- pos = config()->bufferList().indexOf(beforeBufferId);
- if(_sortOrder == Qt::DescendingOrder)
- pos++;
+ QModelIndex source_child = mapToSource(index(row, 0, parent));
+ BufferId beforeBufferId = sourceModel()->data(source_child, NetworkModel::BufferIdRole).value<BufferId>();
+ pos = config()->bufferList().indexOf(beforeBufferId);
+ if(_sortOrder == Qt::DescendingOrder)
+ pos++;
- if(_sortOrder == Qt::AscendingOrder)
- pos = config()->bufferList().count();
- else
- pos = 0;
+ if(_sortOrder == Qt::AscendingOrder)
+ pos = config()->bufferList().count();
+ else
+ pos = 0;
}
if(config()->bufferList().contains(bufferId) && !config()->sortAlphabetically()) {
}
if(config()->bufferList().contains(bufferId) && !config()->sortAlphabetically()) {
- if(config()->bufferList().indexOf(bufferId) < pos)
- pos--;
- ClientBufferViewConfig *clientConf = qobject_cast<ClientBufferViewConfig *>(config());
- if(!clientConf || !clientConf->isLocked())
- config()->requestMoveBuffer(bufferId, pos);
+ if(config()->bufferList().indexOf(bufferId) < pos)
+ pos--;
+ ClientBufferViewConfig *clientConf = qobject_cast<ClientBufferViewConfig *>(config());
+ if(!clientConf || !clientConf->isLocked())
+ config()->requestMoveBuffer(bufferId, pos);
- config()->requestAddBuffer(bufferId, pos);
+ config()->requestAddBuffer(bufferId, pos);
bool lt;
for(int i = 0; i < bufferList.count(); i++) {
if(config() && config()->sortAlphabetically())
bool lt;
for(int i = 0; i < bufferList.count(); i++) {
if(config() && config()->sortAlphabetically())
- lt = bufferIdLessThan(bufferId, bufferList[i]);
+ lt = bufferIdLessThan(bufferId, bufferList[i]);
- lt = bufferId < config()->bufferList()[i];
+ lt = bufferId < config()->bufferList()[i];
- pos = i;
- bufferList.insert(pos, bufferId);
- break;
+ pos = i;
+ bufferList.insert(pos, bufferId);
+ break;
}
}
config()->requestAddBuffer(bufferId, pos);
}
}
config()->requestAddBuffer(bufferId, pos);
if(config()->isInitialized()
&& !config()->removedBuffers().contains(bufferId) // it hasn't been manually removed and either
&& ((config()->addNewBuffersAutomatically() && !config()->temporarilyRemovedBuffers().contains(bufferId)) // is totally unknown to us (a new buffer)...
if(config()->isInitialized()
&& !config()->removedBuffers().contains(bufferId) // it hasn't been manually removed and either
&& ((config()->addNewBuffersAutomatically() && !config()->temporarilyRemovedBuffers().contains(bufferId)) // is totally unknown to us (a new buffer)...
- || (config()->temporarilyRemovedBuffers().contains(bufferId) && activityLevel > BufferInfo::OtherActivity))) { // or was just temporarily hidden and has a new message waiting for us.
+ || (config()->temporarilyRemovedBuffers().contains(bufferId) && activityLevel > BufferInfo::OtherActivity))) { // or was just temporarily hidden and has a new message waiting for us.
addBuffer(bufferId);
}
// note: adding the buffer to the valid list does not temper with the following filters ("show only channels" and stuff)
addBuffer(bufferId);
}
// note: adding the buffer to the valid list does not temper with the following filters ("show only channels" and stuff)
}
bool BufferViewFilter::networkLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const {
}
bool BufferViewFilter::networkLessThan(const QModelIndex &source_left, const QModelIndex &source_right) const {
- NetworkId leftNetworkId = sourceModel()->data(source_left, NetworkModel::NetworkIdRole).value<NetworkId>();
- NetworkId rightNetworkId = sourceModel()->data(source_right, NetworkModel::NetworkIdRole).value<NetworkId>();
+ // NetworkId leftNetworkId = sourceModel()->data(source_left, NetworkModel::NetworkIdRole).value<NetworkId>();
+ // NetworkId rightNetworkId = sourceModel()->data(source_right, NetworkModel::NetworkIdRole).value<NetworkId>();
return QSortFilterProxyModel::lessThan(source_left, source_right);
}
return QSortFilterProxyModel::lessThan(source_left, source_right);
}