summaryrefslogtreecommitdiffstats
path: root/umbrello/umbrello/codeimport/nativeimportbase.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'umbrello/umbrello/codeimport/nativeimportbase.cpp')
-rw-r--r--umbrello/umbrello/codeimport/nativeimportbase.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/umbrello/umbrello/codeimport/nativeimportbase.cpp b/umbrello/umbrello/codeimport/nativeimportbase.cpp
index 925e397a..b2f7dac3 100644
--- a/umbrello/umbrello/codeimport/nativeimportbase.cpp
+++ b/umbrello/umbrello/codeimport/nativeimportbase.cpp
@@ -113,10 +113,10 @@ bool NativeImportBase::preprocess(TQString& line) {
// Check for end of multi line comment.
if (m_inComment) {
int delimiterLen = 0;
- int pos = line.tqfind(m_multiLineCommentEnd);
+ int pos = line.find(m_multiLineCommentEnd);
if (pos == -1) {
if (! m_multiLineAltCommentEnd.isEmpty())
- pos = line.tqfind(m_multiLineAltCommentEnd);
+ pos = line.find(m_multiLineAltCommentEnd);
if (pos == -1) {
m_comment += line + "\n";
return true; // done
@@ -142,20 +142,20 @@ bool NativeImportBase::preprocess(TQString& line) {
// Check for start of multi line comment.
int delimIntroLen = 0;
int delimEndLen = 0;
- int pos = line.tqfind(m_multiLineCommentIntro);
+ int pos = line.find(m_multiLineCommentIntro);
if (pos != -1) {
delimIntroLen = m_multiLineCommentIntro.length();
} else if (!m_multiLineAltCommentIntro.isEmpty()) {
- pos = line.tqfind(m_multiLineAltCommentIntro);
+ pos = line.find(m_multiLineAltCommentIntro);
if (pos != -1)
delimIntroLen = m_multiLineAltCommentIntro.length();
}
if (pos != -1) {
- int endpos = line.tqfind(m_multiLineCommentEnd);
+ int endpos = line.find(m_multiLineCommentEnd);
if (endpos != -1) {
delimEndLen = m_multiLineCommentEnd.length();
} else if (!m_multiLineAltCommentEnd.isEmpty()) {
- endpos = line.tqfind(m_multiLineAltCommentEnd);
+ endpos = line.find(m_multiLineAltCommentEnd);
if (endpos != -1)
delimEndLen = m_multiLineAltCommentEnd.length();
}
@@ -237,7 +237,7 @@ void NativeImportBase::scan(TQString line) {
if (preprocess(line))
return;
// Check for single line comment.
- int pos = line.tqfind(m_singleLineCommentIntro);
+ int pos = line.find(m_singleLineCommentIntro);
if (pos != -1) {
TQString cmnt = line.mid(pos);
m_source.append(cmnt);
@@ -245,7 +245,7 @@ void NativeImportBase::scan(TQString line) {
return;
line = line.left(pos);
}
- if (line.tqcontains(TQRegExp("^\\s*$")))
+ if (line.contains(TQRegExp("^\\s*$")))
return;
TQStringList words = split(line);
for (TQStringList::Iterator it = words.begin(); it != words.end(); ++it) {
@@ -263,12 +263,12 @@ void NativeImportBase::initVars() {
void NativeImportBase::parseFile(const TQString& filename) {
TQString nameWithoutPath = filename;
nameWithoutPath.remove(TQRegExp("^.*/"));
- if (m_parsedFiles.tqcontains(nameWithoutPath))
+ if (m_parsedFiles.contains(nameWithoutPath))
return;
m_parsedFiles.append(nameWithoutPath);
TQString fname = filename;
const TQString msgPrefix = "NativeImportBase::parseFile(" + filename + "): ";
- if (filename.tqcontains('/')) {
+ if (filename.contains('/')) {
TQString path = filename;
path.remove( TQRegExp("/[^/]+$") );
kDebug() << msgPrefix << "adding path " << path << endl;