From kde-commits  Tue Jun 30 20:33:19 2015
From: Thomas Fischer <fischer () unix-ag ! uni-kl ! de>
Date: Tue, 30 Jun 2015 20:33:19 +0000
To: kde-commits
Subject: [kbibtex] src/gui: Rewriting usage of BibTeXFields and BibTeXEntries
Message-Id: <E1ZA2DX-0007KM-Hi () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=143569640809675

Git commit ea9720dba19ec9cd72a8c586ffff63d675b6bace by Thomas Fischer.
Committed on 30/06/2015 at 20:26.
Pushed by thomasfischer into branch 'master'.

Rewriting usage of BibTeXFields and BibTeXEntries

Continuing to rewrite the usage of BibTeXFields and
BibTeXEntries as started in commit 56368702216a11.

Original commit's message reads as follows:

Pointers to singleton objects of BibTeXFields and
BibTeXEntries become 'const' to avoid certain issues.
Furthermore, rewriting some for-loops to avoid
premature deletion of said singletons.

M  +3    -1    src/gui/file/filemodel.cpp
M  +3    -1    src/gui/widgets/filterbar.cpp

http://commits.kde.org/kbibtex/ea9720dba19ec9cd72a8c586ffff63d675b6bace

diff --git a/src/gui/file/filemodel.cpp b/src/gui/file/filemodel.cpp
index b68fad2..2c7f16d 100644
--- a/src/gui/file/filemodel.cpp
+++ b/src/gui/file/filemodel.cpp
@@ -329,7 +329,9 @@ void FileModel::notificationEvent(int eventId)
     if (eventId =3D=3D NotificationHub::EventConfigurationChanged) {
         readConfiguration();
         int column =3D 0;
-        foreach(const FieldDescription *fd, *BibTeXFields::self()) {
+        const BibTeXFields *bf =3D BibTeXFields::self();
+        for (BibTeXFields::ConstIterator it =3D bf->constBegin(); it !=3D =
bf->constEnd(); ++it) {
+            const FieldDescription *fd =3D *it;
             /// Colors may have changed
             bool columnChanged =3D fd->upperCamelCase.toLower() =3D=3D Ent=
ry::ftColor;
             /// Person name formatting may has changed
diff --git a/src/gui/widgets/filterbar.cpp b/src/gui/widgets/filterbar.cpp
index 4181b2c..15cc04e 100644
--- a/src/gui/widgets/filterbar.cpp
+++ b/src/gui/widgets/filterbar.cpp
@@ -201,7 +201,9 @@ FilterBar::FilterBar(QWidget *parent)
     d->comboBoxField->addItem(i18n("any field"), QVariant());
     d->comboBoxField->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::P=
referred);
 =

-    foreach(const FieldDescription *fd, *BibTeXFields::self()) {
+    const BibTeXFields *bf =3D BibTeXFields::self();
+    for (BibTeXFields::ConstIterator it =3D bf->constBegin(); it !=3D bf->=
constEnd(); ++it) {
+        const FieldDescription *fd =3D *it;
         if (fd->upperCamelCaseAlt.isEmpty())
             d->comboBoxField->addItem(fd->label, fd->upperCamelCase);
     }