mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-10 22:18:54 +01:00
scripted-diff: Make SeparatorStyle a scoped enum
-BEGIN VERIFY SCRIPT-
# General rename helper: $1 -> $2
rename_global() { sed -i "s/\<$1\>/$2/g" $(git grep -l "$1"); }
# Helper to rename SeparatorStyle enumerators
rename_value() {
sed -i "s/ $1/ $2/g" src/qt/bitcoinunits.h;
rename_global $1 "SeparatorStyle::$2";
}
rename_global 'enum SeparatorStyle' 'enum class SeparatorStyle'
rename_value 'separatorNever' 'NEVER'
rename_value 'separatorStandard' 'STANDARD'
rename_value 'separatorAlways' 'ALWAYS'
-END VERIFY SCRIPT-
This commit is contained in:
@@ -524,7 +524,7 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
|
||||
case ToAddress:
|
||||
return formatTxToAddress(rec, false);
|
||||
case Amount:
|
||||
return formatTxAmount(rec, true, BitcoinUnits::separatorAlways);
|
||||
return formatTxAmount(rec, true, BitcoinUnits::SeparatorStyle::ALWAYS);
|
||||
}
|
||||
break;
|
||||
case Qt::EditRole:
|
||||
@@ -614,14 +614,14 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
|
||||
details.append(QString::fromStdString(rec->address));
|
||||
details.append(" ");
|
||||
}
|
||||
details.append(formatTxAmount(rec, false, BitcoinUnits::separatorNever));
|
||||
details.append(formatTxAmount(rec, false, BitcoinUnits::SeparatorStyle::NEVER));
|
||||
return details;
|
||||
}
|
||||
case ConfirmedRole:
|
||||
return rec->status.status == TransactionStatus::Status::Confirming || rec->status.status == TransactionStatus::Status::Confirmed;
|
||||
case FormattedAmountRole:
|
||||
// Used for copy/export, so don't include separators
|
||||
return formatTxAmount(rec, false, BitcoinUnits::separatorNever);
|
||||
return formatTxAmount(rec, false, BitcoinUnits::SeparatorStyle::NEVER);
|
||||
case StatusRole:
|
||||
return rec->status.status;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user