summaryrefslogtreecommitdiffstats
path: root/kommander/editor/propertyeditor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kommander/editor/propertyeditor.cpp')
-rw-r--r--kommander/editor/propertyeditor.cpp44
1 files changed, 22 insertions, 22 deletions
diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp
index 220613f5..d579c3b6 100644
--- a/kommander/editor/propertyeditor.cpp
+++ b/kommander/editor/propertyeditor.cpp
@@ -172,7 +172,7 @@ PropertyItem::PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem *
PropertyItem::~PropertyItem()
{
if ( resetButton )
- delete resetButton->tqparentWidget();
+ delete resetButton->parentWidget();
resetButton = 0;
}
@@ -337,7 +337,7 @@ void PropertyItem::setOpen( bool b )
void PropertyItem::showEditor()
{
createResetButton();
- resetButton->tqparentWidget()->show();
+ resetButton->parentWidget()->show();
}
/*! Subclasses have to hide the editor of the item here
@@ -346,7 +346,7 @@ void PropertyItem::showEditor()
void PropertyItem::hideEditor()
{
createResetButton();
- resetButton->tqparentWidget()->hide();
+ resetButton->parentWidget()->hide();
}
/*! This is called to init the value of the item. Reimplement in
@@ -389,7 +389,7 @@ TQString PropertyItem::name() const
void PropertyItem::createResetButton()
{
if ( resetButton ) {
- resetButton->tqparentWidget()->lower();
+ resetButton->parentWidget()->lower();
return;
}
TQHBox *hbox = new TQHBox( listview->viewport() );
@@ -439,8 +439,8 @@ void PropertyItem::placeEditor( TQWidget *w )
r = TQRect( listview->viewportToContents( r.topLeft() ), r.size() );
w->resize( r.size() );
listview->moveChild( w, r.x(), r.y() );
- resetButton->tqparentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() );
- listview->moveChild( resetButton->tqparentWidget(), r.x() + r.width() - 8, r.y() );
+ resetButton->parentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() );
+ listview->moveChild( resetButton->parentWidget(), r.x() + r.width() - 8, r.y() );
resetButton->setFixedHeight( r.height() - 3 );
}
@@ -2498,16 +2498,16 @@ static TQVariant::Type type_to_variant( const TQString &s )
}
#ifndef TQT_NO_SQL
-static bool tqparent_is_data_aware( TQObject *o )
+static bool parent_is_data_aware( TQObject *o )
{
if ( !o->inherits( TQWIDGET_OBJECT_NAME_STRING ) )
return false;
TQWidget *w = (TQWidget*)o;
- TQWidget *p = w->tqparentWidget();
+ TQWidget *p = w->parentWidget();
while ( p && !p->isTopLevel() ) {
if ( p->inherits( "QDesignerDataBrowser" ) || p->inherits( "QDesignerDataView" ) )
return true;
- p = p->tqparentWidget();
+ p = p->parentWidget();
}
return false;
}
@@ -2527,10 +2527,10 @@ void PropertyList::setupProperties()
TQMap<TQString, bool> unique;
TQObject *w = editor->widget();
TQStringList valueSet;
- bool tqparentHasLayout =
+ bool parentHasLayout =
w->isWidgetType() &&
- !editor->formWindow()->isMainContainer( TQT_TQOBJECT((TQWidget*)w) ) && ( (TQWidget*)w )->tqparentWidget() &&
- WidgetFactory::tqlayoutType( ( (TQWidget*)w )->tqparentWidget() ) != WidgetFactory::NoLayout;
+ !editor->formWindow()->isMainContainer( TQT_TQOBJECT((TQWidget*)w) ) && ( (TQWidget*)w )->parentWidget() &&
+ WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
const TQMetaProperty* p =
editor->widget()->tqmetaObject()->
@@ -2573,7 +2573,7 @@ void PropertyList::setupProperties()
continue;
if ( qstrcmp( p->name(), "baseSize" ) == 0 )
continue;
- if ( tqparentHasLayout && qstrcmp( p->name(), "geometry" ) == 0 )
+ if ( parentHasLayout && qstrcmp( p->name(), "geometry" ) == 0 )
continue;
if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || w->inherits( "Spacer" ) ) {
if ( qstrcmp( p->name(), "sizePolicy" ) == 0 )
@@ -2679,7 +2679,7 @@ void PropertyList::setupProperties()
TQStringList lst;
for ( uint i = 0; i < l.count(); ++i ) {
TQString k = l.at( i );
- // filter out enum-tqmasks
+ // filter out enum-masks
if ( k[0] == 'M' && k[1].category() == TQChar::Letter_Uppercase )
continue;
lst << l.at( i );
@@ -2703,11 +2703,11 @@ void PropertyList::setupProperties()
}
if ( !w->inherits( TQSPLITTER_OBJECT_NAME_STRING ) && !w->inherits( "QDesignerMenuBar" ) && !w->inherits( "QDesignerToolBar" ) &&
- w->isWidgetType() && WidgetFactory::tqlayoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) {
- item = new PropertyIntItem( this, item, 0, "tqlayoutSpacing", true );
+ w->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) {
+ item = new PropertyIntItem( this, item, 0, "layoutSpacing", true );
setPropertyValue( item );
item->setChanged( true );
- item = new PropertyIntItem( this, item, 0, "tqlayoutMargin", true );
+ item = new PropertyIntItem( this, item, 0, "layoutMargin", true );
setPropertyValue( item );
item->setChanged( true );
}
@@ -2727,7 +2727,7 @@ void PropertyList::setupProperties()
#ifndef TQT_NO_SQL
if ( !editor->widget()->inherits( TQDATATABLE_OBJECT_NAME_STRING ) && !editor->widget()->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) &&
- !editor->widget()->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) && tqparent_is_data_aware( editor->widget() ) ) {
+ !editor->widget()->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) && parent_is_data_aware( editor->widget() ) ) {
item = new PropertyDatabaseItem( this, item, 0, "database", editor->formWindow()->mainContainer() != w );
setPropertyValue( item );
if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) )
@@ -3084,9 +3084,9 @@ void PropertyList::setPropertyValue( PropertyItem *i )
i->setValue( TQVariant( true, 0 ) );
else
i->setValue( TQVariant( false, 0 ) );
- } else if ( i->name() == "tqlayoutSpacing" ) {
+ } else if ( i->name() == "layoutSpacing" ) {
( (PropertyIntItem*)i )->setValue( MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() )) ) );
- } else if ( i->name() == "tqlayoutMargin" ) {
+ } else if ( i->name() == "layoutMargin" ) {
( (PropertyIntItem*)i )->setValue( MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() )) ) );
} else if ( i->name() == "toolTip" || i->name() == "whatsThis" || i->name() == "database" || i->name() == "frameworkCode" ) {
i->setValue( MetaDataBase::fakeProperty( editor->widget(), i->name() ) );
@@ -3563,11 +3563,11 @@ void PropertyEditor::setWidget( TQObject *w, FormWindow *fw )
#endif
if ( w && w == wid ) {
bool ret = true;
- if ( wid->isWidgetType() && WidgetFactory::tqlayoutType( (TQWidget*)wid ) != WidgetFactory::NoLayout ) {
+ if ( wid->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)wid ) != WidgetFactory::NoLayout ) {
TQListViewItemIterator it( listview );
ret = false;
while ( it.current() ) {
- if ( it.current()->text( 0 ) == "tqlayoutSpacing" || it.current()->text( 0 ) == "tqlayoutMargin" ) {
+ if ( it.current()->text( 0 ) == "layoutSpacing" || it.current()->text( 0 ) == "layoutMargin" ) {
ret = true;
break;
}