Replace one CCI to another CCI on exisiting EA

I have an EA that does multiple functions.

1)  One of it, which uses CCI for entry. Literally, it has 8 lines of code that pertaining to CCI filter.  I want this particular CCI entry formula to another Indicator's formula. I would prefer to have formula included in the EA and not require external indicator for this.

Current CCI code is written as below:  I want to replace this with  similar CCI indicator's formula, which I will provide.  All other code shouldn't have to touch on current EA.  

int CheckCCI()

{

   int retval=0;

   double cci = iCCI(Symbol(),CCITimeFrame,CCIPeriod,CCIApplyTo,0);

   if(cci>CCILevel) retval=1;

   if(cci<CCILevel) retval=-1;

   return(retval);

}

2)  Also, this EA was written under old MT4 build and under current MT4 build, it gave warning when compile.  Current Warning message:  return value of 'order modify' should be check and I would like it to be corrected. So when I compile the EA, I don't see any warning message.