Replaced _init_roster_() _delete_roster_() by static functions in BRoster::Private.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11033 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -63,11 +63,11 @@ public:
|
|||||||
void SaveRecentLists(const char *file) const
|
void SaveRecentLists(const char *file) const
|
||||||
{ fRoster->SaveRecentLists(file); }
|
{ fRoster->SaveRecentLists(file); }
|
||||||
|
|
||||||
|
static void InitBeRoster();
|
||||||
|
static void DeleteBeRoster();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
BRoster *fRoster;
|
BRoster *fRoster;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern "C" int _init_roster_();
|
|
||||||
extern "C" int _delete_roster_();
|
|
||||||
|
|
||||||
#endif // _ROSTER_PRIVATE_H
|
#endif // _ROSTER_PRIVATE_H
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ initialize_before()
|
|||||||
DBG(OUT("initialize_before()\n"));
|
DBG(OUT("initialize_before()\n"));
|
||||||
|
|
||||||
_init_message_();
|
_init_message_();
|
||||||
_init_roster_();
|
BRoster::Private::InitBeRoster();
|
||||||
BPrivate::init_clipboard();
|
BPrivate::init_clipboard();
|
||||||
|
|
||||||
DBG(OUT("initialize_before() done\n"));
|
DBG(OUT("initialize_before() done\n"));
|
||||||
@@ -55,7 +55,7 @@ terminate_after()
|
|||||||
{
|
{
|
||||||
DBG(OUT("terminate_after()\n"));
|
DBG(OUT("terminate_after()\n"));
|
||||||
|
|
||||||
_delete_roster_();
|
BRoster::Private::DeleteBeRoster();
|
||||||
_delete_message_();
|
_delete_message_();
|
||||||
_msg_cache_cleanup_();
|
_msg_cache_cleanup_();
|
||||||
|
|
||||||
|
|||||||
@@ -98,36 +98,24 @@ BRoster::Private::IsMessengerValid(bool mime) const
|
|||||||
: fRoster->fMess.IsValid()));
|
: fRoster->fMess.IsValid()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// InitBeRoster
|
||||||
// _init_roster_
|
|
||||||
/*! \brief Initializes the global be_roster variable.
|
/*! \brief Initializes the global be_roster variable.
|
||||||
|
|
||||||
Called before the global constructors are invoked.
|
Called before the global constructors are invoked.
|
||||||
|
|
||||||
\return Unknown!
|
|
||||||
|
|
||||||
\todo Investigate what the return value means.
|
|
||||||
*/
|
*/
|
||||||
int
|
void
|
||||||
_init_roster_()
|
BRoster::Private::InitBeRoster()
|
||||||
{
|
{
|
||||||
be_roster = new BRoster;
|
be_roster = new BRoster;
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// _delete_roster_
|
// DeleteBeRoster
|
||||||
/*! \brief Deletes the global be_roster.
|
/*! \brief Deletes the global be_roster.
|
||||||
|
|
||||||
Called after the global destructors are invoked.
|
Called after the global destructors are invoked.
|
||||||
|
|
||||||
\return Unknown!
|
|
||||||
|
|
||||||
\todo Investigate what the return value means.
|
|
||||||
*/
|
*/
|
||||||
int
|
void
|
||||||
_delete_roster_()
|
BRoster::Private::DeleteBeRoster()
|
||||||
{
|
{
|
||||||
delete be_roster;
|
delete be_roster;
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user