aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Hill <kyleh@htpc.(none)>2011-05-14 18:07:00 -0500
committerKyle Hill <kyleh@htpc.(none)>2011-05-14 18:07:00 -0500
commit128bf76dbd7c221f665f6084ab22e9f33caf611a (patch)
tree3705e886735a68cba7ecde9026e929ee85f403ac
parentacef66ba6f0bf1db31906c7c7c4f7c83cfee44c1 (diff)
Fixed a few more NULL -> 0 conversion warnings
-rw-r--r--xbmc/guilib/Texture.cpp2
-rw-r--r--xbmc/video/VideoReferenceClock.cpp4
-rw-r--r--xbmc/windowing/X11/WinSystemX11.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/xbmc/guilib/Texture.cpp b/xbmc/guilib/Texture.cpp
index e98adc9e22..46b8666649 100644
--- a/xbmc/guilib/Texture.cpp
+++ b/xbmc/guilib/Texture.cpp
@@ -39,7 +39,7 @@ CBaseTexture::CBaseTexture(unsigned int width, unsigned int height, unsigned int
: m_hasAlpha( true )
{
#ifndef HAS_DX
- m_texture = NULL;
+ m_texture = 0;
#endif
m_pixels = NULL;
m_loadedToGPU = false;
diff --git a/xbmc/video/VideoReferenceClock.cpp b/xbmc/video/VideoReferenceClock.cpp
index 996a65913d..07fed65ed5 100644
--- a/xbmc/video/VideoReferenceClock.cpp
+++ b/xbmc/video/VideoReferenceClock.cpp
@@ -225,7 +225,7 @@ bool CVideoReferenceClock::SetupGLX()
m_vInfo = NULL;
m_Context = NULL;
- m_Window = NULL;
+ m_Window = 0;
CLog::Log(LOGDEBUG, "CVideoReferenceClock: Setting up GLX");
@@ -443,7 +443,7 @@ void CVideoReferenceClock::CleanupGLX()
if (m_Window)
{
XDestroyWindow(m_Dpy, m_Window);
- m_Window = NULL;
+ m_Window = 0;
}
//ati saves the Display* in their libGL, if we close it here, we crash
diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp
index dfdd4c1b53..233bb14e98 100644
--- a/xbmc/windowing/X11/WinSystemX11.cpp
+++ b/xbmc/windowing/X11/WinSystemX11.cpp
@@ -39,8 +39,8 @@ CWinSystemX11::CWinSystemX11() : CWinSystemBase(), m_screensaverReset(true)
m_glContext = NULL;
m_SDLSurface = NULL;
m_dpy = NULL;
- m_glWindow = NULL;
- m_wmWindow = NULL;
+ m_glWindow = 0;
+ m_wmWindow = 0;
m_bWasFullScreenBeforeMinimize = false;
}