diff options
| author | krishna keshav <princy.krishnakeshav@gmail.com> | 2016-05-30 02:17:22 +0530 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-02 07:36:03 +0000 |
| commit | c0843884a0929ae4e5ad30e2410d8a8f6dfb1670 (patch) | |
| tree | 80a01bd69b624ff76be38794b4ecfdae2b963968 /vcl | |
| parent | 4ca9e855389176bd913c60840b516cb122273b81 (diff) | |
tdf#96099 Reduce number of typedefs used for trivial container types
Removed "typedef" for std::unordered_map<int, int> in vcl/win/gdi/winlayout.cxx
Change-Id: I2798a21be61d6ceee680762d4145a2ae1fc1242d
Reviewed-on: https://gerrit.libreoffice.org/25644
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/gdi/winlayout.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index 7133a7cea00c..76900a56fbc6 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -50,8 +50,6 @@ #include <unordered_map> #include <unordered_set> -typedef std::unordered_map<int,int> IntMap; - // Graphite headers #include <config_graphite.h> #if ENABLE_GRAPHITE @@ -233,10 +231,10 @@ public: } private: - IntMap maWidthMap; - mutable int mnMinKashidaWidth; - mutable int mnMinKashidaGlyph; - bool mbGLyphySetupCalled; + std::unordered_map<int, int> maWidthMap; + mutable int mnMinKashidaWidth; + mutable int mnMinKashidaGlyph; + bool mbGLyphySetupCalled; }; GLuint WinFontInstance::mnGLyphyProgram = 0; @@ -345,7 +343,7 @@ inline void WinFontInstance::CacheGlyphWidth( int nCharCode, int nCharWidth ) inline int WinFontInstance::GetCachedGlyphWidth( int nCharCode ) const { - IntMap::const_iterator it = maWidthMap.find( nCharCode ); + auto it = maWidthMap.find( nCharCode ); if( it == maWidthMap.end() ) return -1; return it->second; |