[Lprof-devel] lprof/src/lprofqt lprofmain.cpp,1.151,1.152

[Hal E. <hv...@us...>]

Update of /cvsroot/lprof/lprof/src/lprofqt
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2212/src/lprofqt

Modified Files:
	lprofmain.cpp 
Log Message:
Fix error with profile file name checking code.

Index: lprofmain.cpp
===================================================================
RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.cpp,v
retrieving revision 1.151
retrieving revision 1.152
diff -C2 -d -r1.151 -r1.152
*** lprofmain.cpp	22 Sep 2007 21:03:18 -0000	1.151
--- lprofmain.cpp	24 Sep 2007 23:53:58 -0000	1.152
***************
*** 1967,1973 ****
      // FIXME will this work on Windows?  Need to test it.
  #ifdef __WIN32__
!     pos = fn.findRev('\\', fn.length() -1, FALSE);
  #else
!     pos = fn.findRev('/', fn.length() -1, FALSE);
  #endif  
      qDebug(fn);
--- 1967,1973 ----
      // FIXME will this work on Windows?  Need to test it.
  #ifdef __WIN32__
!     pos = fn.findRev('\\', -1, FALSE);
  #else
!     pos = fn.findRev('/', -1, FALSE);
  #endif  
      qDebug(fn);
***************
*** 1975,1982 ****
      if (d.exists(fn.left(pos)))
      { 
!         // qDebug("fn.length() = %i", fn.length());
!         // qDebug("pos of .i = %i", fn.findRev(".i"));
!         // qDebug("pos of c = %i", fn.findRev("c", -2 ));
!         // qDebug("pos of m = %i", fn.findRev("m"));
          if ((fn.findRev(".i") == fn.length() - 4  || fn.findRev(".I") == fn.length() - 4) &&         // .i or ,I &&
              (fn.findRev("C", -2 ) == fn.length() - 2 ||  fn.findRev("c", -2 ) == fn.length() - 2) && // c or C &&
--- 1975,1982 ----
      if (d.exists(fn.left(pos)))
      { 
!         qDebug("fn.length() = %i", fn.length());
!         qDebug("pos of .i = %i", fn.findRev(".i"));
!         qDebug("pos of c = %i", fn.findRev("c", -2 ));
!         qDebug("pos of m = %i", fn.findRev("m"));
          if ((fn.findRev(".i") == fn.length() - 4  || fn.findRev(".I") == fn.length() - 4) &&         // .i or ,I &&
              (fn.findRev("C", -2 ) == fn.length() - 2 ||  fn.findRev("c", -2 ) == fn.length() - 2) && // c or C &&
***************
*** 3224,3228 ****
      {
          profile = OutputFileEdit_Mon -> text().mid(OutputFileEdit_Mon -> text().findRev('/') + 1,
!                                                                                OutputFileEdit_Mon -> text().length() - OutputFileEdit_Mon -> text().findRev('/') - 1);
          cs_profile = false;
          settings->writeEntry("/LPROF/profile-"    +
--- 3224,3228 ----
      {
          profile = OutputFileEdit_Mon -> text().mid(OutputFileEdit_Mon -> text().findRev('/') + 1,
!                    OutputFileEdit_Mon -> text().length() - OutputFileEdit_Mon -> text().findRev('/') - 1);
          cs_profile = false;
          settings->writeEntry("/LPROF/profile-"    +