Subversion Repositories spk

Rev

Rev 160 | Rev 182 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 160 Rev 181
Line 176... Line 176...
176 
				if ( Diff.startDiff(_S(this->textBox2->Text)) ) {
 176 
				if ( Diff.startDiff(_S(this->textBox2->Text)) ) {
177 
					for(auto itr = list.begin(); itr != list.end(); itr++)
 177 
					for(auto itr = list.begin(); itr != list.end(); itr++)
178 
					{
 178 
					{
179 
						int status = (*itr)->data.toInt();
 179 
						int status = (*itr)->data.toInt();
180 
						if ( status == 2 ) { // in 2nd mod
 180 
						if ( status == 2 ) { // in 2nd mod
181 
							if ( CatFile.AppendFile(_S(this->textBox2->Text) + "::" + (*itr)->str, (*itr)->str) )
 181 
							if ( CatFile.appendFile(_S(this->textBox2->Text) + "::" + (*itr)->str, (*itr)->str) )
182 
								CatFile.WriteCatFile();
 182 
								CatFile.WriteCatFile();
183 
						}
 183 
						}
184 
						// finally, we need to diff the remaining files
 184 
						// finally, we need to diff the remaining files
185 
						else if ( status == -1 ) { // in both
 185 
						else if ( status == -1 ) { // in both
186 
							// only diffable files, we ignore the rest
 186 
							// only diffable files, we ignore the rest