Skip to content

Commit

Permalink
Qt6 deprecated stuff changes
Browse files Browse the repository at this point in the history 
Mostly QMultiMap::insert over insertMulti
Shortcuts broken while editWidget in focus
Minizip updated to sources from zlib 1.2.11
  • Loading branch information
@krab
krab committed Oct 12, 2021
1 parent 05b9b09 commit d341cca
Show file tree
Hide file tree
Showing 76 changed files with 293 additions and 289 deletions.
3 changes: 0 additions & 3 deletions src/loader/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
int main(int argc, char *argv[])
{
QApplication::setAttribute(Qt::AA_DontShowIconsInMenus,false);
#if (QT_VERSION >= QT_VERSION_CHECK(5,6,0))
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling,true);
#endif

QApplication app(argc, argv);
app.setQuitOnLastWindowClosed(false);
Expand Down
4 changes: 2 additions & 2 deletions src/loader/pluginmanager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ bool PluginManager::initPlugins()
IPlugin *plugin = it.value().plugin;
if (plugin->initConnections(this,initOrder))
{
pluginOrder.insertMulti(initOrder,plugin);
pluginOrder.insert(initOrder,plugin);
++it;
}
else
Expand Down Expand Up @@ -747,7 +747,7 @@ void PluginManager::loadCoreTranslations(const QDir &ADir, const QString &ALocal
{
if (FQtTranslator->load("qt_"+ALocaleName,ADir.absoluteFilePath(ALocaleName)) || FQtTranslator->load("qt_"+ALocaleName,ADir.absoluteFilePath(ALocaleName.left(2))))
qApp->installTranslator(FQtTranslator);
else if (FQtTranslator->load("qt_"+QLocale().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
else if (FQtTranslator->load("qt_"+QLocale().name(), QLibraryInfo::path(QLibraryInfo::TranslationsPath)))
qApp->installTranslator(FQtTranslator);
else
LOG_DEBUG("Translation for 'Qt' not found");
Expand Down
20 changes: 10 additions & 10 deletions src/plugins/accountmanager/accountmanager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,31 +108,31 @@ QMultiMap<int, IOptionsDialogWidget *> AccountManager::optionsDialogWidgets(cons
QStringList nodeTree = ANodeId.split(".",Qt::SkipEmptyParts);
if (ANodeId == OPN_ACCOUNTS)
{
widgets.insertMulti(OHO_ACCOUNTS_ACCOUNTS, FOptionsManager->newOptionsDialogHeader(tr("Accounts"),AParent));
widgets.insertMulti(OWO_ACCOUNTS_ACCOUNTS, new AccountsOptionsWidget(this,AParent));
widgets.insert(OHO_ACCOUNTS_ACCOUNTS, FOptionsManager->newOptionsDialogHeader(tr("Accounts"),AParent));
widgets.insert(OWO_ACCOUNTS_ACCOUNTS, new AccountsOptionsWidget(this,AParent));

widgets.insertMulti(OHO_ACCOUNTS_COMMON, FOptionsManager->newOptionsDialogHeader(tr("Common account settings"),AParent));
widgets.insert(OHO_ACCOUNTS_COMMON, FOptionsManager->newOptionsDialogHeader(tr("Common account settings"),AParent));

QComboBox *resourceCombox = newResourceComboBox(QUuid(),AParent);
widgets.insertMulti(OWO_ACCOUNTS_DEFAULTRESOURCE,FOptionsManager->newOptionsDialogWidget(Options::node(OPV_ACCOUNT_DEFAULTRESOURCE),tr("Default resource:"),resourceCombox,AParent));
widgets.insert(OWO_ACCOUNTS_DEFAULTRESOURCE,FOptionsManager->newOptionsDialogWidget(Options::node(OPV_ACCOUNT_DEFAULTRESOURCE),tr("Default resource:"),resourceCombox,AParent));
}
else if (nodeTree.count()==3 && nodeTree.at(0)==OPN_ACCOUNTS && nodeTree.at(2)=="Parameters")
{
OptionsNode options = Options::node(OPV_ACCOUNT_ITEM,nodeTree.at(1));

widgets.insertMulti(OHO_ACCOUNTS_PARAMS_ACCOUNT,FOptionsManager->newOptionsDialogHeader(tr("Account"),AParent));
widgets.insertMulti(OWO_ACCOUNTS_PARAMS_NAME,FOptionsManager->newOptionsDialogWidget(options.node("name"),tr("Name:"),AParent));
widgets.insertMulti(OWO_ACCOUNTS_PARAMS_PASSWORD,FOptionsManager->newOptionsDialogWidget(options.node("password"),tr("Password:"),AParent));
widgets.insert(OHO_ACCOUNTS_PARAMS_ACCOUNT,FOptionsManager->newOptionsDialogHeader(tr("Account"),AParent));
widgets.insert(OWO_ACCOUNTS_PARAMS_NAME,FOptionsManager->newOptionsDialogWidget(options.node("name"),tr("Name:"),AParent));
widgets.insert(OWO_ACCOUNTS_PARAMS_PASSWORD,FOptionsManager->newOptionsDialogWidget(options.node("password"),tr("Password:"),AParent));

QComboBox *resourceCombox = newResourceComboBox(QUuid(nodeTree.at(1)),AParent);
widgets.insertMulti(OWO_ACCOUNTS_PARAMS_RESOURCE,FOptionsManager->newOptionsDialogWidget(options.node("resource"),tr("Resource:"),resourceCombox,AParent));
widgets.insert(OWO_ACCOUNTS_PARAMS_RESOURCE,FOptionsManager->newOptionsDialogWidget(options.node("resource"),tr("Resource:"),resourceCombox,AParent));
}
else if (nodeTree.count()==3 && nodeTree.at(0)==OPN_ACCOUNTS && nodeTree.at(2)=="Additional")
{
OptionsNode options = Options::node(OPV_ACCOUNT_ITEM,nodeTree.at(1));

widgets.insertMulti(OHO_ACCOUNTS_ADDITIONAL_SETTINGS, FOptionsManager->newOptionsDialogHeader(tr("Additional settings"),AParent));
widgets.insertMulti(OWO_ACCOUNTS_ADDITIONAL_REQUIRESECURE,FOptionsManager->newOptionsDialogWidget(options.node("require-encryption"),tr("Require secure connection to server"),AParent));
widgets.insert(OHO_ACCOUNTS_ADDITIONAL_SETTINGS, FOptionsManager->newOptionsDialogHeader(tr("Additional settings"),AParent));
widgets.insert(OWO_ACCOUNTS_ADDITIONAL_REQUIRESECURE,FOptionsManager->newOptionsDialogWidget(options.node("require-encryption"),tr("Require secure connection to server"),AParent));
}

}
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/accountmanager/accountsoptionswidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ void AccountsOptionsWidget::dragMoveEvent(QDragMoveEvent *AEvent)
{
if (FDragItem!=NULL && AEvent->source()==this)
{
AccountItemWidget *item = accountItemWidgetAt(AEvent->pos());
AccountItemWidget *item = accountItemWidgetAt(AEvent->position().toPoint());
if (item!=NULL && item!=FDragItem)
{
FLayout->insertWidget(FLayout->indexOf(item),FDragItem);
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/annotations/annotations.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,8 @@ void Annotations::updateDataHolder(const Jid &AStreamJid, const QList<Jid> &ACon
{
QMultiMap<int,QVariant> findData;
foreach(const Jid &contactJid, AContactJids)
findData.insertMulti(RDR_PREP_BARE_JID,contactJid.pBare());
findData.insertMulti(RDR_STREAM_JID,AStreamJid.pFull());
findData.insert(RDR_PREP_BARE_JID,contactJid.pBare());
findData.insert(RDR_STREAM_JID,AStreamJid.pFull());

foreach (IRosterIndex *index, sroot->findChilds(findData,true))
emit rosterDataChanged(index,RDR_ANNOTATIONS);
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/autostatus/autostatus.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ QMultiMap<int, IOptionsDialogWidget *> AutoStatus::optionsDialogWidgets(const QS
QMultiMap<int, IOptionsDialogWidget *> widgets;
if (ANodeId == OPN_STATUSITEMS)
{
widgets.insertMulti(OHO_AUTOSTATUS, FOptionsManager->newOptionsDialogHeader(tr("Automatic change of status"),AParent));
widgets.insertMulti(OWO_AUTOSTATUS, new AutoStatusOptionsWidget(this,FStatusChanger,AParent));
widgets.insert(OHO_AUTOSTATUS, FOptionsManager->newOptionsDialogHeader(tr("Automatic change of status"),AParent));
widgets.insert(OWO_AUTOSTATUS, new AutoStatusOptionsWidget(this,FStatusChanger,AParent));
}
return widgets;
}
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/avatars/avatars.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ bool Avatars::stanzaReadWrite(int AHandlerId, const Jid &AStreamJid, Stanza &ASt
if (AStanza.type()==PRESENCE_TYPE_AVAILABLE && !FBlockingResources.contains(AStreamJid,contactJid))
{
LOG_STRM_INFO(AStreamJid,QString("Resource %1 is now blocking avatar update notify mechanism").arg(contactJid.resource()));
FBlockingResources.insertMulti(AStreamJid,contactJid);
FBlockingResources.insert(AStreamJid,contactJid);
if (FStreamAvatars.value(AStreamJid) != UNKNOWN_AVATAR_HASH)
{
FStreamAvatars[AStreamJid] = UNKNOWN_AVATAR_HASH;
Expand Down Expand Up @@ -715,7 +715,7 @@ void Avatars::updateDataHolder(const Jid &AContactJid)
if (!AContactJid.isEmpty())
findData.insert(RDR_PREP_BARE_JID,AContactJid.pBare());
foreach(int kind, AvatarRosterKinds)
findData.insertMulti(RDR_KIND,kind);
findData.insert(RDR_KIND,kind);

foreach(IRosterIndex *index, FRostersModel->rootIndex()->findChilds(findData,true))
emit rosterDataChanged(index,RDR_AVATAR_IMAGE);
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/birthdayreminder/birthdayreminder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ bool BirthdayReminder::updateBirthdayState(const Jid &AContactJid)
{
QMultiMap<int, QVariant> findData;
foreach(int kind, BirthdayRosterKinds)
findData.insertMulti(RDR_KIND,kind);
findData.insertMulti(RDR_PREP_BARE_JID,AContactJid.pBare());
findData.insert(RDR_KIND,kind);
findData.insert(RDR_PREP_BARE_JID,AContactJid.pBare());
foreach (IRosterIndex *index, FRostersModel->rootIndex()->findChilds(findData,true))
FRostersViewPlugin->rostersView()->insertLabel(FBirthdayLabelId,index);
}
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/bookmarks/bookmarks.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,12 @@ QMultiMap<int, IOptionsDialogWidget *> Bookmarks::optionsDialogWidgets(const QSt
if (nodeTree.count()==3 && nodeTree.at(0)==OPN_ACCOUNTS && nodeTree.at(2)=="Additional")
{
OptionsNode options = Options::node(OPV_ACCOUNT_ITEM,nodeTree.at(1));
widgets.insertMulti(OHO_ACCOUNTS_ADDITIONAL_CONFERENCES, FOptionsManager->newOptionsDialogHeader(tr("Conferences"),AParent));
widgets.insertMulti(OWO_ACCOUNTS_ADDITIONAL_DISABLEAUTOJOIN, FOptionsManager->newOptionsDialogWidget(options.node("ignore-autojoin"),tr("Disable auto join to conferences on this computer"),AParent));
widgets.insert(OHO_ACCOUNTS_ADDITIONAL_CONFERENCES, FOptionsManager->newOptionsDialogHeader(tr("Conferences"),AParent));
widgets.insert(OWO_ACCOUNTS_ADDITIONAL_DISABLEAUTOJOIN, FOptionsManager->newOptionsDialogWidget(options.node("ignore-autojoin"),tr("Disable auto join to conferences on this computer"),AParent));
}
else if (ANodeId == OPN_CONFERENCES)
{
widgets.insertMulti(OWO_CONFERENCES_SHOWAUTOJOINED, FOptionsManager->newOptionsDialogWidget(Options::node(OPV_MUC_SHOWAUTOJOINED),tr("Show windows of auto joined conferences at startup"),AParent));
widgets.insert(OWO_CONFERENCES_SHOWAUTOJOINED, FOptionsManager->newOptionsDialogWidget(Options::node(OPV_MUC_SHOWAUTOJOINED),tr("Show windows of auto joined conferences at startup"),AParent));
}
}
return widgets;
Expand Down Expand Up @@ -289,7 +289,7 @@ bool Bookmarks::setModelData(const AdvancedItemDelegate *ADelegate, QWidget *AEd
IBookmark &bookmark = bookmarkList[index];

QVariant value = AEditor->property(ADVANCED_DELEGATE_EDITOR_VALUE_PROPERTY);
QByteArray name = ADelegate->editorFactory()->valuePropertyName(value.type());
QByteArray name = ADelegate->editorFactory()->valuePropertyName(value.typeId());
QString newName = AEditor->property(name).toString();

if (!newName.isEmpty() && bookmark.name!=newName)
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/chatmessagehandler/chatmessagehandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ INotification ChatMessageHandler::messageNotify(INotifications *ANotifications,
notify.data.insert(NDR_POPUP_TEXT,AMessage.body());
}

FNotifiedMessages.insertMulti(window, AMessage.data(MDR_MESSAGE_ID).toInt());
FNotifiedMessages.insert(window, AMessage.data(MDR_MESSAGE_ID).toInt());
}
}
else if (window == NULL)
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/chatstates/chatstates.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ QMultiMap<int, IOptionsDialogWidget *> ChatStates::optionsDialogWidgets(const QS
QMultiMap<int, IOptionsDialogWidget *> widgets;
if (FOptionsManager && ANodeId==OPN_MESSAGES)
{
widgets.insertMulti(OWO_MESSAGES_CHATSTATESENABLED, FOptionsManager->newOptionsDialogWidget(Options::node(OPV_MESSAGES_CHATSTATESENABLED),tr("Send notifications of your chat activity"),AParent));
widgets.insert(OWO_MESSAGES_CHATSTATESENABLED, FOptionsManager->newOptionsDialogWidget(Options::node(OPV_MESSAGES_CHATSTATESENABLED),tr("Send notifications of your chat activity"),AParent));
}
return widgets;
}
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/clientinfo/clientinfo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ QMultiMap<int, IOptionsDialogWidget *> ClientInfo::optionsDialogWidgets(const QS
QMultiMap<int, IOptionsDialogWidget *> widgets;
if (FOptionsManager && ANodeId == OPN_COMMON)
{
widgets.insertMulti(OWO_COMMON_SENDCLIENTINFO, FOptionsManager->newOptionsDialogWidget(Options::node(OPV_COMMON_SHAREOSVERSION),tr("Share information about your OS version"),AParent));
widgets.insert(OWO_COMMON_SENDCLIENTINFO, FOptionsManager->newOptionsDialogWidget(Options::node(OPV_COMMON_SHAREOSVERSION),tr("Share information about your OS version"),AParent));
}
return widgets;
}
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/compress/compressfeaturefactory.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ QMultiMap<int, IOptionsDialogWidget *> CompressFeatureFactory::optionsDialogWidg
if (nodeTree.count()==3 && nodeTree.at(0)==OPN_ACCOUNTS && nodeTree.at(2)=="Additional")
{
OptionsNode options = Options::node(OPV_ACCOUNT_ITEM,nodeTree.at(1));
widgets.insertMulti(OWO_ACCOUNTS_ADDITIONAL_STREAMCOMPRESS, FOptionsManager->newOptionsDialogWidget(options.node("stream-compress"),tr("Enable data compression transferred between client and server"),AParent));
widgets.insert(OWO_ACCOUNTS_ADDITIONAL_STREAMCOMPRESS, FOptionsManager->newOptionsDialogWidget(options.node("stream-compress"),tr("Enable data compression transferred between client and server"),AParent));
}
}
return widgets;
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/connectionmanager/connectionmanager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,12 @@ QMultiMap<int, IOptionsDialogWidget *> ConnectionManager::optionsDialogWidgets(c
QStringList nodeTree = ANodeId.split(".",Qt::SkipEmptyParts);
if (nodeTree.count()==3 && nodeTree.at(0)==OPN_ACCOUNTS && nodeTree.at(2)=="Parameters")
{
widgets.insertMulti(OHO_ACCOUNTS_PARAMS_CONNECTION,FOptionsManager->newOptionsDialogHeader(tr("Connection"),AParent));
widgets.insertMulti(OWO_ACCOUNTS_PARAMS_CONNECTION, new ConnectionOptionsWidget(this,Options::node(OPV_ACCOUNT_ITEM,nodeTree.at(1)),AParent));
widgets.insert(OHO_ACCOUNTS_PARAMS_CONNECTION,FOptionsManager->newOptionsDialogHeader(tr("Connection"),AParent));
widgets.insert(OWO_ACCOUNTS_PARAMS_CONNECTION, new ConnectionOptionsWidget(this,Options::node(OPV_ACCOUNT_ITEM,nodeTree.at(1)),AParent));
}
else if (ANodeId == OPN_ACCOUNTS)
{
widgets.insertMulti(OWO_ACCOUNTS_DEFAULTPROXY, proxySettingsWidget(Options::node(OPV_PROXY_DEFAULT),AParent));
widgets.insert(OWO_ACCOUNTS_DEFAULTPROXY, proxySettingsWidget(Options::node(OPV_PROXY_DEFAULT),AParent));
}
return widgets;
}
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/dataforms/dataforms.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,12 +355,12 @@ void DataForms::xmlField(const IDataField &AField, QDomElement &AFormElem, const
if (!AField.type.isEmpty())
fieldElem.setAttribute("type",AField.type);

if (AField.value.type()==QVariant::StringList && !AField.value.toStringList().isEmpty())
if (AField.value.typeId()==QMetaType::QStringList && !AField.value.toStringList().isEmpty())
{
foreach(const QString &value, AField.value.toStringList())
fieldElem.appendChild(doc.createElement("value")).appendChild(doc.createTextNode(value));
}
else if (AField.value.type() == QVariant::Bool)
else if (AField.value.typeId() == QMetaType::Bool)
{
fieldElem.appendChild(doc.createElement("value")).appendChild(doc.createTextNode(AField.value.toBool() ? "1" : "0"));
}
Expand Down Expand Up @@ -597,7 +597,7 @@ bool DataForms::isMediaValid(const IDataMedia &AMedia) const

bool DataForms::isFieldEmpty(const IDataField &AField) const
{
return AField.value.type()==QVariant::StringList ? AField.value.toStringList().isEmpty() : AField.value.toString().isEmpty();
return AField.value.typeId()==QMetaType::QStringList ? AField.value.toStringList().isEmpty() : AField.value.toString().isEmpty();
}

bool DataForms::isFieldValid(const IDataField &AField, const QString &AFormType) const
Expand Down Expand Up @@ -842,7 +842,7 @@ IDataForm DataForms::dataShowSubmit(const IDataForm &AForm, const IDataForm &ASu

foreach(const IDataOption &option, ffield.options)
{
if (sfield.value.type()==QVariant::StringList)
if (sfield.value.typeId()==QMetaType::QStringList)
{
QStringList values = sfield.value.toStringList();
for (int i=0; i<values.count(); i++)
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/datastreamsmanager/datastreamsmanager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ QMultiMap<int, IOptionsDialogWidget *> DataStreamsManger::optionsDialogWidgets(c
int index = 0;
foreach(IDataStreamMethod *method, FMethods)
{
widgets.insertMulti(OHO_DATATRANSFER_METHODNAME + index, FOptionsManager->newOptionsDialogHeader(tr("Transfer method %1").arg(method->methodName()),AParent));
widgets.insertMulti(OWO_DATATRANSFER_METHODSETTINGS + index, method->methodSettingsWidget(settingsProfileNode(QUuid(),method->methodNS()),AParent));
widgets.insert(OHO_DATATRANSFER_METHODNAME + index, FOptionsManager->newOptionsDialogHeader(tr("Transfer method %1").arg(method->methodName()),AParent));
widgets.insert(OWO_DATATRANSFER_METHODSETTINGS + index, method->methodSettingsWidget(settingsProfileNode(QUuid(),method->methodNS()),AParent));
index += 10;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/datastreamspublisher/datastreamspublisher.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ void DataStreamsPublisher::insertStreamHandler(int AOrder, IPublicDataStreamHand
{
if (!FHandlers.contains(AOrder,AHandler))
{
FHandlers.insertMulti(AOrder,AHandler);
FHandlers.insert(AOrder,AHandler);
emit streamHandlerInserted(AOrder,AHandler);
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/emoticons/emoticons.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ QMultiMap<int, IOptionsDialogWidget *> Emoticons::optionsDialogWidgets(const QSt
delete storage;
}

widgets.insertMulti(OHO_APPEARANCE_MESSAGES,FOptionsManager->newOptionsDialogHeader(tr("Message windows"),AParent));
widgets.insertMulti(OWO_APPEARANCE_EMOTICONS,FOptionsManager->newOptionsDialogWidget(Options::node(OPV_MESSAGES_EMOTICONS_ICONSET),tr("Smileys:"),cmbEmoticons,AParent));
widgets.insert(OHO_APPEARANCE_MESSAGES,FOptionsManager->newOptionsDialogHeader(tr("Message windows"),AParent));
widgets.insert(OWO_APPEARANCE_EMOTICONS,FOptionsManager->newOptionsDialogWidget(Options::node(OPV_MESSAGES_EMOTICONS_ICONSET),tr("Smileys:"),cmbEmoticons,AParent));
}
return widgets;
}
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/filemessagearchive/filemessagearchive.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ QList<IArchiveHeader> FileMessageArchive::loadFileHeaders(const Jid &AStreamJid,
IArchiveHeader header;
if (checkRequestFile(fpath,ARequest,&header))
{
filesMap.insertMulti(fname,header);
filesMap.insert(fname,header);
if ((quint32)filesMap.count() > ARequest.maxItems)
filesMap.erase(ARequest.order==Qt::AscendingOrder ? --filesMap.end() : filesMap.begin());
}
Expand Down Expand Up @@ -665,7 +665,7 @@ IArchiveHeader FileMessageArchive::saveFileCollection(const Jid &AStreamJid, con
{
QMultiMap<int, QString> curMessages;
foreach(const Message &message, collection.body.messages)
curMessages.insertMulti(collection.header.start.secsTo(message.dateTime()),message.body());
curMessages.insert(collection.header.start.secsTo(message.dateTime()),message.body());

foreach(const Message &message, ACollection.body.messages)
if (!curMessages.contains(collection.header.start.secsTo(message.dateTime()),message.body()))
Expand All @@ -677,7 +677,7 @@ IArchiveHeader FileMessageArchive::saveFileCollection(const Jid &AStreamJid, con
{
for (QMultiMap<QDateTime, QString>::const_iterator it=ACollection.body.notes.constBegin(); it!=ACollection.body.notes.constEnd(); ++it)
if (!collection.body.notes.contains(it.key(),it.value()))
newBody.notes.insertMulti(it.key(),it.value());
newBody.notes.insert(it.key(),it.value());
}

collection = ACollection;
Expand Down
10 changes: 5 additions & 5 deletions src/plugins/filestreamsmanager/filestreamsmanager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,9 @@ QMultiMap<int, IOptionsDialogWidget *> FileStreamsManager::optionsDialogWidgets(
QMultiMap<int, IOptionsDialogWidget *> widgets;
if (FOptionsManager && ANodeId==OPN_DATATRANSFER)
{
widgets.insertMulti(OHO_DATATRANSFER_FILETRANSFER, FOptionsManager->newOptionsDialogHeader(tr("File transfer"),AParent));
widgets.insertMulti(OWO_DATATRANSFER_FILESTREAMS, new FileStreamsOptionsWidget(this,AParent));
widgets.insertMulti(OWO_DATATRANSFER_GROUPBYSENDER,FOptionsManager->newOptionsDialogWidget(Options::node(OPV_FILESTREAMS_GROUPBYSENDER),tr("Create separate folder for each sender"),AParent));
widgets.insert(OHO_DATATRANSFER_FILETRANSFER, FOptionsManager->newOptionsDialogHeader(tr("File transfer"),AParent));
widgets.insert(OWO_DATATRANSFER_FILESTREAMS, new FileStreamsOptionsWidget(this,AParent));
widgets.insert(OWO_DATATRANSFER_GROUPBYSENDER,FOptionsManager->newOptionsDialogWidget(Options::node(OPV_FILESTREAMS_GROUPBYSENDER),tr("Create separate folder for each sender"),AParent));

if (FDataManager)
{
Expand All @@ -145,7 +145,7 @@ QMultiMap<int, IOptionsDialogWidget *> FileStreamsManager::optionsDialogWidgets(
IDataStreamMethod *method = FDataManager->method(methodId);
cmbDefaultMethod->addItem(method->methodName(), method->methodNS());
}
widgets.insertMulti(OWO_DATATRANSFER_DEFAULTMETHOD,FOptionsManager->newOptionsDialogWidget(Options::node(OPV_FILESTREAMS_DEFAULTMETHOD),tr("Default transfer method:"),cmbDefaultMethod,AParent));
widgets.insert(OWO_DATATRANSFER_DEFAULTMETHOD,FOptionsManager->newOptionsDialogWidget(Options::node(OPV_FILESTREAMS_DEFAULTMETHOD),tr("Default transfer method:"),cmbDefaultMethod,AParent));
}
}
return widgets;
Expand Down Expand Up @@ -331,7 +331,7 @@ void FileStreamsManager::insertStreamsHandler(int AOrder, IFileStreamHandler *AH
{
if (AHandler!=NULL && !FHandlers.contains(AOrder,AHandler))
{
FHandlers.insertMulti(AOrder,AHandler);
FHandlers.insert(AOrder,AHandler);
emit streamHandlerInserted(AOrder, AHandler);
}
}
Expand Down
Loading

0 comments on commit d341cca

Please sign in to comment.