[Lprof-devel] lprof/src/reference_inst_qt installreffile.cpp, 1.55, 1.56

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

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

Modified Files:
	installreffile.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: installreffile.cpp
===================================================================
RCS file: /cvsroot/lprof/lprof/src/reference_inst_qt/installreffile.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** installreffile.cpp	19 Feb 2008 21:03:01 -0000	1.55
--- installreffile.cpp	6 Mar 2008 21:18:59 -0000	1.56
***************
*** 87,91 ****
      else 
      {
!         qDebug("Month not found = " + m);
          return 0;
      }
--- 87,91 ----
      else 
      {
!         qDebug((QString::fromLocal8Bit("Month not found = ") + m).toLocal8Bit());
          return 0;
[...1071 lines suppressed...]
      cmsIT8SetPropertyStr(hIT8, "MANUFACTURER", (const char *) "X-Rite");
!     cmsIT8SaveToFile(hIT8, (const char *) files.items.targetFile.local8Bit());
      
      // QDir::cleanDirPath( files.items.targetFile );
--- 1064,1078 ----
      
      // Modify fields in reference file so that this shows up correctly in UI
!     LCMSHANDLE hIT8 = cmsIT8LoadFromFile((const char *) files.items.targetFile.toLocal8Bit());
      cmsIT8SetPropertyStr(hIT8, "ORIGINATOR", (const char *) "LProf Reference File Installer");
!     if (LogoDescriptor == QString::fromLocal8Bit(""))
!         LogoDescriptor = QString::fromLocal8Bit("Unknown - no decriptor found");
!     if (LogoSerial == QString::fromLocal8Bit(""))
!         LogoSerial = QString::fromLocal8Bit("Unknown - no serial found");
!     cmsIT8SetPropertyStr(hIT8, "DESCRIPTOR", (const char *) LogoDescriptor.toLocal8Bit());
!     cmsIT8SetPropertyStr(hIT8, "SERIAL", (const char *) LogoSerial.toLocal8Bit());
!     cmsIT8SetPropertyStr(hIT8, "CREATED", (const char *) LogoSerial.toLocal8Bit());
      cmsIT8SetPropertyStr(hIT8, "MANUFACTURER", (const char *) "X-Rite");
!     cmsIT8SaveToFile(hIT8, (const char *) files.items.targetFile.toLocal8Bit());
      
      // QDir::cleanDirPath( files.items.targetFile );