diff options
| author | Isak Fyksen <isak.fyksen@qt.io> | 2024-10-17 12:01:48 +0200 |
|---|---|---|
| committer | Isak Fyksen <isak.fyksen@qt.io> | 2024-11-21 16:10:37 +0000 |
| commit | 35022c1698664b1171e0e5e9611bd9de75d31765 (patch) | |
| tree | 208b7e1600992fd48c94f515076798587c82b2d9 /src/opengl/qopengltexture.h | |
| parent | abe3eed54889dc8979b14c4aed1a0cae431f50ff (diff) | |
Replace QPair/qMakePair with std::pair in qtbase/opengl
Task-number: QTBUG-115841
Change-Id: Ic7a362a41fb52d39d8a168f0ba4ed6d33458dd73
Reviewed-by: Matthias Rauter <matthias.rauter@qt.io>
Diffstat (limited to 'src/opengl/qopengltexture.h')
| -rw-r--r-- | src/opengl/qopengltexture.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/opengl/qopengltexture.h b/src/opengl/qopengltexture.h index c9210fa5297..9ac77b1f8e7 100644 --- a/src/opengl/qopengltexture.h +++ b/src/opengl/qopengltexture.h @@ -486,7 +486,7 @@ public: void setMipMaxLevel(int maxLevel); int mipMaxLevel() const; void setMipLevelRange(int baseLevel, int maxLevel); - QPair<int, int> mipLevelRange() const; + std::pair<int, int> mipLevelRange() const; void setAutoMipMapGenerationEnabled(bool enabled); bool isAutoMipMapGenerationEnabled() const; @@ -553,7 +553,7 @@ public: Filter magnificationFilter() const; void setMinMagFilters(Filter minificationFilter, Filter magnificationFilter); - QPair<Filter, Filter> minMagFilters() const; + std::pair<Filter, Filter> minMagFilters() const; void setMaximumAnisotropy(float anisotropy); float maximumAnisotropy() const; @@ -576,7 +576,7 @@ public: void setMaximumLevelOfDetail(float value); float maximumLevelOfDetail() const; void setLevelOfDetailRange(float min, float max); - QPair<float, float> levelOfDetailRange() const; + std::pair<float, float> levelOfDetailRange() const; void setLevelofDetailBias(float bias); float levelofDetailBias() const; |