From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 3 May 2015 22:50:36 +0000 (+1000)
Subject: #include base classes
X-Git-Tag: xonotic-v0.8.1~61^2~7
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=31f1af233d6944afb34a58bafd4794878762b290

#include base classes
---

diff --git a/qcsrc/menu/anim/animation.qc b/qcsrc/menu/anim/animation.qc
index 94df30b37e..3039d85b8d 100644
--- a/qcsrc/menu/anim/animation.qc
+++ b/qcsrc/menu/anim/animation.qc
@@ -1,5 +1,6 @@
 #ifndef ANIM_ANIMATION_H
 #define ANIM_ANIMATION_H
+#include "../oo/base.qh"
 void setterDummy(entity, float);
 CLASS(Animation, Object)
 	METHOD(Animation, configureAnimation, void(entity, entity, void(entity, float), float, float, float, float))
diff --git a/qcsrc/menu/anim/animhost.qc b/qcsrc/menu/anim/animhost.qc
index fb4961d86f..61a040cff9 100644
--- a/qcsrc/menu/anim/animhost.qc
+++ b/qcsrc/menu/anim/animhost.qc
@@ -2,6 +2,7 @@
 
 #ifndef ANIM_ANIMHOST_H
 #define ANIM_ANIMHOST_H
+#include "../oo/base.qh"
 CLASS(AnimHost, Object)
 	METHOD(AnimHost, addAnim, void(entity, entity))
 	METHOD(AnimHost, removeAnim, void(entity, entity))
diff --git a/qcsrc/menu/anim/easing.qc b/qcsrc/menu/anim/easing.qc
index f2c3d46e9c..fe4c0fb65a 100644
--- a/qcsrc/menu/anim/easing.qc
+++ b/qcsrc/menu/anim/easing.qc
@@ -1,5 +1,6 @@
 #ifndef ANIM_EASING_H
 #define ANIM_EASING_H
+#include "animation.qc"
 entity makeHostedEasing(entity, void(entity, float), float(float, float, float, float), float, float, float);
 entity makeEasing(entity, void(entity, float), float(float, float, float, float), float, float, float, float);
 float easingLinear(float, float, float, float);
diff --git a/qcsrc/menu/anim/keyframe.qc b/qcsrc/menu/anim/keyframe.qc
index 0e194bf6b3..d310ef72c7 100644
--- a/qcsrc/menu/anim/keyframe.qc
+++ b/qcsrc/menu/anim/keyframe.qc
@@ -1,5 +1,6 @@
 #ifndef ANIM_KEYFRAME_H
 #define ANIM_KEYFRAME_H
+#include "animation.qc"
 CLASS(Keyframe, Animation)
 	METHOD(Keyframe, addEasing, entity(entity, float, float, float(float, float, float, float)))
 	METHOD(Keyframe, addAnim, void(entity, entity))
diff --git a/qcsrc/menu/item.qc b/qcsrc/menu/item.qc
index 62cfa13783..cb24866d1f 100644
--- a/qcsrc/menu/item.qc
+++ b/qcsrc/menu/item.qc
@@ -1,5 +1,7 @@
 #ifndef ITEM_H
 #define ITEM_H
+#include "skin.qh"
+#include "oo/base.qh"
 CLASS(Item, Object)
 	METHOD(Item, draw, void(entity))
 	METHOD(Item, keyDown, float(entity, float, float, float))
diff --git a/qcsrc/menu/item/button.qc b/qcsrc/menu/item/button.qc
index 8d17f98c68..796ce40a33 100644
--- a/qcsrc/menu/item/button.qc
+++ b/qcsrc/menu/item/button.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_BUTTON_H
 #define ITEM_BUTTON_H
+#include "label.qc"
 CLASS(Button, Label)
 	METHOD(Button, configureButton, void(entity, string, float, string))
 	METHOD(Button, draw, void(entity))
diff --git a/qcsrc/menu/item/checkbox.qc b/qcsrc/menu/item/checkbox.qc
index e220b07666..e8b4e15e33 100644
--- a/qcsrc/menu/item/checkbox.qc
+++ b/qcsrc/menu/item/checkbox.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_CHECKBOX_H
 #define ITEM_CHECKBOX_H
+#include "button.qc"
 void CheckBox_Click(entity me, entity other);
 CLASS(CheckBox, Button)
 	METHOD(CheckBox, configureCheckBox, void(entity, string, float, string))
diff --git a/qcsrc/menu/item/container.qc b/qcsrc/menu/item/container.qc
index a5d01bf92a..449bb0675f 100644
--- a/qcsrc/menu/item/container.qc
+++ b/qcsrc/menu/item/container.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_CONTAINER_H
 #define ITEM_CONTAINER_H
+#include "../item.qc"
 CLASS(Container, Item)
 	METHOD(Container, draw, void(entity))
 	METHOD(Container, keyUp, float(entity, float, float, float))
diff --git a/qcsrc/menu/item/image.qc b/qcsrc/menu/item/image.qc
index 83e5d427a4..7756b49913 100644
--- a/qcsrc/menu/item/image.qc
+++ b/qcsrc/menu/item/image.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_IMAGE_H
 #define ITEM_IMAGE_H
+#include "../item.qc"
 CLASS(Image, Item)
 	METHOD(Image, configureImage, void(entity, string))
 	METHOD(Image, draw, void(entity))
diff --git a/qcsrc/menu/item/inputbox.qc b/qcsrc/menu/item/inputbox.qc
index fd6eab1fad..5bcfd5f9c0 100644
--- a/qcsrc/menu/item/inputbox.qc
+++ b/qcsrc/menu/item/inputbox.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_INPUTBOX_H
 #define ITEM_INPUTBOX_H
+#include "label.qc"
 CLASS(InputBox, Label)
 	METHOD(InputBox, configureInputBox, void(entity, string, float, float, string))
 	METHOD(InputBox, draw, void(entity))
diff --git a/qcsrc/menu/item/inputcontainer.qc b/qcsrc/menu/item/inputcontainer.qc
index b06e255651..90ca719dce 100644
--- a/qcsrc/menu/item/inputcontainer.qc
+++ b/qcsrc/menu/item/inputcontainer.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_INPUTCONTAINER_H
 #define ITEM_INPUTCONTAINER_H
+#include "container.qc"
 CLASS(InputContainer, Container)
 	METHOD(InputContainer, keyDown, float(entity, float, float, float))
 	METHOD(InputContainer, mouseMove, float(entity, vector))
diff --git a/qcsrc/menu/item/label.qc b/qcsrc/menu/item/label.qc
index 751e5c7272..75e79f0b22 100644
--- a/qcsrc/menu/item/label.qc
+++ b/qcsrc/menu/item/label.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_LABEL_H
 #define ITEM_LABEL_H
+#include "../item.qc"
 CLASS(Label, Item)
 	METHOD(Label, configureLabel, void(entity, string, float, float))
 	METHOD(Label, draw, void(entity))
diff --git a/qcsrc/menu/item/listbox.qc b/qcsrc/menu/item/listbox.qc
index 385ed502a8..044c9e34a0 100644
--- a/qcsrc/menu/item/listbox.qc
+++ b/qcsrc/menu/item/listbox.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_LISTBOX_H
 #define ITEM_LISTBOX_H
+#include "../item.qc"
 CLASS(ListBox, Item)
 	METHOD(ListBox, resizeNotify, void(entity, vector, vector, vector, vector))
 	METHOD(ListBox, configureListBox, void(entity, float, float))
diff --git a/qcsrc/menu/item/modalcontroller.qc b/qcsrc/menu/item/modalcontroller.qc
index c1bc021f88..a13fcdd69f 100644
--- a/qcsrc/menu/item/modalcontroller.qc
+++ b/qcsrc/menu/item/modalcontroller.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_MODALCONTROLLER_H
 #define ITEM_MODALCONTROLLER_H
+#include "container.qc"
 CLASS(ModalController, Container)
 	METHOD(ModalController, resizeNotify, void(entity, vector, vector, vector, vector))
 	METHOD(ModalController, draw, void(entity))
diff --git a/qcsrc/menu/item/radiobutton.qc b/qcsrc/menu/item/radiobutton.qc
index d8cadea3d6..c1e034855a 100644
--- a/qcsrc/menu/item/radiobutton.qc
+++ b/qcsrc/menu/item/radiobutton.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_RADIOBUTTON_H
 #define ITEM_RADIOBUTTON_H
+#include "checkbox.qc"
 void RadioButton_Click(entity me, entity other);
 CLASS(RadioButton, CheckBox)
 	METHOD(RadioButton, configureRadioButton, void(entity, string, float, string, float, float))
diff --git a/qcsrc/menu/item/slider.qc b/qcsrc/menu/item/slider.qc
index 7ee9cefa71..e944a96aea 100644
--- a/qcsrc/menu/item/slider.qc
+++ b/qcsrc/menu/item/slider.qc
@@ -2,6 +2,7 @@
 //   to use this, you FIRST call configureSliderVisuals, then configureSliderValues
 #ifndef ITEM_SLIDER_H
 #define ITEM_SLIDER_H
+#include "label.qc"
 CLASS(Slider, Label)
 	METHOD(Slider, resizeNotify, void(entity, vector, vector, vector, vector))
 	METHOD(Slider, configureSliderVisuals, void(entity, float, float, float, string))
diff --git a/qcsrc/menu/item/tab.qc b/qcsrc/menu/item/tab.qc
index 3fdcccc689..fbbf776687 100644
--- a/qcsrc/menu/item/tab.qc
+++ b/qcsrc/menu/item/tab.qc
@@ -1,5 +1,6 @@
 #ifndef ITEM_TAB_H
 #define ITEM_TAB_H
+#include "dialog.qc"
 CLASS(Tab, Dialog)
 	ATTRIB(Tab, isTabRoot, float, 0)
 	ATTRIB(Tab, closable, float, 0)
diff --git a/qcsrc/menu/item/textslider.qc b/qcsrc/menu/item/textslider.qc
index 663f33a8f2..f22e632d6f 100644
--- a/qcsrc/menu/item/textslider.qc
+++ b/qcsrc/menu/item/textslider.qc
@@ -2,6 +2,7 @@
 //   to use this, you FIRST call configureSliderVisuals, then multiple times addValue, then configureTextSlider
 #ifndef ITEM_TEXTSLIDER_H
 #define ITEM_TEXTSLIDER_H
+#include "slider.qc"
 CLASS(TextSlider, Slider)
 	METHOD(TextSlider, valueToText, string(entity, float))
 	METHOD(TextSlider, valueToIdentifier, string(entity, float))