From ec1fddcd0d6663ad273af85357f04abbc5689468 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:00 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a. --- kmrml/kmrml/algorithmdialog.cpp | 10 +++++----- kmrml/kmrml/kcontrol/indexcleaner.cpp | 2 +- kmrml/kmrml/kcontrol/indexer.cpp | 4 ++-- kmrml/kmrml/kcontrol/kcmkmrml.cpp | 14 +++++++------- kmrml/kmrml/kcontrol/mainpage.cpp | 4 ++-- kmrml/kmrml/kcontrol/serverconfigwidget.ui | 4 ++-- kmrml/kmrml/lib/kmrml_config.cpp | 4 ++-- kmrml/kmrml/lib/kmrml_config.h | 2 +- kmrml/kmrml/lib/mrml_shared.cpp | 6 +++--- kmrml/kmrml/lib/mrml_shared.h | 4 ++-- kmrml/kmrml/mrml.cpp | 12 ++++++------ kmrml/kmrml/mrml_elements.cpp | 2 +- kmrml/kmrml/mrml_part.cpp | 28 ++++++++++++++-------------- kmrml/kmrml/mrml_part.h | 6 +++--- kmrml/kmrml/mrml_view.cpp | 20 ++++++++++---------- kmrml/kmrml/mrml_view.h | 2 +- kmrml/kmrml/propertysheet.cpp | 8 ++++---- kmrml/kmrml/propertysheet.h | 2 +- kmrml/kmrml/server/watcher.cpp | 4 ++-- 19 files changed, 69 insertions(+), 69 deletions(-) (limited to 'kmrml') diff --git a/kmrml/kmrml/algorithmdialog.cpp b/kmrml/kmrml/algorithmdialog.cpp index 74eaf050..68060bb3 100644 --- a/kmrml/kmrml/algorithmdialog.cpp +++ b/kmrml/kmrml/algorithmdialog.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include @@ -49,8 +49,8 @@ protected: virtual void viewportResizeEvent(TQResizeEvent* ev) { TQScrollView::viewportResizeEvent(ev); - m_frame->resize( kMax(m_frame->sizeHint().width(), ev->size().width()), - kMax(m_frame->sizeHint().height(), ev->size().height())); + m_frame->resize( kMax(m_frame->tqsizeHint().width(), ev->size().width()), + kMax(m_frame->tqsizeHint().height(), ev->size().height())); }; private: @@ -71,7 +71,7 @@ AlgorithmDialog::AlgorithmDialog( const AlgorithmList& algorithms, TQVBoxLayout *mainLayout = new TQVBoxLayout( box, 0, KDialog::spacingHint(), "mainLayout"); - TQHBoxLayout *collectionLayout = new TQHBoxLayout( 0L, 0, 0, "coll layout"); + TQHBoxLayout *collectionLayout = new TQHBoxLayout( 0L, 0, 0, "coll tqlayout"); collectionLayout->addWidget( new TQLabel( i18n("Collection: "), box )); m_collectionCombo = new CollectionCombo( box, "collection combo" ); @@ -106,7 +106,7 @@ AlgorithmDialog::AlgorithmDialog( const AlgorithmList& algorithms, mainLayout->activate(); algoHLayout->move( groupBox->x() + 10, groupBox->y() - 12 ); - box->setMinimumWidth( algoHLayout->sizeHint().width() + + box->setMinimumWidth( algoHLayout->tqsizeHint().width() + 4 * KDialog::spacingHint() ); } diff --git a/kmrml/kmrml/kcontrol/indexcleaner.cpp b/kmrml/kmrml/kcontrol/indexcleaner.cpp index c184c10c..2183cc5b 100644 --- a/kmrml/kmrml/kcontrol/indexcleaner.cpp +++ b/kmrml/kmrml/kcontrol/indexcleaner.cpp @@ -78,7 +78,7 @@ void IndexCleaner::startNext() if ( index != -1 ) cmd.replace( index, 2, TQUOTE( dir ) ); else // no %d? What else can we do? - cmd.append( TQString::fromLatin1(" ") + TQUOTE( dir ) ); + cmd.append( TQString::tqfromLatin1(" ") + TQUOTE( dir ) ); *m_process << cmd; diff --git a/kmrml/kmrml/kcontrol/indexer.cpp b/kmrml/kmrml/kcontrol/indexer.cpp index 3f479ee6..09a83c33 100644 --- a/kmrml/kmrml/kcontrol/indexer.cpp +++ b/kmrml/kmrml/kcontrol/indexer.cpp @@ -112,7 +112,7 @@ void Indexer::processNext() *m_process << *it; #endif - emit progress( 0, i18n("Next Folder:
%1").arg( m_currentDir )); + emit progress( 0, i18n("Next Folder:
%1").tqarg( m_currentDir )); m_process->start(); } @@ -160,7 +160,7 @@ void Indexer::slotCanRead( KProcIO *proc ) if ( ok ) { uint dirsLeft = m_dirs.count(); - TQString message = i18n( "Processing folder %1 of %2:
%3
File %4 of %5.").arg( m_dirCount - dirsLeft ).arg( m_dirCount).arg( m_currentDir ).arg( currentFile ).arg( numFiles ); + TQString message = i18n( "Processing folder %1 of %2:
%3
File %4 of %5.").tqarg( m_dirCount - dirsLeft ).tqarg( m_dirCount).tqarg( m_currentDir ).tqarg( currentFile ).tqarg( numFiles ); emit progress( perc, message ); } } diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.cpp b/kmrml/kmrml/kcontrol/kcmkmrml.cpp index 3e7e91c1..42aaf534 100644 --- a/kmrml/kmrml/kcontrol/kcmkmrml.cpp +++ b/kmrml/kmrml/kcontrol/kcmkmrml.cpp @@ -17,7 +17,7 @@ */ #include -#include +#include #include #include @@ -58,11 +58,11 @@ KCMKMrml::KCMKMrml(TQWidget *parent, const char *name, const TQStringList & ): ab->addAuthor( "Carsten Pfeiffer", 0, "pfeiffer@kde.org" ); setAboutData( ab ); - TQVBoxLayout *layout = new TQVBoxLayout( this ); - layout->setSpacing( KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + tqlayout->setSpacing( KDialog::spacingHint() ); m_mainPage = new MainPage( this, "main page" ); - layout->addWidget( m_mainPage ); + tqlayout->addWidget( m_mainPage ); connect( m_mainPage, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ))); @@ -86,11 +86,11 @@ void KCMKMrml::checkGiftInstallation() KMessageBox::error( this, errorMessage ); m_mainPage->hide(); TQLabel *errorLabel = new TQLabel( errorMessage, this ); - errorLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); + errorLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); KURLLabel *urlLabel = new KURLLabel( "http://www.gnu.org/software/gift", TQString(), this ); - urlLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + urlLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& )), kapp, TQT_SLOT( invokeBrowser( const TQString& )) ); - TQLayout *l = layout(); + TQLayout *l = tqlayout(); l->addItem( new TQSpacerItem( 0, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); l->add( errorLabel ); l->add( urlLabel ); diff --git a/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp index ca491ead..84ba61a2 100644 --- a/kmrml/kmrml/kcontrol/mainpage.cpp +++ b/kmrml/kmrml/kcontrol/mainpage.cpp @@ -186,7 +186,7 @@ TQStringList MainPage::difference( const TQStringList& oldIndexDirs, { TQStringList result; - TQString slash = TQString::fromLatin1("/"); + TQString slash = TQString::tqfromLatin1("/"); TQStringList::ConstIterator oldIt = oldIndexDirs.begin(); TQString oldDir, newDir; @@ -465,7 +465,7 @@ void MainPage::slotIndexingFinished( int returnCode ) if ( err ) syserr = TQString::fromLocal8Bit( err ); else - syserr = i18n("Unknown error: %1").arg( returnCode ); + syserr = i18n("Unknown error: %1").tqarg( returnCode ); } KMessageBox::detailedError( this, i18n("An error occurred during indexing. The index might be invalid."), diff --git a/kmrml/kmrml/kcontrol/serverconfigwidget.ui b/kmrml/kmrml/kcontrol/serverconfigwidget.ui index 5f3a34cd..e577b221 100644 --- a/kmrml/kmrml/kcontrol/serverconfigwidget.ui +++ b/kmrml/kmrml/kcontrol/serverconfigwidget.ui @@ -135,7 +135,7 @@ Expanding - + 200 0 @@ -200,7 +200,7 @@ Fixed - + 16 16 diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp index ef9c4b06..219a36a6 100644 --- a/kmrml/kmrml/lib/kmrml_config.cpp +++ b/kmrml/kmrml/lib/kmrml_config.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include @@ -104,7 +104,7 @@ bool Config::sync() void Config::setDefaultHost( const TQString& host ) { m_defaultHost = host.isEmpty() ? - TQString::fromLatin1(DEFAULT_HOST) : host; + TQString::tqfromLatin1(DEFAULT_HOST) : host; m_config->setGroup( CONFIG_GROUP ); m_config->writeEntry( "Default Host", m_defaultHost ); diff --git a/kmrml/kmrml/lib/kmrml_config.h b/kmrml/kmrml/lib/kmrml_config.h index 2208030a..4e39d3bf 100644 --- a/kmrml/kmrml/lib/kmrml_config.h +++ b/kmrml/kmrml/lib/kmrml_config.h @@ -108,7 +108,7 @@ namespace KMrml TQString settingsGroup( const TQString& host ) const { - return TQString::fromLatin1( "SettingsFor: " ).append( host ); + return TQString::tqfromLatin1( "SettingsFor: " ).append( host ); } bool m_serverStartedIndividually; diff --git a/kmrml/kmrml/lib/mrml_shared.cpp b/kmrml/kmrml/lib/mrml_shared.cpp index 3e7d6d95..932010f6 100644 --- a/kmrml/kmrml/lib/mrml_shared.cpp +++ b/kmrml/kmrml/lib/mrml_shared.cpp @@ -53,7 +53,7 @@ const TQString * MrmlShared::m_element = 0L; const TQString * MrmlShared::m_attribute = 0L; const TQString * MrmlShared::m_attributeName = 0L; const TQString * MrmlShared::m_attributeValue = 0L; -const TQString * MrmlShared::m_children = 0L; +const TQString * MrmlShared::m_tqchildren = 0L; const TQString * MrmlShared::m_none = 0L; const TQString * MrmlShared::m_multiSet = 0L; @@ -141,7 +141,7 @@ void MrmlShared::init() m_attribute = new TQString ( "attribute" ) ; m_attributeName = new TQString ( "attribute-name" ) ; m_attributeValue = new TQString ( "attribute-value" ) ; - m_children = new TQString ( "children" ) ; + m_tqchildren = new TQString ( "tqchildren" ) ; m_none = new TQString ( "none" ) ; m_multiSet = new TQString ( "multi-set" ) ; @@ -215,7 +215,7 @@ void MrmlShared::cleanup() delete m_attribute; delete m_attributeName; delete m_attributeValue; - delete m_children; + delete m_tqchildren; delete m_none; delete m_visibility; diff --git a/kmrml/kmrml/lib/mrml_shared.h b/kmrml/kmrml/lib/mrml_shared.h index 6ed2177a..175d5c3c 100644 --- a/kmrml/kmrml/lib/mrml_shared.h +++ b/kmrml/kmrml/lib/mrml_shared.h @@ -76,7 +76,7 @@ public: static const TQString& attribute() { return *m_attribute; } static const TQString& attributeName() { return *m_attributeName; } static const TQString& attributeValue() { return *m_attributeValue; } - static const TQString& children() { return *m_children; } + static const TQString& tqchildren() { return *m_tqchildren; } static const TQString& none() { return *m_none; } static const TQString& visibility() { return *m_visibility; } @@ -139,7 +139,7 @@ private: static const TQString * m_attribute; static const TQString * m_attributeName; static const TQString * m_attributeValue; - static const TQString * m_children; + static const TQString * m_tqchildren; static const TQString * m_none; static const TQString * m_visibility; diff --git a/kmrml/kmrml/mrml.cpp b/kmrml/kmrml/mrml.cpp index a61de8f1..137c2062 100644 --- a/kmrml/kmrml/mrml.cpp +++ b/kmrml/kmrml/mrml.cpp @@ -216,11 +216,11 @@ bool Mrml::startSession( const KURL& url ) // Wolfgang says, we shouldn't create an own session-id here, as gcc 2.95 // apparently makes problems in exception handling somehow. So we simply // accept the server's session-id. - TQString msg = mrmlString( TQString() ).arg( + TQString msg = mrmlString( TQString() ).tqarg( " \ \ \ - " ).arg( user( url )); + " ).tqarg( user( url )); TQCString utf8 = msg.utf8(); // qDebug(":::Writing: %s", utf8.data()); @@ -240,13 +240,13 @@ TQString Mrml::mrmlString( const TQString& sessionId, const TQString& transactio "; if ( sessionId.isEmpty() ) // when we don't have one yet - return msg.arg( "%1" ); + return msg.tqarg( "%1" ); if ( transactionId.isNull() ) - return msg.arg( "%1" ).arg( sessionId ); + return msg.tqarg( "%1" ).tqarg( sessionId ); else - return msg.arg( "%1") - .arg( sessionId ).arg( transactionId ); + return msg.tqarg( "%1") + .tqarg( sessionId ).tqarg( transactionId ); } void Mrml::emitData( const TQCString& msg ) diff --git a/kmrml/kmrml/mrml_elements.cpp b/kmrml/kmrml/mrml_elements.cpp index 3fadcaba..8700ed43 100644 --- a/kmrml/kmrml/mrml_elements.cpp +++ b/kmrml/kmrml/mrml_elements.cpp @@ -28,7 +28,7 @@ using namespace KMrml; // // MrmlElement is currently the baseclass for Algorithm and Collection. Both // may have a single child-element , with a number of -// elements as children. +// elements as tqchildren. // MrmlElement::MrmlElement( const TQDomElement& elem ) diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp index 7a8967c8..542d3b9c 100644 --- a/kmrml/kmrml/mrml_part.cpp +++ b/kmrml/kmrml/mrml_part.cpp @@ -153,13 +153,13 @@ MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */, m_algoButton = new TQPushButton( TQString(), m_panel ); m_algoButton->setPixmap( SmallIcon("configure") ); - m_algoButton->setFixedSize( m_algoButton->sizeHint() ); + m_algoButton->setFixedSize( m_algoButton->tqsizeHint() ); connect( m_algoButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureAlgorithm() )); TQToolTip::add( m_algoButton, i18n("Configure algorithm") ); TQWidget *spacer = new TQWidget( m_panel ); - spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, + spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum ) ); int resultSize = config->readNumEntry( "Result-size", 20 ); @@ -172,7 +172,7 @@ MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */, m_startButton = new TQPushButton( TQString(), tmp ); connect( m_startButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStartClicked() )); - setStatus( NeedCollection ); + settqStatus( NeedCollection ); setWidget( box ); @@ -206,7 +206,7 @@ void MrmlPart::initCollections( const TQDomElement& elem ) KMessageBox::information( widget(), i18n("There is no image collection available\n" "at %1.\n"), i18n("No Image Collection")); - setStatus( NeedCollection ); + settqStatus( NeedCollection ); } else m_collectionCombo->updateGeometry(); // adjust the entire grid @@ -229,7 +229,7 @@ bool MrmlPart::openURL( const KURL& url ) m_url = url; TQString host = url.host().isEmpty() ? - TQString::fromLatin1("localhost") : url.host(); + TQString::tqfromLatin1("localhost") : url.host(); m_hostCombo->setCurrentItem( host ); @@ -285,8 +285,8 @@ bool MrmlPart::openURL( const KURL& url ) == KMessageBox::Yes ) { KApplication::tdeinitExec( "kcmshell", - TQString::fromLatin1("kcmkmrml")); - setStatus( NeedCollection ); + TQString::tqfromLatin1("kcmkmrml")); + settqStatus( NeedCollection ); return false; } } @@ -308,9 +308,9 @@ void MrmlPart::contactServer( const KURL& url ) m_job->addMetaData( MrmlShared::kio_task(), MrmlShared::kio_initialize() ); TQString host = url.host().isEmpty() ? - TQString::fromLatin1("localhost") : url.host(); + TQString::tqfromLatin1("localhost") : url.host(); - slotSetStatusBar( i18n("Connecting to indexing server at %1...").arg( host )); + slotSetStatusBar( i18n("Connecting to indexing server at %1...").tqarg( host )); } // @@ -376,7 +376,7 @@ bool MrmlPart::closeURL() m_job = 0L; } - setStatus( NeedCollection ); + settqStatus( NeedCollection ); return true; } @@ -400,7 +400,7 @@ KIO::TransferJob * MrmlPart::transferJob( const KURL& url ) emit started( job ); emit setWindowCaption( url.prettyURL() ); - setStatus( InProgress ); + settqStatus( InProgress ); return job; } @@ -423,7 +423,7 @@ void MrmlPart::slotResult( KIO::Job *job ) bool auto_random = m_view->isEmpty() && m_queryList.isEmpty(); m_random->setChecked( auto_random ); m_random->setEnabled( !auto_random ); - setStatus( job->error() ? NeedCollection : CanSearch ); + settqStatus( job->error() ? NeedCollection : CanSearch ); if ( !job->error() && !m_queryList.isEmpty() ) { // we have a connection and we got a list of relevant URLs to query for @@ -495,7 +495,7 @@ void MrmlPart::parseMrml( TQDomDocument& doc ) else if ( tagName == "error" ) { KMessageBox::information( widget(), i18n("Server returned error:\n%1\n") - .arg( elem.attribute( "message" )), + .tqarg( elem.attribute( "message" )), i18n("Server Error") ); } @@ -776,7 +776,7 @@ void MrmlPart::slotHostComboActivated( const TQString& host ) openURL( settings.getUrl() ); } -void MrmlPart::setStatus( Status status ) +void MrmlPart::settqStatus( tqStatus status ) { switch ( status ) { diff --git a/kmrml/kmrml/mrml_part.h b/kmrml/kmrml/mrml_part.h index 0bfec704..1451b833 100644 --- a/kmrml/kmrml/mrml_part.h +++ b/kmrml/kmrml/mrml_part.h @@ -57,7 +57,7 @@ class MrmlPart : public KParts::ReadOnlyPart TQ_OBJECT public: - enum Status { NeedCollection, CanSearch, InProgress }; + enum tqStatus { NeedCollection, CanSearch, InProgress }; MrmlPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& args ); @@ -116,7 +116,7 @@ private: void initHostCombo(); void enableServerDependentWidgets( bool enable ); - void setStatus( Status status ); + void settqStatus( tqStatus status ); void contactServer( const KURL& url ); void downloadReferenceFiles( const KURL::List& downloadList ); @@ -143,7 +143,7 @@ private: CollectionList m_collections; AlgorithmList m_algorithms; - Status m_status; + tqStatus m_status; static uint s_sessionId; }; diff --git a/kmrml/kmrml/mrml_view.cpp b/kmrml/kmrml/mrml_view.cpp index 2fed1bcb..d5b26117 100644 --- a/kmrml/kmrml/mrml_view.cpp +++ b/kmrml/kmrml/mrml_view.cpp @@ -57,7 +57,7 @@ MrmlView::MrmlView( TQWidget *parent, const char *name ) // query result image TQLabel l( i18n( "No thumbnail available" ), 0L ); l.setFixedSize( 80, 80 ); - l.setAlignment( WordBreak | AlignCenter ); + l.tqsetAlignment( WordBreak | AlignCenter ); // l.setFrameStyle( TQLabel::Box | TQLabel::Plain ); // l.setLineWidth( 1 ); l.setPaletteBackgroundColor( TQt::white ); @@ -176,7 +176,7 @@ void MrmlView::slotLayout() TQPtrListIterator it( m_items ); for ( ; it.current(); ++it ) { - itemWidth = TQMAX( itemWidth, it.current()->sizeHint().width() ); + itemWidth = TQMAX( itemWidth, it.current()->tqsizeHint().width() ); } if ( itemWidth == 0 ) @@ -202,7 +202,7 @@ void MrmlView::slotLayout() if ( item == 0 ) rowIt = it; - rowHeight = TQMAX( rowHeight, it.current()->sizeHint().height() ); + rowHeight = TQMAX( rowHeight, it.current()->tqsizeHint().height() ); addChild( it.current(), margin + item * itemWidth, y ); it.current()->show(); @@ -306,11 +306,11 @@ MrmlViewItem::MrmlViewItem( const KURL& url, const KURL& thumbURL, /* if ( similarity > -1 ) - TQToolTip::add( this, TQString::fromLatin1("%1
%1") - .arg( url ) - .arg(i18n("Similarity: %1").arg( TQString::number(similarity)))); + TQToolTip::add( this, TQString::tqfromLatin1("%1
%1") + .tqarg( url ) + .tqarg(i18n("Similarity: %1").tqarg( TQString::number(similarity)))); else - TQToolTip::add( this, TQString::fromLatin1("%1").arg( url ) ); + TQToolTip::add( this, TQString::tqfromLatin1("%1").tqarg( url ) ); */ setMinimumSize( 130, 130 ); // ### @@ -342,14 +342,14 @@ void MrmlViewItem::paintEvent( TQPaintEvent *e ) if ( m_similarity >= 0 ) { TQPainter p( this ); - TQPen pen( colorGroup().highlight(), 1, TQPen::SolidLine ); + TQPen pen( tqcolorGroup().highlight(), 1, TQPen::SolidLine ); p.setPen( pen ); int x = margin; int y = m_combo->y() - similarityHeight - 2; int w = (int) (similarityFullWidth * m_similarity); int h = similarityHeight; p.drawRect( x, y, similarityFullWidth, h ); - p.fillRect( x, y, w, h, colorGroup().highlight() ); + p.fillRect( x, y, w, h, tqcolorGroup().highlight() ); } } @@ -361,7 +361,7 @@ void MrmlViewItem::resizeEvent( TQResizeEvent *e ) m_combo->move( width()/2 - m_combo->width()/2, y ); } -TQSize MrmlViewItem::sizeHint() const +TQSize MrmlViewItem::tqsizeHint() const { int w = TQMAX( TQMAX(minimumHeight(), m_combo->width()), m_pixmap.width() ); w += 2 * margin; diff --git a/kmrml/kmrml/mrml_view.h b/kmrml/kmrml/mrml_view.h index f73634a8..a9f1aad1 100644 --- a/kmrml/kmrml/mrml_view.h +++ b/kmrml/kmrml/mrml_view.h @@ -126,7 +126,7 @@ public: void setSimilarity( double value ); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; const KURL& url() const { return m_url; } const KURL& thumbURL() const { return m_thumbURL; } diff --git a/kmrml/kmrml/propertysheet.cpp b/kmrml/kmrml/propertysheet.cpp index af913558..dba9d531 100644 --- a/kmrml/kmrml/propertysheet.cpp +++ b/kmrml/kmrml/propertysheet.cpp @@ -98,10 +98,10 @@ void PropertySheet::initFromDOM( const TQDomElement& elem ) m_minSubsetSize = toInt( elem.attribute( MrmlShared::minSubsetSize() )); m_maxSubsetSize = toInt( elem.attribute( MrmlShared::maxSubsetSize() )); - TQValueList children = + TQValueList tqchildren = KMrml::directChildElements( elem, MrmlShared::propertySheet() ); - TQValueListConstIterator it = children.begin(); - for ( ; it != children.end(); ++it ) + TQValueListConstIterator it = tqchildren.begin(); + for ( ; it != tqchildren.end(); ++it ) m_subSheets.append( new PropertySheet( *it ) ); } @@ -190,7 +190,7 @@ PropertySheet::SendType PropertySheet::getSendType( const TQString& value ) type = AttributeName; else if ( value == MrmlShared::attributeValue() ) type = AttributeValue; - else if ( value == MrmlShared::children() ) + else if ( value == MrmlShared::tqchildren() ) type = Children; else if ( value == MrmlShared::none() ) type = None; diff --git a/kmrml/kmrml/propertysheet.h b/kmrml/kmrml/propertysheet.h index e4759282..2e20cb85 100644 --- a/kmrml/kmrml/propertysheet.h +++ b/kmrml/kmrml/propertysheet.h @@ -34,7 +34,7 @@ namespace KMrml { MultiSet = 1, // ?? Subset, // radio-button/combobox or listbox - SetElement, // CheckBox -> disables/enables children? + SetElement, // CheckBox -> disables/enables tqchildren? Boolean, // CheckBox Numeric, // Slider/Spinbox Textual, // lineedit diff --git a/kmrml/kmrml/server/watcher.cpp b/kmrml/kmrml/server/watcher.cpp index ce569bab..70d34c14 100644 --- a/kmrml/kmrml/server/watcher.cpp +++ b/kmrml/kmrml/server/watcher.cpp @@ -146,7 +146,7 @@ void Watcher::slotProcExited( KProcess *proc ) i18n("The server with the command line" "
%1
" "is not available anymore. Do you want to " - "restart it?" ).arg( daemon->commandline ), + "restart it?" ).tqarg( daemon->commandline ), i18n("Service Failure"), i18n("Restart Server"), i18n("Do Not Restart") ) == KMessageBox::Yes ) { @@ -175,7 +175,7 @@ bool Watcher::startDaemon( DaemonData *daemon ) i18n("Unable to start the server with the " "command line" "
%1
" - "Try again?").arg( daemon->commandline ), + "Try again?").tqarg( daemon->commandline ), i18n("Service Failure"), i18n("Try Again"), i18n("Do Not Try") ) == KMessageBox::Yes ) { -- cgit v1.2.1