TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Minor API repair

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211206 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 9f96d63831
commit 0951e055d4
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File

2
TODO
Unescape View File

@ -212,7 +212,7 @@ an alternative help->contents action)
- KListView: merge setDropHighlighter and setDropVisualizer, add a setDnDMode to choose between - KListView: merge setDropHighlighter and setDropVisualizer, add a setDnDMode to choose between
"dnd to move items" (e.g. keditbookmarks) and "dnd onto items" (e.g. kmail). Unless Qt4 does it all :) "dnd to move items" (e.g. keditbookmarks) and "dnd onto items" (e.g. kmail). Unless Qt4 does it all :)
- Move KIO::tqfindDeviceMountPoint, tqfindPathMoundPoint, probably_slow_mounted, and testFileSystemFlag to KMountPoint, - Move KIO::findDeviceMountPoint, tqfindPathMoundPoint, probably_slow_mounted, and testFileSystemFlag to KMountPoint,
to merge that code. to merge that code.
- Refactor the kio/bookmarks code so we don't need to use the static d-pointer trick anymore. - Refactor the kio/bookmarks code so we don't need to use the static d-pointer trick anymore.

12
kio/kio/global.cpp
Unescape View File

@ -1368,7 +1368,7 @@ extern "C" void endvfsent( );
#endif /* HAVE_GETMNTINFO */ #endif /* HAVE_GETMNTINFO */
TQString KIO::tqfindDeviceMountPoint( const TQString& filename ) TQString KIO::findDeviceMountPoint( const TQString& filename )
{ {
TQString result; TQString result;
@ -1383,13 +1383,13 @@ TQString KIO::tqfindDeviceMountPoint( const TQString& filename )
TQCString devname; TQCString devname;
if( (volpath = volmgt_root()) == NULL ) { if( (volpath = volmgt_root()) == NULL ) {
kdDebug( 7007 ) << "tqfindDeviceMountPoint: " kdDebug( 7007 ) << "findDeviceMountPoint: "
<< "VOLMGT: can't tqfind volmgt root dir" << endl; << "VOLMGT: can't tqfind volmgt root dir" << endl;
return TQString::null; return TQString::null;
} }
if( (mnttab = fopen( MNTTAB, "r" )) == NULL ) { if( (mnttab = fopen( MNTTAB, "r" )) == NULL ) {
kdDebug( 7007 ) << "tqfindDeviceMountPoint: " kdDebug( 7007 ) << "findDeviceMountPoint: "
<< "VOLMGT: can't open mnttab" << endl; << "VOLMGT: can't open mnttab" << endl;
return TQString::null; return TQString::null;
} }
@ -1398,7 +1398,7 @@ TQString KIO::tqfindDeviceMountPoint( const TQString& filename )
devname += TQFile::encodeName( filename ); devname += TQFile::encodeName( filename );
devname += '/'; devname += '/';
len = devname.length(); len = devname.length();
// kdDebug( 7007 ) << "tqfindDeviceMountPoint: " // kdDebug( 7007 ) << "findDeviceMountPoint: "
// << "VOLMGT: searching mountpoint for \"" << devname << "\"" // << "VOLMGT: searching mountpoint for \"" << devname << "\""
// << endl; // << endl;
@ -1437,7 +1437,7 @@ TQString KIO::tqfindDeviceMountPoint( const TQString& filename )
// succes, use result from realpath // succes, use result from realpath
realname = realpath_buffer; realname = realpath_buffer;
//kdDebug(7007) << "tqfindDeviceMountPoint realname=" << realname << endl; //kdDebug(7007) << "findDeviceMountPoint realname=" << realname << endl;
#ifdef HAVE_GETMNTINFO #ifdef HAVE_GETMNTINFO
@ -1909,7 +1909,7 @@ static TQString get_mount_info(const TQString& filename,
#else //!Q_OS_UNIX #else //!Q_OS_UNIX
//dummy //dummy
TQString KIO::tqfindDeviceMountPoint( const TQString& filename ) TQString KIO::findDeviceMountPoint( const TQString& filename )
{ {
return TQString::null; return TQString::null;
} }

2
kio/kio/global.h
Unescape View File

@ -416,7 +416,7 @@ namespace KIO
* right now. This means, it has to be mounted, not just * right now. This means, it has to be mounted, not just
* defined in fstab. * 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. * Returns the mount point on which resides @p filename.

4
kio/kio/kautomount.cpp
Unescape View File

@ -51,12 +51,12 @@ void KAutoMount::slotResult( KIO::Job * job )
else else
{ {
KURL mountpoint; KURL mountpoint;
mountpoint.setPath( KIO::tqfindDeviceMountPoint( m_strDevice ) ); mountpoint.setPath( KIO::findDeviceMountPoint( m_strDevice ) );
//kdDebug(7015) << "KAutoMount: m_strDevice=" << m_strDevice << " -> mountpoint=" << mountpoint << endl; //kdDebug(7015) << "KAutoMount: m_strDevice=" << m_strDevice << " -> mountpoint=" << mountpoint << endl;
Q_ASSERT( mountpoint.isValid() ); Q_ASSERT( mountpoint.isValid() );
if ( mountpoint.path().isEmpty() ) 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; << "This looks like a bug, please report it on http://bugs.kde.org, together with your /etc/fstab line" << endl;
else if ( m_bShowFilemanagerWindow ) else if ( m_bShowFilemanagerWindow )
KRun::runURL( mountpoint, "inode/directory" ); KRun::runURL( mountpoint, "inode/directory" );

8
kio/kio/kmimetype.cpp
Unescape View File

@ -717,7 +717,7 @@ TQString KDEDesktopMimeType::icon( const KURL& _url, bool _is_local ) const
TQString dev = cfg.readEntry( "Dev" ); TQString dev = cfg.readEntry( "Dev" );
if ( !icon.isEmpty() && !unmount_icon.isEmpty() && !dev.isEmpty() ) if ( !icon.isEmpty() && !unmount_icon.isEmpty() && !dev.isEmpty() )
{ {
TQString mp = KIO::tqfindDeviceMountPoint( dev ); TQString mp = KIO::findDeviceMountPoint( dev );
// Is the device not mounted ? // Is the device not mounted ?
if ( mp.isNull() ) if ( mp.isNull() )
return unmount_icon; return unmount_icon;
@ -831,7 +831,7 @@ pid_t KDEDesktopMimeType::runFSDevice( const KURL& _url, const KSimpleConfig &cf
return retval; return retval;
} }
TQString mp = KIO::tqfindDeviceMountPoint( dev ); TQString mp = KIO::findDeviceMountPoint( dev );
// Is the device already mounted ? // Is the device already mounted ?
if ( !mp.isNull() ) if ( !mp.isNull() )
{ {
@ -933,7 +933,7 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::builtinServices( co
} }
else else
{ {
TQString mp = KIO::tqfindDeviceMountPoint( dev ); TQString mp = KIO::findDeviceMountPoint( dev );
// not mounted ? // not mounted ?
if ( mp.isEmpty() ) if ( mp.isEmpty() )
{ {
@ -1114,7 +1114,7 @@ void KDEDesktopMimeType::executeService( const KURL::List& urls, KDEDesktopMimeT
KMessageBoxWrapper::error( 0, tmp ); KMessageBoxWrapper::error( 0, tmp );
return; return;
} }
TQString mp = KIO::tqfindDeviceMountPoint( dev ); TQString mp = KIO::findDeviceMountPoint( dev );
if ( _service.m_type == ST_MOUNT ) if ( _service.m_type == ST_MOUNT )
{ {

2
kio/tests/speed.cpp
Unescape View File

@ -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 probably " << (KIO::probably_slow_mounted(url.path()) ? "slow" : "normal") << " mounted\n";
kdDebug() << url.url() << " is " << (KIO::manually_mounted(url.path()) ? "manually" : "system") << " 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()) { if (mp.isEmpty()) {
kdDebug() << "no mount point for device " << url.url() << " found\n"; kdDebug() << "no mount point for device " << url.url() << " found\n";
} else } else

2
kioslave/file/file.cc
Unescape View File

@ -1472,7 +1472,7 @@ void FileProtocol::mount( bool _ro, const char *_fstype, const TQString& _dev, c
else else
{ {
// Didn't work - or maybe we just got a warning // Didn't work - or maybe we just got a warning
TQString mp = KIO::tqfindDeviceMountPoint( _dev ); TQString mp = KIO::findDeviceMountPoint( _dev );
// Is the device mounted ? // Is the device mounted ?
if ( !mp.isEmpty() && mount_ret == 0) if ( !mp.isEmpty() && mount_ret == 0)
{ {

Write Preview
Loading…
Cancel
Save