diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index ddf4344abe4a0..2b435131f07cd 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -484,7 +484,6 @@ - @@ -501,6 +500,7 @@ + @@ -900,6 +900,7 @@ + @@ -1842,7 +1843,6 @@ - @@ -2615,4 +2615,4 @@ - \ No newline at end of file + diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters index 401c079e981a7..b335beb62eaeb 100644 --- a/project/VS2010Express/XBMC.vcxproj.filters +++ b/project/VS2010Express/XBMC.vcxproj.filters @@ -1120,9 +1120,6 @@ guilib - - guilib - guilib @@ -3146,6 +3143,9 @@ video\jobs + + + input network\httprequesthandler\python @@ -4087,9 +4087,6 @@ guilib - - guilib - guilib @@ -6145,6 +6142,9 @@ video\jobs + + + input network\httprequesthandler\python @@ -6218,4 +6218,4 @@ interfaces\swig - \ No newline at end of file + diff --git a/xbmc/ApplicationMessenger.cpp b/xbmc/ApplicationMessenger.cpp index 9e62696db3f61..67d9e06e7e455 100644 --- a/xbmc/ApplicationMessenger.cpp +++ b/xbmc/ApplicationMessenger.cpp @@ -37,7 +37,7 @@ #include "settings/Settings.h" #include "FileItem.h" #include "guilib/GUIDialog.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/GUIKeyboardFactory.h" #include "guilib/Resolution.h" #include "GUIInfoManager.h" diff --git a/xbmc/PlayListPlayer.cpp b/xbmc/PlayListPlayer.cpp index 9a1ddb9fc4601..37a9459da2c66 100644 --- a/xbmc/PlayListPlayer.cpp +++ b/xbmc/PlayListPlayer.cpp @@ -35,7 +35,7 @@ #include "dialogs/GUIDialogKaiToast.h" #include "guilib/LocalizeStrings.h" #include "interfaces/AnnouncementManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "URL.h" using namespace PLAYLIST; diff --git a/xbmc/addons/AddonCallbacksGUI.cpp b/xbmc/addons/AddonCallbacksGUI.cpp index 9028e1ac2547c..84878fe0c1a5c 100644 --- a/xbmc/addons/AddonCallbacksGUI.cpp +++ b/xbmc/addons/AddonCallbacksGUI.cpp @@ -30,7 +30,7 @@ #include "utils/TimeUtils.h" #include "utils/StringUtils.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/TextureManager.h" #include "guilib/GUISpinControlEx.h" #include "guilib/GUIRadioButtonControl.h" diff --git a/xbmc/addons/GUIDialogAddonInfo.cpp b/xbmc/addons/GUIDialogAddonInfo.cpp index 34cd30532dce3..fe3484f50b1a6 100644 --- a/xbmc/addons/GUIDialogAddonInfo.cpp +++ b/xbmc/addons/GUIDialogAddonInfo.cpp @@ -31,7 +31,7 @@ #include "dialogs/GUIDialogTextViewer.h" #include "GUIUserMessages.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "utils/JobManager.h" #include "utils/FileOperationJob.h" #include "utils/StringUtils.h" diff --git a/xbmc/addons/GUIDialogAddonSettings.cpp b/xbmc/addons/GUIDialogAddonSettings.cpp index 41edb263aedd9..ef1c3c2654d57 100644 --- a/xbmc/addons/GUIDialogAddonSettings.cpp +++ b/xbmc/addons/GUIDialogAddonSettings.cpp @@ -34,7 +34,7 @@ #include "guilib/GUIRadioButtonControl.h" #include "guilib/GUISpinControlEx.h" #include "guilib/GUIImage.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "filesystem/Directory.h" #include "video/VideoInfoScanner.h" #include "addons/Scraper.h" diff --git a/xbmc/addons/GUIWindowAddonBrowser.cpp b/xbmc/addons/GUIWindowAddonBrowser.cpp index 5c05d3c94bf0c..f4560dda4ae8d 100644 --- a/xbmc/addons/GUIWindowAddonBrowser.cpp +++ b/xbmc/addons/GUIWindowAddonBrowser.cpp @@ -47,7 +47,7 @@ #include "settings/AdvancedSettings.h" #include "storage/MediaManager.h" #include "LangInfo.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "ContextMenuManager.h" #define CONTROL_AUTOUPDATE 5 @@ -201,28 +201,28 @@ bool CGUIWindowAddonBrowser::OnContextButton(int itemNumber, AddonPtr addon; if (CAddonMgr::Get().GetAddon(pItem->GetProperty("Addon.ID").asString(), addon, ADDON_UNKNOWN, false)) { - if (button == CONTEXT_BUTTON_SETTINGS) - return CGUIDialogAddonSettings::ShowAndGetInput(addon); + if (button == CONTEXT_BUTTON_SETTINGS) + return CGUIDialogAddonSettings::ShowAndGetInput(addon); - if (button == CONTEXT_BUTTON_REFRESH) - { - CAddonDatabase database; - database.Open(); - database.DeleteRepository(addon->ID()); - button = CONTEXT_BUTTON_SCAN; - } + if (button == CONTEXT_BUTTON_REFRESH) + { + CAddonDatabase database; + database.Open(); + database.DeleteRepository(addon->ID()); + button = CONTEXT_BUTTON_SCAN; + } - if (button == CONTEXT_BUTTON_SCAN) - { - CAddonInstaller::Get().UpdateRepos(true); - return true; - } + if (button == CONTEXT_BUTTON_SCAN) + { + CAddonInstaller::Get().UpdateRepos(true); + return true; + } - if (button == CONTEXT_BUTTON_INFO) - { - CGUIDialogAddonInfo::ShowForItem(pItem); - return true; - } + if (button == CONTEXT_BUTTON_INFO) + { + CGUIDialogAddonInfo::ShowForItem(pItem); + return true; + } } return CGUIMediaWindow::OnContextButton(itemNumber, button); @@ -548,9 +548,9 @@ int CGUIWindowAddonBrowser::SelectAddonID(const vector &types, vect // check if the addon is installed or can be installed if ((showInstallable || showMore) && !isInstalled && CAddonMgr::Get().CanAddonBeInstalled(pAddon)) - { + { ++addon; - continue; + continue; } } @@ -571,11 +571,11 @@ int CGUIWindowAddonBrowser::SelectAddonID(const vector &types, vect std::map addonMap; CFileItemList items; for (ADDON::IVECADDONS addon = addons.begin(); addon != addons.end(); ++addon) - { + { CFileItemPtr item(CAddonsDirectory::FileItemFromAddon(*addon, "")); - if (!items.Contains(item->GetPath())) + if (!items.Contains(item->GetPath())) { - items.Add(item); + items.Add(item); addonMap.insert(std::make_pair(item->GetPath(), *addon)); } } @@ -638,7 +638,7 @@ int CGUIWindowAddonBrowser::SelectAddonID(const vector &types, vect addonIDs.clear(); const CFileItemList& list = dialog->GetSelectedItems(); - for (int i = 0; i < list.Size(); i++) + for (int i = 0 ; i < list.Size() ; i++) { const CFileItemPtr& item = list.Get(i); diff --git a/xbmc/android/activity/AndroidKey.cpp b/xbmc/android/activity/AndroidKey.cpp index 34b9ceee72364..6f3cd961a4790 100644 --- a/xbmc/android/activity/AndroidKey.cpp +++ b/xbmc/android/activity/AndroidKey.cpp @@ -21,7 +21,7 @@ #include "AndroidKey.h" #include "AndroidExtra.h" #include "XBMCApp.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "windowing/WinEvents.h" #include "android/jni/KeyCharacterMap.h" diff --git a/xbmc/android/activity/XBMCApp.cpp b/xbmc/android/activity/XBMCApp.cpp index c69ac2603a33b..1cc1be5b57839 100644 --- a/xbmc/android/activity/XBMCApp.cpp +++ b/xbmc/android/activity/XBMCApp.cpp @@ -33,7 +33,7 @@ #include "input/MouseStat.h" #include "input/XBMC_keysym.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "windowing/XBMC_events.h" #include diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp index 9a1e4979a16d9..9321754f43fcf 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -39,7 +39,7 @@ #include "DVDFileInfo.h" #include "utils/LangCodeExpander.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "utils/URIUtils.h" diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp index ae66af3676ad2..eaf8e1b037878 100644 --- a/xbmc/dialogs/GUIDialogContextMenu.cpp +++ b/xbmc/dialogs/GUIDialogContextMenu.cpp @@ -35,7 +35,7 @@ #include "profiles/dialogs/GUIDialogLockSettings.h" #include "storage/MediaManager.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "GUIDialogYesNo.h" #include "addons/AddonManager.h" #include "FileItem.h" diff --git a/xbmc/dialogs/GUIDialogFavourites.cpp b/xbmc/dialogs/GUIDialogFavourites.cpp index de8372062fc9c..56952d1e6a389 100644 --- a/xbmc/dialogs/GUIDialogFavourites.cpp +++ b/xbmc/dialogs/GUIDialogFavourites.cpp @@ -25,7 +25,7 @@ #include "filesystem/FavouritesDirectory.h" #include "guilib/GUIWindowManager.h" #include "guilib/GUIKeyboardFactory.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "filesystem/File.h" #include "FileItem.h" #include "guilib/LocalizeStrings.h" diff --git a/xbmc/dialogs/GUIDialogFileBrowser.cpp b/xbmc/dialogs/GUIDialogFileBrowser.cpp index e1574271509a9..825e442afdc06 100644 --- a/xbmc/dialogs/GUIDialogFileBrowser.cpp +++ b/xbmc/dialogs/GUIDialogFileBrowser.cpp @@ -42,7 +42,7 @@ #include "settings/AdvancedSettings.h" #include "settings/MediaSourceSettings.h" #include "settings/Settings.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "utils/log.h" #include "URL.h" diff --git a/xbmc/dialogs/GUIDialogGamepad.cpp b/xbmc/dialogs/GUIDialogGamepad.cpp index fdd2c619fcc88..0a3dac660854c 100644 --- a/xbmc/dialogs/GUIDialogGamepad.cpp +++ b/xbmc/dialogs/GUIDialogGamepad.cpp @@ -25,7 +25,7 @@ #include "guilib/GUIWindowManager.h" #include "GUIDialogOK.h" #include "utils/StringUtils.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" CGUIDialogGamepad::CGUIDialogGamepad(void) diff --git a/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp b/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp index 6ea4b0a2166f3..a29cd46024471 100644 --- a/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp +++ b/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp @@ -22,7 +22,7 @@ #include "input/XBMC_vkeys.h" #include "guilib/GUIEditControl.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "GUIUserMessages.h" #include "GUIDialogNumeric.h" diff --git a/xbmc/dialogs/GUIDialogMediaSource.cpp b/xbmc/dialogs/GUIDialogMediaSource.cpp index 533e6afabe31e..840f9159afb19 100644 --- a/xbmc/dialogs/GUIDialogMediaSource.cpp +++ b/xbmc/dialogs/GUIDialogMediaSource.cpp @@ -23,7 +23,7 @@ #include "GUIDialogFileBrowser.h" #include "video/windows/GUIWindowVideoBase.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "Util.h" #include "utils/URIUtils.h" #include "utils/StringUtils.h" diff --git a/xbmc/dialogs/GUIDialogNumeric.cpp b/xbmc/dialogs/GUIDialogNumeric.cpp index d69d7bc33db90..58d9c025f26f2 100644 --- a/xbmc/dialogs/GUIDialogNumeric.cpp +++ b/xbmc/dialogs/GUIDialogNumeric.cpp @@ -25,7 +25,7 @@ #include "GUIDialogOK.h" #include "input/XBMC_vkeys.h" #include "utils/StringUtils.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "interfaces/AnnouncementManager.h" diff --git a/xbmc/dialogs/GUIDialogSelect.cpp b/xbmc/dialogs/GUIDialogSelect.cpp index 736eb1a17c34a..acffb6c0738d4 100644 --- a/xbmc/dialogs/GUIDialogSelect.cpp +++ b/xbmc/dialogs/GUIDialogSelect.cpp @@ -21,7 +21,7 @@ #include "GUIDialogSelect.h" #include "guilib/GUIWindowManager.h" #include "FileItem.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "utils/StringUtils.h" diff --git a/xbmc/dialogs/GUIDialogSlider.cpp b/xbmc/dialogs/GUIDialogSlider.cpp index 15d8cadfa77b9..a4a714744b552 100644 --- a/xbmc/dialogs/GUIDialogSlider.cpp +++ b/xbmc/dialogs/GUIDialogSlider.cpp @@ -21,7 +21,7 @@ #include "GUIDialogSlider.h" #include "guilib/GUISliderControl.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #define CONTROL_HEADING 10 diff --git a/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp b/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp index dc5e86c6fbafd..430ec5390dc4c 100644 --- a/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp +++ b/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp @@ -29,7 +29,7 @@ #include "profiles/ProfilesManager.h" #include "settings/Settings.h" #include "FileItem.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" using namespace std; diff --git a/xbmc/dialogs/GUIDialogVolumeBar.cpp b/xbmc/dialogs/GUIDialogVolumeBar.cpp index b5684e534e28d..a4db6fa2cc0dc 100644 --- a/xbmc/dialogs/GUIDialogVolumeBar.cpp +++ b/xbmc/dialogs/GUIDialogVolumeBar.cpp @@ -19,7 +19,7 @@ */ #include "GUIDialogVolumeBar.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "utils/TimeUtils.h" #define VOLUME_BAR_DISPLAY_TIME 1000L diff --git a/xbmc/dialogs/GUIDialogYesNo.cpp b/xbmc/dialogs/GUIDialogYesNo.cpp index cb963c82111d0..4a4a097e22115 100644 --- a/xbmc/dialogs/GUIDialogYesNo.cpp +++ b/xbmc/dialogs/GUIDialogYesNo.cpp @@ -20,7 +20,7 @@ #include "GUIDialogYesNo.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #define CONTROL_NO_BUTTON 10 #define CONTROL_YES_BUTTON 11 diff --git a/xbmc/epg/GUIEPGGridContainer.cpp b/xbmc/epg/GUIEPGGridContainer.cpp index 987cb9cdd1a24..4f68961c3432c 100644 --- a/xbmc/epg/GUIEPGGridContainer.cpp +++ b/xbmc/epg/GUIEPGGridContainer.cpp @@ -18,7 +18,7 @@ * */ -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/GUIControlFactory.h" #include "guilib/GUIListItem.h" #include "guilib/LocalizeStrings.h" diff --git a/xbmc/guilib/GUIAudioManager.cpp b/xbmc/guilib/GUIAudioManager.cpp index 67b174486e0c9..3ca6e98d743af 100644 --- a/xbmc/guilib/GUIAudioManager.cpp +++ b/xbmc/guilib/GUIAudioManager.cpp @@ -20,7 +20,7 @@ #include "system.h" #include "GUIAudioManager.h" -#include "Key.h" +#include "input/Key.h" #include "input/ButtonTranslator.h" #include "settings/lib/Setting.h" #include "threads/SingleLock.h" diff --git a/xbmc/guilib/GUIBaseContainer.cpp b/xbmc/guilib/GUIBaseContainer.cpp index 651be06097f5a..0fc2c61393352 100644 --- a/xbmc/guilib/GUIBaseContainer.cpp +++ b/xbmc/guilib/GUIBaseContainer.cpp @@ -28,7 +28,7 @@ #include "utils/SortUtils.h" #include "utils/StringUtils.h" #include "FileItem.h" -#include "Key.h" +#include "input/Key.h" #include "utils/MathUtils.h" #include "utils/XBMCTinyXML.h" #include "listproviders/IListProvider.h" diff --git a/xbmc/guilib/GUIButtonControl.cpp b/xbmc/guilib/GUIButtonControl.cpp index ac0c1889e4782..fd9fe1da4666b 100644 --- a/xbmc/guilib/GUIButtonControl.cpp +++ b/xbmc/guilib/GUIButtonControl.cpp @@ -22,7 +22,7 @@ #include "GUIWindowManager.h" #include "GUIDialog.h" #include "GUIFontManager.h" -#include "Key.h" +#include "input/Key.h" using namespace std; diff --git a/xbmc/guilib/GUICheckMarkControl.cpp b/xbmc/guilib/GUICheckMarkControl.cpp index f0ca27cce20f5..3c55e94e1fc36 100644 --- a/xbmc/guilib/GUICheckMarkControl.cpp +++ b/xbmc/guilib/GUICheckMarkControl.cpp @@ -20,7 +20,7 @@ #include "GUICheckMarkControl.h" #include "GUIFontManager.h" -#include "Key.h" +#include "input/Key.h" using namespace std; diff --git a/xbmc/guilib/GUIControl.cpp b/xbmc/guilib/GUIControl.cpp index edd7ee76b6d0e..c751416d48db3 100644 --- a/xbmc/guilib/GUIControl.cpp +++ b/xbmc/guilib/GUIControl.cpp @@ -27,7 +27,7 @@ #include "GUIControlProfiler.h" #include "input/MouseStat.h" #include "input/InputManager.h" -#include "Key.h" +#include "input/Key.h" using namespace std; diff --git a/xbmc/guilib/GUIControlFactory.cpp b/xbmc/guilib/GUIControlFactory.cpp index a4cb4f48ec1e2..9ced1289212b4 100644 --- a/xbmc/guilib/GUIControlFactory.cpp +++ b/xbmc/guilib/GUIControlFactory.cpp @@ -55,7 +55,7 @@ #include "GUIListLabel.h" #include "GUIListGroup.h" #include "GUIInfoManager.h" -#include "Key.h" +#include "input/Key.h" #include "addons/Skin.h" #include "utils/CharsetConverter.h" #include "utils/log.h" diff --git a/xbmc/guilib/GUIControlGroupList.cpp b/xbmc/guilib/GUIControlGroupList.cpp index 867f2bfedd872..5e9050bbe665b 100644 --- a/xbmc/guilib/GUIControlGroupList.cpp +++ b/xbmc/guilib/GUIControlGroupList.cpp @@ -19,7 +19,7 @@ */ #include "GUIControlGroupList.h" -#include "Key.h" +#include "input/Key.h" #include "GUIInfoManager.h" #include "GUIControlProfiler.h" #include "GUIFont.h" // for XBFONT_* definitions diff --git a/xbmc/guilib/GUIDialog.cpp b/xbmc/guilib/GUIDialog.cpp index 59b61d2f4eb2d..1a695e95310f6 100644 --- a/xbmc/guilib/GUIDialog.cpp +++ b/xbmc/guilib/GUIDialog.cpp @@ -26,7 +26,7 @@ #include "utils/TimeUtils.h" #include "Application.h" #include "ApplicationMessenger.h" -#include "Key.h" +#include "input/Key.h" CGUIDialog::CGUIDialog(int id, const std::string &xmlFile) : CGUIWindow(id, xmlFile) diff --git a/xbmc/guilib/GUIEditControl.cpp b/xbmc/guilib/GUIEditControl.cpp index eb1fcdbafd43b..e9b4877d57b48 100644 --- a/xbmc/guilib/GUIEditControl.cpp +++ b/xbmc/guilib/GUIEditControl.cpp @@ -24,7 +24,7 @@ #include "GUIKeyboardFactory.h" #include "dialogs/GUIDialogNumeric.h" #include "input/XBMC_vkeys.h" -#include "Key.h" +#include "input/Key.h" #include "LocalizeStrings.h" #include "XBDateTime.h" #include "windowing/WindowingFactory.h" diff --git a/xbmc/guilib/GUIFixedListContainer.cpp b/xbmc/guilib/GUIFixedListContainer.cpp index 658dc31bdcd28..560081fc5e8ac 100644 --- a/xbmc/guilib/GUIFixedListContainer.cpp +++ b/xbmc/guilib/GUIFixedListContainer.cpp @@ -20,7 +20,7 @@ #include "GUIFixedListContainer.h" #include "GUIListItem.h" -#include "Key.h" +#include "input/Key.h" CGUIFixedListContainer::CGUIFixedListContainer(int parentID, int controlID, float posX, float posY, float width, float height, ORIENTATION orientation, const CScroller& scroller, int preloadItems, int fixedPosition, int cursorRange) : CGUIBaseContainer(parentID, controlID, posX, posY, width, height, orientation, scroller, preloadItems) diff --git a/xbmc/guilib/GUIListContainer.cpp b/xbmc/guilib/GUIListContainer.cpp index c3516ddcbf506..06be586f02ab6 100644 --- a/xbmc/guilib/GUIListContainer.cpp +++ b/xbmc/guilib/GUIListContainer.cpp @@ -21,7 +21,7 @@ #include "system.h" #include "GUIListContainer.h" #include "GUIListItem.h" -#include "Key.h" +#include "input/Key.h" #include "utils/StringUtils.h" CGUIListContainer::CGUIListContainer(int parentID, int controlID, float posX, float posY, float width, float height, ORIENTATION orientation, const CScroller& scroller, int preloadItems) diff --git a/xbmc/guilib/GUIMoverControl.cpp b/xbmc/guilib/GUIMoverControl.cpp index 484e70b2a12ae..0ac8a94eb36b4 100644 --- a/xbmc/guilib/GUIMoverControl.cpp +++ b/xbmc/guilib/GUIMoverControl.cpp @@ -20,7 +20,7 @@ #include "GUIMoverControl.h" #include "GUIWindowManager.h" -#include "Key.h" +#include "input/Key.h" #include "utils/TimeUtils.h" // time to reset accelerated cursors (digital movement) diff --git a/xbmc/guilib/GUIMultiImage.cpp b/xbmc/guilib/GUIMultiImage.cpp index 614527fc56369..bdd39a722bbb7 100644 --- a/xbmc/guilib/GUIMultiImage.cpp +++ b/xbmc/guilib/GUIMultiImage.cpp @@ -25,7 +25,7 @@ #include "utils/JobManager.h" #include "FileItem.h" #include "settings/AdvancedSettings.h" -#include "Key.h" +#include "input/Key.h" #include "TextureCache.h" #include "WindowIDs.h" #include "utils/StringUtils.h" diff --git a/xbmc/guilib/GUIMultiSelectText.cpp b/xbmc/guilib/GUIMultiSelectText.cpp index 8be30afdeff17..edf8ce8bec273 100644 --- a/xbmc/guilib/GUIMultiSelectText.cpp +++ b/xbmc/guilib/GUIMultiSelectText.cpp @@ -20,7 +20,7 @@ #include "GUIMultiSelectText.h" #include "GUIWindowManager.h" -#include "Key.h" +#include "input/Key.h" #include "utils/log.h" #include "utils/StringUtils.h" diff --git a/xbmc/guilib/GUIPanelContainer.cpp b/xbmc/guilib/GUIPanelContainer.cpp index 042c8d492b7f1..628c50ca82626 100644 --- a/xbmc/guilib/GUIPanelContainer.cpp +++ b/xbmc/guilib/GUIPanelContainer.cpp @@ -21,7 +21,7 @@ #include "GUIPanelContainer.h" #include "GUIListItem.h" #include "GUIInfoManager.h" -#include "Key.h" +#include "input/Key.h" #include diff --git a/xbmc/guilib/GUIRadioButtonControl.cpp b/xbmc/guilib/GUIRadioButtonControl.cpp index 3323dc0107d8d..3b2ddfbcd528b 100644 --- a/xbmc/guilib/GUIRadioButtonControl.cpp +++ b/xbmc/guilib/GUIRadioButtonControl.cpp @@ -21,7 +21,7 @@ #include "GUIRadioButtonControl.h" #include "GUIInfoManager.h" #include "GUIFontManager.h" -#include "Key.h" +#include "input/Key.h" CGUIRadioButtonControl::CGUIRadioButtonControl(int parentID, int controlID, float posX, float posY, float width, float height, const CTextureInfo& textureFocus, const CTextureInfo& textureNoFocus, diff --git a/xbmc/guilib/GUIResizeControl.cpp b/xbmc/guilib/GUIResizeControl.cpp index 01e4b9663670d..9b3457f628496 100644 --- a/xbmc/guilib/GUIResizeControl.cpp +++ b/xbmc/guilib/GUIResizeControl.cpp @@ -20,7 +20,7 @@ #include "GUIResizeControl.h" #include "GUIWindowManager.h" -#include "Key.h" +#include "input/Key.h" #include "utils/TimeUtils.h" // time to reset accelerated cursors (digital movement) diff --git a/xbmc/guilib/GUIScrollBarControl.cpp b/xbmc/guilib/GUIScrollBarControl.cpp index dfd35c4c950d3..d426ba1487482 100644 --- a/xbmc/guilib/GUIScrollBarControl.cpp +++ b/xbmc/guilib/GUIScrollBarControl.cpp @@ -19,7 +19,7 @@ */ #include "GUIScrollBarControl.h" -#include "Key.h" +#include "input/Key.h" #include "utils/StringUtils.h" #define MIN_NIB_SIZE 4.0f diff --git a/xbmc/guilib/GUISelectButtonControl.cpp b/xbmc/guilib/GUISelectButtonControl.cpp index 1143dd6c0eeed..41802a5533180 100644 --- a/xbmc/guilib/GUISelectButtonControl.cpp +++ b/xbmc/guilib/GUISelectButtonControl.cpp @@ -21,7 +21,7 @@ #include "GUISelectButtonControl.h" #include "GUIWindowManager.h" #include "utils/TimeUtils.h" -#include "Key.h" +#include "input/Key.h" CGUISelectButtonControl::CGUISelectButtonControl(int parentID, int controlID, float posX, float posY, diff --git a/xbmc/guilib/GUISliderControl.cpp b/xbmc/guilib/GUISliderControl.cpp index d97df5650de0d..a076f131b040d 100644 --- a/xbmc/guilib/GUISliderControl.cpp +++ b/xbmc/guilib/GUISliderControl.cpp @@ -20,7 +20,7 @@ #include "GUISliderControl.h" #include "GUIInfoManager.h" -#include "Key.h" +#include "input/Key.h" #include "utils/MathUtils.h" #include "utils/StringUtils.h" #include "GUIWindowManager.h" diff --git a/xbmc/guilib/GUISpinControl.cpp b/xbmc/guilib/GUISpinControl.cpp index 91739ea8a37e5..57a9f6f135d4a 100644 --- a/xbmc/guilib/GUISpinControl.cpp +++ b/xbmc/guilib/GUISpinControl.cpp @@ -19,7 +19,7 @@ */ #include "GUISpinControl.h" -#include "Key.h" +#include "input/Key.h" #include "utils/StringUtils.h" #include diff --git a/xbmc/guilib/GUIToggleButtonControl.cpp b/xbmc/guilib/GUIToggleButtonControl.cpp index bf0fe93cb76ba..a401700fa9849 100644 --- a/xbmc/guilib/GUIToggleButtonControl.cpp +++ b/xbmc/guilib/GUIToggleButtonControl.cpp @@ -22,7 +22,7 @@ #include "GUIWindowManager.h" #include "GUIDialog.h" #include "GUIInfoManager.h" -#include "Key.h" +#include "input/Key.h" using namespace std; diff --git a/xbmc/guilib/GUIVideoControl.cpp b/xbmc/guilib/GUIVideoControl.cpp index 2b8c2cf92e670..b5be83627bc38 100644 --- a/xbmc/guilib/GUIVideoControl.cpp +++ b/xbmc/guilib/GUIVideoControl.cpp @@ -22,7 +22,7 @@ #include "GUIVideoControl.h" #include "GUIWindowManager.h" #include "Application.h" -#include "Key.h" +#include "input/Key.h" #include "WindowIDs.h" #include "cores/IPlayer.h" #ifdef HAS_VIDEO_PLAYBACK diff --git a/xbmc/guilib/GUIVisualisationControl.cpp b/xbmc/guilib/GUIVisualisationControl.cpp index bcac34456affc..36cf5f961f4d0 100644 --- a/xbmc/guilib/GUIVisualisationControl.cpp +++ b/xbmc/guilib/GUIVisualisationControl.cpp @@ -26,7 +26,7 @@ #include "addons/Visualisation.h" #include "utils/log.h" #include "guilib/IRenderingCallback.h" -#include "Key.h" +#include "input/Key.h" using namespace std; using namespace ADDON; diff --git a/xbmc/guilib/GUIWindow.cpp b/xbmc/guilib/GUIWindow.cpp index 6c0117ea22950..ae5e1abc0f37f 100644 --- a/xbmc/guilib/GUIWindow.cpp +++ b/xbmc/guilib/GUIWindow.cpp @@ -21,7 +21,7 @@ #include "system.h" #include "GUIWindow.h" #include "GUIWindowManager.h" -#include "Key.h" +#include "input/Key.h" #include "LocalizeStrings.h" #include "GUIControlFactory.h" #include "GUIControlGroup.h" diff --git a/xbmc/guilib/GUIWindowManager.cpp b/xbmc/guilib/GUIWindowManager.cpp index 4829d88e572a6..99a8934330524 100644 --- a/xbmc/guilib/GUIWindowManager.cpp +++ b/xbmc/guilib/GUIWindowManager.cpp @@ -33,7 +33,7 @@ #include "GUITexture.h" #include "windowing/WindowingFactory.h" #include "utils/Variant.h" -#include "Key.h" +#include "input/Key.h" #include "utils/StringUtils.h" #include "windows/GUIWindowHome.h" diff --git a/xbmc/guilib/GUIWrappingListContainer.cpp b/xbmc/guilib/GUIWrappingListContainer.cpp index 50ec9a245640c..8afa59e752376 100644 --- a/xbmc/guilib/GUIWrappingListContainer.cpp +++ b/xbmc/guilib/GUIWrappingListContainer.cpp @@ -20,7 +20,7 @@ #include "GUIWrappingListContainer.h" #include "FileItem.h" -#include "Key.h" +#include "input/Key.h" #include "utils/log.h" CGUIWrappingListContainer::CGUIWrappingListContainer(int parentID, int controlID, float posX, float posY, float width, float height, ORIENTATION orientation, const CScroller& scroller, int preloadItems, int fixedPosition) diff --git a/xbmc/guilib/Makefile.in b/xbmc/guilib/Makefile.in index 2b911b34108a2..89a766d38f33c 100644 --- a/xbmc/guilib/Makefile.in +++ b/xbmc/guilib/Makefile.in @@ -66,7 +66,6 @@ SRCS += GUIWrappingListContainer.cpp SRCS += imagefactory.cpp SRCS += IWindowManagerCallback.cpp SRCS += JpegIO.cpp -SRCS += Key.cpp SRCS += LocalizeStrings.cpp SRCS += Shader.cpp SRCS += StereoscopicsManager.cpp diff --git a/xbmc/guilib/StereoscopicsManager.cpp b/xbmc/guilib/StereoscopicsManager.cpp index 9ee19479551f6..aafde66bf03c9 100644 --- a/xbmc/guilib/StereoscopicsManager.cpp +++ b/xbmc/guilib/StereoscopicsManager.cpp @@ -34,7 +34,7 @@ #include "GUIInfoManager.h" #include "GUIUserMessages.h" #include "guilib/LocalizeStrings.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/GUIWindowManager.h" #include "settings/AdvancedSettings.h" #include "settings/lib/ISettingCallback.h" diff --git a/xbmc/input/ButtonTranslator.cpp b/xbmc/input/ButtonTranslator.cpp index c748ff86e001c..44f2374cfafec 100644 --- a/xbmc/input/ButtonTranslator.cpp +++ b/xbmc/input/ButtonTranslator.cpp @@ -23,7 +23,7 @@ #include "ButtonTranslator.h" #include "profiles/ProfilesManager.h" #include "utils/URIUtils.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/WindowIDs.h" #include "input/XBMC_keysym.h" #include "input/XBMC_keytable.h" diff --git a/xbmc/input/InertialScrollingHandler.cpp b/xbmc/input/InertialScrollingHandler.cpp index 2ee2dd82ee273..d1dcd592350fd 100644 --- a/xbmc/input/InertialScrollingHandler.cpp +++ b/xbmc/input/InertialScrollingHandler.cpp @@ -23,7 +23,7 @@ #include "InertialScrollingHandler.h" #include "Application.h" #include "utils/TimeUtils.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/GUIWindowManager.h" #include "windowing/WindowingFactory.h" diff --git a/xbmc/input/InputManager.cpp b/xbmc/input/InputManager.cpp index 645a83bc11dab..37266d3421f45 100644 --- a/xbmc/input/InputManager.cpp +++ b/xbmc/input/InputManager.cpp @@ -18,12 +18,11 @@ * */ -#include -#include #include #include "Application.h" #include "InputManager.h" +#include "input/Key.h" #include "ApplicationMessenger.h" #include "guilib/Geometry.h" #include "guilib/GUIAudioManager.h" @@ -89,7 +88,7 @@ void CInputManager::InitializeInputs() #endif #ifdef HAS_SDL_JOYSTICK - // Pass the mapping of axis to triggers to m_Joystick + // Pass the mapping of axis to triggers to m_Joystick m_Joystick.Initialize(); #endif diff --git a/xbmc/input/InputManager.h b/xbmc/input/InputManager.h index 93002ef4e0d99..4ae98eba18d9f 100644 --- a/xbmc/input/InputManager.h +++ b/xbmc/input/InputManager.h @@ -36,11 +36,12 @@ #endif #include "windowing/XBMC_events.h" -#include "guilib/Key.h" #include "input/KeyboardStat.h" #include "input/MouseStat.h" #include "settings/lib/ISettingCallback.h" +class CKey; + class CInputManager : public ISettingCallback { private: @@ -248,7 +249,7 @@ class CInputManager : public ISettingCallback CRemoteControl m_RemoteControl; #endif -#ifdef HAS_EVENT_SERVER +#if defined(HAS_EVENT_SERVER) std::map > m_lastAxisMap; #endif diff --git a/xbmc/guilib/Key.cpp b/xbmc/input/Key.cpp similarity index 99% rename from xbmc/guilib/Key.cpp rename to xbmc/input/Key.cpp index cb665e63085df..95a05c85a3ad3 100644 --- a/xbmc/guilib/Key.cpp +++ b/xbmc/input/Key.cpp @@ -19,7 +19,7 @@ */ #include "system.h" -#include "Key.h" +#include "input/Key.h" CKey::CKey(void) { diff --git a/xbmc/guilib/Key.h b/xbmc/input/Key.h similarity index 99% rename from xbmc/guilib/Key.h rename to xbmc/input/Key.h index cd723aacc58de..c4318527dda31 100644 --- a/xbmc/guilib/Key.h +++ b/xbmc/input/Key.h @@ -2,10 +2,6 @@ \file Key.h \brief */ - -#ifndef GUILIB_KEY -#define GUILIB_KEY - #pragma once /* @@ -561,5 +557,3 @@ class CKey }; #endif //undef SWIG -#endif - diff --git a/xbmc/input/KeyboardStat.h b/xbmc/input/KeyboardStat.h index 13b9a63a30877..1ef749658acfb 100644 --- a/xbmc/input/KeyboardStat.h +++ b/xbmc/input/KeyboardStat.h @@ -40,7 +40,7 @@ #include #include "windowing/XBMC_events.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "input/XBMC_keyboard.h" class CKeyboardStat diff --git a/xbmc/input/Makefile b/xbmc/input/Makefile index 0a9442f94c15d..5bf45894e21a9 100644 --- a/xbmc/input/Makefile +++ b/xbmc/input/Makefile @@ -7,6 +7,7 @@ SRCS=ButtonTranslator.cpp \ SDLJoystick.cpp \ XBMC_keytable.cpp \ InputManager.cpp \ + Key.cpp LIB=input.a diff --git a/xbmc/input/MouseStat.cpp b/xbmc/input/MouseStat.cpp index 8cb6b4c81e13e..9ea1a6e95c507 100644 --- a/xbmc/input/MouseStat.cpp +++ b/xbmc/input/MouseStat.cpp @@ -19,7 +19,7 @@ */ #include "MouseStat.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "settings/lib/Setting.h" #include "utils/TimeUtils.h" #include "windowing/WindowingFactory.h" diff --git a/xbmc/input/touch/generic/GenericTouchActionHandler.cpp b/xbmc/input/touch/generic/GenericTouchActionHandler.cpp index db57c987a05e1..fc8599c9dac2e 100644 --- a/xbmc/input/touch/generic/GenericTouchActionHandler.cpp +++ b/xbmc/input/touch/generic/GenericTouchActionHandler.cpp @@ -21,7 +21,7 @@ #include "GenericTouchActionHandler.h" #include "ApplicationMessenger.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "windowing/WinEvents.h" CGenericTouchActionHandler &CGenericTouchActionHandler::Get() diff --git a/xbmc/input/windows/WINJoystick.cpp b/xbmc/input/windows/WINJoystick.cpp index 8aa43ea1ba1ca..1eca28256158a 100644 --- a/xbmc/input/windows/WINJoystick.cpp +++ b/xbmc/input/windows/WINJoystick.cpp @@ -20,7 +20,6 @@ #include "WINJoystick.h" #include "input/ButtonTranslator.h" -#include "peripherals/devices/PeripheralImon.h" #include "settings/AdvancedSettings.h" #include "settings/lib/Setting.h" #include "utils/log.h" diff --git a/xbmc/interfaces/Builtins.cpp b/xbmc/interfaces/Builtins.cpp index 8d0a0c633eaac..82705d4898925 100644 --- a/xbmc/interfaces/Builtins.cpp +++ b/xbmc/interfaces/Builtins.cpp @@ -32,7 +32,7 @@ #include "addons/GUIDialogAddonSettings.h" #include "dialogs/GUIDialogFileBrowser.h" #include "guilib/GUIKeyboardFactory.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/StereoscopicsManager.h" #include "dialogs/GUIDialogKaiToast.h" #include "dialogs/GUIDialogNumeric.h" diff --git a/xbmc/interfaces/IActionListener.h b/xbmc/interfaces/IActionListener.h index e3b07b95fe7ff..84225ab2fff9f 100644 --- a/xbmc/interfaces/IActionListener.h +++ b/xbmc/interfaces/IActionListener.h @@ -20,7 +20,7 @@ * */ -#include "guilib/Key.h" +#include "input/Key.h" class IActionListener { diff --git a/xbmc/interfaces/json-rpc/GUIOperations.cpp b/xbmc/interfaces/json-rpc/GUIOperations.cpp index d213c8d4544df..ced9160fc6860 100644 --- a/xbmc/interfaces/json-rpc/GUIOperations.cpp +++ b/xbmc/interfaces/json-rpc/GUIOperations.cpp @@ -23,7 +23,7 @@ #include "ApplicationMessenger.h" #include "GUIInfoManager.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "interfaces/Builtins.h" #include "dialogs/GUIDialogKaiToast.h" #include "addons/AddonManager.h" diff --git a/xbmc/interfaces/json-rpc/InputOperations.h b/xbmc/interfaces/json-rpc/InputOperations.h index c8e63de26f77c..5ecd9dcbaac62 100644 --- a/xbmc/interfaces/json-rpc/InputOperations.h +++ b/xbmc/interfaces/json-rpc/InputOperations.h @@ -20,7 +20,7 @@ */ #include "JSONRPC.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "threads/CriticalSection.h" namespace JSONRPC diff --git a/xbmc/interfaces/json-rpc/PlayerOperations.cpp b/xbmc/interfaces/json-rpc/PlayerOperations.cpp index ac79fc76fcab9..181fd8014560b 100644 --- a/xbmc/interfaces/json-rpc/PlayerOperations.cpp +++ b/xbmc/interfaces/json-rpc/PlayerOperations.cpp @@ -24,7 +24,7 @@ #include "PlayListPlayer.h" #include "playlists/PlayList.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "GUIUserMessages.h" #include "pictures/GUIWindowSlideShow.h" #include "interfaces/Builtins.h" diff --git a/xbmc/interfaces/json-rpc/PlaylistOperations.cpp b/xbmc/interfaces/json-rpc/PlaylistOperations.cpp index 38e8b95a6eeb8..4b1d87e5c8e80 100644 --- a/xbmc/interfaces/json-rpc/PlaylistOperations.cpp +++ b/xbmc/interfaces/json-rpc/PlaylistOperations.cpp @@ -23,7 +23,7 @@ #include "PlayListPlayer.h" #include "Util.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "GUIUserMessages.h" #include "ApplicationMessenger.h" #include "pictures/GUIWindowSlideShow.h" diff --git a/xbmc/interfaces/legacy/Control.h b/xbmc/interfaces/legacy/Control.h index 5b2bfa2b0bf22..d02a018f29409 100644 --- a/xbmc/interfaces/legacy/Control.h +++ b/xbmc/interfaces/legacy/Control.h @@ -22,7 +22,7 @@ #include "guilib/GUIControl.h" #include "guilib/GUIFont.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "Alternative.h" #include "Tuple.h" diff --git a/xbmc/interfaces/swig/AddonModuleXbmcgui.i b/xbmc/interfaces/swig/AddonModuleXbmcgui.i index 144a9844bb0c5..c7dcc75437214 100644 --- a/xbmc/interfaces/swig/AddonModuleXbmcgui.i +++ b/xbmc/interfaces/swig/AddonModuleXbmcgui.i @@ -28,7 +28,7 @@ #include "interfaces/legacy/WindowDialog.h" #include "interfaces/legacy/Dialog.h" #include "interfaces/legacy/WindowXML.h" -#include "guilib/Key.h" +#include "input/Key.h" using namespace XBMCAddon; using namespace xbmcgui; @@ -116,4 +116,4 @@ using namespace xbmcgui; %include "interfaces/legacy/WindowXML.h" -%include "guilib/Key.h" +%include "input/Key.h" diff --git a/xbmc/music/dialogs/GUIDialogMusicInfo.cpp b/xbmc/music/dialogs/GUIDialogMusicInfo.cpp index 6480f5e44093e..c8fbc5a62951e 100644 --- a/xbmc/music/dialogs/GUIDialogMusicInfo.cpp +++ b/xbmc/music/dialogs/GUIDialogMusicInfo.cpp @@ -34,7 +34,7 @@ #include "settings/AdvancedSettings.h" #include "settings/MediaSourceSettings.h" #include "settings/Settings.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "utils/log.h" #include "utils/URIUtils.h" diff --git a/xbmc/music/dialogs/GUIDialogMusicOSD.cpp b/xbmc/music/dialogs/GUIDialogMusicOSD.cpp index 0bade7f62a5b5..88e85d8503ac2 100644 --- a/xbmc/music/dialogs/GUIDialogMusicOSD.cpp +++ b/xbmc/music/dialogs/GUIDialogMusicOSD.cpp @@ -20,7 +20,7 @@ #include "GUIDialogMusicOSD.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "input/InputManager.h" #include "GUIUserMessages.h" #include "settings/Settings.h" diff --git a/xbmc/music/dialogs/GUIDialogMusicOverlay.cpp b/xbmc/music/dialogs/GUIDialogMusicOverlay.cpp index 7511cd4038432..118c3ffbc6fe8 100644 --- a/xbmc/music/dialogs/GUIDialogMusicOverlay.cpp +++ b/xbmc/music/dialogs/GUIDialogMusicOverlay.cpp @@ -20,7 +20,7 @@ #include "GUIDialogMusicOverlay.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "input/MouseStat.h" #include "input/InputManager.h" diff --git a/xbmc/music/dialogs/GUIDialogSongInfo.cpp b/xbmc/music/dialogs/GUIDialogSongInfo.cpp index 906488ab51d1a..d2944546f24f3 100644 --- a/xbmc/music/dialogs/GUIDialogSongInfo.cpp +++ b/xbmc/music/dialogs/GUIDialogSongInfo.cpp @@ -28,7 +28,7 @@ #include "music/windows/GUIWindowMusicBase.h" #include "music/tags/MusicInfoTag.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "filesystem/File.h" #include "filesystem/CurlFile.h" #include "FileItem.h" diff --git a/xbmc/music/dialogs/GUIDialogVisualisationPresetList.cpp b/xbmc/music/dialogs/GUIDialogVisualisationPresetList.cpp index a4d098fecb94d..52fa71968ab19 100644 --- a/xbmc/music/dialogs/GUIDialogVisualisationPresetList.cpp +++ b/xbmc/music/dialogs/GUIDialogVisualisationPresetList.cpp @@ -23,7 +23,7 @@ #include "guilib/GUIWindowManager.h" #include "GUIUserMessages.h" #include "FileItem.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "utils/StringUtils.h" diff --git a/xbmc/music/karaoke/GUIDialogKaraokeSongSelector.cpp b/xbmc/music/karaoke/GUIDialogKaraokeSongSelector.cpp index 2c962ec0ed682..ade5bbc2ba3f2 100644 --- a/xbmc/music/karaoke/GUIDialogKaraokeSongSelector.cpp +++ b/xbmc/music/karaoke/GUIDialogKaraokeSongSelector.cpp @@ -21,7 +21,7 @@ #include "GUIDialogKaraokeSongSelector.h" #include "PlayListPlayer.h" #include "playlists/PlayList.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "utils/log.h" #include "utils/StringUtils.h" diff --git a/xbmc/music/karaoke/GUIWindowKaraokeLyrics.cpp b/xbmc/music/karaoke/GUIWindowKaraokeLyrics.cpp index 9ac4c0c768ab9..3628f573864f3 100644 --- a/xbmc/music/karaoke/GUIWindowKaraokeLyrics.cpp +++ b/xbmc/music/karaoke/GUIWindowKaraokeLyrics.cpp @@ -20,7 +20,7 @@ #include "Application.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "settings/AdvancedSettings.h" #include "GUIDialogKaraokeSongSelector.h" diff --git a/xbmc/music/windows/GUIWindowMusicBase.cpp b/xbmc/music/windows/GUIWindowMusicBase.cpp index 5766a60532f76..c95b6e444712a 100644 --- a/xbmc/music/windows/GUIWindowMusicBase.cpp +++ b/xbmc/music/windows/GUIWindowMusicBase.cpp @@ -46,7 +46,7 @@ #include "dialogs/GUIDialogSmartPlaylistEditor.h" #include "music/tags/MusicInfoTag.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "dialogs/GUIDialogOK.h" #include "dialogs/GUIDialogYesNo.h" #include "guilib/GUIKeyboardFactory.h" diff --git a/xbmc/music/windows/GUIWindowMusicNav.cpp b/xbmc/music/windows/GUIWindowMusicNav.cpp index afd12d3120774..228b814f412e6 100644 --- a/xbmc/music/windows/GUIWindowMusicNav.cpp +++ b/xbmc/music/windows/GUIWindowMusicNav.cpp @@ -38,7 +38,7 @@ #include "guilib/GUIWindowManager.h" #include "dialogs/GUIDialogOK.h" #include "guilib/GUIKeyboardFactory.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "dialogs/GUIDialogYesNo.h" #include "guilib/GUIEditControl.h" #include "GUIUserMessages.h" diff --git a/xbmc/music/windows/GUIWindowMusicPlaylist.cpp b/xbmc/music/windows/GUIWindowMusicPlaylist.cpp index 0e2db074da31d..d662e8468d981 100644 --- a/xbmc/music/windows/GUIWindowMusicPlaylist.cpp +++ b/xbmc/music/windows/GUIWindowMusicPlaylist.cpp @@ -29,7 +29,7 @@ #include "music/tags/MusicInfoTag.h" #include "guilib/GUIWindowManager.h" #include "guilib/GUIKeyboardFactory.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "GUIUserMessages.h" #include "ContextMenuManager.h" #include "filesystem/FavouritesDirectory.h" diff --git a/xbmc/music/windows/GUIWindowMusicPlaylistEditor.cpp b/xbmc/music/windows/GUIWindowMusicPlaylistEditor.cpp index 115135e62befc..4096413e23f29 100644 --- a/xbmc/music/windows/GUIWindowMusicPlaylistEditor.cpp +++ b/xbmc/music/windows/GUIWindowMusicPlaylistEditor.cpp @@ -35,7 +35,7 @@ #include "FileItem.h" #include "settings/Settings.h" #include "GUIUserMessages.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "ContextMenuManager.h" diff --git a/xbmc/music/windows/GUIWindowMusicSongs.cpp b/xbmc/music/windows/GUIWindowMusicSongs.cpp index 4fca036cac08b..e31f538395c3e 100644 --- a/xbmc/music/windows/GUIWindowMusicSongs.cpp +++ b/xbmc/music/windows/GUIWindowMusicSongs.cpp @@ -33,7 +33,7 @@ #include "storage/MediaManager.h" #include "settings/MediaSourceSettings.h" #include "settings/Settings.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "utils/log.h" #include "utils/URIUtils.h" diff --git a/xbmc/music/windows/GUIWindowVisualisation.cpp b/xbmc/music/windows/GUIWindowVisualisation.cpp index 98b034fc2e675..172ba15207c2b 100644 --- a/xbmc/music/windows/GUIWindowVisualisation.cpp +++ b/xbmc/music/windows/GUIWindowVisualisation.cpp @@ -25,7 +25,7 @@ #include "GUIInfoManager.h" #include "music/dialogs/GUIDialogVisualisationPresetList.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "settings/AdvancedSettings.h" #include "settings/Settings.h" diff --git a/xbmc/network/AirPlayServer.cpp b/xbmc/network/AirPlayServer.cpp index 48db9dd7ecf4f..0afc29feb83c9 100644 --- a/xbmc/network/AirPlayServer.cpp +++ b/xbmc/network/AirPlayServer.cpp @@ -40,7 +40,7 @@ #include "utils/md5.h" #include "utils/Variant.h" #include "settings/Settings.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "URL.h" #include "cores/IPlayer.h" #include "interfaces/AnnouncementManager.h" diff --git a/xbmc/network/EventClient.cpp b/xbmc/network/EventClient.cpp index d81a56fce19d6..fb28edf61d4c2 100644 --- a/xbmc/network/EventClient.cpp +++ b/xbmc/network/EventClient.cpp @@ -34,7 +34,7 @@ #include "utils/TimeUtils.h" #include "dialogs/GUIDialogKaiToast.h" #include "guilib/GraphicContext.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "utils/StringUtils.h" diff --git a/xbmc/network/EventServer.cpp b/xbmc/network/EventServer.cpp index 66646fe54645f..8bb840427833d 100644 --- a/xbmc/network/EventServer.cpp +++ b/xbmc/network/EventServer.cpp @@ -34,7 +34,7 @@ #include "threads/SingleLock.h" #include "Zeroconf.h" #include "guilib/GUIAudioManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include #include #include diff --git a/xbmc/network/GUIDialogAccessPoints.cpp b/xbmc/network/GUIDialogAccessPoints.cpp index 9edc8b8c6b066..01cd2c575997f 100644 --- a/xbmc/network/GUIDialogAccessPoints.cpp +++ b/xbmc/network/GUIDialogAccessPoints.cpp @@ -25,7 +25,7 @@ #endif #include "Application.h" #include "FileItem.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #define CONTROL_ACCESS_POINTS 3 diff --git a/xbmc/network/upnp/UPnP.cpp b/xbmc/network/upnp/UPnP.cpp index 52580577a100b..05ba0111d5e0a 100644 --- a/xbmc/network/upnp/UPnP.cpp +++ b/xbmc/network/upnp/UPnP.cpp @@ -46,7 +46,7 @@ #include "GUIInfoManager.h" #include "utils/TimeUtils.h" #include "video/VideoInfoTag.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "Util.h" using namespace std; diff --git a/xbmc/network/upnp/UPnPPlayer.cpp b/xbmc/network/upnp/UPnPPlayer.cpp index 992a258ed07f7..b3e0df102b597 100644 --- a/xbmc/network/upnp/UPnPPlayer.cpp +++ b/xbmc/network/upnp/UPnPPlayer.cpp @@ -37,7 +37,7 @@ #include "Application.h" #include "dialogs/GUIDialogBusy.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "dialogs/GUIDialogYesNo.h" diff --git a/xbmc/network/upnp/UPnPRenderer.cpp b/xbmc/network/upnp/UPnPRenderer.cpp index 2c84a46d4e969..7a0787314b840 100644 --- a/xbmc/network/upnp/UPnPRenderer.cpp +++ b/xbmc/network/upnp/UPnPRenderer.cpp @@ -29,7 +29,7 @@ #include "filesystem/SpecialProtocol.h" #include "GUIInfoManager.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "pictures/GUIWindowSlideShow.h" #include "pictures/PictureInfoTag.h" #include "interfaces/AnnouncementManager.h" diff --git a/xbmc/osx/OSXTextInputResponder.mm b/xbmc/osx/OSXTextInputResponder.mm index aec7634537215..d0884dbb6ca52 100644 --- a/xbmc/osx/OSXTextInputResponder.mm +++ b/xbmc/osx/OSXTextInputResponder.mm @@ -28,7 +28,7 @@ #include "GUIUserMessages.h" #include "utils/log.h" #include "ApplicationMessenger.h" -#include "guilib/Key.h" +#include "input/Key.h" #undef BOOL void SendKeyboardText(const char *text) diff --git a/xbmc/osx/atv2/KodiController.mm b/xbmc/osx/atv2/KodiController.mm index 1d26a606d77ec..e5f223377dac3 100644 --- a/xbmc/osx/atv2/KodiController.mm +++ b/xbmc/osx/atv2/KodiController.mm @@ -57,7 +57,7 @@ #include "osx/DarwinUtils.h" #include "threads/Event.h" #include "Application.h" -#include "guilib/Key.h" +#include "input/Key.h" #undef BOOL #import diff --git a/xbmc/osx/ios/XBMCController.mm b/xbmc/osx/ios/XBMCController.mm index 8c4e1d565c2ec..063111bad3445 100644 --- a/xbmc/osx/ios/XBMCController.mm +++ b/xbmc/osx/ios/XBMCController.mm @@ -36,7 +36,7 @@ #include "interfaces/AnnouncementManager.h" #include "input/touch/generic/GenericTouchActionHandler.h" #include "guilib/GUIControl.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "windowing/WindowingFactory.h" #include "video/VideoReferenceClock.h" #include "utils/log.h" diff --git a/xbmc/peripherals/Peripherals.cpp b/xbmc/peripherals/Peripherals.cpp index cf5e7c1d60e5b..f659c21a385f3 100644 --- a/xbmc/peripherals/Peripherals.cpp +++ b/xbmc/peripherals/Peripherals.cpp @@ -46,7 +46,7 @@ #include "GUIUserMessages.h" #include "utils/StringUtils.h" #include "Util.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "settings/lib/Setting.h" using namespace PERIPHERALS; diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp index d54e1a3027e38..819177a7258f3 100644 --- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp @@ -28,7 +28,7 @@ #include "threads/SingleLock.h" #include "dialogs/GUIDialogKaiToast.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "peripherals/Peripherals.h" #include "peripherals/bus/PeripheralBus.h" diff --git a/xbmc/peripherals/devices/PeripheralNyxboard.cpp b/xbmc/peripherals/devices/PeripheralNyxboard.cpp index 777111b8b6b78..f5b4b6f478933 100644 --- a/xbmc/peripherals/devices/PeripheralNyxboard.cpp +++ b/xbmc/peripherals/devices/PeripheralNyxboard.cpp @@ -20,7 +20,7 @@ #include "PeripheralNyxboard.h" #include "PeripheralHID.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "utils/log.h" #include "Application.h" diff --git a/xbmc/peripherals/dialogs/GUIDialogPeripheralManager.cpp b/xbmc/peripherals/dialogs/GUIDialogPeripheralManager.cpp index 16b4aed84a0b4..ce2587ea6e54b 100644 --- a/xbmc/peripherals/dialogs/GUIDialogPeripheralManager.cpp +++ b/xbmc/peripherals/dialogs/GUIDialogPeripheralManager.cpp @@ -23,7 +23,7 @@ #include "guilib/GUIWindowManager.h" #include "peripherals/Peripherals.h" #include "FileItem.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "utils/log.h" #define BUTTON_CLOSE 10 diff --git a/xbmc/pictures/GUIDialogPictureInfo.cpp b/xbmc/pictures/GUIDialogPictureInfo.cpp index cf86c45c92c26..0a8f6135e0853 100644 --- a/xbmc/pictures/GUIDialogPictureInfo.cpp +++ b/xbmc/pictures/GUIDialogPictureInfo.cpp @@ -22,7 +22,7 @@ #include "GUIInfoManager.h" #include "guilib/GUIWindowManager.h" #include "FileItem.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "PictureInfoTag.h" diff --git a/xbmc/pictures/GUIWindowPictures.cpp b/xbmc/pictures/GUIWindowPictures.cpp index 5037206e5cf22..4c4162b226b31 100644 --- a/xbmc/pictures/GUIWindowPictures.cpp +++ b/xbmc/pictures/GUIWindowPictures.cpp @@ -32,7 +32,7 @@ #include "playlists/PlayListFactory.h" #include "PictureInfoLoader.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "dialogs/GUIDialogOK.h" #include "dialogs/GUIDialogYesNo.h" #include "playlists/PlayList.h" diff --git a/xbmc/pictures/GUIWindowSlideShow.cpp b/xbmc/pictures/GUIWindowSlideShow.cpp index 4bffed30ebf51..1d34bb32db2a0 100644 --- a/xbmc/pictures/GUIWindowSlideShow.cpp +++ b/xbmc/pictures/GUIWindowSlideShow.cpp @@ -27,7 +27,7 @@ #include "URL.h" #include "guilib/TextureManager.h" #include "guilib/GUILabelControl.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "GUIInfoManager.h" #include "filesystem/Directory.h" #include "GUIDialogPictureInfo.h" diff --git a/xbmc/profiles/windows/GUIWindowSettingsProfile.cpp b/xbmc/profiles/windows/GUIWindowSettingsProfile.cpp index 717d74efea57b..8462a28f31b14 100644 --- a/xbmc/profiles/windows/GUIWindowSettingsProfile.cpp +++ b/xbmc/profiles/windows/GUIWindowSettingsProfile.cpp @@ -34,7 +34,7 @@ #include "guilib/GUIWindowManager.h" #include "filesystem/Directory.h" #include "FileItem.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" using namespace XFILE; diff --git a/xbmc/programs/GUIWindowPrograms.cpp b/xbmc/programs/GUIWindowPrograms.cpp index 76ba1aa4d2d02..abd995228311d 100644 --- a/xbmc/programs/GUIWindowPrograms.cpp +++ b/xbmc/programs/GUIWindowPrograms.cpp @@ -26,7 +26,7 @@ #include "guilib/GUIWindowManager.h" #include "FileItem.h" #include "settings/MediaSourceSettings.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "utils/log.h" #include "utils/StringUtils.h" diff --git a/xbmc/pvr/PVRActionListener.cpp b/xbmc/pvr/PVRActionListener.cpp index 313cd23b614b6..d1e9f106278b5 100644 --- a/xbmc/pvr/PVRActionListener.cpp +++ b/xbmc/pvr/PVRActionListener.cpp @@ -22,7 +22,7 @@ #include "Application.h" #include "ApplicationMessenger.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/GUIWindow.h" #include "guilib/LocalizeStrings.h" #include "guilib/GUIWindowManager.h" diff --git a/xbmc/pvr/PVRManager.cpp b/xbmc/pvr/PVRManager.cpp index 1cbdf3bd80096..77828155926c7 100644 --- a/xbmc/pvr/PVRManager.cpp +++ b/xbmc/pvr/PVRManager.cpp @@ -59,7 +59,7 @@ #include "timers/PVRTimers.h" #include "interfaces/AnnouncementManager.h" #include "addons/AddonInstaller.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "dialogs/GUIDialogPVRChannelManager.h" #include "dialogs/GUIDialogPVRGroupManager.h" diff --git a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp index af91ee470959d..b3af873be9dc8 100644 --- a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp +++ b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp @@ -30,7 +30,7 @@ #include "dialogs/GUIDialogYesNo.h" #include "guilib/GUIEditControl.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "profiles/ProfilesManager.h" #include "pvr/PVRManager.h" diff --git a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp index b80cc17935055..499f92628e5e5 100644 --- a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp +++ b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp @@ -23,7 +23,7 @@ #include "ApplicationMessenger.h" #include "FileItem.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "dialogs/GUIDialogKaiToast.h" #include "dialogs/GUIDialogOK.h" diff --git a/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp b/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp index 4d7a69521738f..26167df592e5b 100644 --- a/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp +++ b/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp @@ -24,7 +24,7 @@ #include "dialogs/GUIDialogOK.h" #include "dialogs/GUIDialogYesNo.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "guilib/GUIRadioButtonControl.h" #include "utils/StringUtils.h" diff --git a/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp index 8003da75646ef..1670190d52e2f 100644 --- a/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp +++ b/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp @@ -22,7 +22,7 @@ #include "FileItem.h" #include "GUIDialogPVRGuideInfo.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "view/ViewState.h" #include "epg/Epg.h" diff --git a/xbmc/pvr/windows/GUIWindowPVRBase.cpp b/xbmc/pvr/windows/GUIWindowPVRBase.cpp index a2f1ffb31421e..5923a005b16de 100644 --- a/xbmc/pvr/windows/GUIWindowPVRBase.cpp +++ b/xbmc/pvr/windows/GUIWindowPVRBase.cpp @@ -28,7 +28,7 @@ #include "dialogs/GUIDialogYesNo.h" #include "dialogs/GUIDialogSelect.h" #include "filesystem/StackDirectory.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/GUIMessage.h" #include "guilib/GUIWindowManager.h" #include "pvr/PVRManager.h" diff --git a/xbmc/pvr/windows/GUIWindowPVRChannels.cpp b/xbmc/pvr/windows/GUIWindowPVRChannels.cpp index 071cc29d6027a..7265fc3df3fe5 100644 --- a/xbmc/pvr/windows/GUIWindowPVRChannels.cpp +++ b/xbmc/pvr/windows/GUIWindowPVRChannels.cpp @@ -29,7 +29,7 @@ #include "guilib/GUIKeyboardFactory.h" #include "guilib/GUIRadioButtonControl.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "GUIInfoManager.h" #include "pvr/PVRManager.h" #include "pvr/channels/PVRChannelGroupsContainer.h" diff --git a/xbmc/pvr/windows/GUIWindowPVRGuide.cpp b/xbmc/pvr/windows/GUIWindowPVRGuide.cpp index 8bd5f78c32044..de23a1b3f3319 100644 --- a/xbmc/pvr/windows/GUIWindowPVRGuide.cpp +++ b/xbmc/pvr/windows/GUIWindowPVRGuide.cpp @@ -25,7 +25,7 @@ #include "GUIUserMessages.h" #include "dialogs/GUIDialogOK.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "pvr/PVRManager.h" #include "pvr/channels/PVRChannelGroupsContainer.h" #include "epg/EpgContainer.h" diff --git a/xbmc/pvr/windows/GUIWindowPVRRecordings.cpp b/xbmc/pvr/windows/GUIWindowPVRRecordings.cpp index b6ca8c05e2d4f..5fbb581cccd7a 100644 --- a/xbmc/pvr/windows/GUIWindowPVRRecordings.cpp +++ b/xbmc/pvr/windows/GUIWindowPVRRecordings.cpp @@ -25,7 +25,7 @@ #include "dialogs/GUIDialogYesNo.h" #include "guilib/GUIRadioButtonControl.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "GUIInfoManager.h" #include "pvr/PVRManager.h" diff --git a/xbmc/pvr/windows/GUIWindowPVRSearch.cpp b/xbmc/pvr/windows/GUIWindowPVRSearch.cpp index fc0fe3522b9e4..eb03dcabecb06 100644 --- a/xbmc/pvr/windows/GUIWindowPVRSearch.cpp +++ b/xbmc/pvr/windows/GUIWindowPVRSearch.cpp @@ -24,7 +24,7 @@ #include "dialogs/GUIDialogOK.h" #include "dialogs/GUIDialogProgress.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "pvr/PVRManager.h" #include "pvr/channels/PVRChannelGroupsContainer.h" #include "pvr/dialogs/GUIDialogPVRGuideSearch.h" diff --git a/xbmc/pvr/windows/GUIWindowPVRTimers.cpp b/xbmc/pvr/windows/GUIWindowPVRTimers.cpp index bbad1bc4f04e5..9d15479981490 100644 --- a/xbmc/pvr/windows/GUIWindowPVRTimers.cpp +++ b/xbmc/pvr/windows/GUIWindowPVRTimers.cpp @@ -25,7 +25,7 @@ #include "dialogs/GUIDialogOK.h" #include "dialogs/GUIDialogYesNo.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "pvr/PVRManager.h" #include "pvr/dialogs/GUIDialogPVRTimerSettings.h" #include "pvr/timers/PVRTimers.h" diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp index 7dbf32f3767eb..5388ea3b47436 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp @@ -37,12 +37,6 @@ #include "guilib/LocalizeStrings.h" #include "guilib/StereoscopicsManager.h" #include "input/KeyboardLayout.h" -#include "input/MouseStat.h" -#if defined(TARGET_WINDOWS) -#include "input/windows/WINJoystick.h" -#elif defined(HAS_SDL_JOYSTICK) -#include "input/SDLJoystick.h" -#endif // defined(HAS_SDL_JOYSTICK) #if defined(TARGET_POSIX) #include "linux/LinuxTimezone.h" #endif // defined(TARGET_POSIX) diff --git a/xbmc/settings/dialogs/GUIDialogContentSettings.cpp b/xbmc/settings/dialogs/GUIDialogContentSettings.cpp index d6d22f8140a79..443fb4e5b93f1 100644 --- a/xbmc/settings/dialogs/GUIDialogContentSettings.cpp +++ b/xbmc/settings/dialogs/GUIDialogContentSettings.cpp @@ -27,7 +27,7 @@ #include "filesystem/AddonsDirectory.h" #include "dialogs/GUIDialogKaiToast.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "interfaces/Builtins.h" #include "settings/lib/Setting.h" #include "settings/lib/SettingDependency.h" diff --git a/xbmc/settings/dialogs/GUIDialogSettingsBase.cpp b/xbmc/settings/dialogs/GUIDialogSettingsBase.cpp index 668df0c9c6b0c..588ad4db33a2e 100644 --- a/xbmc/settings/dialogs/GUIDialogSettingsBase.cpp +++ b/xbmc/settings/dialogs/GUIDialogSettingsBase.cpp @@ -31,7 +31,7 @@ #include "guilib/GUISpinControlEx.h" #include "guilib/GUIToggleButtonControl.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "settings/SettingControl.h" #include "settings/lib/SettingSection.h" diff --git a/xbmc/settings/windows/GUIWindowSettingsCategory.cpp b/xbmc/settings/windows/GUIWindowSettingsCategory.cpp index 5f256a25feb6e..6a59378271aed 100644 --- a/xbmc/settings/windows/GUIWindowSettingsCategory.cpp +++ b/xbmc/settings/windows/GUIWindowSettingsCategory.cpp @@ -21,7 +21,7 @@ #include "GUIWindowSettingsCategory.h" #include "GUIPassword.h" #include "GUIUserMessages.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "settings/DisplaySettings.h" #include "settings/Settings.h" #include "settings/lib/SettingSection.h" diff --git a/xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp b/xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp index 439fa280916d8..d8e22cbb26328 100644 --- a/xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp +++ b/xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp @@ -30,7 +30,7 @@ #include "settings/Settings.h" #include "guilib/GUIWindowManager.h" #include "dialogs/GUIDialogYesNo.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "utils/log.h" #include "utils/StringUtils.h" diff --git a/xbmc/settings/windows/GUIWindowTestPattern.cpp b/xbmc/settings/windows/GUIWindowTestPattern.cpp index 64f36fa46260a..bb9c2968d00c0 100644 --- a/xbmc/settings/windows/GUIWindowTestPattern.cpp +++ b/xbmc/settings/windows/GUIWindowTestPattern.cpp @@ -21,7 +21,7 @@ #include "GUIWindowTestPattern.h" #include "settings/DisplaySettings.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/WindowIDs.h" #include "windowing/WindowingFactory.h" diff --git a/xbmc/storage/AutorunMediaJob.cpp b/xbmc/storage/AutorunMediaJob.cpp index 65bb9b869add6..2b8aeef837c7f 100644 --- a/xbmc/storage/AutorunMediaJob.cpp +++ b/xbmc/storage/AutorunMediaJob.cpp @@ -22,7 +22,7 @@ #include "interfaces/Builtins.h" #include "guilib/GUIWindowManager.h" #include "dialogs/GUIDialogSelect.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "utils/StringUtils.h" CAutorunMediaJob::CAutorunMediaJob(const std::string &label, const std::string &path): diff --git a/xbmc/utils/SeekHandler.h b/xbmc/utils/SeekHandler.h index bae15060374da..e9809651d36da 100644 --- a/xbmc/utils/SeekHandler.h +++ b/xbmc/utils/SeekHandler.h @@ -20,7 +20,7 @@ */ #include -#include "guilib/Key.h" +#include "input/Key.h" #include "interfaces/IActionListener.h" #include "settings/Settings.h" #include "settings/lib/ISettingCallback.h" diff --git a/xbmc/video/PlayerController.cpp b/xbmc/video/PlayerController.cpp index 3f5fc25bdf8b0..31cf7f4cd59b8 100644 --- a/xbmc/video/PlayerController.cpp +++ b/xbmc/video/PlayerController.cpp @@ -25,7 +25,7 @@ #include "settings/MediaSettings.h" #include "settings/Settings.h" #include "cores/IPlayer.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "guilib/GUISliderControl.h" #include "dialogs/GUIDialogKaiToast.h" diff --git a/xbmc/video/PlayerController.h b/xbmc/video/PlayerController.h index de9133f4d0d72..0e4fb64939820 100644 --- a/xbmc/video/PlayerController.h +++ b/xbmc/video/PlayerController.h @@ -21,7 +21,7 @@ */ #include "guilib/ISliderCallback.h" -#include "guilib/Key.h" +#include "input/Key.h" /*! \brief Player controller class to handle user actions. diff --git a/xbmc/video/Teletext.h b/xbmc/video/Teletext.h index 8c26243f8b53b..b7d437aa221a9 100644 --- a/xbmc/video/Teletext.h +++ b/xbmc/video/Teletext.h @@ -21,7 +21,7 @@ */ #include "TeletextDefines.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/GUITexture.h" // stuff for freetype diff --git a/xbmc/video/dialogs/GUIDialogFileStacking.cpp b/xbmc/video/dialogs/GUIDialogFileStacking.cpp index 0207de581222c..b139aabd97785 100644 --- a/xbmc/video/dialogs/GUIDialogFileStacking.cpp +++ b/xbmc/video/dialogs/GUIDialogFileStacking.cpp @@ -19,7 +19,7 @@ */ #include "GUIDialogFileStacking.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "FileItem.h" #include "utils/StringUtils.h" diff --git a/xbmc/video/dialogs/GUIDialogFullScreenInfo.cpp b/xbmc/video/dialogs/GUIDialogFullScreenInfo.cpp index aec13c1112e11..15e0ea0fe6ff6 100644 --- a/xbmc/video/dialogs/GUIDialogFullScreenInfo.cpp +++ b/xbmc/video/dialogs/GUIDialogFullScreenInfo.cpp @@ -19,7 +19,7 @@ */ #include "GUIDialogFullScreenInfo.h" -#include "guilib/Key.h" +#include "input/Key.h" CGUIDialogFullScreenInfo::CGUIDialogFullScreenInfo(void) : CGUIDialog(WINDOW_DIALOG_FULLSCREEN_INFO, "DialogFullScreenInfo.xml") diff --git a/xbmc/video/dialogs/GUIDialogSubtitles.cpp b/xbmc/video/dialogs/GUIDialogSubtitles.cpp index 688a7674ec465..01d050331e05c 100644 --- a/xbmc/video/dialogs/GUIDialogSubtitles.cpp +++ b/xbmc/video/dialogs/GUIDialogSubtitles.cpp @@ -31,7 +31,7 @@ #include "filesystem/SpecialProtocol.h" #include "filesystem/StackDirectory.h" #include "guilib/GUIKeyboardFactory.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "settings/MediaSettings.h" #include "settings/Settings.h" #include "settings/VideoSettings.h" diff --git a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp index 00139c834b60a..b1814b0f6b124 100644 --- a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp +++ b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp @@ -39,7 +39,7 @@ #include "guilib/Texture.h" #include "guilib/GUIWindowManager.h" #include "utils/Crc32.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "utils/StringUtils.h" #include "utils/URIUtils.h" diff --git a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp index d83844972ed5c..b53d0e3a6d8af 100644 --- a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp +++ b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp @@ -44,7 +44,7 @@ #include "settings/AdvancedSettings.h" #include "settings/MediaSourceSettings.h" #include "settings/Settings.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "ContextMenuManager.h" #include "GUIUserMessages.h" diff --git a/xbmc/video/dialogs/GUIDialogVideoOSD.cpp b/xbmc/video/dialogs/GUIDialogVideoOSD.cpp index 73a1004ed1d36..22272ece1b356 100644 --- a/xbmc/video/dialogs/GUIDialogVideoOSD.cpp +++ b/xbmc/video/dialogs/GUIDialogVideoOSD.cpp @@ -23,7 +23,7 @@ #include "FileItem.h" #include "GUIUserMessages.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "input/InputManager.h" #include "cores/IPlayer.h" diff --git a/xbmc/video/windows/GUIWindowFullScreen.cpp b/xbmc/video/windows/GUIWindowFullScreen.cpp index 548b93f9d005d..c861d66ff203c 100644 --- a/xbmc/video/windows/GUIWindowFullScreen.cpp +++ b/xbmc/video/windows/GUIWindowFullScreen.cpp @@ -35,7 +35,7 @@ #include "guilib/GUIFontManager.h" #include "guilib/GUITextLayout.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "video/dialogs/GUIDialogFullScreenInfo.h" #include "dialogs/GUIDialogNumeric.h" #include "settings/DisplaySettings.h" diff --git a/xbmc/video/windows/GUIWindowVideoBase.cpp b/xbmc/video/windows/GUIWindowVideoBase.cpp index 62ea99550da24..9bdd4ccd18891 100644 --- a/xbmc/video/windows/GUIWindowVideoBase.cpp +++ b/xbmc/video/windows/GUIWindowVideoBase.cpp @@ -57,7 +57,7 @@ #include "settings/AdvancedSettings.h" #include "settings/MediaSettings.h" #include "settings/dialogs/GUIDialogContentSettings.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "utils/StringUtils.h" #include "utils/log.h" diff --git a/xbmc/video/windows/GUIWindowVideoNav.cpp b/xbmc/video/windows/GUIWindowVideoNav.cpp index 98dc51043a742..84f39e62fdbe8 100644 --- a/xbmc/video/windows/GUIWindowVideoNav.cpp +++ b/xbmc/video/windows/GUIWindowVideoNav.cpp @@ -47,7 +47,7 @@ #include "settings/MediaSettings.h" #include "settings/MediaSourceSettings.h" #include "settings/Settings.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "storage/MediaManager.h" #include "utils/LegacyPathTranslation.h" diff --git a/xbmc/video/windows/GUIWindowVideoPlaylist.cpp b/xbmc/video/windows/GUIWindowVideoPlaylist.cpp index 443a3de774136..477231f7bff72 100644 --- a/xbmc/video/windows/GUIWindowVideoPlaylist.cpp +++ b/xbmc/video/windows/GUIWindowVideoPlaylist.cpp @@ -32,7 +32,7 @@ #include "filesystem/FavouritesDirectory.h" #include "settings/Settings.h" #include "settings/MediaSettings.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "utils/log.h" #include "utils/URIUtils.h" diff --git a/xbmc/view/GUIViewState.cpp b/xbmc/view/GUIViewState.cpp index edc2f9205ca81..e2988a1f9f574 100644 --- a/xbmc/view/GUIViewState.cpp +++ b/xbmc/view/GUIViewState.cpp @@ -41,7 +41,7 @@ #include "settings/MediaSourceSettings.h" #include "settings/Settings.h" #include "FileItem.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "filesystem/AddonsDirectory.h" #include "guilib/TextureManager.h" diff --git a/xbmc/windowing/WinEventsSDL.cpp b/xbmc/windowing/WinEventsSDL.cpp index 133cf30793e26..29f1351b1d648 100644 --- a/xbmc/windowing/WinEventsSDL.cpp +++ b/xbmc/windowing/WinEventsSDL.cpp @@ -28,7 +28,7 @@ #include "GUIUserMessages.h" #include "settings/DisplaySettings.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #ifdef HAS_SDL_JOYSTICK #include "input/SDLJoystick.h" #endif diff --git a/xbmc/windows/GUIMediaWindow.cpp b/xbmc/windows/GUIMediaWindow.cpp index 0ba87b005656b..9d7d5db7bc6e1 100644 --- a/xbmc/windows/GUIMediaWindow.cpp +++ b/xbmc/windows/GUIMediaWindow.cpp @@ -53,7 +53,7 @@ #include "video/VideoLibraryQueue.h" #include "utils/StringUtils.h" #include "utils/URIUtils.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "utils/TimeUtils.h" #include "filesystem/File.h" diff --git a/xbmc/windows/GUIWindowFileManager.cpp b/xbmc/windows/GUIWindowFileManager.cpp index 248e4023888be..97476b1a0a921 100644 --- a/xbmc/windows/GUIWindowFileManager.cpp +++ b/xbmc/windows/GUIWindowFileManager.cpp @@ -35,7 +35,7 @@ #include "playlists/PlayListFactory.h" #include "network/Network.h" #include "guilib/GUIWindowManager.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "dialogs/GUIDialogOK.h" #include "dialogs/GUIDialogYesNo.h" #include "guilib/GUIKeyboardFactory.h" diff --git a/xbmc/windows/GUIWindowHome.cpp b/xbmc/windows/GUIWindowHome.cpp index a82446cbb948c..9020f06b675d3 100644 --- a/xbmc/windows/GUIWindowHome.cpp +++ b/xbmc/windows/GUIWindowHome.cpp @@ -19,7 +19,7 @@ */ #include "GUIWindowHome.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/WindowIDs.h" #include "utils/JobManager.h" #include "utils/RecentlyAddedJob.h" diff --git a/xbmc/windows/GUIWindowLoginScreen.cpp b/xbmc/windows/GUIWindowLoginScreen.cpp index b3108ac8ff8fe..e56e0dddd7f09 100644 --- a/xbmc/windows/GUIWindowLoginScreen.cpp +++ b/xbmc/windows/GUIWindowLoginScreen.cpp @@ -43,7 +43,7 @@ #include "dialogs/GUIDialogOK.h" #include "settings/Settings.h" #include "FileItem.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/LocalizeStrings.h" #include "addons/AddonManager.h" #include "view/ViewState.h" diff --git a/xbmc/windows/GUIWindowStartup.cpp b/xbmc/windows/GUIWindowStartup.cpp index 5263f19742815..7d9380ee2e835 100644 --- a/xbmc/windows/GUIWindowStartup.cpp +++ b/xbmc/windows/GUIWindowStartup.cpp @@ -19,7 +19,7 @@ */ #include "GUIWindowStartup.h" -#include "guilib/Key.h" +#include "input/Key.h" #include "guilib/WindowIDs.h" CGUIWindowStartup::CGUIWindowStartup(void)