[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master 2120f12 2/4: [ftinspect] s/maxFaces/faceCounter
From: |
Werner LEMBERG |
Subject: |
[freetype2-demos] master 2120f12 2/4: [ftinspect] s/maxFaces/faceCounter/. |
Date: |
Sat, 7 May 2016 15:36:10 +0000 (UTC) |
branch: master
commit 2120f1241c3c5174c5d915ae9f4043141aedf609
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
[ftinspect] s/maxFaces/faceCounter/.
* src/ftinspect.cpp, src/ftinspect.h: Do it.
---
ChangeLog | 6 ++++++
src/ftinspect.cpp | 4 ++--
src/ftinspect.h | 4 ++--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 76e8f52..ddc0a70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2016-05-07 Werner Lemberg <address@hidden>
+ [ftinspect] s/maxFaces/faceCounter/.
+
+ * src/ftinspect.cpp, src/ftinspect.h: Do it.
+
+2016-05-07 Werner Lemberg <address@hidden>
+
[ftinspect] Another try to implement `faceRequester'.
* src/ftinspect.h (FaceID): Extend structure to make it suitable as
diff --git a/src/ftinspect.cpp b/src/ftinspect.cpp
index 1e16fd4..10f2f73 100644
--- a/src/ftinspect.cpp
+++ b/src/ftinspect.cpp
@@ -557,7 +557,7 @@ MainGUI::showFont()
// we need this for the `faceRequester' function
for (int i = 0; i < numInstances; i++)
faceIDHash.insert(FaceID(currentFontIndex, currentFaceIndex, i),
- maxFaces++);
+ faceCounter++);
// instance index 0 represents a face without an instance;
// consequently, `n' instances are enumerated from 1 to `n'
@@ -1263,7 +1263,7 @@ MainGUI::clearStatusBar()
void
MainGUI::setDefaults()
{
- maxFaces = 0;
+ faceCounter = 0;
// set up mappings between property values and combo box indices
hintingModesTrueTypeHash[TT_INTERPRETER_VERSION_35] =
HintingMode_TrueType_v35;
diff --git a/src/ftinspect.h b/src/ftinspect.h
index 5682d8f..133b65c 100644
--- a/src/ftinspect.h
+++ b/src/ftinspect.h
@@ -69,7 +69,7 @@ struct Font
// This structure is used to map the (font,face,instance) index triplet to
// abstract IDs (generated by a running number stored in MainGUI's
-// `maxFaces' member).
+// `faceCounter' member).
//
// Qt's `QHash' class needs an implementation of `==' and a global,
// overloaded `qHash' function.
@@ -217,7 +217,7 @@ private:
int currentFaceIndex;
int currentInstanceIndex;
- int maxFaces; // a running number used to initialize `faceIDHash'
+ int faceCounter; // a running number used to initialize `faceIDHash'
QHash<FaceID, int> faceIDHash;
// layout related stuff
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master 2120f12 2/4: [ftinspect] s/maxFaces/faceCounter/.,
Werner LEMBERG <=