Kaynağa Gözat

Change const string reference to const string type.

aster2013 12 yıl önce
ebeveyn
işleme
d83f982c57
28 değiştirilmiş dosya ile 41 ekleme ve 43 silme
  1. 1 1
      Source/Extras/LuaScript/pkgs/Core/Context.pkg
  2. 2 2
      Source/Extras/LuaScript/pkgs/Core/Object.pkg
  3. 3 3
      Source/Extras/LuaScript/pkgs/Core/Variant.pkg
  4. 1 1
      Source/Extras/LuaScript/pkgs/Engine/Console.pkg
  5. 1 1
      Source/Extras/LuaScript/pkgs/Graphics/Animation.pkg
  6. 1 1
      Source/Extras/LuaScript/pkgs/Graphics/AnimationController.pkg
  7. 1 1
      Source/Extras/LuaScript/pkgs/Graphics/Graphics.pkg
  8. 1 1
      Source/Extras/LuaScript/pkgs/IO/Deserializer.pkg
  9. 1 1
      Source/Extras/LuaScript/pkgs/IO/File.pkg
  10. 2 2
      Source/Extras/LuaScript/pkgs/IO/FileWatcher.pkg
  11. 1 1
      Source/Extras/LuaScript/pkgs/IO/PackageFile.pkg
  12. 1 1
      Source/Extras/LuaScript/pkgs/IO/VectorBuffer.pkg
  13. 1 1
      Source/Extras/LuaScript/pkgs/Input/Input.pkg
  14. 2 2
      Source/Extras/LuaScript/pkgs/LuaScript/LuaScriptInstance.pkg
  15. 1 1
      Source/Extras/LuaScript/pkgs/Network/Connection.pkg
  16. 2 2
      Source/Extras/LuaScript/pkgs/Network/HttpRequest.pkg
  17. 3 4
      Source/Extras/LuaScript/pkgs/Network/Network.pkg
  18. 1 1
      Source/Extras/LuaScript/pkgs/Resource/Resource.pkg
  19. 1 1
      Source/Extras/LuaScript/pkgs/Resource/ResourceCache.pkg
  20. 1 1
      Source/Extras/LuaScript/pkgs/Scene/Node.pkg
  21. 2 2
      Source/Extras/LuaScript/pkgs/Scene/Scene.pkg
  22. 1 1
      Source/Extras/LuaScript/pkgs/UI/DropDownList.pkg
  23. 4 4
      Source/Extras/LuaScript/pkgs/UI/FileSelector.pkg
  24. 1 2
      Source/Extras/LuaScript/pkgs/UI/LineEdit.pkg
  25. 1 1
      Source/Extras/LuaScript/pkgs/UI/Text.pkg
  26. 1 1
      Source/Extras/LuaScript/pkgs/UI/Text3D.pkg
  27. 1 1
      Source/Extras/LuaScript/pkgs/UI/UI.pkg
  28. 2 2
      Source/Extras/LuaScript/pkgs/UI/UIElement.pkg

+ 1 - 1
Source/Extras/LuaScript/pkgs/Core/Context.pkg

@@ -20,7 +20,7 @@ class Context
 {
     Object* GetEventSender() const;
     EventHandler* GetEventHandler() const;
-    const String& GetTypeName(ShortStringHash type) const;
+    const String GetTypeName(ShortStringHash type) const;
 };
 
 Context* GetContext();

+ 2 - 2
Source/Extras/LuaScript/pkgs/Core/Object.pkg

@@ -4,8 +4,8 @@ class Object : public RefCounted
 {
     ShortStringHash GetType() const;
     ShortStringHash GetBaseType() const;
-    const String& GetTypeName() const;
-    const String& GetCategory() const;
+    const String GetTypeName() const;
+    const String GetCategory() const;
 
     tolua_outside void ObjectSendEvent @ SendEvent(const String eventName, VariantMap* eventData = 0);
     

+ 3 - 3
Source/Extras/LuaScript/pkgs/Core/Variant.pkg

@@ -84,7 +84,7 @@ class Variant
     bool operator == (const Vector4& rhs) const;
     bool operator == (const Quaternion& rhs) const;
     bool operator == (const Color& rhs) const;
-    bool operator == (const String& rhs) const;
+    bool operator == (const String rhs) const;
     bool operator == (const ResourceRef& rhs) const;
     bool operator == (const ResourceRefList& rhs) const;
     bool operator == (const IntRect& rhs) const;
@@ -121,7 +121,7 @@ class Variant
     const Vector4& GetVector4() const;
     const Quaternion& GetQuaternion() const;
     const Color& GetColor() const;
-    const String& GetString() const;
+    const String GetString() const;
     tolua_outside VectorBuffer VariantGetBuffer @ GetBuffer() const;
     const ResourceRef& GetResourceRef() const;
     const ResourceRefList& GetResourceRefList() const;
@@ -175,7 +175,7 @@ class VariantMap
     tolua_outside const Vector4& VariantMapGetVector4 @ GetVector4(const String key);
     tolua_outside const Quaternion& VariantMapGetQuaternion @ GetQuaternion(const String key);
     tolua_outside const Color& VariantMapGetColor @ GetColor(const String key);
-    tolua_outside const String& VariantMapGetString @ GetString(const String key);
+    tolua_outside const String VariantMapGetString @ GetString(const String key);
     tolua_outside VectorBuffer VariantMapGetBuffer @ GetBuffer(const String key);
     tolua_outside const ResourceRef& VariantMapGetResourceRef @ GetResourceRef(const String key);
     tolua_outside const ResourceRefList& VariantMapGetResourceRefList @ GetResourceRefList(const String key);

+ 1 - 1
Source/Extras/LuaScript/pkgs/Engine/Console.pkg

@@ -16,7 +16,7 @@ class Console : public Object
     unsigned GetNumRows() const;
     unsigned GetNumHistoryRows() const;
     unsigned GetHistoryPosition() const;
-    const String& GetHistoryRow(unsigned index) const;
+    const String GetHistoryRow(unsigned index) const;
     
     tolua_property__get_set XMLFile* defaultStyle;
     tolua_readonly tolua_property__get_set BorderImage* background;

+ 1 - 1
Source/Extras/LuaScript/pkgs/Graphics/Animation.pkg

@@ -32,7 +32,7 @@ static const unsigned char CHANNEL_SCALE;
 
 class Animation : public Resource
 {
-    const String& GetAnimationName() const;
+    const String GetAnimationName() const;
     StringHash GetAnimationNameHash() const;
     float GetLength() const;
     unsigned GetNumTracks() const;

+ 1 - 1
Source/Extras/LuaScript/pkgs/Graphics/AnimationController.pkg

@@ -38,7 +38,7 @@ class AnimationController : public Component
     bool IsFadingOut(const String name) const;
     unsigned char GetLayer(const String name) const;
     Bone* GetStartBone(const String name) const;
-    const String& GetStartBoneName(const String name) const;
+    const String GetStartBoneName(const String name) const;
     
     float GetTime(const String name) const;
     float GetWeight(const String name) const;

+ 1 - 1
Source/Extras/LuaScript/pkgs/Graphics/Graphics.pkg

@@ -16,7 +16,7 @@ class Graphics : public Object
     
     bool IsInitialized() const;
     void* GetExternalWindow() const;
-    const String& GetWindowTitle() const;
+    const String GetWindowTitle() const;
     IntVector2 GetWindowPosition() const;
     int GetWidth() const;
     int GetHeight() const;

+ 1 - 1
Source/Extras/LuaScript/pkgs/IO/Deserializer.pkg

@@ -3,7 +3,7 @@ $#include "Deserializer.h"
 class Deserializer
 {
     unsigned Seek(unsigned position);
-    const String& GetName() const;
+    const String GetName() const;
     unsigned GetChecksum();
     unsigned GetPosition() const;
     unsigned GetSize() const;

+ 1 - 1
Source/Extras/LuaScript/pkgs/IO/File.pkg

@@ -27,7 +27,7 @@ class File : public Object
     
     // From Deserializer
         unsigned Seek(unsigned position);
-    const String& GetName() const;
+    const String GetName() const;
     unsigned GetChecksum();
     unsigned GetPosition() const;
     unsigned GetSize() const;

+ 2 - 2
Source/Extras/LuaScript/pkgs/IO/FileWatcher.pkg

@@ -2,8 +2,8 @@ $#include "FileWatcher.h"
 
 class FileWatcher : public Object
 {
-    bool StartWatching(const String& pathName, bool watchSubDirs);
+    bool StartWatching(const String pathName, bool watchSubDirs);
     void StopWatching();
     void AddChange(const String fileName);
-    const String& GetPath() const;
+    const String GetPath() const;
 };

+ 1 - 1
Source/Extras/LuaScript/pkgs/IO/PackageFile.pkg

@@ -18,7 +18,7 @@ class PackageFile : public Object
     const PackageEntry* GetEntry(const String fileName) const;
     const HashMap<String, PackageEntry>& GetEntries() const;
     
-    const String& GetName() const;
+    const String GetName() const;
     StringHash GetNameHash() const;
     unsigned GetNumFiles() const;
     unsigned GetTotalSize() const;

+ 1 - 1
Source/Extras/LuaScript/pkgs/IO/VectorBuffer.pkg

@@ -16,7 +16,7 @@ class VectorBuffer
     
     // From Deserializer
     unsigned Seek(unsigned position);
-    const String& GetName() const;
+    const String GetName() const;
     unsigned GetChecksum();
     unsigned GetPosition() const;
     unsigned GetSize() const;

+ 1 - 1
Source/Extras/LuaScript/pkgs/Input/Input.pkg

@@ -48,7 +48,7 @@ class Input : public Object
     unsigned GetNumTouches() const;
     TouchState* GetTouch(unsigned index) const;
     unsigned GetNumJoysticks() const;
-    const String& GetJoystickName(unsigned index) const;
+    const String GetJoystickName(unsigned index) const;
     JoystickState* GetJoystick(unsigned index);
     bool GetToggleFullscreen() const;
     bool IsMouseVisible() const;

+ 2 - 2
Source/Extras/LuaScript/pkgs/LuaScript/LuaScriptInstance.pkg

@@ -12,8 +12,8 @@ class LuaScriptInstance : public Component
     void ScriptSubscribeToEvent @ SubscribeToEvent(void* sender, const String eventName, const String functionName);
     void ScriptUnsubscribeFromEvent @ UnsubscribeFromEvent(void* sender, const String eventName);
     void ScriptUnsubscribeFromEvents @ UnsubscribeFromEvents(void* sender);
-    const String& GetScriptFileName() const;
-    const String& GetScriptObjectType() const;
+    const String GetScriptFileName() const;
+    const String GetScriptObjectType() const;
     
     tolua_property__get_set const String scriptFileName;
     tolua_property__get_set const String scriptObjectType;

+ 1 - 1
Source/Extras/LuaScript/pkgs/Network/Connection.pkg

@@ -46,7 +46,7 @@ class Connection : public Object
     unsigned short GetPort() const;
     String ToString() const;
     unsigned GetNumDownloads() const;
-    const String& GetDownloadName() const;
+    const String GetDownloadName() const;
     float GetDownloadProgress() const;
     
     tolua_property__get_set VariantMap& identity;

+ 2 - 2
Source/Extras/LuaScript/pkgs/Network/HttpRequest.pkg

@@ -10,8 +10,8 @@ enum HttpRequestState
 
 class HttpRequest : public Deserializer
 {
-    const String& GetURL() const;
-    const String& GetVerb() const;
+    const String GetURL() const;
+    const String GetVerb() const;
     String GetError() const;
     HttpRequestState GetState() const;
     unsigned GetAvailableSize() const;

+ 3 - 4
Source/Extras/LuaScript/pkgs/Network/Network.pkg

@@ -28,17 +28,16 @@ class Network
     void UnregisterRemoteEvent(const String eventType);
     
     void UnregisterAllRemoteEvents();
-    void SetPackageCacheDir(const String& path);
+    void SetPackageCacheDir(const String path);
     SharedPtr<HttpRequest> MakeHttpRequest(const String url, const String verb = String::EMPTY);
-    // SharedPtr<HttpRequest> MakeHttpRequest(const String url, const String verb = String::EMPTY, const Vector<String>& headers = Vector<String>(), const String& postData = String::EMPTY);
-
+    
     int GetUpdateFps() const;
     Connection* GetServerConnection() const;
     
     bool IsServerRunning() const;
     
     bool CheckRemoteEvent(StringHash eventType) const;
-    const String& GetPackageCacheDir() const;
+    const String GetPackageCacheDir() const;
     
     tolua_property__get_set int updateFps;
     tolua_readonly tolua_property__get_set Connection* serverConnection;

+ 1 - 1
Source/Extras/LuaScript/pkgs/Resource/Resource.pkg

@@ -2,7 +2,7 @@ $#include "Resource.h"
 
 class Resource
 {
-    const String& GetName() const;
+    const String GetName() const;
     StringHash GetNameHash() const;
     unsigned GetMemoryUse() const;
     

+ 1 - 1
Source/Extras/LuaScript/pkgs/Resource/ResourceCache.pkg

@@ -17,7 +17,7 @@ class ResourceCache
     unsigned GetMemoryBudget(ShortStringHash type) const;
     unsigned GetMemoryUse(ShortStringHash type) const;
     unsigned GetTotalMemoryUse() const;
-    const String& GetResourceName(StringHash nameHash) const;
+    const String GetResourceName(StringHash nameHash) const;
     String GetResourceFileName(const String name) const;
     
     bool GetAutoReloadResources() const;

+ 1 - 1
Source/Extras/LuaScript/pkgs/Scene/Node.pkg

@@ -106,7 +106,7 @@ class Node : public Serializable
     int GetScriptObject(const String scriptObjectType) const;
     
     unsigned GetID() const;
-    const String& GetName() const;
+    const String GetName() const;
     StringHash GetNameHash() const;
     Node* GetParent() const;
     Scene* GetScene() const;

+ 2 - 2
Source/Extras/LuaScript/pkgs/Scene/Scene.pkg

@@ -32,13 +32,13 @@ class Scene : public Node
     bool IsUpdateEnabled() const;
     bool IsAsyncLoading() const;
     float GetAsyncProgress() const;
-    const String& GetFileName() const;
+    const String GetFileName() const;
     unsigned GetChecksum() const;
     float GetTimeScale() const;
     float GetElapsedTime() const;
     float GetSmoothingConstant() const;
     float GetSnapThreshold() const;
-    const String& GetVarName(ShortStringHash hash) const;
+    const String GetVarName(ShortStringHash hash) const;
 
     void Update(float timeStep);
     void BeginThreadedUpdate();

+ 1 - 1
Source/Extras/LuaScript/pkgs/UI/DropDownList.pkg

@@ -22,7 +22,7 @@ class DropDownList : public Menu
     UIElement* GetSelectedItem() const;
     ListView* GetListView() const;
     UIElement* GetPlaceholder() const;
-    const String& GetPlaceholderText() const;
+    const String GetPlaceholderText() const;
     bool GetResizePopup() const;
     
     void SetSelectionAttr(unsigned index);

+ 4 - 4
Source/Extras/LuaScript/pkgs/UI/FileSelector.pkg

@@ -31,10 +31,10 @@ class FileSelector : public Object
     Button* GetOKButton() const;
     Button* GetCancelButton() const;
     Button* GetCloseButton() const;
-    const String& GetTitle() const;
-    const String& GetPath() const;
-    const String& GetFileName() const;
-    const String& GetFilter() const;
+    const String GetTitle() const;
+    const String GetPath() const;
+    const String GetFileName() const;
+    const String GetFilter() const;
     unsigned GetFilterIndex() const;
     bool GetDirectoryMode() const;
     

+ 1 - 2
Source/Extras/LuaScript/pkgs/UI/LineEdit.pkg

@@ -15,8 +15,7 @@ class LineEdit : public BorderImage
     void SetTextSelectable(bool enable);
     void SetTextCopyable(bool enable);
 
-
-    const String& GetText() const;
+    const String GetText() const;
     unsigned GetCursorPosition() const;
     float GetCursorBlinkRate() const;
     unsigned GetMaxLength() const;

+ 1 - 1
Source/Extras/LuaScript/pkgs/UI/Text.pkg

@@ -29,7 +29,7 @@ class Text : public UIElement
     
     Font* GetFont() const;
     int GetFontSize() const;
-    const String& GetText() const;
+    const String GetText() const;
     HorizontalAlignment GetTextAlignment() const;
     float GetRowSpacing() const;
     bool GetWordwrap() const;

+ 1 - 1
Source/Extras/LuaScript/pkgs/UI/Text3D.pkg

@@ -31,7 +31,7 @@ class Text3D : public Drawable
     Font* GetFont() const;
     Material* GetMaterial() const;
     int GetFontSize() const;
-    const String& GetText() const;
+    const String GetText() const;
     HorizontalAlignment GetTextAlignment() const;
     HorizontalAlignment GetHorizontalAlignment() const;
     VerticalAlignment GetVerticalAlignment() const;

+ 1 - 1
Source/Extras/LuaScript/pkgs/UI/UI.pkg

@@ -31,7 +31,7 @@ class UI : public Object
     UIElement* GetFocusElement() const;
     UIElement* GetFrontElement() const;
     IntVector2 GetCursorPosition() const;
-    const String& GetClipBoardText() const;
+    const String GetClipBoardText() const;
     float GetDoubleClickInterval() const;
     int GetMaxFontTextureSize() const;
     bool IsNonFocusedMouseWheel() const;

+ 2 - 2
Source/Extras/LuaScript/pkgs/UI/UIElement.pkg

@@ -140,7 +140,7 @@ class UIElement : public Serializable
     void SetTraversalMode(TraversalMode traversalMode);
     void SetElementEventSender(bool flag);
 
-    const String& GetName() const;
+    const String GetName() const;
     const IntVector2& GetPosition() const;
     const IntVector2& GetSize() const;
     int GetWidth() const;
@@ -177,7 +177,7 @@ class UIElement : public Serializable
     bool HasColorGradient() const;
     FocusMode GetFocusMode() const;
     unsigned GetDragDropMode() const;
-    const String& GetAppliedStyle() const;
+    const String GetAppliedStyle() const;
     XMLFile* GetDefaultStyle(bool recursiveUp = true) const;
     LayoutMode GetLayoutMode() const;
     int GetLayoutSpacing() const;