summaryrefslogtreecommitdiffstats
path: root/quanta/project
diff options
context:
space:
mode:
Diffstat (limited to 'quanta/project')
-rw-r--r--quanta/project/eventeditordlg.cpp8
-rw-r--r--quanta/project/membereditdlg.cpp2
-rw-r--r--quanta/project/project.cpp34
-rw-r--r--quanta/project/project.h2
-rw-r--r--quanta/project/projectlist.cpp24
-rw-r--r--quanta/project/projectlist.h10
-rw-r--r--quanta/project/projectnewgeneral.cpp2
-rw-r--r--quanta/project/projectnewlocal.cpp14
-rw-r--r--quanta/project/projectnewweb.cpp6
-rw-r--r--quanta/project/projectprivate.cpp40
-rw-r--r--quanta/project/projectupload.cpp10
-rw-r--r--quanta/project/rescanprj.cpp4
-rw-r--r--quanta/project/uploadprofiles.cpp2
13 files changed, 79 insertions, 79 deletions
diff --git a/quanta/project/eventeditordlg.cpp b/quanta/project/eventeditordlg.cpp
index 4c3edd34..1bba3655 100644
--- a/quanta/project/eventeditordlg.cpp
+++ b/quanta/project/eventeditordlg.cpp
@@ -221,7 +221,7 @@ void EventEditorDlg::setArguments(const TQStringList& arguments)
if (actionType == QPEvents::ref()->fullActionName("script"))
{
TQString s = arguments[0];
- if (m_scriptActions.tqcontains(s))
+ if (m_scriptActions.contains(s))
s = m_scriptActions[s];
if (argument1Combo->contains(s))
{
@@ -249,7 +249,7 @@ void EventEditorDlg::setArguments(const TQStringList& arguments)
if (actionType == QPEvents::ref()->fullActionName("action"))
{
TQString s = arguments[0];
- if (m_otherActions.tqcontains(s))
+ if (m_otherActions.contains(s))
s = m_otherActions[s];
if (argument1Combo->contains(s))
{
@@ -363,7 +363,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name)
action = dynamic_cast<TagAction*>(m_actionCollection->action(i));
if (action && action->type() == "script")
{
- s = action->text().tqreplace(r, "");
+ s = action->text().replace(r, "");
items.append(s);
m_scriptActions[action->name()] = s;
}
@@ -392,7 +392,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name)
action = dynamic_cast<TagAction*>(a);
if (!action || action->type() != "script")
{
- s = a->text().tqreplace(r, "");
+ s = a->text().replace(r, "");
items.append(s);
m_otherActions[a->name()] = s;
}
diff --git a/quanta/project/membereditdlg.cpp b/quanta/project/membereditdlg.cpp
index 047ff302..075f40c3 100644
--- a/quanta/project/membereditdlg.cpp
+++ b/quanta/project/membereditdlg.cpp
@@ -123,7 +123,7 @@ void MemberEditDlg::slotMemberSelected()
{
TQString name = nameCombo->currentText();
TQMap<TQString, TeamMember> members = Project::ref()->allMembers();
- if (members.tqcontains(name))
+ if (members.contains(name))
{
emailEdit->setText(members[name].email);
}
diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp
index 98b21135..3cc29461 100644
--- a/quanta/project/project.cpp
+++ b/quanta/project/project.cpp
@@ -143,13 +143,13 @@ void Project::insertFile(const KURL& nameURL, bool tqrepaint )
TQDomElement el;
while ( d->baseURL.isParentOf(url) )
{
- if ( !d->m_projectFiles.tqcontains(url) )
+ if ( !d->m_projectFiles.contains(url) )
{
el = d->dom.createElement("item");
el.setAttribute("url", QuantaCommon::qUrl( QExtFileInfo::toRelative(url, d->baseURL) ));
d->dom.firstChild().firstChild().appendChild( el );
KURL u = url.upURL();
- ProjectURL *parentURL = d->m_projectFiles.tqfind(u);
+ ProjectURL *parentURL = d->m_projectFiles.find(u);
int uploadtqStatus = 1;
if (parentURL)
uploadtqStatus = parentURL->uploadtqStatus;
@@ -364,7 +364,7 @@ void Project::slotRenamed(const KURL& oldURL, const KURL& newURL)
ProjectURL * curUrl = it.current();
if ( oldURL == *curUrl || (isFolder && oldURL.isParentOf(*curUrl)) )
{
- curUrl->setPath( curUrl->path().tqreplace(oldURL.path(), newURL.path()) );
+ curUrl->setPath( curUrl->path().replace(oldURL.path(), newURL.path()) );
el = curUrl->domElement;
el.setAttribute("url", d->m_projectFiles.toRelative(*curUrl).path());
// el.setAttribute("upload_time", "");
@@ -826,7 +826,7 @@ void Project::slotOptions()
//subprojects without a leader
for (uint i = 0; i < d->m_subprojects.count(); i++)
{
- if (!savedSubprojects.tqcontains(d->m_subprojects[i].name))
+ if (!savedSubprojects.contains(d->m_subprojects[i].name))
{
el = d->dom.createElement("subproject");
el.setAttribute("name", d->m_subprojects[i].name);
@@ -921,16 +921,16 @@ KURL Project::urlWithPrefix(const KURL& url)
/*Returns true if url is already in the project.*/
-bool Project::tqcontains(const KURL& url)
+bool Project::contains(const KURL& url)
{
if (d->m_projectFiles.isEmpty())
d->m_projectFiles.readFromXML(d->dom, d->baseURL, d->templateURL, d->excludeRx);
- return d->m_projectFiles.tqcontains(url);
+ return d->m_projectFiles.contains(url);
}
void Project::slotFileDescChanged(const KURL& url, const TQString& desc)
{
- ProjectURL *proUrl = d->m_projectFiles.tqfind(url);
+ ProjectURL *proUrl = d->m_projectFiles.find(url);
if (! proUrl)
return;
@@ -942,7 +942,7 @@ void Project::slotFileDescChanged(const KURL& url, const TQString& desc)
void Project::slotUploadStatusChanged(const KURL& url, int status)
{
- if (! d->m_projectFiles.tqcontains(url))
+ if (! d->m_projectFiles.contains(url))
return;
TQDomElement el;
@@ -962,7 +962,7 @@ void Project::slotUploadStatusChanged(const KURL& url, int status)
void Project::slotChangeDocumentFoldertqStatus(const KURL &url, bool status)
{
- ProjectURL *proUrl = d->m_projectFiles.tqfind(url);
+ ProjectURL *proUrl = d->m_projectFiles.find(url);
if (! proUrl)
return;
@@ -1013,7 +1013,7 @@ void Project::savePassword(const TQString &entry, const TQString &passwd, bool s
TQString Project::password(const TQString &entry)
{
- if (d->m_passwdList.tqcontains(entry))
+ if (d->m_passwdList.contains(entry))
return d->m_passwdList[entry];
else
{
@@ -1187,7 +1187,7 @@ TeamMember Project::teamLeader()
TeamMember Project::subprojectLeader(const TQString &name)
{
- if (d->m_subprojectLeaders.tqcontains(name))
+ if (d->m_subprojectLeaders.contains(name))
return d->m_subprojectLeaders[name];
else
return TeamMember();
@@ -1195,7 +1195,7 @@ TeamMember Project::subprojectLeader(const TQString &name)
TeamMember Project::taskLeader(const TQString &name)
{
- if (d->m_taskLeaders.tqcontains(name))
+ if (d->m_taskLeaders.contains(name))
return d->m_taskLeaders[name];
else
return TeamMember();
@@ -1313,7 +1313,7 @@ void Project::slotShowProjectToolbar(bool show)
void Project::loadBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf)
{
- if (!markIf || !hasProject() || !tqcontains(url) || !d->m_persistentBookmarks)
+ if (!markIf || !hasProject() || !contains(url) || !d->m_persistentBookmarks)
return;
TQDomNodeList nl = d->dom.elementsByTagName("item");
TQDomElement el;
@@ -1337,7 +1337,7 @@ void Project::loadBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf)
void Project::saveBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf)
{
- if (!markIf || !hasProject() || !tqcontains(url) || !d->m_persistentBookmarks)
+ if (!markIf || !hasProject() || !contains(url) || !d->m_persistentBookmarks)
return;
TQStringList markList;
TQPtrList<KTextEditor::Mark> marks = markIf->marks();
@@ -1363,7 +1363,7 @@ void Project::saveBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf)
void Project::loadCursorPosition(const KURL &url, KTextEditor::ViewCursorInterface *viewCursorIf)
{
- if (!viewCursorIf || !hasProject() || !tqcontains(url))
+ if (!viewCursorIf || !hasProject() || !contains(url))
return;
TQDomNodeList nl = d->m_sessionDom.elementsByTagName("item");
TQDomElement el;
@@ -1387,7 +1387,7 @@ void Project::loadCursorPosition(const KURL &url, KTextEditor::ViewCursorInterfa
}
KURL u2 = d->baseURL;
QuantaCommon::setUrl(u2, el.attribute("url"));
- if (!tqcontains(u2))
+ if (!contains(u2))
{
el.parentNode().removeChild(el);
}
@@ -1396,7 +1396,7 @@ void Project::loadCursorPosition(const KURL &url, KTextEditor::ViewCursorInterfa
void Project::saveCursorPosition(const KURL &url, KTextEditor::ViewCursorInterface *viewCursorIf)
{
- if (!viewCursorIf || !hasProject() || !tqcontains(url))
+ if (!viewCursorIf || !hasProject() || !contains(url))
return;
TQDomNodeList nl = d->m_sessionDom.elementsByTagName("item");
TQDomElement el;
diff --git a/quanta/project/project.h b/quanta/project/project.h
index 6315c058..62b71889 100644
--- a/quanta/project/project.h
+++ b/quanta/project/project.h
@@ -87,7 +87,7 @@ public:
void loadLastProject(bool reload);
/** Returns the relative url with the prefix inserted. */
KURL urlWithPrefix(const KURL& url);
- bool tqcontains(const KURL &url);
+ bool contains(const KURL &url);
/** Read property of TQString defaultDTD. */
const TQString& defaultDTD();
const TQString& defaultEncoding();
diff --git a/quanta/project/projectlist.cpp b/quanta/project/projectlist.cpp
index 26c3da8a..01416c41 100644
--- a/quanta/project/projectlist.cpp
+++ b/quanta/project/projectlist.cpp
@@ -72,7 +72,7 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL,
url = QExtFileInfo::toAbsolute(url, baseURL);
if ( el.nodeName() == "item" )
{
- if (excludeRx.exactMatch(path) || tqfind(url.url(-1)))
+ if (excludeRx.exactMatch(path) || find(url.url(-1)))
{
el.parentNode().removeChild(el);
modified = true;
@@ -106,7 +106,7 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL,
}
progressBar->advance(1);
}
- ProjectURL *proUrl = tqfind(baseURL);
+ ProjectURL *proUrl = find(baseURL);
if (!proUrl)
{
el = dom.createElement("item");
@@ -126,7 +126,7 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL,
bool ProjectList::removeFromListAndXML(const KURL &url)
{
- ProjectURL *p = tqfind(url);
+ ProjectURL *p = find(url);
if (p) {
TQDomElement el = p->domElement;
el.parentNode().removeChild(el);
@@ -137,15 +137,15 @@ bool ProjectList::removeFromListAndXML(const KURL &url)
}
-bool ProjectList::tqcontains(const KURL &url) const
+bool ProjectList::contains(const KURL &url) const
{
- return ProjectUrlList::tqfind(url.url(-1));
+ return ProjectUrlList::find(url.url(-1));
}
-ProjectURL * ProjectList::tqfind(const KURL &url) const
+ProjectURL * ProjectList::find(const KURL &url) const
{
- return ProjectUrlList::tqfind(url.url(-1));
+ return ProjectUrlList::find(url.url(-1));
}
@@ -157,7 +157,7 @@ void ProjectList::insert(ProjectURL *url)
bool ProjectList::isFolder(const KURL &url) const
{
- ProjectURL *p = tqfind(url);
+ ProjectURL *p = find(url);
return ( p && url.url(-1) != (*p).url() );
}
@@ -168,9 +168,9 @@ void ProjectList::insert(const TQString & key, const ProjectURL * item)
}
-ProjectURL * ProjectList::tqfind ( const TQString & key ) const
+ProjectURL * ProjectList::find ( const TQString & key ) const
{
- return ProjectUrlList::tqfind(key);
+ return ProjectUrlList::find(key);
}
@@ -180,8 +180,8 @@ bool ProjectList::remove ( const TQString & key )
}
-void ProjectList::tqreplace(const TQString & key, const ProjectURL * item)
+void ProjectList::replace(const TQString & key, const ProjectURL * item)
{
- ProjectUrlList::tqreplace(key, item);
+ ProjectUrlList::replace(key, item);
}
diff --git a/quanta/project/projectlist.h b/quanta/project/projectlist.h
index 361c119c..7106e142 100644
--- a/quanta/project/projectlist.h
+++ b/quanta/project/projectlist.h
@@ -68,11 +68,11 @@ public:
/** @return true if url is in container
*/
- bool tqcontains(const KURL &url) const;
+ bool contains(const KURL &url) const;
/** @return pointer to the entry or 0 if not found
*/
- ProjectURL * tqfind(const KURL &url) const;
+ ProjectURL * find(const KURL &url) const;
/**
Attention: never delete the object you have given here because the
@@ -97,9 +97,9 @@ private:
/**
private because I want to control the key.
- use tqfind(const KURL &url) instead.
+ use find(const KURL &url) instead.
*/
- ProjectURL *tqfind ( const TQString & key ) const;
+ ProjectURL *find ( const TQString & key ) const;
/**
private because I want to control the key.
@@ -109,7 +109,7 @@ private:
/**
private because I want to control the key.
*/
- void tqreplace(const TQString & key, const ProjectURL * item);
+ void replace(const TQString & key, const ProjectURL * item);
};
#endif // PROJECTFILES_H
diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp
index 81c53728..565785d6 100644
--- a/quanta/project/projectnewgeneral.cpp
+++ b/quanta/project/projectnewgeneral.cpp
@@ -149,7 +149,7 @@ void ProjectNewGeneral::slotChangeNames( const TQString &text )
{
int i;
TQString fname = text.lower();
- while( (i=fname.tqfind(" ")) >=0 ) fname.remove(i,1);
+ while( (i=fname.find(" ")) >=0 ) fname.remove(i,1);
linePrjFile->setText( fname+".webprj" );
}
diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp
index 5a47a3db..9c81cb51 100644
--- a/quanta/project/projectnewlocal.cpp
+++ b/quanta/project/projectnewlocal.cpp
@@ -126,9 +126,9 @@ KURL::List ProjectNewLocal::projectFiles()
for ( it = list.begin(); it != list.end(); ++it )
{
name = (*it)->name();
- if (qConfig.markupMimeTypes.tqcontains(name) ||
- qConfig.scriptMimeTypes.tqcontains(name) ||
- qConfig.imageMimeTypes.tqcontains(name))
+ if (qConfig.markupMimeTypes.contains(name) ||
+ qConfig.scriptMimeTypes.contains(name) ||
+ qConfig.imageMimeTypes.contains(name))
{
TQStringList patterns = (*it)->patterns();
for (uint i = 0 ; i < patterns.count(); i++)
@@ -156,7 +156,7 @@ void ProjectNewLocal::slotSetFiles(bool)
progressBar->setTextEnabled(true);
for (uint i = 0; i < files.count(); i++)
{
- if ( !fileList.tqcontains(files[i]))
+ if ( !fileList.contains(files[i]))
{
fileList.append(files[i]);
TQListViewItem *it = listView->addItem(files[i], KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL()));
@@ -219,7 +219,7 @@ void ProjectNewLocal::slotAddFiles()
for (uint i = 0; i < list.count(); i++)
{
list[i] = QExtFileInfo::toRelative(list[i], baseURL, false);
- if (!fileList.tqcontains(list[i]))
+ if (!fileList.contains(list[i]))
{
fileList.append(list[i]);
TQListViewItem *it = listView->addItem(list[i], KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL()));
@@ -300,7 +300,7 @@ void ProjectNewLocal::slotInsertFolderAfterCopying(const KURL::List& a_urlList)
for (uint i = 0; i < files.count(); i++)
{
u = files[i];
- if ( !fileList.tqcontains(u) && u.path() != "." && u.path() != ".." )
+ if ( !fileList.contains(u) && u.path() != "." && u.path() != ".." )
{
fileList.append(u);
listView->addItem(u, KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL()));
@@ -329,7 +329,7 @@ void ProjectNewLocal::slotInsertFilesAfterCopying(const KURL::List& a_urlList)
for (it = a_urlList.begin(); it != a_urlList.end(); ++it)
{
u = QExtFileInfo::toRelative(*it, baseURL, false);
- if ( !fileList.tqcontains(u))
+ if ( !fileList.contains(u))
{
fileList.append(u);
TQListViewItem *it = listView->addItem(u, KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL()));
diff --git a/quanta/project/projectnewweb.cpp b/quanta/project/projectnewweb.cpp
index ef4ee2b7..f4d4d765 100644
--- a/quanta/project/projectnewweb.cpp
+++ b/quanta/project/projectnewweb.cpp
@@ -178,7 +178,7 @@ void ProjectNewWeb::slotGetWgetOutput(KProcess *, char *buffer, int buflen)
int pos;
TQString basePath = baseURL.path(1);
- while ( (pos = output.tqfind("saved")) != -1 )
+ while ( (pos = output.find("saved")) != -1 )
{
if (KLed1->state() == KLed::Off)
{
@@ -189,13 +189,13 @@ void ProjectNewWeb::slotGetWgetOutput(KProcess *, char *buffer, int buflen)
KLed2->setState(KLed::On);
KLed1->setState(KLed::Off);
}
- int begName = output.tqfindRev('`',pos);
+ int begName = output.findRev('`',pos);
if ( begName == -1 ) {
output = output.remove(0,pos+1);
continue;
}
- int endName = output.tqfind('\'',begName);
+ int endName = output.find('\'',begName);
if ( endName == -1 || endName > pos ) {
output = output.remove(0,pos+1);
continue;
diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp
index a481b309..aee0dbec 100644
--- a/quanta/project/projectprivate.cpp
+++ b/quanta/project/projectprivate.cpp
@@ -183,7 +183,7 @@ void ProjectPrivate::adjustViewActions()
TQString oldItem = openPrjViewAction->currentText();
openPrjViewAction->clear();
openPrjViewAction->setItems(viewList);
- int i = viewList.tqfindIndex(oldItem);
+ int i = viewList.findIndex(oldItem);
if (i > -1)
openPrjViewAction->setCurrentItem(i);
deletePrjViewAction->clear();
@@ -274,14 +274,14 @@ void ProjectPrivate::openCurrentView()
KURL::List::Iterator it;
for ( it = openURLs.begin(); it != openURLs.end(); ++it )
{
- if (urlsInView.tqfindIndex( *it ) == -1)
+ if (urlsInView.findIndex( *it ) == -1)
tqparent->closeFile (*it);
}
break;
}
}
TQStringList viewList = projectViewList();
- int i = viewList.tqfindIndex(currentProjectView);
+ int i = viewList.findIndex(currentProjectView);
if (i > -1)
openPrjViewAction->setCurrentItem(i);
adjustViewActions();
@@ -307,7 +307,7 @@ void ProjectPrivate::insertFiles( KURL::List files )
KURL::List::Iterator it;
for ( it = files.begin(); it != files.end(); ++it )
{
- if (m_projectFiles.tqcontains(*it))
+ if (m_projectFiles.contains(*it))
{
it = files.erase(it);
--it;
@@ -322,7 +322,7 @@ void ProjectPrivate::insertFiles( KURL::List files )
url.setPath(url.directory(false));
while ( baseURL.isParentOf(url) )
{
- if (!m_projectFiles.tqcontains(url))
+ if (!m_projectFiles.contains(url))
{
el = dom.createElement("item");
el.setAttribute("url", QuantaCommon::qUrl(QExtFileInfo::toRelative(url, baseURL, false)));
@@ -524,9 +524,9 @@ void ProjectPrivate::loadProjectXML()
} else
if (!excludeStr.endsWith("*"))
str = excludeStr + "/*|"+ excludeStr + "$";
- str.tqreplace(".","\\.");
- str.tqreplace("*",".*");
- str.tqreplace("?",".");
+ str.replace(".","\\.");
+ str.replace("*",".*");
+ str.replace("?",".");
regExpStr.append(str);
if (i+1 < excludeList.count())
regExpStr.append("|");
@@ -564,9 +564,9 @@ void ProjectPrivate::loadProjectXML()
line = line + "/*|"+ line + "$";
if (!line.startsWith("*"))
line.prepend("^");
- line.tqreplace(".","\\.");
- line.tqreplace("*",".*");
- line.tqreplace("?",".");
+ line.replace(".","\\.");
+ line.replace("*",".*");
+ line.replace("?",".");
rxStr += line + "|";
}
regExpStr.prepend(rxStr);
@@ -595,7 +595,7 @@ void ProjectPrivate::loadProjectXML()
if (s != "--not set--" && !s.isEmpty())
ev.arguments << s;
}
- if (m_events->tqcontains(el.attribute("name")))
+ if (m_events->contains(el.attribute("name")))
{
(*m_events)[el.attribute("name")].append(ev);
} else
@@ -936,7 +936,7 @@ void ProjectPrivate::slotSaveAsProjectView(bool askForName)
for ( it = openURLs.begin(); it != openURLs.end(); ++it )
{
KURL url = (*it);
- if (m_projectFiles.tqcontains(url))
+ if (m_projectFiles.contains(url))
{
item = dom.createElement("viewitem");
item.setAttribute("url", QuantaCommon::qUrl(QExtFileInfo::toRelative(url, baseURL)) );
@@ -994,7 +994,7 @@ bool ProjectPrivate::createEmptyDom()
KURL sessionURL = projectURL;
TQString fileName = projectURL.fileName();
if (fileName.endsWith(".webprj"))
- fileName.tqreplace(".webprj", ".session");
+ fileName.replace(".webprj", ".session");
else
fileName += ".session";
sessionURL.setFileName(fileName);
@@ -1170,7 +1170,7 @@ void ProjectPrivate::slotNewProject()
TQStringList lst = DTDs::ref()->nickNameList(true);
pnf->dtdCombo->insertStringList(lst);
TQString defaultDTDName = DTDs::ref()->getDTDNickNameFromName(qConfig.defaultDocType.lower());
- int pos = lst.tqfindIndex(defaultDTDName);
+ int pos = lst.findIndex(defaultDTDName);
if (pos >= 0)
pnf->dtdCombo->setCurrentItem(pos);
@@ -1374,7 +1374,7 @@ bool ProjectPrivate::loadProject(const KURL &url)
KURL sessionURL = url;
TQString fileName = url.fileName();
if (fileName.endsWith(".webprj"))
- fileName.tqreplace(".webprj", ".session");
+ fileName.replace(".webprj", ".session");
else
fileName += ".session";
sessionURL.setFileName(fileName);
@@ -1556,7 +1556,7 @@ void ProjectPrivate::writeConfig()
if (!projectURL.isEmpty())
{
TQStringList projectList = QuantaCommon::readPathListEntry(config, "OpenProjects");
- if (projectList.tqcontains( projectURL.url() ) == 0)
+ if (projectList.contains( projectURL.url() ) == 0)
{
projectList.append( projectURL.url() );
config->writePathEntry("OpenProjects", projectList);
@@ -1581,7 +1581,7 @@ void ProjectPrivate::removeFromConfig(const TQString & urlStr)
config->reparseConfiguration();
config->setGroup("Projects");
TQStringList projectList = QuantaCommon::readPathListEntry(config, "OpenProjects");
- int i = projectList.tqfindIndex( urlStr );
+ int i = projectList.findIndex( urlStr );
if ( i > -1)
{
projectList.remove(projectList.at(i));
@@ -1606,7 +1606,7 @@ bool ProjectPrivate::projectAlreadyOpen(const TQString & urlStr)
config->reparseConfiguration();
config->setGroup("Projects");
TQStringList projectList = QuantaCommon::readPathListEntry(config, "OpenProjects");
- return (projectList.tqcontains(urlStr) != 0);
+ return (projectList.contains(urlStr) != 0);
}
@@ -1618,7 +1618,7 @@ bool ProjectPrivate::uploadProjectFile()
KURL sessionURL = projectURL;
TQString fileName = projectURL.fileName();
if (fileName.endsWith(".webprj"))
- fileName.tqreplace(".webprj", ".session");
+ fileName.replace(".webprj", ".session");
else
fileName += ".session";
sessionURL.setFileName(fileName);
diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp
index 74f59ddf..dbd21dbf 100644
--- a/quanta/project/projectupload.cpp
+++ b/quanta/project/projectupload.cpp
@@ -199,7 +199,7 @@ void ProjectUpload::slotBuildTree()
absUrl.setPath(m_project->projectBaseURL().path(1)+u.path(-1));
/* if (!QExtFileInfo::exists(absUrl))
continue; */
- KFileItem *p_item = projectDirFiles.tqfind(absUrl.url());
+ KFileItem *p_item = projectDirFiles.find(absUrl.url());
if (!p_item)
continue;
KFileItem item(*p_item);
@@ -207,7 +207,7 @@ void ProjectUpload::slotBuildTree()
if ( it != 0 )
{
int uploadedTime = -1;
- if (m_uploadTimeList.tqcontains(s))
+ if (m_uploadTimeList.contains(s))
uploadedTime = m_uploadTimeList[s];
int modifiedTime = item.time(KIO::UDS_MODIFICATION_TIME);
el.setAttribute("modified_time", modifiedTime);
@@ -338,7 +338,7 @@ void ProjectUpload::startUpload()
for ( uint i = 0; i < nl.count(); i++ )
{
el = nl.item(i).toElement();
- if ( selectedList.tqcontains(el.attribute("url")))
+ if ( selectedList.contains(el.attribute("url")))
{
m_uploadTimeList[el.attribute("url")] = el.attribute("modified_time").toInt();
}
@@ -362,7 +362,7 @@ void ProjectUpload::startUpload()
if (!ok) return;
for (it = needsConfirmation.begin(); it != needsConfirmation.end(); ++it)
{
- if (!confirmedList.tqcontains(((UploadTreeFile*)(*it))->url().prettyURL(0, KURL::StripFileProtocol)))
+ if (!confirmedList.contains(((UploadTreeFile*)(*it))->url().prettyURL(0, KURL::StripFileProtocol)))
toUpload.remove(*it);
}
@@ -437,7 +437,7 @@ void ProjectUpload::upload()
dir = to.upURL() ;
}
- if ( !madeDirs.tqcontains(dir) )
+ if ( !madeDirs.contains(dir) )
{
madeDirs.append( dir );
if (!QExtFileInfo::createDir(dir, this))
diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp
index 1c97da09..2b4cc8e4 100644
--- a/quanta/project/rescanprj.cpp
+++ b/quanta/project/rescanprj.cpp
@@ -123,7 +123,7 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list)
found = true;
break;
}
- if (!prjFileList.tqcontains(u) && !found)
+ if (!prjFileList.contains(u) && !found)
{
linkItems.append(new KFileItem(item));
} else
@@ -137,7 +137,7 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list)
itemURL = item.url();
if (item.isDir())
itemURL.adjustPath(+1);
- ProjectURL *proUrl = prjFileList.tqfind(itemURL);
+ ProjectURL *proUrl = prjFileList.find(itemURL);
if (!proUrl)
{
urlEntry.url = prjFileList.toRelative(itemURL);
diff --git a/quanta/project/uploadprofiles.cpp b/quanta/project/uploadprofiles.cpp
index 13df5eda..cb54c27f 100644
--- a/quanta/project/uploadprofiles.cpp
+++ b/quanta/project/uploadprofiles.cpp
@@ -55,7 +55,7 @@ void UploadProfiles::readFromXML(const TQDomDocument &dom)
bool UploadProfiles::removeFromMapAndXML(const TQString &name)
{
- UploadProfiles::Iterator it = tqfind(name);
+ UploadProfiles::Iterator it = find(name);
if ( it == end() )
return false;
// ok now remove