Permalink
Browse files

cosmetic: m_gWindowManager -> g_windowManager for consistency.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@23493 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
  • Loading branch information...
jmarshallnz
jmarshallnz committed Oct 7, 2009
1 parent 363c74f commit 2647224a35cfd9452659e3853ab66963b866110b
Showing with 929 additions and 943 deletions.
  1. +1 −1 guilib/GUIBaseContainer.cpp
  2. +3 −3 guilib/GUIButtonControl.cpp
  3. +1 −1 guilib/GUIButtonScroller.cpp
  4. +3 −3 guilib/GUIControl.cpp
  5. +6 −6 guilib/GUIDialog.cpp
  6. +1 −1 guilib/GUIEditControl.cpp
  7. +1 −1 guilib/GUIFontManager.cpp
  8. +1 −1 guilib/GUIMultiSelectText.cpp
  9. +1 −1 guilib/GUISelectButtonControl.cpp
  10. +2 −2 guilib/GUIStandardWindow.cpp
  11. +4 −4 guilib/GUIVideoControl.cpp
  12. +2 −2 guilib/GUIVisualisationControl.cpp
  13. +4 −4 guilib/GUIWindow.cpp
  14. +1 −14 guilib/GUIWindowManager.cpp
  15. +1 −2 guilib/GUIWindowManager.h
  16. +265 −265 xbmc/Application.cpp
  17. +22 −22 xbmc/ApplicationMessenger.cpp
  18. +2 −2 xbmc/ApplicationMessenger.h
  19. +2 −2 xbmc/ApplicationRenderer.cpp
  20. +1 −1 xbmc/AutoSwitch.cpp
  21. +3 −3 xbmc/Autorun.cpp
  22. +4 −4 xbmc/DetectDVDType.cpp
  23. +1 −1 xbmc/FileSystem/FileShoutcast.cpp
  24. +1 −1 xbmc/FileSystem/LastFMDirectory.cpp
  25. +1 −1 xbmc/FileSystem/MultiPathDirectory.cpp
  26. +1 −1 xbmc/FileSystem/PluginDirectory.cpp
  27. +1 −1 xbmc/FileSystem/RarManager.cpp
  28. +2 −2 xbmc/FileSystem/SAPDirectory.cpp
  29. +2 −2 xbmc/FileSystem/SMBDirectory.cpp
  30. +1 −1 xbmc/FileSystem/ShoutcastDirectory.cpp
  31. +1 −1 xbmc/FileSystem/UPnPDirectory.cpp
  32. +1 −1 xbmc/FileSystem/VirtualPathDirectory.cpp
  33. +6 −6 xbmc/GUIDialogBoxBase.cpp
  34. +9 −9 xbmc/GUIDialogContentSettings.cpp
  35. +10 −10 xbmc/GUIDialogContextMenu.cpp
  36. +2 −2 xbmc/GUIDialogFavourites.cpp
  37. +10 −10 xbmc/GUIDialogFileBrowser.cpp
  38. +1 −1 xbmc/GUIDialogGamepad.cpp
  39. +5 −5 xbmc/GUIDialogKeyboard.cpp
  40. +3 −3 xbmc/GUIDialogLockSettings.cpp
  41. +2 −2 xbmc/GUIDialogMediaSource.cpp
  42. +3 −3 xbmc/GUIDialogMusicOSD.cpp
  43. +2 −2 xbmc/GUIDialogMusicScan.cpp
  44. +1 −1 xbmc/GUIDialogNetworkSetup.cpp
  45. +6 −6 xbmc/GUIDialogNumeric.cpp
  46. +1 −1 xbmc/GUIDialogOK.cpp
  47. +2 −2 xbmc/GUIDialogPictureInfo.cpp
  48. +3 −3 xbmc/GUIDialogPluginSettings.cpp
  49. +1 −1 xbmc/GUIDialogProfileSettings.cpp
  50. +4 −4 xbmc/GUIDialogProgress.cpp
  51. +4 −4 xbmc/GUIDialogSelect.cpp
  52. +2 −2 xbmc/GUIDialogSlider.cpp
  53. +4 −4 xbmc/GUIDialogSmartPlaylistEditor.cpp
  54. +3 −3 xbmc/GUIDialogSmartPlaylistRule.cpp
  55. +3 −3 xbmc/GUIDialogSongInfo.cpp
  56. +1 −1 xbmc/GUIDialogVideoBookmarks.cpp
  57. +2 −2 xbmc/GUIDialogVideoScan.cpp
  58. +1 −1 xbmc/GUIDialogVideoSettings.cpp
  59. +1 −1 xbmc/GUIDialogVisualisationPresetList.cpp
  60. +1 −1 xbmc/GUIDialogVisualisationSettings.cpp
  61. +2 −2 xbmc/GUIDialogYesNo.cpp
  62. +7 −7 xbmc/GUIMediaWindow.cpp
  63. +11 −11 xbmc/GUIPassword.cpp
  64. +10 −10 xbmc/GUIViewControl.cpp
  65. +3 −3 xbmc/GUIViewState.cpp
  66. +18 −18 xbmc/GUIWindowFileManager.cpp
  67. +10 −10 xbmc/GUIWindowFullScreen.cpp
  68. +6 −6 xbmc/GUIWindowLoginScreen.cpp
  69. +30 −30 xbmc/GUIWindowMusicBase.cpp
  70. +3 −3 xbmc/GUIWindowMusicInfo.cpp
  71. +6 −6 xbmc/GUIWindowMusicNav.cpp
  72. +5 −5 xbmc/GUIWindowMusicOverlay.cpp
  73. +1 −1 xbmc/GUIWindowMusicPlaylist.cpp
  74. +1 −1 xbmc/GUIWindowMusicPlaylistEditor.cpp
  75. +3 −3 xbmc/GUIWindowMusicSongs.cpp
  76. +8 −8 xbmc/GUIWindowOSD.cpp
  77. +14 −14 xbmc/GUIWindowPictures.cpp
  78. +2 −2 xbmc/GUIWindowPrograms.cpp
  79. +3 −3 xbmc/GUIWindowScreensaver.cpp
  80. +1 −1 xbmc/GUIWindowScripts.cpp
  81. +1 −1 xbmc/GUIWindowSettings.cpp
  82. +15 −15 xbmc/GUIWindowSettingsCategory.cpp
  83. +13 −13 xbmc/GUIWindowSettingsProfile.cpp
  84. +4 −4 xbmc/GUIWindowSettingsScreenCalibration.cpp
  85. +6 −6 xbmc/GUIWindowSlideShow.cpp
  86. +1 −1 xbmc/GUIWindowSystemInfo.cpp
  87. +1 −1 xbmc/GUIWindowTestPattern.cpp
  88. +29 −29 xbmc/GUIWindowVideoBase.cpp
  89. +4 −4 xbmc/GUIWindowVideoFiles.cpp
  90. +6 −6 xbmc/GUIWindowVideoInfo.cpp
  91. +10 −10 xbmc/GUIWindowVideoNav.cpp
  92. +1 −1 xbmc/GUIWindowVideoOverlay.cpp
  93. +1 −1 xbmc/GUIWindowVideoPlaylist.cpp
  94. +12 −12 xbmc/GUIWindowVisualisation.cpp
  95. +7 −7 xbmc/GUIWindowWeather.cpp
  96. +2 −2 xbmc/LastFmManager.cpp
  97. +2 −2 xbmc/MediaManager.cpp
  98. +12 −12 xbmc/MusicDatabase.cpp
  99. +2 −2 xbmc/MusicInfoScanner.cpp
  100. +4 −4 xbmc/PartyModeManager.cpp
  101. +11 −11 xbmc/PlayListPlayer.cpp
  102. +2 −2 xbmc/Settings.cpp
  103. +3 −3 xbmc/UPnP.cpp
  104. +4 −4 xbmc/Util.cpp
  105. +5 −5 xbmc/VideoDatabase.cpp
  106. +2 −2 xbmc/cdrip/CDDARipper.cpp
  107. +1 −1 xbmc/cores/ExternalPlayer/ExternalPlayer.cpp
  108. +2 −2 xbmc/cores/dlgcache.cpp
  109. +1 −1 xbmc/cores/dvdplayer/DVDPlayer.cpp
  110. +1 −1 xbmc/cores/playercorefactory/PlayerCoreFactory.cpp
  111. +2 −2 xbmc/karaoke/GUIWindowKaraokeLyrics.cpp
  112. +7 −7 xbmc/karaoke/karaokelyricsmanager.cpp
  113. +1 −1 xbmc/lib/UnrarXLib/rar.cpp
  114. +23 −23 xbmc/lib/libGoAhead/XBMChttp.cpp
  115. +1 −1 xbmc/lib/libPython/XBPyThread.cpp
  116. +2 −2 xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.cpp
  117. +2 −2 xbmc/lib/libPython/xbmcmodule/GUIPythonWindowDialog.cpp
  118. +4 −4 xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXMLDialog.cpp
  119. +9 −9 xbmc/lib/libPython/xbmcmodule/dialog.cpp
  120. +7 −7 xbmc/lib/libPython/xbmcmodule/keyboard.cpp
  121. +23 −23 xbmc/lib/libPython/xbmcmodule/window.cpp
  122. +1 −1 xbmc/lib/libPython/xbmcmodule/winxml.cpp
  123. +1 −1 xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp
  124. +2 −2 xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp
  125. +2 −2 xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
  126. +2 −2 xbmc/linux/ZeroconfBrowserAvahi.cpp
  127. +1 −1 xbmc/osx/ZeroconfBrowserOSX.cpp
  128. +1 −1 xbmc/utils/AsyncFileCopy.cpp
  129. +53 −53 xbmc/utils/Builtins.cpp
  130. +30 −30 xbmc/utils/GUIInfoManager.cpp
  131. +1 −1 xbmc/utils/IMDB.cpp
  132. +5 −5 xbmc/utils/TuxBoxUtil.cpp
  133. +3 −3 xbmc/utils/Weather.cpp
  134. +1 −1 xbmc/xbox/Network.cpp
@@ -623,7 +623,7 @@ bool CGUIBaseContainer::OnClick(int actionID)
action.Replace(",,", ",");
CGUIMessage message(GUI_MSG_EXECUTE, GetID(), GetParentID());
message.SetStringParam(action);
- m_gWindowManager.SendMessage(message);
+ g_windowManager.SendMessage(message);
}
}
return true;
@@ -296,7 +296,7 @@ void CGUIButtonControl::OnClick()
{
CGUIMessage message(GUI_MSG_EXECUTE, controlID, parentID);
message.SetAction(clickActions[i]);
- m_gWindowManager.SendMessage(message);
+ g_windowManager.SendMessage(message);
}
}
@@ -306,7 +306,7 @@ void CGUIButtonControl::OnFocus()
{
CGUIMessage message(GUI_MSG_EXECUTE, m_controlID, m_parentID);
message.SetAction(m_focusActions[i]);
- m_gWindowManager.SendThreadMessage(message);
+ g_windowManager.SendThreadMessage(message);
}
}
@@ -316,7 +316,7 @@ void CGUIButtonControl::OnUnFocus()
{
CGUIMessage message(GUI_MSG_EXECUTE, m_controlID, m_parentID);
message.SetAction(m_unfocusActions[i]);
- m_gWindowManager.SendThreadMessage(message);
+ g_windowManager.SendThreadMessage(message);
}
}
@@ -124,7 +124,7 @@ bool CGUIButtonScroller::OnAction(const CAction &action)
CGUIMessage message(GUI_MSG_EXECUTE, GetID(), GetParentID());
// find our currently highlighted item
message.SetAction(actions[i]);
- m_gWindowManager.SendMessage(message);
+ g_windowManager.SendMessage(message);
}
return true;
}
View
@@ -284,10 +284,10 @@ void CGUIControl::OnPrevControl()
bool CGUIControl::SendWindowMessage(CGUIMessage &message)
{
- CGUIWindow *pWindow = m_gWindowManager.GetWindow(GetParentID());
+ CGUIWindow *pWindow = g_windowManager.GetWindow(GetParentID());
if (pWindow)
return pWindow->OnMessage(message);
- return m_gWindowManager.SendMessage(message);
+ return g_windowManager.SendMessage(message);
}
int CGUIControl::GetID(void) const
@@ -872,7 +872,7 @@ void CGUIControl::ExecuteActions(const vector<CGUIActionDescriptor> &actions)
{
CGUIMessage message(GUI_MSG_EXECUTE, savedID, savedParent);
message.SetAction(savedActions[i]);
- m_gWindowManager.SendMessage(message);
+ g_windowManager.SendMessage(message);
}
}
View
@@ -82,15 +82,15 @@ bool CGUIDialog::OnMessage(CGUIMessage& message)
{
case GUI_MSG_WINDOW_DEINIT:
{
- CGUIWindow *pWindow = m_gWindowManager.GetWindow(m_gWindowManager.GetActiveWindow());
+ CGUIWindow *pWindow = g_windowManager.GetWindow(g_windowManager.GetActiveWindow());
if (pWindow)
- m_gWindowManager.ShowOverlay(pWindow->GetOverlayState());
+ g_windowManager.ShowOverlay(pWindow->GetOverlayState());
CGUIWindow::OnMessage(message);
// if we were running, make sure we remove ourselves from the window manager
if (m_bRunning)
{
- m_gWindowManager.RemoveDialog(GetID());
+ g_windowManager.RemoveDialog(GetID());
m_bRunning = false;
m_dialogClosing = false;
m_autoClosing = false;
@@ -148,7 +148,7 @@ void CGUIDialog::DoModal_Internal(int iWindowID /*= WINDOW_INVALID */, const CSt
// the main rendering thread (this should really be handled via
// a thread message though IMO)
m_bRunning = true;
- m_gWindowManager.RouteToWindow(this);
+ g_windowManager.RouteToWindow(this);
// Play the window specific init sound
g_audioManager.PlayWindowSound(GetID(), SOUND_INIT);
@@ -167,7 +167,7 @@ void CGUIDialog::DoModal_Internal(int iWindowID /*= WINDOW_INVALID */, const CSt
while (m_bRunning && !g_application.m_bStop)
{
- m_gWindowManager.Process();
+ g_windowManager.Process();
}
}
@@ -187,7 +187,7 @@ void CGUIDialog::Show_Internal()
// a thread message though IMO)
m_bRunning = true;
m_dialogClosing = false;
- m_gWindowManager.AddModeless(this);
+ g_windowManager.AddModeless(this);
// Play the window specific init sound
g_audioManager.PlayWindowSound(GetID(), SOUND_INIT);
@@ -441,7 +441,7 @@ void CGUIEditControl::OnTextChanged()
{
CGUIMessage message(GUI_MSG_EXECUTE, GetID(), GetParentID());
message.SetAction(textChangeActions[i]);
- m_gWindowManager.SendMessage(message);
+ g_windowManager.SendMessage(message);
}
SetInvalid();
@@ -192,7 +192,7 @@ void GUIFontManager::ReloadTTFFonts(void)
m_bFontsNeedReloading = false;
// send a message to our controls telling them they need to refresh.
- m_gWindowManager.SendMessage(GUI_MSG_NOTIFY_ALL, 0, 0, GUI_MSG_INVALIDATE);
+ g_windowManager.SendMessage(GUI_MSG_NOTIFY_ALL, 0, 0, GUI_MSG_INVALIDATE);
}
void GUIFontManager::Unload(const CStdString& strFontName)
@@ -175,7 +175,7 @@ bool CGUIMultiSelectTextControl::OnAction(const CAction &action)
{ // have a click action -> perform it
CGUIMessage message(GUI_MSG_EXECUTE, m_controlID, m_parentID);
message.SetStringParam(clickAction);
- m_gWindowManager.SendMessage(message);
+ g_windowManager.SendMessage(message);
}
else
{ // no click action, just send a message to the window
@@ -138,7 +138,7 @@ void CGUISelectButtonControl::Render()
// (Sending a message with SendMessage
// can result in a GPF.)
CGUIMessage message(GUI_MSG_CLICKED, GetID(), GetParentID() );
- m_gWindowManager.SendThreadMessage(message);
+ g_windowManager.SendThreadMessage(message);
}
} // if (m_bShowSelect)
else
@@ -36,13 +36,13 @@ bool CGUIStandardWindow::OnAction(const CAction &action)
{
if (action.id == ACTION_PREVIOUS_MENU)
{
- m_gWindowManager.PreviousWindow();
+ g_windowManager.PreviousWindow();
return true;
}
if (action.id == ACTION_PARENT_DIR && g_advancedSettings.m_bUseEvilB)
{
- m_gWindowManager.PreviousWindow();
+ g_windowManager.PreviousWindow();
return true;
}
@@ -74,15 +74,15 @@ bool CGUIVideoControl::OnMouseClick(int button, const CPoint &point)
if (button == MOUSE_LEFT_BUTTON)
{
CGUIMessage message(GUI_MSG_FULLSCREEN, GetID(), GetParentID());
- m_gWindowManager.SendMessage(message);
+ g_windowManager.SendMessage(message);
return true;
}
if (button == MOUSE_RIGHT_BUTTON)
{ // toggle the playlist window
- if (m_gWindowManager.GetActiveWindow() == WINDOW_VIDEO_PLAYLIST)
- m_gWindowManager.PreviousWindow();
+ if (g_windowManager.GetActiveWindow() == WINDOW_VIDEO_PLAYLIST)
+ g_windowManager.PreviousWindow();
else
- m_gWindowManager.ActivateWindow(WINDOW_VIDEO_PLAYLIST);
+ g_windowManager.ActivateWindow(WINDOW_VIDEO_PLAYLIST);
// reset the mouse button.
g_Mouse.bClick[MOUSE_RIGHT_BUTTON] = false;
return true;
@@ -102,7 +102,7 @@ void CGUIVisualisationControl::FreeVisualisation()
m_bInitialized = false;
// tell our app that we're going
CGUIMessage msg(GUI_MSG_VISUALISATION_UNLOADING, 0, 0);
- m_gWindowManager.SendMessage(msg);
+ g_windowManager.SendMessage(msg);
CSingleLock lock (m_critSection);
@@ -187,7 +187,7 @@ void CGUIVisualisationControl::LoadVisualisation()
// tell our app that we're back
CGUIMessage msg(GUI_MSG_VISUALISATION_LOADED, 0, 0, 0, 0, m_pVisualisation);
- m_gWindowManager.SendMessage(msg);
+ g_windowManager.SendMessage(msg);
}
void CGUIVisualisationControl::UpdateVisibility(const CGUIListItem *item)
View
@@ -504,7 +504,7 @@ void CGUIWindow::OnInitWindow()
RestoreControlStates();
SetInitialVisibility();
QueueAnimation(ANIM_TYPE_WINDOW_OPEN);
- m_gWindowManager.ShowOverlay(m_overlayState);
+ g_windowManager.ShowOverlay(m_overlayState);
if (!m_manualRunActions)
{
@@ -532,7 +532,7 @@ void CGUIWindow::OnDeinitWindow(int nextWindowID)
QueueAnimation(ANIM_TYPE_WINDOW_CLOSE);
while (IsAnimating(ANIM_TYPE_WINDOW_CLOSE))
{
- m_gWindowManager.Process(true);
+ g_windowManager.Process(true);
}
}
}
@@ -727,7 +727,7 @@ void CGUIWindow::SetInitialVisibility()
bool CGUIWindow::IsActive() const
{
- return m_gWindowManager.IsWindowActive(GetID());
+ return g_windowManager.IsWindowActive(GetID());
}
bool CGUIWindow::CheckAnimation(ANIMATION_TYPE animType)
@@ -1003,7 +1003,7 @@ void CGUIWindow::RunActions(std::vector<CGUIActionDescriptor>& actions)
{
CGUIMessage message(GUI_MSG_EXECUTE, 0, GetID());
message.SetAction(tempActions[i]);
- m_gWindowManager.SendMessage(message);
+ g_windowManager.SendMessage(message);
}
}
@@ -31,7 +31,7 @@
using namespace std;
-CGUIWindowManager m_gWindowManager;
+CGUIWindowManager g_windowManager;
CGUIWindowManager::CGUIWindowManager(void)
{
@@ -295,19 +295,6 @@ void CGUIWindowManager::PreviousWindow()
return;
}
-void CGUIWindowManager::RefreshWindow()
-{
- // deactivate the current window
- CGUIWindow *pWindow = GetWindow(GetActiveWindow());
- if (!pWindow)
- return;
-
- CGUIMessage msg(GUI_MSG_WINDOW_DEINIT, 0, 0);
- pWindow->OnMessage(msg);
- CGUIMessage msg2(GUI_MSG_WINDOW_INIT, 0, 0, WINDOW_INVALID);
- pWindow->OnMessage(msg2);
-}
-
void CGUIWindowManager::ChangeActiveWindow(int newWindow, const CStdString& strPath)
{
vector<CStdString> params;
@@ -59,7 +59,6 @@ class CGUIWindowManager
void ChangeActiveWindow(int iNewID, const CStdString &strPath = "");
void ActivateWindow(int iWindowID, const std::vector<CStdString>& params, bool swappingWindows = false);
void PreviousWindow();
- void RefreshWindow();
void LoadNotOnDemandWindows();
void UnloadNotOnDemandWindows();
@@ -137,6 +136,6 @@ class CGUIWindowManager
\ingroup winman
\brief
*/
-extern CGUIWindowManager m_gWindowManager;
+extern CGUIWindowManager g_windowManager;
#endif
Oops, something went wrong.

0 comments on commit 2647224

Please sign in to comment.