summaryrefslogtreecommitdiffstats
path: root/lib/widgets/propeditor/pcombobox.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/widgets/propeditor/pcombobox.cpp')
-rw-r--r--lib/widgets/propeditor/pcombobox.cpp16
1 files changed, 6 insertions, 10 deletions
diff --git a/lib/widgets/propeditor/pcombobox.cpp b/lib/widgets/propeditor/pcombobox.cpp
index 958ba34d..18cad9b6 100644
--- a/lib/widgets/propeditor/pcombobox.cpp
+++ b/lib/widgets/propeditor/pcombobox.cpp
@@ -24,14 +24,14 @@
namespace PropertyLib{
-PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, TQWidget *parent, const char *name)
- :PropertyWidget(property, parent, name), m_valueList(list)
+PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, TQWidget *tqparent, const char *name)
+ :PropertyWidget(property, tqparent, name), m_valueList(list)
{
init(false);
}
-PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, bool rw, TQWidget *parent, const char *name)
- :PropertyWidget(property, parent, name), m_valueList(list)
+PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, bool rw, TQWidget *tqparent, const char *name)
+ :PropertyWidget(property, tqparent, name), m_valueList(list)
{
init(rw);
}
@@ -40,7 +40,7 @@ void PComboBox::init(bool rw)
{
TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
m_edit = new TQComboBox(rw, this);
- m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+ m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
l->addWidget(m_edit);
fillBox();
@@ -58,7 +58,7 @@ void PComboBox::fillBox()
TQVariant PComboBox::value() const
{
- TQMap<TQString, TQVariant>::const_iterator it = m_valueList.find(m_edit->currentText());
+ TQMap<TQString, TQVariant>::const_iterator it = m_valueList.tqfind(m_edit->currentText());
if (it == m_valueList.end())
return TQVariant("");
return TQVariant(it.data());
@@ -66,11 +66,7 @@ TQVariant PComboBox::value() const
void PComboBox::setValue(const TQVariant &value, bool emitChange)
{
-#if QT_VERSION >= 0x030100
if (!value.isNull())
-#else
- if (value.canCast(TQVariant::String))
-#endif
{
disconnect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateProperty(int)));
m_edit->setCurrentText(findDescription(value));