summaryrefslogtreecommitdiffstats
path: root/quanta
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-17 03:03:11 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-17 03:03:11 +0000
commita2bae01d006ea8053e85bc16d09a8cf40a4b0b75 (patch)
tree7f2b2a1d90d0d5fbcbf23e06962192923058e0ad /quanta
parent4e0c064056c23aabc053dc4a54d82ff1dceaf6a9 (diff)
downloadtdewebdev-a2bae01d006ea8053e85bc16d09a8cf40a4b0b75.tar.gz
tdewebdev-a2bae01d006ea8053e85bc16d09a8cf40a4b0b75.zip
Fix kdewebdev FTBFS under Qt3
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237074 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'quanta')
-rw-r--r--quanta/components/csseditor/tlpeditors.cpp6
-rw-r--r--quanta/components/debugger/debuggermanager.cpp2
-rw-r--r--quanta/components/debugger/pathmapper.cpp6
-rw-r--r--quanta/components/debugger/pathmapperdialog.cpp2
-rw-r--r--quanta/components/framewizard/visualframeeditor.cpp4
-rw-r--r--quanta/dialogs/copyto.cpp8
-rw-r--r--quanta/dialogs/dirtydlg.cpp2
-rw-r--r--quanta/dialogs/filecombo.cpp2
-rw-r--r--quanta/dialogs/tagdialogs/tagimgdlg.cpp4
-rw-r--r--quanta/messages/annotationoutput.cpp4
-rw-r--r--quanta/parsers/dtd/dtd.cpp2
-rw-r--r--quanta/parsers/dtd/dtdparser.cpp2
-rw-r--r--quanta/parsers/sagroupparser.cpp4
-rw-r--r--quanta/parts/kafka/htmldocumentproperties.cpp4
-rw-r--r--quanta/parts/kafka/htmlenhancer.cpp4
-rw-r--r--quanta/project/eventconfigurationdlg.cpp6
-rw-r--r--quanta/project/eventeditordlg.cpp32
-rw-r--r--quanta/project/project.cpp38
-rw-r--r--quanta/project/projectlist.cpp2
-rw-r--r--quanta/project/projectlist.h2
-rw-r--r--quanta/project/projectnewgeneral.cpp6
-rw-r--r--quanta/project/projectnewlocal.cpp18
-rw-r--r--quanta/project/projectnewweb.cpp2
-rw-r--r--quanta/project/projectprivate.cpp46
-rw-r--r--quanta/project/projectupload.cpp12
-rw-r--r--quanta/project/rescanprj.cpp4
-rw-r--r--quanta/src/document.cpp4
-rw-r--r--quanta/src/dtds.cpp2
-rw-r--r--quanta/src/kqapp.cpp26
-rw-r--r--quanta/src/kqapp.h18
-rw-r--r--quanta/src/main.cpp4
-rw-r--r--quanta/src/quanta.cpp46
-rw-r--r--quanta/src/quanta.h20
-rw-r--r--quanta/src/quanta_init.cpp18
-rw-r--r--quanta/src/quantadoc.cpp2
-rw-r--r--quanta/src/quantaview.cpp4
-rw-r--r--quanta/src/viewmanager.cpp2
-rw-r--r--quanta/treeviews/basetreeview.cpp6
-rw-r--r--quanta/treeviews/filestreeview.cpp6
-rw-r--r--quanta/treeviews/projecttreeview.cpp8
-rw-r--r--quanta/treeviews/servertreeview.cpp4
-rw-r--r--quanta/treeviews/structtreeview.cpp6
-rw-r--r--quanta/treeviews/tagattributeitems.cpp4
-rw-r--r--quanta/treeviews/templatestreeview.cpp8
-rw-r--r--quanta/utility/newstuff.cpp18
-rw-r--r--quanta/utility/newstuff.h30
-rw-r--r--quanta/utility/qpevents.cpp22
-rw-r--r--quanta/utility/qpevents.h12
-rw-r--r--quanta/utility/quantacommon.cpp6
-rw-r--r--quanta/utility/quantanetaccess.cpp4
-rw-r--r--quanta/utility/tagaction.cpp2
51 files changed, 253 insertions, 253 deletions
diff --git a/quanta/components/csseditor/tlpeditors.cpp b/quanta/components/csseditor/tlpeditors.cpp
index 6b796cf7..a674a209 100644
--- a/quanta/components/csseditor/tlpeditors.cpp
+++ b/quanta/components/csseditor/tlpeditors.cpp
@@ -92,7 +92,7 @@ void URIEditor::setMode(const mode& m) {
void URIEditor::selectedURI(const TQString & s){
KURL u;
u.setPath(s);
- emit valueChanged("url(\'" + TQExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')");
+ emit valueChanged("url(\'" + QExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')");
}
void URIEditor::selectedURIs(const TQStringList& s){
@@ -101,7 +101,7 @@ void URIEditor::selectedURIs(const TQStringList& s){
selectedFilesWithURLFormat;
for ( TQStringList::Iterator it = selectedFiles.begin(); it != selectedFiles.end(); ++it ){
u.setPath(*it);
- selectedFilesWithURLFormat.append( "url(\'" + TQExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')");
+ selectedFilesWithURLFormat.append( "url(\'" + QExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')");
}
emit valueChanged(selectedFilesWithURLFormat.join(","));
}
@@ -143,7 +143,7 @@ void URIEditor::openFileDialog(){
KURL u;
for ( TQStringList::Iterator it = selectedFiles.begin(); it != selectedFiles.end(); ++it ){
u.setPath(*it);
- m_sFiles.append( "url(\'" + TQExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')");
+ m_sFiles.append( "url(\'" + QExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')");
}
emit valueChanged(m_sFiles.join(","));*/
}
diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp
index 60fd68ef..0810cd91 100644
--- a/quanta/components/debugger/debuggermanager.cpp
+++ b/quanta/components/debugger/debuggermanager.cpp
@@ -601,7 +601,7 @@ bool DebuggerManager::setActiveLine (const TQString& file, int line )
return true;
// Find new position in editor
- if(ViewManager::ref()->isOpened(filename) || TQExtFileInfo::exists(filename, true, 0L))
+ if(ViewManager::ref()->isOpened(filename) || QExtFileInfo::exists(filename, true, 0L))
quantaApp->gotoFileAndLine(filename, line, 0);
else
{
diff --git a/quanta/components/debugger/pathmapper.cpp b/quanta/components/debugger/pathmapper.cpp
index e1d74875..41d5053e 100644
--- a/quanta/components/debugger/pathmapper.cpp
+++ b/quanta/components/debugger/pathmapper.cpp
@@ -110,21 +110,21 @@ TQString PathMapper::mapServerPathToLocal(const TQString &serverpath)
newpath = translate(serverpath, m_serverBasedir, m_localBasedir);
// Check if this dir is matched by the basedirs
- if(TQExtFileInfo::exists(newpath, true, 0L))
+ if(QExtFileInfo::exists(newpath, true, 0L))
return newpath;
// Check if any previous mappings fit...
for (unsigned int cnt = 0; cnt < m_serverlist.count(); cnt++ )
{
newpath = translate(serverpath, m_serverlist[cnt], m_locallist[cnt]);
- if(TQExtFileInfo::exists(newpath, true, 0L))
+ if(QExtFileInfo::exists(newpath, true, 0L))
return newpath;
}
// If the basedirs didnt match, check if the file exists,
// otherwise scan through the mapping history or show the
// mapping dialog
- if(!TQExtFileInfo::exists(serverpath, true, 0L))
+ if(!QExtFileInfo::exists(serverpath, true, 0L))
{
PathMapperDialog pmdlg(serverpath, PathMapperDialog::ServerToLocal);
for (unsigned int cnt = 0; cnt < m_serverlist.count(); cnt++ )
diff --git a/quanta/components/debugger/pathmapperdialog.cpp b/quanta/components/debugger/pathmapperdialog.cpp
index 8cc385d5..671bb871 100644
--- a/quanta/components/debugger/pathmapperdialog.cpp
+++ b/quanta/components/debugger/pathmapperdialog.cpp
@@ -78,7 +78,7 @@ void PathMapperDialog::slotPathsChanged()
// Indicate wether local file exists
if(m_direction == ServerToLocal)
{
- if(TQExtFileInfo::exists(translated, true, this))
+ if(QExtFileInfo::exists(translated, true, this))
ledTranslationExists->setColor(TQt::green);
else
ledTranslationExists->setColor(TQt::red);
diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp
index d75074bd..ff32277b 100644
--- a/quanta/components/framewizard/visualframeeditor.cpp
+++ b/quanta/components/framewizard/visualframeeditor.cpp
@@ -209,7 +209,7 @@ void VisualFrameEditor::buildInternalTree(const TQString &tqparent){
KURL pathToConvert, basePath;
pathToConvert.setPath(srcPattern.cap(1));
basePath.setPath( Project::ref()->projectBaseURL().path() );
- attributeMap["src"] = TQExtFileInfo::toAbsolute( pathToConvert, basePath ).path();
+ attributeMap["src"] = QExtFileInfo::toAbsolute( pathToConvert, basePath ).path();
line.remove(srcPattern);//we don't need to operate on this anymore
}
@@ -335,7 +335,7 @@ TQString VisualFrameEditor::createFrameTag(areaAttribute *a){
base.setPath( Project::ref()->projectBaseURL().path() );
KURL u;
u.setPath(Src);
- tagMiddle+= (" src=\"" + TQExtFileInfo::toRelative( u, base).path() + "\"");
+ tagMiddle+= (" src=\"" + QExtFileInfo::toRelative( u, base).path() + "\"");
}
if( !Longdesc.isEmpty() )
diff --git a/quanta/dialogs/copyto.cpp b/quanta/dialogs/copyto.cpp
index 7a4c596d..9f66cb11 100644
--- a/quanta/dialogs/copyto.cpp
+++ b/quanta/dialogs/copyto.cpp
@@ -46,9 +46,9 @@ KURL CopyTo::copy(const KURL& urlToCopy, const KURL& destination)
targetDirURL.adjustPath(1);
bool doCopy = true;
- if (!TQExtFileInfo::exists(targetDirURL, false, 0L))
+ if (!QExtFileInfo::exists(targetDirURL, false, 0L))
{
- doCopy = TQExtFileInfo::createDir(targetDirURL, 0L);
+ doCopy = QExtFileInfo::createDir(targetDirURL, 0L);
}
KURL destURL;
@@ -93,9 +93,9 @@ KURL::List CopyTo::copy(const KURL::List& sourceList, const KURL& destination )
targetDirURL = destination;
}
bool doCopy = true;
- if (!TQExtFileInfo::exists(targetDirURL, false, 0L))
+ if (!QExtFileInfo::exists(targetDirURL, false, 0L))
{
- doCopy = TQExtFileInfo::createDir(targetDirURL, 0L);
+ doCopy = QExtFileInfo::createDir(targetDirURL, 0L);
}
KIO::UDSEntry entry;
diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp
index 18301045..61940d1c 100644
--- a/quanta/dialogs/dirtydlg.cpp
+++ b/quanta/dialogs/dirtydlg.cpp
@@ -78,7 +78,7 @@ void DirtyDlg::slotCompareDone(KProcess* proc)
{
KURL backupURL = m_src;
backupURL.setPath(backupURL.path()+".backup");
- TQExtFileInfo::copy(m_src, backupURL, -1, true, false, this);
+ QExtFileInfo::copy(m_src, backupURL, -1, true, false, this);
}
KIO::UDSEntry entry;
diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp
index 818df7ac..b0eae65c 100644
--- a/quanta/dialogs/filecombo.cpp
+++ b/quanta/dialogs/filecombo.cpp
@@ -97,7 +97,7 @@ void FileCombo::slotFileSelect()
delete dlg;
if ( !url.isEmpty() )
{
- if (!m_absolutePath) url = TQExtFileInfo::toRelative(url, baseURL);
+ if (!m_absolutePath) url = QExtFileInfo::toRelative(url, baseURL);
combo->setEditText( url.path() );
}
}
diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp
index b8f08324..b52d3be9 100644
--- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp
+++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp
@@ -108,7 +108,7 @@ void TagImgDlg::slotFileSelect()
if ( !url.isEmpty() )
{
slotImageSet( url );
- url = TQExtFileInfo::toRelative(url, baseURL);
+ url = QExtFileInfo::toRelative(url, baseURL);
lineImgSource->setText( url.path() );
}
}
@@ -150,7 +150,7 @@ void TagImgDlg::writeAttributes( TQDict<TQString> *d )
lineImgSource->setText(*t);
KURL url = baseURL;
QuantaCommon::setUrl(url, *t);
- url = TQExtFileInfo::toAbsolute(url, baseURL);
+ url = QExtFileInfo::toAbsolute(url, baseURL);
slotImageSet( url );
}
if ( (t=d->tqfind("alt")) )
diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp
index b666f7b6..2b584854 100644
--- a/quanta/messages/annotationoutput.cpp
+++ b/quanta/messages/annotationoutput.cpp
@@ -147,7 +147,7 @@ void AnnotationOutput::readAnnotations()
TQString fileName = el.attribute("url");
KURL u = baseURL;
QuantaCommon::setUrl(u, fileName);
- u = TQExtFileInfo::toAbsolute(u, baseURL);
+ u = QExtFileInfo::toAbsolute(u, baseURL);
if (Project::ref()->tqcontains(u))
{
bool ok;
@@ -331,7 +331,7 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url)
f.close();
if (!annotations.isEmpty())
{
- KURL u = TQExtFileInfo::toRelative(url, Project::ref()->projectBaseURL());
+ KURL u = QExtFileInfo::toRelative(url, Project::ref()->projectBaseURL());
writeAnnotations(QuantaCommon::qUrl(u), annotations);
}
}
diff --git a/quanta/parsers/dtd/dtd.cpp b/quanta/parsers/dtd/dtd.cpp
index c0942441..2783acca 100644
--- a/quanta/parsers/dtd/dtd.cpp
+++ b/quanta/parsers/dtd/dtd.cpp
@@ -84,7 +84,7 @@ void DTD::writeTagFiles()
TQString dirName = m_dtepDir;
KURL u;
u.setPath(dirName);
- if (!TQExtFileInfo::createDir(dirName)) {
+ if (!QExtFileInfo::createDir(dirName)) {
QuantaCommon::dirCreationError(0, u);
return;
}
diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp
index 577d2734..8b4ec503 100644
--- a/quanta/parsers/dtd/dtdparser.cpp
+++ b/quanta/parsers/dtd/dtdparser.cpp
@@ -134,7 +134,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly)
DTD::dirName = targetDir;
KURL u;
u.setPath(DTD::dirName);
- if (!TQExtFileInfo::createDir(u, 0L)) {
+ if (!QExtFileInfo::createDir(u, 0L)) {
QuantaCommon::dirCreationError(0L, u);
return false;
}
diff --git a/quanta/parsers/sagroupparser.cpp b/quanta/parsers/sagroupparser.cpp
index e28abe78..5f45a73a 100644
--- a/quanta/parsers/sagroupparser.cpp
+++ b/quanta/parsers/sagroupparser.cpp
@@ -117,7 +117,7 @@ void SAGroupParser::parseForScriptGroup(Node *node)
StructTreeGroup group;
GroupElement *groupElement;
GroupElementList* groupElementList;
- KURL baseURL = TQExtFileInfo::path(m_write->url());
+ KURL baseURL = QExtFileInfo::path(m_write->url());
TQString str = node->tag->cleanStr;
TQString tagStr = node->tag->tagStr();
const DTDStruct* dtd = node->tag->dtd();
@@ -294,7 +294,7 @@ void SAGroupParser::parseForScriptGroup(Node *node)
s.remove(group.fileNameRx);
KURL url;
QuantaCommon::setUrl(url, s.stripWhiteSpace());
- url = TQExtFileInfo::toAbsolute(url, baseURL);
+ url = QExtFileInfo::toAbsolute(url, baseURL);
ParserCommon::includedFiles += url.path();
ParserCommon::includedFilesDTD.append(dtd);
ParserCommon::includeWatch->addFile(url.path());
diff --git a/quanta/parts/kafka/htmldocumentproperties.cpp b/quanta/parts/kafka/htmldocumentproperties.cpp
index a6fdd8bb..23b2655e 100644
--- a/quanta/parts/kafka/htmldocumentproperties.cpp
+++ b/quanta/parts/kafka/htmldocumentproperties.cpp
@@ -219,7 +219,7 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* tqparent, bool forceIn
cssStylesheet->setMode(KFile::File | KFile::ExistingOnly );
baseURL.setPath(ViewManager::ref()->activeDocument()->url().directory());
QuantaCommon::setUrl(url, linkNode->tag->attributeValue(index));
- url = TQExtFileInfo::toAbsolute(url, baseURL);
+ url = QExtFileInfo::toAbsolute(url, baseURL);
cssStylesheet->setURL(url.url());
}
}
@@ -537,7 +537,7 @@ void htmlDocumentProperties::accept()
QuantaCommon::setUrl(url, cssStylesheet->url());
baseURL = view->document()->url();
baseURL.setPath(baseURL.directory());
- url = TQExtFileInfo::toRelative(url, baseURL);
+ url = QExtFileInfo::toRelative(url, baseURL);
finalURL = url.url();
if (url.protocol() == view->document()->url().protocol())
finalURL.remove(0, url.protocol().length() + 1);
diff --git a/quanta/parts/kafka/htmlenhancer.cpp b/quanta/parts/kafka/htmlenhancer.cpp
index 3f757a48..e9419799 100644
--- a/quanta/parts/kafka/htmlenhancer.cpp
+++ b/quanta/parts/kafka/htmlenhancer.cpp
@@ -64,7 +64,7 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node tqparentDNode, DOM::Node ne
{
baseURL.setPath(ViewManager::ref()->activeDocument()->url().directory());
QuantaCommon::setUrl(url, domNode.nodeValue().string());
- url = TQExtFileInfo::toAbsolute(url, baseURL);
+ url = QExtFileInfo::toAbsolute(url, baseURL);
domNode.setNodeValue(url.url());
#ifdef HEAVY_DEBUG
kdDebug(25001)<< "HTMLTranslator::translateNode() - new src : " << url.url() << endl;
@@ -80,7 +80,7 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node tqparentDNode, DOM::Node ne
{
baseURL.setPath(ViewManager::ref()->activeDocument()->url().directory());
QuantaCommon::setUrl(url, domNode.nodeValue().string());
- url = TQExtFileInfo::toAbsolute(url, baseURL);
+ url = QExtFileInfo::toAbsolute(url, baseURL);
domNode.setNodeValue(url.url());
#ifdef HEAVY_DEBUG
kdDebug(25001)<< "HTMLTranslator::translateNode() - new href : " << url.url() << endl;
diff --git a/quanta/project/eventconfigurationdlg.cpp b/quanta/project/eventconfigurationdlg.cpp
index 226c4bff..d50eb1e0 100644
--- a/quanta/project/eventconfigurationdlg.cpp
+++ b/quanta/project/eventconfigurationdlg.cpp
@@ -48,7 +48,7 @@ void EventConfigurationDlg::initEvents(EventActions *events)
for (TQValueList<EventAction>::ConstIterator it2 = evList.constBegin(); it2 != evList.constEnd(); ++it2)
{
EventAction ev = *it2;
- item = new TQListViewItem(eventsListView, TQPEvents::ref()->fullEventName(it.key()), TQPEvents::ref()->fullActionName(ev.action));
+ item = new TQListViewItem(eventsListView, QPEvents::ref()->fullEventName(it.key()), QPEvents::ref()->fullActionName(ev.action));
int argcount = ev.arguments.count();
if (argcount > 0)
item->setText(2, ev.arguments[0]);
@@ -78,8 +78,8 @@ void EventConfigurationDlg::saveEvents(TQDomDocument dom)
node = dom.createElement("event");
eventsNode.appendChild(node);
TQDomElement el = node.toElement();
- el.setAttribute("name", TQPEvents::ref()->eventName(item->text(0)));
- el.setAttribute("action", TQPEvents::ref()->actionName(item->text(1)));
+ el.setAttribute("name", QPEvents::ref()->eventName(item->text(0)));
+ el.setAttribute("action", QPEvents::ref()->actionName(item->text(1)));
if (el.attribute("action") == "script" || el.attribute("action") == "action")
el.setAttribute("type", "external");
else
diff --git a/quanta/project/eventeditordlg.cpp b/quanta/project/eventeditordlg.cpp
index db5c8b93..4c3edd34 100644
--- a/quanta/project/eventeditordlg.cpp
+++ b/quanta/project/eventeditordlg.cpp
@@ -39,8 +39,8 @@ EventEditorDlg::EventEditorDlg(KActionCollection *actionCollection, TQWidget* tq
: EventEditorDlgS(tqparent,name,fl)
{
m_actionCollection = actionCollection;
- eventCombo->insertStringList(TQPEvents::ref()->eventNames());
- actionCombo->insertStringList(TQPEvents::ref()->actionNames());
+ eventCombo->insertStringList(QPEvents::ref()->eventNames());
+ actionCombo->insertStringList(QPEvents::ref()->actionNames());
slotActionChanged(actionCombo->currentText());
}
@@ -79,7 +79,7 @@ TQString EventEditorDlg::argument1()
{
TQString s = argument1Combo->currentText();
TQString actionType = actionCombo->currentText();
- if (actionType == TQPEvents::ref()->fullActionName("email"))
+ if (actionType == QPEvents::ref()->fullActionName("email"))
{
if (s == i18n(teamLeaderStr.utf8()))
s = "teamleader";
@@ -96,7 +96,7 @@ TQString EventEditorDlg::argument1()
}
return s;
} else
- if (actionType == TQPEvents::ref()->fullActionName("script"))
+ if (actionType == QPEvents::ref()->fullActionName("script"))
{
TQString s = argument1Combo->currentText();
for (TQMap<TQString, TQString>::ConstIterator it = m_scriptActions.constBegin(); it != m_scriptActions.constEnd(); ++it)
@@ -109,7 +109,7 @@ TQString EventEditorDlg::argument1()
}
return s;
} else
- if (actionType == TQPEvents::ref()->fullActionName("action"))
+ if (actionType == QPEvents::ref()->fullActionName("action"))
{
TQString s = argument1Combo->currentText();
for (TQMap<TQString, TQString>::ConstIterator it = m_otherActions.constBegin(); it != m_otherActions.constEnd(); ++it)
@@ -134,7 +134,7 @@ TQString EventEditorDlg::argument2()
if (argument2Combo->isEnabled())
{
TQString actionType = actionCombo->currentText();
- if (actionType == TQPEvents::ref()->fullActionName("log"))
+ if (actionType == QPEvents::ref()->fullActionName("log"))
{
int id = argument2Combo->currentItem();
if (id == 0)
@@ -142,7 +142,7 @@ TQString EventEditorDlg::argument2()
else
return "minimal";
} else
- if (actionType == TQPEvents::ref()->fullActionName("script"))
+ if (actionType == QPEvents::ref()->fullActionName("script"))
{
int id = argument2Combo->currentItem();
if (id == 0)
@@ -160,7 +160,7 @@ TQString EventEditorDlg::argument3()
if (argument3Combo->isEnabled())
{
TQString actionType = actionCombo->currentText();
- if (actionType == TQPEvents::ref()->fullActionName("log"))
+ if (actionType == QPEvents::ref()->fullActionName("log"))
{
int id = argument3Combo->currentItem();
if (id == 0)
@@ -185,7 +185,7 @@ TQString EventEditorDlg::argument4()
void EventEditorDlg::setArguments(const TQStringList& arguments)
{
TQString actionType = actionCombo->currentText();
- if (actionType == TQPEvents::ref()->fullActionName("email"))
+ if (actionType == QPEvents::ref()->fullActionName("email"))
{
TQString s = arguments[0];
if (s == "teamleader")
@@ -218,7 +218,7 @@ void EventEditorDlg::setArguments(const TQStringList& arguments)
argument1Combo->setCurrentItem(0);
}
} else
- if (actionType == TQPEvents::ref()->fullActionName("script"))
+ if (actionType == QPEvents::ref()->fullActionName("script"))
{
TQString s = arguments[0];
if (m_scriptActions.tqcontains(s))
@@ -246,7 +246,7 @@ void EventEditorDlg::setArguments(const TQStringList& arguments)
argument2Combo->setCurrentItem(1);
return; //setup for script arguments completed
} else
- if (actionType == TQPEvents::ref()->fullActionName("action"))
+ if (actionType == QPEvents::ref()->fullActionName("action"))
{
TQString s = arguments[0];
if (m_otherActions.tqcontains(s))
@@ -268,7 +268,7 @@ void EventEditorDlg::setArguments(const TQStringList& arguments)
argument1Combo->setCurrentItem(0);
}
} else
- if (actionType == TQPEvents::ref()->fullActionName("log"))
+ if (actionType == QPEvents::ref()->fullActionName("log"))
{
argument1Combo->insertItem(arguments[0], 0);
argument1Combo->setCurrentItem(0);
@@ -312,7 +312,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name)
resetArgumentWidgets(argument2Label, argument2Combo);
resetArgumentWidgets(argument3Label, argument3Combo);
resetArgumentWidgets(argument4Label, argument4Combo);
- if (name == TQPEvents::ref()->fullActionName("email"))
+ if (name == QPEvents::ref()->fullActionName("email"))
{
argument1Label->setEnabled(true);
argument1Label->setText(i18n("Receiver:"));
@@ -331,7 +331,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name)
argument1Combo->insertItem(i18n(taskLeaderStr.utf8()) + " - " + tasks[i]);
}
} else
- if (name == TQPEvents::ref()->fullActionName("log"))
+ if (name == QPEvents::ref()->fullActionName("log"))
{
argument1Label->setEnabled(true);
argument1Label->setText(i18n("Log file:"));
@@ -350,7 +350,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name)
argument3Combo->insertItem(i18n("Create New Log"), 0);
argument3Combo->insertItem(i18n("Append to Existing Log"), 1);
} else
- if (name == TQPEvents::ref()->fullActionName("script"))
+ if (name == QPEvents::ref()->fullActionName("script"))
{
argument1Label->setEnabled(true);
argument1Label->setText(i18n("Action name:"));
@@ -378,7 +378,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name)
argument2Combo->insertItem(i18n("Yes"), 0);
argument2Combo->insertItem(i18n("No"), 1);
} else
- if (name == TQPEvents::ref()->fullActionName("action"))
+ if (name == QPEvents::ref()->fullActionName("action"))
{
argument1Label->setEnabled(true);
argument1Label->setText(i18n("Action name:"));
diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp
index d5988c69..aa80e4f3 100644
--- a/quanta/project/project.cpp
+++ b/quanta/project/project.cpp
@@ -146,7 +146,7 @@ void Project::insertFile(const KURL& nameURL, bool tqrepaint )
if ( !d->m_projectFiles.tqcontains(url) )
{
el = d->dom.createElement("item");
- el.setAttribute("url", QuantaCommon::qUrl( TQExtFileInfo::toRelative(url, d->baseURL) ));
+ el.setAttribute("url", QuantaCommon::qUrl( QExtFileInfo::toRelative(url, d->baseURL) ));
d->dom.firstChild().firstChild().appendChild( el );
KURL u = url.upURL();
ProjectURL *tqparentURL = d->m_projectFiles.tqfind(u);
@@ -258,7 +258,7 @@ void Project::slotOpenProject(const KURL &url)
kdDebug(24000) << "Open recent project: " << url <<endl;
if ( !url.isEmpty() )
{
- if ( !TQExtFileInfo::exists(url, true, d->m_mainWindow) )
+ if ( !QExtFileInfo::exists(url, true, d->m_mainWindow) )
{
emit hideSplash();
if (KMessageBox::questionYesNo(d->m_mainWindow,
@@ -424,7 +424,7 @@ void Project::slotRemove(const KURL& urlToRemove)
emit reloadTree( &(d->m_projectFiles), false, TQStringList() );
emit newtqStatus();
- TQString urlPath = TQExtFileInfo::toRelative(urlToRemove, d->baseURL).path();
+ TQString urlPath = QExtFileInfo::toRelative(urlToRemove, d->baseURL).path();
TQString nice = urlPath;
nice = KStringHandler::lsqueeze(nice, 60);
if (KMessageBox::warningContinueCancel(d->m_mainWindow, i18n("<qt>Do you want to remove <br><b>%1</b><br> from the server(s) as well?</qt>").tqarg(nice), i18n("Remove From Server"), KStdGuiItem::remove(), "RemoveFromServer") == KMessageBox::Continue )
@@ -468,9 +468,9 @@ void Project::slotOptions()
topLayout->addWidget(&optionsPage);
optionsPage.linePrjName->setText( d->projectName );
- url = TQExtFileInfo::toRelative(d->templateURL, d->baseURL);
+ url = QExtFileInfo::toRelative(d->templateURL, d->baseURL);
optionsPage.linePrjTmpl->setText(QuantaCommon::qUrl(url));
- url = TQExtFileInfo::toRelative(d->toolbarURL, d->baseURL);
+ url = QExtFileInfo::toRelative(d->toolbarURL, d->baseURL);
optionsPage.linePrjToolbar->setText( QuantaCommon::qUrl(url) );
optionsPage.lineAuthor->setText( d->author );
@@ -627,16 +627,16 @@ void Project::slotOptions()
QuantaCommon::setUrl(d->templateURL, optionsPage.linePrjTmpl->text());
d->templateURL.adjustPath(1);
- d->templateURL = TQExtFileInfo::toAbsolute(d->templateURL, d->baseURL);
- if (!TQExtFileInfo::createDir(d->templateURL, d->m_mainWindow))
+ d->templateURL = QExtFileInfo::toAbsolute(d->templateURL, d->baseURL);
+ if (!QExtFileInfo::createDir(d->templateURL, d->m_mainWindow))
{
QuantaCommon::dirCreationError(d->m_mainWindow, d->templateURL);
}
QuantaCommon::setUrl(d->toolbarURL, optionsPage.linePrjToolbar->text());
d->toolbarURL.adjustPath(1);
- d->toolbarURL = TQExtFileInfo::toAbsolute(d->toolbarURL, d->baseURL);
- if (!TQExtFileInfo::createDir(d->toolbarURL, d->m_mainWindow))
+ d->toolbarURL = QExtFileInfo::toAbsolute(d->toolbarURL, d->baseURL);
+ if (!QExtFileInfo::createDir(d->toolbarURL, d->m_mainWindow))
{
QuantaCommon::dirCreationError(d->m_mainWindow, d->toolbarURL);
}
@@ -706,7 +706,7 @@ void Project::slotOptions()
}
el = projectNode.namedItem("templates").toElement();
- url = TQExtFileInfo::toRelative(d->templateURL, d->baseURL);
+ url = QExtFileInfo::toRelative(d->templateURL, d->baseURL);
if(el.isNull())
{
el =d->dom.createElement("templates");
@@ -718,7 +718,7 @@ void Project::slotOptions()
el.firstChild().setNodeValue(QuantaCommon::qUrl(url));
}
- url = TQExtFileInfo::toRelative(d->toolbarURL, d->baseURL);
+ url = QExtFileInfo::toRelative(d->toolbarURL, d->baseURL);
el = projectNode.namedItem("toolbars").toElement();
if(el.isNull())
{
@@ -874,7 +874,7 @@ void Project::slotUploadURL(const KURL& urlToUpload, const TQString& profileName
if (!ViewManager::ref()->saveAll())
return;
- KURL url = TQExtFileInfo::toRelative( urlToUpload, d->baseURL);
+ KURL url = QExtFileInfo::toRelative( urlToUpload, d->baseURL);
if (!d->m_uploadDialog)
{
d->m_uploadDialog = new ProjectUpload(url, profileName, false, quickUpload, markOnly, i18n("Upload project items...").ascii());
@@ -909,7 +909,7 @@ KURL Project::urlWithPrefix(const KURL& url)
if (d->usePreviewPrefix)
{
- KURL tempUrl = TQExtFileInfo::toRelative(url, d->baseURL );
+ KURL tempUrl = QExtFileInfo::toRelative(url, d->baseURL );
if ( !tempUrl.path().startsWith("/") )
{
returnUrl = d->previewPrefix;
@@ -985,10 +985,10 @@ KURL Project::projectBaseURL()
Document *w = ViewManager::ref()->activeDocument();
if ( !w || w->isUntitled() )
{
- result = TQExtFileInfo::home();
+ result = QExtFileInfo::home();
} else
{
- result = TQExtFileInfo::path(w->url());
+ result = QExtFileInfo::path(w->url());
}
}
return result;
@@ -1317,7 +1317,7 @@ void Project::loadBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf)
return;
TQDomNodeList nl = d->dom.elementsByTagName("item");
TQDomElement el;
- KURL u = TQExtFileInfo::toRelative(url, d->baseURL);
+ KURL u = QExtFileInfo::toRelative(url, d->baseURL);
for ( uint i = 0; i < nl.count(); i++ )
{
el = nl.item(i).toElement();
@@ -1349,7 +1349,7 @@ void Project::saveBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf)
}
TQDomNodeList nl = d->dom.elementsByTagName("item");
TQDomElement el;
- KURL u = TQExtFileInfo::toRelative(url, d->baseURL);
+ KURL u = QExtFileInfo::toRelative(url, d->baseURL);
for ( uint i = 0; i < nl.count(); i++ )
{
el = nl.item(i).toElement();
@@ -1367,7 +1367,7 @@ void Project::loadCursorPosition(const KURL &url, KTextEditor::ViewCursorInterfa
return;
TQDomNodeList nl = d->m_sessionDom.elementsByTagName("item");
TQDomElement el;
- KURL u = TQExtFileInfo::toRelative(url, d->baseURL);
+ KURL u = QExtFileInfo::toRelative(url, d->baseURL);
for ( uint i = 0; i < nl.count(); i++ )
{
el = nl.item(i).toElement();
@@ -1400,7 +1400,7 @@ void Project::saveCursorPosition(const KURL &url, KTextEditor::ViewCursorInterfa
return;
TQDomNodeList nl = d->m_sessionDom.elementsByTagName("item");
TQDomElement el;
- KURL u = TQExtFileInfo::toRelative(url, d->baseURL);
+ KURL u = QExtFileInfo::toRelative(url, d->baseURL);
uint line, col;
viewCursorIf->cursorPosition(&line, &col);
bool found = false;
diff --git a/quanta/project/projectlist.cpp b/quanta/project/projectlist.cpp
index db162ce2..82b4d86e 100644
--- a/quanta/project/projectlist.cpp
+++ b/quanta/project/projectlist.cpp
@@ -69,7 +69,7 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL,
}
}
path = url.path();
- url = TQExtFileInfo::toAbsolute(url, baseURL);
+ url = QExtFileInfo::toAbsolute(url, baseURL);
if ( el.nodeName() == "item" )
{
if (excludeRx.exactMatch(path) || tqfind(url.url(-1)))
diff --git a/quanta/project/projectlist.h b/quanta/project/projectlist.h
index baec78ec..361c119c 100644
--- a/quanta/project/projectlist.h
+++ b/quanta/project/projectlist.h
@@ -56,7 +56,7 @@ public:
*/
KURL toRelative(const KURL &url) const
{
- return TQExtFileInfo::toRelative(url, m_baseURL, false);
+ return QExtFileInfo::toRelative(url, m_baseURL, false);
}
/**
diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp
index 76a98a79..81c53728 100644
--- a/quanta/project/projectnewgeneral.cpp
+++ b/quanta/project/projectnewgeneral.cpp
@@ -137,7 +137,7 @@ void ProjectNewGeneral::slotLinePrjFile( const TQString & )
baseUrl = url;
if (baseUrl.isLocalFile())
{
- s = TQExtFileInfo::canonicalPath(baseUrl.path());
+ s = QExtFileInfo::canonicalPath(baseUrl.path());
if (!s.isEmpty())
baseUrl.setPath(s);
}
@@ -222,7 +222,7 @@ bool ProjectNewGeneral::eventFilter ( TQObject * watched, TQEvent * e )
{
KURL url = baseUrl;
QuantaCommon::setUrl(url, linePrjTmpl->text());
- url = TQExtFileInfo::toAbsolute(url, baseUrl);
+ url = QExtFileInfo::toAbsolute(url, baseUrl);
if (!baseUrl.isParentOf(url))
{
KMessageBox::sorry(this,i18n("<qt>The project templates must be stored under the main project folder: <br><br><b>%1</b></qt>").tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol)));
@@ -235,7 +235,7 @@ bool ProjectNewGeneral::eventFilter ( TQObject * watched, TQEvent * e )
{
KURL url = baseUrl;
QuantaCommon::setUrl(url, linePrjToolbar->text());
- url = TQExtFileInfo::toAbsolute(url, baseUrl);
+ url = QExtFileInfo::toAbsolute(url, baseUrl);
if (!baseUrl.isParentOf(url))
{
KMessageBox::sorry(0,i18n("<qt>The project toolbars must be stored under the main project folder: <br><br><b>%1</b></qt>")
diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp
index 1de12e9e..5a47a3db 100644
--- a/quanta/project/projectnewlocal.cpp
+++ b/quanta/project/projectnewlocal.cpp
@@ -112,7 +112,7 @@ KURL::List ProjectNewLocal::projectFiles()
{
KURL::List list;
- if (!TQExtFileInfo::exists(baseURL, false, this) ||
+ if (!QExtFileInfo::exists(baseURL, false, this) ||
!baseURL.path().endsWith("/") ||
!checkInsert->isChecked() ) return list;
@@ -142,7 +142,7 @@ KURL::List ProjectNewLocal::projectFiles()
ftqmask = tqmask->text();
}
- list = TQExtFileInfo::allFilesRelative(baseURL, ftqmask, this, false);
+ list = QExtFileInfo::allFilesRelative(baseURL, ftqmask, this, false);
return list;
}
@@ -180,7 +180,7 @@ void ProjectNewLocal::resizeEvent ( TQResizeEvent *t )
/** No descriptions */
void ProjectNewLocal::slotAddFiles()
{
- TQExtFileInfo::createDir(baseURL, this);
+ QExtFileInfo::createDir(baseURL, this);
KURL::List list = KFileDialog::getOpenURLs(
baseURL.url(), i18n("*"), this, i18n("Insert Files in Project"));
@@ -188,7 +188,7 @@ void ProjectNewLocal::slotAddFiles()
{
KURL u = list.first();
- u = TQExtFileInfo::toRelative( u, baseURL, false );
+ u = QExtFileInfo::toRelative( u, baseURL, false );
if ( u.path().startsWith("..") || u.path().startsWith("/"))
{
@@ -218,7 +218,7 @@ void ProjectNewLocal::slotAddFiles()
progressBar->setTextEnabled(true);
for (uint i = 0; i < list.count(); i++)
{
- list[i] = TQExtFileInfo::toRelative(list[i], baseURL, false);
+ list[i] = QExtFileInfo::toRelative(list[i], baseURL, false);
if (!fileList.tqcontains(list[i]))
{
fileList.append(list[i]);
@@ -238,7 +238,7 @@ void ProjectNewLocal::slotAddFolder()
{
//TODO/FIXME: This returns null if the selected directory is not on the local disk.
//I think this is a KDE bug
- TQExtFileInfo::createDir(baseURL, this);
+ QExtFileInfo::createDir(baseURL, this);
KURL dirURL ;
dirURL = KFileDialog::getExistingURL(
baseURL.url(), this, i18n("Insert Folder in Project"));
@@ -248,7 +248,7 @@ void ProjectNewLocal::slotAddFolder()
dirURL.adjustPath(1);
KURL sdir = dirURL;
- sdir = TQExtFileInfo::toRelative( sdir, baseURL, false);
+ sdir = QExtFileInfo::toRelative( sdir, baseURL, false);
if ( sdir.path().startsWith("..") || sdir.path().startsWith("/") )
{
@@ -293,7 +293,7 @@ void ProjectNewLocal::slotInsertFolderAfterCopying(const KURL::List& a_urlList)
{
dirURL = *it;
// dirURL.adjustPath(1);
- KURL::List files = TQExtFileInfo::allFilesRelative(dirURL, "*", this, false);
+ KURL::List files = QExtFileInfo::allFilesRelative(dirURL, "*", this, false);
progressBar->setTotalSteps(files.count() - 1);
progressBar->setTextEnabled(true);
KURL u;
@@ -328,7 +328,7 @@ void ProjectNewLocal::slotInsertFilesAfterCopying(const KURL::List& a_urlList)
progressBar->setTextEnabled(true);
for (it = a_urlList.begin(); it != a_urlList.end(); ++it)
{
- u = TQExtFileInfo::toRelative(*it, baseURL, false);
+ u = QExtFileInfo::toRelative(*it, baseURL, false);
if ( !fileList.tqcontains(u))
{
fileList.append(u);
diff --git a/quanta/project/projectnewweb.cpp b/quanta/project/projectnewweb.cpp
index 08391dbe..ef4ee2b7 100644
--- a/quanta/project/projectnewweb.cpp
+++ b/quanta/project/projectnewweb.cpp
@@ -99,7 +99,7 @@ void ProjectNewWeb::slotStart()
{
emit enableMessagesWidget();
- if (TQExtFileInfo::createDir(baseURL, this))
+ if (QExtFileInfo::createDir(baseURL, this))
{
if (baseURL.protocol() == "file")
{
diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp
index 871ae7bc..e5a9e8e5 100644
--- a/quanta/project/projectprivate.cpp
+++ b/quanta/project/projectprivate.cpp
@@ -254,11 +254,11 @@ void ProjectPrivate::openCurrentView()
TQDomElement el2 = itemNodes.item(j).cloneNode().toElement();
KURL url = baseURL;
QuantaCommon::setUrl(url,el2.attribute("url"));
- url = TQExtFileInfo::toAbsolute(url, baseURL);
+ url = QExtFileInfo::toAbsolute(url, baseURL);
if (el2.nodeName() == "viewitem")
{
urlsInView.append(url);
- if (!ViewManager::ref()->isOpened(url) && TQExtFileInfo::exists(url, true, m_mainWindow))
+ if (!ViewManager::ref()->isOpened(url) && QExtFileInfo::exists(url, true, m_mainWindow))
urlsToOpen.append(url);
} else {
if (el2.nodeName() == "viewtoolbar")
@@ -325,7 +325,7 @@ void ProjectPrivate::insertFiles( KURL::List files )
if (!m_projectFiles.tqcontains(url))
{
el = dom.createElement("item");
- el.setAttribute("url", QuantaCommon::qUrl(TQExtFileInfo::toRelative(url, baseURL, false)));
+ el.setAttribute("url", QuantaCommon::qUrl(QExtFileInfo::toRelative(url, baseURL, false)));
dom.firstChild().firstChild().appendChild(el);
m_projectFiles.insert( new ProjectURL(url, "", 1, false, el) );
emit eventHappened("after_project_add", url.url(), TQString());
@@ -337,7 +337,7 @@ void ProjectPrivate::insertFiles( KURL::List files )
url = *it;
if (!excludeRx.exactMatch(url.path()))
{
- el.setAttribute("url", QuantaCommon::qUrl(TQExtFileInfo::toRelative(url, baseURL, false)));
+ el.setAttribute("url", QuantaCommon::qUrl(QExtFileInfo::toRelative(url, baseURL, false)));
dom.firstChild().firstChild().appendChild(el);
m_projectFiles.insert( new ProjectURL(url, "", 1, false, el) );
emit eventHappened("after_project_add", url.url(), TQString());
@@ -362,7 +362,7 @@ void ProjectPrivate::insertFiles(const KURL& pathURL, const TQString& tqmask )
KURL::List list;
list.append(pathURL);
- list += TQExtFileInfo::allFiles(pathURL, tqmask, m_mainWindow);
+ list += QExtFileInfo::allFiles(pathURL, tqmask, m_mainWindow);
insertFiles(list);
}
@@ -464,7 +464,7 @@ void ProjectPrivate::loadProjectXML()
if (tmpString != QuantaCommon::qUrl(templateURL) )
{
el = no.toElement();
- url = TQExtFileInfo::toRelative(templateURL, baseURL);
+ url = QExtFileInfo::toRelative(templateURL, baseURL);
if(el.isNull())
{
el = dom.createElement("templates");
@@ -476,7 +476,7 @@ void ProjectPrivate::loadProjectXML()
el.firstChild().setNodeValue(QuantaCommon::qUrl(url));
}
}
- templateURL = TQExtFileInfo::toAbsolute(templateURL, baseURL);
+ templateURL = QExtFileInfo::toAbsolute(templateURL, baseURL);
no = projectNode.namedItem("toolbars");
toolbarURL = baseURL;
@@ -492,7 +492,7 @@ void ProjectPrivate::loadProjectXML()
if (tmpString != QuantaCommon::qUrl(toolbarURL))
{
el = no.toElement();
- url = TQExtFileInfo::toRelative(toolbarURL, baseURL);
+ url = QExtFileInfo::toRelative(toolbarURL, baseURL);
if(el.isNull())
{
el = dom.createElement("toolbars");
@@ -504,7 +504,7 @@ void ProjectPrivate::loadProjectXML()
el.firstChild().setNodeValue(QuantaCommon::qUrl(url));
}
}
- toolbarURL = TQExtFileInfo::toAbsolute(toolbarURL, baseURL);
+ toolbarURL = QExtFileInfo::toAbsolute(toolbarURL, baseURL);
no = projectNode.namedItem("exclude");
m_excludeCvsignore = (no.toElement().attribute("cvsignore", "false") == "true");
@@ -739,7 +739,7 @@ void ProjectPrivate::slotAcceptCreateProject()
if (baseURL.protocol() == i18n("Local")) baseURL.setProtocol("file");
baseURL.adjustPath(1);
if (!baseURL.path().startsWith("/")) baseURL.setPath("/"+ baseURL.path());
- if (!TQExtFileInfo::createDir(baseURL, m_mainWindow))
+ if (!QExtFileInfo::createDir(baseURL, m_mainWindow))
{
QuantaCommon::dirCreationError(m_mainWindow, baseURL);
baseURL = oldBaseURL;
@@ -789,7 +789,7 @@ void ProjectPrivate::slotAcceptCreateProject()
for ( KURL::List::Iterator it = list.begin(); it != list.end(); ++it )
{
- url = *it;//TQExtFileInfo::toRelative(*it, baseURL );
+ url = *it;//QExtFileInfo::toRelative(*it, baseURL );
el = dom.createElement("item");
el.setAttribute("url",QuantaCommon::qUrl(url));
dom.firstChild().firstChild().appendChild( el );
@@ -823,28 +823,28 @@ void ProjectPrivate::slotAcceptCreateProject()
{
QuantaCommon::setUrl(templateURL, png->linePrjTmpl->text());
templateURL.adjustPath(1);
- templateURL = TQExtFileInfo::toAbsolute(templateURL, baseURL);
- if (!TQExtFileInfo::createDir(templateURL, m_mainWindow))
+ templateURL = QExtFileInfo::toAbsolute(templateURL, baseURL);
+ if (!QExtFileInfo::createDir(templateURL, m_mainWindow))
{
QuantaCommon::dirCreationError(m_mainWindow, templateURL);
}
}
//the nodes are already created in loadProjectXML() called from createEmptyDom()
el = dom.firstChild().firstChild().namedItem("templates").toElement();
- url = TQExtFileInfo::toRelative(templateURL, baseURL);
+ url = QExtFileInfo::toRelative(templateURL, baseURL);
el.firstChild().setNodeValue(QuantaCommon::qUrl(url));
//setup the toolbars directory
toolbarURL = baseURL;
QuantaCommon::setUrl(toolbarURL,png->linePrjToolbar->text());
toolbarURL.adjustPath(1);
- toolbarURL = TQExtFileInfo::toAbsolute(toolbarURL, baseURL);
- if (!TQExtFileInfo::createDir(toolbarURL, m_mainWindow))
+ toolbarURL = QExtFileInfo::toAbsolute(toolbarURL, baseURL);
+ if (!QExtFileInfo::createDir(toolbarURL, m_mainWindow))
{
QuantaCommon::dirCreationError(m_mainWindow, toolbarURL);
}
el = dom.firstChild().firstChild().namedItem("toolbars").toElement();
- url = TQExtFileInfo::toRelative(toolbarURL, baseURL);
+ url = QExtFileInfo::toRelative(toolbarURL, baseURL);
el.firstChild().setNodeValue(QuantaCommon::qUrl(url));
#if KDE_IS_VERSION(3,4,89)
@@ -939,7 +939,7 @@ void ProjectPrivate::slotSaveAsProjectView(bool askForName)
if (m_projectFiles.tqcontains(url))
{
item = dom.createElement("viewitem");
- item.setAttribute("url", QuantaCommon::qUrl(TQExtFileInfo::toRelative(url, baseURL)) );
+ item.setAttribute("url", QuantaCommon::qUrl(QExtFileInfo::toRelative(url, baseURL)) );
el.appendChild(item);
}
}
@@ -950,7 +950,7 @@ void ProjectPrivate::slotSaveAsProjectView(bool askForName)
{
item = dom.createElement("viewtoolbar");
KURL url = toolbarList[i];
- url = TQExtFileInfo::toRelative(url, baseURL);
+ url = QExtFileInfo::toRelative(url, baseURL);
item.setAttribute("url", QuantaCommon::qUrl(url) );
el.appendChild(item);
}
@@ -1008,7 +1008,7 @@ bool ProjectPrivate::createEmptyDom()
tempFile->textStream()->setEncoding(TQTextStream::UnicodeUTF8);
*(tempFile->textStream()) << str;
tempFile->close();
- result = TQExtFileInfo::createDir(baseURL, m_mainWindow);
+ result = QExtFileInfo::createDir(baseURL, m_mainWindow);
if (result)
result = KIO::NetAccess::upload(tempFile->name(), projectURL, m_mainWindow);
if (result)
@@ -1100,7 +1100,7 @@ void ProjectPrivate::getStatusFromTree()
}
TQStringList folderList;
tqparent->getTreetqStatus( &folderList );
- // toplevel folder is always open in a project and TQExtFileInfo::toRelative
+ // toplevel folder is always open in a project and QExtFileInfo::toRelative
// creates strange output -> we remove the toplevel folder
if (folderList.count() > 0)
folderList.remove(folderList.begin());
@@ -1110,7 +1110,7 @@ void ProjectPrivate::getStatusFromTree()
m_sessionDom.firstChild().firstChild().appendChild(root);
for (TQStringList::Iterator it = folderList.begin(); it != folderList.end(); ++it) {
el = m_sessionDom.createElement("openfolder");
- el.setAttribute("url", QuantaCommon::qUrl( TQExtFileInfo::toRelative(KURL(*it), baseURL) ) );
+ el.setAttribute("url", QuantaCommon::qUrl( QExtFileInfo::toRelative(KURL(*it), baseURL) ) );
root.appendChild( el );
}
}
@@ -1432,7 +1432,7 @@ void ProjectPrivate::slotAddFiles()
if ( !list.isEmpty() )
{
KURL firstURL = list.first();
- firstURL = TQExtFileInfo::toRelative( firstURL, baseURL );
+ firstURL = QExtFileInfo::toRelative( firstURL, baseURL );
if ( firstURL.path().startsWith("/") || firstURL.path().startsWith("."))
{
diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp
index 52f52908..dd88ab5c 100644
--- a/quanta/project/projectupload.cpp
+++ b/quanta/project/projectupload.cpp
@@ -172,13 +172,13 @@ void ProjectUpload::slotBuildTree()
KURL u = m_project->projectBaseURL();
if (!startUrl.isEmpty())
{
- u = TQExtFileInfo::toAbsolute(startUrl, u);
+ u = QExtFileInfo::toAbsolute(startUrl, u);
}
TQDict<KFileItem> projectDirFiles;
if (startUrl.isEmpty() || strUrl.endsWith("/")) //upload a folder
{
- projectDirFiles = TQExtFileInfo::allFilesDetailed(u, "*", this);
+ projectDirFiles = QExtFileInfo::allFilesDetailed(u, "*", this);
} else
{
projectDirFiles.insert(u.url(), new KFileItem(KFileItem::Unknown, KFileItem::Unknown, u, true));
@@ -197,7 +197,7 @@ void ProjectUpload::slotBuildTree()
{
QuantaCommon::setUrl(u, s);
absUrl.setPath(m_project->projectBaseURL().path(1)+u.path(-1));
-/* if (!TQExtFileInfo::exists(absUrl))
+/* if (!QExtFileInfo::exists(absUrl))
continue; */
KFileItem *p_item = projectDirFiles.tqfind(absUrl.url());
if (!p_item)
@@ -375,7 +375,7 @@ void ProjectUpload::startUpload()
buttonUpload->setEnabled(false);
KURL u = *baseUrl;
u.setPath(u.protocol() == "file" ? "/" : "");
- if (TQExtFileInfo::exists(u, false, this) || (u.protocol() == "webdav" && TQExtFileInfo::exists(*baseUrl, false, this)))
+ if (QExtFileInfo::exists(u, false, this) || (u.protocol() == "webdav" && QExtFileInfo::exists(*baseUrl, false, this)))
{
upload();
return;
@@ -425,7 +425,7 @@ void ProjectUpload::upload()
}
- KURL from = TQExtFileInfo::toAbsolute(currentURL, m_project->projectBaseURL());
+ KURL from = QExtFileInfo::toAbsolute(currentURL, m_project->projectBaseURL());
to = *baseUrl;
to.addPath( currentURL.path() );
if (to.fileName(false).isEmpty())
@@ -440,7 +440,7 @@ void ProjectUpload::upload()
if ( !madeDirs.tqcontains(dir) )
{
madeDirs.append( dir );
- if (!TQExtFileInfo::createDir(dir, this))
+ if (!QExtFileInfo::createDir(dir, this))
{
QuantaCommon::dirCreationError(this, KURL( dir.prettyURL(0, KURL::StripFileProtocol) ));
buttonUpload->setEnabled(true);
diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp
index b24b123f..1c97da09 100644
--- a/quanta/project/rescanprj.cpp
+++ b/quanta/project/rescanprj.cpp
@@ -115,7 +115,7 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list)
else
u.setPath(linkDest);
u.adjustPath(+1);
- KURL u2 = TQExtFileInfo::toRelative(u, baseURL);
+ KURL u2 = QExtFileInfo::toRelative(u, baseURL);
bool found = false;
for (uint i = 0; i < urlList.count(); i++)
if (urlList[i].url == u2)
@@ -214,7 +214,7 @@ KURL::List RescanPrj::files()
}
if (!u.isEmpty())
- r.append( TQExtFileInfo::toAbsolute(u, baseURL) );
+ r.append( QExtFileInfo::toAbsolute(u, baseURL) );
}
}
return r;
diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index 70fce267..7c2ff3f1 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -2546,7 +2546,7 @@ TQStringList* Document::tagAttributeValues(const TQString& dtdName, const TQStri
for (uint i = 0; i < values->count(); i++)
{
u = (*values)[i];
- u = TQExtFileInfo::toRelative(u, base);
+ u = QExtFileInfo::toRelative(u, base);
(*values)[i] = u.path();
}
values->remove(values->at(0));
@@ -2878,7 +2878,7 @@ void Document::open(const KURL &url, const TQString &encoding)
slotOpeningFailed(TQString());
if (!url.isLocalFile())
{
- TQExtFileInfo internalFileInfo;
+ QExtFileInfo internalFileInfo;
internalFileInfo.enter_loop();
}
}
diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp
index e1c5a742..5061abd4 100644
--- a/quanta/src/dtds.cpp
+++ b/quanta/src/dtds.cpp
@@ -274,7 +274,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
readTagFile(dirName + "common.tag", dtd, 0L);
//bool idleTimertqStatus = quantaApp->slotEnableIdleTimer(false);
emit enableIdleTimer(false);
- KURL::List files = TQExtFileInfo::allFilesRelative(dirURL, "*.tag", 0L);
+ KURL::List files = QExtFileInfo::allFilesRelative(dirURL, "*.tag", 0L);
//quantaApp->slotEnableIdleTimer(idleTimertqStatus);
emit enableIdleTimer(true);
TQString tmpStr;
diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp
index 1f1f0401..0323d2c0 100644
--- a/quanta/src/kqapp.cpp
+++ b/quanta/src/kqapp.cpp
@@ -1,5 +1,5 @@
/*
- KTQApplication.cpp
+ KQApplication.cpp
KNode, the KDE newsreader
Copyright (c) 1999-2001 the KNode authors.
@@ -59,7 +59,7 @@ KSplash::~KSplash()
}
-KTQApplication::KTQApplication()
+KQApplication::KQApplication()
: KApplication()
{
args = KCmdLineArgs::parsedArgs();
@@ -101,16 +101,16 @@ KTQApplication::KTQApplication()
}
}
-void KTQApplication::slotInit()
+void KQApplication::slotInit()
{
- KTQApplicationPrivate::init();
+ KQApplicationPrivate::init();
}
-KTQApplication::~KTQApplication()
+KQApplication::~KQApplication()
{
}
-void KTQApplication::slotSplashTimeout()
+void KQApplication::slotSplashTimeout()
{
delete splash;
delete sp;
@@ -118,19 +118,19 @@ void KTQApplication::slotSplashTimeout()
sp = 0L;
}
-KTQUniqueApplication::KTQUniqueApplication()
+KQUniqueApplication::KQUniqueApplication()
: KUniqueApplication()
{
KGlobal::dirs()->addPrefix(PREFIX);
dcopClient()->registerAs("quanta", false);
}
-KTQUniqueApplication::~KTQUniqueApplication()
+KQUniqueApplication::~KQUniqueApplication()
{
}
-int KTQUniqueApplication::newInstance()
+int KQUniqueApplication::newInstance()
{
args = KCmdLineArgs::parsedArgs();
if (mainWidget())
@@ -174,12 +174,12 @@ int KTQUniqueApplication::newInstance()
return 0;
}
-void KTQUniqueApplication::slotInit()
+void KQUniqueApplication::slotInit()
{
- KTQApplicationPrivate::init();
+ KQApplicationPrivate::init();
}
-void KTQUniqueApplication::slotSplashTimeout()
+void KQUniqueApplication::slotSplashTimeout()
{
delete splash;
delete sp;
@@ -188,7 +188,7 @@ void KTQUniqueApplication::slotSplashTimeout()
}
-void KTQApplicationPrivate::init()
+void KQApplicationPrivate::init()
{
if (quantaApp->quantaStarted)
{
diff --git a/quanta/src/kqapp.h b/quanta/src/kqapp.h
index ea4b9b7d..728a3f63 100644
--- a/quanta/src/kqapp.h
+++ b/quanta/src/kqapp.h
@@ -35,11 +35,11 @@ class KSplash : public TQFrame
~KSplash();
};
-class KTQApplicationPrivate
+class KQApplicationPrivate
{
public:
- KTQApplicationPrivate():splash(0L), sp(0L) {};
- ~KTQApplicationPrivate() {};
+ KQApplicationPrivate():splash(0L), sp(0L) {};
+ ~KQApplicationPrivate() {};
protected:
void init();
@@ -49,27 +49,27 @@ class KTQApplicationPrivate
KSplashScreen *sp;
};
-class KTQApplication : public KApplication, KTQApplicationPrivate
+class KQApplication : public KApplication, KQApplicationPrivate
{
Q_OBJECT
TQ_OBJECT
public:
- KTQApplication();
- ~KTQApplication();
+ KQApplication();
+ ~KQApplication();
public slots:
void slotInit();
void slotSplashTimeout();
};
-class KTQUniqueApplication : public KUniqueApplication, KTQApplicationPrivate
+class KQUniqueApplication : public KUniqueApplication, KQApplicationPrivate
{
Q_OBJECT
TQ_OBJECT
public:
- KTQUniqueApplication();
- ~KTQUniqueApplication();
+ KQUniqueApplication();
+ ~KQUniqueApplication();
/** Create new instance of Quanta. Make the existing
main window active if Quanta is already running */
diff --git a/quanta/src/main.cpp b/quanta/src/main.cpp
index 7c2fe22a..fda7d0dc 100644
--- a/quanta/src/main.cpp
+++ b/quanta/src/main.cpp
@@ -208,9 +208,9 @@ int main(int argc, char *argv[])
DCOPRef("quanta", QUANTA_PACKAGE).call("newInstance()");
exit(0);
}
- app = new KTQUniqueApplication;
+ app = new KQUniqueApplication;
} else {
- app = new KTQApplication;
+ app = new KQApplication;
}
return app->exec();
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index ada60632..1ca3aa96 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -373,7 +373,7 @@ void QuantaApp::slotFileOpen(const KURL::List &urls, const TQString& encoding)
m_parserEnabled = false;
for (KURL::List::ConstIterator i = urls.begin(); i != urls.end(); ++i)
{
- if (!TQExtFileInfo::exists(*i, true, this))
+ if (!QExtFileInfo::exists(*i, true, this))
{
KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").tqarg((*i).prettyURL(0, KURL::StripFileProtocol)));
@@ -409,7 +409,7 @@ void QuantaApp::slotFileOpen(const KURL &url, const TQString& encoding, bool rea
void QuantaApp::slotFileOpenRecent(const KURL &url)
{
- if (!TQExtFileInfo::exists(url, true, this))
+ if (!QExtFileInfo::exists(url, true, this))
{
if (KMessageBox::questionYesNo(this,
i18n("The file %1 does not exist.\n Do you want to remove it from the list?").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::del(), i18n("Keep"))
@@ -602,7 +602,7 @@ void QuantaApp::saveAsTemplate(bool projectTemplate, bool selectionOnly)
stream << content;
tempFile->file()->flush();
tempFile->close();
- if (!TQExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), url, -1, true, false, this))
+ if (!QExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), url, -1, true, false, this))
KMessageBox::error(this, i18n("<qt>There was an error while creating the template file.<br>Check that you have write access to <i>%1</i>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error"));
delete tempFile;
} else
@@ -809,7 +809,7 @@ void QuantaApp::slotRepaintPreview()
tmpFile->textStream()->setCodec(TQTextCodec::codecForName(encoding.ascii()));
*(tmpFile->textStream()) << w->editIf->text();
tmpFile->close();
- if (!TQExtFileInfo::copy(KURL::fromPathOrURL(tempFileName), previewURL, -1, true)) {
+ if (!QExtFileInfo::copy(KURL::fromPathOrURL(tempFileName), previewURL, -1, true)) {
m_htmlPart->setPreviewedURL(KURL()); // copy failed, force the preview of the original
};
delete tmpFile;
@@ -864,7 +864,7 @@ void QuantaApp::slotInsertTag(const KURL& url, DirInfo dirInfo)
baseURL = w->url();
baseURL.setFileName("");
}
- KURL relURL = TQExtFileInfo::toRelative(url, baseURL);
+ KURL relURL = QExtFileInfo::toRelative(url, baseURL);
TQString urlStr = relURL.url();
if (relURL.protocol() == baseURL.protocol())
urlStr = relURL.path();
@@ -1964,10 +1964,10 @@ void QuantaApp::slotContextMenuAboutToShow()
{
if (!name.isEmpty())
{
- KURL baseUrl = TQExtFileInfo::path(w->url());
+ KURL baseUrl = QExtFileInfo::path(w->url());
urlUnderCursor = baseUrl;
QuantaCommon::setUrl(urlUnderCursor, name.stripWhiteSpace());
- urlUnderCursor = TQExtFileInfo::toAbsolute(urlUnderCursor, baseUrl);
+ urlUnderCursor = QExtFileInfo::toAbsolute(urlUnderCursor, baseUrl);
action->setText(i18n("Open File: %1").tqarg(KStringHandler::lsqueeze(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol), 80)));
action->setEnabled(true);
} else
@@ -2074,7 +2074,7 @@ void QuantaApp::slotContextMenuAboutToShow()
void QuantaApp::slotOpenFileUnderCursor()
{
- if (TQExtFileInfo::exists(urlUnderCursor, true, this))
+ if (QExtFileInfo::exists(urlUnderCursor, true, this))
{
if (QuantaCommon::checkMimeGroup(urlUnderCursor, "text" ))
{
@@ -2458,7 +2458,7 @@ KURL QuantaApp::saveToolbarToFile(const TQString& toolbarName, const KURL& destF
if (!tar.writeFile(TQFileInfo(tarFile.path()).baseName()+".actions", "user", "group", buffer2.buffer().size(), buffer2.buffer().data()))
return KURL();
tar.close();
- if (!TQExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), tarFile, -1, true, false, this))
+ if (!QExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), tarFile, -1, true, false, this))
{
KMessageBox::error(this, i18n("<qt>An error happened while saving the <b>%1</b> toolbar.<br>"
"Check that you have write permissions for<br><b>%2</b>.<br><br>This might happen if you tried save to save a global toolbar as a simple user. Use <i>Save As</i> or <i>Toolbars->Save Toolbars->Save as Local Toolbar</i> in this case. </qt>").tqarg(p_toolbar->name).tqarg(tarFile.prettyURL(0, KURL::StripFileProtocol)), i18n("Toolbar Saving Error"));
@@ -2767,7 +2767,7 @@ void QuantaApp::slotSendToolbar()
void QuantaApp::slotDownloadToolbar()
{
if (!m_newToolbarStuff)
- m_newToolbarStuff = new TQNewToolbarStuff("quanta/toolbar", this);
+ m_newToolbarStuff = new QNewToolbarStuff("quanta/toolbar", this);
m_newToolbarStuff->downloadResource();
}
@@ -2777,7 +2777,7 @@ void QuantaApp::slotUploadToolbar()
if (tempFileName.isNull())
return;
if (!m_newToolbarStuff)
- m_newToolbarStuff = new TQNewToolbarStuff("quanta/toolbar", this);
+ m_newToolbarStuff = new QNewToolbarStuff("quanta/toolbar", this);
// tempDirList.append(m_newToolbarStuff->uploadResource(tempFileName));
m_newToolbarStuff->uploadResource(tempFileName);
}
@@ -3200,7 +3200,7 @@ void QuantaApp::slotLoadToolbarForDTD(const TQString& dtdName)
//first load the local version if it exists
fileName = locateLocal("data", resourceDir + "toolbars/"+newDtd->toolbars[i]);
QuantaCommon::setUrl(url, fileName);
- if (TQExtFileInfo::exists(url, true, this))
+ if (QExtFileInfo::exists(url, true, this))
{
//showToolbarFile(url);
newToolbars += url;
@@ -3208,7 +3208,7 @@ void QuantaApp::slotLoadToolbarForDTD(const TQString& dtdName)
{
fileName = qConfig.globalDataDir + resourceDir + "toolbars/"+newDtd->toolbars[i];
QuantaCommon::setUrl(url, fileName);
- if (TQExtFileInfo::exists(url, true, this))
+ if (QExtFileInfo::exists(url, true, this))
{
newToolbars += url;// showToolbarFile(url);
}
@@ -3461,7 +3461,7 @@ void QuantaApp::slotBuildPrjToolbarsMenu()
if (Project::ref()->hasProject())
{
buildInProgress = true;
- toolbarList = TQExtFileInfo::allFiles(Project::ref()->toolbarURL(), "*"+toolbarExtension, this);
+ toolbarList = QExtFileInfo::allFiles(Project::ref()->toolbarURL(), "*"+toolbarExtension, this);
buildInProgress = false;
projectToolbarFiles->setMaxItems(toolbarList.count());
for (uint i = 0; i < toolbarList.count(); i++)
@@ -3580,7 +3580,7 @@ TQString QuantaApp::createDTEPTarball()
dirURL.setPath(DTDs::ref()->tqfind(dtdName)->fileName);
dirURL.setPath(dirURL.directory(false));
- KURL::List files = TQExtFileInfo::allFilesRelative(dirURL, "*", this);
+ KURL::List files = QExtFileInfo::allFilesRelative(dirURL, "*", this);
for ( KURL::List::Iterator it_f = files.begin(); it_f != files.end(); ++it_f )
{
TQString name = (*it_f).fileName();
@@ -3643,7 +3643,7 @@ void QuantaApp::slotEmailDTEP()
void QuantaApp::slotDownloadDTEP()
{
if (!m_newDTEPStuff)
- m_newDTEPStuff = new TQNewDTEPStuff("quanta/dtep", this);
+ m_newDTEPStuff = new QNewDTEPStuff("quanta/dtep", this);
m_newDTEPStuff->downloadResource();
}
@@ -3653,7 +3653,7 @@ void QuantaApp::slotUploadDTEP()
if (tempFileName.isNull())
return;
if (!m_newDTEPStuff)
- m_newDTEPStuff = new TQNewDTEPStuff("quanta/dtep", this);
+ m_newDTEPStuff = new QNewDTEPStuff("quanta/dtep", this);
// tempDirList.append(m_newDTEPStuff->uploadResource(tempFileName));
m_newDTEPStuff->uploadResource(tempFileName);
}
@@ -3677,14 +3677,14 @@ void QuantaApp::slotSmartTagInsertion()
void QuantaApp::slotDownloadTemplate()
{
if (!m_newTemplateStuff)
- m_newTemplateStuff = new TQNewTemplateStuff("quanta/template", this);
+ m_newTemplateStuff = new QNewTemplateStuff("quanta/template", this);
m_newTemplateStuff->downloadResource();
}
void QuantaApp::slotUploadTemplate(const TQString &fileName)
{
if (!m_newTemplateStuff)
- m_newTemplateStuff = new TQNewTemplateStuff("quanta/template", this);
+ m_newTemplateStuff = new QNewTemplateStuff("quanta/template", this);
// tempDirList.append(m_newTemplateStuff->uploadResource(fileName));
m_newTemplateStuff->uploadResource(fileName);
}
@@ -3692,14 +3692,14 @@ void QuantaApp::slotUploadTemplate(const TQString &fileName)
void QuantaApp::slotDownloadScript()
{
if (!m_newScriptStuff)
- m_newScriptStuff = new TQNewScriptStuff("quanta/script", this);
+ m_newScriptStuff = new QNewScriptStuff("quanta/script", this);
m_newScriptStuff->downloadResource();
}
void QuantaApp::slotUploadScript(const TQString &fileName)
{
if (!m_newScriptStuff)
- m_newScriptStuff = new TQNewScriptStuff("quanta/script", this);
+ m_newScriptStuff = new QNewScriptStuff("quanta/script", this);
// tempDirList.append(m_newScriptStuff->uploadResource(fileName));
m_newScriptStuff->uploadResource(fileName);
}
@@ -3708,7 +3708,7 @@ void QuantaApp::slotDownloadDoc()
{
if (!m_newDocStuff)
{
- m_newDocStuff = new TQNewDocStuff("quanta/documentation", this);
+ m_newDocStuff = new QNewDocStuff("quanta/documentation", this);
connect(m_newDocStuff, TQT_SIGNAL(installFinished()), dTab, TQT_SLOT(slotRefreshTree()));
}
m_newDocStuff->downloadResource();
@@ -5122,7 +5122,7 @@ void QuantaApp::slotFileClosed(Document *w)
KURL url = w->url();
if (Project::ref()->hasProject() && Project::ref()->tqcontains(url))
{
- KURL u = TQExtFileInfo::toRelative(url, Project::ref()->projectBaseURL());
+ KURL u = QExtFileInfo::toRelative(url, Project::ref()->projectBaseURL());
m_annotationOutput->writeAnnotations(QuantaCommon::qUrl(u), w->annotations());
}
}
diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h
index b10d6480..404a9329 100644
--- a/quanta/src/quanta.h
+++ b/quanta/src/quanta.h
@@ -56,11 +56,11 @@ class QuantaPluginInterface;
class QuantaDoc;
class QuantaView;
-class TQNewDTEPStuff;
-class TQNewToolbarStuff;
-class TQNewTemplateStuff;
-class TQNewScriptStuff;
-class TQNewDocStuff;
+class QNewDTEPStuff;
+class QNewToolbarStuff;
+class QNewTemplateStuff;
+class QNewScriptStuff;
+class QNewDocStuff;
class TQTabWidget;
class TQWidgetStack;
@@ -644,11 +644,11 @@ protected: // Protected attributes
DCOPQuanta *dcopQuanta;
KParts::PartManager *m_partManager; ///< the pointer to the part manager
TQGuardedPtr<KTextEditor::View> m_oldKTextEditor; ///< remembers the last activated GUI
- TQNewDTEPStuff *m_newDTEPStuff;
- TQNewToolbarStuff *m_newToolbarStuff;
- TQNewTemplateStuff *m_newTemplateStuff;
- TQNewScriptStuff *m_newScriptStuff;
- TQNewDocStuff *m_newDocStuff;
+ QNewDTEPStuff *m_newDTEPStuff;
+ QNewToolbarStuff *m_newToolbarStuff;
+ QNewTemplateStuff *m_newTemplateStuff;
+ QNewScriptStuff *m_newScriptStuff;
+ QNewDocStuff *m_newDocStuff;
TQDict<ToolbarEntry> m_toolbarList;
public: //TODO: check if it's worth to make a read method for them
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 2fcdda6b..d1e2054c 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -309,7 +309,7 @@ void QuantaInit::initQuanta()
TQString infoCss = tmpDir;
infoCss.tqreplace(TQRegExp("/quanta$"),"");
infoCss += "/info.css";
- TQExtFileInfo::copy(KURL().fromPathOrURL(qConfig.globalDataDir + resourceDir + "scripts/info.css"), KURL().fromPathOrURL(infoCss));
+ QExtFileInfo::copy(KURL().fromPathOrURL(qConfig.globalDataDir + resourceDir + "scripts/info.css"), KURL().fromPathOrURL(infoCss));
checkRuntimeDependencies();
ViewManager::ref()->activeDocument()->view()->setFocus();
@@ -379,7 +379,7 @@ void QuantaInit::initProject()
connect(m_project, TQT_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)),
pTab, TQT_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &)));
connect(m_project, TQT_SIGNAL(closeFiles()), ViewManager::ref(), TQT_SLOT(closeAll()));
- connect(m_project, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), TQPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
+ connect(m_project, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
connect(m_quanta->fTab, TQT_SIGNAL(insertDirInProject(const KURL&)),
m_project, TQT_SLOT(slotAddDirectory(const KURL&)));
@@ -1081,9 +1081,9 @@ void QuantaInit::initActions()
connect( char_action, TQT_SIGNAL(activated()),
TQT_TQOBJECT(m_quanta), TQT_SLOT(slotInsertChar()) );
- connect(m_quanta, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), TQPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
- connect(m_quanta->doc(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), TQPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
- connect(ViewManager::ref(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), TQPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
+ connect(m_quanta, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
+ connect(m_quanta->doc(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
+ connect(ViewManager::ref(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
QuantaBookmarks *m_bookmarks = new QuantaBookmarks(ViewManager::ref(TQT_TQOBJECT(m_quanta)));
m_bookmarks->createActions(ac);
@@ -1199,9 +1199,9 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList)
//backup the current version and restore it from the autosaved backup
KURL backupURL = originalVersion;
backupURL.setPath(backupURL.path() + "." + TQString::number(getpid(),10) + ".backup");
- TQExtFileInfo::copy(originalVersion, backupURL, -1, true, false, m_quanta);
- TQExtFileInfo::copy(autosavedVersion, originalVersion, -1, true, false, m_quanta);
- //we save a list of autosaved file names so "KTQApplicationPrivate::init()"
+ QExtFileInfo::copy(originalVersion, backupURL, -1, true, false, m_quanta);
+ QExtFileInfo::copy(autosavedVersion, originalVersion, -1, true, false, m_quanta);
+ //we save a list of autosaved file names so "KQApplicationPrivate::init()"
//can open them. If autosavedVersion.path().right(1) == "U" then we are recovering
//an untitled document
if(isUntitledDocument)
@@ -1302,7 +1302,7 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList)
connect(timer, TQT_SIGNAL(timeout()),
TQT_TQOBJECT(m_quanta), TQT_SLOT(slotProcessTimeout()));
timer->start(180*1000, true);
- TQExtFileInfo internalFileInfo;
+ QExtFileInfo internalFileInfo;
m_quanta->m_loopStarted = true;
internalFileInfo.enter_loop();
delete timer;
diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp
index 51729fb6..1ea690dc 100644
--- a/quanta/src/quantadoc.cpp
+++ b/quanta/src/quantadoc.cpp
@@ -171,7 +171,7 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding,
}
if (!url.isEmpty())
{
- if (TQExtFileInfo::exists(url, true, quantaApp))
+ if (QExtFileInfo::exists(url, true, quantaApp))
{
if (encoding.isEmpty())
encoding = quantaApp->defaultEncoding();
diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp
index e0c761e9..988bf338 100644
--- a/quanta/src/quantaview.cpp
+++ b/quanta/src/quantaview.cpp
@@ -290,7 +290,7 @@ void QuantaView::updateTab()
TQIconSet mimeIcon (KMimeType::pixmapForURL(m_document->url(), 0, KIcon::Small));
if (mimeIcon.isNull())
mimeIcon = TQIconSet(SmallIcon("document"));
- TQString urlStr = TQExtFileInfo::shortName(m_document->url().path());
+ TQString urlStr = QExtFileInfo::shortName(m_document->url().path());
if (m_document->isModified())
{
if (qConfig.showCloseButtons == "ShowAlways")
@@ -1140,7 +1140,7 @@ bool QuantaView::saveDocument(const KURL& url)
if (m_saveResult)
{
//start an event loop and wait until the saving finished
- TQExtFileInfo internalFileInfo;
+ QExtFileInfo internalFileInfo;
m_eventLoopStarted = true;
internalFileInfo.enter_loop();
}
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index 152063c8..bc91a218 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -99,7 +99,7 @@ QuantaView* ViewManager::createView(const TQString &caption)
disconnect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView *)), 0, 0 );
connect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView*)), this, TQT_SLOT(slotCloseRequest(KMdiChildView*)));
connect(view, TQT_SIGNAL(documentClosed(const KURL&)), this, TQT_SLOT(slotDocumentClosed(const KURL&)));
- connect(view, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), TQPEvents::ref(), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
+ connect(view, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& )));
return view;
}
diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp
index efe8bb69..ba35ab61 100644
--- a/quanta/treeviews/basetreeview.cpp
+++ b/quanta/treeviews/basetreeview.cpp
@@ -1036,7 +1036,7 @@ void BaseTreeView::doRename(KFileTreeViewItem* kftvi, const TQString & newName)
if ( oldURL != newURL )
{
bool proceed = true;
- if (TQExtFileInfo::exists(newURL, false, this))
+ if (QExtFileInfo::exists(newURL, false, this))
{
proceed = KMessageBox::warningContinueCancel(this, i18n("<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").tqarg(newURL.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue;
}
@@ -1159,7 +1159,7 @@ void BaseTreeView::slotCreateSiteTemplate()
bool error = false;
if (tar.open(IO_WriteOnly))
{
- KURL::List fileList = TQExtFileInfo::allFiles(url, "*", this);
+ KURL::List fileList = QExtFileInfo::allFiles(url, "*", this);
for (KURL::List::Iterator it = fileList.begin(); it != fileList.end(); ++it)
{
if (!(*it).path().endsWith("/"))
@@ -1214,7 +1214,7 @@ void BaseTreeView::slotCreateFile()
url.setPath(url.path() + "/" + fileName);
else
url.setPath(url.directory() + "/" + fileName);
- if (TQExtFileInfo::exists(url, false, this))
+ if (QExtFileInfo::exists(url, false, this))
{
KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").tqarg(fileName), i18n("Error Creating File"));
return;
diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp
index 7d7146e2..6aaca415 100644
--- a/quanta/treeviews/filestreeview.cpp
+++ b/quanta/treeviews/filestreeview.cpp
@@ -77,7 +77,7 @@ FilesTreeView::FilesTreeView(KConfig *config, TQWidget *tqparent, const char *na
if (!topURLList.tqcontains(url))
topURLList.append(url);
url = KURL();
- url.setPath(TQExtFileInfo::homeDirPath() + "/");
+ url.setPath(QExtFileInfo::homeDirPath() + "/");
if (!topURLList.tqcontains(url))
topURLList.append(url);
}
@@ -153,7 +153,7 @@ KFileTreeBranch* FilesTreeView::newBranch(const KURL& url)
newBrnch = new BaseTreeBranch(this, url, i18n("Root Folder"), SmallIcon(fileItem.iconName()), true);
} else
{
- if (url.isLocalFile() && url.equals(KURL(TQExtFileInfo::homeDirPath() + "/"), true))
+ if (url.isLocalFile() && url.equals(KURL(QExtFileInfo::homeDirPath() + "/"), true))
{
newBrnch = new BaseTreeBranch(this, url, i18n("Home Folder"), SmallIcon(fileItem.iconName()), true);
} else
@@ -218,7 +218,7 @@ void FilesTreeView::slotMenu(KListView* listView, TQListViewItem *item, const TQ
m_folderMenu->setItemVisible(m_menuFolderRename, false);
m_config->setGroup("General Options");
- if ((url == KURL("file:/") || url == KURL("file:" + TQExtFileInfo::homeDirPath() + "/")) &&
+ if ((url == KURL("file:/") || url == KURL("file:" + QExtFileInfo::homeDirPath() + "/")) &&
m_config->readBoolEntry("Home-Root Folder On", true) )
m_folderMenu ->setItemVisible(m_menuTop, false);
m_folderMenu ->setItemVisible(m_reloadMenuId, true);
diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp
index 3068fb55..21c3f345 100644
--- a/quanta/treeviews/projecttreeview.cpp
+++ b/quanta/treeviews/projecttreeview.cpp
@@ -380,7 +380,7 @@ void ProjectTreeView::slotCreateFolder()
url.setPath(url.path() + "/" + folderName + "/");
else
url.setPath(url.directory() + "/" + folderName +"/");
- if (TQExtFileInfo::createDir(url, this))
+ if (QExtFileInfo::createDir(url, this))
{
emit insertToProject(url);
}
@@ -398,7 +398,7 @@ void ProjectTreeView::slotCreateFile()
url.setPath(url.path() + "/" + fileName);
else
url.setPath(url.directory() + "/" + fileName);
- if (TQExtFileInfo::exists(url, false, this))
+ if (QExtFileInfo::exists(url, false, this))
{
KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").tqarg(fileName), i18n("Error Creating File"));
return;
@@ -406,7 +406,7 @@ void ProjectTreeView::slotCreateFile()
KTempFile *tempFile = new KTempFile(tmpDir);
tempFile->setAutoDelete(true);
tempFile->close();
- if (TQExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), url))
+ if (QExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), url))
{
emit insertToProject(url);
emit openFile(url);
@@ -422,7 +422,7 @@ void ProjectTreeView::slotRemoveFromProject(int askForRemove)
if (item)
{
KURL url = currentURL();
- TQString nice = TQExtFileInfo::toRelative(url, m_projectBaseURL).path();
+ TQString nice = QExtFileInfo::toRelative(url, m_projectBaseURL).path();
nice = KStringHandler::lsqueeze(nice, 60);
if ( !askForRemove ||
KMessageBox::warningContinueCancel(this,i18n("<qt>Do you really want to remove <br><b>%1</b><br> from the project?</qt>").tqarg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") == KMessageBox::Continue )
diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp
index 3d410c03..1543c37d 100644
--- a/quanta/treeviews/servertreeview.cpp
+++ b/quanta/treeviews/servertreeview.cpp
@@ -47,8 +47,8 @@ void ServerTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg,
TQColorGroup _cg( cg );
KURL baseURL = Project::ref()->projectBaseURL();
KURL relURL = baseURL;
- relURL.setPath(TQExtFileInfo::toRelative(url(), branch()->url()).path());
- KURL url = TQExtFileInfo::toAbsolute(relURL, baseURL);
+ relURL.setPath(QExtFileInfo::toRelative(url(), branch()->url()).path());
+ KURL url = QExtFileInfo::toAbsolute(relURL, baseURL);
if ( !Project::ref()->tqcontains(url) )
{
TQFont f = p->font();
diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp
index 00c78845..8519f72b 100644
--- a/quanta/treeviews/structtreeview.cpp
+++ b/quanta/treeviews/structtreeview.cpp
@@ -990,11 +990,11 @@ void StructTreeView::slotOpenFile()
{
TQString text = item->groupTag->name;
text.remove(item->fileNameRx);
- KURL baseUrl = TQExtFileInfo::path(write->url());
+ KURL baseUrl = QExtFileInfo::path(write->url());
KURL url = baseUrl;
QuantaCommon::setUrl(url, text.stripWhiteSpace());
- url = TQExtFileInfo::toAbsolute(url, baseUrl);
- if (TQExtFileInfo::exists(url, true, this))
+ url = QExtFileInfo::toAbsolute(url, baseUrl);
+ if (QExtFileInfo::exists(url, true, this))
{
if (QuantaCommon::checkMimeGroup(url, "text" ))
{
diff --git a/quanta/treeviews/tagattributeitems.cpp b/quanta/treeviews/tagattributeitems.cpp
index aa6c5215..0d80311a 100644
--- a/quanta/treeviews/tagattributeitems.cpp
+++ b/quanta/treeviews/tagattributeitems.cpp
@@ -345,7 +345,7 @@ TQString AttributeUrlItem::editorText(int)
QuantaCommon::setUrl(url, urlRequester->url());
baseURL = (static_cast<TagAttributeTree *>(m_listView))->node()->tag->write()->url();
baseURL.setPath(baseURL.directory());
- url = TQExtFileInfo::toRelative(url, baseURL);
+ url = QExtFileInfo::toRelative(url, baseURL);
TQString s = url.url();
if (url.protocol() == (static_cast<TagAttributeTree *>(m_listView))->node()->tag->write()->url().protocol())
s.remove(0, url.protocol().length() + 3);
@@ -360,7 +360,7 @@ void AttributeUrlItem::showEditor(int)
baseURL = (static_cast<TagAttributeTree *>(m_listView))->node()->tag->write()->url();
baseURL.setPath(baseURL.directory());
QuantaCommon::setUrl(url, text(1));
- url= TQExtFileInfo::toAbsolute(url, baseURL);
+ url= QExtFileInfo::toAbsolute(url, baseURL);
urlRequester->setURL(url.url());
urlRequester->setFocus();
}
diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp
index 75218842..5efd8b05 100644
--- a/quanta/treeviews/templatestreeview.cpp
+++ b/quanta/treeviews/templatestreeview.cpp
@@ -465,7 +465,7 @@ void TemplatesTreeView::contentsDropEvent(TQDropEvent *e)
*(tempFile->textStream()) << content;
tempFile->close();
bool proceed = true;
- if (TQExtFileInfo::exists(url, false, this))
+ if (QExtFileInfo::exists(url, false, this))
{
proceed = KMessageBox::warningContinueCancel(this, i18n("<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue;
}
@@ -953,14 +953,14 @@ TQString TemplatesTreeView::createTemplateTarball()
if ( ! currentKFileTreeViewItem()->isDir() )
files.append(url);
else {
- files = TQExtFileInfo::allFiles(dirURL, "*", this) ;
+ files = QExtFileInfo::allFiles(dirURL, "*", this) ;
dirURL = dirURL.upURL();
}
for ( KURL::List::Iterator it_f = files.begin(); it_f != files.end(); ++it_f )
{
if (!(*it_f).fileName(false).isEmpty()) {
- url = TQExtFileInfo::toRelative( (*it_f), dirURL) ;
+ url = QExtFileInfo::toRelative( (*it_f), dirURL) ;
TQFile file((*it_f).path());
file.open(IO_ReadOnly);
@@ -1062,7 +1062,7 @@ void TemplatesTreeView::slotExtractSiteTemplate()
} else
error = true;
KIO::NetAccess::removeTempFile(tempFile);
- if (!m_projectBaseURL.isEmpty() && !TQExtFileInfo::toRelative(targetURL, m_projectBaseURL).url().startsWith("."))
+ if (!m_projectBaseURL.isEmpty() && !QExtFileInfo::toRelative(targetURL, m_projectBaseURL).url().startsWith("."))
{
if (KMessageBox::questionYesNo(this, i18n("You have extracted the site template to a folder which is not under your main project folder.\nDo you want to copy the folder into the main project folder?"), TQString(), i18n("Copy Folder"), i18n("Do Not Copy")) == KMessageBox::Yes)
{
diff --git a/quanta/utility/newstuff.cpp b/quanta/utility/newstuff.cpp
index 12eb12c9..adf4e5d0 100644
--- a/quanta/utility/newstuff.cpp
+++ b/quanta/utility/newstuff.cpp
@@ -29,7 +29,7 @@
#include "quantacommon.h"
#include "qextfileinfo.h"
-void TQNewDTEPStuff::installResource()
+void QNewDTEPStuff::installResource()
{
bool ok = true;
KTar tar(m_tarName, "application/x-gzip");
@@ -53,20 +53,20 @@ void TQNewDTEPStuff::installResource()
KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded DTEP tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("DTEP Installation Error"));
}
-TQNewToolbarStuff::TQNewToolbarStuff(const TQString &type, TQWidget *tqparentWidget)
+QNewToolbarStuff::QNewToolbarStuff(const TQString &type, TQWidget *tqparentWidget)
:KNewStuffSecure(type, tqparentWidget)
{
connect(this, TQT_SIGNAL(loadToolbarFile(const KURL&)), tqparentWidget, TQT_SLOT(slotLoadToolbarFile(const KURL&)));
}
-void TQNewToolbarStuff::installResource()
+void QNewToolbarStuff::installResource()
{
KURL destURL = KURL::fromPathOrURL(KGlobal::dirs()->saveLocation("data") + resourceDir + "toolbars/" + TQFileInfo(m_tarName).fileName());
bool ok = true;
if (QuantaCommon::checkOverwrite(destURL, tqparentWidget()))
{
- if (!TQExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, tqparentWidget()))
+ if (!QExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, tqparentWidget()))
ok = false;
else
{
@@ -80,20 +80,20 @@ void TQNewToolbarStuff::installResource()
}
}
-TQNewTemplateStuff::TQNewTemplateStuff(const TQString &type, TQWidget *tqparentWidget)
+QNewTemplateStuff::QNewTemplateStuff(const TQString &type, TQWidget *tqparentWidget)
:KNewStuffSecure(type, tqparentWidget)
{
connect(this, TQT_SIGNAL(openFile(const KURL&)), tqparentWidget, TQT_SLOT(slotFileOpen(const KURL&)));
}
-void TQNewTemplateStuff::installResource()
+void QNewTemplateStuff::installResource()
{
KURL destURL = KURL::fromPathOrURL(KGlobal::dirs()->saveLocation("data") + resourceDir + "templates/" + TQFileInfo(m_tarName).fileName());
bool ok = true;
if (QuantaCommon::checkOverwrite(destURL, tqparentWidget()))
{
- if (!TQExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, tqparentWidget()))
+ if (!QExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, tqparentWidget()))
ok = false;
else
{
@@ -107,7 +107,7 @@ void TQNewTemplateStuff::installResource()
}
}
-void TQNewScriptStuff::installResource()
+void QNewScriptStuff::installResource()
{
bool ok = true;
KTar tar(m_tarName, "application/x-gzip");
@@ -124,7 +124,7 @@ void TQNewScriptStuff::installResource()
KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded script tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Script Installation Error"));
}
-void TQNewDocStuff::installResource()
+void QNewDocStuff::installResource()
{
bool ok = true;
KTar tar(m_tarName, "application/x-gzip");
diff --git a/quanta/utility/newstuff.h b/quanta/utility/newstuff.h
index e25639a0..3be6857d 100644
--- a/quanta/utility/newstuff.h
+++ b/quanta/utility/newstuff.h
@@ -29,15 +29,15 @@ Makes possible downloading and installing a DTEP resource files from a server.
class KURL;
-class TQNewDTEPStuff: public KNewStuffSecure
+class QNewDTEPStuff: public KNewStuffSecure
{
Q_OBJECT
TQ_OBJECT
public:
- TQNewDTEPStuff(const TQString &type, TQWidget *tqparentWidget=0)
+ QNewDTEPStuff(const TQString &type, TQWidget *tqparentWidget=0)
:KNewStuffSecure(type, tqparentWidget){};
- ~TQNewDTEPStuff() {};
+ ~QNewDTEPStuff() {};
private:
virtual void installResource();
@@ -48,14 +48,14 @@ Makes possible downloading and installing a Toolbar resource files from a server
@author Andras Mantia
*/
-class TQNewToolbarStuff: public KNewStuffSecure
+class QNewToolbarStuff: public KNewStuffSecure
{
Q_OBJECT
TQ_OBJECT
public:
- TQNewToolbarStuff(const TQString &type, TQWidget *tqparentWidget=0);
- ~TQNewToolbarStuff() {};
+ QNewToolbarStuff(const TQString &type, TQWidget *tqparentWidget=0);
+ ~QNewToolbarStuff() {};
signals:
void loadToolbarFile(const KURL&);
@@ -69,14 +69,14 @@ Makes possible downloading and installing a template resource files from a serve
@author Andras Mantia
*/
-class TQNewTemplateStuff: public KNewStuffSecure
+class QNewTemplateStuff: public KNewStuffSecure
{
Q_OBJECT
TQ_OBJECT
public:
- TQNewTemplateStuff(const TQString &type, TQWidget *tqparentWidget=0);
- ~TQNewTemplateStuff() {};
+ QNewTemplateStuff(const TQString &type, TQWidget *tqparentWidget=0);
+ ~QNewTemplateStuff() {};
signals:
void openFile(const KURL&);
@@ -90,15 +90,15 @@ Makes possible downloading and installing a script resource files from a server.
@author Andras Mantia
*/
-class TQNewScriptStuff: public KNewStuffSecure
+class QNewScriptStuff: public KNewStuffSecure
{
Q_OBJECT
TQ_OBJECT
public:
- TQNewScriptStuff(const TQString &type, TQWidget *tqparentWidget=0)
+ QNewScriptStuff(const TQString &type, TQWidget *tqparentWidget=0)
:KNewStuffSecure(type, tqparentWidget){};
- ~TQNewScriptStuff() {};
+ ~QNewScriptStuff() {};
private:
virtual void installResource();
@@ -109,15 +109,15 @@ Makes possible downloading and installing a documentation resource files from a
@author Andras Mantia
*/
-class TQNewDocStuff: public KNewStuffSecure
+class QNewDocStuff: public KNewStuffSecure
{
Q_OBJECT
TQ_OBJECT
public:
- TQNewDocStuff(const TQString &type, TQWidget *tqparentWidget=0)
+ QNewDocStuff(const TQString &type, TQWidget *tqparentWidget=0)
:KNewStuffSecure(type, tqparentWidget){};
- ~TQNewDocStuff() {};
+ ~QNewDocStuff() {};
private:
virtual void installResource();
diff --git a/quanta/utility/qpevents.cpp b/quanta/utility/qpevents.cpp
index 7be8fc66..52be21ba 100644
--- a/quanta/utility/qpevents.cpp
+++ b/quanta/utility/qpevents.cpp
@@ -36,7 +36,7 @@
#include "tagaction.h"
//TODO: Better create a class for each internal event action
-TQPEvents::TQPEvents(TQObject *tqparent, const char *name)
+QPEvents::QPEvents(TQObject *tqparent, const char *name)
: TQObject(tqparent, name)
{
m_eventNames["before_save"] = i18n("Before Document Save");
@@ -66,11 +66,11 @@ TQPEvents::TQPEvents(TQObject *tqparent, const char *name)
}
-TQPEvents::~TQPEvents()
+QPEvents::~QPEvents()
{
}
-void TQPEvents::slotEventHappened(const TQString& name, const TQString& argument1, const TQString& argument2)
+void QPEvents::slotEventHappened(const TQString& name, const TQString& argument1, const TQString& argument2)
{
if (!quantaApp || !Project::ref()->eventsEnabled())
return;
@@ -131,7 +131,7 @@ void TQPEvents::slotEventHappened(const TQString& name, const TQString& argument
}
} else
{
- TQString relativePath = TQExtFileInfo::toRelative(url, Project::ref()->projectBaseURL()).path();
+ TQString relativePath = QExtFileInfo::toRelative(url, Project::ref()->projectBaseURL()).path();
if (inProject && name == "after_save")
{
ev.arguments << i18n("Document saved");
@@ -224,7 +224,7 @@ void TQPEvents::slotEventHappened(const TQString& name, const TQString& argument
KMessageBox::sorry(0L, i18n("<qt>Unsupported event <b>%1</b>.</qt>").tqarg(name), i18n("Event Handling Error"));
}
-bool TQPEvents::handleEvent(const EventAction& ev)
+bool QPEvents::handleEvent(const EventAction& ev)
{
if (ev.type == EventAction::Internal)
{
@@ -344,7 +344,7 @@ bool TQPEvents::handleEvent(const EventAction& ev)
return false;
}
-TQString TQPEvents::fullEventName(const TQString &name)
+TQString QPEvents::fullEventName(const TQString &name)
{
if (m_eventNames.tqcontains(name))
return m_eventNames[name];
@@ -352,7 +352,7 @@ TQString TQPEvents::fullEventName(const TQString &name)
return name;
}
-TQString TQPEvents::fullActionName(const TQString& name)
+TQString QPEvents::fullActionName(const TQString& name)
{
if (m_actionNames.tqcontains(name))
return m_actionNames[name];
@@ -360,7 +360,7 @@ TQString TQPEvents::fullActionName(const TQString& name)
return name;
}
-TQString TQPEvents::eventName(const TQString &fullName)
+TQString QPEvents::eventName(const TQString &fullName)
{
for (TQMap<TQString, TQString>::ConstIterator it = m_eventNames.constBegin(); it != m_eventNames.constEnd(); ++it)
{
@@ -370,7 +370,7 @@ TQString TQPEvents::eventName(const TQString &fullName)
return fullName;
}
-TQString TQPEvents::actionName(const TQString &fullName)
+TQString QPEvents::actionName(const TQString &fullName)
{
for (TQMap<TQString, TQString>::ConstIterator it = m_actionNames.constBegin(); it != m_actionNames.constEnd(); ++it)
{
@@ -380,7 +380,7 @@ TQString TQPEvents::actionName(const TQString &fullName)
return fullName;
}
-TQStringList TQPEvents::eventNames()
+TQStringList QPEvents::eventNames()
{
TQStringList names;
for (TQMap<TQString, TQString>::ConstIterator it = m_eventNames.constBegin(); it != m_eventNames.constEnd(); ++it)
@@ -390,7 +390,7 @@ TQStringList TQPEvents::eventNames()
return names;
}
-TQStringList TQPEvents::actionNames()
+TQStringList QPEvents::actionNames()
{
TQStringList names;
for (TQMap<TQString, TQString>::ConstIterator it = m_actionNames.constBegin(); it != m_actionNames.constEnd(); ++it)
diff --git a/quanta/utility/qpevents.h b/quanta/utility/qpevents.h
index 31c05235..b46770ef 100644
--- a/quanta/utility/qpevents.h
+++ b/quanta/utility/qpevents.h
@@ -50,18 +50,18 @@ after_project_remove, after_commit
*/
typedef TQMap<TQString, TQValueList<EventAction> > EventActions;
-class TQPEvents : public TQObject
+class QPEvents : public TQObject
{
Q_OBJECT
TQ_OBJECT
public:
- static TQPEvents* const ref(TQObject *tqparent = 0L)
+ static QPEvents* const ref(TQObject *tqparent = 0L)
{
- static TQPEvents *m_ref;
- if (!m_ref) m_ref = new TQPEvents(tqparent);
+ static QPEvents *m_ref;
+ if (!m_ref) m_ref = new QPEvents(tqparent);
return m_ref;
}
- ~TQPEvents();
+ ~QPEvents();
TQString fullEventName(const TQString &name);
TQString fullActionName(const TQString &name);
TQString eventName(const TQString &fullName);
@@ -74,7 +74,7 @@ public slots:
void slotEventHappened(const TQString& name, const TQString& argument1, const TQString& argument2);
private:
- TQPEvents(TQObject *tqparent = 0, const char *name = 0);
+ QPEvents(TQObject *tqparent = 0, const char *name = 0);
/** Calls the action associated with an event. Returns true if the call succeeded, false
otherwise. The call might fail if:
- the action type is unknown
diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp
index 6b709ca3..7846fa15 100644
--- a/quanta/utility/quantacommon.cpp
+++ b/quanta/utility/quantacommon.cpp
@@ -704,7 +704,7 @@ bool QuantaCommon::checkOverwrite(const KURL& url, TQWidget *window)
{
bool result = true;
- if (TQExtFileInfo::exists(url, false, window))
+ if (QExtFileInfo::exists(url, false, window))
{
if (KMessageBox::warningContinueCancel(window,
i18n( "<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>" ).tqarg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), i18n("Overwrite")) == KMessageBox::Cancel)
@@ -723,7 +723,7 @@ TQStringList QuantaCommon::readPathListEntry(KConfig *config, const TQString &pK
KURL u = KURL::fromPathOrURL(*it);
if (u.isValid() && u.isLocalFile())
{
- u.setPath(TQExtFileInfo::canonicalPath(u.path()));
+ u.setPath(QExtFileInfo::canonicalPath(u.path()));
*it = u.url();
}
}
@@ -736,7 +736,7 @@ TQString QuantaCommon::readPathEntry(KConfig *config, const TQString &pKey)
KURL u = KURL::fromPathOrURL(path);
if (u.isValid() && u.isLocalFile())
{
- u.setPath(TQExtFileInfo::canonicalPath(u.path()));
+ u.setPath(QExtFileInfo::canonicalPath(u.path()));
path = u.url();
}
return path;
diff --git a/quanta/utility/quantanetaccess.cpp b/quanta/utility/quantanetaccess.cpp
index 93c664e3..ec110499 100644
--- a/quanta/utility/quantanetaccess.cpp
+++ b/quanta/utility/quantanetaccess.cpp
@@ -180,7 +180,7 @@ void QuantaNetAccess::checkProjectInsert(const KURL& target, TQWidget* window, b
{
if (confirm)
{
- TQString nice = TQExtFileInfo::toRelative(saveUrl, baseURL).path();
+ TQString nice = QExtFileInfo::toRelative(saveUrl, baseURL).path();
nice = KStringHandler::lsqueeze(nice, 60);
if ( KMessageBox::Yes != KMessageBox::questionYesNo(window, i18n("<qt>Do you want to add <br><b>%1</b><br> to the project?</qt>").tqarg(nice), i18n("Add to Project"), KStdGuiItem::add(), i18n("Do Not Add"), "AddToProject") )
{
@@ -205,7 +205,7 @@ bool QuantaNetAccess::checkProjectRemove(const KURL& src, TQWidget* window, bool
{
if (confirm)
{
- TQString nice = TQExtFileInfo::toRelative(url, baseURL).path();
+ TQString nice = QExtFileInfo::toRelative(url, baseURL).path();
nice = KStringHandler::lsqueeze(nice, 60);
if ( KMessageBox::Continue != KMessageBox::warningContinueCancel(window, i18n("<qt>Do you really want to remove <br><b>%1</b><br> from the project?</qt>").tqarg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") )
{
diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp
index 33bf5313..f354dc5c 100644
--- a/quanta/utility/tagaction.cpp
+++ b/quanta/utility/tagaction.cpp
@@ -993,7 +993,7 @@ void TagAction::execute(bool blocking)
timer = new TQTimer(this);
connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
timer->start(180*1000, true);
- TQExtFileInfo internalFileInfo;
+ QExtFileInfo internalFileInfo;
loopStarted = true;
m_killCount = 0;
internalFileInfo.enter_loop();