[freetype2-demos] master 12e8abc 2/7: [ftinspect] Variable renaming.

[Werner LEMBERG]

branch: master
commit 12e8abcc7f9c12b7be34c3323489ac772633e498
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [ftinspect] Variable renaming.
    
    * src/ftinspect.cpp, src/ftinspect.h (FaceID):
    s/instanceIndex/namedInstanceIndex/.
---
 ChangeLog         |    7 +++++++
 src/ftinspect.cpp |   14 +++++++-------
 src/ftinspect.h   |    2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 69f716a..1641624 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-05-14  Werner Lemberg  <address@hidden>
+
+       [ftinspect] Variable renaming.
+
+       * src/ftinspect.cpp, src/ftinspect.h (FaceID):
+       s/instanceIndex/namedInstanceIndex/.
+
 2016-05-12  Werner Lemberg  <address@hidden>
 
        [ftinspect] Variable renamings.
diff --git a/src/ftinspect.cpp b/src/ftinspect.cpp
index b821f77..187f883 100644
--- a/src/ftinspect.cpp
+++ b/src/ftinspect.cpp
@@ -11,7 +11,7 @@
 FaceID::FaceID()
 : fontIndex(-1),
   faceIndex(-1),
-  instanceIndex(-1)
+  namedInstanceIndex(-1)
 {
   // empty
 }
@@ -19,10 +19,10 @@ FaceID::FaceID()
 
 FaceID::FaceID(int fontIdx,
                int faceIdx,
-               int instanceIdx)
+               int namedInstanceIdx)
 : fontIndex(fontIdx),
   faceIndex(faceIdx),
-  instanceIndex(instanceIdx)
+  namedInstanceIndex(namedInstanceIdx)
 {
   // empty
 }
@@ -33,7 +33,7 @@ FaceID::operator==(const FaceID& other) const
 {
   return (fontIndex == other.fontIndex
           && faceIndex == other.faceIndex
-          && instanceIndex == other.instanceIndex);
+          && namedInstanceIndex == other.namedInstanceIndex);
 }
 
 
@@ -42,7 +42,7 @@ qHash(FaceID key)
 {
   return ((uint)key.fontIndex << 20)
          | ((uint)key.faceIndex << 10)
-         | (uint)key.instanceIndex;
+         | (uint)key.namedInstanceIndex;
 }
 
 
@@ -69,8 +69,8 @@ faceRequester(FTC_FaceID faceID,
   Font& font = gui->fontList[id.fontIndex];
   int faceIndex = id.faceIndex;
 
-  if (id.instanceIndex >= 0)
-    faceIndex += id.instanceIndex << 16;
+  if (id.namedInstanceIndex >= 0)
+    faceIndex += id.namedInstanceIndex << 16;
 
   return FT_New_Face(library,
                      qPrintable(font.filePathname),
diff --git a/src/ftinspect.h b/src/ftinspect.h
index 1e417fa..a884fae 100644
--- a/src/ftinspect.h
+++ b/src/ftinspect.h
@@ -94,7 +94,7 @@ struct FaceID
 {
   int fontIndex;
   int faceIndex;
-  int instanceIndex;
+  int namedInstanceIndex;
 
   FaceID();
   FaceID(int, int, int);