From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 19 Jan 2011 01:42:14 +0000 Subject: Enable compilation with TQt for Qt4 3.4.0 TP2 This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kioslave/floppy/kio_floppy.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'kioslave/floppy') diff --git a/kioslave/floppy/kio_floppy.cpp b/kioslave/floppy/kio_floppy.cpp index a0c68a9d2..bd24aca0c 100644 --- a/kioslave/floppy/kio_floppy.cpp +++ b/kioslave/floppy/kio_floppy.cpp @@ -195,51 +195,51 @@ bool FloppyProtocol::stopAfterError(const KURL& url, const TQString& drive) TQTextIStream output(&outputString); TQString line=output.readLine(); kdDebug(7101)<<"line: -"< -1) + if (line.tqfind("resource busy") > -1) { error( KIO::ERR_SLAVE_DEFINED, i18n("Could not access drive %1.\nThe drive is still busy.\nWait until it is inactive and then try again.").arg(drive)); } - else if ((line.find("Disk full") > -1) || (line.find("No free cluster") > -1)) + else if ((line.tqfind("Disk full") > -1) || (line.tqfind("No free cluster") > -1)) { error( KIO::ERR_SLAVE_DEFINED, i18n("Could not write to file %1.\nThe disk in drive %2 is probably full.").arg(url.prettyURL(),drive)); } //file not found - else if (line.find("not found") > -1) + else if (line.tqfind("not found") > -1) { error( KIO::ERR_DOES_NOT_EXIST, url.prettyURL()); } //no disk - else if (line.find("not configured") > -1) + else if (line.tqfind("not configured") > -1) { error( KIO::ERR_SLAVE_DEFINED, i18n("Could not access %1.\nThere is probably no disk in the drive %2").arg(url.prettyURL(),drive)); } - else if (line.find("No such device") > -1) + else if (line.tqfind("No such device") > -1) { error( KIO::ERR_SLAVE_DEFINED, i18n("Could not access %1.\nThere is probably no disk in the drive %2 or you do not have enough permissions to access the drive.").arg(url.prettyURL(),drive)); } - else if (line.find("not supported") > -1) + else if (line.tqfind("not supported") > -1) { error( KIO::ERR_SLAVE_DEFINED, i18n("Could not access %1.\nThe drive %2 is not supported.").arg(url.prettyURL(),drive)); } //not supported or no such drive - else if (line.find("Permission denied") > -1) + else if (line.tqfind("Permission denied") > -1) { error( KIO::ERR_SLAVE_DEFINED, i18n("Could not access %1.\nMake sure the floppy in drive %2 is a DOS-formatted floppy disk \nand that the permissions of the device file (e.g. /dev/fd0) are set correctly (e.g. rwxrwxrwx).").arg(url.prettyURL(),drive)); } - else if (line.find("non DOS media") > -1) + else if (line.tqfind("non DOS media") > -1) { error( KIO::ERR_SLAVE_DEFINED, i18n("Could not access %1.\nThe disk in drive %2 is probably not a DOS-formatted floppy disk.").arg(url.prettyURL(),drive)); } - else if (line.find("Read-only") > -1) + else if (line.tqfind("Read-only") > -1) { error( KIO::ERR_SLAVE_DEFINED, i18n("Access denied.\nCould not write to %1.\nThe disk in drive %2 is probably write-protected.").arg(url.prettyURL(),drive)); } - else if ((outputString.find("already exists") > -1) || (outputString.find("Skipping ") > -1)) + else if ((outputString.tqfind("already exists") > -1) || (outputString.tqfind("Skipping ") > -1)) { error( KIO::ERR_FILE_ALREADY_EXIST,url.prettyURL()); //return false; } - else if (outputString.find("could not read boot sector") > -1) + else if (outputString.tqfind("could not read boot sector") > -1) { error( KIO::ERR_SLAVE_DEFINED, i18n("Could not read boot sector for %1.\nThere is probably not any disk in drive %2.").arg(url.prettyURL(),drive)); //return false; @@ -404,7 +404,7 @@ StatInfo FloppyProtocol::createStatInfo(const TQString line, bool makeStat, cons if (line.length()==41) { - int nameLength=line.find(' '); + int nameLength=line.tqfind(' '); kdDebug(7101)<<"Floppy::createStatInfo: line find: "<0) { @@ -669,7 +669,7 @@ int FloppyProtocol::freeSpace(const KURL& url) while (!output.atEnd()) { line=output.readLine(); - if (line.find("bytes free")==36) + if (line.tqfind("bytes free")==36) { TQString tmp=line.mid(24,3); tmp=tmp.stripWhiteSpace(); -- cgit v1.2.3