mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-26 02:14:22 +00:00
Code Activity

Minor cleanups

Browse source
This commit is contained in:
jules 2015-05-25 10:05:33 +01:00
parent 40b13a692e
commit 0c99e8e068
5 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/juce_gui_basics/components/juce_Component.cpp
View file

@ -154,7 +154,7 @@ private:
bool shouldBailOut() const noexcept
{
return checker.shouldBailOut() || safePointer == 0;
return checker.shouldBailOut() || safePointer == nullptr;
}
private:

4
modules/juce_gui_basics/native/juce_linux_Clipboard.cpp
View file

@ -22,8 +22,8 @@
==============================================================================
*/
extern Display* display;
extern Window juce_messageWindowHandle;
extern ::Display* display;
extern ::Window juce_messageWindowHandle;
namespace ClipboardHelpers
{

34
modules/juce_gui_basics/native/juce_linux_Windowing.cpp
View file

@ -22,7 +22,7 @@
==============================================================================
*/
extern Display* display;
extern ::Display* display;
extern XContext windowHandleXContext;
typedef void (*WindowMessageReceiveCallback) (XEvent&);
extern WindowMessageReceiveCallback dispatchWindowMessage;
@ -775,7 +775,7 @@ class DisplayGeometry
{
private:
//==============================================================================
DisplayGeometry (::Display *dpy, double masterScale)
DisplayGeometry (::Display* dpy, double masterScale)
{
jassert (instance == nullptr);
instance = this;
@ -912,19 +912,20 @@ public:
}
//==============================================================================
static DisplayGeometry& getInstance ()
static DisplayGeometry& getInstance()
{
jassert (instance != nullptr);
return *instance;
}
static DisplayGeometry& getOrCreateInstance (::Display *dpy, double masterScale)
static DisplayGeometry& getOrCreateInstance (::Display* dpy, double masterScale)
{
if (instance == nullptr)
new DisplayGeometry (dpy, masterScale);
return getInstance();
}
private:
//==============================================================================
static DisplayGeometry* instance;
@ -1027,7 +1028,7 @@ private:
}
//==============================================================================
XRRScreenResources* getScreenResources (::Display *dpy, ::Window window)
XRRScreenResources* getScreenResources (::Display* dpy, ::Window window)
{
if (getScreenResourcesPtr != nullptr)
return getScreenResourcesPtr (dpy, window);
@ -1035,7 +1036,7 @@ private:
return nullptr;
}
XRROutputInfo* getOutputInfo (::Display *dpy, XRRScreenResources *resources, RROutput output)
XRROutputInfo* getOutputInfo (::Display* dpy, XRRScreenResources* resources, RROutput output)
{
if (getOutputInfoPtr != nullptr)
return getOutputInfoPtr (dpy, resources, output);
@ -1043,7 +1044,7 @@ private:
return nullptr;
}
XRRCrtcInfo* getCrtcInfo (::Display *dpy, XRRScreenResources *resources, RRCrtc crtc)
XRRCrtcInfo* getCrtcInfo (::Display* dpy, XRRScreenResources* resources, RRCrtc crtc)
{
if (getCrtcInfoPtr != nullptr)
return getCrtcInfoPtr (dpy, resources, crtc);
@ -1051,13 +1052,14 @@ private:
return nullptr;
}
RROutput getOutputPrimary (::Display *dpy, ::Window window)
RROutput getOutputPrimary (::Display* dpy, ::Window window)
{
if (getOutputPrimaryPtr != nullptr)
return getOutputPrimaryPtr (dpy, window);
return 0;
}
private:
//==============================================================================
friend class ContainerDeletePolicy<XRRScreenResources>;
@ -1084,13 +1086,13 @@ private:
private:
static XRandrWrapper* instance;
typedef XRRScreenResources* (*tXRRGetScreenResources) (::Display *dpy, ::Window window);
typedef void (*tXRRFreeScreenResources) (XRRScreenResources *resources);
typedef XRROutputInfo* (*tXRRGetOutputInfo) (::Display *dpy, XRRScreenResources *resources, RROutput output);
typedef void (*tXRRFreeOutputInfo) (XRROutputInfo *outputInfo);
typedef XRRCrtcInfo* (*tXRRGetCrtcInfo) (::Display *dpy, XRRScreenResources *resources, RRCrtc crtc);
typedef void (*tXRRFreeCrtcInfo) (XRRCrtcInfo *crtcInfo);
typedef RROutput (*tXRRGetOutputPrimary) (::Display *dpy, ::Window window);
typedef XRRScreenResources* (*tXRRGetScreenResources) (::Display*, ::Window);
typedef void (*tXRRFreeScreenResources) (XRRScreenResources*);
typedef XRROutputInfo* (*tXRRGetOutputInfo) (::Display*, XRRScreenResources*, RROutput);
typedef void (*tXRRFreeOutputInfo) (XRROutputInfo*);
typedef XRRCrtcInfo* (*tXRRGetCrtcInfo) (::Display*, XRRScreenResources*, RRCrtc);
typedef void (*tXRRFreeCrtcInfo) (XRRCrtcInfo*);
typedef RROutput (*tXRRGetOutputPrimary) (::Display*, ::Window);
void* libXrandr;
tXRRGetScreenResources getScreenResourcesPtr;
@ -1172,7 +1174,7 @@ private:
}
//==============================================================================
void queryDisplayInfos (::Display *dpy, double masterScale) noexcept
void queryDisplayInfos (::Display* dpy, double masterScale) noexcept
{
ScopedXLock xlock;

2
modules/juce_gui_extra/native/juce_linux_SystemTrayIcon.cpp
View file

@ -22,7 +22,7 @@
==============================================================================
*/
extern Display* display;
extern ::Display* display;
//==============================================================================
class SystemTrayIconComponent::Pimpl

2
modules/juce_opengl/native/juce_OpenGL_linux.h
View file

@ -23,7 +23,7 @@
==============================================================================
*/
extern Display* display;
extern ::Display* display;
extern XContext windowHandleXContext;
//==============================================================================