diff --git a/CMakeLists.txt b/CMakeLists.txt index 68fef180..b4322e25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,7 +73,7 @@ include( ConfigureChecks.cmake ) ###### global compiler settings ################# -add_definitions( -DHAVE_CONFIG_H -UQT_NO_ASCII_CAST ) +add_definitions( -DHAVE_CONFIG_H ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp index 804e67ae..1d9eeba7 100644 --- a/kimagemapeditor/kimagemapeditor.cpp +++ b/kimagemapeditor/kimagemapeditor.cpp @@ -1529,7 +1529,7 @@ void KImageMapEditor::mapEditName() void KImageMapEditor::mapShowHTML() { - KDialogBase *dialog= new KDialogBase(widget(),TQString(),true,i18n("HTML Code of Map"),KDialogBase::Ok); + KDialogBase *dialog= new KDialogBase(widget(), "", true, i18n("HTML Code of Map"), KDialogBase::Ok); TQMultiLineEdit *edit = new TQMultiLineEdit(dialog); edit->setText(getHtmlCode()); diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp index 942320ef..b04ba886 100644 --- a/kimagemapeditor/kimeshell.cpp +++ b/kimagemapeditor/kimeshell.cpp @@ -91,7 +91,7 @@ KimeShell::~KimeShell() bool KimeShell::queryClose() { if (_stdout) { - std::cout << m_part->getHtmlCode() << std::endl; + std::cout << m_part->getHtmlCode().local8Bit() << std::endl; } return m_part->queryClose(); diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp index 134b9582..82572997 100644 --- a/klinkstatus/src/engine/linkchecker.cpp +++ b/klinkstatus/src/engine/linkchecker.cpp @@ -277,7 +277,7 @@ void LinkChecker::slotData(TDEIO::Job* /*job*/, const TQByteArray& data) TQTextCodec* codec = 0; if(has_defined_charset_) - codec = TQTextCodec::codecForName(document_charset_); + codec = TQTextCodec::codecForName(document_charset_.latin1()); if(!codec) codec = TQTextCodec::codecForName("iso8859-1"); // default diff --git a/klinkstatus/src/global.cpp b/klinkstatus/src/global.cpp index 4fa6d88f..b5ac9619 100644 --- a/klinkstatus/src/global.cpp +++ b/klinkstatus/src/global.cpp @@ -111,7 +111,7 @@ TQCString Global::quantaDCOPAppId() { ps_list[i] = ps_list[i].stripWhiteSpace (); if(self()->dcop_client_->isApplicationRegistered("quanta-" + ps_list[i].local8Bit())) - app_id = "quanta-" + ps_list[i]; + app_id = "quanta-" + ps_list[i].utf8(); } } diff --git a/klinkstatus/src/ui/tabwidgetsession.cpp b/klinkstatus/src/ui/tabwidgetsession.cpp index 015ce4cf..9f27d344 100644 --- a/klinkstatus/src/ui/tabwidgetsession.cpp +++ b/klinkstatus/src/ui/tabwidgetsession.cpp @@ -149,7 +149,7 @@ void TabWidgetSession::closeSession() SessionWidget* TabWidgetSession::newSessionWidget() { SessionWidget* session_widget = new SessionWidget(KLSConfig::maxConnectionsNumber(), - KLSConfig::timeOut(), this, TQString("session_widget-" + count())); + KLSConfig::timeOut(), this, TQString("session_widget-" + count()).utf8()); TQStringList columns; diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp index c14a0824..52e7883b 100644 --- a/klinkstatus/src/ui/treeview.cpp +++ b/klinkstatus/src/ui/treeview.cpp @@ -72,7 +72,7 @@ void TreeView::setColumns(TQStringList const& columns) // resetColumns is called automatically for(uint i = 0; i != columns.size(); ++i) { - addColumn(i18n(columns[i])); + addColumn(i18n(columns[i].utf8())); setColumnWidthMode(i, TQListView::Manual); } 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 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 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 ¤ 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 ¤ 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 8b35aa77..c1fb461c 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::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 58509db1..f02ff466 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 6246498f..05f3b01b 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 ) << "" << p->valueToKey( w->property( name ).toInt() ) << "" << endl; + const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name.latin1(), true ), true ); + ts << makeIndent( indent ) << "" << p->valueToKey( w->property( name.latin1() ).toInt() ) << "" << 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 76ec00d9..339e78d0 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" ) { diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp index e23a206a..6dbb1a10 100644 --- a/kommander/executor/instance.cpp +++ b/kommander/executor/instance.cpp @@ -606,7 +606,7 @@ void Instance::setGlobal(const TQString& variableName, const TQString& value) TQObject* Instance::stringToWidget(const TQString& name) { - return m_instance->child(name); + return m_instance->child(name.utf8()); } KommanderWidget* Instance::kommanderWidget(TQObject* object) diff --git a/kommander/factory/domtool.cpp b/kommander/factory/domtool.cpp index 40190ff1..25030fe5 100644 --- a/kommander/factory/domtool.cpp +++ b/kommander/factory/domtool.cpp @@ -169,7 +169,7 @@ TQVariant DomTool::elementToVariant( const TQDomElement& e, const TQVariant& def if ( n.tagName() == "comment" ) comment = n.firstChild().toText().data(); } else if ( e.tagName() == "cstring" ) { - v = TQVariant( TQCString( e.firstChild().toText().data() ) ); + v = TQVariant( e.firstChild().toText().data().utf8() ); } else if ( e.tagName() == "number" ) { bool ok = true; v = TQVariant( e.firstChild().toText().data().toInt( &ok ) ); diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp index 37f26fdb..146c5f2b 100644 --- a/kommander/factory/kommanderfactory.cpp +++ b/kommander/factory/kommanderfactory.cpp @@ -288,8 +288,8 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg } for ( TQMap::Iterator it = widgetFactory->buddies.begin(); it != widgetFactory->buddies.end(); ++it ) { - TQLabel *label = (TQLabel*)widgetFactory->toplevel->child( it.key(), "TQLabel" ); - TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( *it, "TQWidget" ); + TQLabel *label = (TQLabel*)widgetFactory->toplevel->child( it.key().utf8(), "TQLabel" ); + TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( (*it).utf8(), "TQWidget" ); if ( label && buddy ) label->setBuddy( buddy ); } @@ -724,7 +724,7 @@ KommanderFactory::LayoutType KommanderFactory::layoutType( TQLayout *layout ) co void KommanderFactory::setProperty( 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 ); TQVariant defVariant; if ( e.tagName() == "font" ) { @@ -816,13 +816,13 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T 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 ) ); } @@ -833,7 +833,7 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T } } - obj->setProperty( prop, v ); + obj->setProperty( prop.latin1(), v ); } void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) @@ -920,7 +920,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; @@ -1021,12 +1021,12 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect while ( !n2.isNull() ) { if ( n2.tagName() == "sender" ) { TQString name = n2.firstChild().toText().data(); - if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) { + if ( name == "this" || name == toplevel->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(); @@ -1036,13 +1036,13 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect if ( !conn.sender ) conn.sender = 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" || name == toplevel->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(); @@ -1050,7 +1050,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect } } } else if ( n2.tagName() == "slot" ) { - conn.slot = n2.firstChild().toText().data(); + conn.slot = n2.firstChild().toText().data().utf8(); } n2 = n2.nextSibling().toElement(); } @@ -1108,7 +1108,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect n = n.nextSibling().toElement(); continue; } - TQObject::connect( sender, s, receiver, s2 ); + TQObject::connect( sender, s.utf8(), receiver, s2.utf8() ); } else { EventFunction ef = eventMap[ conn.sender ]; ef.events.append( conn.signal ); @@ -1130,7 +1130,7 @@ void KommanderFactory::loadTabOrder( const TQDomElement &e ) while ( !n.isNull() ) { if ( n.tagName() == "tabstop" ) { TQString name = n.firstChild().toText().data(); - 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(); @@ -1404,7 +1404,7 @@ void KommanderFactory::loadToolBars( const TQDomElement &e ) TQt::Dock dock = (TQt::Dock)n.attribute( "dock" ).toInt(); tb = new TQToolBar( TQString(), mw, dock ); tb->setLabel( n.attribute( "label" ) ); - tb->setName( n.attribute( "name" ) ); + tb->setName( n.attribute( "name" ).utf8() ); TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "action" ) { @@ -1433,7 +1433,7 @@ void KommanderFactory::loadMenuBar( const TQDomElement &e ) while ( !n.isNull() ) { if ( n.tagName() == "item" ) { TQPopupMenu *popup = new TQPopupMenu( 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/widget/functionlib.cpp b/kommander/widget/functionlib.cpp index dca811e5..49e5f7b0 100644 --- a/kommander/widget/functionlib.cpp +++ b/kommander/widget/functionlib.cpp @@ -164,7 +164,7 @@ static ParseNode f_return(Parser* p, const ParameterList& params) static ParseNode f_stringRound(Parser*, const ParameterList& params) { TQString s; - s.sprintf("%."+params[1].toString()+"f", params[0].toDouble()); + s.sprintf("%.*f", params[1].toInt(), params[0].toDouble()); return s; } @@ -172,7 +172,7 @@ static ParseNode f_stringRound(Parser*, const ParameterList& params) static ParseNode f_debug(Parser*, const ParameterList& params) { for (uint i=0; itranslate(params[0].toString()); + return TDEGlobal::locale()->translate(params[0].toString().utf8()); } static ParseNode f_env(Parser*, const ParameterList& params) @@ -567,13 +567,11 @@ static ParseNode f_arrayToString(Parser* P, const ParameterList& params) TQStringList keys = P->array(name).keys(); TQValueList values = P->array(name).values(); - TQStringList::Iterator it = keys.begin(); + TQStringList::Iterator it = keys.begin(); TQValueList::Iterator itval = values.begin(); - while (*it) + for (; it != keys.end(); ++it, ++itval) { array += TQString("%1\t%2\n").arg(*it).arg((*itval).toString()); - ++it; - ++itval; } return array; } diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp index 3d580f88..59aaec07 100644 --- a/kommander/widget/kommanderfunctions.cpp +++ b/kommander/widget/kommanderfunctions.cpp @@ -57,7 +57,7 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL case Kommander::env: return TQString(getenv(args[0].latin1())); case Kommander::i18n: - return TDEGlobal::locale()->translate(args[0]); + return TDEGlobal::locale()->translate(args[0].utf8()); case Kommander::global: return global(args[0]); case Kommander::setGlobal: diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp index db473520..05be2dfe 100644 --- a/kommander/widgets/aboutdialog.cpp +++ b/kommander/widgets/aboutdialog.cpp @@ -124,8 +124,8 @@ void AboutDialog::initialize(const TQString& appName, const TQString &icon, cons m_appName = appName; m_icon = icon; m_copyright = copyright; - m_aboutData = new TDEAboutData(m_appName, m_appName, m_version); - m_aboutData->setCopyrightStatement(m_copyright); + m_aboutData = new TDEAboutData(m_appName.utf8(), m_appName.utf8(), m_version.utf8()); + m_aboutData->setCopyrightStatement(m_copyright.utf8()); if (!m_icon.isEmpty()) m_aboutData->setProgramLogo(TDEGlobal::iconLoader()->loadIcon(m_icon, TDEIcon::NoGroup, TDEIcon::SizeMedium).convertToImage()); } @@ -138,7 +138,7 @@ void AboutDialog::addAuthor(const TQString& author, const TQString &task, const m_emails.append(email); m_tasks.append(task); m_addresses.append(webAddress); - m_aboutData->addAuthor(author, task, email, webAddress); + m_aboutData->addAuthor(author.utf8(), task.utf8(), email.utf8(), webAddress.utf8()); } void AboutDialog::addTranslator(const TQString& author, const TQString& email) @@ -147,7 +147,7 @@ void AboutDialog::addTranslator(const TQString& author, const TQString& email) return; m_authors.append(author); m_emails.append(email); - m_aboutData->setTranslator(author, email); + m_aboutData->setTranslator(author.utf8(), email.utf8()); } void AboutDialog::setDescription(const TQString& description) @@ -155,7 +155,7 @@ void AboutDialog::setDescription(const TQString& description) if (!m_aboutData) return; m_description = description; - m_aboutData->setShortDescription(m_description); + m_aboutData->setShortDescription(m_description.utf8()); } void AboutDialog::setHomepage(const TQString &homepage) @@ -163,7 +163,7 @@ void AboutDialog::setHomepage(const TQString &homepage) if (!m_aboutData) return; m_homepage = homepage; - m_aboutData->setHomepage(m_homepage); + m_aboutData->setHomepage(m_homepage.utf8()); } void AboutDialog::setBugAddress(const TQString &bugAddress) @@ -171,7 +171,7 @@ void AboutDialog::setBugAddress(const TQString &bugAddress) if (!m_aboutData) return; m_bugaddress = bugAddress; - m_aboutData->setBugAddress(m_bugaddress); + m_aboutData->setBugAddress(m_bugaddress.utf8()); } void AboutDialog::setLicense(const TQString &key) @@ -200,7 +200,7 @@ void AboutDialog::setLicense(const TQString &key) { if (!key.isEmpty()) m_license = key; - m_aboutData->setLicenseText(m_license); + m_aboutData->setLicenseText(m_license.utf8()); } else { @@ -209,9 +209,9 @@ void AboutDialog::setLicense(const TQString &key) if (!key.isEmpty()) file = key; } - m_aboutData->setLicenseTextFile(file); - } - + m_aboutData->setLicenseTextFile(file.utf8()); + } + } void AboutDialog::setPopulationText(const TQString& a_text) diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp index fa535813..d4969444 100644 --- a/kommander/widgets/execbutton.cpp +++ b/kommander/widgets/execbutton.cpp @@ -126,7 +126,7 @@ void ExecButton::startProcess() { TDEApplication::restoreOverrideCursor(); if (writeStdout()) - cout << m_output << flush; + cout << m_output.local8Bit() << flush; } setEnabled(enabledStatus); } @@ -160,7 +160,7 @@ void ExecButton::processExited(MyProcess* p) { m_output = p->output(); if (writeStdout()) - cout << m_output << flush; + cout << m_output.local8Bit() << flush; delete p; } } diff --git a/kommander/widgets/textbrowser.cpp b/kommander/widgets/textbrowser.cpp index 9e466c5e..4abaa706 100644 --- a/kommander/widgets/textbrowser.cpp +++ b/kommander/widgets/textbrowser.cpp @@ -121,7 +121,7 @@ TQString TextBrowser::handleDCOP(int function, const TQStringList& args) case DCOP::selection: return selectedText(); case TBR_setNotifyClick: - KTextBrowser::setNotifyClick(args[0]); + KTextBrowser::setNotifyClick(args[0].utf8()); break; case TBR_isNotifyClick: return TQString::number(KTextBrowser::isNotifyClick()); diff --git a/kxsldbg/xsldbgmain.cpp b/kxsldbg/xsldbgmain.cpp index 5e0b35ef..9d782dc2 100644 --- a/kxsldbg/xsldbgmain.cpp +++ b/kxsldbg/xsldbgmain.cpp @@ -126,7 +126,7 @@ int main(int argc, char **argv) TQString libexsltCompileTimeInfo(i18n("libexslt %1 was compiled against libxml %2\n").arg(exsltLibexsltVersion).arg(exsltLibxmlVersion)); TQString freeFormText = xsldbgRunTimeInfo + libxmlCompileTimeInfo + libxsltCompileTimeInfo + libexsltCompileTimeInfo; - TDEAboutData about("xsldbg", I18N_NOOP("Xsldbg"), version, description, TDEAboutData::License_GPL, "(C) 2003 Keith Isdale", freeFormText, 0, "k_isdale@tpg.com.au"); + TDEAboutData about("xsldbg", I18N_NOOP("Xsldbg"), version, description, TDEAboutData::License_GPL, "(C) 2003 Keith Isdale", freeFormText.utf8(), 0, "k_isdale@tpg.com.au"); about.addAuthor( "Keith Isdale", 0, "k_isdale@tpg.com.au" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp index 735eb2c8..e979c417 100644 --- a/quanta/components/cvsservice/cvsservice.cpp +++ b/quanta/components/cvsservice/cvsservice.cpp @@ -180,7 +180,7 @@ void CVSService::slotUpdateToTag(const TQStringList &files) } else { extraOpts = "-D " + m_updateToDlg->dateLineEdit->text(); - commandStr = i18n("Updating to the version from %1 ...").arg(+ m_updateToDlg->dateLineEdit->text()); + commandStr = i18n("Updating to the version from %1 ...").arg(m_updateToDlg->dateLineEdit->text()); } emit clearMessages(); emit showMessage(commandStr + "\n", false);