Menu
▾
▴
[Performous-commit] Tapio Vierros : Remove excess includes and move to .cc when possible.
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-07-18 06:39:24
|
Module: performous
Branch: portaudio
Commit: b1b1d8d9c4720c5941a2bacc7cb2aaa0c699051f
Author: Tapio Vierros <tap...@gm...>
Date: Sat Jul 17 00:57:29 2010 +0300
Remove excess includes and move to .cc when possible.
---
game/3dobject.cc | 6 ------
game/3dobject.hh | 4 ----
game/backgrounds.cc | 1 -
game/backgrounds.hh | 1 -
game/dancegraph.cc | 7 +++----
game/dancegraph.hh | 8 --------
game/guitargraph.cc | 5 ++---
game/guitargraph.hh | 8 --------
game/instrumentgraph.hh | 3 ---
game/joystick.cc | 1 -
game/screen_configuration.cc | 3 +++
game/screen_configuration.hh | 7 ++++---
game/screen_intro.cc | 2 ++
game/screen_intro.hh | 8 ++++----
game/screen_practice.cc | 4 +++-
game/screen_practice.hh | 10 +++++-----
game/songparser-ini.cc | 1 -
game/songparser-sm.cc | 1 -
game/songparser.cc | 3 +--
game/songparser.hh | 2 --
20 files changed, 27 insertions(+), 58 deletions(-)
diff --git a/game/3dobject.cc b/game/3dobject.cc
index edafe3d..053896c 100644
--- a/game/3dobject.cc
+++ b/game/3dobject.cc
@@ -1,14 +1,8 @@
#include "3dobject.hh"
-#include "surface.hh"
-#include "glutil.hh"
-#include <vector>
-#include <map>
-#include <iostream>
#include <sstream>
#include <fstream>
#include <stdexcept>
-#include <string>
#include <cmath>
diff --git a/game/3dobject.hh b/game/3dobject.hh
index 8bf6ceb..9858de8 100644
--- a/game/3dobject.hh
+++ b/game/3dobject.hh
@@ -1,11 +1,7 @@
#pragma once
#include <vector>
-#include <map>
-#include <iostream>
-#include <stdexcept>
#include <string>
-
#include <boost/scoped_ptr.hpp>
#include <boost/noncopyable.hpp>
#include "surface.hh"
diff --git a/game/backgrounds.cc b/game/backgrounds.cc
index fcc7fe2..5fe42bd 100644
--- a/game/backgrounds.cc
+++ b/game/backgrounds.cc
@@ -1,7 +1,6 @@
#include "backgrounds.hh"
#include "configuration.hh"
-#include "fs.hh"
#include <boost/bind.hpp>
#include <boost/format.hpp>
diff --git a/game/backgrounds.hh b/game/backgrounds.hh
index aa99bab..d56eab7 100644
--- a/game/backgrounds.hh
+++ b/game/backgrounds.hh
@@ -7,7 +7,6 @@
#include <boost/scoped_ptr.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/thread.hpp>
-#include <set>
#include <vector>
/// songs class for songs screen
diff --git a/game/dancegraph.cc b/game/dancegraph.cc
index 468106c..8d2d7a9 100644
--- a/game/dancegraph.cc
+++ b/game/dancegraph.cc
@@ -1,8 +1,7 @@
#include "dancegraph.hh"
-#include "instrumentgraph.hh"
-#include "fs.hh"
-#include "notes.hh"
-#include "surface.hh"
+#include "song.hh"
+#include "i18n.hh"
+
#include <boost/lexical_cast.hpp>
#include <stdexcept>
#include <algorithm>
diff --git a/game/dancegraph.hh b/game/dancegraph.hh
index 0eff7b7..67c58fd 100644
--- a/game/dancegraph.hh
+++ b/game/dancegraph.hh
@@ -1,16 +1,8 @@
#pragma once
-#include <vector>
#include <boost/ptr_container/ptr_map.hpp>
#include "instrumentgraph.hh"
-#include "animvalue.hh"
-#include "song.hh"
-#include "notes.hh"
-#include "audio.hh"
-#include "joystick.hh"
-#include "surface.hh"
-#include "opengl_text.hh"
class Song;
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index 01d9ffb..c0152b1 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -1,12 +1,11 @@
#include "guitargraph.hh"
-#include "instrumentgraph.hh"
#include "fs.hh"
#include "song.hh"
-#include "3dobject.hh"
+#include "i18n.hh"
+
#include <cmath>
#include <cstdlib>
#include <stdexcept>
-
#include <boost/lexical_cast.hpp>
#include <boost/format.hpp>
diff --git a/game/guitargraph.hh b/game/guitargraph.hh
index ed8b931..e8e5e1f 100644
--- a/game/guitargraph.hh
+++ b/game/guitargraph.hh
@@ -1,17 +1,9 @@
#pragma once
-#include <vector>
#include <boost/ptr_container/ptr_map.hpp>
#include "instrumentgraph.hh"
-#include "animvalue.hh"
-#include "notes.hh"
-#include "audio.hh"
-#include "joystick.hh"
-#include "surface.hh"
-#include "opengl_text.hh"
#include "3dobject.hh"
-#include "glutil.hh"
class Song;
diff --git a/game/instrumentgraph.hh b/game/instrumentgraph.hh
index 8ca5cac..7bc6ab8 100644
--- a/game/instrumentgraph.hh
+++ b/game/instrumentgraph.hh
@@ -8,11 +8,8 @@
#include "joystick.hh"
#include "surface.hh"
#include "opengl_text.hh"
-#include "3dobject.hh"
#include "glutil.hh"
#include "fs.hh"
-#include "i18n.hh"
-
/// Represents popup messages
class Popup {
diff --git a/game/joystick.cc b/game/joystick.cc
index 02d016d..98640c1 100644
--- a/game/joystick.cc
+++ b/game/joystick.cc
@@ -1,5 +1,4 @@
#include "joystick.hh"
-#include <iostream>
#include <boost/lexical_cast.hpp>
diff --git a/game/screen_configuration.cc b/game/screen_configuration.cc
index 87b7a4a..e61ecf3 100644
--- a/game/screen_configuration.cc
+++ b/game/screen_configuration.cc
@@ -2,6 +2,9 @@
#include "configuration.hh"
#include "joystick.hh"
+#include "theme.hh"
+#include "audio.hh"
+
ScreenConfiguration::ScreenConfiguration(std::string const& name, Audio& audio): Screen(name), m_audio(audio), selected() {
for (ConfigMenu::const_iterator it = configMenu.begin(); it != configMenu.end(); ++it) {
diff --git a/game/screen_configuration.hh b/game/screen_configuration.hh
index 72d54b8..3524d3c 100644
--- a/game/screen_configuration.hh
+++ b/game/screen_configuration.hh
@@ -1,9 +1,10 @@
#pragma once
-#include "screen.hh"
-#include "audio.hh"
-#include "theme.hh"
#include <boost/scoped_ptr.hpp>
+#include "screen.hh"
+
+class Audio;
+class ThemeConfiguration;
/// options dialogue
class ScreenConfiguration: public Screen {
diff --git a/game/screen_intro.cc b/game/screen_intro.cc
index 2b488a5..818bfeb 100644
--- a/game/screen_intro.cc
+++ b/game/screen_intro.cc
@@ -5,6 +5,8 @@
#include "record.hh"
#include "i18n.hh"
#include "joystick.hh"
+#include "theme.hh"
+#include "menu.hh"
ScreenIntro::ScreenIntro(std::string const& name, Audio& audio, Capture& capture): Screen(name), m_audio(audio), m_capture(capture), selected(), m_first(true) {
}
diff --git a/game/screen_intro.hh b/game/screen_intro.hh
index 76d7909..a7912d8 100644
--- a/game/screen_intro.hh
+++ b/game/screen_intro.hh
@@ -1,13 +1,13 @@
#pragma once
+#include <boost/scoped_ptr.hpp>
#include "dialog.hh"
#include "screen.hh"
-#include "theme.hh"
-#include "menu.hh"
-#include <boost/scoped_ptr.hpp>
class Audio;
class Capture;
+class ThemeIntro;
+class MenuOption;
/// intro screen
class ScreenIntro : public Screen {
@@ -18,7 +18,7 @@ class ScreenIntro : public Screen {
void exit();
void manageEvent(SDL_Event event);
void draw();
-
+
/// draw menu
void draw_menu_options();
diff --git a/game/screen_practice.cc b/game/screen_practice.cc
index 1ca3135..4b37583 100644
--- a/game/screen_practice.cc
+++ b/game/screen_practice.cc
@@ -3,7 +3,9 @@
#include "util.hh"
#include "fs.hh"
#include "record.hh"
-#include "joystick.hh"
+#include "audio.hh"
+#include "theme.hh"
+#include "progressbar.hh"
ScreenPractice::ScreenPractice(std::string const& name, Audio& audio, Capture& capture):
Screen(name), m_audio(audio), m_capture(capture)
diff --git a/game/screen_practice.hh b/game/screen_practice.hh
index a2c372c..fd77a75 100644
--- a/game/screen_practice.hh
+++ b/game/screen_practice.hh
@@ -1,14 +1,14 @@
#pragma once
#include <boost/scoped_ptr.hpp>
-#include "audio.hh"
#include "screen.hh"
-#include "theme.hh"
-//#include "opengl_text.hh"
-#include "progressbar.hh"
#include "joystick.hh"
+class Audio;
class Capture;
+class Sample;
+class ProgressBar;
+class ThemePractice;
/// screen for practice mode
class ScreenPractice : public Screen {
@@ -19,7 +19,7 @@ class ScreenPractice : public Screen {
void exit();
void manageEvent( SDL_Event event );
void draw();
-
+
/// draw analyzers
void draw_analyzers();
diff --git a/game/songparser-ini.cc b/game/songparser-ini.cc
index 1b5a686..67e2ce0 100644
--- a/game/songparser-ini.cc
+++ b/game/songparser-ini.cc
@@ -2,7 +2,6 @@
#include <boost/lexical_cast.hpp>
#include <boost/algorithm/string.hpp>
-#include <boost/filesystem.hpp>
#include <boost/regex.hpp>
#include <stdexcept>
#include "midifile.hh"
diff --git a/game/songparser-sm.cc b/game/songparser-sm.cc
index df5fe91..cb84732 100644
--- a/game/songparser-sm.cc
+++ b/game/songparser-sm.cc
@@ -1,6 +1,5 @@
#include "songparser.hh"
-#include <boost/filesystem.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/algorithm/string.hpp>
#include <algorithm>
diff --git a/game/songparser.cc b/game/songparser.cc
index 47c6ca8..af47a6d 100644
--- a/game/songparser.cc
+++ b/game/songparser.cc
@@ -1,9 +1,8 @@
#include "songparser.hh"
+
#include <fstream>
-#include <sstream>
#include <boost/lexical_cast.hpp>
#include <boost/algorithm/string.hpp>
-#include <boost/filesystem.hpp>
#include <boost/regex.hpp>
diff --git a/game/songparser.hh b/game/songparser.hh
index 20a6901..a0bb6e5 100644
--- a/game/songparser.hh
+++ b/game/songparser.hh
@@ -2,10 +2,8 @@
#include "song.hh"
#include "unicode.hh"
-#include <fstream>
#include <sstream>
#include <boost/filesystem.hpp>
-#include <boost/regex.hpp>
namespace SongParserUtil {
/// Parse an int from string and assign it to a variable
|
