Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-24 00:00:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing header order and code style

Browse source
This commit is contained in:
Brad Davis 2015-02-04 14:36:03 -08:00
parent 1745ba9a7e
commit 02f2f1c1bf
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/render-utils/src/TextRenderer.cpp
View file

@ -9,8 +9,6 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
#include "TextRenderer.h"
#include "MatrixStack.h"
#include <gpu/GPUConfig.h> #include <gpu/GPUConfig.h>
#include <QApplication> #include <QApplication>
@ -36,6 +34,9 @@
#include "FontRoboto.h" #include "FontRoboto.h"
#include "FontTimeless.h" #include "FontTimeless.h"
#include "FontCourierPrime.h" #include "FontCourierPrime.h"
#include "MatrixStack.h"
#include "TextRenderer.h"
namespace Shaders { namespace Shaders {
// Normally we could use 'enum class' to avoid namespace pollution, // Normally we could use 'enum class' to avoid namespace pollution,
@ -231,7 +232,7 @@ public:
float maxWidth) const; float maxWidth) const;
}; };
static QHash<QString, Font*> LOADED_FONTS; static QHash<QString, Font *> LOADED_FONTS;
Font * loadFont(QIODevice & buffer) { Font * loadFont(QIODevice & buffer) {
Font * result = new Font(); Font * result = new Font();