eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

iMaxElements is not required for function AddStringFiFoWithCompare

Browse source
This commit is contained in:
Volker Fischer 2013-02-23 21:09:14 +00:00
parent 4bffd4edcd
commit b83f14a2eb
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/llconclientdlg.cpp
View file

@ -853,8 +853,7 @@ void CLlconClientDlg::ConnectDisconnect ( const bool bDoStart,
{
// store new address at the top of the list, if the list was already
// full, the last element is thrown out
pClient->vstrIPAddress.AddStringFiFoWithCompare ( strSelectedAddress,
MAX_NUM_SERVER_ADDR_ITEMS );
pClient->vstrIPAddress.AddStringFiFoWithCompare ( strSelectedAddress );
}
// everything was ok with the connection dialog, set flag

12
src/util.h
View file

@ -112,8 +112,7 @@ public:
void Enlarge ( const int iAddedSize );
void Add ( const TData& tI ) { Enlarge ( 1 ); pData[iVectorSize - 1] = tI; }
void AddStringFiFoWithCompare ( const QString strNewValue,
const int iMaxElements );
void AddStringFiFoWithCompare ( const QString strNewValue );
inline int Size() const { return iVectorSize; }
@ -207,10 +206,9 @@ template<class TData> void CVector<TData>::Reset ( const TData tResetVal )
}
// note: this is only supported for string vectors
template<class TData> void CVector<TData>::AddStringFiFoWithCompare ( const QString strNewValue,
const int iMaxElements )
template<class TData> void CVector<TData>::AddStringFiFoWithCompare ( const QString strNewValue )
{
CVector<QString> vstrTempList ( iMaxElements, "" );
CVector<QString> vstrTempList ( iVectorSize, "" );
// store the new element in the current storage list at
// the top, make sure we do not have more than allowed stored
@ -218,12 +216,12 @@ template<class TData> void CVector<TData>::AddStringFiFoWithCompare ( const QStr
vstrTempList[0] = strNewValue;
int iTempListCnt = 1;
for ( int iIdx = 0; iIdx < iMaxElements; iIdx++ )
for ( int iIdx = 0; iIdx < iVectorSize; iIdx++ )
{
// only add old element if it is not the same as the
// selected one
if ( ( pData[iIdx].compare ( strNewValue ) ) &&
( iTempListCnt < iMaxElements ) )
( iTempListCnt < iVectorSize ) )
{
vstrTempList[iTempListCnt] = pData[iIdx];