summaryrefslogtreecommitdiffstats
path: root/kexi/plugins/macros
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/plugins/macros')
-rw-r--r--kexi/plugins/macros/kexipart/keximacroerrorbase.ui2
-rw-r--r--kexi/plugins/macros/kexipart/keximacroproperty.cpp4
-rw-r--r--kexi/plugins/macros/lib/metaobject.cpp10
3 files changed, 8 insertions, 8 deletions
diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
index d44b8aee..72c45001 100644
--- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
+++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
@@ -53,7 +53,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>48</width>
<height>48</height>
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
index e67794be..d5e576f9 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
@@ -351,7 +351,7 @@ class EditListBoxItem : public ListBoxItem
m_widget->reparent(listBox(), 0, TQPoint(1,1));
//tqlayout->addWidget(m_widget, 1);
m_widget->setMinimumHeight(5);
- m_widget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ m_widget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
}
private:
@@ -520,7 +520,7 @@ KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property,
d->listbox = new ListBox(d->combobox, d->macroproperty);
d->combobox->setEditable(true);
d->combobox->setListBox(d->listbox);
- d->combobox->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ d->combobox->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
d->combobox->setMinimumHeight(5);
d->combobox->setInsertionPolicy(TQComboBox::NoInsertion);
d->combobox->setMinimumSize(10, 0); // to allow the combo to be resized to a small size
diff --git a/kexi/plugins/macros/lib/metaobject.cpp b/kexi/plugins/macros/lib/metaobject.cpp
index e9e56b44..0916fe37 100644
--- a/kexi/plugins/macros/lib/metaobject.cpp
+++ b/kexi/plugins/macros/lib/metaobject.cpp
@@ -77,18 +77,18 @@ TQObject* const MetaObject::object() const
/*
TQStrList MetaObject::signalNames() const
{
- return object()->tqmetaObject()->signalNames();
+ return object()->metaObject()->signalNames();
}
TQStrList MetaObject::slotNames() const
{
- return object()->tqmetaObject()->slotNames();
+ return object()->metaObject()->slotNames();
}
*/
int MetaObject::indexOfSignal(const char* signal) const
{
- TQMetaObject* metaobject = object()->tqmetaObject();
+ TQMetaObject* metaobject = object()->metaObject();
int signalid = metaobject->findSignal(signal, false);
if(signalid < 0) {
throw Exception(TQString("Invalid signal \"%1\"").tqarg(signal));
@@ -98,7 +98,7 @@ int MetaObject::indexOfSignal(const char* signal) const
int MetaObject::indexOfSlot(const char* slot) const
{
- TQMetaObject* metaobject = object()->tqmetaObject();
+ TQMetaObject* metaobject = object()->metaObject();
int slotid = metaobject->findSlot(slot, false);
if(slotid < 0) {
throw Exception(TQString("Invalid slot \"%1\"").tqarg(slot));
@@ -110,7 +110,7 @@ KSharedPtr<MetaMethod> MetaObject::method(int index)
{
TQObject* obj = object();
MetaMethod::Type type = MetaMethod::Slot;
- TQMetaObject* metaobject = obj->tqmetaObject();
+ TQMetaObject* metaobject = obj->metaObject();
const TQMetaData* metadata = metaobject->slot(index, true);
if(! metadata) {