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.cpp152
1 files changed, 74 insertions, 78 deletions
diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp
index 00511834..4b0c58e4 100644
--- a/kommander/editor/propertyeditor.cpp
+++ b/kommander/editor/propertyeditor.cpp
@@ -282,7 +282,7 @@ void PropertyItem::paintBranches( TQPainter * p, const TQColorGroup & cg,
void PropertyItem::paintFocus( TQPainter *p, const TQColorGroup &cg, const TQRect &r )
{
p->save();
- TQApplication::style().tqdrawPrimitive(TQStyle::PE_Panel, p, r, cg,
+ TQApplication::style().drawPrimitive(TQStyle::PE_Panel, p, r, cg,
TQStyle::Style_Sunken, TQStyleOption(1,1) );
p->restore();
}
@@ -401,8 +401,8 @@ void PropertyItem::createResetButton()
hbox->layout()->setAlignment( TQt::AlignRight );
listview->addChild( hbox );
hbox->hide();
- TQObject::connect( resetButton, TQT_SIGNAL( clicked() ),
- listview, TQT_SLOT( resetProperty() ) );
+ TQObject::connect( resetButton, TQ_SIGNAL( clicked() ),
+ listview, TQ_SLOT( resetProperty() ) );
TQToolTip::add( resetButton, i18n("Reset the property to its default value" ) );
TQWhatsThis::add( resetButton, i18n("Click this button to reset the property to its default value" ) );
updateResetButtonState();
@@ -539,7 +539,7 @@ void PropertyItem::setFocus( TQWidget *w )
{
if ( !tqApp->focusWidget() ||
listview->propertyEditor()->formWindow() &&
- ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->focusWidget()) ) &&
+ ( !MainWindow::self->isAFormWindowChild( tqApp->focusWidget() ) &&
!tqApp->focusWidget()->inherits( "Editor" ) ) )
w->setFocus();
}
@@ -582,30 +582,30 @@ TQLineEdit *PropertyTextItem::lined()
if ( asciiOnly ) {
if ( PropertyItem::name() == "name" )
- lin->setValidator( new AsciiValidator( TQT_TQOBJECT(lin), "ascii_validator" ) );
+ lin->setValidator( new AsciiValidator( lin, "ascii_validator" ) );
else
lin->setValidator( new AsciiValidator( TQString("!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~"
"\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9"
"\xaa\xab\xac\xad\xae\xaf\xb1\xb2\xb3"
"\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc"
- "\xbd\xbe\xbf"), TQT_TQOBJECT(lin), "ascii_validator" ) );
+ "\xbd\xbe\xbf"), lin, "ascii_validator" ) );
} if ( !hasMultiLines ) {
lin->hide();
} else {
button = new TQPushButton( i18n("..."), box );
button->setFixedWidth( 20 );
- connect( button, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( getText() ) );
+ connect( button, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( getText() ) );
lin->setFrame( false );
}
- connect( lin, TQT_SIGNAL( returnPressed() ),
- this, TQT_SLOT( setValue() ) );
- connect( lin, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SLOT( setValue() ) );
+ connect( lin, TQ_SIGNAL( returnPressed() ),
+ this, TQ_SLOT( setValue() ) );
+ connect( lin, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SLOT( setValue() ) );
if ( PropertyItem::name() == "name" || PropertyItem::name() == "itemName" )
- connect( lin, TQT_SIGNAL( returnPressed() ),
+ connect( lin, TQ_SIGNAL( returnPressed() ),
listview->propertyEditor()->formWindow()->commandHistory(),
- TQT_SLOT( checkCompressedCommand() ) );
+ TQ_SLOT( checkCompressedCommand() ) );
lin->installEventFilter( listview );
return lin;
}
@@ -762,12 +762,12 @@ TQLineEdit *PropertyDoubleItem::lined()
if ( lin )
return lin;
lin = new TQLineEdit( listview->viewport() );
- lin->setValidator( new TQDoubleValidator( TQT_TQOBJECT(lin), "double_validator" ) );
+ lin->setValidator( new TQDoubleValidator( lin, "double_validator" ) );
- connect( lin, TQT_SIGNAL( returnPressed() ),
- this, TQT_SLOT( setValue() ) );
- connect( lin, TQT_SIGNAL( textChanged( const TQString & ) ),
- this, TQT_SLOT( setValue() ) );
+ connect( lin, TQ_SIGNAL( returnPressed() ),
+ this, TQ_SLOT( setValue() ) );
+ connect( lin, TQ_SIGNAL( textChanged( const TQString & ) ),
+ this, TQ_SLOT( setValue() ) );
lin->installEventFilter( listview );
return lin;
}
@@ -846,8 +846,8 @@ TQDateEdit *PropertyDateItem::lined()
for ( TQObject *o = l->first(); o; o = l->next() )
o->installEventFilter( listview );
delete l;
- connect( lin, TQT_SIGNAL( valueChanged( const TQDate & ) ),
- this, TQT_SLOT( setValue() ) );
+ connect( lin, TQ_SIGNAL( valueChanged( const TQDate & ) ),
+ this, TQ_SLOT( setValue() ) );
return lin;
}
@@ -891,13 +891,13 @@ void PropertyDateItem::setValue( const TQVariant &v )
lined()->setDate( v.toDate() );
lined()->blockSignals( false );
}
- setText( 1, v.toDate().toString( ::Qt::ISODate ) );
+ setText( 1, v.toDate().toString( ::TQt::ISODate ) );
PropertyItem::setValue( v );
}
void PropertyDateItem::setValue()
{
- setText( 1, lined()->date().toString( ::Qt::ISODate ) );
+ setText( 1, lined()->date().toString( ::TQt::ISODate ) );
TQVariant v;
v = lined()->date();
PropertyItem::setValue( v );
@@ -917,8 +917,8 @@ TQTimeEdit *PropertyTimeItem::lined()
if ( lin )
return lin;
lin = new TQTimeEdit( listview->viewport() );
- connect( lin, TQT_SIGNAL( valueChanged( const TQTime & ) ),
- this, TQT_SLOT( setValue() ) );
+ connect( lin, TQ_SIGNAL( valueChanged( const TQTime & ) ),
+ this, TQ_SLOT( setValue() ) );
TQObjectList *l = lin->queryList( "TQLineEdit" );
for ( TQObject *o = l->first(); o; o = l->next() )
o->installEventFilter( listview );
@@ -966,13 +966,13 @@ void PropertyTimeItem::setValue( const TQVariant &v )
lined()->setTime( v.toTime() );
lined()->blockSignals( false );
}
- setText( 1, v.toTime().toString( ::Qt::ISODate ) );
+ setText( 1, v.toTime().toString( ::TQt::ISODate ) );
PropertyItem::setValue( v );
}
void PropertyTimeItem::setValue()
{
- setText( 1, lined()->time().toString( ::Qt::ISODate ) );
+ setText( 1, lined()->time().toString( ::TQt::ISODate ) );
TQVariant v;
v = lined()->time();
PropertyItem::setValue( v );
@@ -992,8 +992,8 @@ TQDateTimeEdit *PropertyDateTimeItem::lined()
if ( lin )
return lin;
lin = new TQDateTimeEdit( listview->viewport() );
- connect( lin, TQT_SIGNAL( valueChanged( const TQDateTime & ) ),
- this, TQT_SLOT( setValue() ) );
+ connect( lin, TQ_SIGNAL( valueChanged( const TQDateTime & ) ),
+ this, TQ_SLOT( setValue() ) );
TQObjectList *l = lin->queryList( "TQLineEdit" );
for ( TQObject *o = l->first(); o; o = l->next() )
o->installEventFilter( listview );
@@ -1041,13 +1041,13 @@ void PropertyDateTimeItem::setValue( const TQVariant &v )
lined()->setDateTime( v.toDateTime() );
lined()->blockSignals( false );
}
- setText( 1, v.toDateTime().toString( ::Qt::ISODate ) );
+ setText( 1, v.toDateTime().toString( ::TQt::ISODate ) );
PropertyItem::setValue( v );
}
void PropertyDateTimeItem::setValue()
{
- setText( 1, lined()->dateTime().toString( ::Qt::ISODate ) );
+ setText( 1, lined()->dateTime().toString( ::TQt::ISODate ) );
TQVariant v;
v = lined()->dateTime();
PropertyItem::setValue( v );
@@ -1070,8 +1070,8 @@ TQComboBox *PropertyBoolItem::combo()
comb->hide();
comb->insertItem( i18n("False" ) );
comb->insertItem( i18n("True" ) );
- connect( comb, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( setValue() ) );
+ connect( comb, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( setValue() ) );
comb->installEventFilter( listview );
return comb;
}
@@ -1167,8 +1167,8 @@ TQSpinBox *PropertyIntItem::spinBox()
if ( ol && ol->first() )
ol->first()->installEventFilter( listview );
delete ol;
- connect( spinBx, TQT_SIGNAL( valueChanged( int ) ),
- this, TQT_SLOT( setValue() ) );
+ connect( spinBx, TQ_SIGNAL( valueChanged( int ) ),
+ this, TQ_SLOT( setValue() ) );
return spinBx;
}
@@ -1252,8 +1252,8 @@ TQComboBox *PropertyListItem::combo()
return comb;
comb = new TQComboBox( editable, listview->viewport() );
comb->hide();
- connect( comb, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( setValue() ) );
+ connect( comb, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( setValue() ) );
comb->installEventFilter( listview );
if ( editable ) {
TQObjectList *ol = comb->queryList( "TQLineEdit" );
@@ -1548,8 +1548,8 @@ PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, Pr
box->setLineWidth( 2 );
pixPrev->setFrameStyle( TQFrame::NoFrame );
box->installEventFilter( listview );
- connect( button, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( getPixmap() ) );
+ connect( button, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( getPixmap() ) );
}
PropertyPixmapItem::~PropertyPixmapItem()
{
@@ -1637,8 +1637,8 @@ PropertyColorItem::PropertyColorItem( PropertyList *l, PropertyItem *after, Prop
pal.setDisabled( cg );
colorPrev->setPalette( pal );
box->installEventFilter( listview );
- connect( button, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( getColor() ) );
+ connect( button, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( getColor() ) );
}
void PropertyColorItem::createChildren()
@@ -1758,8 +1758,8 @@ PropertyFontItem::PropertyFontItem( PropertyList *l, PropertyItem *after, Proper
box->installEventFilter( listview );
lined->installEventFilter( listview );
button->installEventFilter( listview );
- connect( button, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( getFont() ) );
+ connect( button, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( getFont() ) );
}
void PropertyFontItem::createChildren()
@@ -2156,8 +2156,8 @@ PropertyPaletteItem::PropertyPaletteItem( PropertyList *l, PropertyItem *after,
box->setLineWidth( 2 );
palettePrev->setFrameStyle( TQFrame::NoFrame );
box->installEventFilter( listview );
- connect( button, TQT_SIGNAL( clicked() ),
- this, TQT_SLOT( getPalette() ) );
+ connect( button, TQ_SIGNAL( clicked() ),
+ this, TQ_SLOT( getPalette() ) );
}
PropertyPaletteItem::~PropertyPaletteItem()
{
@@ -2197,11 +2197,7 @@ void PropertyPaletteItem::getPalette()
if ( w->inherits( "TQScrollView" ) )
w = ( (TQScrollView*)w )->viewport();
TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(),
-#if defined(TQT_NON_COMMERCIAL)
- w->backgroundMode(), listview->topLevelWidget(),
-#else
w->backgroundMode(), listview,
-#endif
"choose_palette", listview->propertyEditor()->formWindow() );
if ( !ok )
return;
@@ -2309,8 +2305,8 @@ TQComboBox *PropertyCursorItem::combo()
cur.setMask( cur );
comb->insertItem( cur, i18n("Forbidden"), TQObject::ForbiddenCursor );
- connect( comb, TQT_SIGNAL( activated( int ) ),
- this, TQT_SLOT( setValue() ) );
+ connect( comb, TQ_SIGNAL( activated( int ) ),
+ this, TQ_SLOT( setValue() ) );
comb->installEventFilter( listview );
return comb;
}
@@ -2401,16 +2397,16 @@ PropertyList::PropertyList( PropertyEditor *e )
viewport()->installEventFilter( this );
addColumn( i18n("Property" ) );
addColumn( i18n("Value" ) );
- connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ),
- this, TQT_SLOT( updateEditorSize() ) );
- disconnect( header(), TQT_SIGNAL( sectionClicked( int ) ),
- this, TQT_SLOT( changeSortColumn( int ) ) );
- connect( header(), TQT_SIGNAL( sectionClicked( int ) ),
- this, TQT_SLOT( toggleSort() ) );
- connect( this, TQT_SIGNAL( pressed( TQListViewItem *, const TQPoint &, int ) ),
- this, TQT_SLOT( itemPressed( TQListViewItem *, const TQPoint &, int ) ) );
- connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
- this, TQT_SLOT( toggleOpen( TQListViewItem * ) ) );
+ connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ),
+ this, TQ_SLOT( updateEditorSize() ) );
+ disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ),
+ this, TQ_SLOT( changeSortColumn( int ) ) );
+ connect( header(), TQ_SIGNAL( sectionClicked( int ) ),
+ this, TQ_SLOT( toggleSort() ) );
+ connect( this, TQ_SIGNAL( pressed( TQListViewItem *, const TQPoint &, int ) ),
+ this, TQ_SLOT( itemPressed( TQListViewItem *, const TQPoint &, int ) ) );
+ connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+ this, TQ_SLOT( toggleOpen( TQListViewItem * ) ) );
setSorting( -1 );
setHScrollBarMode( AlwaysOff );
setVScrollBarMode( AlwaysOn );
@@ -2529,7 +2525,7 @@ void PropertyList::setupProperties()
TQStringList valueSet;
bool parentHasLayout =
w->isWidgetType() &&
- !editor->formWindow()->isMainContainer( TQT_TQOBJECT((TQWidget*)w) ) && ( (TQWidget*)w )->parentWidget() &&
+ !editor->formWindow()->isMainContainer( (TQWidget*)w ) && ( (TQWidget*)w )->parentWidget() &&
WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
const TQMetaProperty* p =
@@ -2559,7 +2555,7 @@ void PropertyList::setupProperties()
}
unique.insert( TQString::fromLatin1( it.current() ), true );
if ( editor->widget()->isWidgetType() &&
- editor->formWindow()->isMainContainer( TQT_TQOBJECT((TQWidget*)editor->widget()) ) ) {
+ editor->formWindow()->isMainContainer( (TQWidget*)editor->widget() ) ) {
if ( qstrcmp( p->name(), "geometry" ) == 0 )
continue;
} else { // hide some toplevel-only stuff
@@ -2785,7 +2781,7 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name,
case TQVariant::CString:
item = new PropertyTextItem( this, item, 0,
name, name == "name" &&
- TQT_BASE_OBJECT(editor->widget()) == TQT_BASE_OBJECT(editor->formWindow()->mainContainer()),
+ editor->widget() == editor->formWindow()->mainContainer(),
false, true );
break;
case TQVariant::Bool:
@@ -2885,7 +2881,7 @@ void PropertyList::valueChanged( PropertyItem *i )
TQString pn( i18n("Set '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) );
SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(),
editor->widget(), editor,
- i->name(), WidgetFactory::property( editor->widget(), i->name() ),
+ i->name(), WidgetFactory::property( editor->widget(), i->name().latin1() ),
i->value(), i->currentItem(), i->currentItemFromObject() );
cmd->execute();
editor->formWindow()->commandHistory()->addCommand( cmd, true );
@@ -2921,10 +2917,10 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e )
return true;
PropertyItem *i = (PropertyItem*)currentItem();
- if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this) &&e->type() == TQEvent::KeyPress ) {
+ if ( o != this &&e->type() == TQEvent::KeyPress ) {
TQKeyEvent *ke = (TQKeyEvent*)e;
if ( ( ke->key() == Key_Up || ke->key() == Key_Down ) &&
- ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(viewport()) ) &&
+ ( o != this || o != viewport() ) &&
!( ke->state() & ControlButton ) ) {
TQApplication::sendEvent( this, (TQKeyEvent*)e );
return true;
@@ -2945,8 +2941,8 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e )
return true;
}
} else if ( e->type() == TQEvent::FocusOut && o->inherits( "TQLineEdit" ) && editor->formWindow() ) {
- TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQT_SLOT( checkCompressedCommand() ) );
- } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) ) {
+ TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQ_SLOT( checkCompressedCommand() ) );
+ } else if ( o == viewport() ) {
TQMouseEvent *me;
PropertyListItem* i;
switch ( e->type() ) {
@@ -2961,7 +2957,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e )
break;
case TQEvent::MouseMove:
me = (TQMouseEvent*)e;
- if ( me && me->state() & Qt::LeftButton && mousePressed) {
+ if ( me && me->state() & TQt::LeftButton && mousePressed) {
i = (PropertyListItem*) itemAt( me->pos() );
if( i && i == pressItem ) {
@@ -2996,7 +2992,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e )
default:
break;
}
- } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(header()) ) {
+ } else if ( o == header() ) {
if ( e->type() == TQEvent::ContextMenu ) {
((TQContextMenuEvent *)e)->accept();
TQPopupMenu menu( 0 );
@@ -3062,7 +3058,7 @@ void PropertyList::setPropertyValue( PropertyItem *i )
{
const TQMetaProperty *p =
editor->widget()->metaObject()->
- property( editor->widget()->metaObject()->findProperty( i->name(), true), true );
+ property( editor->widget()->metaObject()->findProperty( i->name().latin1(), true), true );
if ( !p ) {
if ( i->name() == "hAlign" ) {
int align = editor->widget()->property( "alignment" ).toInt();
@@ -3085,9 +3081,9 @@ void PropertyList::setPropertyValue( PropertyItem *i )
else
i->setValue( TQVariant( false) );
} else if ( i->name() == "layoutSpacing" ) {
- ( (PropertyIntItem*)i )->setValue( MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() )) ) );
+ ( (PropertyIntItem*)i )->setValue( MetaDataBase::spacing( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ) ) );
} else if ( i->name() == "layoutMargin" ) {
- ( (PropertyIntItem*)i )->setValue( MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() )) ) );
+ ( (PropertyIntItem*)i )->setValue( MetaDataBase::margin( 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() ) );
} else if ( editor->widget()->inherits( "CustomWidget" ) ) {
@@ -3101,9 +3097,9 @@ void PropertyList::setPropertyValue( PropertyItem *i )
if ( p->isSetType() )
;
else if ( p->isEnumType() )
- ( (PropertyListItem*)i )->setCurrentItem( p->valueToKey( editor->widget()->property( i->name() ).toInt() ) );
+ ( (PropertyListItem*)i )->setCurrentItem( p->valueToKey( editor->widget()->property( i->name().latin1() ).toInt() ) );
else
- i->setValue( editor->widget()->property( i->name() ) );
+ i->setValue( editor->widget()->property( i->name().latin1() ) );
}
void PropertyList::setCurrentProperty( const TQString &n )
@@ -3284,8 +3280,8 @@ EventList::EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e )
header()->hide();
removeColumn( 1 );
setRootIsDecorated( true );
- connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ),
- this, TQT_SLOT( renamed( TQListViewItem * ) ) );
+ connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ),
+ this, TQ_SLOT( renamed( TQListViewItem * ) ) );
}
void EventList::setup()