From aa0726b20f398264f0a2abc60215be044b106f9c Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 17 May 2011 08:20:48 +0000 Subject: TQt4 port basket This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/basket@1232416 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/tools.cpp | 234 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 117 insertions(+), 117 deletions(-) (limited to 'src/tools.cpp') diff --git a/src/tools.cpp b/src/tools.cpp index 9acbda7..2d3cce7 100644 --- a/src/tools.cpp +++ b/src/tools.cpp @@ -19,24 +19,24 @@ ***************************************************************************/ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "tools.h" -QMemArray StopWatch::starts; -QMemArray StopWatch::totals; -QMemArray StopWatch::counts; +TQMemArray StopWatch::starts; +TQMemArray StopWatch::totals; +TQMemArray StopWatch::counts; void StopWatch::start(uint id) { @@ -49,46 +49,46 @@ void StopWatch::start(uint id) } starts.resize(id + 1); } - starts[id] = QTime::currentTime(); + starts[id] = TQTime::currentTime(); } void StopWatch::check(uint id) { if (id >= starts.size()) return; - double time = starts[id].msecsTo(QTime::currentTime()) / 1000.0; + double time = starts[id].msecsTo(TQTime::currentTime()) / 1000.0; totals[id] += time; counts[id]++; kdDebug() << k_funcinfo << "Timer_" << id << ": " << time << " s [" << counts[id] << " times, total: " << totals[id] << " s, average: " << totals[id] / counts[id] << " s]" << endl; } -QString Tools::textToHTML(const QString &text) +TQString Tools::textToHTML(const TQString &text) { if (text.isEmpty()) return "

"; if (/*text.isEmpty() ||*/ text == " " || text == " ") return "

"; - // convertFromPlainText() replace "\n\n" by "

": we don't want that - QString htmlString = QStyleSheet::convertFromPlainText(text, QStyleSheetItem::WhiteSpaceNormal); - return htmlString.replace("

\n", "
\n
\n").replace("\n

", "\n"); // Don't replace first and last tags + // convertFromPlainText() tqreplace "\n\n" by "

": we don't want that + TQString htmlString = TQStyleSheet::convertFromPlainText(text, TQStyleSheetItem::WhiteSpaceNormal); + return htmlString.tqreplace("

\n", "
\n
\n").tqreplace("\n

", "\n"); // Don't replace first and last tags } -QString Tools::textToHTMLWithoutP(const QString &text) +TQString Tools::textToHTMLWithoutP(const TQString &text) { // textToHTML(text) return "

HTMLizedText

". We remove the strating "

" and ending

" - QString HTMLizedText = textToHTML(text); + TQString HTMLizedText = textToHTML(text); return HTMLizedText.mid(3, HTMLizedText.length() - 3 - 4); } -QString Tools::htmlToParagraph(const QString &html) +TQString Tools::htmlToParagraph(const TQString &html) { - QString result = html; + TQString result = html; bool startedBySpan = false; // Remove the start tag, all the and the start // Because can contain style="..." parameter, we transform it to - int pos = result.find("\n", each tag can be separated by space characters (%s) // "

" can be omitted (eg. if the HTML doesn't contain paragraph but tables), as well as "" (optinal) - pos = result.find(QRegExp("(?:(?:

[\\s\\n\\r\\t]*)*[\\s\\n\\r\\t]*)*", false)); // Case unsensitive + pos = result.tqfind(TQRegExp("(?:(?:

[\\s\\n\\r\\t]*)*[\\s\\n\\r\\t]*)*", false)); // Case unsensitive if (pos != -1) result = result.left(pos); if (startedBySpan) result += ""; - return result.replace("

", "

").replace("

", ""); + return result.tqreplace("

", "

").tqreplace("

", ""); } // The following is adapted from KStringHanlder::tagURLs // The adaptation lies in the change to urlEx // Thanks to Richard Heck -QString Tools::tagURLs(const QString &text) +TQString Tools::tagURLs(const TQString &text) { - QRegExp urlEx("(www\\.(?!\\.)|([a-zA-z]+)://)[\\d\\w\\./,:_~\\?=&;#@\\-\\+\\%\\$]+[\\d\\w/]"); + TQRegExp urlEx("(www\\.(?!\\.)|([a-zA-z]+)://)[\\d\\w\\./,:_~\\?=&;#@\\-\\+\\%\\$]+[\\d\\w/]"); - QString richText(text); + TQString richText(text); int urlPos = 0; int urlLen; while ((urlPos = urlEx.search(richText, urlPos)) >= 0) { urlLen = urlEx.matchedLength(); - QString href = richText.mid(urlPos, urlLen); - // Qt doesn't support (?<=pattern) so we do it here + TQString href = richText.mid(urlPos, urlLen); + // TQt doesn't support (?<=pattern) so we do it here if ((urlPos > 0) && richText[urlPos-1].isLetterOrNumber()) { urlPos++; continue; } - QString anchor = "" + href + ""; - richText.replace(urlPos, urlLen, anchor); + TQString anchor = "" + href + ""; + richText.tqreplace(urlPos, urlLen, anchor); urlPos += anchor.length(); } return richText; } -QString Tools::htmlToText(const QString &html) +TQString Tools::htmlToText(const TQString &html) { - QString text = htmlToParagraph(html); + TQString text = htmlToParagraph(html); text.remove("\n"); - text.replace("", "\n"); - text.replace("", "\n"); - text.replace("", "\n"); - text.replace("", "\n"); - text.replace("", "\n"); - text.replace("", "\n"); - text.replace("", "\n"); - text.replace("", "\n"); - text.replace("", "\n"); - text.replace("

", " "); - text.replace("","\n"); - text.replace("","\n"); - text.replace("","\n"); - text.replace("", "\n"); - text.replace("", " "); - text.replace("", " "); - text.replace("
", "\n"); - text.replace("
","\n"); + text.tqreplace("", "\n"); + text.tqreplace("", "\n"); + text.tqreplace("", "\n"); + text.tqreplace("", "\n"); + text.tqreplace("", "\n"); + text.tqreplace("", "\n"); + text.tqreplace("", "\n"); + text.tqreplace("", "\n"); + text.tqreplace("

", "\n"); + text.tqreplace("

", " "); + text.tqreplace("","\n"); + text.tqreplace("","\n"); + text.tqreplace("","\n"); + text.tqreplace("", "\n"); + text.tqreplace("", " "); + text.tqreplace("", " "); + text.tqreplace("
", "\n"); + text.tqreplace("
","\n"); // FIXME: Format tags better, if possible // TODO: Replace é and co. by theire equivalent! // To manage tags: int pos = 0; int pos2; - QString tag, tag3; + TQString tag, tag3; // To manage lists: int deep = 0; // The deep of the current line in imbriqued lists - QValueStack ul; // true if current list is a

lines; // The line number if it is an

ul; // true if current list is a

lines; // The line number if it is an

-void Tools::deleteRecursively(const QString &folderOrFile) +void Tools::deleteRecursively(const TQString &folderOrFile) { if (folderOrFile.isEmpty()) return; - QFileInfo fileInfo(folderOrFile); + TQFileInfo fileInfo(folderOrFile); if (fileInfo.isDir()) { // Delete the child files: - QDir dir(folderOrFile, QString::null, QDir::Name | QDir::IgnoreCase, QDir::All | QDir::Hidden); - QStringList list = dir.entryList(); - for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) + TQDir dir(folderOrFile, TQString(), TQDir::Name | TQDir::IgnoreCase, TQDir::All | TQDir::Hidden); + TQStringList list = dir.entryList(); + for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) if ( *it != "." && *it != ".." ) deleteRecursively(folderOrFile + "/" + *it); // And then delete the folder: dir.rmdir(folderOrFile); } else // Delete the file: - QFile::remove(folderOrFile); + TQFile::remove(folderOrFile); } -QString Tools::fileNameForNewFile(const QString &wantedName, const QString &destFolder) +TQString Tools::fileNameForNewFile(const TQString &wantedName, const TQString &destFolder) { - QString fileName = wantedName; - QString fullName = destFolder + fileName; - QString extension = ""; + TQString fileName = wantedName; + TQString fullName = destFolder + fileName; + TQString extension = ""; int number = 2; - QDir dir; + TQDir dir; // First check if the file do not exists yet (simplier and more often case) - dir = QDir(fullName); + dir = TQDir(fullName); if ( ! dir.exists(fullName) ) return fileName; // Find the file extension, if it exists : Split fileName in fileName and extension // Example : fileName == "note5-3.txt" => fileName = "note5-3" and extension = ".txt" - int extIndex = fileName.findRev('.'); + int extIndex = fileName.tqfindRev('.'); if (extIndex != -1 && extIndex != int(fileName.length()-1)) { // Extension found and fileName do not ends with '.' ! extension = fileName.mid(extIndex); fileName.truncate(extIndex); @@ -392,7 +392,7 @@ QString Tools::fileNameForNewFile(const QString &wantedName, const QString &dest // Find the file number, if it exists : Split fileName in fileName and number // Example : fileName == "note5-3" => fileName = "note5" and number = 3 - int extNumber = fileName.findRev('-'); + int extNumber = fileName.tqfindRev('-'); if (extNumber != -1 && extNumber != int(fileName.length()-1)) { // Number found and fileName do not ends with '-' ! bool isANumber; int theNumber = fileName.mid(extNumber + 1).toInt(&isANumber); @@ -402,11 +402,11 @@ QString Tools::fileNameForNewFile(const QString &wantedName, const QString &dest } // else : } // else fileName = fileName and number = 2 (because if the file already exists, the genereated name is at last the 2nd) - QString finalName; + TQString finalName; for (/*int number = 2*/; ; ++number) { // TODO: FIXME: If overflow ??? - finalName = fileName + "-" + QString::number(number) + extension; + finalName = fileName + "-" + TQString::number(number) + extension; fullName = destFolder + finalName; - dir = QDir(fullName); + dir = TQDir(fullName); if ( ! dir.exists(fullName) ) break; } @@ -416,28 +416,28 @@ QString Tools::fileNameForNewFile(const QString &wantedName, const QString &dest // TODO: Move it from NoteFactory -/*QString NoteFactory::iconForURL(const KURL &url) +/*TQString NoteFactory::iconForURL(const KURL &url) { - QString icon = KMimeType::iconForURL(url.url()); + TQString icon = KMimeType::iconForURL(url.url()); if ( url.protocol() == "mailto" ) icon = "message"; return icon; }*/ -bool Tools::isAFileCut(QMimeSource *source) +bool Tools::isAFileCut(TQMimeSource *source) { if (source->provides("application/x-kde-cutselection")) { - QByteArray array = source->encodedData("application/x-kde-cutselection"); - return !array.isEmpty() && QCString(array.data(), array.size() + 1).at(0) == '1'; + TQByteArray array = source->tqencodedData("application/x-kde-cutselection"); + return !array.isEmpty() && TQCString(array.data(), array.size() + 1).at(0) == '1'; } else return false; } -void Tools::printChildren(QObject* parent) +void Tools::printChildren(TQObject* tqparent) { - const QObjectList* objs = parent->children(); - QObjectListIt it(*objs); - QObject *obj; + const TQObjectList objs = tqparent->childrenListObject(); + TQObjectListIt it(objs); + TQObject *obj; while((obj = it.current())!= 0){ ++it; -- cgit v1.2.1