diff options
author | Sergey Yershov <yershov@corp.mail.ru> | 2015-04-10 12:34:50 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:45:55 +0300 |
commit | 8af9575c0f3baa1467b73b45ab25e23bf3cfc9d6 (patch) | |
tree | 5bba3c0ab3bfaa36b65394c4fd7d1044a9765397 /qt_tstfrm | |
parent | e605a3ac816747cb7e5d5d207e8f8cbe28d162db (diff) |
Fix include path for qt & qt_tstfrm
Diffstat (limited to 'qt_tstfrm')
-rw-r--r-- | qt_tstfrm/gl_test_widget.hpp | 4 | ||||
-rw-r--r-- | qt_tstfrm/gui_test_widget.hpp | 4 | ||||
-rw-r--r-- | qt_tstfrm/macros.hpp | 2 | ||||
-rw-r--r-- | qt_tstfrm/test_main_loop.cpp | 6 | ||||
-rw-r--r-- | qt_tstfrm/test_main_loop.hpp | 2 | ||||
-rw-r--r-- | qt_tstfrm/tstwidgets.cpp | 16 | ||||
-rw-r--r-- | qt_tstfrm/tstwidgets.hpp | 12 |
7 files changed, 23 insertions, 23 deletions
diff --git a/qt_tstfrm/gl_test_widget.hpp b/qt_tstfrm/gl_test_widget.hpp index 4f1cad4a9c..459ce880ee 100644 --- a/qt_tstfrm/gl_test_widget.hpp +++ b/qt_tstfrm/gl_test_widget.hpp @@ -2,9 +2,9 @@ #include "tstwidgets.hpp" -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../../map/qgl_render_context.hpp" +#include "map/qgl_render_context.hpp" #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) #include <QtGui/QApplication> diff --git a/qt_tstfrm/gui_test_widget.hpp b/qt_tstfrm/gui_test_widget.hpp index f4d017f367..6596c8a91d 100644 --- a/qt_tstfrm/gui_test_widget.hpp +++ b/qt_tstfrm/gui_test_widget.hpp @@ -1,8 +1,8 @@ #pragma once #include "gl_test_widget.hpp" -#include "../../gui/controller.hpp" -#include "../../base/strings_bundle.hpp" +#include "gui/controller.hpp" +#include "base/strings_bundle.hpp" #include <QMouseEvent> #include <QObject> #include <QTimerEvent> diff --git a/qt_tstfrm/macros.hpp b/qt_tstfrm/macros.hpp index 58e097ba2f..23b349daf9 100644 --- a/qt_tstfrm/macros.hpp +++ b/qt_tstfrm/macros.hpp @@ -1,3 +1,3 @@ #pragma once -#include "gl_test_widget.hpp" +#include "qt_tstfrm/gl_test_widget.hpp" diff --git a/qt_tstfrm/test_main_loop.cpp b/qt_tstfrm/test_main_loop.cpp index d5db995773..cfd37fdb98 100644 --- a/qt_tstfrm/test_main_loop.cpp +++ b/qt_tstfrm/test_main_loop.cpp @@ -1,12 +1,12 @@ -#include "test_main_loop.hpp" +#include "qt_tstfrm/test_main_loop.hpp" #include <QtCore/QTimer> #include <QtWidgets/QApplication> #include <QtWidgets/QWidget> -#include "../base/scope_guard.hpp" +#include "base/scope_guard.hpp" -#include "../std/cstring.hpp" +#include "std/cstring.hpp" namespace { diff --git a/qt_tstfrm/test_main_loop.hpp b/qt_tstfrm/test_main_loop.hpp index 4a324523ca..db102c218e 100644 --- a/qt_tstfrm/test_main_loop.hpp +++ b/qt_tstfrm/test_main_loop.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../std/function.hpp" +#include "std/function.hpp" class QPaintDevice; typedef function<void (QPaintDevice *)> TRednerFn; diff --git a/qt_tstfrm/tstwidgets.cpp b/qt_tstfrm/tstwidgets.cpp index 37679e3541..b2672f149d 100644 --- a/qt_tstfrm/tstwidgets.cpp +++ b/qt_tstfrm/tstwidgets.cpp @@ -1,14 +1,14 @@ -#include "tstwidgets.hpp" +#include "qt_tstfrm/tstwidgets.hpp" -#include "../graphics/screen.hpp" -#include "../graphics/resource_manager.hpp" +#include "graphics/screen.hpp" +#include "graphics/resource_manager.hpp" -#include "../graphics/opengl/utils.hpp" -#include "../graphics/opengl/framebuffer.hpp" -#include "../graphics/opengl/renderbuffer.hpp" -#include "../graphics/opengl/opengl.hpp" +#include "graphics/opengl/utils.hpp" +#include "graphics/opengl/framebuffer.hpp" +#include "graphics/opengl/renderbuffer.hpp" +#include "graphics/opengl/opengl.hpp" -#include "../platform/platform.hpp" +#include "platform/platform.hpp" namespace tst { diff --git a/qt_tstfrm/tstwidgets.hpp b/qt_tstfrm/tstwidgets.hpp index 0f05ccf074..b7b60f0033 100644 --- a/qt_tstfrm/tstwidgets.hpp +++ b/qt_tstfrm/tstwidgets.hpp @@ -1,14 +1,14 @@ #pragma once -#include "../graphics/opengl/texture.hpp" -#include "../graphics/opengl/renderbuffer.hpp" +#include "graphics/opengl/texture.hpp" +#include "graphics/opengl/renderbuffer.hpp" -#include "../graphics/resource_manager.hpp" +#include "graphics/resource_manager.hpp" -#include "../map/drawer.hpp" -#include "../map/qgl_render_context.hpp" +#include "map/drawer.hpp" +#include "map/qgl_render_context.hpp" -#include "../std/shared_ptr.hpp" +#include "std/shared_ptr.hpp" #include <QtOpenGL/QGLWidget> |