From 0a80cfd57d271dd44221467efb426675fa470356 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 28 Jun 2011 18:31:12 +0000 Subject: TQt4 port kvirc This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238719 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/kvilib/file/kvi_fileutils.cpp | 204 +++++++++++++++++++------------------- 1 file changed, 102 insertions(+), 102 deletions(-) (limited to 'src/kvilib/file/kvi_fileutils.cpp') diff --git a/src/kvilib/file/kvi_fileutils.cpp b/src/kvilib/file/kvi_fileutils.cpp index 648d9125..1ad09d60 100644 --- a/src/kvilib/file/kvi_fileutils.cpp +++ b/src/kvilib/file/kvi_fileutils.cpp @@ -31,18 +31,18 @@ #include "kvi_file.h" #include "kvi_malloc.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace KviFileUtils { /* WORKING CODE BUT UNUSED FOR NOW - bool readLine(QFile * f,QString &szBuffer,bool bClearBuffer) + bool readLine(TQFile * f,TQString &szBuffer,bool bClearBuffer) { // FIXME: Should this assume UTF8 encoding ? char tmp_buf[256]; @@ -60,7 +60,7 @@ namespace KviFileUtils if(tmp_buf[255] == '\r')cur_len--; //Ignore CR... int lastlen = szBuffer.length(); szBuffer.setLength(lastlen + cur_len); - QChar *p1 = szBuffer.unicode() + lastlen; + TQChar *p1 = szBuffer.tqunicode() + lastlen; char * p2 = tmp_buf; for(int i=0;i 2) && (szPath.at(0) != QChar('/'))) + if((szPath.length() > 2) && (szPath.at(0) != TQChar('/'))) { - if((szPath.at(1) == QChar(':')) && (szPath.at(2) == QChar('/'))) + if((szPath.at(1) == TQChar(':')) && (szPath.at(2) == TQChar('/'))) { szPath.remove(0,2); } } #ifdef COMPILE_USE_QT4 - szPath=QDir::cleanPath(szPath); + szPath=TQDir::cleanPath(szPath); #else - szPath=QDir::cleanDirPath(szPath); + szPath=TQDir::cleanDirPath(szPath); #endif #endif } - bool directoryExists(const QString &szPath) + bool directoryExists(const TQString &szPath) { - QFileInfo f(szPath); + TQFileInfo f(szPath); return (f.exists() && f.isDir()); } bool directoryExists(const char* path) { - QString szPath=QString::fromUtf8(path); - QFileInfo f(szPath); + TQString szPath=TQString::fromUtf8(path); + TQFileInfo f(szPath); return (f.exists() && f.isDir()); } - bool fileExists(const QString &szPath) + bool fileExists(const TQString &szPath) { - QFileInfo f(szPath); + TQFileInfo f(szPath); return (f.exists() && f.isFile()); } bool fileExists(const char* path) { - QString szPath=QString::fromUtf8(path); + TQString szPath=TQString::fromUtf8(path); return fileExists(szPath); } - bool removeFile(const QString &szPath) + bool removeFile(const TQString &szPath) { - QDir d; + TQDir d; return d.remove(szPath); } bool removeFile(const char* path) { - QString szPath=QString::fromUtf8(path); + TQString szPath=TQString::fromUtf8(path); return removeFile(szPath); } - bool removeDir(const QString &szPath) + bool removeDir(const TQString &szPath) { - QDir d; + TQDir d; return d.rmdir(szPath); } bool removeDir(const char* path) { - QString szPath=QString::fromUtf8(path); + TQString szPath=TQString::fromUtf8(path); return removeDir(szPath); } - bool deleteDir(const QString &szPath) + bool deleteDir(const TQString &szPath) { - QDir d(szPath); - QStringList sl = d.entryList(QDir::Dirs); - QStringList::Iterator it; + TQDir d(szPath); + TQStringList sl = d.entryList(TQDir::Dirs); + TQStringList::Iterator it; for(it=sl.begin();it != sl.end();it++) { - QString szSubdir = *it; - if(!(KviQString::equalCS(szSubdir,"..") || KviQString::equalCS(szSubdir,"."))) + TQString szSubdir = *it; + if(!(KviTQString::equalCS(szSubdir,"..") || KviTQString::equalCS(szSubdir,"."))) { - QString szSubPath = szPath; - KviQString::ensureLastCharIs(szSubPath,QChar(KVI_PATH_SEPARATOR_CHAR)); + TQString szSubPath = szPath; + KviTQString::ensureLastCharIs(szSubPath,TQChar(KVI_PATH_SEPARATOR_CHAR)); szSubPath += szSubdir; if(!KviFileUtils::deleteDir(szSubPath)) return false; } } - sl = d.entryList(QDir::Files); + sl = d.entryList(TQDir::Files); for(it=sl.begin();it != sl.end();it++) { - QString szFilePath = szPath; - KviQString::ensureLastCharIs(szFilePath,QChar(KVI_PATH_SEPARATOR_CHAR)); + TQString szFilePath = szPath; + KviTQString::ensureLastCharIs(szFilePath,TQChar(KVI_PATH_SEPARATOR_CHAR)); szFilePath += *it; if(!KviFileUtils::removeFile(szFilePath)) return false; @@ -324,39 +324,39 @@ namespace KviFileUtils return KviFileUtils::removeDir(szPath); } - bool writeFile(const QString &szPath,const QString &szData,bool bAppend) + bool writeFile(const TQString &szPath,const TQString &szData,bool bAppend) { KviFile f(szPath); if(!f.openForWriting(bAppend))return false; - KviQCString szTmp = KviQString::toUtf8(szData); + KviTQCString szTmp = KviTQString::toUtf8(szData); if(!szTmp.data())return true; if(f.writeBlock(szTmp.data(),szTmp.length()) != ((int)(szTmp.length())))return false; return true; } - bool writeFile(const char* path,const QString &szData,bool bAppend) + bool writeFile(const char* path,const TQString &szData,bool bAppend) { - QString szPath=QString::fromUtf8(path); + TQString szPath=TQString::fromUtf8(path); return writeFile(szPath,szData,bAppend); } - bool writeFileLocal8Bit(const QString &szPath,const QString &szData,bool bAppend) + bool writeFileLocal8Bit(const TQString &szPath,const TQString &szData,bool bAppend) { KviFile f(szPath); if(!f.openForWriting(bAppend))return false; - KviQCString szTmp = QTextCodec::codecForLocale()->fromUnicode(szData); + KviTQCString szTmp = TQTextCodec::codecForLocale()->fromUnicode(szData); if(!szTmp.data())return true; if(f.writeBlock(szTmp.data(),szTmp.length()) != ((int)(szTmp.length())))return false; return true; } - bool writeFileLocal8Bit(const char* path,const QString &szData,bool bAppend) + bool writeFileLocal8Bit(const char* path,const TQString &szData,bool bAppend) { - QString szPath=QString::fromUtf8(path); + TQString szPath=TQString::fromUtf8(path); return writeFileLocal8Bit(szPath,szData,bAppend); } - bool readFile(const QString &szPath,QString &szBuffer,unsigned int uMaxSize) + bool readFile(const TQString &szPath,TQString &szBuffer,unsigned int uMaxSize) { KviFile f(szPath); if(!f.openForReading())return false; @@ -375,40 +375,40 @@ namespace KviFileUtils return false; } buf[f.size()] = '\0'; - szBuffer = QString::fromUtf8(buf); + szBuffer = TQString::fromUtf8(buf); delete[] buf; return true; } - bool readFile(const char* path,QString &szBuffer,unsigned int uMaxSize) + bool readFile(const char* path,TQString &szBuffer,unsigned int uMaxSize) { - QString szPath=QString::fromUtf8(path); + TQString szPath=TQString::fromUtf8(path); return readFile(szPath,szBuffer,uMaxSize); } - QString extractFileName(const QString &szFileNameWithPath) + TQString extractFileName(const TQString &szFileNameWithPath) { - return QFileInfo(szFileNameWithPath).fileName(); + return TQFileInfo(szFileNameWithPath).fileName(); } - QString extractFilePath(const QString &szFileNameWithPath) + TQString extractFilePath(const TQString &szFileNameWithPath) { - return QFileInfo(szFileNameWithPath).dirPath(true); + return TQFileInfo(szFileNameWithPath).dirPath(true); } - bool readLine(QFile * f,QString &szBuffer,bool bUtf8) + bool readLine(TQFile * f,TQString &szBuffer,bool bUtf8) { - QTextStream stream(f); - stream.setEncoding(bUtf8 ? QTextStream::UnicodeUTF8 : QTextStream::Locale); + TQTextStream stream(f); + stream.setEncoding(bUtf8 ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale); szBuffer=stream.readLine(); return !szBuffer.isNull(); } - bool readLines(QFile * f,QStringList &buffer,int iStartLine, int iCount, bool bUtf8) + bool readLines(TQFile * f,TQStringList &buffer,int iStartLine, int iCount, bool bUtf8) { - QTextStream stream( f ); - stream.setEncoding(bUtf8 ? QTextStream::UnicodeUTF8 : QTextStream::Locale); + TQTextStream stream( f ); + stream.setEncoding(bUtf8 ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale); for(int i=0;i