Mac build fix and clean up

Author: maxim-productengine

indra/newview/llfloaterdirectory.cpp

@@ -46,7 +46,6 @@
 
 LLFloaterDirectory::LLFloaterDirectory(const std::string& name)
 :   LLFloater(name),
-    mMinimizing(false),
     mPanelAvatarp(nullptr),
     mPanelGroupp(nullptr),
     mPanelPlacep(nullptr),

indra/newview/llfloaterdirectory.h

@@ -73,7 +73,6 @@ class LLFloaterDirectory : public LLFloater
     LLPanelClassifiedInfo* mPanelClassifiedp;
 
 private:
-    bool mMinimizing; // HACK: see reshape() for details
     static LLFloaterDirectory *sInstance;
 };
 

indra/newview/llpaneldirbrowser.cpp

@@ -70,7 +70,7 @@ LLPanelDirBrowser::LLPanelDirBrowser()
     mCurrentSortColumn("name"),
     mCurrentSortAscending(true),
     mSearchStart(0),
-    mResultsPerPage(100),
+    mResultsPerPage(RESULTS_PER_PAGE_DEFAULT),
     mResultsReceived(0),
     mMinSearchChars(1),
     mResultsContents(),

indra/newview/llpaneldirbrowser.h

@@ -45,9 +45,9 @@ class LLPanelDirBrowser: public LLPanel
     void setFloaterDirectory(LLFloaterDirectory* floater) { mFloaterDirectory = floater; }
 
     // Use to get periodic updates.
-    virtual void draw();
+    void draw() override;
 
-    virtual void onVisibilityChange(bool curVisibilityIn);
+    void onVisibilityChange(bool curVisibilityIn) override;
 
     // Redo your search for the prev/next page of results
     virtual void prevPage();
@@ -139,6 +139,9 @@ class LLPanelDirBrowser: public LLPanel
     LLButton* mNextPageBtn;
 };
 
+constexpr S32 RESULTS_PER_PAGE_DEFAULT = 100;
+constexpr S32 RESULTS_PER_PAGE_EVENTS = 200;
+
 // Codes used for sorting by type.
 const S32 INVALID_CODE = -1;
 const S32 EVENT_CODE = 0;

indra/newview/llpaneldirclassified.cpp

@@ -62,6 +62,7 @@ bool LLPanelDirClassified::postBuild()
     LLPanelDirBrowser::postBuild();
 
     childSetAction("Search", onClickSearchCore, this);
+    setDefaultBtn("Search");
     return true;
 }
 

indra/newview/llpaneldirevents.cpp

@@ -45,12 +45,14 @@
 
 static LLPanelInjector<LLPanelDirEvents> t_panel_dir_events("panel_dir_events");
 
+constexpr S32 DAY_TO_SEC = 24 * 60 * 60;
+
 LLPanelDirEvents::LLPanelDirEvents()
     : LLPanelDirBrowser(),
     mDay(0)
 {
     // more results per page for this
-    mResultsPerPage = 200;
+    mResultsPerPage = RESULTS_PER_PAGE_EVENTS;
 }
 
 bool LLPanelDirEvents::postBuild()
@@ -59,8 +61,8 @@ bool LLPanelDirEvents::postBuild()
 
     childSetCommitCallback("date_mode", onDateModeCallback, this);
 
-    childSetAction("<<", onBackBtn, this);
-    childSetAction(">>", onForwardBtn, this);
+    childSetAction("back_btn", onBackBtn, this);
+    childSetAction("forward_btn", onForwardBtn, this);
 
     childSetCommitCallback("mature", onCommitMature, this);
 
@@ -88,7 +90,7 @@ void LLPanelDirEvents::setDay(S32 day)
     time_t utc_time = time_corrected();
 
     // Correct for offset
-    utc_time += day * 24 * 60 * 60;
+    utc_time += day * DAY_TO_SEC;
 
     // There's only one internal tm buffer.
     struct tm* internal_time;
@@ -120,7 +122,7 @@ void LLPanelDirEvents::performQueryOrDelete(U32 event_id)
     time_t utc_time = time_corrected();
 
     // Correct for offset
-    utc_time += relative_day * 24 * 60 * 60;
+    utc_time += relative_day * DAY_TO_SEC;
 
     // There's only one internal tm buffer.
     struct tm* internal_time;
@@ -208,13 +210,13 @@ void LLPanelDirEvents::onDateModeCallback(LLUICtrl* ctrl, void *data)
     LLPanelDirEvents* self = (LLPanelDirEvents*)data;
     if (self->childGetValue("date_mode").asString() == "date")
     {
-        self->childEnable(">>");
-        self->childEnable("<<");
+        self->childEnable("forward_btn");
+        self->childEnable("back_btn");
     }
     else
     {
-        self->childDisable(">>");
-        self->childDisable("<<");
+        self->childDisable("forward_btn");
+        self->childDisable("back_btn");
     }
 }
 

indra/newview/llpaneldirevents.h

@@ -40,7 +40,7 @@ class LLPanelDirEvents : public LLPanelDirBrowser
 
     bool postBuild() override;
 
-    /*virtual*/ void performQuery();
+    /*virtual*/ void performQuery() override;
 
     void performQueryOrDelete(U32 event_id);
 

indra/newview/llpaneldirgroups.cpp

@@ -49,7 +49,6 @@ bool LLPanelDirGroups::postBuild()
     //getChild<LLLineEditor>("name")->setKeystrokeCallback(boost::bind(&LLPanelDirBrowser::onKeystrokeName, _1, _2), NULL);
 
     childSetAction("Search", &LLPanelDirBrowser::onClickSearchCore, this);
-    //childDisable("Search");
     setDefaultBtn( "Search" );
 
     return true;

indra/newview/llpaneldirpeople.cpp

@@ -49,7 +49,6 @@ bool LLPanelDirPeople::postBuild()
     //getChild<LLLineEditor>("name")->setKeystrokeCallback(boost::bind(&LLPanelDirBrowser::onKeystrokeName, _1, _2), NULL);
 
     childSetAction("Search", &LLPanelDirBrowser::onClickSearchCore, this);
-    //childDisable("Search");
     setDefaultBtn( "Search" );
 
     return true;

indra/newview/llpaneldirplaces.cpp

@@ -60,7 +60,7 @@ bool LLPanelDirPlaces::postBuild()
     //getChild<LLLineEditor>("name")->setKeystrokeCallback(boost::bind(&LLPanelDirBrowser::onKeystrokeName, _1, _2), NULL);
 
     childSetAction("Search", &LLPanelDirBrowser::onClickSearchCore, this);
-    //childDisable("Search");
+    setDefaultBtn("Search");
 
     mCurrentSortColumn = "dwell";
     mCurrentSortAscending = false;