[Lprof-devel] lprof/src/IDqt profileid.cpp, 1.20.2.1, 1.20.2.2 profileidbase.ui, 1.15, 1.15.2.1

[Amit K. <ami...@us...>]

Update of /cvsroot/lprof/lprof/src/IDqt
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11270/IDqt

Modified Files:
      Tag: GSoC-2009
	profileid.cpp profileidbase.ui 
Log Message:
With these changes lprof is now ported


Index: profileid.cpp
===================================================================
RCS file: /cvsroot/lprof/lprof/src/IDqt/profileid.cpp,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -C2 -d -r1.20.2.1 -r1.20.2.2
*** profileid.cpp	30 Jun 2009 00:00:09 -0000	1.20.2.1
--- profileid.cpp	5 Jul 2009 20:33:17 -0000	1.20.2.2
***************
*** 35,40 ****
  #include  <qwidget.h>
  #include <qlineedit.h>
! #include <q3multilineedit.h>
! #include <q3filedialog.h>
  #include <qfileinfo.h>
  #include <qmessagebox.h>
--- 35,40 ----
  #include  <qwidget.h>
  #include <qlineedit.h>
! #include <QTextEdit>
! #include <QFileDialog>
  #include <qfileinfo.h>
  #include <qmessagebox.h>
***************
*** 72,76 ****
  
  ProfileID::ProfileID( QWidget *parent)
!     : QDialog(parent, "", 0, Qt::WindowSystemMenuHint)
  {
      setupUi(this);
--- 72,76 ----
  
  ProfileID::ProfileID( QWidget *parent)
!     : QDialog(parent, Qt::WindowSystemMenuHint)
  {
      setupUi(this);
***************
*** 129,133 ****
          strcpy(sys.hdr.Manufacturer, ManufacturerEdit->text().toLocal8Bit());
          strcpy(sys.hdr.Model, ModelEdit -> text().toLocal8Bit());
!         strcpy(sys.hdr.Copyright, CopyrightEdit -> text().toLocal8Bit());
          strcpy(sys.hdr.Description, DescriptionEdit -> text().toLocal8Bit());
      
--- 129,133 ----
          strcpy(sys.hdr.Manufacturer, ManufacturerEdit->text().toLocal8Bit());
          strcpy(sys.hdr.Model, ModelEdit -> text().toLocal8Bit());
!         strcpy(sys.hdr.Copyright, CopyrightEdit -> toPlainText().toLocal8Bit());
          strcpy(sys.hdr.Description, DescriptionEdit -> text().toLocal8Bit());
      
***************
*** 234,240 ****
      
  #ifdef __WIN32__
!     pos = fn.findRev(QString::fromLocal8Bit("\\"), -1, FALSE);
  #else
!     pos = fn.findRev(QString::fromLocal8Bit("/"), -1, FALSE);
  #endif  
      
--- 234,240 ----
      
  #ifdef __WIN32__
!     pos = fn.lastIndexOf(QString::fromLocal8Bit("\\"), -1, Qt::CaseInsensitive);
  #else
!     pos = fn.lastIndexOf(QString::fromLocal8Bit("/"), -1, Qt::CaseInsensitive);
  #endif  
      
***************
*** 270,281 ****
      { 
          // check to make sure extension is some form of .icm or .icc
!         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
--- 270,281 ----
      { 
          // check to make sure extension is some form of .icm or .icc
!         if ((fn.lastIndexOf(QString::fromLocal8Bit(".i")) == fn.length() - 4  || 
!              fn.lastIndexOf(QString::fromLocal8Bit(".I")) == fn.length() - 4) &&           // .i or ,I &&
!              (fn.lastIndexOf(QString::fromLocal8Bit("C"), -2 ) == fn.length() - 2 ||  
!              fn.lastIndexOf(QString::fromLocal8Bit("c"), -2 ) == fn.length() - 2) &&       // c or C &&
!              ((fn.lastIndexOf(QString::fromLocal8Bit("C")) == fn.length() - 1 ||  
!                      fn.lastIndexOf(QString::fromLocal8Bit("c")) ==  fn.length() - 1) ||         // c  or C
!              (fn.lastIndexOf(QString::fromLocal8Bit("M")) == fn.length() - 1 ||  
!                      fn.lastIndexOf(QString::fromLocal8Bit("m")) ==  fn.length() - 1 )))         // or m or M
          {
              //  the directory and extension are OK
***************
*** 285,289 ****
          {
              // 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
              {  
                  // not really OK but we don't want to clobber the user entered file name
--- 285,289 ----
          {
              // direcotry OK but extesion is not
!             if (fn.indexOf(QString::fromLocal8Bit("."), pos) > -1) // There is an extension so this is a user error that we can not fix
              {  
                  // not really OK but we don't want to clobber the user entered file name

Index: profileidbase.ui
===================================================================
RCS file: /cvsroot/lprof/lprof/src/IDqt/profileidbase.ui,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -d -r1.15 -r1.15.2.1
*** profileidbase.ui	1 Feb 2009 20:04:01 -0000	1.15
--- profileidbase.ui	5 Jul 2009 20:33:17 -0000	1.15.2.1
***************
*** 1,49 ****
! <ui version="4.0" >
   <class>ProfileIDBase</class>
!  <widget class="QDialog" name="ProfileIDBase" >
!   <property name="geometry" >
     <rect>
      <x>0</x>
!     <y>0</y>
!     <width>535</width>
!     <height>533</height>
     </rect>
[...984 lines suppressed...]
!    <container>1</container>
!   </customwidget>
!   <customwidget>
!    <class>Q3MultiLineEdit</class>
!    <extends>QWidget</extends>
!    <header>q3multilineedit.h</header>
!   </customwidget>
!  </customwidgets>
   <resources>
!   <include location="../../lprof.qrc" />
   </resources>
   <connections/>
--- 497,503 ----
    </layout>
   </widget>
!  <layoutdefault spacing="6" margin="11"/>
   <resources>
!   <include location="../../lprof.qrc"/>
   </resources>
   <connections/>