[Compbench-devel] CompBenchmarks++/Qt-4/Package PackageInfo.cpp, 1.2, 1.3 PackageInfo.h, 1.2, 1.3

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

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

Modified Files:
	PackageInfo.cpp PackageInfo.h 
Log Message:
Use Basic/Info.h

Index: PackageInfo.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Package/PackageInfo.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PackageInfo.cpp	17 May 2007 22:36:45 -0000	1.2
--- PackageInfo.cpp	22 May 2007 17:28:28 -0000	1.3
***************
*** 4,49 ****
  using namespace CQT;
  
- PackageInfoTab::PackageInfoTab(QWidget *parent)
-   : QWidget(parent)
- {
-   lay=new QGridLayout;
- 
-   layIndex=0;
-   setLayout(lay);
- }
- 
- QLineEdit *PackageInfoTab::addInfo(std::string _label,
- 				   std::string _value)
- {
-   QLabel      *l;
-   QLineEdit   *v;
- 
-   l=new QLabel(tr(_label.c_str()));
-   v=new QLineEdit(_value.c_str());
-   v->setReadOnly(true);
-   lay->addWidget(l, layIndex, 0);
-   lay->addWidget(v, layIndex, 1);
-   layIndex++;
-   return(v);
- }
- 
- void PackageInfoTab::addSpace(void)
- {
-   lay->setRowStretch(20,20);
- }
- 
- QGridLayout *PackageInfoTab::Layout(void)
- {
-   return(lay);
- }
- 
- PackageInfoTab::~PackageInfoTab()
- {
- }
- 
  PackageInfo::PackageInfo(QWidget *parent)
    : QTabWidget(parent)
  {
!   PackageInfoTab *main = new PackageInfoTab();
  
    addTab(main, "General");
--- 4,11 ----
  using namespace CQT;
  
  PackageInfo::PackageInfo(QWidget *parent)
    : QTabWidget(parent)
  {
!   InfoTab *main = new InfoTab();
  
    addTab(main, "General");
***************
*** 61,73 ****
    main->addSpace();
  
!   PackageInfoTab *comments = new PackageInfoTab();
    comments->setToolTip(tr("Comments"));
    addTab(comments, "Comments");
!   packageComments = new QTextEdit("");
!   packageComments->setReadOnly(true);
    packageComments->setToolTip(tr("Comments and various informations about package"));
-   comments->Layout()->addWidget(packageComments, 0, 0);  
  
!   PackageInfoTab *meta = new PackageInfoTab();
    meta->setToolTip(tr("Informations used or added by CompBenchmarks for selected package"));
    addTab(meta, "Meta-informations");
--- 23,34 ----
    main->addSpace();
  
!   InfoTab *comments = new InfoTab();
    comments->setToolTip(tr("Comments"));
    addTab(comments, "Comments");
! 
!   packageComments = comments->addText("");
    packageComments->setToolTip(tr("Comments and various informations about package"));
  
!   InfoTab *meta = new InfoTab();
    meta->setToolTip(tr("Informations used or added by CompBenchmarks for selected package"));
    addTab(meta, "Meta-informations");
***************
*** 82,86 ****
    meta->addSpace();
  
!   PackageInfoTab *links = new PackageInfoTab();
    links->setToolTip(tr("Internet URL"));
    addTab(links, tr("Links"));
--- 43,47 ----
    meta->addSpace();
  
!   InfoTab *links = new InfoTab();
    links->setToolTip(tr("Internet URL"));
    addTab(links, tr("Links"));

Index: PackageInfo.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Package/PackageInfo.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PackageInfo.h	17 May 2007 22:36:45 -0000	1.2
--- PackageInfo.h	22 May 2007 17:28:28 -0000	1.3
***************
*** 2,36 ****
  #define H_CQT_PACKAGEINFO
  
  #include <Package/PackageHolder.h>
  #include <QListWidget>
- #include <QGridLayout>
  #include <QLabel>
- #include <QLineEdit>
- #include <QTextEdit>
  #include <QTabWidget>
  
  namespace CQT {
  
-   class PackageInfoTab : public QWidget
-   {
-     Q_OBJECT
-   private:
-     QGridLayout *lay;
-     int         layIndex;
- 
-   protected:
-   public:
-     PackageInfoTab(QWidget *parent = 0);
- 
-     virtual QLineEdit *addInfo(std::string _label,
- 			       std::string _value);
- 
-     virtual void addSpace(void);
- 
-     virtual QGridLayout *Layout(void);
- 
-     virtual ~PackageInfoTab();
-   };
- 
    class PackageInfo : public QTabWidget
    {
--- 2,13 ----
  #define H_CQT_PACKAGEINFO
  
+ #include <Basic/Info.h>
  #include <Package/PackageHolder.h>
  #include <QListWidget>
  #include <QLabel>
  #include <QTabWidget>
  
  namespace CQT {
  
    class PackageInfo : public QTabWidget
    {