compbench-devel

[Frederic T. <xf...@us...>]

Update of /cvsroot/compbench/CompBenchmarks++/Qt-4
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25562

Modified Files:
	compbenchmarks-ui-qt4.pro main.cpp 
Log Message:
Modifications due to changes in libcompbenchmarks. Commited to release BETA2.


Index: main.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** main.cpp	22 May 2007 17:26:06 -0000	1.8
--- main.cpp	29 Aug 2007 20:34:06 -0000	1.9
***************
*** 86,89 ****
--- 86,90 ----
    int i;
  
+   /*
    CBM::cbmUI->Information(CBM::UI::CompilerAutodetect,
  			  "",
***************
*** 107,110 ****
--- 108,112 ----
    if (parent())
      parent()->deleteLater();
+   */
  }
  
***************
*** 121,125 ****
    App=this;
  
!   qRegisterMetaType<CBM::UI::State>("CBM::UI::State");
    qRegisterMetaType<CBM::Package*>("CBM::Package*");
  
--- 123,127 ----
    App=this;
  
!   qRegisterMetaType<CBM::UIMsg*>("CBM::UIMsg*");
    qRegisterMetaType<CBM::Package*>("CBM::Package*");
  
***************
*** 228,238 ****
  void Application::doPackageInstallation(CBM::Package *_package)
  {
!   StatusWidget         *W;
    PackageInstallThread *T;
  
!   W=new StatusInstall(_package);
  
!   W->show();
!   T=new PackageInstallThread(_package, W);
    T->start();
  }
--- 230,240 ----
  void Application::doPackageInstallation(CBM::Package *_package)
  {
!   // StatusWidget         *W;
    PackageInstallThread *T;
  
!   // W=new StatusInstall(_package);
  
!   // W->show();
!   T=new PackageInstallThread(_package);
    T->start();
  }
***************
*** 240,250 ****
  void Application::doPackageUninstallation(CBM::Package *_package)
  {
!   StatusWidget           *W;
    PackageUninstallThread *T;
  
!   W=new StatusWidget(0);
  
!   W->show();
!   T=new PackageUninstallThread(_package, W);
    T->start();
  }
--- 242,252 ----
  void Application::doPackageUninstallation(CBM::Package *_package)
  {
!   // StatusWidget           *W;
    PackageUninstallThread *T;
  
!   // W=new StatusWidget(0);
  
!   // W->show();
!   T=new PackageUninstallThread(_package);
    T->start();
  }

Index: compbenchmarks-ui-qt4.pro
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/compbenchmarks-ui-qt4.pro,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** compbenchmarks-ui-qt4.pro	21 Aug 2007 19:12:22 -0000	1.6
--- compbenchmarks-ui-qt4.pro	29 Aug 2007 20:34:06 -0000	1.7
***************
*** 25,29 ****
  plan_sources	= Plan/PlanAvailableOption Plan/PlanAvailableCompiler Plan/PlanAvailable Plan/PlanAvailableBenchmark Plan/PlanDefineToolBox Plan/PlanDefineBatch Plan/PlanDefine Plan/PlanManager
  
! all_sources	= $$base_sources $$option_sources $$package_sources $$compiler_sources $$plan_sources Status/Status main
  
  defineReplace(headers) {
--- 25,29 ----
  plan_sources	= Plan/PlanAvailableOption Plan/PlanAvailableCompiler Plan/PlanAvailable Plan/PlanAvailableBenchmark Plan/PlanDefineToolBox Plan/PlanDefineBatch Plan/PlanDefine Plan/PlanManager
  
! all_sources	= $$base_sources $$option_sources $$package_sources $$compiler_sources $$plan_sources Status/Status-UI Status/Status main
  
  defineReplace(headers) {