diff options
Diffstat (limited to 'src/fileaccess.cpp')
| -rw-r--r-- | src/fileaccess.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp index c2be1dc..01b8d48 100644 --- a/src/fileaccess.cpp +++ b/src/fileaccess.cpp @@ -407,11 +407,11 @@ bool FileAccess::writeFile( const void* pSrcBuffer, unsigned long length ) if ( isExecutable() ) // value is true if the old file was executable { // Preserve attributes - struct stat srcFiletqStatus; - int statResult = ::stat( filePath().ascii(), &srcFiletqStatus ); + struct stat srcFileStatus; + int statResult = ::stat( filePath().ascii(), &srcFileStatus ); if (statResult==0) { - ::chmod ( filePath().ascii(), srcFiletqStatus.st_mode | S_IXUSR ); + ::chmod ( filePath().ascii(), srcFileStatus.st_mode | S_IXUSR ); } } #endif @@ -938,28 +938,28 @@ bool FileAccessJobHandler::copyFile( const TQString& dest ) // Update the times of the destFile #ifdef _WIN32 - struct _stat srcFiletqStatus; - int statResult = ::_stat( srcName.ascii(), &srcFiletqStatus ); + struct _stat srcFileStatus; + int statResult = ::_stat( srcName.ascii(), &srcFileStatus ); if (statResult==0) { _utimbuf destTimes; - destTimes.actime = srcFiletqStatus.st_atime;/* time of last access */ - destTimes.modtime = srcFiletqStatus.st_mtime;/* time of last modification */ + destTimes.actime = srcFileStatus.st_atime;/* time of last access */ + destTimes.modtime = srcFileStatus.st_mtime;/* time of last modification */ _utime ( destName.ascii(), &destTimes ); - _chmod ( destName.ascii(), srcFiletqStatus.st_mode ); + _chmod ( destName.ascii(), srcFileStatus.st_mode ); } #else - struct stat srcFiletqStatus; - int statResult = ::stat( srcName.ascii(), &srcFiletqStatus ); + struct stat srcFileStatus; + int statResult = ::stat( srcName.ascii(), &srcFileStatus ); if (statResult==0) { utimbuf destTimes; - destTimes.actime = srcFiletqStatus.st_atime;/* time of last access */ - destTimes.modtime = srcFiletqStatus.st_mtime;/* time of last modification */ + destTimes.actime = srcFileStatus.st_atime;/* time of last access */ + destTimes.modtime = srcFileStatus.st_mtime;/* time of last modification */ utime ( destName.ascii(), &destTimes ); - chmod ( destName.ascii(), srcFiletqStatus.st_mode ); + chmod ( destName.ascii(), srcFileStatus.st_mode ); } #endif return true; @@ -1010,7 +1010,7 @@ void CvsIgnoreList::init( FileAccess& dir, bool bUseLocalCvsIgnore ) ".nse_depinfo #* .#* cvslog.* ,* CVS CVS.adm .del-* *.a *.olb *.o *.obj " "*.so *.Z *~ *.old *.elc *.ln *.bak *.BAK *.orig *.rej *.exe _$* *$"; - addEntriesFromString(TQString::tqfromLatin1(ignorestr)); + addEntriesFromString(TQString::fromLatin1(ignorestr)); addEntriesFromFile(TQDir::homeDirPath() + "/.cvsignore"); addEntriesFromString(TQString::fromLocal8Bit(::getenv("CVSIGNORE"))); @@ -1032,7 +1032,7 @@ void CvsIgnoreList::init( FileAccess& dir, bool bUseLocalCvsIgnore ) { if (pos>pos1) { - addEntry( TQString::tqfromLatin1( &buf[pos1], pos-pos1 ) ); + addEntry( TQString::fromLatin1( &buf[pos1], pos-pos1 ) ); } ++pos1; } |