summaryrefslogtreecommitdiffstats
path: root/src/common/global
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:30 -0600
commitad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7 (patch)
treec47273eb6595f763c282d33fb89affe1f8866120 /src/common/global
parent9d6927a7d6a543332f828bffedf65eecf6774c6d (diff)
downloadpiklab-ad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7.tar.gz
piklab-ad1fc5fc8eadb9b63e8767e57ac41cbac84f7eb7.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 9d6927a7d6a543332f828bffedf65eecf6774c6d.
Diffstat (limited to 'src/common/global')
-rw-r--r--src/common/global/pfile.h2
-rw-r--r--src/common/global/process.cpp8
-rw-r--r--src/common/global/purl.cpp2
-rw-r--r--src/common/global/xml_data_file.cpp4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/common/global/pfile.h b/src/common/global/pfile.h
index 4337ab7..477d7c0 100644
--- a/src/common/global/pfile.h
+++ b/src/common/global/pfile.h
@@ -9,7 +9,7 @@
#ifndef PFILE_H
#define PFILE_H
-#include <textstream.h>
+#include <tqtextstream.h>
#include "purl.h"
namespace PURL
diff --git a/src/common/global/process.cpp b/src/common/global/process.cpp
index 238d336..ed63f86 100644
--- a/src/common/global/process.cpp
+++ b/src/common/global/process.cpp
@@ -146,13 +146,13 @@ bool Process::Base::isFilteredLine(const TQString &line)
//----------------------------------------------------------------------------
void Process::StringOutput::receivedStdout(KProcess*, char *data, int len)
{
- _stdout += TQString::fromLatin1(data, len);
+ _stdout += TQString::tqfromLatin1(data, len);
emit stdoutDataReceived();
}
void Process::StringOutput::receivedStderr(KProcess*, char *data, int len)
{
- _stderr += TQString::fromLatin1(data, len);
+ _stderr += TQString::tqfromLatin1(data, len);
emit stderrDataReceived();
}
@@ -164,7 +164,7 @@ void Process::LineBase::receivedStdout(KProcess*, char *data, int len)
if ( data[i]=='\n' ) {
if ( !isFilteredLine(_stdout) ) addStdoutLine(_stdout);
_stdout = TQString();
- } else _stdout += TQString::fromLatin1(data + i, 1);
+ } else _stdout += TQString::tqfromLatin1(data + i, 1);
}
if ( !_process->isRunning() && !isFilteredLine(_stdout) ) addStdoutLine(_stdout);
emit stdoutDataReceived();
@@ -177,7 +177,7 @@ void Process::LineBase::receivedStderr(KProcess*, char *data, int len)
if ( data[i]=='\n' ) {
if ( !isFilteredLine(_stderr) ) addStderrLine(_stderr);
_stderr = TQString();
- } else _stderr += TQString::fromLatin1(data + i, 1);
+ } else _stderr += TQString::tqfromLatin1(data + i, 1);
}
if ( !_process->isRunning() && !isFilteredLine(_stderr) ) addStderrLine(_stderr);
emit stderrDataReceived();
diff --git a/src/common/global/purl.cpp b/src/common/global/purl.cpp
index d0b5498..ab1f8da 100644
--- a/src/common/global/purl.cpp
+++ b/src/common/global/purl.cpp
@@ -69,7 +69,7 @@ TQString PURL::Private::getWindowsDrivePath(char drive)
}
return _winDrives[drive];
#else
- return TQString("%1:\\").arg(drive);
+ return TQString("%1:\\").tqarg(drive);
#endif
}
diff --git a/src/common/global/xml_data_file.cpp b/src/common/global/xml_data_file.cpp
index bae7f17..528f8e7 100644
--- a/src/common/global/xml_data_file.cpp
+++ b/src/common/global/xml_data_file.cpp
@@ -26,7 +26,7 @@ bool XmlDataFile::load(TQString &error)
Log::StringView sview;
PURL::File file(_url, sview);
if ( !file.openForRead() ) {
- error = i18n("Error opening file: %1").arg(sview.string());
+ error = i18n("Error opening file: %1").tqarg(sview.string());
return false;
}
if ( !_document.setContent(file.qfile(), false, &error) ) return false;
@@ -48,7 +48,7 @@ bool XmlDataFile::save(TQString &error) const
file.appendText(s);
ok = file.close();
}
- if ( !ok ) error = i18n("Error saving file: %1").arg(sview.string());
+ if ( !ok ) error = i18n("Error saving file: %1").tqarg(sview.string());
return ok;
}