summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2009-06-18 06:27:37 (GMT)
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2009-06-18 06:27:37 (GMT)
commit7e8008cdd707d4ea3504df4ad02a4589c7b16510 (patch)
tree8ee79814606469897c6e6ed0d1cfb4dcd6a3e401
parent7d6da125cb94f70f2b14b60c87ded71876e28149 (diff)
downloadQt-7e8008cdd707d4ea3504df4ad02a4589c7b16510.zip
Qt-7e8008cdd707d4ea3504df4ad02a4589c7b16510.tar.gz
Qt-7e8008cdd707d4ea3504df4ad02a4589c7b16510.tar.bz2
Fix nasty qt3-qt4 porting trap: for a QStringList, lst.remove(lst.at(idx)) used to only remove one item in Qt3, while it removes all occurrences of the item in Qt4 (remove==removeAll). To catch it I commented out remove(T) in my qlist.h, which caught this.
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
-rw-r--r--tools/qtconfig/mainwindow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp
index eabaec6..a59f790 100644
--- a/tools/qtconfig/mainwindow.cpp
+++ b/tools/qtconfig/mainwindow.cpp
@@ -829,7 +829,7 @@ void MainWindow::removeSubstitute()
int item = sublistbox->currentItem();
QStringList subs = QFont::substitutes(familysubcombo->currentText());
- subs.remove(subs.at(sublistbox->currentItem()));
+ subs.removeAt(sublistbox->currentItem());
sublistbox->clear();
sublistbox->insertStringList(subs);
if (uint(item) > sublistbox->count())
@@ -909,7 +909,7 @@ void MainWindow::removeFontpath()
return;
int item = fontpathlistbox->currentItem();
- fontpaths.remove(fontpaths.at(fontpathlistbox->currentItem()));
+ fontpaths.removeAt(fontpathlistbox->currentItem());
fontpathlistbox->clear();
fontpathlistbox->insertStringList(fontpaths);
if (uint(item) > fontpathlistbox->count())