Include mac/linux in RString reference changes, should compile now...

jameskr97 · Oct 30, 2016 · 3ef472b · 3ef472b
1 parent bc26e1d
commit 3ef472b
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 22 deletions.
diff --git a/src/arch/ArchHooks/ArchHooks_MacOSX.h b/src/arch/ArchHooks/ArchHooks_MacOSX.h
@@ -10,7 +10,7 @@ class ArchHooks_MacOSX : public ArchHooks
 	RString GetArchName() const;
 	void DumpDebugInfo();
 	RString GetPreferredLanguage();
-	bool GoToURL( RString sUrl );
+	bool GoToURL( const RString &sUrl );
 	float GetDisplayAspectRatio();
 };
 

diff --git a/src/arch/ArchHooks/ArchHooks_MacOSX.mm b/src/arch/ArchHooks/ArchHooks_MacOSX.mm
@@ -270,7 +270,7 @@ static bool DoEmergencyShutdown( int signal, siginfo_t *si, const ucontext_t *us
 	return ret;
 }
 
-bool ArchHooks_MacOSX::GoToURL( RString sUrl )
+bool ArchHooks_MacOSX::GoToURL( const RString &sUrl )
 {
 	CFURLRef url = CFURLCreateWithBytes( kCFAllocatorDefault, (const UInt8*)sUrl.data(),
 						 sUrl.length(), kCFStringEncodingUTF8, NULL );

diff --git a/src/arch/ArchHooks/ArchHooks_Unix.cpp b/src/arch/ArchHooks/ArchHooks_Unix.cpp
@@ -212,7 +212,7 @@ void ArchHooks_Unix::Init()
 #endif
 }
 
-bool ArchHooks_Unix::GoToURL( RString sUrl )
+bool ArchHooks_Unix::GoToURL( const RString &sUrl )
 {
 	int status;
 	pid_t p = fork();

diff --git a/src/arch/ArchHooks/ArchHooks_Unix.h b/src/arch/ArchHooks/ArchHooks_Unix.h
@@ -15,7 +15,7 @@ class ArchHooks_Unix: public ArchHooks
 	void MountInitialFilesystems( const RString &sDirOfExecutable );
 	float GetDisplayAspectRatio() { return 4.0f/3; }
 
-	bool GoToURL( RString sUrl );
+	bool GoToURL( const RString &sUrl );
 
 	static clockid_t GetClock();
 

diff --git a/src/arch/Dialog/DialogDriver_MacOSX.cpp b/src/arch/Dialog/DialogDriver_MacOSX.cpp
@@ -38,7 +38,7 @@ static CFOptionFlags ShowAlert( CFOptionFlags flags, const RString& sMessage, CF
 
 #define LSTRING(b,x) CFBundleCopyLocalizedString( (b), CFSTR(x), NULL, CFSTR("Localizable") )
 
-void DialogDriver_MacOSX::OK( RString sMessage, RString sID )
+void DialogDriver_MacOSX::OK( const RString &sMessage, const RString &sID )
 {
 	CFBundleRef bundle = CFBundleGetMainBundle();
 	CFStringRef sDSA = LSTRING( bundle, "Don't show again" );
@@ -49,12 +49,12 @@ void DialogDriver_MacOSX::OK( RString sMessage, RString sID )
 		Dialog::IgnoreMessage( sID );
 }
 
-void DialogDriver_MacOSX::Error( RString sError, RString sID )
+void DialogDriver_MacOSX::Error( const RString &sError, const RString &sID )
 {
 	ShowAlert( kCFUserNotificationStopAlertLevel, sError, CFSTR("OK") );
 }
 
-Dialog::Result DialogDriver_MacOSX::OKCancel( RString sMessage, RString sID )
+Dialog::Result DialogDriver_MacOSX::OKCancel( const RString &sMessage, const RString &sID )
 {
 	CFBundleRef bundle = CFBundleGetMainBundle();
 	CFStringRef sOK = LSTRING( bundle, "OK" );
@@ -75,7 +75,7 @@ Dialog::Result DialogDriver_MacOSX::OKCancel( RString sMessage, RString sID )
 	}
 }
 
-Dialog::Result DialogDriver_MacOSX::AbortRetryIgnore( RString sMessage, RString sID )
+Dialog::Result DialogDriver_MacOSX::AbortRetryIgnore( const RString &sMessage, const RString &sID )
 {
 	CFBundleRef bundle = CFBundleGetMainBundle();
 	CFStringRef sIgnore = LSTRING( bundle, "Ignore" );
@@ -101,7 +101,7 @@ Dialog::Result DialogDriver_MacOSX::AbortRetryIgnore( RString sMessage, RString
 	}
 }
 
-Dialog::Result DialogDriver_MacOSX::AbortRetry( RString sMessage, RString sID )
+Dialog::Result DialogDriver_MacOSX::AbortRetry( const RString &sMessage, const RString &sID )
 {
 	CFBundleRef bundle = CFBundleGetMainBundle();
 	CFStringRef sRetry = LSTRING( bundle, "Retry" );
@@ -122,7 +122,7 @@ Dialog::Result DialogDriver_MacOSX::AbortRetry( RString sMessage, RString sID )
 	}
 }
 
-Dialog::Result DialogDriver_MacOSX::YesNo( RString sMessage, RString sID )
+Dialog::Result DialogDriver_MacOSX::YesNo( const RString &sMessage, const RString &sID )
 {
 	CFBundleRef bundle = CFBundleGetMainBundle();
 	CFStringRef sYes = LSTRING( bundle, "Yes" );

diff --git a/src/arch/Dialog/DialogDriver_MacOSX.h b/src/arch/Dialog/DialogDriver_MacOSX.h
@@ -6,12 +6,12 @@
 class DialogDriver_MacOSX: public DialogDriver
 {
 public:
-	void Error( RString sError, RString sID );
-	void OK( RString sMessage, RString sID );
-	Dialog::Result OKCancel( RString sMessage, RString sID );
-	Dialog::Result AbortRetryIgnore( RString sMessage, RString sID );
-	Dialog::Result AbortRetry( RString sMessage, RString sID );
-	Dialog::Result YesNo( RString sMessage, RString sID );
+	void Error( const RString &sError, const RString &sID );
+	void OK( const RString &sMessage, const RString &sID );
+	Dialog::Result OKCancel( const RString &sMessage, const RString &sID );
+	Dialog::Result AbortRetryIgnore( const RString &sMessage, const RString &sID );
+	Dialog::Result AbortRetry( const RString &sMessage, const RString &sID );
+	Dialog::Result YesNo( const RString &sMessage, const RString &sID );
 };
 #define USE_DIALOG_DRIVER_COCOA
 

diff --git a/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp b/src/arch/LoadingWindow/LoadingWindow_Gtk.cpp
@@ -78,7 +78,7 @@ LoadingWindow_Gtk::~LoadingWindow_Gtk()
 	Handle = NULL;
 }
 
-void LoadingWindow_Gtk::SetText( RString s )
+void LoadingWindow_Gtk::SetText( const RString &s )
 {
 	Module_SetText( s );
 }

diff --git a/src/arch/LoadingWindow/LoadingWindow_MacOSX.mm b/src/arch/LoadingWindow/LoadingWindow_MacOSX.mm
@@ -123,7 +123,7 @@ - (void) setIndeterminate:(NSNumber *)indeterminate
 	[pool release];
 }
 
-void LoadingWindow_MacOSX::SetText( RString str )
+void LoadingWindow_MacOSX::SetText( const RString &str )
 {
 	if( !g_Helper )
 		return;

diff --git a/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h b/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h
@@ -20,7 +20,7 @@ class LowLevelWindow_MacOSX : public LowLevelWindow
 public:
 	LowLevelWindow_MacOSX();
 	~LowLevelWindow_MacOSX();
-	void *GetProcAddress( RString s );
+	void *GetProcAddress( const RString &s );
 	RString TryVideoMode( const VideoModeParams& p, bool& newDeviceOut );	
 	void GetDisplayResolutions( DisplayResolutions &dr ) const;
 

diff --git a/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.mm b/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.mm
@@ -317,7 +317,7 @@ - (void) setParams:(NSValue *)params
 	[m_WindowDelegate release];
 }
 
-void *LowLevelWindow_MacOSX::GetProcAddress( RString s )
+void *LowLevelWindow_MacOSX::GetProcAddress( const RString &s )
 {
 	// http://developer.apple.com/qa/qa2001/qa1188.html
 	// Both functions mentioned in there are deprecated in 10.4.

diff --git a/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp b/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp
@@ -82,7 +82,7 @@ LowLevelWindow_X11::~LowLevelWindow_X11()
 	CloseXConnection();
 }
 
-void *LowLevelWindow_X11::GetProcAddress( RString s )
+void *LowLevelWindow_X11::GetProcAddress( const RString &s )
 {
 	// XXX: We should check whether glXGetProcAddress or
 	// glXGetProcAddressARB is available/not NULL, and go by that,

diff --git a/src/arch/LowLevelWindow/LowLevelWindow_X11.h b/src/arch/LowLevelWindow/LowLevelWindow_X11.h
@@ -12,7 +12,7 @@ class LowLevelWindow_X11 : public LowLevelWindow
 	LowLevelWindow_X11();
 	~LowLevelWindow_X11();
 
-	void *GetProcAddress(RString s);
+	void *GetProcAddress(const RString &s);
 	RString TryVideoMode(const VideoModeParams &p, bool &bNewDeviceOut);
 	void LogDebugInformation() const;
 	bool IsSoftwareRenderer( RString &sError );