[Performous-commit] Lasse Karkkainen : Rename joystick.hh/cc to controllers.hh/cc.

[Lasse Kärkkäi. <tr...@us...>]

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Nov  3 09:00:39 2012 +0200

Rename joystick.hh/cc to controllers.hh/cc.

---

 game/{joystick.cc => controllers.cc} |    2 +-
 game/{joystick.hh => controllers.hh} |    0
 game/instrumentgraph.hh              |    2 +-
 game/main.cc                         |    2 +-
 game/screen_audiodevices.cc          |    2 +-
 game/screen_intro.cc                 |    2 +-
 game/screen_paths.cc                 |    2 +-
 game/screen_players.cc               |    2 +-
 game/screen_practice.cc              |    2 +-
 game/screen_practice.hh              |    2 +-
 game/screen_songs.hh                 |    2 +-
 game/video_driver.cc                 |    2 +-
 12 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/game/joystick.cc b/game/controllers.cc
similarity index 99%
rename from game/joystick.cc
rename to game/controllers.cc
index d1c9d26..c870c0f 100644
--- a/game/joystick.cc
+++ b/game/controllers.cc
@@ -1,4 +1,4 @@
-#include "joystick.hh"
+#include "controllers.hh"
 
 #include <boost/lexical_cast.hpp>
 #include <boost/regex.hpp>
diff --git a/game/joystick.hh b/game/controllers.hh
similarity index 100%
rename from game/joystick.hh
rename to game/controllers.hh
diff --git a/game/instrumentgraph.hh b/game/instrumentgraph.hh
index c8006b7..233c8a1 100644
--- a/game/instrumentgraph.hh
+++ b/game/instrumentgraph.hh
@@ -5,7 +5,7 @@
 #include "animvalue.hh"
 #include "notes.hh"
 #include "audio.hh"
-#include "joystick.hh"
+#include "controllers.hh"
 #include "surface.hh"
 #include "opengl_text.hh"
 #include "glutil.hh"
diff --git a/game/main.cc b/game/main.cc
index cb3308b..7b3cf03 100644
--- a/game/main.cc
+++ b/game/main.cc
@@ -1,7 +1,7 @@
 #include "config.hh"
 #include "fs.hh"
 #include "screen.hh"
-#include "joystick.hh"
+#include "controllers.hh"
 #include "profiler.hh"
 #include "songs.hh"
 #include "backgrounds.hh"
diff --git a/game/screen_audiodevices.cc b/game/screen_audiodevices.cc
index 3cc97d6..75a7e5f 100644
--- a/game/screen_audiodevices.cc
+++ b/game/screen_audiodevices.cc
@@ -1,7 +1,7 @@
 #include "screen_audiodevices.hh"
 
 #include "configuration.hh"
-#include "joystick.hh"
+#include "controllers.hh"
 #include "theme.hh"
 #include "audio.hh"
 #include "i18n.hh"
diff --git a/game/screen_intro.cc b/game/screen_intro.cc
index 906df55..bcedaf8 100644
--- a/game/screen_intro.cc
+++ b/game/screen_intro.cc
@@ -4,7 +4,7 @@
 #include "glmath.hh"
 #include "audio.hh"
 #include "i18n.hh"
-#include "joystick.hh"
+#include "controllers.hh"
 #include "theme.hh"
 #include "menu.hh"
 #include "xtime.hh"
diff --git a/game/screen_paths.cc b/game/screen_paths.cc
index 9169e44..46310ef 100644
--- a/game/screen_paths.cc
+++ b/game/screen_paths.cc
@@ -1,7 +1,7 @@
 #include "screen_paths.hh"
 
 #include "configuration.hh"
-#include "joystick.hh"
+#include "controllers.hh"
 #include "theme.hh"
 #include "audio.hh"
 #include "i18n.hh"
diff --git a/game/screen_players.cc b/game/screen_players.cc
index 9f49b6d..0190150 100644
--- a/game/screen_players.cc
+++ b/game/screen_players.cc
@@ -9,7 +9,7 @@
 #include "theme.hh"
 #include "video.hh"
 #include "i18n.hh"
-#include "joystick.hh"
+#include "controllers.hh"
 
 #include <iostream>
 #include <sstream>
diff --git a/game/screen_practice.cc b/game/screen_practice.cc
index 28f8197..3da1dea 100644
--- a/game/screen_practice.cc
+++ b/game/screen_practice.cc
@@ -3,7 +3,7 @@
 #include "audio.hh"
 #include "util.hh"
 #include "fs.hh"
-#include "joystick.hh"
+#include "controllers.hh"
 #include "theme.hh"
 #include "progressbar.hh"
 
diff --git a/game/screen_practice.hh b/game/screen_practice.hh
index bb0ae1e..0fb3f8d 100644
--- a/game/screen_practice.hh
+++ b/game/screen_practice.hh
@@ -2,7 +2,7 @@
 
 #include <boost/scoped_ptr.hpp>
 #include "screen.hh"
-#include "joystick.hh"
+#include "controllers.hh"
 
 class Audio;
 class Sample;
diff --git a/game/screen_songs.hh b/game/screen_songs.hh
index e8314cd..7e1f93d 100644
--- a/game/screen_songs.hh
+++ b/game/screen_songs.hh
@@ -9,7 +9,7 @@
 #include "textinput.hh"
 #include "theme.hh"
 #include "video.hh"
-#include "joystick.hh"
+#include "controllers.hh"
 
 class Song;
 class Audio;
diff --git a/game/video_driver.cc b/game/video_driver.cc
index 51f02b6..dbe31bf 100644
--- a/game/video_driver.cc
+++ b/game/video_driver.cc
@@ -6,7 +6,7 @@
 #include "glmath.hh"
 #include "image.hh"
 #include "util.hh"
-#include "joystick.hh"
+#include "controllers.hh"
 #include "screen.hh"
 #include <boost/date_time.hpp>
 #include <fstream>