mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Hard-coded some juce namespace declarations.

Browse source
This commit is contained in:
Julian Storer 2011-08-13 21:13:50 +01:00
parent d3bcbeef9c
commit 4808d9c318
47 changed files with 170 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

26
modules/juce_gui_basics/application/juce_Initialisation.h
View file

@ -87,44 +87,44 @@ public:
*/
#if JUCE_ANDROID
#define START_JUCE_APPLICATION(AppClass) \
JUCE_NAMESPACE::JUCEApplication* juce_CreateApplication() { return new AppClass(); }
juce::JUCEApplication* juce_CreateApplication() { return new AppClass(); }
#elif defined (JUCE_GCC) || defined (__MWERKS__)
#define START_JUCE_APPLICATION(AppClass) \
static JUCE_NAMESPACE::JUCEApplicationBase* juce_CreateApplication() { return new AppClass(); } \
static juce::JUCEApplicationBase* juce_CreateApplication() { return new AppClass(); } \
int main (int argc, char* argv[]) \
{ \
JUCE_NAMESPACE::JUCEApplication::createInstance = &juce_CreateApplication; \
return JUCE_NAMESPACE::JUCEApplication::main (argc, (const char**) argv); \
juce::JUCEApplication::createInstance = &juce_CreateApplication; \
return juce::JUCEApplication::main (argc, (const char**) argv); \
}
#elif JUCE_WINDOWS
#ifdef _CONSOLE
#define START_JUCE_APPLICATION(AppClass) \
static JUCE_NAMESPACE::JUCEApplicationBase* juce_CreateApplication() { return new AppClass(); } \
static juce::JUCEApplicationBase* juce_CreateApplication() { return new AppClass(); } \
int main (int, char* argv[]) \
{ \
JUCE_NAMESPACE::JUCEApplication::createInstance = &juce_CreateApplication; \
return JUCE_NAMESPACE::JUCEApplication::main (JUCE_NAMESPACE::Process::getCurrentCommandLineParams()); \
juce::JUCEApplication::createInstance = &juce_CreateApplication; \
return juce::JUCEApplication::main (juce::Process::getCurrentCommandLineParams()); \
}
#elif ! defined (_AFXDLL)
#ifdef _WINDOWS_
#define START_JUCE_APPLICATION(AppClass) \
static JUCE_NAMESPACE::JUCEApplicationBase* juce_CreateApplication() { return new AppClass(); } \
static juce::JUCEApplicationBase* juce_CreateApplication() { return new AppClass(); } \
int WINAPI WinMain (HINSTANCE, HINSTANCE, LPSTR, int) \
{ \
JUCE_NAMESPACE::JUCEApplication::createInstance = &juce_CreateApplication; \
return JUCE_NAMESPACE::JUCEApplication::main (JUCE_NAMESPACE::Process::getCurrentCommandLineParams()); \
juce::JUCEApplication::createInstance = &juce_CreateApplication; \
return juce::JUCEApplication::main (juce::Process::getCurrentCommandLineParams()); \
}
#else
#define START_JUCE_APPLICATION(AppClass) \
static JUCE_NAMESPACE::JUCEApplicationBase* juce_CreateApplication() { return new AppClass(); } \
static juce::JUCEApplicationBase* juce_CreateApplication() { return new AppClass(); } \
int __stdcall WinMain (void*, void*, const char*, int) \
{ \
JUCE_NAMESPACE::JUCEApplication::createInstance = &juce_CreateApplication; \
return JUCE_NAMESPACE::JUCEApplication::main (JUCE_NAMESPACE::Process::getCurrentCommandLineParams()); \
juce::JUCEApplication::createInstance = &juce_CreateApplication; \
return juce::JUCEApplication::main (juce::Process::getCurrentCommandLineParams()); \
}
#endif
#endif

2
modules/juce_gui_basics/juce_gui_basics.cpp
View file

@ -235,7 +235,7 @@
#include "misc/juce_DropShadower.cpp"
// END_AUTOINCLUDE
using namespace JUCE_NAMESPACE;
using namespace juce;
//==============================================================================
BEGIN_JUCE_NAMESPACE

2
modules/juce_gui_basics/native/juce_android_Windowing.cpp
View file

@ -24,7 +24,7 @@
*/
END_JUCE_NAMESPACE
extern JUCE_NAMESPACE::JUCEApplicationBase* juce_CreateApplication(); // (from START_JUCE_APPLICATION)
extern juce::JUCEApplicationBase* juce_CreateApplication(); // (from START_JUCE_APPLICATION)
BEGIN_JUCE_NAMESPACE
//==============================================================================

4
modules/juce_gui_basics/native/juce_ios_UIViewComponentPeer.mm
View file

@ -292,7 +292,7 @@ void ModifierKeys::updateCurrentModifiers() noexcept
currentModifiers = UIViewComponentPeer::currentModifiers;
}
JUCE_NAMESPACE::Point<int> juce_lastMousePos;
juce::Point<int> juce_lastMousePos;
//==============================================================================
- (void) touchesBegan: (NSSet*) touches withEvent: (UIEvent*) event
@ -917,7 +917,7 @@ void UIViewComponentPeer::drawRect (CGRect r)
bool UIViewComponentPeer::canBecomeKeyWindow()
{
return (getStyleFlags() & JUCE_NAMESPACE::ComponentPeer::windowIgnoresKeyPresses) == 0;
return (getStyleFlags() & juce::ComponentPeer::windowIgnoresKeyPresses) == 0;
}
bool UIViewComponentPeer::windowShouldClose()

2
modules/juce_gui_basics/native/juce_mac_FileChooser.mm
View file

@ -27,7 +27,7 @@
//==============================================================================
END_JUCE_NAMESPACE
using namespace JUCE_NAMESPACE;
using namespace juce;
#define JuceFileChooserDelegate MakeObjCClassName(JuceFileChooserDelegate)

6
modules/juce_gui_basics/native/juce_mac_MainMenu.mm
View file

@ -26,7 +26,7 @@
class JuceMainMenuHandler;
END_JUCE_NAMESPACE
using namespace JUCE_NAMESPACE;
using namespace juce;
#define JuceMenuCallback MakeObjCClassName(JuceMenuCallback)
@ -423,9 +423,9 @@ END_JUCE_NAMESPACE
NSEvent* e = [NSApp currentEvent];
if ([e type] == NSKeyDown || [e type] == NSKeyUp)
{
if (JUCE_NAMESPACE::Component::getCurrentlyFocusedComponent() != nullptr)
if (juce::Component::getCurrentlyFocusedComponent() != nullptr)
{
JUCE_NAMESPACE::NSViewComponentPeer* peer = dynamic_cast <JUCE_NAMESPACE::NSViewComponentPeer*> (JUCE_NAMESPACE::Component::getCurrentlyFocusedComponent()->getPeer());
juce::NSViewComponentPeer* peer = dynamic_cast <juce::NSViewComponentPeer*> (juce::Component::getCurrentlyFocusedComponent()->getPeer());
if (peer != nullptr)
{

12
modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm
View file

@ -669,7 +669,7 @@ END_JUCE_NAMESPACE
- (NSRect) firstRectForCharacterRange: (NSRange) theRange
{
(void) theRange;
JUCE_NAMESPACE::Component* const comp = dynamic_cast <JUCE_NAMESPACE::Component*> (owner->findCurrentTextInputTarget());
juce::Component* const comp = dynamic_cast <juce::Component*> (owner->findCurrentTextInputTarget());
if (comp == 0)
return NSMakeRect (0, 0, 0, 0);
@ -820,10 +820,10 @@ END_JUCE_NAMESPACE
if (owner != nullptr)
frameRect = owner->constrainRect (frameRect);
if (JUCE_NAMESPACE::Component::getCurrentlyModalComponent() != nullptr
if (juce::Component::getCurrentlyModalComponent() != nullptr
&& owner->getComponent()->isCurrentlyBlockedByAnotherModalComponent()
&& owner->hasNativeTitleBar())
JUCE_NAMESPACE::Component::getCurrentlyModalComponent()->inputAttemptWhenModal();
juce::Component::getCurrentlyModalComponent()->inputAttemptWhenModal();
return frameRect.size;
}
@ -841,10 +841,10 @@ END_JUCE_NAMESPACE
{
(void) notification;
if (JUCE_NAMESPACE::Component::getCurrentlyModalComponent() != nullptr
if (juce::Component::getCurrentlyModalComponent() != nullptr
&& owner->getComponent()->isCurrentlyBlockedByAnotherModalComponent()
&& owner->hasNativeTitleBar())
JUCE_NAMESPACE::Component::getCurrentlyModalComponent()->inputAttemptWhenModal();
juce::Component::getCurrentlyModalComponent()->inputAttemptWhenModal();
}
@end
@ -1685,7 +1685,7 @@ void NSViewComponentPeer::setCurrentRenderingEngine (int index)
bool NSViewComponentPeer::canBecomeKeyWindow()
{
return (getStyleFlags() & JUCE_NAMESPACE::ComponentPeer::windowIgnoresKeyPresses) == 0;
return (getStyleFlags() & juce::ComponentPeer::windowIgnoresKeyPresses) == 0;
}
void NSViewComponentPeer::becomeKeyWindow()