diff options
Diffstat (limited to 'kio')
| -rw-r--r-- | kio/kio/global.cpp | 12 | ||||
| -rw-r--r-- | kio/kio/global.h | 2 | ||||
| -rw-r--r-- | kio/kio/kautomount.cpp | 4 | ||||
| -rw-r--r-- | kio/kio/kmimetype.cpp | 8 | ||||
| -rw-r--r-- | kio/tests/speed.cpp | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/kio/kio/global.cpp b/kio/kio/global.cpp index 44718fc91..a8bd85d17 100644 --- a/kio/kio/global.cpp +++ b/kio/kio/global.cpp @@ -1368,7 +1368,7 @@ extern "C" void endvfsent( ); #endif /* HAVE_GETMNTINFO */ -TQString KIO::tqfindDeviceMountPoint( const TQString& filename ) +TQString KIO::findDeviceMountPoint( const TQString& filename ) { TQString result; @@ -1383,13 +1383,13 @@ TQString KIO::tqfindDeviceMountPoint( const TQString& filename ) TQCString devname; if( (volpath = volmgt_root()) == NULL ) { - kdDebug( 7007 ) << "tqfindDeviceMountPoint: " + kdDebug( 7007 ) << "findDeviceMountPoint: " << "VOLMGT: can't tqfind volmgt root dir" << endl; return TQString::null; } if( (mnttab = fopen( MNTTAB, "r" )) == NULL ) { - kdDebug( 7007 ) << "tqfindDeviceMountPoint: " + kdDebug( 7007 ) << "findDeviceMountPoint: " << "VOLMGT: can't open mnttab" << endl; return TQString::null; } @@ -1398,7 +1398,7 @@ TQString KIO::tqfindDeviceMountPoint( const TQString& filename ) devname += TQFile::encodeName( filename ); devname += '/'; len = devname.length(); -// kdDebug( 7007 ) << "tqfindDeviceMountPoint: " +// kdDebug( 7007 ) << "findDeviceMountPoint: " // << "VOLMGT: searching mountpoint for \"" << devname << "\"" // << endl; @@ -1437,7 +1437,7 @@ TQString KIO::tqfindDeviceMountPoint( const TQString& filename ) // succes, use result from realpath realname = realpath_buffer; - //kdDebug(7007) << "tqfindDeviceMountPoint realname=" << realname << endl; + //kdDebug(7007) << "findDeviceMountPoint realname=" << realname << endl; #ifdef HAVE_GETMNTINFO @@ -1909,7 +1909,7 @@ static TQString get_mount_info(const TQString& filename, #else //!Q_OS_UNIX //dummy -TQString KIO::tqfindDeviceMountPoint( const TQString& filename ) +TQString KIO::findDeviceMountPoint( const TQString& filename ) { return TQString::null; } diff --git a/kio/kio/global.h b/kio/kio/global.h index 780bac6a2..fc18f1953 100644 --- a/kio/kio/global.h +++ b/kio/kio/global.h @@ -416,7 +416,7 @@ namespace KIO * right now. This means, it has to be mounted, not just * defined in fstab. */ - KIO_EXPORT TQString tqfindDeviceMountPoint( const TQString& device ); + KIO_EXPORT TQString findDeviceMountPoint( const TQString& device ); /** * Returns the mount point on which resides @p filename. diff --git a/kio/kio/kautomount.cpp b/kio/kio/kautomount.cpp index e7df61a0a..3bbe47c52 100644 --- a/kio/kio/kautomount.cpp +++ b/kio/kio/kautomount.cpp @@ -51,12 +51,12 @@ void KAutoMount::slotResult( KIO::Job * job ) else { KURL mountpoint; - mountpoint.setPath( KIO::tqfindDeviceMountPoint( m_strDevice ) ); + mountpoint.setPath( KIO::findDeviceMountPoint( m_strDevice ) ); //kdDebug(7015) << "KAutoMount: m_strDevice=" << m_strDevice << " -> mountpoint=" << mountpoint << endl; Q_ASSERT( mountpoint.isValid() ); if ( mountpoint.path().isEmpty() ) - kdWarning(7015) << m_strDevice << " was correctly mounted, but KIO::tqfindDeviceMountPoint didn't tqfind it. " + kdWarning(7015) << m_strDevice << " was correctly mounted, but KIO::findDeviceMountPoint didn't tqfind it. " << "This looks like a bug, please report it on http://bugs.kde.org, together with your /etc/fstab line" << endl; else if ( m_bShowFilemanagerWindow ) KRun::runURL( mountpoint, "inode/directory" ); diff --git a/kio/kio/kmimetype.cpp b/kio/kio/kmimetype.cpp index aa2bdd807..1e74f90de 100644 --- a/kio/kio/kmimetype.cpp +++ b/kio/kio/kmimetype.cpp @@ -717,7 +717,7 @@ TQString KDEDesktopMimeType::icon( const KURL& _url, bool _is_local ) const TQString dev = cfg.readEntry( "Dev" ); if ( !icon.isEmpty() && !unmount_icon.isEmpty() && !dev.isEmpty() ) { - TQString mp = KIO::tqfindDeviceMountPoint( dev ); + TQString mp = KIO::findDeviceMountPoint( dev ); // Is the device not mounted ? if ( mp.isNull() ) return unmount_icon; @@ -831,7 +831,7 @@ pid_t KDEDesktopMimeType::runFSDevice( const KURL& _url, const KSimpleConfig &cf return retval; } - TQString mp = KIO::tqfindDeviceMountPoint( dev ); + TQString mp = KIO::findDeviceMountPoint( dev ); // Is the device already mounted ? if ( !mp.isNull() ) { @@ -933,7 +933,7 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::builtinServices( co } else { - TQString mp = KIO::tqfindDeviceMountPoint( dev ); + TQString mp = KIO::findDeviceMountPoint( dev ); // not mounted ? if ( mp.isEmpty() ) { @@ -1114,7 +1114,7 @@ void KDEDesktopMimeType::executeService( const KURL::List& urls, KDEDesktopMimeT KMessageBoxWrapper::error( 0, tmp ); return; } - TQString mp = KIO::tqfindDeviceMountPoint( dev ); + TQString mp = KIO::findDeviceMountPoint( dev ); if ( _service.m_type == ST_MOUNT ) { diff --git a/kio/tests/speed.cpp b/kio/tests/speed.cpp index 08d039aa8..4b29e1815 100644 --- a/kio/tests/speed.cpp +++ b/kio/tests/speed.cpp @@ -81,7 +81,7 @@ int main(int argc, char **argv) { kdDebug() << url.url() << " is probably " << (KIO::probably_slow_mounted(url.path()) ? "slow" : "normal") << " mounted\n"; kdDebug() << url.url() << " is " << (KIO::manually_mounted(url.path()) ? "manually" : "system") << " mounted\n"; - TQString mp = KIO::tqfindDeviceMountPoint(url.path()); + TQString mp = KIO::findDeviceMountPoint(url.path()); if (mp.isEmpty()) { kdDebug() << "no mount point for device " << url.url() << " found\n"; } else |