Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move AIAlert* into namespace AIAlert and rename classes.

Browse Source 
Instead of having several AI* classes, it turned out to be easier to
have a namespace: this allows me to define the classes in llcommon but
add (new) 'add' and 'add_modal' functions to 'AIAlert' in llui.
This is needed to avoid a collision with the 'add' functions in
LLNotificationsUtil.

The new add/add_modal makes it a lot easier to just show a caught
alert, prepending or appending new text: it turns out that that is
way more common then a re-throw.

Adjusted code as appropriate.
This commit is contained in:
Aleric Inglewood
2013-11-05 22:30:02 +01:00
parent 8ab9039ff6
commit c516a71804
14 changed files with 300 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
indra/llcommon/aialert.cpp
View File

@@ -25,43 +25,51 @@
*
* 02/11/2013
* - Initial version, written by Aleric Inglewood @ SL
*
* 05/11/2013
* Moved everything in namespace AIAlert, except AIArgs.
*/
#include "aialert.h"
AIAlert::AIAlert(AIAlertPrefix const& prefix, modal_nt type,
std::string const& xml_desc, AIArgs const& args) : mModal(type)
namespace AIAlert
{
if (prefix) mLines.push_back(AIAlertLine(prefix));
mLines.push_back(AIAlertLine(xml_desc, args));
Error::Error(Prefix const& prefix, modal_nt type,
std::string const& xml_desc, AIArgs const& args) : mModal(type)
{
if (prefix) mLines.push_back(Line(prefix));
mLines.push_back(Line(xml_desc, args));
}
AIAlert::AIAlert(AIAlertPrefix const& prefix, modal_nt type,
AIAlert const& alert,
std::string const& xml_desc, AIArgs const& args) : mLines(alert.mLines), mModal(type)
Error::Error(Prefix const& prefix, modal_nt type,
Error const& alert,
std::string const& xml_desc, AIArgs const& args) : mLines(alert.mLines), mModal(type)
{
if (alert.mModal == modal) mModal = modal;
if (prefix) mLines.push_back(AIAlertLine(prefix, !mLines.empty()));
mLines.push_back(AIAlertLine(xml_desc, args));
if (prefix) mLines.push_back(Line(prefix, !mLines.empty()));
mLines.push_back(Line(xml_desc, args));
}
AIAlert::AIAlert(AIAlertPrefix const& prefix, modal_nt type,
std::string const& xml_desc,
AIAlert const& alert) : mLines(alert.mLines), mModal(type)
Error::Error(Prefix const& prefix, modal_nt type,
std::string const& xml_desc,
Error const& alert) : mLines(alert.mLines), mModal(type)
{
if (alert.mModal == modal) mModal = modal;
if (!mLines.empty()) { mLines.front().set_newline(); }
mLines.push_front(AIAlertLine(xml_desc));
if (prefix) mLines.push_front(AIAlertLine(prefix));
mLines.push_front(Line(xml_desc));
if (prefix) mLines.push_front(Line(prefix));
}
AIAlert::AIAlert(AIAlertPrefix const& prefix, modal_nt type,
std::string const& xml_desc, AIArgs const& args,
AIAlert const& alert) : mLines(alert.mLines), mModal(type)
Error::Error(Prefix const& prefix, modal_nt type,
std::string const& xml_desc, AIArgs const& args,
Error const& alert) : mLines(alert.mLines), mModal(type)
{
if (alert.mModal == modal) mModal = modal;
if (!mLines.empty()) { mLines.front().set_newline(); }
mLines.push_front(AIAlertLine(xml_desc, args));
if (prefix) mLines.push_front(AIAlertLine(prefix));
mLines.push_front(Line(xml_desc, args));
if (prefix) mLines.push_front(Line(prefix));
}
} // namespace AIAlert