summaryrefslogtreecommitdiffstats
path: root/kmrml
diff options
context:
space:
mode:
Diffstat (limited to 'kmrml')
-rw-r--r--kmrml/kmrml.spec6
-rw-r--r--kmrml/kmrml/kcontrol/indexcleaner.cpp4
-rw-r--r--kmrml/kmrml/kcontrol/indexer.cpp10
-rw-r--r--kmrml/kmrml/kcontrol/mainpage.cpp2
-rw-r--r--kmrml/kmrml/lib/kmrml_config.cpp26
-rw-r--r--kmrml/kmrml/loader.cpp4
-rw-r--r--kmrml/kmrml/mrml_elements.cpp2
-rw-r--r--kmrml/kmrml/mrml_part.cpp2
-rw-r--r--kmrml/kmrml/mrml_view.cpp4
-rw-r--r--kmrml/kmrml/server/watcher.cpp8
10 files changed, 34 insertions, 34 deletions
diff --git a/kmrml/kmrml.spec b/kmrml/kmrml.spec
index d278a7d0..79dbab29 100644
--- a/kmrml/kmrml.spec
+++ b/kmrml/kmrml.spec
@@ -48,11 +48,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
cd $RPM_BUILD_ROOT
-tqfind . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.%{name}
+find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.%{name}
-tqfind . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
+find . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
-tqfind . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
+find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/kmrml/kmrml/kcontrol/indexcleaner.cpp b/kmrml/kmrml/kcontrol/indexcleaner.cpp
index b02d6343..18d5205e 100644
--- a/kmrml/kmrml/kcontrol/indexcleaner.cpp
+++ b/kmrml/kmrml/kcontrol/indexcleaner.cpp
@@ -74,9 +74,9 @@ void IndexCleaner::startNext()
TQString dir = m_dirs.first();
m_dirs.pop_front();
- int index = cmd.tqfind( "%d" );
+ int index = cmd.find( "%d" );
if ( index != -1 )
- cmd.tqreplace( index, 2, TQUOTE( dir ) );
+ cmd.replace( index, 2, TQUOTE( dir ) );
else // no %d? What else can we do?
cmd.append( TQString::tqfromLatin1(" ") + TQUOTE( dir ) );
diff --git a/kmrml/kmrml/kcontrol/indexer.cpp b/kmrml/kmrml/kcontrol/indexer.cpp
index 0308dd39..14c6a5c5 100644
--- a/kmrml/kmrml/kcontrol/indexer.cpp
+++ b/kmrml/kmrml/kcontrol/indexer.cpp
@@ -93,14 +93,14 @@ void Indexer::processNext()
TQString cmd = m_config->addCollectionCommandLine().simplifyWhiteSpace().stripWhiteSpace();
- // in the commandline, tqreplace %d with the directory to process and
+ // in the commandline, replace %d with the directory to process and
// %t with the thumbnail dir
- int index = cmd.tqfind( "%d" ); // ### TQFile::encodeName()?
+ int index = cmd.find( "%d" ); // ### TQFile::encodeName()?
if ( index != -1 )
- cmd.tqreplace( index, 2, TQUOTE( m_currentDir ) );
- index = cmd.tqfind( "%t" );
+ cmd.replace( index, 2, TQUOTE( m_currentDir ) );
+ index = cmd.find( "%t" );
if ( index != -1 )
- cmd.tqreplace( index, 2, TQUOTE(m_currentDir + "_thumbnails") );
+ cmd.replace( index, 2, TQUOTE(m_currentDir + "_thumbnails") );
// qDebug("****** command: %s", cmd.latin1());
#if KDE_VERSION >= 306
diff --git a/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp
index ab6fc84b..90756bfb 100644
--- a/kmrml/kmrml/kcontrol/mainpage.cpp
+++ b/kmrml/kmrml/kcontrol/mainpage.cpp
@@ -341,7 +341,7 @@ void MainPage::slotRemoveClicked()
void MainPage::enableWidgetsFor( const KMrml::ServerSettings& settings )
{
TQString host = settings.host;
- bool enableWidgets = (m_config->hosts().tqfindIndex( host ) > -1);
+ bool enableWidgets = (m_config->hosts().findIndex( host ) > -1);
m_serverWidget->m_addButton->setEnabled(!enableWidgets && !host.isEmpty());
m_serverWidget->m_removeButton->setEnabled( enableWidgets &&
!host.isEmpty() &&
diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp
index 6d779860..2167448b 100644
--- a/kmrml/kmrml/lib/kmrml_config.cpp
+++ b/kmrml/kmrml/lib/kmrml_config.cpp
@@ -137,7 +137,7 @@ ServerSettings Config::settingsForHost( const TQString& host ) const
void Config::addSettings( const ServerSettings& settings )
{
TQString host = settings.host;
- if ( m_hostList.tqfind( host ) == m_hostList.end() )
+ if ( m_hostList.find( host ) == m_hostList.end() )
m_hostList.append( host );
m_config->setGroup( CONFIG_GROUP );
@@ -181,13 +181,13 @@ TQString Config::addCollectionCommandLine() const
m_config->setGroup( CONFIG_GROUP );
TQString cmd = m_config->readEntry( "AddCollection Commandline",
DEFAULT_ADDCOLLECTION_CMD );
- int index = cmd.tqfind( "%h" );
+ int index = cmd.find( "%h" );
if ( index != -1 )
- cmd.tqreplace( index, 2, TQUOTE( mrmldDataDir() ) );
+ cmd.replace( index, 2, TQUOTE( mrmldDataDir() ) );
- index = cmd.tqfind( "%e" );
+ index = cmd.find( "%e" );
if ( index != -1 )
- cmd.tqreplace( index, 2, TQTextCodec::codecForLocale()->mimeName() );
+ cmd.replace( index, 2, TQTextCodec::codecForLocale()->mimeName() );
return cmd;
}
@@ -203,13 +203,13 @@ TQString Config::removeCollectionCommandLine() const
m_config->setGroup( CONFIG_GROUP );
TQString cmd = m_config->readEntry( "RemoveCollection Commandline",
DEFAULT_REMOVECOLLECTION_CMD );
- int index = cmd.tqfind( "%h" );
+ int index = cmd.find( "%h" );
if ( index != -1 )
- cmd.tqreplace( index, 2, TQUOTE( mrmldDataDir() ) );
+ cmd.replace( index, 2, TQUOTE( mrmldDataDir() ) );
- index = cmd.tqfind( "%e" );
+ index = cmd.find( "%e" );
if ( index != -1 )
- cmd.tqreplace( index, 2, TQTextCodec::codecForLocale()->mimeName() );
+ cmd.replace( index, 2, TQTextCodec::codecForLocale()->mimeName() );
return cmd;
}
@@ -231,17 +231,17 @@ TQString Config::mrmldCommandline() const
DEFAULT_MRMLD_CMD );
// add data directory and port to the commandline
- int index = cmd.tqfind( "%p" );
+ int index = cmd.find( "%p" );
if ( index != -1 )
{
TQString port = settings.autoPort ?
TQString() : TQString::number( settings.configuredPort );
- cmd.tqreplace( index, 2, port );
+ cmd.replace( index, 2, port );
}
- index = cmd.tqfind( "%d" );
+ index = cmd.find( "%d" );
if ( index != -1 )
{
- cmd.tqreplace( index, 2, TQUOTE( mrmldDataDir() ) );
+ cmd.replace( index, 2, TQUOTE( mrmldDataDir() ) );
}
qDebug("***** commandline: %s", cmd.latin1());
diff --git a/kmrml/kmrml/loader.cpp b/kmrml/kmrml/loader.cpp
index f8cbecb3..ea8803e2 100644
--- a/kmrml/kmrml/loader.cpp
+++ b/kmrml/kmrml/loader.cpp
@@ -72,7 +72,7 @@ void Loader::requestDownload( const KURL& url )
void Loader::slotData( KIO::Job *job, const TQByteArray& data )
{
- DownloadIterator it = m_downloads.tqfind( static_cast<KIO::TransferJob*>(job) );
+ DownloadIterator it = m_downloads.find( static_cast<KIO::TransferJob*>(job) );
if ( it != m_downloads.end() ) {
TQBuffer& buffer = it.data()->m_buffer;
if ( !buffer.isOpen() )
@@ -90,7 +90,7 @@ void Loader::slotResult( KIO::Job *job )
{
KIO::TransferJob *tjob = static_cast<KIO::TransferJob*>( job );
- DownloadIterator it = m_downloads.tqfind( tjob );
+ DownloadIterator it = m_downloads.find( tjob );
if ( it != m_downloads.end() ) {
Download *d = it.data();
diff --git a/kmrml/kmrml/mrml_elements.cpp b/kmrml/kmrml/mrml_elements.cpp
index a5a0ebb1..ae7ddeee 100644
--- a/kmrml/kmrml/mrml_elements.cpp
+++ b/kmrml/kmrml/mrml_elements.cpp
@@ -194,7 +194,7 @@ bool QueryParadigm::equalMaps( const TQMap<TQString,TQString> m1,
TQMapConstIterator<TQString,TQString> it = m1.begin();
for ( ; it != m1.end(); ++it )
{
- TQMapConstIterator<TQString,TQString> it2 = m2.tqfind( it.key() );
+ TQMapConstIterator<TQString,TQString> it2 = m2.find( it.key() );
if ( it2 == m2.end() || it.data() != it2.data() )
return false;
}
diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp
index 305cc684..032eafe6 100644
--- a/kmrml/kmrml/mrml_part.cpp
+++ b/kmrml/kmrml/mrml_part.cpp
@@ -325,7 +325,7 @@ void MrmlPart::downloadReferenceFiles( const KURL::List& downloadList )
for ( ; it != downloadList.end(); it++ )
{
TQString extension;
- int index = (*it).fileName().tqfindRev( '.' );
+ int index = (*it).fileName().findRev( '.' );
if ( index != -1 )
extension = (*it).fileName().mid( index );
diff --git a/kmrml/kmrml/mrml_view.cpp b/kmrml/kmrml/mrml_view.cpp
index 254307e0..5874c996 100644
--- a/kmrml/kmrml/mrml_view.cpp
+++ b/kmrml/kmrml/mrml_view.cpp
@@ -120,7 +120,7 @@ void MrmlView::clear()
TQPixmap * MrmlView::getPixmap( const KURL& url )
{
TQString u = url.url();
- TQPixmap *pix = m_pixmapCache.tqfind( u );
+ TQPixmap *pix = m_pixmapCache.find( u );
if ( pix )
return pix;
@@ -130,7 +130,7 @@ TQPixmap * MrmlView::getPixmap( const KURL& url )
p = m_unavailablePixmap;
m_pixmapCache.insert( u, p );
- return m_pixmapCache.tqfind( u );
+ return m_pixmapCache.find( u );
}
else { // remote url, download with KIO
Loader::self()->requestDownload( url );
diff --git a/kmrml/kmrml/server/watcher.cpp b/kmrml/kmrml/server/watcher.cpp
index 7281a4ae..60b37c48 100644
--- a/kmrml/kmrml/server/watcher.cpp
+++ b/kmrml/kmrml/server/watcher.cpp
@@ -56,11 +56,11 @@ bool Watcher::requireDaemon( const TQCString& clientAppId,
<< ": Client AppID is not registered with DCOP: "
<< clientAppId << endl;
- DaemonData *daemon = m_daemons.tqfind( daemonKey );
+ DaemonData *daemon = m_daemons.find( daemonKey );
if ( daemon )
{
- if ( !daemon->apps.tqfind( clientAppId ) )
+ if ( !daemon->apps.find( clientAppId ) )
daemon->apps.append( clientAppId );
// timeout, commandline and restart values are: first come, first serve
@@ -93,7 +93,7 @@ bool Watcher::requireDaemon( const TQCString& clientAppId,
void Watcher::unrequireDaemon( const TQCString& clientAppId,
const TQString& daemonKey )
{
- unrequireDaemon( m_daemons.tqfind( daemonKey ), clientAppId );
+ unrequireDaemon( m_daemons.find( daemonKey ), clientAppId );
}
void Watcher::unrequireDaemon( DaemonData *daemon,
@@ -243,7 +243,7 @@ void Watcher::slotAppUnregistered( const TQCString& appId )
TQDictIterator<DaemonData> it( m_daemons );
for ( ; (daemon = it.current()); ++it )
{
- if ( daemon->apps.tqfind( appId ) != -1 )
+ if ( daemon->apps.find( appId ) != -1 )
unrequireDaemon( daemon, appId );
}
}