From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kode/kwsdl/compiler.cpp | 2 +- kode/kwsdl/converter.cpp | 2 +- kode/kwsdl/kung/complexbaseinputfield.cpp | 6 +++--- kode/kwsdl/kung/dateinputfield.cpp | 2 +- kode/kwsdl/kung/dispatcher.cpp | 4 ++-- kode/kwsdl/kung/listinputfield.cpp | 10 +++++----- kode/kwsdl/kung/pageinputfield.cpp | 10 +++++----- kode/kwsdl/namemapper.cpp | 2 +- kode/kwsdl/schema/fileprovider.cpp | 2 +- kode/kwsdl/schema/parser.cpp | 2 +- kode/kwsdl/schema/simpletype.cpp | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) (limited to 'kode/kwsdl') diff --git a/kode/kwsdl/compiler.cpp b/kode/kwsdl/compiler.cpp index 9e4c86ab9..e3ccf4f8c 100644 --- a/kode/kwsdl/compiler.cpp +++ b/kode/kwsdl/compiler.cpp @@ -107,7 +107,7 @@ void Compiler::create() creator.setNameSpace( mNameSpace ); creator.create( converter.classes() ); - qApp->quit(); + tqApp->quit(); } #include "compiler.moc" diff --git a/kode/kwsdl/converter.cpp b/kode/kwsdl/converter.cpp index 5d824afe3..3f97efe1d 100644 --- a/kode/kwsdl/converter.cpp +++ b/kode/kwsdl/converter.cpp @@ -32,7 +32,7 @@ static TQString escapeEnum( const TQString &str ) { TQString enumStr = capitalize( str ); - return enumStr.replace( "-", "_" ); + return enumStr.tqreplace( "-", "_" ); } Converter::Converter() diff --git a/kode/kwsdl/kung/complexbaseinputfield.cpp b/kode/kwsdl/kung/complexbaseinputfield.cpp index 80f755817..1c43bd952 100644 --- a/kode/kwsdl/kung/complexbaseinputfield.cpp +++ b/kode/kwsdl/kung/complexbaseinputfield.cpp @@ -141,14 +141,14 @@ TQWidget *ComplexBaseInputField::createWidget( TQWidget *parent ) { TQGroupBox *inputWidget = new TQGroupBox( mName, parent ); inputWidget->setColumnLayout( 0, Qt::Horizontal ); - TQGridLayout *layout = new TQGridLayout( inputWidget->layout(), 2, 2, 6 ); + TQGridLayout *tqlayout = new TQGridLayout( inputWidget->tqlayout(), 2, 2, 6 ); InputField::List::Iterator it; int row = 0; for ( it = mFields.begin(); it != mFields.end(); ++it, ++row ) { TQLabel *label = new TQLabel( (*it)->name(), inputWidget ); - layout->addWidget( label, row, 0 ); - layout->addWidget( (*it)->createWidget( inputWidget ), row, 1 ); + tqlayout->addWidget( label, row, 0 ); + tqlayout->addWidget( (*it)->createWidget( inputWidget ), row, 1 ); } return inputWidget; diff --git a/kode/kwsdl/kung/dateinputfield.cpp b/kode/kwsdl/kung/dateinputfield.cpp index b38d46b14..8d5c329cc 100644 --- a/kode/kwsdl/kung/dateinputfield.cpp +++ b/kode/kwsdl/kung/dateinputfield.cpp @@ -25,7 +25,7 @@ DateInputField::DateInputField( const TQString &name, const Schema::SimpleType *type ) : SimpleInputField( name, type ), - mValue( TQDate::currentDate() ) + mValue( TQDate::tqcurrentDate() ) { } diff --git a/kode/kwsdl/kung/dispatcher.cpp b/kode/kwsdl/kung/dispatcher.cpp index d337d19f3..9d2ecc239 100644 --- a/kode/kwsdl/kung/dispatcher.cpp +++ b/kode/kwsdl/kung/dispatcher.cpp @@ -85,7 +85,7 @@ void Dispatcher::nextMessage() mCurrentMessage = items.first(); if ( mCurrentMessage.isEmpty() ) { - qApp->quit(); + tqApp->quit(); return; } @@ -119,7 +119,7 @@ void Dispatcher::nextMessage() mTransport->query( doc.toString( 2 ) ); } } else - qApp->quit(); + tqApp->quit(); } void Dispatcher::result( const TQString &xml ) diff --git a/kode/kwsdl/kung/listinputfield.cpp b/kode/kwsdl/kung/listinputfield.cpp index 6bc1d8240..7a5eeb713 100644 --- a/kode/kwsdl/kung/listinputfield.cpp +++ b/kode/kwsdl/kung/listinputfield.cpp @@ -91,19 +91,19 @@ ListWidget::ListWidget( InputField *parentField, const TQString &name, const TQS : TQWidget( parent ), mParentField( parentField ), mName( name ), mType( type ) { - TQGridLayout *layout = new TQGridLayout( this, 4, 2, 11, 6 ); + TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 ); mView = new TQListBox( this ); - layout->addMultiCellWidget( mView, 0, 3, 0, 0 ); + tqlayout->addMultiCellWidget( mView, 0, 3, 0, 0 ); mAddButton = new TQPushButton( i18n( "Add" ), this ); - layout->addWidget( mAddButton, 0, 1 ); + tqlayout->addWidget( mAddButton, 0, 1 ); mEditButton = new TQPushButton( i18n( "Edit..." ), this ); - layout->addWidget( mEditButton, 1, 1 ); + tqlayout->addWidget( mEditButton, 1, 1 ); mRemoveButton = new TQPushButton( i18n( "Remove" ), this ); - layout->addWidget( mRemoveButton, 2, 1 ); + tqlayout->addWidget( mRemoveButton, 2, 1 ); connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) ); connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) ); diff --git a/kode/kwsdl/kung/pageinputfield.cpp b/kode/kwsdl/kung/pageinputfield.cpp index 956e54bfc..04f66ffa0 100644 --- a/kode/kwsdl/kung/pageinputfield.cpp +++ b/kode/kwsdl/kung/pageinputfield.cpp @@ -88,18 +88,18 @@ TQString PageInputField::data() const TQWidget *PageInputField::createWidget( TQWidget *parent ) { TQWidget *mInputWidget = new TQWidget( parent, "PageInputWidget" ); - TQGridLayout *layout = new TQGridLayout( mInputWidget, 2, 2, 11, 6 ); + TQGridLayout *tqlayout = new TQGridLayout( mInputWidget, 2, 2, 11, 6 ); InputField::List::Iterator it; int row = 0; for ( it = mFields.begin(); it != mFields.end(); ++it, ++row ) { TQLabel *label = new TQLabel( (*it)->name(), mInputWidget ); - label->setAlignment( Qt::AlignTop ); - layout->addWidget( label, row, 0 ); - layout->addWidget( (*it)->createWidget( mInputWidget ), row, 1 ); + label->tqsetAlignment( Qt::AlignTop ); + tqlayout->addWidget( label, row, 0 ); + tqlayout->addWidget( (*it)->createWidget( mInputWidget ), row, 1 ); } - layout->setRowStretch( ++row, 1 ); + tqlayout->setRowStretch( ++row, 1 ); return mInputWidget; } diff --git a/kode/kwsdl/namemapper.cpp b/kode/kwsdl/namemapper.cpp index 426498f5c..6d7ae6399 100644 --- a/kode/kwsdl/namemapper.cpp +++ b/kode/kwsdl/namemapper.cpp @@ -30,7 +30,7 @@ NameMapper::NameMapper() TQString NameMapper::escape( const TQString &name ) const { - if ( mKeyWords.contains( name ) ) + if ( mKeyWords.tqcontains( name ) ) return "_" + name; else return name; diff --git a/kode/kwsdl/schema/fileprovider.cpp b/kode/kwsdl/schema/fileprovider.cpp index 2a7448c4f..54fa0163e 100644 --- a/kode/kwsdl/schema/fileprovider.cpp +++ b/kode/kwsdl/schema/fileprovider.cpp @@ -60,7 +60,7 @@ bool FileProvider::get( const TQString &url, TQString &target ) mBlocked = true; while ( mBlocked ) { - qApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); + tqApp->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput ); usleep( 500 ); } diff --git a/kode/kwsdl/schema/parser.cpp b/kode/kwsdl/schema/parser.cpp index 7ec3804f8..ba62b0c33 100644 --- a/kode/kwsdl/schema/parser.cpp +++ b/kode/kwsdl/schema/parser.cpp @@ -200,7 +200,7 @@ void Parser::parseImport( const TQDomElement &element ) TQString location = element.attribute( "schemaLocation" ); if ( !location.isEmpty() ) { // don't import a schema twice - if ( mImportedSchemas.contains( location ) ) + if ( mImportedSchemas.tqcontains( location ) ) return; else mImportedSchemas.append( location ); diff --git a/kode/kwsdl/schema/simpletype.cpp b/kode/kwsdl/schema/simpletype.cpp index d5dcf2fd9..50242808f 100644 --- a/kode/kwsdl/schema/simpletype.cpp +++ b/kode/kwsdl/schema/simpletype.cpp @@ -202,7 +202,7 @@ void SimpleType::setFacetValue( const TQString &value ) mFacetValue.wsp = PRESERVE; else if ( value == "collapse" ) mFacetValue.wsp = COLLAPSE; - else if ( value == "replace" ) + else if ( value == "tqreplace" ) mFacetValue.wsp = REPLACE; else { qDebug( "Invalid facet value for whitespace" ); -- cgit v1.2.1