diff options
Diffstat (limited to 'tdeioslave/file/file.cpp')
| -rw-r--r-- | tdeioslave/file/file.cpp | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/tdeioslave/file/file.cpp b/tdeioslave/file/file.cpp index b7ac91bfd..ba42792ee 100644 --- a/tdeioslave/file/file.cpp +++ b/tdeioslave/file/file.cpp @@ -73,24 +73,23 @@ #include <kshred.h> #include <kdebug.h> #include <kurl.h> -#include <kinstance.h> -#include <ksimpleconfig.h> +#include <tdeinstance.h> +#include <tdesimpleconfig.h> #include <tdetempfile.h> #include <tdelocale.h> #include <tqfile.h> #include <tqstrlist.h> #include "file.h" #include <limits.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kmountpoint.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #ifdef HAVE_VOLMGT #include <volmgt.h> #include <sys/mnttab.h> #endif -#include <kstandarddirs.h> #include <tdeio/ioslave_defaults.h> #include <klargefile.h> #include <tdeglobal.h> @@ -108,7 +107,7 @@ static void appendACLAtoms( const TQCString & path, UDSEntry& entry, mode_t type, bool withACL ); #endif -extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); } +extern "C" { TDE_EXPORT int kdemain(int argc, char **argv); } int kdemain( int argc, char **argv ) { @@ -569,7 +568,7 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum // set modification time const TQString mtimeStr = metaData( "modified" ); if ( !mtimeStr.isEmpty() ) { - TQDateTime dt = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( mtimeStr, Qt::ISODate )); + TQDateTime dt = TQDateTime::fromString( mtimeStr, TQt::ISODate ); if ( dt.isValid() ) { KDE_struct_stat dest_statbuf; if (KDE_stat( _dest_orig.data(), &dest_statbuf ) == 0) { @@ -639,7 +638,7 @@ void FileProtocol::copy( const KURL &src, const KURL &dest, return; } - // If the destination is a symlink and overwrite is TRUE, + // If the destination is a symlink and overwrite is true, // remove the symlink first to prevent the scenario where // the symlink actually points to current source! if (_overwrite && S_ISLNK(buff_dest.st_mode)) @@ -1336,10 +1335,10 @@ void FileProtocol::special( const TQByteArray &data) TQString filename; stream >> filename; KShred shred( filename ); - connect( &shred, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ), - this, TQT_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) ); - connect( &shred, TQT_SIGNAL( infoMessage( const TQString & ) ), - this, TQT_SLOT( slotInfoMessage( const TQString & ) ) ); + connect( &shred, TQ_SIGNAL( processedSize( TDEIO::filesize_t ) ), + this, TQ_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) ); + connect( &shred, TQ_SIGNAL( infoMessage( const TQString & ) ), + this, TQ_SLOT( slotInfoMessage( const TQString & ) ) ); if (!shred.shred()) error( TDEIO::ERR_CANNOT_DELETE, filename ); else @@ -1446,15 +1445,15 @@ void FileProtocol::mount( bool _ro, const char *_fstype, const TQString& _dev, c buffer.sprintf( "%s %s %s %s 2>%s", mountProg.latin1(), readonly.data(), dev.data(), point.data(), tmp ); else // mount giving device + mountpoint + fstype -#if defined(__svr4__) && defined(__sun__) - // MACRO for Solaris 8 and I +#if defined(Q_OS_SOLARIS) + // MACRO for Solaris 8 and I // believe this is true for SVR4 in general - buffer.sprintf( "%s -F %s %s %s %s 2>%s" - mountProg.latin1() - fstype.data() - _ro ? "-oro" : "" - dev.data() - point.data() + buffer.sprintf( "%s -F %s %s %s %s 2>%s", + mountProg.latin1(), + fstype.data(), + _ro ? "-oro" : "", + dev.data(), + point.data(), tmp ); #elif defined(__OpenBSD__) buffer.sprintf( "%s %s %s -t %s %s %s 2>%s", "tdesu", mountProg.latin1(), readonly.data(), |