Sanitize #include statements

The general rule I'm aiming for is to <> include
system wide / installed paths / generally everything
that's outside the git managed source tree (this means
mruby paths too!), and "" include everything else,
ie. local mkxp headers.

The only current exception are the mri headers, which
all have './' at their front as to not clash with
system wide ruby headers. I'm leaving them be for now
until I can come up with a better general solution.

binding-mri/binding-mri.cpp

@@ -28,9 +28,9 @@
 #include "./ruby/include/ruby.h"
 #include "./ruby/include/ruby/encoding.h"
 
-#include "zlib.h"
+#include <zlib.h>
 
-#include "SDL_filesystem.h"
+#include <SDL_filesystem.h>
 
 #include <QFile>
 #include <QByteArray>

binding-mruby/binding-mruby.cpp

@@ -21,23 +21,23 @@
 
 #include "binding.h"
 
-#include "mruby.h"
+#include <mruby.h>
-#include "mruby/string.h"
+#include <mruby/string.h>
-#include "mruby/array.h"
+#include <mruby/array.h>
-#include "mruby/class.h"
+#include <mruby/class.h>
-#include "mruby/irep.h"
+#include <mruby/irep.h>
-#include "mruby/compile.h"
+#include <mruby/compile.h>
-#include "mruby/proc.h"
+#include <mruby/proc.h>
-#include "mruby/dump.h"
+#include <mruby/dump.h>
 
 #include "binding-util.h"
 
-#include "stdio.h"
+#include <stdio.h>
-#include "zlib.h"
+#include <zlib.h>
 
-#include "SDL_messagebox.h"
+#include <SDL_messagebox.h>
-#include "SDL_rwops.h"
+#include <SDL_rwops.h>
-#include "SDL_timer.h"
+#include <SDL_timer.h>
 
 #include "sharedstate.h"
 #include "texpool.h"

binding-mruby/binding-util.h

@@ -22,10 +22,10 @@
 #ifndef BINDINGUTIL_H
 #define BINDINGUTIL_H
 
-#include "mruby.h"
+#include <mruby.h>
-#include "mruby/data.h"
+#include <mruby/data.h>
-#include "mruby/variable.h"
+#include <mruby/variable.h>
-#include "mruby/class.h"
+#include <mruby/class.h>
 
 #include <stdio.h>
 

binding-mruby/etc-binding.cpp

@@ -23,7 +23,6 @@
 #include "binding-util.h"
 #include "binding-types.h"
 #include "serializable-binding.h"
-#include "mruby/class.h"
 
 #include <QDebug>
 

binding-mruby/font-binding.cpp

@@ -24,7 +24,7 @@
 #include "binding-types.h"
 #include "exception.h"
 
-#include "mruby/string.h"
+#include <mruby/string.h>
 
 DEF_TYPE(Font);
 

binding-mruby/graphics-binding.cpp

@@ -21,7 +21,6 @@
 
 #include "graphics.h"
 #include "sharedstate.h"
-#include "mruby.h"
 #include "binding-util.h"
 #include "exception.h"
 

binding-mruby/mrb-ext/file.cpp

@@ -22,11 +22,11 @@
 #include "file.h"
 
 #include "../binding-util.h"
-#include "mruby/string.h"
+#include <mruby/string.h>
-#include "mruby/array.h"
+#include <mruby/array.h>
-#include "mruby/class.h"
+#include <mruby/class.h>
 
-#include "SDL_rwops.h"
+#include <SDL_rwops.h>
 
 #include <stdio.h>
 #include <errno.h>

binding-mruby/mrb-ext/file.h

@@ -24,7 +24,7 @@
 
 #include "../binding-util.h"
 
-#include "SDL_rwops.h"
+#include <SDL_rwops.h>
 
 struct FileImpl
 {

binding-mruby/mrb-ext/kernel.cpp

@@ -19,14 +19,14 @@
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "mruby.h"
+#include <mruby.h>
-#include "mruby/string.h"
+#include <mruby/string.h>
-#include "mruby/compile.h"
+#include <mruby/compile.h>
 
 #include <stdlib.h>
 #include <sys/time.h>
 
-#include "SDL_messagebox.h"
+#include <SDL_messagebox.h>
 
 #include "../binding-util.h"
 #include "marshal.h"

binding-mruby/mrb-ext/marshal.cpp

@@ -21,12 +21,12 @@
 
 #include "marshal.h"
 
-#include "mruby/array.h"
+#include <mruby/array.h>
-#include "mruby/hash.h"
+#include <mruby/hash.h>
-#include "mruby/khash.h"
+#include <mruby/khash.h>
-#include "mruby/string.h"
+#include <mruby/string.h>
-#include "mruby/variable.h"
+#include <mruby/variable.h>
-#include "mruby/class.h"
+#include <mruby/class.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -38,7 +38,7 @@
 #include "rwmem.h"
 #include "exception.h"
 
-#include "SDL_timer.h"
+#include <SDL_timer.h>
 
 #include <QVector>
 #include <QHash>

binding-mruby/mrb-ext/marshal.h

@@ -22,8 +22,8 @@
 #ifndef MARSHAL_H
 #define MARSHAL_H
 
-#include "mruby.h"
+#include <mruby.h>
-#include "SDL_rwops.h"
+#include <SDL_rwops.h>
 
 void marshalDumpInt(mrb_state *, SDL_RWops *, mrb_value);
 mrb_value marshalLoadInt(mrb_state *, SDL_RWops *);

binding-mruby/mrb-ext/rwmem.cpp

@@ -21,7 +21,7 @@
 
 #include "rwmem.h"
 
-#include "SDL_rwops.h"
+#include <SDL_rwops.h>
 #include <QVector>
 
 typedef QVector<char> ByteVec;

binding-mruby/mrb-ext/time.cpp

@@ -20,9 +20,10 @@
 */
 
 #include "../binding-util.h"
-#include "mruby/string.h"
+
-#include "mruby/array.h"
+#include <mruby/string.h>
-#include "mruby/class.h"
+#include <mruby/array.h>
+#include <mruby/class.h>
 
 #include "time.h"
 #include <sys/time.h>

binding-mruby/serializable-binding.h

@@ -25,7 +25,7 @@
 #include "serializable.h"
 #include "binding-util.h"
 
-#include "mruby/string.h"
+#include <mruby/string.h>
 
 template<class C>
 MRB_METHOD(serializableDump)

binding-mruby/table-binding.cpp

@@ -24,8 +24,6 @@
 #include "binding-types.h"
 #include "serializable-binding.h"
 
-#include "mruby.h"
-
 #include <QDebug>
 
 DEF_TYPE(Table);

binding-mruby/tilemap-binding.cpp

@@ -28,7 +28,7 @@
 #include "binding-util.h"
 #include "binding-types.h"
 
-#include "mruby/array.h"
+#include <mruby/array.h>
 
 static const mrb_data_type TilemapAutotilesType =
 {

src/bitmap.cpp

@@ -21,12 +21,12 @@
 
 #include "bitmap.h"
 
-#include "SDL.h"
+#include <SDL.h>
-#include "SDL_image.h"
+#include <SDL_image.h>
-#include "SDL_ttf.h"
+#include <SDL_ttf.h>
-#include "SDL_rect.h"
+#include <SDL_rect.h>
 
-#include "pixman.h"
+#include <pixman.h>
 
 #include <QString>
 #include <QChar>

src/bitmap.h

@@ -26,7 +26,7 @@
 #include "etc-internal.h"
 #include "etc.h"
 
-#include "sigc++/signal.h"
+#include <sigc++/signal.h>
 
 class Font;
 class ShaderBase;

src/debuglogger.cpp

@@ -21,7 +21,7 @@
 
 #include "debuglogger.h"
 
-#include "glew.h"
+#include <glew.h>
 
 #include <QFile>
 #include <QTime>

src/disposable.h

@@ -24,7 +24,7 @@
 
 #include "exception.h"
 
-#include "sigc++/signal.h"
+#include <sigc++/signal.h>
 
 class Disposable
 {

src/etc.cpp

@@ -24,8 +24,8 @@
 #include "serial-util.h"
 #include "exception.h"
 
-#include "SDL_types.h"
+#include <SDL_types.h>
-#include "SDL_pixels.h"
+#include <SDL_pixels.h>
 
 Color::Color(double red, double green, double blue, double alpha)
 	: red(red), green(green), blue(blue), alpha(alpha)

src/etc.h

@@ -22,7 +22,7 @@
 #ifndef ETC_H
 #define ETC_H
 
-#include "sigc++/signal.h"
+#include <sigc++/signal.h>
 
 #include "serializable.h"
 #include "etc-internal.h"

src/eventthread.cpp

@@ -21,16 +21,16 @@
 
 #include "eventthread.h"
 
-#include "SDL_events.h"
+#include <SDL_events.h>
-#include "SDL_joystick.h"
+#include <SDL_joystick.h>
-#include "SDL_messagebox.h"
+#include <SDL_messagebox.h>
-#include "SDL_timer.h"
+#include <SDL_timer.h>
-#include "SDL_thread.h"
+#include <SDL_thread.h>
 
 #include "sharedstate.h"
 #include "graphics.h"
 
-#include "string.h"
+#include <string.h>
 
 #include <QDebug>
 

src/eventthread.h

@@ -25,11 +25,10 @@
 #include "config.h"
 #include "etc-internal.h"
 
-#include "SDL_scancode.h"
+#include <SDL_scancode.h>
-#include "SDL_joystick.h"
+#include <SDL_joystick.h>
-#include "SDL_mouse.h"
+#include <SDL_mouse.h>
-
+#include <SDL_mutex.h>
-#include "SDL_mutex.h"
 
 #include <QByteArray>
 #include <QVector>

src/filesystem.cpp

@@ -24,7 +24,7 @@
 #include "util.h"
 #include "exception.h"
 
-#include "physfs.h"
+#include <physfs.h>
 
 #include <SDL_sound.h>
 
@@ -32,8 +32,8 @@
 #include <QSet>
 #include <QByteArray>
 
-#include "stdio.h"
+#include <stdio.h>
-#include "string.h"
+#include <string.h>
 
 #include <QDebug>
 

src/filesystem.h

@@ -22,7 +22,7 @@
 #ifndef FILESYSTEM_H
 #define FILESYSTEM_H
 
-#include "SDL_rwops.h"
+#include <SDL_rwops.h>
 
 struct FileSystemPrivate;
 

src/font.cpp

@@ -27,7 +27,7 @@
 
 #include "../liberation.ttf.xxd"
 
-#include "SDL_ttf.h"
+#include <SDL_ttf.h>
 
 #include <QHash>
 #include <QByteArray>

src/gl-util.h

@@ -22,10 +22,9 @@
 #ifndef GLUTIL_H
 #define GLUTIL_H
 
-#include "glew.h"
+#include <glew.h>
 
 #include "etc-internal.h"
-#include <QDebug>
 
 /* Struct wrapping GLuint for some light type safety */
 #define DEF_GL_ID \

src/global-ibo.h

@@ -22,7 +22,7 @@
 #ifndef GLOBALIBO_H
 #define GLOBALIBO_H
 
-#include <gl-util.h>
+#include "gl-util.h"
 #include <QVector>
 
 struct GlobalIBO

src/glstate.cpp

@@ -20,10 +20,12 @@
 */
 
 #include "glstate.h"
-#include "glew.h"
-#include "SDL_rect.h"
 #include "etc.h"
 
+#include <glew.h>
+
+#include <SDL_rect.h>
+
 void GLClearColor::apply(const Vec4 &value)
 {
 	glClearColor(value.x, value.y, value.z, value.w);

src/graphics.cpp

@@ -35,8 +35,8 @@
 #include "binding.h"
 #include "perftimer.h"
 
-#include "SDL_video.h"
+#include <SDL_video.h>
-#include "SDL_timer.h"
+#include <SDL_timer.h>
 
 #include <time.h>
 

src/input.cpp

@@ -25,11 +25,11 @@
 #include "exception.h"
 #include "util.h"
 
-#include "SDL_scancode.h"
+#include <SDL_scancode.h>
-#include "SDL_mouse.h"
+#include <SDL_mouse.h>
 
 #include <QVector>
-#include "string.h"
+#include <string.h>
 
 #include <QDebug>
 

src/main.cpp

@@ -19,12 +19,12 @@
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "glew.h"
+#include <glew.h>
 #include <alc.h>
 
-#include "SDL.h"
+#include <SDL.h>
-#include "SDL_image.h"
+#include <SDL_image.h>
-#include "SDL_ttf.h"
+#include <SDL_ttf.h>
 #include <SDL_sound.h>
 
 #include "sharedstate.h"

src/perftimer.cpp

@@ -1,7 +1,7 @@
 #include "perftimer.h"
 
-#include "SDL_timer.h"
+#include <SDL_timer.h>
-#include "glew.h"
+#include <glew.h>
 
 #include <QDebug>
 

src/plane.h

@@ -25,9 +25,6 @@
 #include "disposable.h"
 #include "viewport.h"
 
-#include "SFML/Graphics/Sprite.hpp"
-#include "SFML/Graphics/RectangleShape.hpp"
-
 class Bitmap;
 struct Color;
 struct Tone;

src/quadarray.h

@@ -22,12 +22,13 @@
 #ifndef QUADARRAY_H
 #define QUADARRAY_H
 
-#include <QtGlobal>
 #include "gl-util.h"
 #include "sharedstate.h"
 #include "global-ibo.h"
 #include "shader.h"
 
+#include <stdint.h>
+
 typedef uint32_t index_t;
 #define _GL_INDEX_TYPE GL_UNSIGNED_INT
 

src/shader.cpp

@@ -23,7 +23,7 @@
 #include "sharedstate.h"
 #include "glstate.h"
 
-#include "glew.h"
+#include <glew.h>
 
 #include <QFile>
 
@@ -48,6 +48,8 @@
 #include "../blurV.vert.xxd"
 #endif
 
+#include <QDebug>
+
 
 #define INIT_SHADER(vert, frag) \
 { \

src/sharedstate.h

@@ -22,7 +22,7 @@
 #ifndef SHAREDSTATE_H
 #define SHAREDSTATE_H
 
-#include "sigc++/signal.h"
+#include <sigc++/signal.h>
 
 #define shState SharedState::instance
 #define glState shState->_glState()

src/sprite.cpp

@@ -33,7 +33,7 @@
 #include "shader.h"
 #include "glstate.h"
 
-#include "sigc++/connection.h"
+#include <sigc++/connection.h>
 
 #include <QDebug>
 

src/table.h

@@ -25,7 +25,7 @@
 #include "serializable.h"
 
 #include <stdint.h>
-#include "sigc++/signal.h"
+#include <sigc++/signal.h>
 
 class Table : public Serializable
 {

src/tilemap.cpp

@@ -34,14 +34,14 @@
 #include "quad.h"
 #include "tileatlas.h"
 
-#include "sigc++/connection.h"
+#include <sigc++/connection.h>
 
 #include <string.h>
 #include <stdint.h>
 
 #include <QVector>
 
-#include "SDL_surface.h"
+#include <SDL_surface.h>
 
 extern const StaticRect autotileRects[];
 

src/transform.h

@@ -48,8 +48,9 @@
 #define TRANSFORM_H
 
 #include "etc-internal.h"
-#include "math.h"
+
-#include "string.h"
+#include <math.h>
+#include <string.h>
 
 class Transform
 {

src/viewport.cpp

@@ -27,9 +27,9 @@
 #include "quad.h"
 #include "glstate.h"
 
-#include "SDL_rect.h"
+#include <SDL_rect.h>
 
-#include "sigc++/connection.h"
+#include <sigc++/connection.h>
 
 #include <QDebug>
 

src/viewport.h

@@ -27,8 +27,6 @@
 #include "disposable.h"
 #include "util.h"
 
-#include "SFML/Graphics/Rect.hpp"
-
 struct ViewportPrivate;
 
 class Viewport : public Scene, public SceneElement, public Flashable, public Disposable

src/window.cpp

@@ -34,7 +34,7 @@
 #include "texpool.h"
 #include "glstate.h"
 
-#include "sigc++/connection.h"
+#include <sigc++/connection.h>
 
 #include <QDebug>