diff 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
line wrap: on
line diff
--- a/kdiff3/src-QT4/kreplacements/kreplacements.cpp	Sat May 15 20:36:52 2010 +0000
+++ b/kdiff3/src-QT4/kreplacements/kreplacements.cpp	Mon May 17 18:35:51 2010 +0000
@@ -79,6 +79,7 @@
       }
 
 #ifndef Q_OS_OS2
+      char buf[256];
       HINSTANCE hi = FindExecutableA( helpFile.fileName().toAscii(), helpFile.absolutePath().toAscii(), buf );
       if ( int(hi)<=32 )
       {
@@ -1069,8 +1070,8 @@
             int len = pos==-1 ? optName.length() : pos;
             int len2 = arg.length();
 
-            if( len>0 && ( arg[1]=='-' && len2-2==len && optName.left(len) ==  arg.mid(2,len) ||
-                                          len2-1==len && optName.left(len) ==  arg.mid(1,len) ))
+            if( len>0 && ( (arg[1]=='-' && len2-2==len && optName.left(len) ==  arg.mid(2,len)) ||
+                                          (len2-1==len && optName.left(len) ==  arg.mid(1,len)) ))
             {
                if (s_options[j].description == 0)  // alias, because without description.
                {