[Lprof-devel] lprof/src/lprofqt config.cpp, 1.6, 1.7 griditem.cpp, 1.3, 1.4 imageitem.cpp, 1.3, 1.4 interfaces.cpp, 1.4, 1.5 lprofmain-priv.cpp, 1.3, 1.4 lprofmain-priv.h, 1.5, 1.6 lprofmain.cpp, 1.183, 1.184 lprofmain.h, 1.51, 1.52 main.cpp, 1.40, 1.41 slots.cpp, 1.3, 1.4

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

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

Modified Files:
	config.cpp griditem.cpp imageitem.cpp interfaces.cpp 
	lprofmain-priv.cpp lprofmain-priv.h lprofmain.cpp lprofmain.h 
	main.cpp slots.cpp 
Log Message:
Add -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII to the default build settings to prevent ambiguous handling of character strings.  Fixed all code to compile with these settings.

Add Qt::WStyle_Title to all constructors for windows and dialogs that are not full screen dialogs to make sure all window managers display a title.

Index: main.cpp
===================================================================
RCS file: /cvsroot/lprof/lprof/src/lprofqt/main.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** main.cpp	19 Feb 2008 21:02:47 -0000	1.40
--- main.cpp	6 Mar 2008 21:18:59 -0000	1.41
***************
*** 62,66 ****
      char execPath[512];
      
!     exec = getAppExecDir() + "/";
      strcpy(execPath, exec.local8Bit());
      if (setup_spyd2(execPath) == 0)
--- 62,66 ----
      char execPath[512];
      
!     exec = getAppExecDir() + QString::fromLocal8Bit("/");
      strcpy(execPath, exec.local8Bit());
      if (setup_spyd2(execPath) == 0)
***************
*** 91,99 ****
       // but also so the help system can locate the help files.
       // Otherwise it would be inside of the if below
!      prefix_path.truncate(prefix_path.find( QString("/build") ));
!      prefix_path = prefix_path + QString("/data");
       if ( dir->exists(prefix_path) )
       {
!          prefix_path = prefix_path + QString("/");
       }
       else
--- 91,99 ----
       // but also so the help system can locate the help files.
       // Otherwise it would be inside of the if below
!      prefix_path.truncate(prefix_path.find( QString::fromLocal8Bit("/build") ));
!      prefix_path = prefix_path + QString::fromLocal8Bit("/data");
       if ( dir->exists(prefix_path) )
       {
!          prefix_path = prefix_path + QString::fromLocal8Bit("/");
       }
       else
***************
*** 102,111 ****
            // not in the build directory so need to check for the /data subfolder of the bundle
            prefix_path = a;
!           prefix_path = prefix_path + QString("/data/");
  # else
            // not in the build directory so need to check for and remove /bin
            prefix_path = a;
            prefix_path.truncate(prefix_path.length()-3);
!           prefix_path = prefix_path + QString("share/lprof/data/");
  # endif /* __APPLE__ */	 
       }
--- 102,111 ----
            // not in the build directory so need to check for the /data subfolder of the bundle
            prefix_path = a;
!           prefix_path = prefix_path + QString::fromLocal8Bit("/data/");
  # else
            // not in the build directory so need to check for and remove /bin
            prefix_path = a;
            prefix_path.truncate(prefix_path.length()-3);
!           prefix_path = prefix_path + QString::fromLocal8Bit("share/lprof/data/");
  # endif /* __APPLE__ */	 
       }
***************
*** 124,133 ****
  	
      QTranslator translator( 0 );
!     // QString translations = ":/translations/lprof_" + (QString) QTextCodec::locale();
!     translator.load( (QString)"lprof_" + (QString) QTextCodec::locale(), ":/" );
      lprofApp -> installTranslator( &translator );
      
!     QString temp = getAppExecDir() + "/";
!     strcpy(execPath, temp.local8Bit());
      setup_spyd2(execPath);
  
--- 124,133 ----
  	
      QTranslator translator( 0 );
!     // QString::fromLocal8Bit translations = ":/translations/lprof_" + (QString::fromLocal8Bit) QTextCodec::locale();
!     translator.load( QString::fromLocal8Bit("lprof_") + QString::fromLocal8Bit(QTextCodec::locale()), QString::fromLocal8Bit(":/") );
      lprofApp -> installTranslator( &translator );
      
!     QString temp = getAppExecDir() + QString::fromLocal8Bit("/");
!     strcpy(execPath, temp.toLocal8Bit());
      setup_spyd2(execPath);
  

Index: slots.cpp
===================================================================
RCS file: /cvsroot/lprof/lprof/src/lprofqt/slots.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** slots.cpp	19 Feb 2008 21:02:48 -0000	1.3
--- slots.cpp	6 Mar 2008 21:18:59 -0000	1.4
***************
*** 109,134 ****
      // qDebug("lprofMain::slotLoad");
      zeroProgressBars();
!     QString dir = lprofSettings -> readEntry("/LPROF/Files/last_load_dir", QDir::homeDirPath());
  
      fn = Q3FileDialog::getOpenFileName( dir,
!                                        tr(QString("Image files (*.gif *.png *.jpg *.bmp *.pbm *.pgm *.pnm *.sun *.tif *.tiff *.viff *.GIF *.PNG *.JPG *.BMP *.PBM *.PGM *.PNM *.SUN *.TIF *.TIFF *.VIFF)\nAll files (*.*)")),
                                            this,
                                            "",
!                                           tr(QString("Select target image")));
  
[...1081 lines suppressed...]
      else
!         ui->MonMeasurementSheet -> setFilename("");
      if (monCalOK)
!         ui->MonCalibrationSheet -> setFilename(moncalFile);
      else
!         ui->MonCalibrationSheet -> setFilename("");
      slotIsAllReady();
  }
--- 1148,1158 ----
      monCal.exec();
      if (monMeasOK)
!         ui->MonMeasurementSheet -> setFilename(QString::fromLocal8Bit(monmeasFile));
      else
!         ui->MonMeasurementSheet -> setFilename(QString::fromLocal8Bit(""));
      if (monCalOK)
!         ui->MonCalibrationSheet -> setFilename(QString::fromLocal8Bit(moncalFile));
      else
!         ui->MonCalibrationSheet -> setFilename(QString::fromLocal8Bit(""));
      slotIsAllReady();
  }

Index: imageitem.cpp
===================================================================
RCS file: /cvsroot/lprof/lprof/src/lprofqt/imageitem.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** imageitem.cpp	19 Feb 2008 21:02:42 -0000	1.3
--- imageitem.cpp	6 Mar 2008 21:18:58 -0000	1.4
***************
*** 50,54 ****
      QFile in(InputProfile), out(OutputProfile);
      
!     qDebug("ImageItem::TransformImage InputProfile = " + InputProfile);
      
      if (in.exists() && out.exists())
--- 50,54 ----
      QFile in(InputProfile), out(OutputProfile);
      
!     qDebug("ImageItem::TransformImage InputProfile = " + InputProfile.toLocal8Bit());
      
      if (in.exists() && out.exists())
***************
*** 148,156 ****
      if (!vigra::isImage(file))
      {
!         QMessageBox mb( QTranslator::tr(QString("Load image failure")),
!                         QTranslator::tr(QString("This image format is unsupported by LPROF ") +
!                                 "on your system. Sorry. Supported ones " +
!                                 "are BMP, GIF, JPEG, PNG, PBM, PGM, " +
!                                 "PNM, PPM, SUN, TIFF and VIFF."),
                                  QMessageBox::Critical,
                                  QMessageBox::Ok | QMessageBox::Default,
--- 148,153 ----
      if (!vigra::isImage(file))
      {
!         QMessageBox mb( QTranslator::tr("Load image failure"),
!                         QTranslator::tr("This image format is unsupported by LPROF on your system. Sorry. Supported ones are BMP, GIF, JPEG, PNG, PBM, PGM, PNM, PPM, SUN, TIFF and VIFF."),
                                  QMessageBox::Critical,
                                  QMessageBox::Ok | QMessageBox::Default,
***************
*** 166,172 ****
      if (!(image_data->isColor()))
      {
!         QMessageBox mb( QTranslator::tr(QString("Load image failure")),
!                         QTranslator::tr(QString("This image is not a color RGB image.  ") +
!                                 "Only color images are supported at this time."),
                                  QMessageBox::Critical,
                                  QMessageBox::Ok | QMessageBox::Default,
--- 163,168 ----
      if (!(image_data->isColor()))
      {
!         QMessageBox mb( QTranslator::tr("Load image failure"),
!                         QTranslator::tr("This image is not a color RGB image.  Only color images are supported at this time."),
                                  QMessageBox::Critical,
                                  QMessageBox::Ok | QMessageBox::Default,
***************
*** 177,187 ****
      }
  
!     image_file_name = (QString) ImageFile;
!     QString pixtype = (QString) image_data->getPixelType();
!     int16lprof = (pixtype.contains( "INT16") > 0);
!     int32lprof = (pixtype.contains( "INT32") > 0);
!     uint8lprof = (pixtype.contains( "UINT8") > 0);
!     fltpixlprof = (pixtype.contains( "FLOAT") > 0);
!     dblpixlprof = (pixtype.contains( "DOUBLE") > 0);
  
      // try again
--- 173,183 ----
      }
  
!     image_file_name = ImageFile;
!     QString pixtype = QString::fromLocal8Bit(image_data->getPixelType());
!     int16lprof = (pixtype.contains(QString::fromLocal8Bit("INT16")) > 0);
!     int32lprof = (pixtype.contains(QString::fromLocal8Bit("INT32")) > 0);
!     uint8lprof = (pixtype.contains(QString::fromLocal8Bit("UINT8")) > 0);
!     fltpixlprof = (pixtype.contains(QString::fromLocal8Bit("FLOAT")) > 0);
!     dblpixlprof = (pixtype.contains(QString::fromLocal8Bit("DOUBLE")) > 0);
  
      // try again

Index: lprofmain-priv.h
===================================================================
RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain-priv.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** lprofmain-priv.h	19 Feb 2008 21:02:42 -0000	1.5
--- lprofmain-priv.h	6 Mar 2008 21:18:58 -0000	1.6
***************
*** 78,82 ****
  extern bool int16lprof, int32lprof, uint8lprof, fltpixlprof, dblpixlprof;
  
! extern QString* global_help_path;
  
  extern QAssistantClient* help;
--- 78,82 ----
  extern bool int16lprof, int32lprof, uint8lprof, fltpixlprof, dblpixlprof;
  
! extern QString global_help_path;
  
  extern QAssistantClient* help;
***************
*** 136,140 ****
  void init_env();
  
! void setupHelp(QString* g_path);
  
  void setData(uint i);
--- 136,140 ----
  void init_env();
  
! void setupHelp(QString &g_path);
  
  void setData(uint i);

Index: lprofmain.cpp
===================================================================
RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.cpp,v
retrieving revision 1.183
retrieving revision 1.184
diff -C2 -d -r1.183 -r1.184
*** lprofmain.cpp	1 Mar 2008 23:41:49 -0000	1.183
--- lprofmain.cpp	6 Mar 2008 21:18:58 -0000	1.184
***************
*** 148,152 ****
          // after issuing an error message fo the user.
          QString message;
!         message = (QString) getErrorMessage(); 
          QMessageBox mb( QTranslator::tr("Problem Getting List of Measurement Devices."),
                          message + QTranslator::tr("This error indicates some type of problem with accessing the devices or the Serial or USB ports on this machine.  A likely cause is not having access rights to the device.   Check your permissions to make sure you have USB, serial port access and access rights to these device."),
--- 148,152 ----
          // after issuing an error message fo the user.
          QString message;
!         message = QString::fromLocal8Bit(getErrorMessage()); 
          QMessageBox mb( QTranslator::tr("Problem Getting List of Measurement Devices."),
                          message + QTranslator::tr("This error indicates some type of problem with accessing the devices or the Serial or USB ports on this machine.  A likely cause is not having access rights to the device.   Check your permissions to make sure you have USB, serial port access and access rights to these device."),
***************
*** 184,190 ****
              {   // not USB device
                  
!                 temp = (QString)coms -> paths[position]->path;
!                 start = temp.find('(',0, TRUE) + 1;
!                 end = temp.find(')', 0, TRUE);
                  port = temp.mid(0, start -1);
                  
--- 184,190 ----
              {   // not USB device
                  
!                 temp = QString::fromLocal8Bit(coms -> paths[position]->path);
!                 start = temp.find(QChar::fromAscii('('), 0, TRUE) + 1;
!                 end = temp.find(QChar::fromAscii(')'), 0, TRUE);
                  port = temp.mid(0, start -1);
                  
***************
*** 197,203 ****
                  {
                      temp.sprintf("/LPROF/serial_instruments/port%i", j);
!                     strcpy(tempInst.port, lprofSettings->readEntry(temp, "").ascii());
!                     if (QString (sys.hdr.instArray[k].port) ==
!                         QString (tempInst.port))
                      {
                          sys.hdr.instArray[k].inst = instUnknown;
--- 197,203 ----
                  {
                      temp.sprintf("/LPROF/serial_instruments/port%i", j);
!                     strcpy(tempInst.port, lprofSettings->readEntry(temp, QString::fromLocal8Bit("")).toLocal8Bit());
!                     if (QString::fromLocal8Bit(sys.hdr.instArray[k].port) ==
!                         QString::fromLocal8Bit(tempInst.port))
                      {
                          sys.hdr.instArray[k].inst = instUnknown;
***************
*** 232,240 ****
                  instD.Inst ==  instSpectrocam)
              {
!                 instD.name = instD.port + " " + QString (inst_name(instD.Inst));
              }
              else 
              {
!                 instD.name = instD.port + " " + QString (inst_name(instD.Inst)) + QTranslator::tr(" - Wrong type");
                  instD.deviceFlag = wrongType;
              }
--- 232,240 ----
                  instD.Inst ==  instSpectrocam)
              {
!                 instD.name = instD.port + QString::fromLocal8Bit(" ") + QString::fromLocal8Bit(inst_name(instD.Inst));
              }
              else 
              {
!                 instD.name = instD.port + QString::fromLocal8Bit(" ") + QString::fromLocal8Bit(inst_name(instD.Inst)) + QTranslator::tr(" - Wrong type");
                  instD.deviceFlag = wrongType;
              }
***************
*** 252,265 ****
                  instD.Inst ==  instI1Pro)
              {
!                 instD.name = instD.port + " " + QString (inst_name(instD.Inst));
              }
              else
              {
!                 instD.name = instD.port + " " + QString (inst_name(instD.Inst)) + QTranslator::tr(" - Wrong type");
                  instD.deviceFlag = wrongType;
              }
          }
          else if (instCap == all)
!             instD.name = instD.port + " " + QString (inst_name(instD.Inst));
      }
      else
--- 252,265 ----
                  instD.Inst ==  instI1Pro)
              {
!                 instD.name = instD.port + QString::fromLocal8Bit(" ") + QString::fromLocal8Bit(inst_name(instD.Inst));
              }
              else
              {
!                 instD.name = instD.port + QString::fromLocal8Bit(" ") + QString::fromLocal8Bit(inst_name(instD.Inst)) + QTranslator::tr(" - Wrong type");
                  instD.deviceFlag = wrongType;
              }
          }
          else if (instCap == all)
!             instD.name = instD.port + QString::fromLocal8Bit(" ") + QString::fromLocal8Bit(inst_name(instD.Inst));
      }
      else
***************
*** 281,285 ****
      int number;
  
!     sys.hdr.validInst = lprofSettings->readNumEntry( "/LPROF/numbers/instCount", 0);
      populatePortArray();
      spyd2FirmwareOK = TRUE;
--- 281,285 ----
      int number;
  
!     sys.hdr.validInst = lprofSettings->readNumEntry( QString::fromLocal8Bit("/LPROF/numbers/instCount"), 0);
      populatePortArray();
      spyd2FirmwareOK = TRUE;
***************
*** 292,296 ****
          // after issuing an error message fo the user.
          QString message;
!         message = (QString) getErrorMessage(); 
          QMessageBox mb( QTranslator::tr("Problem Getting List of Measurement Devices."),
                          message + QTranslator::tr("This error indicates some type of problem with accessing the devices or the Serial or USB ports on this machine.  A likely cause is not having access rights to the device.   Check your permissions to make sure you have USB, serial port access and access rights to these device."),
--- 292,296 ----
          // after issuing an error message fo the user.
          QString message;
!         message = QString::fromLocal8Bit( getErrorMessage()); 
          QMessageBox mb( QTranslator::tr("Problem Getting List of Measurement Devices."),
                          message + QTranslator::tr("This error indicates some type of problem with accessing the devices or the Serial or USB ports on this machine.  A likely cause is not having access rights to the device.   Check your permissions to make sure you have USB, serial port access and access rights to these device."),
***************
*** 311,321 ****
          for (i=0; i < number; i++)
          {
!             temp = (QString)coms -> paths[i]->path;
!             start = temp.find('(',0, TRUE) + 1;
!             end = temp.find(')', 0, TRUE);
              instName = temp.mid(start, end - start);
              port = temp.mid(0, start -1);
              instlist[i].deviceFlag = OK;
!             if ((coms -> paths[i]-> dev != NULL) || (port.left(3) == "hid"))
              {   // USB device
                  // qDebug(port + " " + instName);
--- 311,321 ----
          for (i=0; i < number; i++)
          {
!             temp = QString::fromLocal8Bit(coms -> paths[i]->path);
!             start = temp.find(QString::fromLocal8Bit("("), 0, TRUE) + 1;
!             end = temp.find(QString::fromLocal8Bit(")"), 0, TRUE);
              instName = temp.mid(start, end - start);
              port = temp.mid(0, start -1);
              instlist[i].deviceFlag = OK;
!             if ((coms -> paths[i]-> dev != NULL) || (coms -> paths[i]-> hev != NULL))
              {   // USB device
                  // qDebug(port + " " + instName);
***************
*** 324,328 ****
                  instlist[i].dupType = FALSE;
                  instlist[i].Inst = coms -> paths[i]-> itype;
!                 if (instName == "ColorVision Spyder2")
                  {
                      // check Spyder 2 to make sure the firmware is available
--- 324,328 ----
                  instlist[i].dupType = FALSE;
                  instlist[i].Inst = coms -> paths[i]-> itype;
!                 if (instName == QString::fromLocal8Bit("ColorVision Spyder2"))
                  {
                      // check Spyder 2 to make sure the firmware is available
***************
*** 345,349 ****
                  for (int j=0; j < count; j++)
                  {
!                     if (QString (sys.hdr.instArray[j].port) == port)
                      { 
                          instlist[i].Inst = sys.hdr.instArray[j].inst;
--- 345,349 ----
                  for (int j=0; j < count; j++)
                  {
!                     if (QString::fromLocal8Bit(sys.hdr.instArray[j].port) == port)
                      { 
                          instlist[i].Inst = sys.hdr.instArray[j].inst;
***************
*** 423,427 ****
      bool found = FALSE, notOK = FALSE, OK = FALSE;
          
!     sys.hdr.validInst = lprofSettings->readNumEntry( "/LPROF/numbers/instCount", 0);
      populatePortArray();
  
--- 423,427 ----
      bool found = FALSE, notOK = FALSE, OK = FALSE;
          
!     sys.hdr.validInst = lprofSettings->readNumEntry( QString::fromLocal8Bit("/LPROF/numbers/instCount"), 0);
      populatePortArray();
  
***************
*** 429,433 ****
      for (j=0; j < sys.hdr.validPorts; j++)
      { 
!         if (QString(sys.hdr.instArray[j].port) == newPort)
          {
              position = sys.hdr.instArray[j].pos;
--- 429,433 ----
      for (j=0; j < sys.hdr.validPorts; j++)
      { 
!         if (QString::fromLocal8Bit(sys.hdr.instArray[j].port) == newPort)
          {
              position = sys.hdr.instArray[j].pos;
***************
*** 513,517 ****
          {
              sys.hdr.instArray[index].inst = itype;
!             strcpy(sys.hdr.instArray[index].port, item -> text(1));
          }
          else
--- 513,517 ----
          {
              sys.hdr.instArray[index].inst = itype;
!             strcpy(sys.hdr.instArray[index].port, item -> text(1).toLocal8Bit());
          }
          else
***************
*** 541,545 ****
      // qDebug("instCount = %i", sys.hdr.validInst);
  
!     lprofSettings->writeEntry( "/LPROF/numbers/instCount", sys.hdr.validInst);
  
      // qDebug("save settings for serial devices and ports");
--- 541,545 ----
      // qDebug("instCount = %i", sys.hdr.validInst);
  
!     lprofSettings->writeEntry( QString::fromLocal8Bit("/LPROF/numbers/instCount"), sys.hdr.validInst);
  
      // qDebug("save settings for serial devices and ports");
***************
*** 547,551 ****
      {
          temp.sprintf("/LPROF/serial_instruments/port%i", j);
!         lprofSettings->writeEntry(temp, QString(sys.hdr.instArray[j].port));
          temp.sprintf("/LPROF/serial_instruments/instType%i", j);
          lprofSettings->writeEntry(temp, sys.hdr.instArray[j].inst);
--- 547,551 ----
      {
          temp.sprintf("/LPROF/serial_instruments/port%i", j);
!         lprofSettings->writeEntry(temp, sys.hdr.instArray[j].port);
          temp.sprintf("/LPROF/serial_instruments/instType%i", j);
          lprofSettings->writeEntry(temp, sys.hdr.instArray[j].inst);
***************
*** 555,559 ****
  void lprofMain::populatePortandInstListView()
  {
!     sys.hdr.validInst = lprofSettings->readNumEntry( "/LPROF/numbers/instCount", 0);
      populatePortArray();
      QString portnum, insttype;
--- 555,559 ----
  void lprofMain::populatePortandInstListView()
  {
!     sys.hdr.validInst = lprofSettings->readNumEntry( QString::fromLocal8Bit("/LPROF/numbers/instCount"), 0);
      populatePortArray();
      QString portnum, insttype;
***************
*** 580,592 ****
          if (sys.hdr.instArray[i].inst != instUnknown)
          {
!             if (validateIntrument(QString(sys.hdr.instArray[i].port), sys.hdr.instArray[i].inst))
!                 status = QString(tr("Device verified."));
              else
!                 status = QString(tr("Device failed verification."));
          }
          else
!             status = QString(tr("No device installed."));
          (void) new Q3ListViewItem(ui->listViewPortsInsts, portnum,
!          sys.hdr.instArray[i].port,
           ui->comboBoxDevice -> currentText(), status, insttype);
      }
--- 580,592 ----
          if (sys.hdr.instArray[i].inst != instUnknown)
          {
!             if (validateIntrument(QString::fromLocal8Bit(sys.hdr.instArray[i].port), sys.hdr.instArray[i].inst))
!                 status = tr("Device verified.");
              else
!                 status = tr("Device failed verification.");
          }
          else
!             status = tr("No device installed.");
          (void) new Q3ListViewItem(ui->listViewPortsInsts, portnum,
!          QString::fromLocal8Bit(sys.hdr.instArray[i].port),
           ui->comboBoxDevice -> currentText(), status, insttype);
      }
***************
*** 695,699 ****
          {
              case 's':
!                 Buffer = Buffer.arg(va_arg(args, char *));
                  break;
              case 'd':
--- 695,699 ----
          {
              case 's':
!                 Buffer = Buffer.arg(QString::fromLocal8Bit(va_arg(args, char *)));
                  break;
              case 'd':
***************
*** 893,897 ****
      }
  
!     cmsxIT8SaveToFile(it8, measfile);
      cmsxIT8Free(it8);
  }
--- 893,897 ----
      }
  
!     cmsxIT8SaveToFile(it8, measfile.toLocal8Bit());
      cmsxIT8Free(it8);
  }
***************
*** 941,947 ****
      
  #ifdef __WIN32__
!     pos = fn.findRev('\\', -1, FALSE);
  #else
!     pos = fn.findRev('/', -1, FALSE);
  #endif  
      
--- 941,947 ----
      
  #ifdef __WIN32__
!     pos = fn.findRev(QString::fromLocal8Bit("\\"), -1, FALSE);
  #else
!     pos = fn.findRev(QString::fromLocal8Bit("/"), -1, FALSE);
  #endif  
      
***************
*** 951,955 ****
      // but we should not allow writing to root
      // in any case
!     if (fn.left(1) == "/" && pos < 1)
          OK = FALSE;
      else
--- 951,955 ----
      // but we should not allow writing to root
      // in any case
!     if (fn.left(1) == QString::fromLocal8Bit("/") && pos < 1)
          OK = FALSE;
      else
***************
*** 971,982 ****
      if (OK)
      { 
!         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 &&
!             ((fn.findRev("C" ) == (fn.length() - 1) ||  
!                     fn.findRev("c") ==  (fn.length() - 1)) ||        // c  or C
!             (fn.findRev("M" ) == (fn.length() - 1) ||  
!                     fn.findRev("m" ) ==  (fn.length() -1 ))))         // or m or M
          {
              //  the directory and extension are OK
--- 971,982 ----
      if (OK)
      { 
!         if ((fn.findRev(QString::fromLocal8Bit(".i")) == (fn.length() - 4)  || 
!              fn.findRev(QString::fromLocal8Bit(".I")) == (fn.length() - 4)) &&         // .i or ,I &&
!              (fn.findRev(QString::fromLocal8Bit("C"), -2 ) == (fn.length() - 2) ||  
!              fn.findRev(QString::fromLocal8Bit("c"), -2 ) == (fn.length() - 2)) && // c or C &&
!              ((fn.findRev(QString::fromLocal8Bit("C") ) == (fn.length() - 1) ||  
!                      fn.findRev(QString::fromLocal8Bit("c")) ==  (fn.length() - 1)) ||        // c  or C
!              (fn.findRev(QString::fromLocal8Bit("M")) == (fn.length() - 1) ||  
!                      fn.findRev(QString::fromLocal8Bit("m")) ==  (fn.length() -1 ))))         // or m or M
          {
              //  the directory and extension are OK
***************
*** 986,990 ****
          {
              // direcotry OK but extesion is not
!             if (!fn.find('.', pos) == -1) // There is an extension so this is a user error that we can not fix
              {  
                  OK = FALSE;
--- 986,990 ----
          {
              // direcotry OK but extesion is not
!             if (!fn.find(QString::fromLocal8Bit("."), pos) == -1) // There is an extension so this is a user error that we can not fix
              {  
                  OK = FALSE;
***************
*** 995,999 ****
              {
                  // No extesion add it
!                 fn = fn + ".icc";
                  OK = TRUE;
              }
--- 995,999 ----
              {
                  // No extesion add it
!                 fn = fn + QString::fromLocal8Bit(".icc");
                  OK = TRUE;
              }
***************
*** 1011,1016 ****
      : QDialog( parent, "", 0, 
                 Qt::WType_TopLevel | Qt::WStyle_SysMenu | Qt::WStyle_MinMax | Qt::WStyle_Title),
!     FigEditor( 0 ), Canvas( 0 ), CanvasFrameLayout( 0 ), TheGrid( 0 ), TheImage( 0 ),
!     CurrentTemplate( "" ), CurrentSafeFrame( 0 ), fn( "" )
  {
      // qDebug("lprofMain::lprofMain");
--- 1011,1022 ----
      : QDialog( parent, "", 0, 
                 Qt::WType_TopLevel | Qt::WStyle_SysMenu | Qt::WStyle_MinMax | Qt::WStyle_Title),
!                FigEditor( 0 ), 
!                Canvas( 0 ), 
!                CanvasFrameLayout( 0 ), 
!                TheGrid( 0 ), 
!                TheImage( 0 ),
!                CurrentTemplate( QString::fromLocal8Bit("")), 
!                CurrentSafeFrame( 0 ), 
!                fn( QString::fromLocal8Bit(""))
  {
      // qDebug("lprofMain::lprofMain");
***************
*** 1087,1094 ****
  
      ui->ComboBoxIntent -> clear();
!     ui->ComboBoxIntent -> insertItem(tr((QString)"Perceptual"));
!     ui->ComboBoxIntent -> insertItem(tr((QString)"Relative colorimetric"));
!     ui->ComboBoxIntent -> insertItem(tr((QString)"Saturation"));
!     ui->ComboBoxIntent -> insertItem(tr((QString)"Absolute"));
  
      init_mon();
--- 1093,1100 ----
  
      ui->ComboBoxIntent -> clear();
!     ui->ComboBoxIntent -> insertItem(per);
!     ui->ComboBoxIntent -> insertItem(relcolor);
!     ui->ComboBoxIntent -> insertItem(sat);
!     ui->ComboBoxIntent -> insertItem(Absolute);
  
      init_mon();
***************
*** 1109,1113 ****
      // init_targetlist();
      last_tab=0;    
!     global_help_path = new QString;
      setupHelp(global_help_path);
      sys.hdr.ProfilerTab = ui->TabProfiler -> currentPageIndex();
--- 1115,1119 ----
      // init_targetlist();
      last_tab=0;    
!     // global_help_path = new QString;
      setupHelp(global_help_path);
      sys.hdr.ProfilerTab = ui->TabProfiler -> currentPageIndex();
***************
*** 1145,1155 ****
  
      if (cTarget != QString::null)
!             strcpy(sys.hdr.ReferenceSheet, cTarget.local8Bit());
  
!     strcpy(sys.hdr.MeasurementSheet,  measfile);
      if (ui->radioButtonCandMFile -> isOn())
      {
!         strcpy(sys.hdr.MonMeasurementSheet, (const char*)ui->MonMeasurementSheet->getFilename().local8Bit());
!         strcpy(sys.hdr.MonCalibrationSheet, (const char*)ui->MonCalibrationSheet->getFilename().local8Bit());
      }
      else
--- 1151,1161 ----
  
      if (cTarget != QString::null)
!             strcpy(sys.hdr.ReferenceSheet, cTarget.toLocal8Bit());
  
!     strcpy(sys.hdr.MeasurementSheet,  measfile.toLocal8Bit());
      if (ui->radioButtonCandMFile -> isOn())
      {
!         strcpy(sys.hdr.MonMeasurementSheet, (const char*)ui->MonMeasurementSheet->getFilename().toLocal8Bit());
!         strcpy(sys.hdr.MonCalibrationSheet, (const char*)ui->MonCalibrationSheet->getFilename().toLocal8Bit());
      }
      else
***************
*** 1159,1168 ****
      }
  
!     strcpy(sys.hdr.OutputProfileFile, (const char*) ui->OutputFileEdit -> text().local8Bit());
!     strcpy(sys.hdr.MonOutputProfileFile, (const char*) ui->OutputFileEdit_Mon -> text().local8Bit());
      sys.hdr.cur_ref = ui->TargetSelector->getCurrItem();
      strcpy(sys.hdr.template_dir, templates.local8Bit());
      strcpy(sys.hdr.mon_profile_dir, (const char*) ui->MonitorProfileSelector->Dir.local8Bit());
!     strcpy(sys.hdr.mon_profile_file_name, (const char*)ui->MonitorProfileSelector->getFilename().local8Bit());
  }
  
--- 1165,1174 ----
      }
  
!     strcpy(sys.hdr.OutputProfileFile, (const char*) ui->OutputFileEdit -> text().toLocal8Bit());
!     strcpy(sys.hdr.MonOutputProfileFile, (const char*) ui->OutputFileEdit_Mon -> text().toLocal8Bit());
      sys.hdr.cur_ref = ui->TargetSelector->getCurrItem();
      strcpy(sys.hdr.template_dir, templates.local8Bit());
      strcpy(sys.hdr.mon_profile_dir, (const char*) ui->MonitorProfileSelector->Dir.local8Bit());
!     strcpy(sys.hdr.mon_profile_file_name, (const char*)ui->MonitorProfileSelector->getFilename().toLocal8Bit());
  }
  
***************
*** 1170,1174 ****
  {
     // qDebug(QString(sys.hdr.Description).left(14));
!    if (QString(sys.hdr.Description).left(14) == QString("no description"))
     {
          QMessageBox mb( QTranslator::tr("LProf ICC Profiler"),
--- 1176,1180 ----
  {
     // qDebug(QString(sys.hdr.Description).left(14));
!    if (QString::fromLocal8Bit(sys.hdr.Description).left(14) == QString::fromLocal8Bit("no description"))
     {
          QMessageBox mb( QTranslator::tr("LProf ICC Profiler"),
***************
*** 1205,1211 ****
      Console    =  ui->ProgressConsole;
      Console -> setTextFormat( Qt::LogText);
!     strcpy(sys.hdr.temp_file, WorkTempFileName);
  
!     SetGoButton(tr(QString("Profiling... please wait")), FALSE);
      /* TRANSLATOR Text displayed in the messages widget */
      ConsolePrintf("Working hard...", 0, 'c');
--- 1211,1217 ----
      Console    =  ui->ProgressConsole;
      Console -> setTextFormat( Qt::LogText);
!     strcpy(sys.hdr.temp_file, WorkTempFileName.toLocal8Bit());
  
!     SetGoButton(tr("Profiling... please wait"), FALSE);
      /* TRANSLATOR Text displayed in the messages widget */
      ConsolePrintf("Working hard...", 0, 'c');
***************
*** 1218,1223 ****
  
      if (cTarget != QString::null)
!             strcpy(sys.hdr.ReferenceSheet, cTarget.local8Bit());
!     strcpy(sys.hdr.MeasurementSheet, measfile);
       // qDebug("about to call cmsxScannerProfilerDo");
  
--- 1224,1229 ----
  
      if (cTarget != QString::null)
!             strcpy(sys.hdr.ReferenceSheet, cTarget.toLocal8Bit());
!     strcpy(sys.hdr.MeasurementSheet, measfile.toLocal8Bit());
       // qDebug("about to call cmsxScannerProfilerDo");
  
***************
*** 1235,1242 ****
          Gauger("Init...", 0, 100, 100);
          /* TRANSLATOR Text displayed in the messages widget */
!         ConsolePrintf("Profile '%1' DONE!", 1, 's', sys.hdr.OutputProfileFile);
          lprofApp -> restoreOverrideCursor();
       }
!     SetGoButton(tr(QString("Ready to GO!")), TRUE);
  
  
--- 1241,1249 ----
          Gauger("Init...", 0, 100, 100);
          /* TRANSLATOR Text displayed in the messages widget */
!         QString temp = temp.fromLocal8Bit(sys.hdr.OutputProfileFile);
!         ConsolePrintf("Profile '%1' DONE!", 1, 's', temp.toLocal8Bit());
          lprofApp -> restoreOverrideCursor();
       }
!     SetGoButton(tr("Ready to GO!"), TRUE);
  
  
***************
*** 1252,1260 ****
      Console -> setTextFormat( Qt::LogText);
      
!     strcpy(sys.hdr.temp_file, WorkTempFileName);
  
      OutputFileNameChangedMon();
  
!     SetGoButton(tr(QString("Profiling... please wait")), FALSE);
      /* TRANSLATOR Text displayed in the messages widget */
      ConsolePrintf("Working hard...", 0, 'c');
--- 1259,1267 ----
      Console -> setTextFormat( Qt::LogText);
      
!     strcpy(sys.hdr.temp_file, WorkTempFileName.toLocal8Bit());
  
      OutputFileNameChangedMon();
  
!     SetGoButton(tr("Profiling... please wait"), FALSE);
      /* TRANSLATOR Text displayed in the messages widget */
      ConsolePrintf("Working hard...", 0, 'c');
***************
*** 1271,1276 ****
      else if (ui->radioButtonCandMFile -> isOn())
      {
!         strcpy(sys.hdr.MonMeasurementSheet, ui->MonMeasurementSheet->getFilename().local8Bit());
!         strcpy(sys.hdr.MonCalibrationSheet, ui->MonCalibrationSheet->getFilename().local8Bit());
      }
      else
--- 1278,1283 ----
      else if (ui->radioButtonCandMFile -> isOn())
      {
!         strcpy(sys.hdr.MonMeasurementSheet, ui->MonMeasurementSheet->getFilename().toLocal8Bit());
!         strcpy(sys.hdr.MonCalibrationSheet, ui->MonCalibrationSheet->getFilename().toLocal8Bit());
      }
      else
***************
*** 1296,1300 ****
      }
  
!     SetGoButton_2(tr(QString("Ready to GO!")), TRUE);
      if (sys.hdr.WhitePointParams.location==WP_LOC_RGB)
         slotUpdateProfileParmsText();
--- 1303,1307 ----
      }
  
!     SetGoButton_2(tr("Ready to GO!"), TRUE);
      if (sys.hdr.WhitePointParams.location==WP_LOC_RGB)
         slotUpdateProfileParmsText();

Index: griditem.cpp
===================================================================
RCS file: /cvsroot/lprof/lprof/src/lprofqt/griditem.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** griditem.cpp	19 Feb 2008 21:02:42 -0000	1.3
--- griditem.cpp	6 Mar 2008 21:18:58 -0000	1.4
***************
*** 201,229 ****
      patchCount = 0.0;
      QRect OurViewport;
-      // qDebug("GridItem::Pick");
      cmsHTRANSFORM hInputXFORM;
      cmsHPROFILE hLab = NULL, hInputProfile = NULL;
  
!     // Will not compile with QT_NO_ASCII_CAST turned on
!     // when changed to
!     // const char* cInputProfile = InputProfileName.local8Bit();
!     // Will get runtime errors for bad file name
!     // Needs to be fixed
!     
!     QFile inProf(InputProfileName);
!     const char* cInputProfile = InputProfileName;
! 
!     if (cInputProfile && inProf.exists()) 
      {
! 
!         hLab          = cmsCreateLabProfile(NULL);
!         hInputProfile = cmsOpenProfileFromFile(cInputProfile, "r");
!         hInputXFORM   = cmsCreateTransform(hInputProfile, TYPE_RGB_DBL,
!                                            hLab, TYPE_Lab_16, INTENT_ABSOLUTE_COLORIMETRIC,
!                                            cmsFLAGS_NOTPRECALC);
      }
-     else hInputXFORM = NULL;
      ComputeViewport(OurViewport, sx, sy);
- 
      vigra::DRGBImage in(image_data->width(), image_data->height());
      vigra::importImage(*image_data, destImage(in));
--- 201,224 ----
      patchCount = 0.0;
      QRect OurViewport;
      cmsHTRANSFORM hInputXFORM;
      cmsHPROFILE hLab = NULL, hInputProfile = NULL;
  
!     if (InputProfileName.isEmpty())
!         hInputXFORM = NULL;
!     else
      {
!         QFile inProf(InputProfileName);
!         if (inProf.exists()) 
!         {
!             hLab = cmsCreateLabProfile(NULL);
!             hInputProfile = cmsOpenProfileFromFile(InputProfileName.toLocal8Bit(), "r");
!             hInputXFORM   = cmsCreateTransform(hInputProfile, TYPE_RGB_DBL,
!                                             hLab, TYPE_Lab_16, INTENT_ABSOLUTE_COLORIMETRIC,
!                                             cmsFLAGS_NOTPRECALC);
!         }
!         else 
!             hInputXFORM = NULL;
      }
      ComputeViewport(OurViewport, sx, sy);
      vigra::DRGBImage in(image_data->width(), image_data->height());
      vigra::importImage(*image_data, destImage(in));
***************
*** 234,239 ****
      else if (int32lprof) mult = 255.0/4294967295.0;
      else mult = 255.0;  // floating point type images
! 
! 
      QList<GridLayout>::iterator itEnd = Layout.end();
      for ( QList<GridLayout>::iterator it = Layout.begin(); it != itEnd; ++it )
--- 229,233 ----
      else if (int32lprof) mult = 255.0/4294967295.0;
      else mult = 255.0;  // floating point type images
!     
      QList<GridLayout>::iterator itEnd = Layout.end();
      for ( QList<GridLayout>::iterator it = Layout.begin(); it != itEnd; ++it )
***************
*** 312,316 ****
              }
          }
- 
          Patch.p.dwFlags = PATCH_HAS_POS|PATCH_HAS_PIXELS|PATCH_HAS_RGB|
                            PATCH_HAS_STD_RGB|PATCH_HAS_CHISQ;
--- 306,309 ----
***************
*** 335,339 ****
          if (b.Mean() > (255.0 - b.Std()))
              clippedPatches++;
! 
          if (hInputXFORM) 
          {
--- 328,332 ----
          if (b.Mean() > (255.0 - b.Std()))
              clippedPatches++;
!         
          if (hInputXFORM) 
          {
***************
*** 365,369 ****
          }
      }
! 
      if (hInputXFORM) 
      {
--- 358,362 ----
          }
      }
!     
      if (hInputXFORM) 
      {

Index: lprofmain.h
===================================================================
RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** lprofmain.h	19 Feb 2008 21:02:47 -0000	1.51
--- lprofmain.h	6 Mar 2008 21:18:59 -0000	1.52
***************
*** 54,58 ****
  
  QAssistantClient* getHelp();
! QString* get_global_help_path();
  
  extern QSettings* lprofSettings;
--- 54,58 ----
  
  QAssistantClient* getHelp();
! QString get_global_help_path();
  
  extern QSettings* lprofSettings;

Index: config.cpp
===================================================================
RCS file: /cvsroot/lprof/lprof/src/lprofqt/config.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** config.cpp	19 Feb 2008 21:02:42 -0000	1.6
--- config.cpp	6 Mar 2008 21:18:58 -0000	1.7
***************
*** 60,66 ****
   
  #if defined (__APPLE__)
!     const QString lprofBaseDir = "/Library/Application Support/lprof";
  #else
!     const QString lprofBaseDir = "/.lprof";
  #endif
  
--- 60,66 ----
   
  #if defined (__APPLE__)
[...1112 lines suppressed...]
!                                     +  profile 
!                                     + QString::fromLocal8Bit("/text/manufacturer"),  
!                                     QString::fromLocal8Bit(sys.hdr.Manufacturer)).toLocal8Bit());
!     strcpy(sys.hdr.Model, 
!            lprofSettings->readEntry(QString::fromLocal8Bit("LPROF/profile-") 
!                                     +  profile 
!                                     + QString::fromLocal8Bit("/text/model"),  
!                                     QString::fromLocal8Bit(sys.hdr.Model)).toLocal8Bit());
!     strcpy(sys.hdr.Copyright, 
!            lprofSettings->readEntry(QString::fromLocal8Bit("LPROF/profile-") 
!                                     +  profile 
!                                     + QString::fromLocal8Bit("/text/copyright"),  
!                                     QString::fromLocal8Bit(sys.hdr.Copyright)).toLocal8Bit());
!     strcpy(sys.hdr.Description, 
!            lprofSettings->readEntry(QString::fromLocal8Bit("LPROF/profile-") 
!                                     +  profile 
!                                     + QString::fromLocal8Bit("/text/description"),  
!                                     QString::fromLocal8Bit(sys.hdr.Description)).toLocal8Bit());
  
  }

Index: lprofmain-priv.cpp
===================================================================
RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain-priv.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** lprofmain-priv.cpp	19 Feb 2008 21:02:42 -0000	1.3
--- lprofmain-priv.cpp	6 Mar 2008 21:18:58 -0000	1.4
***************
*** 22,26 ****
  bool int16lprof, int32lprof, uint8lprof, fltpixlprof, dblpixlprof;
  
! QString* global_help_path;
  
  QAssistantClient* help;
--- 22,26 ----
  bool int16lprof, int32lprof, uint8lprof, fltpixlprof, dblpixlprof;
  
! QString global_help_path;
  
  QAssistantClient* help;

Index: interfaces.cpp
===================================================================
RCS file: /cvsroot/lprof/lprof/src/lprofqt/interfaces.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** interfaces.cpp	30 Nov 2007 06:28:58 -0000	1.4
--- interfaces.cpp	6 Mar 2008 21:18:58 -0000	1.5
***************
*** 42,46 ****
  }
  
! QString* get_global_help_path()
  
  {
--- 42,46 ----
  }
  
! QString get_global_help_path()
  
  {
***************
*** 64,73 ****
       // qDebug("checkP::get");
  
!     out.items.ref_dir=(QString) ref_dir;
      out.items.cur_ref = sys.hdr.cur_ref;
!     out.items.profile=(QString) sys.hdr.OutputProfileFile;
!     out.items.msheet=(QString) sys.hdr.MeasurementSheet;
!     out.items.mon_profile_dir=(QString) sys.hdr.mon_profile_dir;
!     out.items.mon_profile_file_name=(QString) sys.hdr.mon_profile_file_name;
  }
  
--- 64,73 ----
       // qDebug("checkP::get");
  
!     out.items.ref_dir=ref_dir;
      out.items.cur_ref = sys.hdr.cur_ref;
!     out.items.profile=QString::fromLocal8Bit( sys.hdr.OutputProfileFile);
!     out.items.msheet=QString::fromLocal8Bit( sys.hdr.MeasurementSheet);
!     out.items.mon_profile_dir=QString::fromLocal8Bit( sys.hdr.mon_profile_dir);
!     out.items.mon_profile_file_name=QString::fromLocal8Bit( sys.hdr.mon_profile_file_name);
  }
  
***************
*** 142,146 ****
  void targetTemplate::put(targetTemplate &in)
  {
!     if (in.items.targetFile!=""&&in.items.templateFile!="")
      {
          add_target(in.items);
--- 142,146 ----
  void targetTemplate::put(targetTemplate &in)
  {
!     if (in.items.targetFile != QString::fromLocal8Bit("") && in.items.templateFile != QString::fromLocal8Bit(""))
      {
          add_target(in.items);