From b412500f7911dc717da0da14d49ffd8435614989 Mon Sep 17 00:00:00 2001 From: TimePath Date: Fri, 1 May 2015 18:57:44 +1000 Subject: [PATCH] Avoid including the same file twice in progs.src --- qcsrc/menu/{classes.qc => classes.inc} | 0 qcsrc/menu/oo/{implementation.qh => implementation.qc} | 6 ++---- qcsrc/menu/oo/{interface.qh => interface.qc} | 6 ++---- qcsrc/menu/progs.src | 6 ++---- 4 files changed, 6 insertions(+), 12 deletions(-) rename qcsrc/menu/{classes.qc => classes.inc} (100%) rename qcsrc/menu/oo/{implementation.qh => implementation.qc} (93%) rename qcsrc/menu/oo/{interface.qh => interface.qc} (92%) diff --git a/qcsrc/menu/classes.qc b/qcsrc/menu/classes.inc similarity index 100% rename from qcsrc/menu/classes.qc rename to qcsrc/menu/classes.inc diff --git a/qcsrc/menu/oo/implementation.qh b/qcsrc/menu/oo/implementation.qc similarity index 93% rename from qcsrc/menu/oo/implementation.qh rename to qcsrc/menu/oo/implementation.qc index 42a74be24..d01152360 100644 --- a/qcsrc/menu/oo/implementation.qh +++ b/qcsrc/menu/oo/implementation.qc @@ -1,6 +1,3 @@ -#ifndef IMPLEMENTATION_H -#define IMPLEMENTATION_H - #ifndef INTERFACE #define INTERFACE #endif @@ -29,4 +26,5 @@ // for the implementation #define SUPER(cname) (cname##_vtbl.vtblbase) -#endif + +#include "../classes.inc" diff --git a/qcsrc/menu/oo/interface.qh b/qcsrc/menu/oo/interface.qc similarity index 92% rename from qcsrc/menu/oo/interface.qh rename to qcsrc/menu/oo/interface.qc index e24bb3f9a..50485bc54 100644 --- a/qcsrc/menu/oo/interface.qh +++ b/qcsrc/menu/oo/interface.qc @@ -1,6 +1,3 @@ -#ifndef INTERFACE_H -#define INTERFACE_H - #ifndef INTERFACE #define INTERFACE #endif @@ -26,4 +23,5 @@ #define ATTRIBARRAY(cname,name,type,cnt) .type name[cnt]; #define ENDCLASS(cname) .float instanceOf##cname; #define SUPER(cname) -#endif + +#include "../classes.inc" diff --git a/qcsrc/menu/progs.src b/qcsrc/menu/progs.src index a1fb38b1a..547a32708 100644 --- a/qcsrc/menu/progs.src +++ b/qcsrc/menu/progs.src @@ -4,10 +4,8 @@ ../dpdefs/menudefs.qh ../dpdefs/keycodes.qh -oo/interface.qh - classes.qc -oo/implementation.qh - classes.qc +oo/interface.qc +oo/implementation.qc draw.qc menu.qc -- 2.39.2