summaryrefslogtreecommitdiffstats
path: root/scribus/patterndialog.cpp
diff options
context:
space:
mode:
authorcraig <craig@11d20701-8431-0410-a711-e3c959e3b870>2012-01-25 21:10:44 +0000
committercraig <craig@11d20701-8431-0410-a711-e3c959e3b870>2012-01-25 21:10:44 +0000
commit98a30cc8b97ed2f16cc15742327ae8ea732fc9a6 (patch)
tree470e34491c4d1978df2d9700d6ce75a53d908acb /scribus/patterndialog.cpp
parent4f4d36f57f4b613364dfb18e262fb6c5e4e690e3 (diff)
downloadscribus-98a30cc8b97ed2f16cc15742327ae8ea732fc9a6.tar.gz
scribus-98a30cc8b97ed2f16cc15742327ae8ea732fc9a6.tar.xz
scribus-98a30cc8b97ed2f16cc15742327ae8ea732fc9a6.zip
#10082: Backport new Query dialog code and adjust usage to new duplicate check method, and move to declared vars
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17234 11d20701-8431-0410-a711-e3c959e3b870
Diffstat (limited to 'scribus/patterndialog.cpp')
-rw-r--r--scribus/patterndialog.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/scribus/patterndialog.cpp b/scribus/patterndialog.cpp
index a7b1778..d4d8ddb 100644
--- a/scribus/patterndialog.cpp
+++ b/scribus/patterndialog.cpp
@@ -84,15 +84,10 @@ void PatternDialog::renamePattern()
QString newName = "";
Query dia(this, "tt", 1, 0, tr("&Name:"), tr("Rename Entry"));
dia.setEditText(it->text(), true);
+ dia.setTestList(dialogPatterns.keys());
if (dia.exec())
{
newName = dia.getEditText();
- while (dialogPatterns.contains(newName))
- {
- if (!dia.exec())
- return;
- newName = dia.getEditText();
- }
ScPattern pat = dialogPatterns.take(it->text());
dialogPatterns.insert(newName, pat);
replaceMap.insert(patternName, newName);