From a2bae01d006ea8053e85bc16d09a8cf40a4b0b75 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 17 Jun 2011 03:03:11 +0000 Subject: Fix kdewebdev FTBFS under Qt3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237074 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- quanta/utility/newstuff.cpp | 18 +++++++++--------- quanta/utility/newstuff.h | 30 +++++++++++++++--------------- quanta/utility/qpevents.cpp | 22 +++++++++++----------- quanta/utility/qpevents.h | 12 ++++++------ quanta/utility/quantacommon.cpp | 6 +++--- quanta/utility/quantanetaccess.cpp | 4 ++-- quanta/utility/tagaction.cpp | 2 +- 7 files changed, 47 insertions(+), 47 deletions(-) (limited to 'quanta/utility') 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("Unsupported event %1.").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::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::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::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::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 > 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( "The file %1 already exists.
Do you want to overwrite it?" ).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("Do you want to add
%1
to the project?").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("Do you really want to remove
%1
from the project?").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(); -- cgit v1.2.1