Skip to content

Commit

Permalink
typedefs -> using (progress with #66)
Browse files Browse the repository at this point in the history
Alba
  • Loading branch information
jlblancoc committed Mar 29, 2018
1 parent 8c633ad commit b5bfb44
Show file tree
Hide file tree
Showing 86 changed files with 2,517 additions and 2,730 deletions.
6 changes: 3 additions & 3 deletions apps/RawLogViewer/CFormChangeSensorPositions.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ class CFormChangeSensorPositions : public wxDialog
{
public:
/** Used in executeOperationOnRawlogFiles
*/
typedef void (*TRawlogFilter)(
*/
using TRawlogFilter = void (*)(
mrpt::obs::CActionCollection* acts, mrpt::obs::CSensoryFrame* SF,
int& changesCount);

/** This is the common function for all operations over a rawlog file
* ("filter" a rawlog file into a new one) or over the loaded rawlog
* (depending on the user selection in the GUI).
*/
*/
void executeOperationOnRawlog(TRawlogFilter operation, const char* endMsg);

CFormChangeSensorPositions(wxWindow* parent, wxWindowID id = wxID_ANY);
Expand Down
6 changes: 3 additions & 3 deletions apps/RawLogViewer/CFormEdit.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ class CFormEdit : public wxDialog
virtual ~CFormEdit();

/** Used in executeOperationOnRawlogFiles
*/
typedef void (*TRawlogFilter)(
*/
using TRawlogFilter = void (*)(
mrpt::obs::CActionCollection* acts, mrpt::obs::CSensoryFrame* SF,
int& changesCount);
/** This is the common function for all operations over a rawlog file
* ("filter" a rawlog file into a new one) or over the loaded rawlog
* (depending on the user selection in the GUI).
*/
*/
void executeOperationOnRawlog(TRawlogFilter operation, const char* endMsg);

//(*Identifiers(CFormEdit)
Expand Down
19 changes: 10 additions & 9 deletions apps/RawLogViewer/CRawlogTreeView.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ enum TRawlogTreeViewEvent
class CRawlogTreeView;

/** The type for event handler
*/
typedef void (*wxRawlogTreeEventFunction)(
*/
using wxRawlogTreeEventFunction = void (*)(
wxWindow* me, CRawlogTreeView* the_tree, TRawlogTreeViewEvent ev,
int item_index, const mrpt::serialization::CSerializable::Ptr& item_data);

Expand All @@ -40,7 +40,7 @@ class CRawlogTreeView : public wxScrolledWindow
{
public:
/** Constructor
*/
*/
CRawlogTreeView(
wxWindow* parent = nullptr, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,
Expand All @@ -55,23 +55,23 @@ class CRawlogTreeView : public wxScrolledWindow
void AssignImageList(wxImageList* imageList) { m_imageList = imageList; }
/** Sets the rawlog to be rendered in the control (It's kept as a pointer,
* so the original object cannot be destroyed).
* It automatically calls "reloadFromRawlog".
*/
* It automatically calls "reloadFromRawlog".
*/
void setRawlogSource(mrpt::obs::CRawlog* rawlog);

/** Sets the name of the rawlog file, used for the root item */
void setRawlogName(const std::string& s) { m_rawlog_name = s; }
/** Reloads from the rawlog: it adapts the size of the scroll window and
* refresh the view.
*/
*/
void reloadFromRawlog(int hint_rawlog_items = -1);

/** Sets a handler for the event of selected item changes.
*/
*/
void ConnectSelectedItemChange(wxRawlogTreeEventFunction func);

/** This method MUST be called to obtain feedback from events.
*/
*/
void setWinParent(wxWindow* win) { m_win_parent = win; }
/** Returns the time of the first element in the rawlog. */
mrpt::system::TTimeStamp getFirstTimestamp() const
Expand All @@ -83,6 +83,7 @@ class CRawlogTreeView : public wxScrolledWindow
* any. */
void SetSelectedItem(int index, bool force_refresh = false);
int GetSelectedItem() const { return m_selectedItem; }

protected:
/** A reference to the rawlog to be rendered. */
mrpt::obs::CRawlog* m_rawlog;
Expand Down Expand Up @@ -115,7 +116,7 @@ class CRawlogTreeView : public wxScrolledWindow

/** Returns an icon index depending on the class of the object in the tree
* view
*/
*/
static int iconIndexFromClass(const mrpt::rtti::TRuntimeClassId* class_ID);

static const int ROW_HEIGHT;
Expand Down
2 changes: 1 addition & 1 deletion apps/RawLogViewer/CScanAnimation.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class CScanAnimation : public wxDialog
mrpt::system::TTimeStamp timestamp;
mrpt::opengl::CRenderizable::Ptr obj;
};
typedef std::map<std::string, TRenderObject> TListGlObjects;
using TListGlObjects = std::map<std::string, TRenderObject>;
/** All the observations added to the map. */
TListGlObjects m_gl_objects;

Expand Down
Loading

0 comments on commit b5bfb44

Please sign in to comment.