diff options
| -rw-r--r-- | src/base/song.hpp | 4 | ||||
| -rw-r--r-- | src/menu/control.cpp | 1 | ||||
| -rw-r--r-- | src/menu/frame_background_image.hpp | 2 | ||||
| -rw-r--r-- | src/menu/software_mouse_pointer.hpp | 2 | ||||
| -rw-r--r-- | src/utils/rectangle.hpp | 4 |
5 files changed, 6 insertions, 7 deletions
diff --git a/src/base/song.hpp b/src/base/song.hpp index afcae7f4..b14e1cde 100644 --- a/src/base/song.hpp +++ b/src/base/song.hpp @@ -34,7 +34,7 @@ #include <log4cpp/Category.hh> #include "bpm.hpp" #include "lyric_line.hpp" -#include "texture.hpp" +#include "utils/image.hpp" #include "utils/base_exception.hpp" namespace usdx @@ -76,7 +76,7 @@ namespace usdx float video_gap; std::string cover_file; - Texture* cover; + Image* cover; std::string genre; std::string edition; diff --git a/src/menu/control.cpp b/src/menu/control.cpp index f9ea2a89..b22df1ab 100644 --- a/src/menu/control.cpp +++ b/src/menu/control.cpp @@ -24,7 +24,6 @@ * $Id$ */ -#include <stddef.h> #include "control.hpp" namespace usdx diff --git a/src/menu/frame_background_image.hpp b/src/menu/frame_background_image.hpp index de9103c1..a3349574 100644 --- a/src/menu/frame_background_image.hpp +++ b/src/menu/frame_background_image.hpp @@ -31,7 +31,7 @@ #include <GL/gl.h> #include "frame_background.hpp" -#include "base/texture.hpp" +#include "texture.hpp" namespace usdx { diff --git a/src/menu/software_mouse_pointer.hpp b/src/menu/software_mouse_pointer.hpp index b1f40d06..3b29e50e 100644 --- a/src/menu/software_mouse_pointer.hpp +++ b/src/menu/software_mouse_pointer.hpp @@ -30,7 +30,7 @@ #include "drawable_control.hpp" #include "control.hpp" #include "event_manager.hpp" -#include "base/texture.hpp" +#include "texture.hpp" #include <boost/signals2.hpp> #include <boost/thread/mutex.hpp> diff --git a/src/utils/rectangle.hpp b/src/utils/rectangle.hpp index 0dc456ef..c77b8673 100644 --- a/src/utils/rectangle.hpp +++ b/src/utils/rectangle.hpp @@ -27,8 +27,8 @@ #ifndef RECTANGLE_HPP #define RECTANGLE_HPP -#include "utils/point.hpp" -#include "utils/dimension.hpp" +#include "point.hpp" +#include "dimension.hpp" namespace usdx { |