int hspacing;
int vspacing;
-protected slots:
- int layoutSpacingImplementation(QSizePolicy::ControlType control1,
- QSizePolicy::ControlType control2,
- Qt::Orientation orientation,
- const QStyleOption *option = 0,
- const QWidget *widget = 0) const;
+ int layoutSpacing(QSizePolicy::ControlType control1,
+ QSizePolicy::ControlType control2,
+ Qt::Orientation orientation,
+ const QStyleOption *option = 0,
+ const QWidget *widget = 0) const;
};
#define CT1(c) CT2(c, c)
#define CT2(c1, c2) ((uint)c1 << 16) | (uint)c2
-int CustomLayoutStyle::layoutSpacingImplementation(QSizePolicy::ControlType control1,
+int CustomLayoutStyle::layoutSpacing(QSizePolicy::ControlType control1,
QSizePolicy::ControlType control2,
Qt::Orientation orientation,
const QStyleOption * /*option = 0*/,
QGraphicsWidget *window = new QGraphicsWidget(0, Qt::Window);
- // Test layoutSpacingImplementation
+ // Test layoutSpacing
CustomLayoutStyle *style = new CustomLayoutStyle;
style->hspacing = -1;
style->vspacing = -1;
void styleDependentSpacingsAndMargins_data();
void styleDependentSpacingsAndMargins();
- void layoutSpacingImplementation_data();
- void layoutSpacingImplementation();
+ void layoutSpacing_data();
+ void layoutSpacing();
void spacing();
void spacerWithSpacing();
void contentsRect();
int vspacing;
bool reimplementSubelementRect;
-protected slots:
- int layoutSpacingImplementation(QSizePolicy::ControlType control1,
- QSizePolicy::ControlType control2,
- Qt::Orientation orientation,
- const QStyleOption *option = 0,
- const QWidget *widget = 0) const;
+ int layoutSpacing(QSizePolicy::ControlType control1,
+ QSizePolicy::ControlType control2,
+ Qt::Orientation orientation,
+ const QStyleOption *option = 0,
+ const QWidget *widget = 0) const;
};
#define CT1(c) CT2(c, c)
#define CT2(c1, c2) ((uint)c1 << 16) | (uint)c2
-int CustomLayoutStyle::layoutSpacingImplementation(QSizePolicy::ControlType control1,
+int CustomLayoutStyle::layoutSpacing(QSizePolicy::ControlType control1,
QSizePolicy::ControlType control2,
Qt::Orientation orientation,
const QStyleOption * /*option = 0*/,
}
}
-void tst_QGridLayout::layoutSpacingImplementation_data()
+void tst_QGridLayout::layoutSpacing_data()
{
QTest::addColumn<QWidget*>("widget");
// expected
CustomLayoutStyle *style = new CustomLayoutStyle();
{
// If the layoutSpacing is negative, the layouting code will call
- // layoutSpacingImplementation()
+ // layoutSpacing()
style->hspacing = -1;
style->vspacing = -1;
style->reimplementSubelementRect = false;
}
-void tst_QGridLayout::layoutSpacingImplementation()
+void tst_QGridLayout::layoutSpacing()
{
QFETCH(QWidget *, widget);
QFETCH(PointList, expectedpositions);
return style->generatedIconPixmap(mode, pix, opt);
}
+ int layoutSpacing(QSizePolicy::ControlType c1,
+ QSizePolicy::ControlType c2,
+ Qt::Orientation ori,
+ const QStyleOption *opt,
+ const QWidget *w) const
+ {
+ return style->layoutSpacing(c1, c2, ori, opt, w);
+ }
+
+ QIcon standardIcon(StandardPixmap si,
+ const QStyleOption *opt,
+ const QWidget *w) const
+ {
+ return style->standardIcon(si, opt, w);
+ }
+
private:
QStyle *style;
};