Commit a5f4f5f8 authored by Carsten Niehaus's avatar Carsten Niehaus
Browse files

Backporting r851430 and r851423 (memleak and missing i18n) to make

merging this branch into trunk easier.

svn path=/branches/work/soc-stepgame/step/; revision=851653
parent d9b49ad4
......@@ -811,18 +811,18 @@ DataSourceWidget::DataSourceWidget(QWidget* parent)
layout->setContentsMargins(0,0,0,0);
_object = new KComboBox(this);
_object->setToolTip("Object name");
_object->setToolTip(i18n("Object name"));
_object->setMinimumContentsLength(10);
layout->addWidget(_object, 1);
_property = new KComboBox(this);
_property->setToolTip("Property name");
_property->setToolTip(i18n("Property name"));
_property->setEnabled(false);
_property->setMinimumContentsLength(10);
layout->addWidget(_property, 1);
_index = new KComboBox(this);
_index->setToolTip("Vector index");
_index->setToolTip(i18n("Vector index"));
_index->setMinimumContentsLength(1);
_index->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
layout->addWidget(_index, 0);
......
......@@ -55,6 +55,7 @@
#include <KIcon>
#include <KIconLoader>
#include <KDebug>
template<typename T>
ItemCreator* newItemCreatorHelper(const QString& className,
......@@ -240,6 +241,11 @@ WorldFactory::WorldFactory()
}
WorldFactory::~WorldFactory()
{
delete _nullIcon;
}
ItemCreator* WorldFactory::newItemCreator(const QString& className,
WorldModel* worldModel, WorldScene* worldScene) const
{
......
......@@ -52,6 +52,7 @@ class WorldFactory: public StepCore::Factory
{
public:
WorldFactory();
~WorldFactory();
/** Get ExtMetaObject for given StepCore::MetaObject */
const ExtMetaObject* extMetaObject(const StepCore::MetaObject* mObject) const
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment