Clean up LLUI and fix/add suggestions from VS (#2746)

# Conflicts:
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.h
#	indra/llwindow/llwindowsdl.cpp

1 files changed, 7 insertions, 7 deletions

diff --git a/indra/llui/llflatlistview.h b/indra/llui/llflatlistview.h
index 6d75e9f282..3c40f91ab0 100644
--- a/indra/llui/llflatlistview.h
+++ b/indra/llui/llflatlistview.h
@@ -126,10 +126,10 @@ public:
     /** Returns full rect of child panel */
     const LLRect& getItemsRect() const;
 
-    LLRect getRequiredRect() { return getItemsRect(); }
+    LLRect getRequiredRect() const { return getItemsRect(); }
 
     /** Returns distance between items */
-    const S32 getItemsPad() { return mItemPad; }
+    const S32 getItemsPad() const { return mItemPad; }
 
     /**
      * Adds and item and LLSD value associated with it to the list at specified position
@@ -264,7 +264,7 @@ public:
     void setCommitOnSelectionChange(bool b)     { mCommitOnSelectionChange = b; }
 
     /** Get number of selected items in the list */
-    U32 numSelected() const {return static_cast<U32>(mSelectedItemPairs.size()); }
+    U32 numSelected() const { return static_cast<U32>(mSelectedItemPairs.size()); }
 
     /** Get number of (visible) items in the list */
     U32 size(const bool only_visible_items = true) const;
@@ -294,8 +294,8 @@ public:
 
     void scrollToShowFirstSelectedItem();
 
-    void selectFirstItem    ();
-    void selectLastItem     ();
+    void selectFirstItem();
+    void selectLastItem();
 
     virtual S32 notify(const LLSD& info) ;
 
@@ -478,7 +478,7 @@ public:
     void setNoItemsMsg(const std::string& msg) { mNoItemsMsg = msg; }
     void setNoFilteredItemsMsg(const std::string& msg) { mNoFilteredItemsMsg = msg; }
 
-    bool getForceShowingUnmatchedItems();
+    bool getForceShowingUnmatchedItems() const;
 
     void setForceShowingUnmatchedItems(bool show);
 
@@ -486,7 +486,7 @@ public:
      * Sets up new filter string and filters the list.
      */
     void setFilterSubString(const std::string& filter_str, bool notify_parent);
-    std::string getFilterSubString() { return mFilterSubString; }
+    std::string getFilterSubString() const { return mFilterSubString; }
 
     /**
      * Filters the list, rearranges and notifies parent about shape changes.