summaryrefslogtreecommitdiffstats
path: root/kmrml
diff options
context:
space:
mode:
Diffstat (limited to 'kmrml')
-rw-r--r--kmrml/kmrml/algorithmdialog.cpp10
-rw-r--r--kmrml/kmrml/kcontrol/indexcleaner.cpp2
-rw-r--r--kmrml/kmrml/kcontrol/indexer.cpp4
-rw-r--r--kmrml/kmrml/kcontrol/kcmkmrml.cpp14
-rw-r--r--kmrml/kmrml/kcontrol/mainpage.cpp4
-rw-r--r--kmrml/kmrml/kcontrol/serverconfigwidget.ui4
-rw-r--r--kmrml/kmrml/lib/kmrml_config.cpp4
-rw-r--r--kmrml/kmrml/lib/kmrml_config.h2
-rw-r--r--kmrml/kmrml/lib/mrml_shared.cpp6
-rw-r--r--kmrml/kmrml/lib/mrml_shared.h4
-rw-r--r--kmrml/kmrml/mrml.cpp12
-rw-r--r--kmrml/kmrml/mrml_elements.cpp2
-rw-r--r--kmrml/kmrml/mrml_part.cpp28
-rw-r--r--kmrml/kmrml/mrml_part.h6
-rw-r--r--kmrml/kmrml/mrml_view.cpp20
-rw-r--r--kmrml/kmrml/mrml_view.h2
-rw-r--r--kmrml/kmrml/propertysheet.cpp8
-rw-r--r--kmrml/kmrml/propertysheet.h2
-rw-r--r--kmrml/kmrml/server/watcher.cpp4
19 files changed, 69 insertions, 69 deletions
diff --git a/kmrml/kmrml/algorithmdialog.cpp b/kmrml/kmrml/algorithmdialog.cpp
index 68060bb3..74eaf050 100644
--- a/kmrml/kmrml/algorithmdialog.cpp
+++ b/kmrml/kmrml/algorithmdialog.cpp
@@ -22,7 +22,7 @@
#include <tqhbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqscrollview.h>
#include <tqvbox.h>
#include <tqvgroupbox.h>
@@ -49,8 +49,8 @@ protected:
virtual void viewportResizeEvent(TQResizeEvent* ev)
{
TQScrollView::viewportResizeEvent(ev);
- m_frame->resize( kMax(m_frame->tqsizeHint().width(), ev->size().width()),
- kMax(m_frame->tqsizeHint().height(), ev->size().height()));
+ m_frame->resize( kMax(m_frame->sizeHint().width(), ev->size().width()),
+ kMax(m_frame->sizeHint().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 tqlayout");
+ TQHBoxLayout *collectionLayout = new TQHBoxLayout( 0L, 0, 0, "coll layout");
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->tqsizeHint().width() +
+ box->setMinimumWidth( algoHLayout->sizeHint().width() +
4 * KDialog::spacingHint() );
}
diff --git a/kmrml/kmrml/kcontrol/indexcleaner.cpp b/kmrml/kmrml/kcontrol/indexcleaner.cpp
index 2183cc5b..c184c10c 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::tqfromLatin1(" ") + TQUOTE( dir ) );
+ cmd.append( TQString::fromLatin1(" ") + TQUOTE( dir ) );
*m_process << cmd;
diff --git a/kmrml/kmrml/kcontrol/indexer.cpp b/kmrml/kmrml/kcontrol/indexer.cpp
index 09a83c33..3f479ee6 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("<qt>Next Folder: <br><b>%1</b>").tqarg( m_currentDir ));
+ emit progress( 0, i18n("<qt>Next Folder: <br><b>%1</b>").arg( m_currentDir ));
m_process->start();
}
@@ -160,7 +160,7 @@ void Indexer::slotCanRead( KProcIO *proc )
if ( ok )
{
uint dirsLeft = m_dirs.count();
- TQString message = i18n( "<qt>Processing folder %1 of %2: <br><b>%3</b><br>File %4 of %5.</qt>").tqarg( m_dirCount - dirsLeft ).tqarg( m_dirCount).tqarg( m_currentDir ).tqarg( currentFile ).tqarg( numFiles );
+ TQString message = i18n( "<qt>Processing folder %1 of %2: <br><b>%3</b><br>File %4 of %5.</qt>").arg( m_dirCount - dirsLeft ).arg( m_dirCount).arg( m_currentDir ).arg( currentFile ).arg( numFiles );
emit progress( perc, message );
}
}
diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.cpp b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
index 42aaf534..3e7e91c1 100644
--- a/kmrml/kmrml/kcontrol/kcmkmrml.cpp
+++ b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
@@ -17,7 +17,7 @@
*/
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kaboutdata.h>
#include <kapplication.h>
@@ -58,11 +58,11 @@ KCMKMrml::KCMKMrml(TQWidget *parent, const char *name, const TQStringList & ):
ab->addAuthor( "Carsten Pfeiffer", 0, "pfeiffer@kde.org" );
setAboutData( ab );
- TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
- tqlayout->setSpacing( KDialog::spacingHint() );
+ TQVBoxLayout *layout = new TQVBoxLayout( this );
+ layout->setSpacing( KDialog::spacingHint() );
m_mainPage = new MainPage( this, "main page" );
- tqlayout->addWidget( m_mainPage );
+ layout->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->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+ errorLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
KURLLabel *urlLabel = new KURLLabel( "http://www.gnu.org/software/gift", TQString(), this );
- urlLabel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+ urlLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& )), kapp, TQT_SLOT( invokeBrowser( const TQString& )) );
- TQLayout *l = tqlayout();
+ TQLayout *l = layout();
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 84ba61a2..ca491ead 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::tqfromLatin1("/");
+ TQString slash = TQString::fromLatin1("/");
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").tqarg( returnCode );
+ syserr = i18n("Unknown error: %1").arg( 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 e577b221..5f3a34cd 100644
--- a/kmrml/kmrml/kcontrol/serverconfigwidget.ui
+++ b/kmrml/kmrml/kcontrol/serverconfigwidget.ui
@@ -135,7 +135,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>200</width>
<height>0</height>
@@ -200,7 +200,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>16</height>
diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp
index 219a36a6..ef9c4b06 100644
--- a/kmrml/kmrml/lib/kmrml_config.cpp
+++ b/kmrml/kmrml/lib/kmrml_config.cpp
@@ -18,7 +18,7 @@
#include <tqdir.h>
#include <tqfile.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <kconfig.h>
#include <kdebug.h>
@@ -104,7 +104,7 @@ bool Config::sync()
void Config::setDefaultHost( const TQString& host )
{
m_defaultHost = host.isEmpty() ?
- TQString::tqfromLatin1(DEFAULT_HOST) : host;
+ TQString::fromLatin1(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 4e39d3bf..2208030a 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::tqfromLatin1( "SettingsFor: " ).append( host );
+ return TQString::fromLatin1( "SettingsFor: " ).append( host );
}
bool m_serverStartedIndividually;
diff --git a/kmrml/kmrml/lib/mrml_shared.cpp b/kmrml/kmrml/lib/mrml_shared.cpp
index 932010f6..3e7d6d95 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_tqchildren = 0L;
+const TQString * MrmlShared::m_children = 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_tqchildren = new TQString ( "tqchildren" ) ;
+ m_children = new TQString ( "children" ) ;
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_tqchildren;
+ delete m_children;
delete m_none;
delete m_visibility;
diff --git a/kmrml/kmrml/lib/mrml_shared.h b/kmrml/kmrml/lib/mrml_shared.h
index 175d5c3c..6ed2177a 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& tqchildren() { return *m_tqchildren; }
+ static const TQString& children() { return *m_children; }
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_tqchildren;
+ static const TQString * m_children;
static const TQString * m_none;
static const TQString * m_visibility;
diff --git a/kmrml/kmrml/mrml.cpp b/kmrml/kmrml/mrml.cpp
index 137c2062..a61de8f1 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() ).tqarg(
+ TQString msg = mrmlString( TQString() ).arg(
"<open-session user-name=\"%1\" session-name=\"kio_mrml session\" /> \
<get-algorithms /> \
<get-collections /> \
- </mrml>" ).tqarg( user( url ));
+ </mrml>" ).arg( user( url ));
TQCString utf8 = msg.utf8();
// qDebug(":::Writing: %s", utf8.data());
@@ -240,13 +240,13 @@ TQString Mrml::mrmlString( const TQString& sessionId, const TQString& transactio
</mrml>";
if ( sessionId.isEmpty() ) // when we don't have one yet
- return msg.tqarg( "<mrml>%1" );
+ return msg.arg( "<mrml>%1" );
if ( transactionId.isNull() )
- return msg.tqarg( "<mrml session-id=\"%1\">%1" ).tqarg( sessionId );
+ return msg.arg( "<mrml session-id=\"%1\">%1" ).arg( sessionId );
else
- return msg.tqarg( "<mrml session-id=\"%1\" transaction-id=\"%1\">%1")
- .tqarg( sessionId ).tqarg( transactionId );
+ return msg.arg( "<mrml session-id=\"%1\" transaction-id=\"%1\">%1")
+ .arg( sessionId ).arg( transactionId );
}
void Mrml::emitData( const TQCString& msg )
diff --git a/kmrml/kmrml/mrml_elements.cpp b/kmrml/kmrml/mrml_elements.cpp
index 8700ed43..3fadcaba 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 <query-paradigm-list>, with a number of
-// <query-paradigm> elements as tqchildren.
+// <query-paradigm> elements as children.
//
MrmlElement::MrmlElement( const TQDomElement& elem )
diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp
index 542d3b9c..7a8967c8 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->tqsizeHint() );
+ m_algoButton->setFixedSize( m_algoButton->sizeHint() );
connect( m_algoButton, TQT_SIGNAL( clicked() ),
TQT_SLOT( slotConfigureAlgorithm() ));
TQToolTip::add( m_algoButton, i18n("Configure algorithm") );
TQWidget *spacer = new TQWidget( m_panel );
- spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
+ spacer->setSizePolicy( 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() ));
- settqStatus( NeedCollection );
+ setStatus( 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"));
- settqStatus( NeedCollection );
+ setStatus( 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::tqfromLatin1("localhost") : url.host();
+ TQString::fromLatin1("localhost") : url.host();
m_hostCombo->setCurrentItem( host );
@@ -285,8 +285,8 @@ bool MrmlPart::openURL( const KURL& url )
== KMessageBox::Yes )
{
KApplication::tdeinitExec( "kcmshell",
- TQString::tqfromLatin1("kcmkmrml"));
- settqStatus( NeedCollection );
+ TQString::fromLatin1("kcmkmrml"));
+ setStatus( 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::tqfromLatin1("localhost") : url.host();
+ TQString::fromLatin1("localhost") : url.host();
- slotSetStatusBar( i18n("Connecting to indexing server at %1...").tqarg( host ));
+ slotSetStatusBar( i18n("Connecting to indexing server at %1...").arg( host ));
}
//
@@ -376,7 +376,7 @@ bool MrmlPart::closeURL()
m_job = 0L;
}
- settqStatus( NeedCollection );
+ setStatus( NeedCollection );
return true;
}
@@ -400,7 +400,7 @@ KIO::TransferJob * MrmlPart::transferJob( const KURL& url )
emit started( job );
emit setWindowCaption( url.prettyURL() );
- settqStatus( InProgress );
+ setStatus( 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 );
- settqStatus( job->error() ? NeedCollection : CanSearch );
+ setStatus( 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")
- .tqarg( elem.attribute( "message" )),
+ .arg( elem.attribute( "message" )),
i18n("Server Error") );
}
@@ -776,7 +776,7 @@ void MrmlPart::slotHostComboActivated( const TQString& host )
openURL( settings.getUrl() );
}
-void MrmlPart::settqStatus( tqStatus status )
+void MrmlPart::setStatus( Status status )
{
switch ( status )
{
diff --git a/kmrml/kmrml/mrml_part.h b/kmrml/kmrml/mrml_part.h
index 1451b833..0bfec704 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 tqStatus { NeedCollection, CanSearch, InProgress };
+ enum Status { 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 settqStatus( tqStatus status );
+ void setStatus( Status status );
void contactServer( const KURL& url );
void downloadReferenceFiles( const KURL::List& downloadList );
@@ -143,7 +143,7 @@ private:
CollectionList m_collections;
AlgorithmList m_algorithms;
- tqStatus m_status;
+ Status m_status;
static uint s_sessionId;
};
diff --git a/kmrml/kmrml/mrml_view.cpp b/kmrml/kmrml/mrml_view.cpp
index d5b26117..2fed1bcb 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.tqsetAlignment( WordBreak | AlignCenter );
+ l.setAlignment( WordBreak | AlignCenter );
// l.setFrameStyle( TQLabel::Box | TQLabel::Plain );
// l.setLineWidth( 1 );
l.setPaletteBackgroundColor( TQt::white );
@@ -176,7 +176,7 @@ void MrmlView::slotLayout()
TQPtrListIterator<MrmlViewItem> it( m_items );
for ( ; it.current(); ++it ) {
- itemWidth = TQMAX( itemWidth, it.current()->tqsizeHint().width() );
+ itemWidth = TQMAX( itemWidth, it.current()->sizeHint().width() );
}
if ( itemWidth == 0 )
@@ -202,7 +202,7 @@ void MrmlView::slotLayout()
if ( item == 0 )
rowIt = it;
- rowHeight = TQMAX( rowHeight, it.current()->tqsizeHint().height() );
+ rowHeight = TQMAX( rowHeight, it.current()->sizeHint().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::tqfromLatin1("<qt>%1<br>%1</qt>")
- .tqarg( url )
- .tqarg(i18n("Similarity: %1").tqarg( TQString::number(similarity))));
+ TQToolTip::add( this, TQString::fromLatin1("<qt>%1<br>%1</qt>")
+ .arg( url )
+ .arg(i18n("Similarity: %1").arg( TQString::number(similarity))));
else
- TQToolTip::add( this, TQString::tqfromLatin1("<qt>%1</qt>").tqarg( url ) );
+ TQToolTip::add( this, TQString::fromLatin1("<qt>%1</qt>").arg( url ) );
*/
setMinimumSize( 130, 130 ); // ###
@@ -342,14 +342,14 @@ void MrmlViewItem::paintEvent( TQPaintEvent *e )
if ( m_similarity >= 0 ) {
TQPainter p( this );
- TQPen pen( tqcolorGroup().highlight(), 1, TQPen::SolidLine );
+ TQPen pen( colorGroup().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, tqcolorGroup().highlight() );
+ p.fillRect( x, y, w, h, colorGroup().highlight() );
}
}
@@ -361,7 +361,7 @@ void MrmlViewItem::resizeEvent( TQResizeEvent *e )
m_combo->move( width()/2 - m_combo->width()/2, y );
}
-TQSize MrmlViewItem::tqsizeHint() const
+TQSize MrmlViewItem::sizeHint() 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 a9f1aad1..f73634a8 100644
--- a/kmrml/kmrml/mrml_view.h
+++ b/kmrml/kmrml/mrml_view.h
@@ -126,7 +126,7 @@ public:
void setSimilarity( double value );
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() 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 dba9d531..af913558 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<TQDomElement> tqchildren =
+ TQValueList<TQDomElement> children =
KMrml::directChildElements( elem, MrmlShared::propertySheet() );
- TQValueListConstIterator<TQDomElement> it = tqchildren.begin();
- for ( ; it != tqchildren.end(); ++it )
+ TQValueListConstIterator<TQDomElement> it = children.begin();
+ for ( ; it != children.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::tqchildren() )
+ else if ( value == MrmlShared::children() )
type = Children;
else if ( value == MrmlShared::none() )
type = None;
diff --git a/kmrml/kmrml/propertysheet.h b/kmrml/kmrml/propertysheet.h
index 2e20cb85..e4759282 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 tqchildren?
+ SetElement, // CheckBox -> disables/enables children?
Boolean, // CheckBox
Numeric, // Slider/Spinbox
Textual, // lineedit
diff --git a/kmrml/kmrml/server/watcher.cpp b/kmrml/kmrml/server/watcher.cpp
index 70d34c14..ce569bab 100644
--- a/kmrml/kmrml/server/watcher.cpp
+++ b/kmrml/kmrml/server/watcher.cpp
@@ -146,7 +146,7 @@ void Watcher::slotProcExited( KProcess *proc )
i18n("<qt>The server with the command line"
"<br>%1<br>"
"is not available anymore. Do you want to "
- "restart it?" ).tqarg( daemon->commandline ),
+ "restart it?" ).arg( 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"
"<br>%1<br>"
- "Try again?").tqarg( daemon->commandline ),
+ "Try again?").arg( daemon->commandline ),
i18n("Service Failure"), i18n("Try Again"), i18n("Do Not Try") )
== KMessageBox::Yes )
{
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 12:14:23 +0000