[Cmake-commits] [cmake-commits] clinton committed QMacInstallDialog.cxx 1.5 1.6

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv17696

Modified Files:
	QMacInstallDialog.cxx 
Log Message:
Remove dependence on Qt/STL support.


Index: QMacInstallDialog.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QMacInstallDialog.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** QMacInstallDialog.cxx	23 Apr 2008 13:58:18 -0000	1.5
--- QMacInstallDialog.cxx	23 Nov 2009 22:30:00 -0000	1.6
***************
*** 34,39 ****
  {  
    QDir installDir(this->Internals->InstallPrefix->text());
!   std::string installTo = installDir.path().toStdString();
!   if(!cmSystemTools::FileExists(installTo.c_str()))
      {
      QString message = tr("Build install does not exist, "
--- 34,39 ----
  {  
    QDir installDir(this->Internals->InstallPrefix->text());
!   QString installTo = installDir.path();
!   if(!cmSystemTools::FileExists(installTo.toAscii().data()))
      {
      QString message = tr("Build install does not exist, "
***************
*** 48,52 ****
      if(btn == QMessageBox::Yes)
        {
!       cmSystemTools::MakeDirectory(installTo.c_str());
        }
      }
--- 48,52 ----
      if(btn == QMessageBox::Yes)
        {
!       cmSystemTools::MakeDirectory(installTo.toAscii().data());
        }
      }
***************
*** 57,78 ****
      {
      QFileInfo fileInfo = list.at(i);
!     std::string filename = fileInfo.fileName().toStdString();
      if(filename.size() && filename[0] == '.')
        {
        continue;
        }
!     std::string file = fileInfo.absoluteFilePath().toStdString();
!     std::string newName = installTo;
      newName += "/";
      newName += filename;
      // Remove the old files
!     if(cmSystemTools::FileExists(newName.c_str()))
        {
!       std::cout << "rm [" << newName << "]\n";
!       if(!cmSystemTools::RemoveFile(newName.c_str()))
          {
          QString message = tr("Failed to remove file "
                               "installation may be incomplete: ");
!         message += newName.c_str();
          QString title = tr("Error Removing file");
          QMessageBox::StandardButton btn =
--- 57,78 ----
      {
      QFileInfo fileInfo = list.at(i);
!     QString filename = fileInfo.fileName();
      if(filename.size() && filename[0] == '.')
        {
        continue;
        }
!     QString file = fileInfo.absoluteFilePath();
!     QString newName = installTo;
      newName += "/";
      newName += filename;
      // Remove the old files
!     if(cmSystemTools::FileExists(newName.toAscii().data()))
        {
!       std::cout << "rm [" << newName.toAscii().data() << "]\n";
!       if(!cmSystemTools::RemoveFile(newName.toAscii().data()))
          {
          QString message = tr("Failed to remove file "
                               "installation may be incomplete: ");
!         message += newName.toAscii().data();
          QString title = tr("Error Removing file");
          QMessageBox::StandardButton btn =
***************
*** 85,96 ****
          }
        }
!     std::cout << "ln -s [" << file << "] [";
!     std::cout << newName << "]\n";
!     if(!cmSystemTools::CreateSymlink(file.c_str(),
!                                      newName.c_str()))
        {
        QString message = tr("Failed create symlink "
                             "installation may be incomplete: ");
!       message += newName.c_str();
        QString title = tr("Error Creating Symlink");
        QMessageBox::StandardButton btn =
--- 85,96 ----
          }
        }
!     std::cout << "ln -s [" << file.toAscii().data() << "] [";
!     std::cout << newName.toAscii().data() << "]\n";
!     if(!cmSystemTools::CreateSymlink(file.toAscii().data(),
!                                      newName.toAscii().data()))
        {
        QString message = tr("Failed create symlink "
                             "installation may be incomplete: ");
!       message += newName.toAscii().data();
        QString title = tr("Error Creating Symlink");
        QMessageBox::StandardButton btn =