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.cpp74
1 files changed, 37 insertions, 37 deletions
diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp
index 50938a89..ad46f6ec 100644
--- a/kommander/editor/propertyeditor.cpp
+++ b/kommander/editor/propertyeditor.cpp
@@ -397,8 +397,8 @@ void PropertyItem::createResetButton()
hbox->setLineWidth( 1 );
resetButton = new TQPushButton( hbox );
resetButton->setPixmap( PixmapChooser::loadPixmap( "resetproperty.xpm", PixmapChooser::Mini ) );
- resetButton->setFixedWidth( resetButton->tqsizeHint().width() );
- hbox->tqlayout()->tqsetAlignment( TQt::AlignRight );
+ resetButton->setFixedWidth( resetButton->sizeHint().width() );
+ hbox->tqlayout()->setAlignment( TQt::AlignRight );
listview->addChild( hbox );
hbox->hide();
TQObject::connect( resetButton, TQT_SIGNAL( clicked() ),
@@ -425,13 +425,13 @@ void PropertyItem::updateResetButtonState()
void PropertyItem::placeEditor( TQWidget *w )
{
createResetButton();
- TQRect r = listview->tqitemRect( this );
+ TQRect r = listview->itemRect( this );
if ( !r.size().isValid() ) {
listview->ensureItemVisible( this );
#if defined(TQ_WS_WIN)
listview->repaintContents( false );
#endif
- r = listview->tqitemRect( this );
+ r = listview->itemRect( this );
}
r.setX( listview->header()->sectionPos( 1 ) );
r.setWidth( listview->header()->sectionSize( 1 ) - 1 );
@@ -439,7 +439,7 @@ 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->parentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() );
+ resetButton->parentWidget()->resize( resetButton->sizeHint().width() + 10, r.height() );
listview->moveChild( resetButton->parentWidget(), r.x() + r.width() - 8, r.y() );
resetButton->setFixedHeight( r.height() - 3 );
}
@@ -537,10 +537,10 @@ TQString PropertyItem::currentItemFromObject() const
void PropertyItem::setFocus( TQWidget *w )
{
- if ( !tqApp->tqfocusWidget() ||
+ if ( !tqApp->focusWidget() ||
listview->propertyEditor()->formWindow() &&
- ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->tqfocusWidget()) ) &&
- !tqApp->tqfocusWidget()->inherits( "Editor" ) ) )
+ ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->focusWidget()) ) &&
+ !tqApp->focusWidget()->inherits( "Editor" ) ) )
w->setFocus();
}
@@ -1540,8 +1540,8 @@ PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, Pr
box = new TQHBox( listview->viewport() );
box->hide();
pixPrev = new TQLabel( box );
- pixPrev->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
- pixPrev->setBackgroundColor( pixPrev->tqcolorGroup().color( TQColorGroup::Base ) );
+ pixPrev->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
+ pixPrev->setBackgroundColor( pixPrev->colorGroup().color( TQColorGroup::Base ) );
button = new TQPushButton( "...", box );
button->setFixedWidth( 20 );
box->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
@@ -1605,8 +1605,8 @@ void PropertyPixmapItem::drawCustomContents( TQPainter *p, const TQRect &r )
TQPixmap pix( (!iconSet ? value().toPixmap() : value().toIconSet().pixmap()) );
if ( !pix.isNull() ) {
p->save();
- p->setClipRect( TQRect( TQPoint( (int)(p->tqworldMatrix().dx() + r.x()),
- (int)(p->tqworldMatrix().dy() + r.y()) ),
+ p->setClipRect( TQRect( TQPoint( (int)(p->worldMatrix().dx() + r.x()),
+ (int)(p->worldMatrix().dy() + r.y()) ),
r.size() ) );
p->drawPixmap( r.x(), r.y() + ( r.height() - pix.height() ) / 2, pix );
p->restore();
@@ -2198,7 +2198,7 @@ void PropertyPaletteItem::getPalette()
w = ( (TQScrollView*)w )->viewport();
TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(),
#if defined(TQT_NON_COMMERCIAL)
- w->backgroundMode(), listview->tqtopLevelWidget(),
+ w->backgroundMode(), listview->topLevelWidget(),
#else
w->backgroundMode(), listview,
#endif
@@ -2218,8 +2218,8 @@ void PropertyPaletteItem::drawCustomContents( TQPainter *p, const TQRect &r )
{
TQPalette pal( value().toPalette() );
p->save();
- p->setClipRect( TQRect( TQPoint( (int)(p->tqworldMatrix().dx() + r.x()),
- (int)(p->tqworldMatrix().dy() + r.y()) ),
+ p->setClipRect( TQRect( TQPoint( (int)(p->worldMatrix().dx() + r.x()),
+ (int)(p->worldMatrix().dy() + r.y()) ),
r.size() ) );
TQRect r2( r );
r2.setX( r2.x() + 2 );
@@ -2522,7 +2522,7 @@ void PropertyList::setupProperties()
if ( !editor->widget() )
return;
bool allProperties = !editor->widget()->inherits( "Spacer" );
- TQStrList lst = editor->widget()->tqmetaObject()->propertyNames( allProperties );
+ TQStrList lst = editor->widget()->metaObject()->propertyNames( allProperties );
PropertyItem *item = 0;
TQMap<TQString, bool> unique;
TQObject *w = editor->widget();
@@ -2533,11 +2533,11 @@ void PropertyList::setupProperties()
WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
const TQMetaProperty* p =
- editor->widget()->tqmetaObject()->
- property( editor->widget()->tqmetaObject()->findProperty( it.current(), allProperties), allProperties );
+ editor->widget()->metaObject()->
+ property( editor->widget()->metaObject()->findProperty( it.current(), allProperties), allProperties );
if ( !p )
continue;
- if ( unique.contains( TQString::tqfromLatin1( it.current() ) ) )
+ if ( unique.contains( TQString::fromLatin1( it.current() ) ) )
continue;
if ( editor->widget()->inherits( "QDesignerToolBar" ) || editor->widget()->inherits( "QDesignerMenuBar" ) ) {
if ( qstrcmp( p->name(), "minimumHeight" ) == 0 )
@@ -2552,12 +2552,12 @@ void PropertyList::setupProperties()
continue;
if ( qstrcmp( p->name(), "sizePolicy" ) == 0 )
continue;
- if ( qstrcmp( p->name(), "tqminimumSize" ) == 0 )
+ if ( qstrcmp( p->name(), "minimumSize" ) == 0 )
continue;
- if ( qstrcmp( p->name(), "tqmaximumSize" ) == 0 )
+ if ( qstrcmp( p->name(), "maximumSize" ) == 0 )
continue;
}
- unique.insert( TQString::tqfromLatin1( it.current() ), true );
+ unique.insert( TQString::fromLatin1( it.current() ), true );
if ( editor->widget()->isWidgetType() &&
editor->formWindow()->isMainContainer( TQT_TQOBJECT((TQWidget*)editor->widget()) ) ) {
if ( qstrcmp( p->name(), "geometry" ) == 0 )
@@ -2588,9 +2588,9 @@ void PropertyList::setupProperties()
continue;
if ( qstrcmp( p->name(), "geometry" ) == 0 )
continue;
- if ( qstrcmp( p->name(), "tqminimumSize" ) == 0 )
+ if ( qstrcmp( p->name(), "minimumSize" ) == 0 )
continue;
- if ( qstrcmp( p->name(), "tqmaximumSize" ) == 0 )
+ if ( qstrcmp( p->name(), "maximumSize" ) == 0 )
continue;
if ( qstrcmp( p->name(), "enabled" ) == 0 )
continue;
@@ -3061,21 +3061,21 @@ static void clearAlignList( TQStrList &l )
void PropertyList::setPropertyValue( PropertyItem *i )
{
const TQMetaProperty *p =
- editor->widget()->tqmetaObject()->
- property( editor->widget()->tqmetaObject()->findProperty( i->name(), true), true );
+ editor->widget()->metaObject()->
+ property( editor->widget()->metaObject()->findProperty( i->name(), true), true );
if ( !p ) {
if ( i->name() == "hAlign" ) {
int align = editor->widget()->property( "tqalignment" ).toInt();
- p = editor->widget()->tqmetaObject()->
- property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", true ), true );
+ p = editor->widget()->metaObject()->
+ property( editor->widget()->metaObject()->findProperty( "tqalignment", true ), true );
align &= ~AlignVertical_Mask;
TQStrList l = p->valueToKeys( align );
clearAlignList( l );
( (PropertyListItem*)i )->setCurrentItem( l.last() );
} else if ( i->name() == "vAlign" ) {
int align = editor->widget()->property( "tqalignment" ).toInt();
- p = editor->widget()->tqmetaObject()->
- property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", true ), true );
+ p = editor->widget()->metaObject()->
+ property( editor->widget()->metaObject()->findProperty( "tqalignment", true ), true );
align &= ~AlignHorizontal_Mask;
( (PropertyListItem*)i )->setCurrentItem( p->valueToKeys( align ).last() );
} else if ( i->name() == "wordwrap" ) {
@@ -3229,7 +3229,7 @@ TQString PropertyList::whatsThisText( TQListViewItem *i )
if ( ( (PropertyItem*)i )->propertyParent() )
i = ( (PropertyItem*)i )->propertyParent();
- const TQMetaObject *mo = editor->widget()->tqmetaObject();
+ const TQMetaObject *mo = editor->widget()->metaObject();
TQString prop = ( (PropertyItem*)i )->name();
while ( mo ) {
TQString s;
@@ -3238,7 +3238,7 @@ TQString PropertyList::whatsThisText( TQListViewItem *i )
if ( ( it = propertyDocs.find( s ) ) != propertyDocs.end() ) {
return *it;
}
- mo = mo->tqsuperClass();
+ mo = mo->superClass();
}
return i18n("<p><b>TQWidget::%1</b></p><p>There is no documentation available for this property.</p>" ).tqarg( prop );
@@ -3327,7 +3327,7 @@ void EventList::setup()
#endif
}
} else {
- TQStrList sigs = editor->widget()->tqmetaObject()->signalNames( true );
+ TQStrList sigs = editor->widget()->metaObject()->signalNames( true );
sigs.remove( "destroyed()" );
TQStrListIterator it( sigs );
while ( it.current() ) {
@@ -3674,21 +3674,21 @@ TQString PropertyEditor::classOfCurrentProperty() const
return TQString();
TQObject *o = wid;
TQString curr = currentProperty();
- TQMetaObject *mo = o->tqmetaObject();
+ TQMetaObject *mo = o->metaObject();
while ( mo ) {
TQStrList props = mo->propertyNames( false );
if ( props.find( curr.latin1() ) != -1 )
return mo->className();
- mo = mo->tqsuperClass();
+ mo = mo->superClass();
}
return TQString();
}
-TQMetaObject* PropertyEditor::tqmetaObjectOfCurrentProperty() const
+TQMetaObject* PropertyEditor::metaObjectOfCurrentProperty() const
{
if ( !wid )
return 0;
- return wid->tqmetaObject();
+ return wid->metaObject();
}
void PropertyEditor::resetFocus()