summaryrefslogtreecommitdiffstats
path: root/kommander/editor
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-03-07 20:24:08 +0100
committergregory guy <gregory-tde@laposte.net>2021-03-11 15:04:46 +0100
commit70defe5e6d9498c5c6011eee50c4dc506abebd61 (patch)
treec2d269ffeaf389637607efa6547ff8eb2d41cd45 /kommander/editor
parent4c43d1fbb66a296958ed1d0dbddf3f8ac4466130 (diff)
downloadtdewebdev-70defe5e6d9498c5c6011eee50c4dc506abebd61.tar.gz
tdewebdev-70defe5e6d9498c5c6011eee50c4dc506abebd61.zip
Added controlled conversions to char* instead of automatic ascii conversions.
The definition of -UTQT_NO_ASCII_CAST is no longer needed. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'kommander/editor')
-rw-r--r--kommander/editor/actiondnd.cpp4
-rw-r--r--kommander/editor/actioneditorimpl.cpp4
-rw-r--r--kommander/editor/command.cpp32
-rw-r--r--kommander/editor/connectioneditorimpl.cpp4
-rw-r--r--kommander/editor/formwindow.cpp4
-rw-r--r--kommander/editor/layout.cpp6
-rw-r--r--kommander/editor/metadatabase.cpp4
-rw-r--r--kommander/editor/newformimpl.cpp4
-rw-r--r--kommander/editor/pixmapchooser.cpp2
-rw-r--r--kommander/editor/propertyeditor.cpp8
-rw-r--r--kommander/editor/resource.cpp40
-rw-r--r--kommander/editor/widgetdatabase.cpp6
-rw-r--r--kommander/editor/widgetfactory.cpp4
13 files changed, 61 insertions, 61 deletions
diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp
index 48f8a427..87a55c9f 100644
--- a/kommander/editor/actiondnd.cpp
+++ b/kommander/editor/actiondnd.cpp
@@ -452,7 +452,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
TQString type = a->inherits( "TQActionGroup" ) ? TQString( "application/x-designer-actiongroup" ) :
a->inherits( "QSeparatorAction" ) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" );
- TQStoredDrag *drag = new TQStoredDrag( type, this );
+ TQStoredDrag *drag = new TQStoredDrag( type.utf8(), this );
TQString s = TQString::number( (long)a ); // #### huha, that is evil
drag->setEncodedData( TQCString( s.latin1() ) );
drag->setPixmap( a->iconSet().pixmap() );
@@ -1076,7 +1076,7 @@ void QDesignerPopupMenu::mouseMoveEvent( TQMouseEvent *e )
TQString type = a->inherits( "TQActionGroup" ) ? TQString( "application/x-designer-actiongroup" ) :
a->inherits( "QSeparatorAction" ) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" );
- TQStoredDrag *drag = new TQStoredDrag( type, this );
+ TQStoredDrag *drag = new TQStoredDrag( type.utf8(), this );
TQString s = TQString::number( (long)a ); // #### huha, that is evil
drag->setEncodedData( TQCString( s.latin1() ) );
drag->setPixmap( a->iconSet().pixmap() );
diff --git a/kommander/editor/actioneditorimpl.cpp b/kommander/editor/actioneditorimpl.cpp
index 22f30088..72f09daf 100644
--- a/kommander/editor/actioneditorimpl.cpp
+++ b/kommander/editor/actioneditorimpl.cpp
@@ -130,7 +130,7 @@ void ActionEditor::newAction()
TQString n = "Action";
formWindow->unify( i->action(), n, true );
i->setText( 0, n );
- i->action()->setName( n );
+ i->action()->setName( n.utf8() );
i->action()->setText( i->action()->name() );
if ( actionParent && actionParent->actionGroup() &&
actionParent->actionGroup()->usesDropDown() ) {
@@ -164,7 +164,7 @@ void ActionEditor::newActionGroup()
TQString n = "ActionGroup";
formWindow->unify( i->action(), n, true );
i->setText( 0, n );
- i->actionGroup()->setName( n );
+ i->actionGroup()->setName( n.utf8() );
i->actionGroup()->setText( i->actionGroup()->name() );
MetaDataBase::setPropertyChanged( i->actionGroup(), "text", true );
MetaDataBase::setPropertyChanged( i->actionGroup(), "name", true );
diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp
index 757a6197..adc74084 100644
--- a/kommander/editor/command.cpp
+++ b/kommander/editor/command.cpp
@@ -368,7 +368,7 @@ void DeleteCommand::execute()
w->hide();
TQString s = w->name();
s.prepend( "qt_dead_widget_" );
- w->setName( s );
+ w->setName( s.utf8() );
formWindow()->selectWidget( TQT_TQOBJECT(w), false );
formWindow()->widgets()->remove( w );
TQValueList<MetaDataBase::Connection> conns = MetaDataBase::connections( TQT_TQOBJECT(formWindow()), TQT_TQOBJECT(w) );
@@ -393,7 +393,7 @@ void DeleteCommand::unexecute()
w->show();
TQString s = w->name();
s.remove( 0, TQString( "qt_dead_widget_" ).length() );
- w->setName( s );
+ w->setName( s.utf8() );
formWindow()->widgets()->insert( w, w );
formWindow()->selectWidget( TQT_TQOBJECT(w) );
TQValueList<MetaDataBase::Connection> conns = *connections.find( w );
@@ -438,7 +438,7 @@ void SetPropertyCommand::execute()
PropertyItem *i = (PropertyItem*)editor->propertyList()->currentItem();
if ( !i )
return;
- i->setValue( widget->property( propName ) );
+ i->setValue( widget->property( propName.latin1() ) );
i->setChanged( false );
editor->refetchData();
editor->emitWidgetChanged();
@@ -461,7 +461,7 @@ bool SetPropertyCommand::canMerge( Command *c )
{
SetPropertyCommand *cmd = (SetPropertyCommand*)c;
const TQMetaProperty *p =
- widget->metaObject()->property( widget->metaObject()->findProperty( propName, true ), true );
+ widget->metaObject()->property( widget->metaObject()->findProperty( propName.latin1(), true ), true );
if ( !p ) {
if ( propName == "toolTip" || propName == "whatsThis" )
return true;
@@ -532,19 +532,19 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
editor->propertyList()->setCurrentProperty( propName );
const TQMetaProperty *p =
- widget->metaObject()->property( widget->metaObject()->findProperty( propName, true ), true );
+ widget->metaObject()->property( widget->metaObject()->findProperty( propName.latin1(), true ), true );
if ( !p ) {
if ( propName == "hAlign" ) {
p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", true ), true );
int align = widget->property( "alignment" ).toInt();
align &= ~( AlignHorizontal_Mask );
- align |= p->keyToValue( currentItemText );
+ align |= p->keyToValue( currentItemText.utf8() );
widget->setProperty( "alignment", TQVariant( align ) );
} else if ( propName == "vAlign" ) {
p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", true ), true );
int align = widget->property( "alignment" ).toInt();
align &= ~( AlignVertical_Mask );
- align |= p->keyToValue( currentItemText );
+ align |= p->keyToValue( currentItemText.utf8() );
widget->setProperty( "alignment", TQVariant( align ) );
} else if ( propName == "wordwrap" ) {
int align = widget->property( "alignment" ).toInt();
@@ -577,18 +577,18 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
if ( p->isSetType() ) {
;
} else if ( p->isEnumType() ) {
- widget->setProperty( propName, p->keyToValue( currentItemText ) );
+ widget->setProperty( propName.latin1(), p->keyToValue( currentItemText.utf8() ) );
} else {
TQVariant ov;
if ( propName == "name" || propName == "itemName" )
- ov = widget->property( propName );
+ ov = widget->property( propName.latin1() );
int oldSerNum = -1;
if ( v.type() == TQVariant::Pixmap )
oldSerNum = v.toPixmap().serialNumber();
- widget->setProperty( propName, v );
- if ( oldSerNum != -1 && oldSerNum != widget->property( propName ).toPixmap().serialNumber() )
+ widget->setProperty( propName.latin1(), v );
+ if ( oldSerNum != -1 && oldSerNum != widget->property( propName.latin1() ).toPixmap().serialNumber() )
MetaDataBase::setPixmapKey( TQT_TQOBJECT(formWindow()),
- widget->property( propName ).toPixmap().serialNumber(),
+ widget->property( propName.latin1() ).toPixmap().serialNumber(),
MetaDataBase::pixmapKey( TQT_TQOBJECT(formWindow()), oldSerNum ) );
if ( propName == "cursor" )
MetaDataBase::setCursor( (TQWidget*)widget, v.toCursor() );
@@ -1589,7 +1589,7 @@ void AddActionToToolBarCommand::execute()
TQString s = ( (QDesignerAction*)action )->widget()->name();
if ( s.startsWith( "qt_dead_widget_" ) ) {
s.remove( 0, TQString( "qt_dead_widget_" ).length() );
- ( (QDesignerAction*)action )->widget()->setName( s );
+ ( (QDesignerAction*)action )->widget()->setName( s.utf8() );
}
}
@@ -1644,7 +1644,7 @@ void AddActionToToolBarCommand::unexecute()
if ( action->inherits( "QDesignerAction" ) ) {
TQString s = ( (QDesignerAction*)action )->widget()->name();
s.prepend( "qt_dead_widget_" );
- ( (QDesignerAction*)action )->widget()->setName( s );
+ ( (QDesignerAction*)action )->widget()->setName( s.utf8() );
}
toolBar->removeAction( action );
@@ -1750,7 +1750,7 @@ void AddMenuCommand::execute()
TQString n = "PopupMenu";
popup = new QDesignerPopupMenu( mainWindow );
formWindow()->unify( TQT_TQOBJECT(popup), n, true );
- popup->setName( n );
+ popup->setName( n.utf8() );
}
if ( !mainWindow->child( 0, "TQMenuBar" ) ) {
menuBar = new QDesignerMenuBar( (TQWidget*)mainWindow );
@@ -1828,7 +1828,7 @@ void AddToolBarCommand::execute()
toolBar = new QDesignerToolBar( mainWindow );
TQString n = "Toolbar";
formWindow()->unify( TQT_TQOBJECT(toolBar), n, true );
- toolBar->setName( n );
+ toolBar->setName( n.utf8() );
mainWindow->addToolBar( toolBar, n );
} else {
toolBar->show();
diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp
index 2b57437f..aa1c9f61 100644
--- a/kommander/editor/connectioneditorimpl.cpp
+++ b/kommander/editor/connectioneditorimpl.cpp
@@ -194,8 +194,8 @@ void ConnectionEditor::connectClicked()
return;
MetaDataBase::Connection conn;
conn.sender = m_sender;
- conn.signal = signalBox->currentText();
- conn.slot = slotBox->currentText();
+ conn.signal = signalBox->currentText().utf8();
+ conn.slot = slotBox->currentText().utf8();
conn.receiver = m_receiver;
TDEListViewItem *i = new TDEListViewItem(connectionView, m_sender->name(), conn.signal, m_receiver->name(),
conn.slot);
diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp
index ea76109e..1c294adc 100644
--- a/kommander/editor/formwindow.cpp
+++ b/kommander/editor/formwindow.cpp
@@ -333,7 +333,7 @@ void FormWindow::insertWidget()
TQString s = w->name();
unify(TQT_TQOBJECT(w), s, true);
- w->setName(s);
+ w->setName(s.utf8());
insertWidget(w);
TQRect r(currRect);
if (!oldRectValid || (currRect.width() < 2 && currRect.height() < 2))
@@ -415,7 +415,7 @@ void FormWindow::insertWidget(TQWidget *w, bool checkName)
if (checkName) {
TQString s = w->name();
unify(TQT_TQOBJECT(w), s, true);
- w->setName(s);
+ w->setName(s.utf8());
}
MetaDataBase::addEntry(TQT_TQOBJECT(w));
diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp
index 8fa45d95..026b39f4 100644
--- a/kommander/editor/layout.cpp
+++ b/kommander/editor/layout.cpp
@@ -191,7 +191,7 @@ void Layout::finishLayout( bool needMove, TQLayout *layout )
TQString n = layoutBase->name();
if ( n.find( "qt_dead_widget_" ) != -1 ) {
n.remove( 0, TQString( "qt_dead_widget_" ).length() );
- layoutBase->setName( n );
+ layoutBase->setName( n.utf8() );
}
}
@@ -212,7 +212,7 @@ void Layout::undoLayout()
layoutBase->hide();
TQString n = layoutBase->name();
n.prepend( "qt_dead_widget_" );
- layoutBase->setName( n );
+ layoutBase->setName( n.utf8() );
} else {
layoutBase->setGeometry( oldGeometry );
}
@@ -254,7 +254,7 @@ void Layout::breakLayout()
parent = layoutBase->parentWidget();
TQString n = layoutBase->name();
n.prepend( "qt_dead_widget_" );
- layoutBase->setName( n );
+ layoutBase->setName( n.utf8() );
} else {
parent = layoutBase;
}
diff --git a/kommander/editor/metadatabase.cpp b/kommander/editor/metadatabase.cpp
index b3a65aa8..ca261721 100644
--- a/kommander/editor/metadatabase.cpp
+++ b/kommander/editor/metadatabase.cpp
@@ -477,7 +477,7 @@ void MetaDataBase::doConnections( TQObject *o )
slotList.find( conn.slot ) == -1 )
continue;
- TQObject::connect( sender, s, receiver, s2 );
+ TQObject::connect( sender, s.utf8(), receiver, s2.utf8() );
}
}
@@ -1019,7 +1019,7 @@ bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const
bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const
{
TQStrList slotList = TQWidget::staticMetaObject()->slotNames( true );
- if ( slotList.find( normalizeSlot( slot ) ) != -1 )
+ if ( slotList.find( normalizeSlot(slot).utf8() ) != -1 )
return true;
for ( TQValueList<MetaDataBase::Slot>::ConstIterator it = lstSlots.begin(); it != lstSlots.end(); ++it ) {
diff --git a/kommander/editor/newformimpl.cpp b/kommander/editor/newformimpl.cpp
index 7b8e330b..5aeafc5d 100644
--- a/kommander/editor/newformimpl.cpp
+++ b/kommander/editor/newformimpl.cpp
@@ -56,7 +56,7 @@ void FormItem::insert()
TQString n = "Form" + TQString::number(++_forms);
FormWindow *fw = 0;
FormFile *ff = new FormFile(FormFile::createUnnamedFileName(), true);
- fw = new FormWindow(ff, MainWindow::self, MainWindow::self->qWorkspace(), n);
+ fw = new FormWindow(ff, MainWindow::self, MainWindow::self->qWorkspace(), n.utf8());
MetaDataBase::addEntry(TQT_TQOBJECT(fw));
TQWidget *w = 0L;
if (fType == Dialog)
@@ -107,7 +107,7 @@ static void unifyFormName(FormWindow *fw, TQWorkspace *qworkspace)
int i = 1;
while (lst.findIndex(n) != -1)
n = origName + TQString::number(i++);
- fw->setName(n);
+ fw->setName(n.utf8());
fw->setCaption(n);
}
diff --git a/kommander/editor/pixmapchooser.cpp b/kommander/editor/pixmapchooser.cpp
index 224bbe72..7a2bd85e 100644
--- a/kommander/editor/pixmapchooser.cpp
+++ b/kommander/editor/pixmapchooser.cpp
@@ -1016,7 +1016,7 @@ ImageIconProvider::~ImageIconProvider()
const TQPixmap * ImageIconProvider::pixmap( const TQFileInfo &fi )
{
TQString ext = fi.extension().upper();
- if ( fmts.contains( ext ) ) {
+ if ( fmts.contains( ext.utf8() ) ) {
return &imagepm;
} else {
return TQFileIconProvider::pixmap( fi );
diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp
index 00511834..24ce0949 100644
--- a/kommander/editor/propertyeditor.cpp
+++ b/kommander/editor/propertyeditor.cpp
@@ -2885,7 +2885,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 );
@@ -3062,7 +3062,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();
@@ -3101,9 +3101,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 )
diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp
index 817ffe75..bcf15811 100644
--- a/kommander/editor/resource.cpp
+++ b/kommander/editor/resource.cpp
@@ -363,7 +363,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev )
slot.returnType = n.attribute( "returnType", "void" );
if ( slot.returnType.isEmpty() )
slot.returnType = "void";
- slot.slot = n.firstChild().toText().data();
+ slot.slot = n.firstChild().toText().data().utf8();
if ( !MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), slot.slot, true ) )
MetaDataBase::addSlot( TQT_TQOBJECT(formwindow), slot.slot, slot.specifier,
slot.access, slot.language, slot.returnType );
@@ -1066,8 +1066,8 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent )
{
- const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, true ), true );
- TQStrList l( p->valueToKeys( w->property( name ).toInt() ) );
+ const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name.latin1(), true ), true );
+ TQStrList l( p->valueToKeys( w->property( name.latin1() ).toInt() ) );
TQString v;
for ( uint i = 0; i < l.count(); ++i ) {
v += l.at( i );
@@ -1079,8 +1079,8 @@ void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Ty
void Resource::saveEnumProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent )
{
- const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, true ), true );
- ts << makeIndent( indent ) << "<enum>" << p->valueToKey( w->property( name ).toInt() ) << "</enum>" << endl;
+ const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name.latin1(), true ), true );
+ ts << makeIndent( indent ) << "<enum>" << p->valueToKey( w->property( name.latin1() ).toInt() ) << "</enum>" << endl;
}
void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant &value, TQVariant::Type t, TQTextStream &ts, int indent )
@@ -1644,7 +1644,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay
*/
void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQDomElement &e )
{
- const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, true ), true );
+ const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop.latin1(), true ), true );
if ( !obj->inherits( "TQLayout" ) ) {// no layouts in metadatabase... (RS)
if ( obj->inherits( "CustomWidget" ) ) {
@@ -1720,13 +1720,13 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
v = TQPalette( p );
} else if ( e.tagName() == "enum" && p && p->isEnumType() ) {
TQString key( v.toString() );
- v = TQVariant( p->keyToValue( key ) );
+ v = TQVariant( p->keyToValue( key.utf8() ) );
} else if ( e.tagName() == "set" && p && p->isSetType() ) {
TQString keys( v.toString() );
TQStringList lst = TQStringList::split( '|', keys );
TQStrList l;
for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it )
- l.append( *it );
+ l.append( (*it).utf8() );
v = TQVariant( p->keysToValue( l ) );
}
@@ -1769,7 +1769,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
if ( pasting ) {
TQString s = v.toString();
formwindow->unify( TQT_TQOBJECT(obj), s, true );
- obj->setName( s );
+ obj->setName( s.utf8() );
return;
} else if ( formwindow && TQT_BASE_OBJECT(obj) == formwindow->mainContainer() ) {
formwindow->setName( v.toCString() );
@@ -1781,7 +1781,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
sp.setHeightForWidth( ( (TQWidget*)obj )->sizePolicy().hasHeightForWidth() );
}
- obj->setProperty( prop, v );
+ obj->setProperty( prop.latin1(), v );
}
@@ -1876,7 +1876,7 @@ static TQImage loadImageData( TQDomElement &n2 )
::uncompress( (uchar*) baunzip.data(), &len, (uchar*) ba, data.length()/2 );
img.loadFromData( (const uchar*)baunzip.data(), len, "XPM" );
} else {
- img.loadFromData( (const uchar*)ba, data.length() / 2, format );
+ img.loadFromData( (const uchar*)ba, data.length() / 2, format.utf8() );
}
delete [] ba;
@@ -1994,12 +1994,12 @@ void Resource::loadConnections( const TQDomElement &e )
if ( n2.tagName() == "sender" ) {
conn.sender = 0;
TQString name = n2.firstChild().toText().data();
- if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) {
+ if ( name == "this" || toplevel->name() == name ) {
conn.sender = TQT_TQOBJECT(toplevel);
} else {
if ( name == "this" )
name = toplevel->name();
- TQObjectList *l = toplevel->queryList( 0, name, false );
+ TQObjectList *l = toplevel->queryList( 0, name.utf8(), false );
if ( l ) {
if ( l->first() )
conn.sender = l->first();
@@ -2009,13 +2009,13 @@ void Resource::loadConnections( const TQDomElement &e )
conn.sender = formwindow->findAction( name );
}
} else if ( n2.tagName() == "signal" ) {
- conn.signal = n2.firstChild().toText().data();
+ conn.signal = n2.firstChild().toText().data().utf8();
} else if ( n2.tagName() == "receiver" ) {
TQString name = n2.firstChild().toText().data();
- if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) {
+ if ( name == "this" || toplevel->name() == name ) {
conn.receiver = TQT_TQOBJECT(toplevel);
} else {
- TQObjectList *l = toplevel->queryList( 0, name, false );
+ TQObjectList *l = toplevel->queryList( 0, name.utf8(), false );
if ( l ) {
if ( l->first() )
conn.receiver = l->first();
@@ -2023,7 +2023,7 @@ void Resource::loadConnections( const TQDomElement &e )
}
}
} else if ( n2.tagName() == "slot" ) {
- conn.slot = n2.firstChild().toText().data();
+ conn.slot = n2.firstChild().toText().data().utf8();
}
n2 = n2.nextSibling().toElement();
}
@@ -2060,7 +2060,7 @@ void Resource::loadConnections( const TQDomElement &e )
slot.returnType = n.attribute( "returnType", "void" );
if ( slot.returnType.isEmpty() )
slot.returnType = "void";
- slot.slot = n.firstChild().toText().data();
+ slot.slot = n.firstChild().toText().data().utf8();
if ( !MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), slot.slot, true ) )
MetaDataBase::addSlot( TQT_TQOBJECT(formwindow), slot.slot, slot.specifier,
slot.access, slot.language, slot.returnType );
@@ -2233,7 +2233,7 @@ void Resource::loadTabOrder( const TQDomElement &e )
TQString name = n.firstChild().toText().data();
if ( name.isEmpty() )
continue;
- TQObjectList *l = toplevel->queryList( 0, name, false );
+ TQObjectList *l = toplevel->queryList( 0, name.utf8(), false );
if ( l ) {
if ( l->first() ) {
TQWidget *w = (TQWidget*)l->first();
@@ -2611,7 +2611,7 @@ void Resource::loadMenuBar( const TQDomElement &e )
while ( !n.isNull() ) {
if ( n.tagName() == "item" ) {
QDesignerPopupMenu *popup = new QDesignerPopupMenu( mw );
- popup->setName( n.attribute( "name" ) );
+ popup->setName( n.attribute( "name" ).utf8() );
TQDomElement n2 = n.firstChild().toElement();
while ( !n2.isNull() ) {
if ( n2.tagName() == "action" ) {
diff --git a/kommander/editor/widgetdatabase.cpp b/kommander/editor/widgetdatabase.cpp
index 1418c1a2..a57c74f1 100644
--- a/kommander/editor/widgetdatabase.cpp
+++ b/kommander/editor/widgetdatabase.cpp
@@ -916,8 +916,8 @@ void WidgetDatabase::append( WidgetDatabaseRecord *r )
TQString WidgetDatabase::widgetGroup( const TQString &g )
{
- if ( wGroups->find( g ) == -1 )
- wGroups->append( g );
+ if ( wGroups->find( g.utf8() ) == -1 )
+ wGroups->append( g.utf8() );
return g;
}
@@ -957,7 +957,7 @@ int WidgetDatabase::numWidgetGroups()
bool WidgetDatabase::isGroupVisible( const TQString &g )
{
setupDataBase( -1 );
- return invisibleGroups->find( g ) == -1;
+ return invisibleGroups->find( g.utf8() ) == -1;
}
int WidgetDatabase::addCustomWidget( WidgetDatabaseRecord *r )
diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp
index 8c04e51d..3effc4e3 100644
--- a/kommander/editor/widgetfactory.cpp
+++ b/kommander/editor/widgetfactory.cpp
@@ -1673,7 +1673,7 @@ bool WidgetFactory::canResetProperty( TQObject *w, const TQString &propName )
bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName )
{
const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->
- findProperty( propName, true ), true );
+ findProperty( propName.latin1(), true ), true );
if (!p )
return false;
return p->reset( w );
@@ -1706,7 +1706,7 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName )
TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propName )
{
const TQMetaProperty *p = w->metaObject()->
- property( w->metaObject()->findProperty( propName, true ), true );
+ property( w->metaObject()->findProperty( propName.latin1(), true ), true );
if ( !p ) {
int v = defaultValue( w, "alignment" ).toInt();
if ( propName == "hAlign" ) {