[Lprof-devel] lprof/src/lprofqt config.cpp, 1.8.2.4, 1.8.2.5 lprofmain.h, 1.52.2.5, 1.52.2.6

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

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

Modified Files:
      Tag: GSoC-2009
	config.cpp lprofmain.h 
Log Message:


Index: lprofmain.h
===================================================================
RCS file: /cvsroot/lprof/lprof/src/lprofqt/lprofmain.h,v
retrieving revision 1.52.2.5
retrieving revision 1.52.2.6
diff -C2 -d -r1.52.2.5 -r1.52.2.6
*** lprofmain.h	1 Jul 2009 18:34:02 -0000	1.52.2.5
--- lprofmain.h	3 Jul 2009 16:10:56 -0000	1.52.2.6
***************
*** 374,378 ****
      virtual void slotUpdateProfileParmsText();
      virtual void setRGBpatchValues();
- //  void templateFileCopied( Q3NetworkOperation *op );	==============================================================
      void zeroProgressBars();
      virtual void AddTemplate();
--- 374,377 ----

Index: config.cpp
===================================================================
RCS file: /cvsroot/lprof/lprof/src/lprofqt/config.cpp,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -C2 -d -r1.8.2.4 -r1.8.2.5
*** config.cpp	1 Jul 2009 18:34:02 -0000	1.8.2.4
--- config.cpp	3 Jul 2009 16:10:56 -0000	1.8.2.5
***************
*** 263,273 ****
  
          QString path;
! 		//QString test =	QString::fromLocal8Bit(QTextCodec::locale());		//removed by me ===============29june==========
!         QString test = QLocale::system().name()	;	//added by me=============29june====
          if ((test.indexOf((QString::fromLocal8Bit("C")), 0, Qt::CaseInsensitive) >= 0))
               path = QDir::currentPath() + QString::fromLocal8Bit("/help/") +  QString::fromLocal8Bit("en");
          else
              if (test == QString::fromLocal8Bit("ru"))
!                 path = QDir::currentPath() + QString::fromLocal8Bit("/help/") + QLocale::system().name();	//changed QString::fromLocal8Bit(QTextCodec::locale()) to QLocale::system().name()
          else // since at this point only english and Russian
                 // help pages exist
--- 263,272 ----
  
          QString path;
!         QString test = QLocale::system().name()	;	
          if ((test.indexOf((QString::fromLocal8Bit("C")), 0, Qt::CaseInsensitive) >= 0))
               path = QDir::currentPath() + QString::fromLocal8Bit("/help/") +  QString::fromLocal8Bit("en");
          else
              if (test == QString::fromLocal8Bit("ru"))
!                 path = QDir::currentPath() + QString::fromLocal8Bit("/help/") + QLocale::system().name();
          else // since at this point only english and Russian
                 // help pages exist
***************
*** 304,333 ****
  }
  
- /*
- void lprofMain::templateFileCopied( Q3NetworkOperation *op )
- {
-     //qDebug(QString::fromLocal8Bit("templateFileCopied()"));
- 	qDebug("templateFileCopied()");
-     if ( !op )
-         return;
- 
-     if ( op->state() == Q3NetworkProtocol::StFailed )
-     {
-         // The copy operation failed
-         // Let users know there is a problem
-         // qDebug(QString::fromLocal8Bit("Error on template file copy"));
-         QMessageBox::critical( this, tr( "ERROR" ), op->protocolDetail() );
-     }
-     else if(op->operation () == Q3NetworkProtocol::OpPut )
-     {
-         qDebug("Template file saved - operation successful. %i", copyNumTempFile);
-         mutexTempFile.lock();
-         copyNumTempFile = copyNumTempFile - 1;
-         mutexTempFile.unlock();
-     }
-     qDebug("copyNumTempFile = %i", copyNumTempFile);
- 
- }
- */
  void lprofMain::Create_Config_Dir(const QString data_path)
  {
--- 303,306 ----