From 86095cf273e954342dd31f9b4aec53f57995a857 Mon Sep 17 00:00:00 2001 From: svntobi Date: Sun, 19 Aug 2007 20:17:20 +0000 Subject: =?UTF-8?q?=C3=82morerenamings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/submenu/trunk@5832 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f --- src/custommainmenuitem.cpp | 53 ------------------------------------------- src/custommainmenuitem.h | 42 ---------------------------------- src/osditemdefinition.cpp | 53 +++++++++++++++++++++++++++++++++++++++++++ src/osditemdefinition.h | 42 ++++++++++++++++++++++++++++++++++ src/pluginitemdefinition.cpp | 54 ++++++++++++++++++++++++++++++++++++++++++++ src/pluginitemdefinition.h | 43 +++++++++++++++++++++++++++++++++++ src/pluginmainmenuitem.cpp | 54 -------------------------------------------- src/pluginmainmenuitem.h | 43 ----------------------------------- src/pluginmenunode.cpp | 4 ++-- src/submenunode.cpp | 4 ++-- src/systemmenunode.cpp | 4 ++-- 11 files changed, 198 insertions(+), 198 deletions(-) delete mode 100644 src/custommainmenuitem.cpp delete mode 100644 src/custommainmenuitem.h create mode 100644 src/osditemdefinition.cpp create mode 100644 src/osditemdefinition.h create mode 100644 src/pluginitemdefinition.cpp create mode 100644 src/pluginitemdefinition.h delete mode 100644 src/pluginmainmenuitem.cpp delete mode 100644 src/pluginmainmenuitem.h (limited to 'src') diff --git a/src/custommainmenuitem.cpp b/src/custommainmenuitem.cpp deleted file mode 100644 index fb93a49..0000000 --- a/src/custommainmenuitem.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/* - * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ - * - */ - -#include "custommainmenuitem.h" - -CustomMainMenuItem::CustomMainMenuItem(cOsdItem* osdItem) -{ - _osdItem = osdItem; -} - -bool CustomMainMenuItem::IsCustomOsdItem() -{ - return true; -} - -bool CustomMainMenuItem::IsPluginItem() -{ - return false; -} - -cOsdItem* CustomMainMenuItem::CustomOsdItem() -{ - return _osdItem; -} - -const char* CustomMainMenuItem::PluginMenuEntry() -{ - return NULL; -} - -int CustomMainMenuItem::PluginIndex() -{ - return 0; -} diff --git a/src/custommainmenuitem.h b/src/custommainmenuitem.h deleted file mode 100644 index 7e6cd41..0000000 --- a/src/custommainmenuitem.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ - * - */ - -#ifndef ___CUSTOMMAINMENUITEM_H -#define ___CUSTOMMAINMENUITEM_H - -#include - -class CustomMainMenuItem: public IMenuItemDefinition -{ - private: - cOsdItem* _osdItem; - - public: - CustomMainMenuItem(cOsdItem* osdItem); - virtual bool IsCustomOsdItem(); - virtual bool IsPluginItem(); - virtual cOsdItem* CustomOsdItem(); - virtual const char* PluginMenuEntry(); - virtual int PluginIndex(); -}; - -#endif diff --git a/src/osditemdefinition.cpp b/src/osditemdefinition.cpp new file mode 100644 index 0000000..f28334b --- /dev/null +++ b/src/osditemdefinition.cpp @@ -0,0 +1,53 @@ +/* + * vdr-menuorg - A plugin for the Linux Video Disk Recorder + * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id$ + * + */ + +#include "osditemdefinition.h" + +OsdItemDefinition::OsdItemDefinition(cOsdItem* osdItem) +{ + _osdItem = osdItem; +} + +bool OsdItemDefinition::IsCustomOsdItem() +{ + return true; +} + +bool OsdItemDefinition::IsPluginItem() +{ + return false; +} + +cOsdItem* OsdItemDefinition::CustomOsdItem() +{ + return _osdItem; +} + +const char* OsdItemDefinition::PluginMenuEntry() +{ + return NULL; +} + +int OsdItemDefinition::PluginIndex() +{ + return 0; +} diff --git a/src/osditemdefinition.h b/src/osditemdefinition.h new file mode 100644 index 0000000..0c4bad7 --- /dev/null +++ b/src/osditemdefinition.h @@ -0,0 +1,42 @@ +/* + * vdr-menuorg - A plugin for the Linux Video Disk Recorder + * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id$ + * + */ + +#ifndef ___OSDITEMDEFINITION_H +#define ___OSDITEMDEFINITION_H + +#include + +class OsdItemDefinition: public IMenuItemDefinition +{ + private: + cOsdItem* _osdItem; + + public: + OsdItemDefinition(cOsdItem* osdItem); + virtual bool IsCustomOsdItem(); + virtual bool IsPluginItem(); + virtual cOsdItem* CustomOsdItem(); + virtual const char* PluginMenuEntry(); + virtual int PluginIndex(); +}; + +#endif diff --git a/src/pluginitemdefinition.cpp b/src/pluginitemdefinition.cpp new file mode 100644 index 0000000..f74a04d --- /dev/null +++ b/src/pluginitemdefinition.cpp @@ -0,0 +1,54 @@ +/* + * vdr-menuorg - A plugin for the Linux Video Disk Recorder + * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id$ + * + */ + +#include "pluginitemdefinition.h" + +PluginItemDefinition::PluginItemDefinition(const char* mainMenuEntry, int pluginIndex) +{ + _mainMenuEntry = mainMenuEntry; + _pluginIndex = pluginIndex; +} + +bool PluginItemDefinition::IsCustomOsdItem() +{ + return false; +} + +bool PluginItemDefinition::IsPluginItem() +{ + return true; +} + +cOsdItem* PluginItemDefinition::CustomOsdItem() +{ + return NULL; +} + +const char* PluginItemDefinition::PluginMenuEntry() +{ + return _mainMenuEntry; +} + +int PluginItemDefinition::PluginIndex() +{ + return _pluginIndex; +} diff --git a/src/pluginitemdefinition.h b/src/pluginitemdefinition.h new file mode 100644 index 0000000..75ad0a3 --- /dev/null +++ b/src/pluginitemdefinition.h @@ -0,0 +1,43 @@ +/* + * vdr-menuorg - A plugin for the Linux Video Disk Recorder + * Copyright (C) 2007 Thomas Creutz, Tobias Grimm + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id$ + * + */ + +#ifndef ___PLUGINITEMDEFINITION_H +#define ___PLUGINITEMDEFINITION_H + +#include + +class PluginItemDefinition: public IMenuItemDefinition +{ + private: + const char* _mainMenuEntry; + int _pluginIndex; + + public: + PluginItemDefinition(const char* mainMenuEntry, int pluginIndex); + virtual bool IsCustomOsdItem(); + virtual bool IsPluginItem(); + virtual cOsdItem* CustomOsdItem(); + virtual const char* PluginMenuEntry(); + virtual int PluginIndex(); +}; + +#endif diff --git a/src/pluginmainmenuitem.cpp b/src/pluginmainmenuitem.cpp deleted file mode 100644 index 8101aa1..0000000 --- a/src/pluginmainmenuitem.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/* - * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ - * - */ - -#include "pluginmainmenuitem.h" - -PluginMainMenuItem::PluginMainMenuItem(const char* mainMenuEntry, int pluginIndex) -{ - _mainMenuEntry = mainMenuEntry; - _pluginIndex = pluginIndex; -} - -bool PluginMainMenuItem::IsCustomOsdItem() -{ - return false; -} - -bool PluginMainMenuItem::IsPluginItem() -{ - return true; -} - -cOsdItem* PluginMainMenuItem::CustomOsdItem() -{ - return NULL; -} - -const char* PluginMainMenuItem::PluginMenuEntry() -{ - return _mainMenuEntry; -} - -int PluginMainMenuItem::PluginIndex() -{ - return _pluginIndex; -} diff --git a/src/pluginmainmenuitem.h b/src/pluginmainmenuitem.h deleted file mode 100644 index df1427f..0000000 --- a/src/pluginmainmenuitem.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * vdr-menuorg - A plugin for the Linux Video Disk Recorder - * Copyright (C) 2007 Thomas Creutz, Tobias Grimm - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ - * - */ - -#ifndef ___PLUGINMAINMENUITEM_H -#define ___PLUGINMAINMENUITEM_H - -#include - -class PluginMainMenuItem: public IMenuItemDefinition -{ - private: - const char* _mainMenuEntry; - int _pluginIndex; - - public: - PluginMainMenuItem(const char* mainMenuEntry, int pluginIndex); - virtual bool IsCustomOsdItem(); - virtual bool IsPluginItem(); - virtual cOsdItem* CustomOsdItem(); - virtual const char* PluginMenuEntry(); - virtual int PluginIndex(); -}; - -#endif diff --git a/src/pluginmenunode.cpp b/src/pluginmenunode.cpp index 1d966c9..3e8bc5b 100644 --- a/src/pluginmenunode.cpp +++ b/src/pluginmenunode.cpp @@ -22,7 +22,7 @@ #include "pluginmenunode.h" #include -#include "pluginmainmenuitem.h" +#include "pluginitemdefinition.h" PluginMenuNode::PluginMenuNode(const char* pluginMainMenuEntry, int pluginIndex) { @@ -32,5 +32,5 @@ PluginMenuNode::PluginMenuNode(const char* pluginMainMenuEntry, int pluginIndex) IMenuItemDefinition* PluginMenuNode::CreateMenuItemDefinition() { - return new PluginMainMenuItem(_pluginMainMenuEntry, _pluginIndex); + return new PluginItemDefinition(_pluginMainMenuEntry, _pluginIndex); } diff --git a/src/submenunode.cpp b/src/submenunode.cpp index 18f493a..6894f53 100644 --- a/src/submenunode.cpp +++ b/src/submenunode.cpp @@ -22,7 +22,7 @@ #include "submenunode.h" #include -#include "custommainmenuitem.h" +#include "osditemdefinition.h" SubMenuNode::SubMenuNode(std::string text) { @@ -31,5 +31,5 @@ SubMenuNode::SubMenuNode(std::string text) IMenuItemDefinition* SubMenuNode::CreateMenuItemDefinition() { - return new CustomMainMenuItem(new cOsdItem(tr(_text.c_str()), osUser1)); + return new OsdItemDefinition(new cOsdItem(tr(_text.c_str()), osUser1)); } diff --git a/src/systemmenunode.cpp b/src/systemmenunode.cpp index 2b9f2dd..4242bac 100644 --- a/src/systemmenunode.cpp +++ b/src/systemmenunode.cpp @@ -22,7 +22,7 @@ #include "systemmenunode.h" #include -#include "custommainmenuitem.h" +#include "osditemdefinition.h" SystemMenuNode::SystemMenuNode(std::string text, eOSState state) { @@ -32,5 +32,5 @@ SystemMenuNode::SystemMenuNode(std::string text, eOSState state) IMenuItemDefinition* SystemMenuNode::CreateMenuItemDefinition() { - return new CustomMainMenuItem(new cOsdItem(_text.c_str(), _state)); + return new OsdItemDefinition(new cOsdItem(_text.c_str(), _state)); } -- cgit v1.2.3