From 99455a65b6522dbf7310b2aa38c8617dd7768a8b Mon Sep 17 00:00:00 2001 From: w1z7ard Date: Sun, 8 Jul 2007 22:36:40 +0000 Subject: [PATCH] changed Param.h and Parser.h -> hppS git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@253 6778bc44-b910-0410-a7a0-be141de4315d --- src/projectM-engine/BuiltinParams.hpp | 2 +- src/projectM-engine/CMakeLists.txt | 2 +- src/projectM-engine/CustomShape.cpp | 2 +- src/projectM-engine/CustomShape.hpp | 2 +- src/projectM-engine/CustomWave.cpp | 2 +- src/projectM-engine/CustomWave.hpp | 2 +- src/projectM-engine/Eval.cpp | 2 +- src/projectM-engine/Eval.h | 2 +- src/projectM-engine/InitCond.cpp | 2 +- src/projectM-engine/InitCond.hpp | 3 ++- src/projectM-engine/Param.cpp | 2 +- src/projectM-engine/{Param.h => Param.hpp} | 0 src/projectM-engine/ParamUtils.hpp | 2 +- src/projectM-engine/Parser.cpp | 4 ++-- src/projectM-engine/{Parser.h => Parser.hpp} | 0 src/projectM-engine/PerFrameEqn.cpp | 2 +- src/projectM-engine/PerPixelEqn.cpp | 2 +- src/projectM-engine/PerPointEqn.cpp | 2 +- src/projectM-engine/Preset.cpp | 2 +- src/projectM-engine/menu.cpp | 2 +- src/projectM-engine/menu.h | 2 +- src/projectM-engine/projectM.cpp | 4 ++-- 22 files changed, 23 insertions(+), 22 deletions(-) rename src/projectM-engine/{Param.h => Param.hpp} (100%) rename src/projectM-engine/{Parser.h => Parser.hpp} (100%) diff --git a/src/projectM-engine/BuiltinParams.hpp b/src/projectM-engine/BuiltinParams.hpp index c11f1a5dc..52b4cfb3e 100644 --- a/src/projectM-engine/BuiltinParams.hpp +++ b/src/projectM-engine/BuiltinParams.hpp @@ -29,7 +29,7 @@ #include #include "PresetFrameIO.hpp" -#include "Param.h" +#include "Param.hpp" #include class BuiltinParams { diff --git a/src/projectM-engine/CMakeLists.txt b/src/projectM-engine/CMakeLists.txt index b3c529a16..e92619fbe 100644 --- a/src/projectM-engine/CMakeLists.txt +++ b/src/projectM-engine/CMakeLists.txt @@ -1,7 +1,7 @@ PROJECT(projectM) ADD_LIBRARY(projectM SHARED projectM.cpp projectM.h pbuffer.cpp pbuffer.h InitCond.cpp InitCond.hpp Expr.cpp PCM.cpp Parser.cpp Preset.cpp common.h BeatDetect.cpp PCM.h PerPixelEqn.cpp Eval.h -Param.cpp CustomWave.cpp CustomShape.hpp CustomShape.cpp Param.h CustomWave.hpp BeatDetect.h menu.cpp console_interface.h +Param.cpp CustomWave.cpp CustomShape.hpp CustomShape.cpp Param.hpp CustomWave.hpp BeatDetect.h menu.cpp console_interface.h Func.h Func.cpp Eval.cpp wipemalloc.h browser.cpp PerFrameEqn.cpp PerPointEqn.cpp editor.cpp fftsg.cpp glConsole.cpp console_interface.cpp CValue.h Expr.h timer.cpp wipemalloc.cpp PerFrameEqn.h PerPixelEqn.h PerPointEqn.h browser.h BuiltinFuncs.hpp BuiltinFuncs.cpp compare.h editor.h event.h fatal.h SplayTree.hpp fftsg.h glConsole.h menu.h timer.h SplayNode.hpp BuiltinParams.hpp BuiltinParams.cpp Preset.hpp Renderer.cpp Renderer.hpp ParamUtils.hpp PresetLoader.cpp PresetLoader.hpp PresetChooser.hpp PresetChooser.cpp) diff --git a/src/projectM-engine/CustomShape.cpp b/src/projectM-engine/CustomShape.cpp index 6fcf37591..59ef89d97 100755 --- a/src/projectM-engine/CustomShape.cpp +++ b/src/projectM-engine/CustomShape.cpp @@ -30,7 +30,7 @@ #include "Eval.h" #include "Expr.h" #include "InitCond.hpp" -#include "Param.h" +#include "Param.hpp" #include "PerFrameEqn.h" #include "Preset.hpp" #include "SplayTree.hpp" diff --git a/src/projectM-engine/CustomShape.hpp b/src/projectM-engine/CustomShape.hpp index ab4b3d376..c1e4b9661 100755 --- a/src/projectM-engine/CustomShape.hpp +++ b/src/projectM-engine/CustomShape.hpp @@ -31,7 +31,7 @@ #define CUSTOM_SHAPE_DEBUG 0 #include "SplayTree.hpp" -#include "Param.h" +#include "Param.hpp" #include "PerFrameEqn.h" #include "InitCond.hpp" diff --git a/src/projectM-engine/CustomWave.cpp b/src/projectM-engine/CustomWave.cpp index fd67acf9e..7225c97c3 100755 --- a/src/projectM-engine/CustomWave.cpp +++ b/src/projectM-engine/CustomWave.cpp @@ -32,7 +32,7 @@ #include "Eval.h" #include "Expr.h" #include "InitCond.hpp" -#include "Param.h" +#include "Param.hpp" #include "PerFrameEqn.h" #include "PerPointEqn.h" #include "Preset.hpp" diff --git a/src/projectM-engine/CustomWave.hpp b/src/projectM-engine/CustomWave.hpp index 7ee3c4a98..1d359dec1 100755 --- a/src/projectM-engine/CustomWave.hpp +++ b/src/projectM-engine/CustomWave.hpp @@ -45,7 +45,7 @@ class PerPointEqn; class Preset; #include "common.h" -#include "Param.h" +#include "Param.hpp" #include "PerFrameEqn.h" #include "SplayTree.hpp" diff --git a/src/projectM-engine/Eval.cpp b/src/projectM-engine/Eval.cpp index efcf6a1c1..49b4fac7a 100755 --- a/src/projectM-engine/Eval.cpp +++ b/src/projectM-engine/Eval.cpp @@ -29,7 +29,7 @@ #include "Eval.h" #include "Expr.h" -#include "Param.h" +#include "Param.hpp" #include "Func.h" #include "BuiltinFuncs.hpp" #include "wipemalloc.h" diff --git a/src/projectM-engine/Eval.h b/src/projectM-engine/Eval.h index 0d353ecbc..791bb1cb7 100755 --- a/src/projectM-engine/Eval.h +++ b/src/projectM-engine/Eval.h @@ -33,7 +33,7 @@ #include "projectM.h" #include "Func.h" -#include "Param.h" +#include "Param.hpp" //#define EVAL_DEBUG 2 //#define EVAL_DEBUG_DOUBLE 2 diff --git a/src/projectM-engine/InitCond.cpp b/src/projectM-engine/InitCond.cpp index e630041e0..fdb779b46 100755 --- a/src/projectM-engine/InitCond.cpp +++ b/src/projectM-engine/InitCond.cpp @@ -29,7 +29,7 @@ #include "Expr.h" #include "InitCond.hpp" -#include "Param.h" +#include "Param.hpp" #include "SplayTree.hpp" #include "wipemalloc.h" diff --git a/src/projectM-engine/InitCond.hpp b/src/projectM-engine/InitCond.hpp index edafece51..80688b66c 100755 --- a/src/projectM-engine/InitCond.hpp +++ b/src/projectM-engine/InitCond.hpp @@ -29,10 +29,11 @@ #ifndef _INIT_COND_HPP #define _INIT_COND_HPP + //#define INIT_COND_DEBUG 2 #define INIT_COND_DEBUG 0 -#include "Param.h" +#include "Param.hpp" class InitCond; class Param; diff --git a/src/projectM-engine/Param.cpp b/src/projectM-engine/Param.cpp index 03b31de67..f4b745a8a 100755 --- a/src/projectM-engine/Param.cpp +++ b/src/projectM-engine/Param.cpp @@ -34,7 +34,7 @@ #include "Eval.h" #include "Expr.h" #include "InitCond.hpp" -#include "Param.h" +#include "Param.hpp" #include "Preset.hpp" #include "SplayTree.hpp" diff --git a/src/projectM-engine/Param.h b/src/projectM-engine/Param.hpp similarity index 100% rename from src/projectM-engine/Param.h rename to src/projectM-engine/Param.hpp diff --git a/src/projectM-engine/ParamUtils.hpp b/src/projectM-engine/ParamUtils.hpp index 84c3fb79a..ae8e77d48 100644 --- a/src/projectM-engine/ParamUtils.hpp +++ b/src/projectM-engine/ParamUtils.hpp @@ -5,7 +5,7 @@ #ifndef _PARAM_UTILS_HPP #define _PARAM_UTILS_HPP -#include "Param.h" +#include "Param.hpp" #include "SplayTree.hpp" #include diff --git a/src/projectM-engine/Parser.cpp b/src/projectM-engine/Parser.cpp index 0f6b527da..ba46b28e6 100755 --- a/src/projectM-engine/Parser.cpp +++ b/src/projectM-engine/Parser.cpp @@ -34,9 +34,9 @@ #include "Eval.h" #include "Func.h" #include "InitCond.hpp" -#include "Param.h" +#include "Param.hpp" #include "Preset.hpp" -#include "Parser.h" +#include "Parser.hpp" #include "PerFrameEqn.h" #include "PerPixelEqn.h" #include "SplayTree.hpp" diff --git a/src/projectM-engine/Parser.h b/src/projectM-engine/Parser.hpp similarity index 100% rename from src/projectM-engine/Parser.h rename to src/projectM-engine/Parser.hpp diff --git a/src/projectM-engine/PerFrameEqn.cpp b/src/projectM-engine/PerFrameEqn.cpp index 356f68988..43d5d78a8 100755 --- a/src/projectM-engine/PerFrameEqn.cpp +++ b/src/projectM-engine/PerFrameEqn.cpp @@ -26,7 +26,7 @@ #include "fatal.h" #include "common.h" -#include "Param.h" +#include "Param.hpp" #include "PerFrameEqn.h" #include "Eval.h" diff --git a/src/projectM-engine/PerPixelEqn.cpp b/src/projectM-engine/PerPixelEqn.cpp index 2ef298b2a..ccf46d90a 100755 --- a/src/projectM-engine/PerPixelEqn.cpp +++ b/src/projectM-engine/PerPixelEqn.cpp @@ -30,7 +30,7 @@ #include "Expr.h" #include "Eval.h" -#include "Param.h" +#include "Param.hpp" #include "PerPixelEqn.h" #include "SplayTree.hpp" diff --git a/src/projectM-engine/PerPointEqn.cpp b/src/projectM-engine/PerPointEqn.cpp index 8b134a4fb..7617e2714 100755 --- a/src/projectM-engine/PerPointEqn.cpp +++ b/src/projectM-engine/PerPointEqn.cpp @@ -31,7 +31,7 @@ #include "CustomWave.hpp" #include "Eval.h" #include "Expr.h" -#include "Param.h" +#include "Param.hpp" #include "PerPixelEqn.h" #include "PerPointEqn.h" #include "SplayTree.hpp" diff --git a/src/projectM-engine/Preset.cpp b/src/projectM-engine/Preset.cpp index 2fc746b74..5fe949451 100755 --- a/src/projectM-engine/Preset.cpp +++ b/src/projectM-engine/Preset.cpp @@ -30,7 +30,7 @@ #include #include "Preset.hpp" -#include "Parser.h" +#include "Parser.hpp" #include "ParamUtils.hpp" diff --git a/src/projectM-engine/menu.cpp b/src/projectM-engine/menu.cpp index c4bdb9659..d995ecbf1 100755 --- a/src/projectM-engine/menu.cpp +++ b/src/projectM-engine/menu.cpp @@ -32,7 +32,7 @@ #endif /** MACOS */ #include "common.h" #include "fatal.h" -#include "Param.h" +#include "Param.hpp" #include "SplayTree.hpp" #include "InitCond.hpp" diff --git a/src/projectM-engine/menu.h b/src/projectM-engine/menu.h index 6820cba78..27972e641 100755 --- a/src/projectM-engine/menu.h +++ b/src/projectM-engine/menu.h @@ -31,7 +31,7 @@ #include "event.h" #include "common.h" -#include "Param.h" +#include "Param.hpp" #define MENU_DEBUG 0 diff --git a/src/projectM-engine/projectM.cpp b/src/projectM-engine/projectM.cpp index 5300d54d1..610873772 100755 --- a/src/projectM-engine/projectM.cpp +++ b/src/projectM-engine/projectM.cpp @@ -37,8 +37,8 @@ #include "projectM.h" #include "BeatDetect.h" #include "Eval.h" -#include "Param.h" -#include "Parser.h" +#include "Param.hpp" +#include "Parser.hpp" #include "Preset.hpp" #include "PerPixelEqn.h" //#include "menu.h"