From 27ab895381639f75f61d999fa19a3aa07385a244 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 10 Apr 2013 16:10:50 -0700 Subject: [PATCH] have MenuColumn constructor take const char* --- interface/src/MenuColumn.cpp | 2 +- interface/src/MenuColumn.h | 2 +- interface/src/MenuRow.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/MenuColumn.cpp b/interface/src/MenuColumn.cpp index 6c66aefc06..496ed65956 100644 --- a/interface/src/MenuColumn.cpp +++ b/interface/src/MenuColumn.cpp @@ -13,7 +13,7 @@ MenuColumn::MenuColumn() { } -MenuColumn::MenuColumn(char * columnName) { +MenuColumn::MenuColumn(const char* columnName) { int length = std::min(MAX_COLUMN_NAME - 1,(int) strlen(columnName)); strncpy(this->columnName, columnName, length); this->columnName[length] = '\0'; diff --git a/interface/src/MenuColumn.h b/interface/src/MenuColumn.h index f7ce2853e5..c9dd24bbf7 100644 --- a/interface/src/MenuColumn.h +++ b/interface/src/MenuColumn.h @@ -5,7 +5,7 @@ class MenuColumn { public: MenuColumn(); - MenuColumn(char * columnName); + MenuColumn(const char* columnName); ~MenuColumn(); void mouseClickRow(int iColumnIndex); bool mouseClick(int x, int y, int xLeft, int menuHeight, int lineHeight); diff --git a/interface/src/MenuRow.h b/interface/src/MenuRow.h index 2d52295927..049bfac012 100644 --- a/interface/src/MenuRow.h +++ b/interface/src/MenuRow.h @@ -10,7 +10,7 @@ typedef int(*MenuRowCallback)(int); class MenuRow { public: MenuRow(); - MenuRow(const char * rowName, MenuRowCallback callback); + MenuRow(const char* rowName, MenuRowCallback callback); ~MenuRow(); void call(); char * getName();