comparison kdiff3/src-QT4/kreplacements/kreplacements.cpp @ 99:f0c42ddbbda4

Fixed compilation for windows.
author joachim99
date Mon, 17 May 2010 18:35:51 +0000
parents 6f42f5bd218e
children 4bac4535ea7f
comparison
equal deleted inserted replaced
98:236f1c9c3fbf 99:f0c42ddbbda4
77 " http://kdiff3.sourceforge.net/"); 77 " http://kdiff3.sourceforge.net/");
78 return; 78 return;
79 } 79 }
80 80
81 #ifndef Q_OS_OS2 81 #ifndef Q_OS_OS2
82 char buf[256];
82 HINSTANCE hi = FindExecutableA( helpFile.fileName().toAscii(), helpFile.absolutePath().toAscii(), buf ); 83 HINSTANCE hi = FindExecutableA( helpFile.fileName().toAscii(), helpFile.absolutePath().toAscii(), buf );
83 if ( int(hi)<=32 ) 84 if ( int(hi)<=32 )
84 { 85 {
85 #endif 86 #endif
86 static QTextBrowser* pBrowser = 0; 87 static QTextBrowser* pBrowser = 0;
1067 QString optName = s_options[j].name; 1068 QString optName = s_options[j].name;
1068 int pos = optName.indexOf( ' ' ); 1069 int pos = optName.indexOf( ' ' );
1069 int len = pos==-1 ? optName.length() : pos; 1070 int len = pos==-1 ? optName.length() : pos;
1070 int len2 = arg.length(); 1071 int len2 = arg.length();
1071 1072
1072 if( len>0 && ( arg[1]=='-' && len2-2==len && optName.left(len) == arg.mid(2,len) || 1073 if( len>0 && ( (arg[1]=='-' && len2-2==len && optName.left(len) == arg.mid(2,len)) ||
1073 len2-1==len && optName.left(len) == arg.mid(1,len) )) 1074 (len2-1==len && optName.left(len) == arg.mid(1,len)) ))
1074 { 1075 {
1075 if (s_options[j].description == 0) // alias, because without description. 1076 if (s_options[j].description == 0) // alias, because without description.
1076 { 1077 {
1077 ++j; 1078 ++j;
1078 optName = s_options[j].name; 1079 optName = s_options[j].name;