Author: coolo
Date: Wed Dec 5 10:35:36 2007
New Revision: 42695
URL: http://svn.opensuse.org/viewcvs/yast?rev=42695&view=rev
Log:
what an ugly class - is that really used in yast? I hope not
Modified:
branches/tmp/coolo/qt4-port/src/YQFrame.cc
branches/tmp/coolo/qt4-port/src/YQFrame.h
Modified: branches/tmp/coolo/qt4-port/src/YQFrame.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQFrame.cc?rev=42695&r1=42694&r2=42695&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQFrame.cc (original)
+++ branches/tmp/coolo/qt4-port/src/YQFrame.cc Wed Dec 5 10:35:36 2007
@@ -30,7 +30,7 @@
YQFrame::YQFrame( YWidget * parent,
const string & initialLabel )
- : Q3GroupBox( (QWidget *) parent->widgetRep() )
+ : QGroupBox( (QWidget *) parent->widgetRep() )
, YFrame( parent, initialLabel )
{
setWidgetRep ( this );
@@ -58,13 +58,13 @@
if ( hasChildren() )
{
- int newChildWidth = max ( 0, newWidth - 2 * frameWidth() - 1 );
- int newChildHeight = max ( 0, newHeight - frameWidth() - fontMetrics().height() - 1 );
+ int newChildWidth = max ( 0, newWidth - 2 * 11 - 1 );
+ int newChildHeight = max ( 0, newHeight - 11 - fontMetrics().height() - 1 );
firstChild()->setSize( newChildWidth, newChildHeight );
-
+
QWidget * qChild = (QWidget *) firstChild()->widgetRep();
- qChild->move( frameWidth(), fontMetrics().height() );
+ qChild->move( 11, fontMetrics().height() );
}
}
@@ -83,18 +83,19 @@
int childPreferredWidth = hasChildren() ? firstChild()->preferredWidth() : 0;
preferredWidth = max( childPreferredWidth,
- (10 + fontMetrics().width( title() ) ) );
- preferredWidth += 2*frameWidth() + 1;
+ (10 + fontMetrics().width( title() ) ) );
+ preferredWidth += 2*11 + 1;
+
+ return preferredWidth;
- return preferredWidth;
}
int YQFrame::preferredHeight()
{
int preferredHeight = hasChildren() ? firstChild()->preferredHeight() : 0;
- preferredHeight += frameWidth() + fontMetrics().height() + 1;
-
+ preferredHeight += 11 + fontMetrics().height() + 1;
+
return preferredHeight;
}
Modified: branches/tmp/coolo/qt4-port/src/YQFrame.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQFrame.h?rev=42695&r1=42694&r2=42695&view=diff
==============================================================================
--- branches/tmp/coolo/qt4-port/src/YQFrame.h (original)
+++ branches/tmp/coolo/qt4-port/src/YQFrame.h Wed Dec 5 10:35:36 2007
@@ -22,11 +22,11 @@
#include "YFrame.h"
-#include