From 416d738788c76d516dfc5884fafebafc157fd4cb Mon Sep 17 00:00:00 2001 From: Sascha Volkenandt Date: Sun, 7 Jan 2007 18:49:02 +0000 Subject: - renamed page_init.ecpp and page_exit.ecpp to *.eh --- pages/edit_timer.ecpp | 4 ++-- pages/page_exit.ecpp | 10 ---------- pages/page_exit.eh | 10 ++++++++++ pages/page_init.ecpp | 12 ------------ pages/page_init.eh | 12 ++++++++++++ pages/recordings.ecpp | 4 ++-- pages/remote.ecpp | 4 ++-- pages/schedule.ecpp | 4 ++-- pages/timers.ecpp | 4 ++-- pages/whats_on.ecpp | 4 ++-- 10 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 pages/page_exit.ecpp create mode 100644 pages/page_exit.eh delete mode 100644 pages/page_init.ecpp create mode 100644 pages/page_init.eh diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp index 1fa3e95..a97ed37 100644 --- a/pages/edit_timer.ecpp +++ b/pages/edit_timer.ecpp @@ -31,7 +31,7 @@ using namespace vdrlive; int lifetime = ::Setup.DefaultLifetime; aux = ""; -<%include>page_init.ecpp +<%include>page_init.eh <%cpp> pageTitle = tr("Edit timer"); @@ -172,4 +172,4 @@ using namespace vdrlive; -<%include>page_exit.ecpp +<%include>page_exit.eh diff --git a/pages/page_exit.ecpp b/pages/page_exit.ecpp deleted file mode 100644 index 94c46ed..0000000 --- a/pages/page_exit.ecpp +++ /dev/null @@ -1,10 +0,0 @@ -<# do not add to Makefile #> -<%cpp> - spoint.commit(); -} catch ( HtmlError const& ex ) { - cxxtools::QueryParams param = qparam; - param.add( "pageTitle", pageTitle ); - param.add( "errorMessage", ex.what() ); - callComp( "error", request, reply, param ); -} - diff --git a/pages/page_exit.eh b/pages/page_exit.eh new file mode 100644 index 0000000..94c46ed --- /dev/null +++ b/pages/page_exit.eh @@ -0,0 +1,10 @@ +<# do not add to Makefile #> +<%cpp> + spoint.commit(); +} catch ( HtmlError const& ex ) { + cxxtools::QueryParams param = qparam; + param.add( "pageTitle", pageTitle ); + param.add( "errorMessage", ex.what() ); + callComp( "error", request, reply, param ); +} + diff --git a/pages/page_init.ecpp b/pages/page_init.ecpp deleted file mode 100644 index c1d4680..0000000 --- a/pages/page_init.ecpp +++ /dev/null @@ -1,12 +0,0 @@ -<# do not add to Makefile #> -<%pre> -#include -#include "exception.h" - -<%request scope="global"> -std::string pageTitle; - -<%cpp> -try { - tnt::Savepoint spoint( reply ); - diff --git a/pages/page_init.eh b/pages/page_init.eh new file mode 100644 index 0000000..c1d4680 --- /dev/null +++ b/pages/page_init.eh @@ -0,0 +1,12 @@ +<# do not add to Makefile #> +<%pre> +#include +#include "exception.h" + +<%request scope="global"> +std::string pageTitle; + +<%cpp> +try { + tnt::Savepoint spoint( reply ); + diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp index 8ea488e..17dcf54 100644 --- a/pages/recordings.ecpp +++ b/pages/recordings.ecpp @@ -14,7 +14,7 @@ using namespace vdrlive; <%request scope="page"> RecordingsTree recordingsTree; -<%include>page_init.ecpp +<%include>page_init.eh <%cpp> pageTitle = tr("Recordings"); @@ -41,7 +41,7 @@ RecordingsTree recordingsTree; -<%include>page_exit.ecpp +<%include>page_exit.eh <%def recordings_item> <%args> diff --git a/pages/remote.ecpp b/pages/remote.ecpp index ec593fb..cb6a97f 100644 --- a/pages/remote.ecpp +++ b/pages/remote.ecpp @@ -5,7 +5,7 @@ using namespace vdrlive; -<%include>page_init.ecpp +<%include>page_init.eh <%cpp> pageTitle = tr("Remote control"); @@ -191,4 +191,4 @@ using namespace vdrlive; -<%include>page_exit.ecpp +<%include>page_exit.eh diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp index 2577c6d..b43e660 100644 --- a/pages/schedule.ecpp +++ b/pages/schedule.ecpp @@ -13,7 +13,7 @@ using namespace vdrlive; <%args> int channel = -1; -<%include>page_init.ecpp +<%include>page_init.eh <%cpp> pageTitle = tr("Schedule"); @@ -97,4 +97,4 @@ using namespace vdrlive; -<%include>page_exit.ecpp +<%include>page_exit.eh diff --git a/pages/timers.ecpp b/pages/timers.ecpp index ff27a1e..e593833 100644 --- a/pages/timers.ecpp +++ b/pages/timers.ecpp @@ -6,7 +6,7 @@ using namespace vdrlive; -<%include>page_init.ecpp +<%include>page_init.eh <%cpp> pageTitle = tr("Timers"); @@ -62,4 +62,4 @@ using namespace vdrlive; -<%include>page_exit.ecpp +<%include>page_exit.eh diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp index d05b9fa..80b9c54 100644 --- a/pages/whats_on.ecpp +++ b/pages/whats_on.ecpp @@ -13,7 +13,7 @@ using namespace vdrlive; <%args> type = "now"; -<%include>page_init.ecpp +<%include>page_init.eh <{ cSchedulesLock schedulesLock; @@ -92,4 +92,4 @@ if (type == "now") { -<%include>page_exit.ecpp +<%include>page_exit.eh -- cgit v1.2.3