Merge pull request #141 from cptspiff/nocredits

changed: remove old, unused, not likely to return, HAS_CREDITS code

4 files changed, 0 insertions, 36 deletions

diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp
index dff1d9d893..f486aae142 100644
--- a/xbmc/Util.cpp
+++ b/xbmc/Util.cpp
@@ -55,9 +55,6 @@
 #ifdef HAS_UPNP
 #include "filesystem/UPnPDirectory.h"
 #endif
-#ifdef HAS_CREDITS
-#include "Credits.h"
-#endif
 #ifdef HAS_VIDEO_PLAYBACK
 #include "cores/VideoRenderers/RenderManager.h"
 #endif
diff --git a/xbmc/interfaces/Builtins.cpp b/xbmc/interfaces/Builtins.cpp
index 0976813a9a..b5918b6f0f 100644
--- a/xbmc/interfaces/Builtins.cpp
+++ b/xbmc/interfaces/Builtins.cpp
@@ -112,7 +112,6 @@ const BUILT_IN commands[] = {
   { "Suspend",                    false,  "Suspends the system" },
   { "RestartApp",                 false,  "Restart XBMC" },
   { "Minimize",                   false,  "Minimize XBMC" },
-  { "Credits",                    false,  "Run XBMCs Credits" },
   { "Reset",                      false,  "Reset the xbox (warm reboot)" },
   { "Mastermode",                 false,  "Control master mode" },
   { "ActivateWindow",             true,   "Activate the specified window" },
@@ -305,12 +304,6 @@ int CBuiltins::Execute(const CStdString& execString)
   {
     CUtil::TakeScreenshot();
   }
-  else if (execute.Equals("credits"))
-  {
-#ifdef HAS_CREDITS
-    CUtil::RunCredits();
-#endif
-  }
   else if (execute.Equals("reset")) //Will reset the xbox, aka soft reset
   {
     g_application.getApplicationMessenger().Reset();
diff --git a/xbmc/settings/GUIWindowSettings.cpp b/xbmc/settings/GUIWindowSettings.cpp
index 5c9650602c..7073dcd3ec 100644
--- a/xbmc/settings/GUIWindowSettings.cpp
+++ b/xbmc/settings/GUIWindowSettings.cpp
@@ -23,11 +23,6 @@
 #include "GUIWindowSettings.h"
 #include "guilib/GUIWindowManager.h"
 #include "guilib/Key.h"
-#ifdef HAS_CREDITS
-#include "Credits.h"
-#endif
-
-#define CONTROL_CREDITS 12
 
 CGUIWindowSettings::CGUIWindowSettings(void)
     : CGUIWindow(WINDOW_SETTINGS_MENU, "Settings.xml")
@@ -49,23 +44,3 @@ bool CGUIWindowSettings::OnAction(const CAction &action)
   return CGUIWindow::OnAction(action);
 }
 
-bool CGUIWindowSettings::OnMessage(CGUIMessage& message)
-{
-  switch ( message.GetMessage() )
-  {
-  case GUI_MSG_CLICKED:
-    {
-      int iControl = message.GetSenderId();
-      if (iControl == CONTROL_CREDITS)
-      {
-#ifdef HAS_CREDITS
-        RunCredits();
-#endif
-        return true;
-      }
-    }
-    break;
-  }
-
-  return CGUIWindow::OnMessage(message);
-}
diff --git a/xbmc/settings/GUIWindowSettings.h b/xbmc/settings/GUIWindowSettings.h
index 6cc011e679..a52c3be90f 100644
--- a/xbmc/settings/GUIWindowSettings.h
+++ b/xbmc/settings/GUIWindowSettings.h
@@ -29,6 +29,5 @@ class CGUIWindowSettings :
 public:
   CGUIWindowSettings(void);
   virtual ~CGUIWindowSettings(void);
-  virtual bool OnMessage(CGUIMessage& message);
   virtual bool OnAction(const CAction &action);
 };