Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-08-02 17:09:28 +02:00
Code Issues Projects Releases Wiki Activity

2021-02-02 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Refactored the 'System-Wide Settings' dialog in rdadmin(1) to use
	'QMultiMap' instead of 'std::map'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-02-02 20:45:27 -05:00
parent 074cfb0c8c
commit 4c3775132a
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -20993,3 +20993,6 @@
2021-02-02 Fred Gleason <fredg@paravelsystems.com> 2021-02-02 Fred Gleason <fredg@paravelsystems.com>
* Refactored the 'System-Wide Settings' dialog in rdadmin(1) to use * Refactored the 'System-Wide Settings' dialog in rdadmin(1) to use
the model-based API. the model-based API.
2021-02-02 Fred Gleason <fredg@paravelsystems.com>
* Refactored the 'System-Wide Settings' dialog in rdadmin(1) to use
'QMultiMap' instead of 'std::map'.

11
rdadmin/edit_system.cpp
View File

@ -20,7 +20,7 @@
#include <QApplication> #include <QApplication>
#include <QFileDialog> #include <QFileDialog>
#include <QMap> #include <QMultiMap>
#include <QMessageBox> #include <QMessageBox>
#include <QProgressDialog> #include <QProgressDialog>
@ -347,7 +347,8 @@ void EditSystem::okData()
QString sql; QString sql;
RDSqlQuery *q; RDSqlQuery *q;
RDSqlQuery *q1; RDSqlQuery *q1;
std::map<unsigned,QString> dups; // std::map<unsigned,QString> dups;
QMultiMap<unsigned,QString> dups;
if(edit_duplicate_carts_box->isChecked()!= if(edit_duplicate_carts_box->isChecked()!=
edit_system->allowDuplicateCartTitles()) { edit_system->allowDuplicateCartTitles()) {
@ -375,7 +376,7 @@ void EditSystem::okData()
QString().sprintf("(NUMBER!=%u)",q->value(0).toUInt()); QString().sprintf("(NUMBER!=%u)",q->value(0).toUInt());
q1=new RDSqlQuery(sql); q1=new RDSqlQuery(sql);
while(q1->next()) { while(q1->next()) {
dups[q1->value(0).toUInt()]=q->value(1).toString(); dups.insert(q1->value(0).toUInt(),q->value(1).toString());
} }
delete q1; delete q1;
count++; count++;
@ -401,9 +402,9 @@ void EditSystem::okData()
edit_cancel_button-> edit_cancel_button->
setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
QString filter_sql="where ("; QString filter_sql="where (";
for(std::map<unsigned,QString>::const_iterator ci=dups.begin(); for(QMultiMap<unsigned,QString>::const_iterator ci=dups.begin();
ci!=dups.end();ci++) { ci!=dups.end();ci++) {
filter_sql+=QString().sprintf("CART.NUMBER=%u||",ci->first); filter_sql+=QString().sprintf("CART.NUMBER=%u||",ci.key());
} }
filter_sql=filter_sql.left(filter_sql.length()-2)+ filter_sql=filter_sql.left(filter_sql.length()-2)+
") order by CART.TITLE "; ") order by CART.TITLE ";