Permalink
Browse files

changed: split off window id's to separate file

Key.h rebuilds from 291 to 129 (232 for new file) => 60 spurious
rebuilds killed
  • Loading branch information...
spiff
spiff committed Mar 16, 2013
1 parent 3f0e0c9 commit 16f276be317fa74efba6e5ddf16ec3f9bfba4b26
Showing with 262 additions and 157 deletions.
  1. +2 −1 xbmc/Application.h
  2. +1 −0 xbmc/ApplicationMessenger.cpp
  3. +2 −1 xbmc/ApplicationMessenger.h
  4. +1 −1 xbmc/AutoSwitch.cpp
  5. +1 −0 xbmc/addons/AddonCallbacksGUI.cpp
  6. +1 −0 xbmc/addons/GUIDialogAddonInfo.cpp
  7. +1 −0 xbmc/addons/GUIDialogAddonSettings.cpp
  8. +1 −1 xbmc/addons/GUIViewStateAddonBrowser.cpp
  9. +1 −0 xbmc/addons/GUIWindowAddonBrowser.cpp
  10. +1 −1 xbmc/addons/Skin.cpp
  11. +0 −1 xbmc/addons/Visualisation.h
  12. +1 −0 xbmc/cores/dvdplayer/DVDPlayer.cpp
  13. +1 −0 xbmc/dialogs/GUIDialogContextMenu.cpp
  14. +1 −0 xbmc/dialogs/GUIDialogFavourites.cpp
  15. +1 −0 xbmc/dialogs/GUIDialogFileBrowser.cpp
  16. +1 −0 xbmc/dialogs/GUIDialogGamepad.cpp
  17. +1 −0 xbmc/dialogs/GUIDialogKeyboardGeneric.cpp
  18. +1 −0 xbmc/dialogs/GUIDialogMediaSource.cpp
  19. +1 −0 xbmc/dialogs/GUIDialogNumeric.cpp
  20. +1 −0 xbmc/dialogs/GUIDialogSelect.cpp
  21. +1 −0 xbmc/dialogs/GUIDialogSlider.cpp
  22. +1 −0 xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
  23. +1 −0 xbmc/dialogs/GUIDialogVolumeBar.cpp
  24. +1 −0 xbmc/dialogs/GUIDialogYesNo.cpp
  25. +1 −0 xbmc/guilib/GUIButtonControl.cpp
  26. +1 −0 xbmc/guilib/GUIDialog.cpp
  27. +1 −1 xbmc/guilib/GUIDialog.h
  28. +1 −0 xbmc/guilib/GUIEditControl.cpp
  29. +1 −0 xbmc/guilib/GUIMultiImage.cpp
  30. +1 −0 xbmc/guilib/GUIToggleButtonControl.cpp
  31. +2 −0 xbmc/guilib/GUIVideoControl.cpp
  32. +1 −0 xbmc/guilib/GUIVisualisationControl.cpp
  33. +1 −0 xbmc/guilib/GUIWindowManager.cpp
  34. +0 −140 xbmc/guilib/Key.h
  35. +162 −0 xbmc/guilib/WindowIDs.h
  36. +1 −0 xbmc/input/ButtonTranslator.cpp
  37. +1 −0 xbmc/interfaces/Builtins.cpp
  38. +1 −0 xbmc/interfaces/json-rpc/GUIOperations.cpp
  39. +1 −0 xbmc/interfaces/json-rpc/PlayerOperations.cpp
  40. +1 −0 xbmc/interfaces/json-rpc/PlaylistOperations.cpp
  41. +1 −1 xbmc/music/GUIViewStateMusic.cpp
  42. +1 −0 xbmc/music/dialogs/GUIDialogMusicInfo.cpp
  43. +1 −0 xbmc/music/dialogs/GUIDialogMusicOSD.cpp
  44. +1 −0 xbmc/music/dialogs/GUIDialogMusicOverlay.cpp
  45. +1 −0 xbmc/music/dialogs/GUIDialogSongInfo.cpp
  46. +1 −0 xbmc/music/dialogs/GUIDialogVisualisationPresetList.cpp
  47. +1 −0 xbmc/music/karaoke/GUIDialogKaraokeSongSelector.cpp
  48. +1 −0 xbmc/music/karaoke/GUIWindowKaraokeLyrics.cpp
  49. +1 −0 xbmc/music/windows/GUIWindowMusicBase.cpp
  50. +1 −0 xbmc/music/windows/GUIWindowMusicNav.cpp
  51. +1 −0 xbmc/music/windows/GUIWindowMusicPlaylist.cpp
  52. +1 −0 xbmc/music/windows/GUIWindowMusicPlaylistEditor.cpp
  53. +1 −0 xbmc/music/windows/GUIWindowMusicSongs.cpp
  54. +1 −0 xbmc/music/windows/GUIWindowVisualisation.cpp
  55. +1 −0 xbmc/network/EventClient.cpp
  56. +1 −0 xbmc/network/EventServer.cpp
  57. +1 −0 xbmc/network/GUIDialogAccessPoints.cpp
  58. +1 −0 xbmc/network/upnp/UPnPRenderer.cpp
  59. +1 −1 xbmc/network/upnp/UPnPServer.cpp
  60. +1 −0 xbmc/pictures/GUIDialogPictureInfo.cpp
  61. +1 −1 xbmc/pictures/GUIViewStatePictures.cpp
  62. +1 −0 xbmc/pictures/GUIWindowPictures.cpp
  63. +1 −0 xbmc/pictures/GUIWindowSlideShow.cpp
  64. +1 −1 xbmc/programs/GUIViewStatePrograms.cpp
  65. +1 −0 xbmc/programs/GUIWindowPrograms.cpp
  66. +1 −0 xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp
  67. +1 −0 xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
  68. +1 −0 xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp
  69. +1 −0 xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp
  70. +1 −0 xbmc/pvr/windows/GUIWindowPVRChannels.cpp
  71. +1 −0 xbmc/pvr/windows/GUIWindowPVRCommon.cpp
  72. +1 −0 xbmc/pvr/windows/GUIWindowPVRGuide.cpp
  73. +1 −0 xbmc/pvr/windows/GUIWindowPVRRecordings.cpp
  74. +1 −0 xbmc/pvr/windows/GUIWindowPVRSearch.cpp
  75. +1 −0 xbmc/pvr/windows/GUIWindowPVRTimers.cpp
  76. +1 −0 xbmc/settings/dialogs/GUIDialogContentSettings.cpp
  77. +1 −1 xbmc/settings/windows/GUIWindowSettings.cpp
  78. +1 −0 xbmc/settings/windows/GUIWindowSettingsProfile.cpp
  79. +1 −0 xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp
  80. +1 −0 xbmc/settings/windows/GUIWindowTestPattern.cpp
  81. +1 −1 xbmc/utils/RecentlyAddedJob.cpp
  82. +1 −0 xbmc/utils/Weather.cpp
  83. +1 −1 xbmc/video/GUIViewStateVideo.cpp
  84. +2 −1 xbmc/video/dialogs/GUIDialogFileStacking.cpp
  85. +1 −0 xbmc/video/dialogs/GUIDialogFullScreenInfo.cpp
  86. +1 −0 xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
  87. +1 −0 xbmc/video/dialogs/GUIDialogVideoInfo.cpp
  88. +1 −0 xbmc/video/dialogs/GUIDialogVideoOSD.cpp
  89. +1 −0 xbmc/video/windows/GUIWindowFullScreen.cpp
  90. +1 −0 xbmc/video/windows/GUIWindowVideoBase.cpp
  91. +1 −0 xbmc/video/windows/GUIWindowVideoNav.cpp
  92. +1 −0 xbmc/video/windows/GUIWindowVideoPlaylist.cpp
  93. +1 −1 xbmc/view/GUIViewControl.cpp
  94. +1 −0 xbmc/windows/GUIMediaWindow.cpp
  95. +1 −0 xbmc/windows/GUIWindowFileManager.cpp
  96. +1 −0 xbmc/windows/GUIWindowHome.cpp
  97. +1 −0 xbmc/windows/GUIWindowLoginScreen.cpp
  98. +1 −0 xbmc/windows/GUIWindowStartup.cpp
  99. +1 −1 xbmc/windows/GUIWindowSystemInfo.cpp
View
@@ -24,14 +24,15 @@
#include "XBApplicationEx.h"
#include "guilib/IMsgTargetCallback.h"
-#include "guilib/Key.h"
#include "threads/Condition.h"
#include "utils/GlobalsHandling.h"
#include <map>
+class CAction;
class CFileItem;
class CFileItemList;
+class CKey;
namespace ADDON
{
class CSkinInfo;
@@ -34,6 +34,7 @@
#include "utils/URIUtils.h"
#include "utils/Variant.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "settings/Settings.h"
#include "settings/GUISettings.h"
#include "FileItem.h"
@@ -22,7 +22,7 @@
#include "threads/CriticalSection.h"
#include "utils/StdString.h"
-#include "guilib/Key.h"
+#include "guilib/WindowIDs.h"
#include "threads/Thread.h"
#include "threads/Event.h"
#include <boost/shared_ptr.hpp>
@@ -36,6 +36,7 @@ class CGUIDialog;
class CGUIWindow;
class CGUIMessage;
class CVideoInfoTag;
+class CAction;
namespace MUSIC_INFO
{
View
@@ -23,7 +23,7 @@
#include "settings/GUISettings.h"
#include "guilib/GUIWindowManager.h"
#include "FileItem.h"
-#include "guilib/Key.h"
+#include "guilib/WindowIDs.h"
#define METHOD_BYFOLDERS 0
#define METHOD_BYFILES 1
@@ -29,6 +29,7 @@
#include "utils/URIUtils.h"
#include "utils/TimeUtils.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "guilib/TextureManager.h"
#include "settings/GUISettings.h"
#include "guilib/GUISpinControlEx.h"
@@ -31,6 +31,7 @@
#include "dialogs/GUIDialogTextViewer.h"
#include "GUIUserMessages.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "utils/JobManager.h"
#include "utils/FileOperationJob.h"
#include "utils/StringUtils.h"
@@ -34,6 +34,7 @@
#include "guilib/GUIRadioButtonControl.h"
#include "guilib/GUISpinControlEx.h"
#include "guilib/GUIImage.h"
+#include "guilib/Key.h"
#include "filesystem/Directory.h"
#include "video/VideoInfoScanner.h"
#include "addons/Scraper.h"
@@ -20,7 +20,7 @@
#include "GUIViewStateAddonBrowser.h"
#include "FileItem.h"
-#include "guilib/Key.h"
+#include "guilib/WindowIDs.h"
#include "view/ViewState.h"
#include "settings/Settings.h"
#include "addons/Addon.h"
@@ -46,6 +46,7 @@
#include "storage/MediaManager.h"
#include "settings/GUISettings.h"
#include "LangInfo.h"
+#include "guilib/Key.h"
#define CONTROL_AUTOUPDATE 5
#define CONTROL_SHUTUP 6
View
@@ -22,7 +22,7 @@
#include "AddonManager.h"
#include "filesystem/File.h"
#include "filesystem/SpecialProtocol.h"
-#include "guilib/Key.h"
+#include "guilib/WindowIDs.h"
#include "utils/URIUtils.h"
#include "settings/Settings.h"
#include "utils/log.h"
@@ -19,7 +19,6 @@
*/
#pragma once
-#include "guilib/Key.h"
#include "AddonDll.h"
#include "cores/IAudioCallback.h"
#include "include/xbmc_vis_types.h"
@@ -41,6 +41,7 @@
#include "DVDFileInfo.h"
#include "utils/LangCodeExpander.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#include "utils/URIUtils.h"
@@ -33,6 +33,7 @@
#include "settings/dialogs/GUIDialogLockSettings.h"
#include "storage/MediaManager.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "GUIDialogYesNo.h"
#include "addons/AddonManager.h"
#include "FileItem.h"
@@ -24,6 +24,7 @@
#include "Favourites.h"
#include "guilib/GUIWindowManager.h"
#include "guilib/GUIKeyboardFactory.h"
+#include "guilib/Key.h"
#include "filesystem/File.h"
#include "FileItem.h"
#include "guilib/LocalizeStrings.h"
@@ -41,6 +41,7 @@
#include "settings/AdvancedSettings.h"
#include "settings/Settings.h"
#include "settings/GUISettings.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#include "utils/log.h"
#include "URL.h"
@@ -24,6 +24,7 @@
#include "guilib/GUIWindowManager.h"
#include "GUIDialogOK.h"
#include "utils/StringUtils.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
CGUIDialogGamepad::CGUIDialogGamepad(void)
@@ -22,6 +22,7 @@
#include "input/XBMC_vkeys.h"
#include "guilib/GUILabelControl.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#include "GUIUserMessages.h"
#include "GUIDialogNumeric.h"
@@ -23,6 +23,7 @@
#include "GUIDialogFileBrowser.h"
#include "video/windows/GUIWindowVideoBase.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "Util.h"
#include "utils/URIUtils.h"
#include "filesystem/Directory.h"
@@ -25,6 +25,7 @@
#include "GUIDialogOK.h"
#include "input/XBMC_vkeys.h"
#include "utils/StringUtils.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#include "interfaces/AnnouncementManager.h"
@@ -21,6 +21,7 @@
#include "GUIDialogSelect.h"
#include "guilib/GUIWindowManager.h"
#include "FileItem.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#define CONTROL_HEADING 1
@@ -21,6 +21,7 @@
#include "GUIDialogSlider.h"
#include "guilib/GUISliderControl.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
#define CONTROL_HEADING 10
@@ -28,6 +28,7 @@
#include "settings/GUISettings.h"
#include "settings/Settings.h"
#include "FileItem.h"
+#include "guilib/Key.h"
#include "guilib/LocalizeStrings.h"
using namespace std;
@@ -19,6 +19,7 @@
*/
#include "GUIDialogVolumeBar.h"
+#include "guilib/Key.h"
#include "utils/TimeUtils.h"
#define VOLUME_BAR_DISPLAY_TIME 1000L
@@ -20,6 +20,7 @@
#include "GUIDialogYesNo.h"
#include "guilib/GUIWindowManager.h"
+#include "guilib/Key.h"
#define CONTROL_NO_BUTTON 10
#define CONTROL_YES_BUTTON 11
@@ -23,6 +23,7 @@
#include "GUIDialog.h"
#include "utils/CharsetConverter.h"
#include "GUIFontManager.h"
+#include "Key.h"
using namespace std;
@@ -27,6 +27,7 @@
#include "utils/TimeUtils.h"
#include "Application.h"
#include "ApplicationMessenger.h"
+#include "Key.h"
CGUIDialog::CGUIDialog(int id, const CStdString &xmlFile)
: CGUIWindow(id, xmlFile)
View
@@ -26,7 +26,7 @@
*/
#include "GUIWindow.h"
-#include "Key.h"
+#include "WindowIDs.h"
/*!
\ingroup winmsg
@@ -24,6 +24,7 @@
#include "GUIKeyboardFactory.h"
#include "dialogs/GUIDialogNumeric.h"
#include "input/XBMC_vkeys.h"
+#include "Key.h"
#include "LocalizeStrings.h"
#include "XBDateTime.h"
#include "utils/md5.h"
@@ -27,6 +27,7 @@
#include "settings/Settings.h"
#include "Key.h"
#include "TextureCache.h"
+#include "WindowIDs.h"
using namespace std;
using namespace XFILE;
@@ -23,6 +23,7 @@
#include "GUIDialog.h"
#include "utils/CharsetConverter.h"
#include "GUIInfoManager.h"
+#include "Key.h"
using namespace std;
@@ -22,6 +22,8 @@
#include "GUIVideoControl.h"
#include "GUIWindowManager.h"
#include "Application.h"
+#include "Key.h"
+#include "WindowIDs.h"
#include "cores/IPlayer.h"
#ifdef HAS_VIDEO_PLAYBACK
#include "cores/VideoRenderers/RenderManager.h"
@@ -26,6 +26,7 @@
#include "addons/Visualisation.h"
#include "utils/log.h"
#include "guilib/IRenderingCallback.h"
+#include "Key.h"
using namespace std;
using namespace ADDON;
@@ -34,6 +34,7 @@
#include "GUITexture.h"
#include "windowing/WindowingFactory.h"
#include "utils/Variant.h"
+#include "Key.h"
using namespace std;
Oops, something went wrong.

0 comments on commit 16f276b

Please sign in to comment.