diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-16 19:02:47 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-16 19:02:47 +0000 |
| commit | e985f7e545f4739493965aad69bbecb136dc9346 (patch) | |
| tree | 54afd409d8acd6202dd8ab611d24e78c28e4c0a0 /quanta/project | |
| parent | f7670c198945adc3b95ad69a959fe5f8ae55b493 (diff) | |
| download | tdewebdev-e985f7e545f4739493965aad69bbecb136dc9346.tar.gz tdewebdev-e985f7e545f4739493965aad69bbecb136dc9346.zip | |
TQt4 port kdewebdev
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237029 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'quanta/project')
45 files changed, 687 insertions, 675 deletions
diff --git a/quanta/project/eventconfigurationdlg.cpp b/quanta/project/eventconfigurationdlg.cpp index 29d23964..226c4bff 100644 --- a/quanta/project/eventconfigurationdlg.cpp +++ b/quanta/project/eventconfigurationdlg.cpp @@ -29,8 +29,8 @@ #include "eventeditordlg.h" #include "qpevents.h" -EventConfigurationDlg::EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl) -: EventConfigurationDlgS(parent,name,fl) +EventConfigurationDlg::EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* tqparent, const char* name, WFlags fl) +: EventConfigurationDlgS(tqparent,name,fl) { m_actionCollection = actionCollection; } @@ -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, QPEvents::ref()->fullEventName(it.key()), QPEvents::ref()->fullActionName(ev.action)); + item = new TQListViewItem(eventsListView, TQPEvents::ref()->fullEventName(it.key()), TQPEvents::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", QPEvents::ref()->eventName(item->text(0))); - el.setAttribute("action", QPEvents::ref()->actionName(item->text(1))); + el.setAttribute("name", TQPEvents::ref()->eventName(item->text(0))); + el.setAttribute("action", TQPEvents::ref()->actionName(item->text(1))); if (el.attribute("action") == "script" || el.attribute("action") == "action") el.setAttribute("type", "external"); else @@ -141,7 +141,7 @@ void EventConfigurationDlg::slotDeleteEvent() { TQListViewItem *item = eventsListView->currentItem(); if (!item) return; - if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove the configuration of the <b>%1</b> event?</qt>").arg(item->text(0)), i18n("Delete Event Configuration"),KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove the configuration of the <b>%1</b> event?</qt>").tqarg(item->text(0)), i18n("Delete Event Configuration"),KStdGuiItem::del()) == KMessageBox::Continue) { delete item; } diff --git a/quanta/project/eventconfigurationdlg.h b/quanta/project/eventconfigurationdlg.h index c1451c81..0d8a305b 100644 --- a/quanta/project/eventconfigurationdlg.h +++ b/quanta/project/eventconfigurationdlg.h @@ -27,9 +27,10 @@ typedef TQMap<TQString, TQValueList<EventAction> > EventActions; class EventConfigurationDlg : public EventConfigurationDlgS { Q_OBJECT + TQ_OBJECT public: - EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~EventConfigurationDlg(); void initEvents(EventActions *events); void saveEvents(TQDomDocument dom); diff --git a/quanta/project/eventconfigurationdlgs.ui b/quanta/project/eventconfigurationdlgs.ui index 329791b8..a9f8461d 100644 --- a/quanta/project/eventconfigurationdlgs.ui +++ b/quanta/project/eventconfigurationdlgs.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EventConfigurationDlgS</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EventConfigurationDlgS</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>enableEventsBox</cstring> </property> @@ -27,7 +27,7 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -64,7 +64,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>172</width> <height>20</height> @@ -152,7 +152,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>150</width> <height>20</height> @@ -211,12 +211,12 @@ <tabstop>editButton</tabstop> <tabstop>deleteButton</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>slotEditEvent()</slot> <slot>slotAddEvent()</slot> <slot>slotDeleteEvent()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/quanta/project/eventeditordlg.cpp b/quanta/project/eventeditordlg.cpp index 2926f916..db5c8b93 100644 --- a/quanta/project/eventeditordlg.cpp +++ b/quanta/project/eventeditordlg.cpp @@ -35,12 +35,12 @@ extern TQString taskLeaderStr; extern TQString teamLeaderStr; extern TQString subprojectLeaderStr; -EventEditorDlg::EventEditorDlg(KActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl) -: EventEditorDlgS(parent,name,fl) +EventEditorDlg::EventEditorDlg(KActionCollection *actionCollection, TQWidget* tqparent, const char* name, WFlags fl) +: EventEditorDlgS(tqparent,name,fl) { m_actionCollection = actionCollection; - eventCombo->insertStringList(QPEvents::ref()->eventNames()); - actionCombo->insertStringList(QPEvents::ref()->actionNames()); + eventCombo->insertStringList(TQPEvents::ref()->eventNames()); + actionCombo->insertStringList(TQPEvents::ref()->actionNames()); slotActionChanged(actionCombo->currentText()); } @@ -79,7 +79,7 @@ TQString EventEditorDlg::argument1() { TQString s = argument1Combo->currentText(); TQString actionType = actionCombo->currentText(); - if (actionType == QPEvents::ref()->fullActionName("email")) + if (actionType == TQPEvents::ref()->fullActionName("email")) { if (s == i18n(teamLeaderStr.utf8())) s = "teamleader"; @@ -96,7 +96,7 @@ TQString EventEditorDlg::argument1() } return s; } else - if (actionType == QPEvents::ref()->fullActionName("script")) + if (actionType == TQPEvents::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 == QPEvents::ref()->fullActionName("action")) + if (actionType == TQPEvents::ref()->fullActionName("action")) { TQString s = argument1Combo->currentText(); for (TQMap<TQString, TQString>::ConstIterator it = m_otherActions.constBegin(); it != m_otherActions.constEnd(); ++it) @@ -126,7 +126,7 @@ TQString EventEditorDlg::argument1() return s; } - return TQString::null; + return TQString(); } TQString EventEditorDlg::argument2() @@ -134,7 +134,7 @@ TQString EventEditorDlg::argument2() if (argument2Combo->isEnabled()) { TQString actionType = actionCombo->currentText(); - if (actionType == QPEvents::ref()->fullActionName("log")) + if (actionType == TQPEvents::ref()->fullActionName("log")) { int id = argument2Combo->currentItem(); if (id == 0) @@ -142,7 +142,7 @@ TQString EventEditorDlg::argument2() else return "minimal"; } else - if (actionType == QPEvents::ref()->fullActionName("script")) + if (actionType == TQPEvents::ref()->fullActionName("script")) { int id = argument2Combo->currentItem(); if (id == 0) @@ -152,7 +152,7 @@ TQString EventEditorDlg::argument2() } return argument2Combo->currentText(); } else - return TQString::null; + return TQString(); } TQString EventEditorDlg::argument3() @@ -160,7 +160,7 @@ TQString EventEditorDlg::argument3() if (argument3Combo->isEnabled()) { TQString actionType = actionCombo->currentText(); - if (actionType == QPEvents::ref()->fullActionName("log")) + if (actionType == TQPEvents::ref()->fullActionName("log")) { int id = argument3Combo->currentItem(); if (id == 0) @@ -170,7 +170,7 @@ TQString EventEditorDlg::argument3() } return argument3Combo->currentText(); } else - return TQString::null; + return TQString(); } TQString EventEditorDlg::argument4() @@ -179,13 +179,13 @@ TQString EventEditorDlg::argument4() { return argument4Combo->currentText(); } else - return TQString::null; + return TQString(); } void EventEditorDlg::setArguments(const TQStringList& arguments) { TQString actionType = actionCombo->currentText(); - if (actionType == QPEvents::ref()->fullActionName("email")) + if (actionType == TQPEvents::ref()->fullActionName("email")) { TQString s = arguments[0]; if (s == "teamleader") @@ -218,10 +218,10 @@ void EventEditorDlg::setArguments(const TQStringList& arguments) argument1Combo->setCurrentItem(0); } } else - if (actionType == QPEvents::ref()->fullActionName("script")) + if (actionType == TQPEvents::ref()->fullActionName("script")) { TQString s = arguments[0]; - if (m_scriptActions.contains(s)) + if (m_scriptActions.tqcontains(s)) s = m_scriptActions[s]; if (argument1Combo->contains(s)) { @@ -246,10 +246,10 @@ void EventEditorDlg::setArguments(const TQStringList& arguments) argument2Combo->setCurrentItem(1); return; //setup for script arguments completed } else - if (actionType == QPEvents::ref()->fullActionName("action")) + if (actionType == TQPEvents::ref()->fullActionName("action")) { TQString s = arguments[0]; - if (m_otherActions.contains(s)) + if (m_otherActions.tqcontains(s)) s = m_otherActions[s]; if (argument1Combo->contains(s)) { @@ -268,7 +268,7 @@ void EventEditorDlg::setArguments(const TQStringList& arguments) argument1Combo->setCurrentItem(0); } } else - if (actionType == QPEvents::ref()->fullActionName("log")) + if (actionType == TQPEvents::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 == QPEvents::ref()->fullActionName("email")) + if (name == TQPEvents::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 == QPEvents::ref()->fullActionName("log")) + if (name == TQPEvents::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 == QPEvents::ref()->fullActionName("script")) + if (name == TQPEvents::ref()->fullActionName("script")) { argument1Label->setEnabled(true); argument1Label->setText(i18n("Action name:")); @@ -363,7 +363,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name) action = dynamic_cast<TagAction*>(m_actionCollection->action(i)); if (action && action->type() == "script") { - s = action->text().replace(r, ""); + s = action->text().tqreplace(r, ""); items.append(s); m_scriptActions[action->name()] = s; } @@ -378,7 +378,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name) argument2Combo->insertItem(i18n("Yes"), 0); argument2Combo->insertItem(i18n("No"), 1); } else - if (name == QPEvents::ref()->fullActionName("action")) + if (name == TQPEvents::ref()->fullActionName("action")) { argument1Label->setEnabled(true); argument1Label->setText(i18n("Action name:")); @@ -392,7 +392,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name) action = dynamic_cast<TagAction*>(a); if (!action || action->type() != "script") { - s = a->text().replace(r, ""); + s = a->text().tqreplace(r, ""); items.append(s); m_otherActions[a->name()] = s; } diff --git a/quanta/project/eventeditordlg.h b/quanta/project/eventeditordlg.h index 9f89a09c..73897b39 100644 --- a/quanta/project/eventeditordlg.h +++ b/quanta/project/eventeditordlg.h @@ -27,9 +27,10 @@ class KComboBox; class EventEditorDlg : public EventEditorDlgS { Q_OBJECT + TQ_OBJECT public: - EventEditorDlg(KActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + EventEditorDlg(KActionCollection *actionCollection, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~EventEditorDlg(); void setEvent(const TQString &name); void setAction(const TQString &name); diff --git a/quanta/project/eventeditordlgs.ui b/quanta/project/eventeditordlgs.ui index a19a35d1..ba10f39b 100644 --- a/quanta/project/eventeditordlgs.ui +++ b/quanta/project/eventeditordlgs.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EventEditorDlgS</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EventEditorDlgS</cstring> </property> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>350</width> <height>0</height> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -62,7 +62,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -91,7 +91,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>argument1Label</cstring> </property> @@ -123,7 +123,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>argument2Label</cstring> </property> @@ -155,7 +155,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>argument3Label</cstring> </property> @@ -171,7 +171,7 @@ <string>Argument 3:</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>argument4Label</cstring> </property> @@ -229,8 +229,8 @@ <slot>slotActionChanged(const QString&)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>slotActionChanged(const QString &name)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/project/membereditdlg.cpp b/quanta/project/membereditdlg.cpp index 1b27d354..047ff302 100644 --- a/quanta/project/membereditdlg.cpp +++ b/quanta/project/membereditdlg.cpp @@ -38,8 +38,8 @@ TQString teamLeaderStr = I18N_NOOP("Team Leader"); TQString subprojectLeaderStr = I18N_NOOP("Subproject Leader"); -MemberEditDlg::MemberEditDlg(TQWidget *parent, const char *name) - : MemberEditDlgS(parent, name) +MemberEditDlg::MemberEditDlg(TQWidget *tqparent, const char *name) + : MemberEditDlgS(tqparent, name) { TQValueList<SubProject> *subprojects = Project::ref()->subprojects(); for (TQValueList<SubProject>::ConstIterator it = subprojects->constBegin(); it != subprojects->constEnd(); ++it) @@ -53,7 +53,7 @@ MemberEditDlg::MemberEditDlg(TQWidget *parent, const char *name) { nameCombo->insertItem(it.key()); } - nameCombo->insertItem(TQString::null, 0); + nameCombo->insertItem(TQString(), 0); roleCombo->insertItem(i18n(teamLeaderStr.utf8())); roleCombo->insertItem(i18n(subprojectLeaderStr.utf8())); @@ -123,7 +123,7 @@ void MemberEditDlg::slotMemberSelected() { TQString name = nameCombo->currentText(); TQMap<TQString, TeamMember> members = Project::ref()->allMembers(); - if (members.contains(name)) + if (members.tqcontains(name)) { emailEdit->setText(members[name].email); } diff --git a/quanta/project/membereditdlg.h b/quanta/project/membereditdlg.h index 3c6c94a8..c4173e91 100644 --- a/quanta/project/membereditdlg.h +++ b/quanta/project/membereditdlg.h @@ -25,8 +25,9 @@ class MemberEditDlg : public MemberEditDlgS { Q_OBJECT + TQ_OBJECT public: - MemberEditDlg(TQWidget *parent = 0, const char *name = 0); + MemberEditDlg(TQWidget *tqparent = 0, const char *name = 0); ~MemberEditDlg(); void selectMember(const TQString &name); diff --git a/quanta/project/membereditdlgs.ui b/quanta/project/membereditdlgs.ui index 487e20bf..f8d22bbe 100644 --- a/quanta/project/membereditdlgs.ui +++ b/quanta/project/membereditdlgs.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MemberEditDlgS</class> <author>(C) 2005 Andras Mantia <[email protected]></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MemberEditDlgS</cstring> </property> @@ -33,7 +33,7 @@ <string>...</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -62,7 +62,7 @@ <cstring>taskEdit</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -73,7 +73,7 @@ <cstring>taskEdit</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -84,7 +84,7 @@ <cstring>subprojectCombo</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -95,7 +95,7 @@ <cstring>roleCombo</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -119,7 +119,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -175,13 +175,13 @@ <tabstop>subprojectCombo</tabstop> <tabstop>editSubprojectsButton</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>slotRoleSelected(const QString& roleName)</slot> <slot>slotEditSubprojects()</slot> <slot>slotMemberSelected()</slot> <slot>slotSelectFromAddrBook()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp index fa4af964..d5988c69 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -68,15 +68,15 @@ extern TQString taskLeaderStr; extern TQString teamLeaderStr; extern TQString subprojectLeaderStr; -Project::Project(KMainWindow *parent) +Project::Project(KMainWindow *tqparent) : TQObject() { d = new ProjectPrivate(this); connect(d, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); - d->m_mainWindow = parent; + d->m_mainWindow = tqparent; d->m_uploadDialog = 0L; keepPasswd = true; - d->initActions(parent->actionCollection()); + d->initActions(tqparent->actionCollection()); } Project::~Project() @@ -109,7 +109,7 @@ KURL::List Project::files() return list; } -void Project::insertFile(const KURL& nameURL, bool repaint ) +void Project::insertFile(const KURL& nameURL, bool tqrepaint ) { if (d->excludeRx.exactMatch(nameURL.path())) return; @@ -118,7 +118,7 @@ void Project::insertFile(const KURL& nameURL, bool repaint ) if ( !d->baseURL.isParentOf(url) ) { KURLRequesterDlg *urlRequesterDlg = new KURLRequesterDlg( d->baseURL.prettyURL(), d->m_mainWindow, ""); - urlRequesterDlg->setCaption(i18n("%1: Copy to Project").arg(nameURL.prettyURL(0, KURL::StripFileProtocol))); + urlRequesterDlg->setCaption(i18n("%1: Copy to Project").tqarg(nameURL.prettyURL(0, KURL::StripFileProtocol))); urlRequesterDlg->urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly); urlRequesterDlg->exec(); KURL destination = urlRequesterDlg->selectedURL(); @@ -143,26 +143,26 @@ void Project::insertFile(const KURL& nameURL, bool repaint ) TQDomElement el; while ( d->baseURL.isParentOf(url) ) { - if ( !d->m_projectFiles.contains(url) ) + if ( !d->m_projectFiles.tqcontains(url) ) { el = d->dom.createElement("item"); - el.setAttribute("url", QuantaCommon::qUrl( QExtFileInfo::toRelative(url, d->baseURL) )); + el.setAttribute("url", QuantaCommon::qUrl( TQExtFileInfo::toRelative(url, d->baseURL) )); d->dom.firstChild().firstChild().appendChild( el ); KURL u = url.upURL(); - ProjectURL *parentURL = d->m_projectFiles.find(u); - int uploadStatus = 1; - if (parentURL) - uploadStatus = parentURL->uploadStatus; - d->m_projectFiles.insert( new ProjectURL(url, "", uploadStatus, false, el) ); + ProjectURL *tqparentURL = d->m_projectFiles.tqfind(u); + int uploadtqStatus = 1; + if (tqparentURL) + uploadtqStatus = tqparentURL->uploadtqStatus; + d->m_projectFiles.insert( new ProjectURL(url, "", uploadtqStatus, false, el) ); } url.setPath(url.directory(false)); } - emit eventHappened("after_project_add", url.url(), TQString::null); + emit eventHappened("after_project_add", url.url(), TQString()); setModified(); - if ( repaint ) + if ( tqrepaint ) { emit reloadTree( &(d->m_projectFiles), false, TQStringList()); - emit newStatus(); + emit newtqStatus(); } } @@ -213,7 +213,7 @@ void Project::loadLastProject(bool reload) { KURL tempURL = KURL().fromPathOrURL(tempPath); if (KIO::NetAccess::exists(tempURL, false, d->m_mainWindow) && - KMessageBox::questionYesNo(d->m_mainWindow, i18n("<qt>Found a backup for project <b>%1</b>.<br> Do you want to open it?</qt>").arg(url.prettyURL()), i18n("Open Project Backup"), KStdGuiItem::open(), i18n("Do Not Open") ) + KMessageBox::questionYesNo(d->m_mainWindow, i18n("<qt>Found a backup for project <b>%1</b>.<br> Do you want to open it?</qt>").tqarg(url.prettyURL()), i18n("Open Project Backup"), KStdGuiItem::open(), i18n("Do Not Open") ) == KMessageBox::Yes) { d->m_tmpProjectFile = tempPath; @@ -258,11 +258,11 @@ void Project::slotOpenProject(const KURL &url) kdDebug(24000) << "Open recent project: " << url <<endl; if ( !url.isEmpty() ) { - if ( !QExtFileInfo::exists(url, true, d->m_mainWindow) ) + if ( !TQExtFileInfo::exists(url, true, d->m_mainWindow) ) { emit hideSplash(); if (KMessageBox::questionYesNo(d->m_mainWindow, - i18n("<qt>The file <b>%1</b> does not exist.<br> Do you want to remove it from the list?</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)), TQString::null, KStdGuiItem::del(), i18n("Keep") ) + i18n("<qt>The file <b>%1</b> does not exist.<br> Do you want to remove it from the list?</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::del(), i18n("Keep") ) == KMessageBox::Yes) { d->m_projectRecent->removeURL(url); @@ -271,7 +271,7 @@ void Project::slotOpenProject(const KURL &url) } else { d->loadProject ( url ); - emit eventHappened("after_project_open", url.url(), TQString::null); + emit eventHappened("after_project_open", url.url(), TQString()); } } } @@ -297,7 +297,7 @@ void Project::slotAddDirectory(const KURL& p_dirURL, bool showDlg) if (showDlg) { KURLRequesterDlg *urlRequesterDlg = new KURLRequesterDlg( d->baseURL.prettyURL(), d->m_mainWindow, ""); - urlRequesterDlg->setCaption(i18n("%1: Copy to Project").arg(dirURL.prettyURL(0, KURL::StripFileProtocol))); + urlRequesterDlg->setCaption(i18n("%1: Copy to Project").tqarg(dirURL.prettyURL(0, KURL::StripFileProtocol))); urlRequesterDlg->urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly); urlRequesterDlg->exec(); destination = urlRequesterDlg->selectedURL(); @@ -364,7 +364,7 @@ void Project::slotRenamed(const KURL& oldURL, const KURL& newURL) ProjectURL * curUrl = it.current(); if ( oldURL == *curUrl || (isFolder && oldURL.isParentOf(*curUrl)) ) { - curUrl->setPath( curUrl->path().replace(oldURL.path(), newURL.path()) ); + curUrl->setPath( curUrl->path().tqreplace(oldURL.path(), newURL.path()) ); el = curUrl->domElement; el.setAttribute("url", d->m_projectFiles.toRelative(*curUrl).path()); // el.setAttribute("upload_time", ""); @@ -379,12 +379,12 @@ void Project::slotRenamed(const KURL& oldURL, const KURL& newURL) progressBar->setValue(0); progressBar->setTextEnabled(false); - emit statusMsg(TQString::null); + emit statusMsg(TQString()); if (d->m_modified) setModified(); // there happens more than setting the flag ! emit reloadTree(&(d->m_projectFiles), false, TQStringList()); - emit newStatus(); + emit newtqStatus(); } @@ -406,7 +406,7 @@ void Project::slotRemove(const KURL& urlToRemove) { d->m_projectFiles.removeFromListAndXML(url); d->m_modified = true; - emit eventHappened("after_project_remove", url.url(), TQString::null); + emit eventHappened("after_project_remove", url.url(), TQString()); if (!isFolder) break; } @@ -417,17 +417,17 @@ void Project::slotRemove(const KURL& urlToRemove) progressBar->setValue(0); progressBar->setTextEnabled(false); - emit statusMsg(TQString::null); + emit statusMsg(TQString()); if (d->m_modified) setModified(); // there happens more than setting the flag ! emit reloadTree( &(d->m_projectFiles), false, TQStringList() ); - emit newStatus(); + emit newtqStatus(); - TQString urlPath = QExtFileInfo::toRelative(urlToRemove, d->baseURL).path(); + TQString urlPath = TQExtFileInfo::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>").arg(nice), i18n("Remove From Server"), KStdGuiItem::remove(), "RemoveFromServer") == KMessageBox::Continue ) + 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 ) { TQDomNode profilesNode = d->m_sessionDom.firstChild().firstChild().namedItem("uploadprofiles"); TQDomNodeList profileList = profilesNode.toElement().elementsByTagName("profile"); @@ -468,9 +468,9 @@ void Project::slotOptions() topLayout->addWidget(&optionsPage); optionsPage.linePrjName->setText( d->projectName ); - url = QExtFileInfo::toRelative(d->templateURL, d->baseURL); + url = TQExtFileInfo::toRelative(d->templateURL, d->baseURL); optionsPage.linePrjTmpl->setText(QuantaCommon::qUrl(url)); - url = QExtFileInfo::toRelative(d->toolbarURL, d->baseURL); + url = TQExtFileInfo::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 = QExtFileInfo::toAbsolute(d->templateURL, d->baseURL); - if (!QExtFileInfo::createDir(d->templateURL, d->m_mainWindow)) + d->templateURL = TQExtFileInfo::toAbsolute(d->templateURL, d->baseURL); + if (!TQExtFileInfo::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 = QExtFileInfo::toAbsolute(d->toolbarURL, d->baseURL); - if (!QExtFileInfo::createDir(d->toolbarURL, d->m_mainWindow)) + d->toolbarURL = TQExtFileInfo::toAbsolute(d->toolbarURL, d->baseURL); + if (!TQExtFileInfo::createDir(d->toolbarURL, d->m_mainWindow)) { QuantaCommon::dirCreationError(d->m_mainWindow, d->toolbarURL); } @@ -658,14 +658,14 @@ void Project::slotOptions() el = projectNode.namedItem("author").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el =d->dom.createElement("author"); projectNode.appendChild( el ); el.appendChild(d->dom.createTextNode( d->author ) ); el = projectNode.namedItem("email").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el =d->dom.createElement("email"); projectNode.appendChild( el ); el.appendChild(d->dom.createTextNode( d->email ) ); @@ -673,7 +673,7 @@ void Project::slotOptions() // Debugger el =projectNode.namedItem("debuggerclient").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el =d->dom.createElement("debuggerclient"); projectNode.appendChild( el ); el.appendChild(d->dom.createTextNode( d->debuggerClient ) ); @@ -684,7 +684,7 @@ void Project::slotOptions() excludeStr = optionsPage.lineExclude->text(); el =projectNode.namedItem("exclude").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el =d->dom.createElement("exclude"); if (d->m_excludeCvsignore) el.setAttribute("cvsignore", "true"); @@ -706,7 +706,7 @@ void Project::slotOptions() } el = projectNode.namedItem("templates").toElement(); - url = QExtFileInfo::toRelative(d->templateURL, d->baseURL); + url = TQExtFileInfo::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 = QExtFileInfo::toRelative(d->toolbarURL, d->baseURL); + url = TQExtFileInfo::toRelative(d->toolbarURL, d->baseURL); el = projectNode.namedItem("toolbars").toElement(); if(el.isNull()) { @@ -826,7 +826,7 @@ void Project::slotOptions() //subprojects without a leader for (uint i = 0; i < d->m_subprojects.count(); i++) { - if (!savedSubprojects.contains(d->m_subprojects[i].name)) + if (!savedSubprojects.tqcontains(d->m_subprojects[i].name)) { el = d->dom.createElement("subproject"); el.setAttribute("name", d->m_subprojects[i].name); @@ -874,7 +874,7 @@ void Project::slotUploadURL(const KURL& urlToUpload, const TQString& profileName if (!ViewManager::ref()->saveAll()) return; - KURL url = QExtFileInfo::toRelative( urlToUpload, d->baseURL); + KURL url = TQExtFileInfo::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 = QExtFileInfo::toRelative(url, d->baseURL ); + KURL tempUrl = TQExtFileInfo::toRelative(url, d->baseURL ); if ( !tempUrl.path().startsWith("/") ) { returnUrl = d->previewPrefix; @@ -921,16 +921,16 @@ KURL Project::urlWithPrefix(const KURL& url) /*Returns true if url is already in the project.*/ -bool Project::contains(const KURL& url) +bool Project::tqcontains(const KURL& url) { if (d->m_projectFiles.isEmpty()) d->m_projectFiles.readFromXML(d->dom, d->baseURL, d->templateURL, d->excludeRx); - return d->m_projectFiles.contains(url); + return d->m_projectFiles.tqcontains(url); } void Project::slotFileDescChanged(const KURL& url, const TQString& desc) { - ProjectURL *proUrl = d->m_projectFiles.find(url); + ProjectURL *proUrl = d->m_projectFiles.tqfind(url); if (! proUrl) return; @@ -942,7 +942,7 @@ void Project::slotFileDescChanged(const KURL& url, const TQString& desc) void Project::slotUploadStatusChanged(const KURL& url, int status) { - if (! d->m_projectFiles.contains(url)) + if (! d->m_projectFiles.tqcontains(url)) return; TQDomElement el; @@ -952,7 +952,7 @@ void Project::slotUploadStatusChanged(const KURL& url, int status) { if ( it.currentKey().startsWith(urlStr) || it.currentKey() + "/" == urlStr) { - it.current()->uploadStatus = status; + it.current()->uploadtqStatus = status; el = it.current()->domElement; el.setAttribute("uploadstatus", status); } @@ -960,9 +960,9 @@ void Project::slotUploadStatusChanged(const KURL& url, int status) setModified(); } -void Project::slotChangeDocumentFolderStatus(const KURL &url, bool status) +void Project::slotChangeDocumentFoldertqStatus(const KURL &url, bool status) { - ProjectURL *proUrl = d->m_projectFiles.find(url); + ProjectURL *proUrl = d->m_projectFiles.tqfind(url); if (! proUrl) return; @@ -985,10 +985,10 @@ KURL Project::projectBaseURL() Document *w = ViewManager::ref()->activeDocument(); if ( !w || w->isUntitled() ) { - result = QExtFileInfo::home(); + result = TQExtFileInfo::home(); } else { - result = QExtFileInfo::path(w->url()); + result = TQExtFileInfo::path(w->url()); } } return result; @@ -1013,7 +1013,7 @@ void Project::savePassword(const TQString &entry, const TQString &passwd, bool s TQString Project::password(const TQString &entry) { - if (d->m_passwdList.contains(entry)) + if (d->m_passwdList.tqcontains(entry)) return d->m_passwdList[entry]; else { @@ -1187,7 +1187,7 @@ TeamMember Project::teamLeader() TeamMember Project::subprojectLeader(const TQString &name) { - if (d->m_subprojectLeaders.contains(name)) + if (d->m_subprojectLeaders.tqcontains(name)) return d->m_subprojectLeaders[name]; else return TeamMember(); @@ -1195,7 +1195,7 @@ TeamMember Project::subprojectLeader(const TQString &name) TeamMember Project::taskLeader(const TQString &name) { - if (d->m_taskLeaders.contains(name)) + if (d->m_taskLeaders.tqcontains(name)) return d->m_taskLeaders[name]; else return TeamMember(); @@ -1257,7 +1257,7 @@ bool Project::queryClose() bool canExit = true; if (hasProject()) { - emit eventHappened("before_project_close", d->baseURL.url(), TQString::null); + emit eventHappened("before_project_close", d->baseURL.url(), TQString()); d->config->setGroup("Projects"); KURL url = d->projectURL.url(); url.setPass(""); @@ -1270,7 +1270,7 @@ bool Project::queryClose() } if (canExit) { - emit eventHappened("after_project_close", d->baseURL.url(), TQString::null); + emit eventHappened("after_project_close", d->baseURL.url(), TQString()); // empty dom tree d->dom.clear(); d->m_sessionDom.clear(); @@ -1280,7 +1280,7 @@ bool Project::queryClose() reloadTree( &(d->m_projectFiles), true, TQStringList()); d->adjustActions(); d->m_projectRecent->setCurrentItem(-1); - newStatus(); + newtqStatus(); // kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); } } @@ -1313,11 +1313,11 @@ void Project::slotShowProjectToolbar(bool show) void Project::loadBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf) { - if (!markIf || !hasProject() || !contains(url) || !d->m_persistentBookmarks) + if (!markIf || !hasProject() || !tqcontains(url) || !d->m_persistentBookmarks) return; TQDomNodeList nl = d->dom.elementsByTagName("item"); TQDomElement el; - KURL u = QExtFileInfo::toRelative(url, d->baseURL); + KURL u = TQExtFileInfo::toRelative(url, d->baseURL); for ( uint i = 0; i < nl.count(); i++ ) { el = nl.item(i).toElement(); @@ -1337,7 +1337,7 @@ void Project::loadBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf) void Project::saveBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf) { - if (!markIf || !hasProject() || !contains(url) || !d->m_persistentBookmarks) + if (!markIf || !hasProject() || !tqcontains(url) || !d->m_persistentBookmarks) return; TQStringList markList; TQPtrList<KTextEditor::Mark> marks = markIf->marks(); @@ -1345,11 +1345,11 @@ void Project::saveBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf) { KTextEditor::Mark *mark = marks.at(i); if (mark->type == KTextEditor::MarkInterface::Bookmark) - markList << TQString("%1").arg(mark->line); + markList << TQString("%1").tqarg(mark->line); } TQDomNodeList nl = d->dom.elementsByTagName("item"); TQDomElement el; - KURL u = QExtFileInfo::toRelative(url, d->baseURL); + KURL u = TQExtFileInfo::toRelative(url, d->baseURL); for ( uint i = 0; i < nl.count(); i++ ) { el = nl.item(i).toElement(); @@ -1363,11 +1363,11 @@ void Project::saveBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf) void Project::loadCursorPosition(const KURL &url, KTextEditor::ViewCursorInterface *viewCursorIf) { - if (!viewCursorIf || !hasProject() || !contains(url)) + if (!viewCursorIf || !hasProject() || !tqcontains(url)) return; TQDomNodeList nl = d->m_sessionDom.elementsByTagName("item"); TQDomElement el; - KURL u = QExtFileInfo::toRelative(url, d->baseURL); + KURL u = TQExtFileInfo::toRelative(url, d->baseURL); for ( uint i = 0; i < nl.count(); i++ ) { el = nl.item(i).toElement(); @@ -1387,20 +1387,20 @@ void Project::loadCursorPosition(const KURL &url, KTextEditor::ViewCursorInterfa } KURL u2 = d->baseURL; QuantaCommon::setUrl(u2, el.attribute("url")); - if (!contains(u2)) + if (!tqcontains(u2)) { - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); } } } void Project::saveCursorPosition(const KURL &url, KTextEditor::ViewCursorInterface *viewCursorIf) { - if (!viewCursorIf || !hasProject() || !contains(url)) + if (!viewCursorIf || !hasProject() || !tqcontains(url)) return; TQDomNodeList nl = d->m_sessionDom.elementsByTagName("item"); TQDomElement el; - KURL u = QExtFileInfo::toRelative(url, d->baseURL); + KURL u = TQExtFileInfo::toRelative(url, d->baseURL); uint line, col; viewCursorIf->cursorPosition(&line, &col); bool found = false; diff --git a/quanta/project/project.h b/quanta/project/project.h index 95995036..6315c058 100644 --- a/quanta/project/project.h +++ b/quanta/project/project.h @@ -22,7 +22,7 @@ #include "projecturl.h" -class QDom; +class TQDom; class ProjectPrivate; class ProjectList; namespace KTextEditor{ @@ -53,6 +53,7 @@ struct SubProject { class Project : public TQObject { Q_OBJECT + TQ_OBJECT friend class ProjectPrivate; // need this because I use the signals public: @@ -63,10 +64,10 @@ public: * the parameter is only used at the first call to create the class * */ - static Project* const ref(KMainWindow *parent = 0L) + static Project* const ref(KMainWindow *tqparent = 0L) { static Project *m_ref; - if (!m_ref) m_ref = new Project(parent); + if (!m_ref) m_ref = new Project(tqparent); return m_ref; } @@ -78,7 +79,7 @@ public: TQStringList fileNameList(); KURL::List files(); - void insertFile( const KURL& nameURL, bool repaint ); + void insertFile( const KURL& nameURL, bool tqrepaint ); void readConfig(KConfig *); /** loads the last project again if reload == true but checks in any case if there is a left over project from a crash @@ -86,7 +87,7 @@ public: void loadLastProject(bool reload); /** Returns the relative url with the prefix inserted. */ KURL urlWithPrefix(const KURL& url); - bool contains(const KURL &url); + bool tqcontains(const KURL &url); /** Read property of TQString defaultDTD. */ const TQString& defaultDTD(); const TQString& defaultEncoding(); @@ -173,7 +174,7 @@ public slots: void slotRescanPrjDir(); void slotFileDescChanged(const KURL& url, const TQString& desc); void slotUploadStatusChanged(const KURL& url, int status); - void slotChangeDocumentFolderStatus(const KURL& url, bool status); + void slotChangeDocumentFoldertqStatus(const KURL& url, bool status); void slotReloadProjectDocs(); @@ -193,7 +194,7 @@ signals: void messages(const TQString& ); void enableMessageWidget(); - void newStatus(); + void newtqStatus(); void statusMsg(const TQString &); /** No descriptions */ void newProjectLoaded(const TQString &, const KURL &, const KURL &); @@ -203,7 +204,7 @@ signals: void getUserToolbarFiles(KURL::List *); void loadToolbarFile(const KURL &); /** ask for the tree status for saving in project */ - void getTreeStatus(TQStringList *); + void getTreetqStatus(TQStringList *); void eventHappened(const TQString&, const TQString&, const TQString& ); private: @@ -211,7 +212,7 @@ private: * If you need the class use Project::ref() for * construction and reference */ - Project(KMainWindow *parent); + Project(KMainWindow *tqparent); ProjectPrivate *d; bool m_projectToolbarVisible; diff --git a/quanta/project/projectlist.cpp b/quanta/project/projectlist.cpp index fabec2fd..db162ce2 100644 --- a/quanta/project/projectlist.cpp +++ b/quanta/project/projectlist.cpp @@ -69,19 +69,19 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL, } } path = url.path(); - url = QExtFileInfo::toAbsolute(url, baseURL); + url = TQExtFileInfo::toAbsolute(url, baseURL); if ( el.nodeName() == "item" ) { - if (excludeRx.exactMatch(path) || find(url.url(-1))) + if (excludeRx.exactMatch(path) || tqfind(url.url(-1))) { - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); modified = true; i--; } else { bool docFolder = (el.attribute("documentFolder", "false") == "true"); - int uploadStatus = el.attribute("uploadstatus", "-1").toInt(); - if (uploadStatus == -1) + int uploadtqStatus = el.attribute("uploadstatus", "-1").toInt(); + if (uploadtqStatus == -1) el.setAttribute("uploadstatus", 1); //remove non-existent local files if ( url.isLocalFile() ) @@ -89,7 +89,7 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL, TQFileInfo fi( url.path() ); if ( !fi.exists() ) { - el.parentNode().removeChild( el ); + el.tqparentNode().removeChild( el ); modified = true; i--; } else @@ -106,7 +106,7 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL, } progressBar->advance(1); } - ProjectURL *proUrl = find(baseURL); + ProjectURL *proUrl = tqfind(baseURL); if (!proUrl) { el = dom.createElement("item"); @@ -126,10 +126,10 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL, bool ProjectList::removeFromListAndXML(const KURL &url) { - ProjectURL *p = find(url); + ProjectURL *p = tqfind(url); if (p) { TQDomElement el = p->domElement; - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); remove(url.url(-1)); return true; } @@ -137,15 +137,15 @@ bool ProjectList::removeFromListAndXML(const KURL &url) } -bool ProjectList::contains(const KURL &url) const +bool ProjectList::tqcontains(const KURL &url) const { - return ProjectUrlList::find(url.url(-1)); + return ProjectUrlList::tqfind(url.url(-1)); } -ProjectURL * ProjectList::find(const KURL &url) const +ProjectURL * ProjectList::tqfind(const KURL &url) const { - return ProjectUrlList::find(url.url(-1)); + return ProjectUrlList::tqfind(url.url(-1)); } @@ -157,7 +157,7 @@ void ProjectList::insert(ProjectURL *url) bool ProjectList::isFolder(const KURL &url) const { - ProjectURL *p = find(url); + ProjectURL *p = tqfind(url); return ( p && url.url(-1) != (*p).url() ); } @@ -168,9 +168,9 @@ void ProjectList::insert(const TQString & key, const ProjectURL * item) } -ProjectURL * ProjectList::find ( const TQString & key ) const +ProjectURL * ProjectList::tqfind ( const TQString & key ) const { - return ProjectUrlList::find(key); + return ProjectUrlList::tqfind(key); } @@ -180,8 +180,8 @@ bool ProjectList::remove ( const TQString & key ) } -void ProjectList::replace(const TQString & key, const ProjectURL * item) +void ProjectList::tqreplace(const TQString & key, const ProjectURL * item) { - ProjectUrlList::replace(key, item); + ProjectUrlList::tqreplace(key, item); } diff --git a/quanta/project/projectlist.h b/quanta/project/projectlist.h index 7106e142..baec78ec 100644 --- a/quanta/project/projectlist.h +++ b/quanta/project/projectlist.h @@ -56,7 +56,7 @@ public: */ KURL toRelative(const KURL &url) const { - return QExtFileInfo::toRelative(url, m_baseURL, false); + return TQExtFileInfo::toRelative(url, m_baseURL, false); } /** @@ -68,11 +68,11 @@ public: /** @return true if url is in container */ - bool contains(const KURL &url) const; + bool tqcontains(const KURL &url) const; /** @return pointer to the entry or 0 if not found */ - ProjectURL * find(const KURL &url) const; + ProjectURL * tqfind(const KURL &url) const; /** Attention: never delete the object you have given here because the @@ -97,9 +97,9 @@ private: /** private because I want to control the key. - use find(const KURL &url) instead. + use tqfind(const KURL &url) instead. */ - ProjectURL *find ( const TQString & key ) const; + ProjectURL *tqfind ( const TQString & key ) const; /** private because I want to control the key. @@ -109,7 +109,7 @@ private: /** private because I want to control the key. */ - void replace(const TQString & key, const ProjectURL * item); + void tqreplace(const TQString & key, const ProjectURL * item); }; #endif // PROJECTFILES_H diff --git a/quanta/project/projectnewfinal.cpp b/quanta/project/projectnewfinal.cpp index b96e8b6f..033df99e 100644 --- a/quanta/project/projectnewfinal.cpp +++ b/quanta/project/projectnewfinal.cpp @@ -26,8 +26,8 @@ #include "projectnewfinal.h" #include "projectnewfinal.moc" -ProjectNewFinal::ProjectNewFinal(TQWidget *parent, const char *name ) - : ProjectNewFinalS(parent,name) +ProjectNewFinal::ProjectNewFinal(TQWidget *tqparent, const char *name ) + : ProjectNewFinalS(tqparent,name) { imagelabel->setPixmap( UserIcon("wiznewprjfin") ); } @@ -37,6 +37,6 @@ ProjectNewFinal::~ProjectNewFinal(){ void ProjectNewFinal::setMargin(int i) { - layout()->setMargin(i); + tqlayout()->setMargin(i); } diff --git a/quanta/project/projectnewfinal.h b/quanta/project/projectnewfinal.h index 16a40791..578aaa47 100644 --- a/quanta/project/projectnewfinal.h +++ b/quanta/project/projectnewfinal.h @@ -26,8 +26,9 @@ class ProjectNewFinal : public ProjectNewFinalS { Q_OBJECT + TQ_OBJECT public: - ProjectNewFinal(TQWidget *parent=0, const char *name=0); + ProjectNewFinal(TQWidget *tqparent=0, const char *name=0); ~ProjectNewFinal(); void setMargin(int); diff --git a/quanta/project/projectnewfinals.ui b/quanta/project/projectnewfinals.ui index ffaac915..50cb98f4 100644 --- a/quanta/project/projectnewfinals.ui +++ b/quanta/project/projectnewfinals.ui @@ -9,7 +9,7 @@ * * ***************************************************************************/ </comment> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ProjectNewFinalS</cstring> </property> @@ -29,27 +29,27 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>620</width> <height>410</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32000</width> <height>32000</height> </size> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>imagelabel</cstring> </property> @@ -61,13 +61,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>115</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>115</width> <height>480</height> @@ -79,7 +79,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -95,22 +95,22 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -121,12 +121,12 @@ <string>Prefix:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>lineAuthor</cstring> </property> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="5"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>GroupBox4</cstring> </property> @@ -137,11 +137,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel3_2_3</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -151,16 +151,16 @@ <string>Default DTD:</string> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>encodingCombo</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel3_2_2_2</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -170,14 +170,14 @@ <string>Default encoding:</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>dtdCombo</cstring> </property> </widget> </grid> </widget> - <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="5"> + <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>insertLocalTemplates</cstring> </property> @@ -185,7 +185,7 @@ <string>Insert &local templates</string> </property> </widget> - <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="5"> + <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>insertGlobalTemplates</cstring> </property> @@ -193,7 +193,7 @@ <string>Insert &global templates</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="5"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>checkPrefix</cstring> </property> @@ -201,7 +201,7 @@ <string>Use preview prefi&x</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -209,7 +209,7 @@ <string>Author:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="4"> + <widget class="TQLineEdit" row="0" column="4"> <property name="name"> <cstring>lineEmail</cstring> </property> @@ -227,7 +227,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -248,7 +248,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="3" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>linePrefix</cstring> </property> @@ -256,7 +256,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="0" column="3"> + <widget class="TQLabel" row="0" column="3"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -292,5 +292,5 @@ <tabstop>insertGlobalTemplates</tabstop> <tabstop>insertLocalTemplates</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp index 28c4b611..76a98a79 100644 --- a/quanta/project/projectnewgeneral.cpp +++ b/quanta/project/projectnewgeneral.cpp @@ -39,8 +39,8 @@ #include "quantacommon.h" #include "qextfileinfo.h" -ProjectNewGeneral::ProjectNewGeneral(TQWidget *parent, const char *name ) - : ProjectNewGeneralS(parent,name) +ProjectNewGeneral::ProjectNewGeneral(TQWidget *tqparent, const char *name ) + : ProjectNewGeneralS(tqparent,name) { imagelabel->setPixmap( UserIcon("wiznewprjglb") ); linePrjName->setFocus(); @@ -137,7 +137,7 @@ void ProjectNewGeneral::slotLinePrjFile( const TQString & ) baseUrl = url; if (baseUrl.isLocalFile()) { - s = QExtFileInfo::canonicalPath(baseUrl.path()); + s = TQExtFileInfo::canonicalPath(baseUrl.path()); if (!s.isEmpty()) baseUrl.setPath(s); } @@ -149,7 +149,7 @@ void ProjectNewGeneral::slotChangeNames( const TQString &text ) { int i; TQString fname = text.lower(); - while( (i=fname.find(" ")) >=0 ) fname.remove(i,1); + while( (i=fname.tqfind(" ")) >=0 ) fname.remove(i,1); linePrjFile->setText( fname+".webprj" ); } @@ -164,7 +164,7 @@ TQString ProjectNewGeneral::type() void ProjectNewGeneral::setMargin(int i) { - layout()->setMargin(i); + tqlayout()->setMargin(i); } void ProjectNewGeneral::slotButtonTmpl() @@ -177,7 +177,7 @@ void ProjectNewGeneral::slotButtonTmpl() linePrjTmpl->setText(KURL::relativeURL(baseUrl, url)); } else { - KMessageBox::sorry(this, i18n("<qt>The project templates must be stored under the main project folder: <br><br><b>%1</b></qt>").arg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); + 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))); } } @@ -192,7 +192,7 @@ void ProjectNewGeneral::slotButtonToolbar() } { KMessageBox::sorry(0, i18n("<qt>The project toolbars must be stored under the main project folder: <br><br><b>%1</b></qt>") - .arg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); + .tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); } } @@ -218,28 +218,28 @@ bool ProjectNewGeneral::eventFilter ( TQObject * watched, TQEvent * e ) { if (e->type() == TQEvent::FocusOut) { - if (watched == linePrjTmpl) + if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(linePrjTmpl)) { KURL url = baseUrl; QuantaCommon::setUrl(url, linePrjTmpl->text()); - url = QExtFileInfo::toAbsolute(url, baseUrl); + url = TQExtFileInfo::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>").arg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); + 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))); linePrjTmpl->setFocus(); emit enableNextButton(this, false); } else emit enableNextButton(this, true); } else - if (watched == linePrjToolbar) + if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(linePrjToolbar)) { KURL url = baseUrl; QuantaCommon::setUrl(url, linePrjToolbar->text()); - url = QExtFileInfo::toAbsolute(url, baseUrl); + url = TQExtFileInfo::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>") - .arg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); + .tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); linePrjToolbar->setFocus(); emit enableNextButton(this, false); } else diff --git a/quanta/project/projectnewgeneral.h b/quanta/project/projectnewgeneral.h index 6f39fde6..21c594f3 100644 --- a/quanta/project/projectnewgeneral.h +++ b/quanta/project/projectnewgeneral.h @@ -28,8 +28,9 @@ class KURL; class ProjectNewGeneral : public ProjectNewGeneralS { Q_OBJECT + TQ_OBJECT public: - ProjectNewGeneral(TQWidget *parent=0, const char *name=0); + ProjectNewGeneral(TQWidget *tqparent=0, const char *name=0); ~ProjectNewGeneral(); TQString type(); diff --git a/quanta/project/projectnewgenerals.ui b/quanta/project/projectnewgenerals.ui index dfc0e55f..d64b0e92 100644 --- a/quanta/project/projectnewgenerals.ui +++ b/quanta/project/projectnewgenerals.ui @@ -9,7 +9,7 @@ * * ***************************************************************************/ </comment> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ProjectNewGeneralS</cstring> </property> @@ -32,27 +32,27 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>620</width> <height>410</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32000</width> <height>32000</height> </size> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>imagelabel</cstring> </property> @@ -64,13 +64,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>115</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>115</width> <height>480</height> @@ -82,7 +82,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -98,22 +98,22 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="4"> + <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>GroupBox3</cstring> </property> @@ -124,12 +124,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="1" column="2"> + <widget class="TQLineEdit" row="1" column="2"> <property name="name"> <cstring>linePrjTmpl</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel1_2_3</cstring> </property> @@ -137,17 +137,17 @@ <string>Templates directory:</string> </property> </widget> - <widget class="QPushButton" row="2" column="3"> + <widget class="TQPushButton" row="2" column="3"> <property name="name"> <cstring>buttonToolbar</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32767</height> @@ -157,12 +157,12 @@ <string>...</string> </property> </widget> - <widget class="QLineEdit" row="2" column="2"> + <widget class="TQLineEdit" row="2" column="2"> <property name="name"> <cstring>linePrjToolbar</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel1_2_2_2</cstring> </property> @@ -170,17 +170,17 @@ <string>Toolbars directory:</string> </property> </widget> - <widget class="QPushButton" row="1" column="3"> + <widget class="TQPushButton" row="1" column="3"> <property name="name"> <cstring>buttonTmpl</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32767</height> @@ -190,7 +190,7 @@ <string>...</string> </property> </widget> - <widget class="QPushButton" row="0" column="3"> + <widget class="TQPushButton" row="0" column="3"> <property name="name"> <cstring>buttonDir</cstring> </property> @@ -202,7 +202,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32767</height> @@ -212,7 +212,7 @@ <string>...</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel2_3</cstring> </property> @@ -220,19 +220,19 @@ <string>Main directory:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>linePrjDir</cstring> </property> </widget> </grid> </widget> - <widget class="QLineEdit" row="0" column="3"> + <widget class="TQLineEdit" row="0" column="3"> <property name="name"> <cstring>linePrjFile</cstring> </property> </widget> - <widget class="QButtonGroup" row="3" column="0" rowspan="1" colspan="4"> + <widget class="TQButtonGroup" row="3" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>bGroupSources</cstring> </property> @@ -249,7 +249,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioLocal</cstring> </property> @@ -260,7 +260,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radioWeb</cstring> </property> @@ -270,18 +270,18 @@ </widget> </grid> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>TextLabel3</cstring> </property> <property name="text"> <string>File:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -289,7 +289,7 @@ <string>Name:</string> </property> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="4"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>GroupBox2</cstring> </property> @@ -300,31 +300,31 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> <property name="text"> <string>Protocol: </string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel" row="1" column="4"> + <widget class="TQLabel" row="1" column="4"> <property name="name"> <cstring>TextLabel3_3</cstring> </property> <property name="text"> <string>Password:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLineEdit" row="1" column="7"> + <widget class="TQLineEdit" row="1" column="7"> <property name="name"> <cstring>linePort</cstring> </property> @@ -337,7 +337,7 @@ </sizepolicy> </property> </widget> - <widget class="QComboBox" row="0" column="2"> + <widget class="TQComboBox" row="0" column="2"> <item> <property name="text"> <string>Local</string> @@ -347,7 +347,7 @@ <cstring>comboProtocol</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="5"> + <widget class="TQLineEdit" row="1" column="5"> <property name="name"> <cstring>linePasswd</cstring> </property> @@ -359,7 +359,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>26</height> @@ -374,34 +374,34 @@ <enum>Password</enum> </property> </widget> - <widget class="QLabel" row="1" column="6"> + <widget class="TQLabel" row="1" column="6"> <property name="name"> <cstring>TextLabel1_2_4</cstring> </property> <property name="text"> <string>Port:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLineEdit" row="0" column="4" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="0" column="4" rowspan="1" colspan="4"> <property name="name"> <cstring>lineHost</cstring> </property> </widget> - <widget class="QLabel" row="0" column="3"> + <widget class="TQLabel" row="0" column="3"> <property name="name"> <cstring>TextLabel4_2</cstring> </property> <property name="text"> <string>Host:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -409,7 +409,7 @@ <string>User:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>lineUser</cstring> </property> @@ -424,7 +424,7 @@ </widget> </grid> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>linePrjName</cstring> </property> @@ -450,5 +450,5 @@ <tabstop>radioLocal</tabstop> <tabstop>radioWeb</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp index e2d99d30..1de12e9e 100644 --- a/quanta/project/projectnewlocal.cpp +++ b/quanta/project/projectnewlocal.cpp @@ -45,17 +45,17 @@ #include "resource.h" #include "quantacommon.h" -ProjectNewLocal::ProjectNewLocal(TQWidget *parent, const char *name ) - : ProjectNewLocalS(parent,name) +ProjectNewLocal::ProjectNewLocal(TQWidget *tqparent, const char *name ) + : ProjectNewLocalS(tqparent,name) { imagelabel->setPixmap( UserIcon("wiznewprjloc") ); -// listView->setColumnAlignment(1,Qt::AlignRight); +// listView->setColumnAlignment(1,TQt::AlignRight); listView->setColumnText(1, i18n("Add")); listView->removeColumn(2); listView->removeColumn(2); - mask->setText("*"); + tqmask->setText("*"); checkInsertWeb->setChecked( true ); @@ -75,7 +75,7 @@ void ProjectNewLocal::setBaseURL(const KURL& a_baseURL) { baseURL = a_baseURL; baseURL.adjustPath(1); - checkInsert->setText(i18n("Insert files from %1.").arg(baseURL.prettyURL(0, KURL::StripFileProtocol))); + checkInsert->setText(i18n("Insert files from %1.").tqarg(baseURL.prettyURL(0, KURL::StripFileProtocol))); listView->clear(); fileList.clear(); checkInsert->setChecked(false); @@ -112,37 +112,37 @@ KURL::List ProjectNewLocal::projectFiles() { KURL::List list; - if (!QExtFileInfo::exists(baseURL, false, this) || + if (!TQExtFileInfo::exists(baseURL, false, this) || !baseURL.path().endsWith("/") || !checkInsert->isChecked() ) return list; - TQString fmask = "*"; + TQString ftqmask = "*"; if ( checkInsertWeb->isChecked() ) { KMimeType::List list = KMimeType::allMimeTypes(); KMimeType::List::iterator it; TQString name; - fmask = ""; + ftqmask = ""; for ( it = list.begin(); it != list.end(); ++it ) { name = (*it)->name(); - if (qConfig.markupMimeTypes.contains(name) || - qConfig.scriptMimeTypes.contains(name) || - qConfig.imageMimeTypes.contains(name)) + if (qConfig.markupMimeTypes.tqcontains(name) || + qConfig.scriptMimeTypes.tqcontains(name) || + qConfig.imageMimeTypes.tqcontains(name)) { TQStringList patterns = (*it)->patterns(); for (uint i = 0 ; i < patterns.count(); i++) { - fmask = fmask+patterns[i]+" "; + ftqmask = ftqmask+patterns[i]+" "; } } } } else { - fmask = mask->text(); + ftqmask = tqmask->text(); } - list = QExtFileInfo::allFilesRelative(baseURL, fmask, this, false); + list = TQExtFileInfo::allFilesRelative(baseURL, ftqmask, this, false); return list; } @@ -156,7 +156,7 @@ void ProjectNewLocal::slotSetFiles(bool) progressBar->setTextEnabled(true); for (uint i = 0; i < files.count(); i++) { - if ( !fileList.contains(files[i])) + if ( !fileList.tqcontains(files[i])) { fileList.append(files[i]); TQListViewItem *it = listView->addItem(files[i], KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL())); @@ -180,7 +180,7 @@ void ProjectNewLocal::resizeEvent ( TQResizeEvent *t ) /** No descriptions */ void ProjectNewLocal::slotAddFiles() { - QExtFileInfo::createDir(baseURL, this); + TQExtFileInfo::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 = QExtFileInfo::toRelative( u, baseURL, false ); + u = TQExtFileInfo::toRelative( u, baseURL, false ); if ( u.path().startsWith("..") || u.path().startsWith("/")) { @@ -218,8 +218,8 @@ void ProjectNewLocal::slotAddFiles() progressBar->setTextEnabled(true); for (uint i = 0; i < list.count(); i++) { - list[i] = QExtFileInfo::toRelative(list[i], baseURL, false); - if (!fileList.contains(list[i])) + list[i] = TQExtFileInfo::toRelative(list[i], baseURL, false); + if (!fileList.tqcontains(list[i])) { fileList.append(list[i]); TQListViewItem *it = listView->addItem(list[i], KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL())); @@ -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 - QExtFileInfo::createDir(baseURL, this); + TQExtFileInfo::createDir(baseURL, this); KURL dirURL ; dirURL = KFileDialog::getExistingURL( baseURL.url(), this, i18n("Insert Folder in Project")); @@ -248,13 +248,13 @@ void ProjectNewLocal::slotAddFolder() dirURL.adjustPath(1); KURL sdir = dirURL; - sdir = QExtFileInfo::toRelative( sdir, baseURL, false); + sdir = TQExtFileInfo::toRelative( sdir, baseURL, false); if ( sdir.path().startsWith("..") || sdir.path().startsWith("/") ) { KURLRequesterDlg *urlRequesterDlg = new KURLRequesterDlg( baseURL.prettyURL(), this, ""); - urlRequesterDlg->setCaption(i18n("%1: Copy to Project").arg(dirURL.prettyURL(0, KURL::StripFileProtocol))); + urlRequesterDlg->setCaption(i18n("%1: Copy to Project").tqarg(dirURL.prettyURL(0, KURL::StripFileProtocol))); urlRequesterDlg->urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly); urlRequesterDlg->exec(); KURL destination = urlRequesterDlg->selectedURL(); @@ -293,14 +293,14 @@ void ProjectNewLocal::slotInsertFolderAfterCopying(const KURL::List& a_urlList) { dirURL = *it; // dirURL.adjustPath(1); - KURL::List files = QExtFileInfo::allFilesRelative(dirURL, "*", this, false); + KURL::List files = TQExtFileInfo::allFilesRelative(dirURL, "*", this, false); progressBar->setTotalSteps(files.count() - 1); progressBar->setTextEnabled(true); KURL u; for (uint i = 0; i < files.count(); i++) { u = files[i]; - if ( !fileList.contains(u) && u.path() != "." && u.path() != ".." ) + if ( !fileList.tqcontains(u) && u.path() != "." && u.path() != ".." ) { fileList.append(u); listView->addItem(u, KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL())); @@ -328,8 +328,8 @@ void ProjectNewLocal::slotInsertFilesAfterCopying(const KURL::List& a_urlList) progressBar->setTextEnabled(true); for (it = a_urlList.begin(); it != a_urlList.end(); ++it) { - u = QExtFileInfo::toRelative(*it, baseURL, false); - if ( !fileList.contains(u)) + u = TQExtFileInfo::toRelative(*it, baseURL, false); + if ( !fileList.tqcontains(u)) { fileList.append(u); TQListViewItem *it = listView->addItem(u, KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL())); diff --git a/quanta/project/projectnewlocal.h b/quanta/project/projectnewlocal.h index 498b336d..b1a984c9 100644 --- a/quanta/project/projectnewlocal.h +++ b/quanta/project/projectnewlocal.h @@ -30,8 +30,9 @@ class CopyTo; class ProjectNewLocal : public ProjectNewLocalS { Q_OBJECT + TQ_OBJECT public: - ProjectNewLocal(TQWidget *parent=0, const char *name=0); + ProjectNewLocal(TQWidget *tqparent=0, const char *name=0); ~ProjectNewLocal(); KURL::List files(); diff --git a/quanta/project/projectnewlocals.ui b/quanta/project/projectnewlocals.ui index c752274f..7ebdc26f 100644 --- a/quanta/project/projectnewlocals.ui +++ b/quanta/project/projectnewlocals.ui @@ -9,7 +9,7 @@ * * ***************************************************************************/ </comment> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ProjectNewLocalS</cstring> </property> @@ -29,27 +29,27 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>620</width> <height>410</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32000</width> <height>32000</height> </size> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>imagelabel</cstring> </property> @@ -61,13 +61,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>115</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>115</width> <height>480</height> @@ -85,21 +85,21 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> </property> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>checkInsert</cstring> </property> @@ -107,7 +107,7 @@ <string>Insert files from</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel8</cstring> </property> @@ -123,7 +123,7 @@ <string>Included files:</string> </property> </widget> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>ButtonGroup12</cstring> </property> @@ -151,23 +151,23 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>checkInsertWithMask</cstring> </property> <property name="text"> - <string>Insert files with the following &mask:</string> + <string>Insert files with the following &tqmask:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> - <cstring>mask</cstring> + <cstring>tqmask</cstring> </property> <property name="enabled"> <bool>false</bool> </property> </widget> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>checkInsertWeb</cstring> </property> @@ -182,9 +182,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> @@ -203,9 +203,9 @@ </sizepolicy> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -221,14 +221,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>85</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addFiles</cstring> </property> @@ -236,7 +236,7 @@ <string>&Add Files...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addFolder</cstring> </property> @@ -244,7 +244,7 @@ <string>A&dd Folder...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>clearList</cstring> </property> @@ -262,7 +262,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>89</width> <height>20</height> @@ -281,7 +281,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -319,7 +319,7 @@ <connection> <sender>checkInsertWithMask</sender> <signal>toggled(bool)</signal> - <receiver>mask</receiver> + <receiver>tqmask</receiver> <slot>setEnabled(bool)</slot> </connection> <connection> @@ -332,12 +332,12 @@ <tabstops> <tabstop>checkInsert</tabstop> <tabstop>checkInsertWeb</tabstop> - <tabstop>mask</tabstop> + <tabstop>tqmask</tabstop> <tabstop>addFiles</tabstop> <tabstop>addFolder</tabstop> <tabstop>clearList</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>uploadtreeview.h</includehint> </includehints> diff --git a/quanta/project/projectnewweb.cpp b/quanta/project/projectnewweb.cpp index a087497c..08391dbe 100644 --- a/quanta/project/projectnewweb.cpp +++ b/quanta/project/projectnewweb.cpp @@ -38,8 +38,8 @@ #include "quantacommon.h" #include "uploadtreeview.h" -ProjectNewWeb::ProjectNewWeb(TQWidget *parent, const char *name ) - : ProjectNewWebS(parent,name) +ProjectNewWeb::ProjectNewWeb(TQWidget *tqparent, const char *name ) + : ProjectNewWebS(tqparent,name) { button->setEnabled(false); siteUrl->setFocus(); @@ -99,7 +99,7 @@ void ProjectNewWeb::slotStart() { emit enableMessagesWidget(); - if (QExtFileInfo::createDir(baseURL, this)) + if (TQExtFileInfo::createDir(baseURL, this)) { if (baseURL.protocol() == "file") { @@ -126,7 +126,7 @@ void ProjectNewWeb::slotStart() { start = true; button->setText( i18n("Stop") ); - emit enableNextButton((TQWidget *)this->parent(),false); + emit enableNextButton((TQWidget *)this->tqparent(),false); } else { KMessageBox::error(this, i18n("There was an error while trying to run the \"wget\" application.\ @@ -138,14 +138,14 @@ void ProjectNewWeb::slotStart() KMessageBox::sorry(this,i18n("This feature is available only if the project lies on a local disk.")); start = false; button->setText( i18n("Start") ); - emit enableNextButton((TQWidget *)this->parent(),true); + emit enableNextButton((TQWidget *)this->tqparent(),true); } } else { QuantaCommon::dirCreationError(this, baseURL); start = false; button->setText( i18n("Start") ); - emit enableNextButton((TQWidget *)this->parent(),true); + emit enableNextButton((TQWidget *)this->tqparent(),true); } } else { @@ -155,7 +155,7 @@ void ProjectNewWeb::slotStart() start = false; button->setText( i18n("Start") ); - emit enableNextButton((TQWidget *)this->parent(),true); + emit enableNextButton((TQWidget *)this->tqparent(),true); } } @@ -166,7 +166,7 @@ void ProjectNewWeb::slotGetWgetExited(KProcess*) start = false; button->setText( i18n("Start") ); emit messages(i18n("wget finished...\n")); - emit enableNextButton((TQWidget *)this->parent(),true); + emit enableNextButton((TQWidget *)this->tqparent(),true); } void ProjectNewWeb::slotGetWgetOutput(KProcess *, char *buffer, int buflen) @@ -178,7 +178,7 @@ void ProjectNewWeb::slotGetWgetOutput(KProcess *, char *buffer, int buflen) int pos; TQString basePath = baseURL.path(1); - while ( (pos = output.find("saved")) != -1 ) + while ( (pos = output.tqfind("saved")) != -1 ) { if (KLed1->state() == KLed::Off) { @@ -189,13 +189,13 @@ void ProjectNewWeb::slotGetWgetOutput(KProcess *, char *buffer, int buflen) KLed2->setState(KLed::On); KLed1->setState(KLed::Off); } - int begName = output.findRev('`',pos); + int begName = output.tqfindRev('`',pos); if ( begName == -1 ) { output = output.remove(0,pos+1); continue; } - int endName = output.find('\'',begName); + int endName = output.tqfind('\'',begName); if ( endName == -1 || endName > pos ) { output = output.remove(0,pos+1); continue; diff --git a/quanta/project/projectnewweb.h b/quanta/project/projectnewweb.h index 28a395b4..4e9c7088 100644 --- a/quanta/project/projectnewweb.h +++ b/quanta/project/projectnewweb.h @@ -34,8 +34,9 @@ class KURL; class ProjectNewWeb : public ProjectNewWebS { Q_OBJECT + TQ_OBJECT public: - ProjectNewWeb(TQWidget *parent=0, const char *name=0); + ProjectNewWeb(TQWidget *tqparent=0, const char *name=0); ~ProjectNewWeb(); public slots: diff --git a/quanta/project/projectnewwebs.ui b/quanta/project/projectnewwebs.ui index b0b726e4..97b7fc7f 100644 --- a/quanta/project/projectnewwebs.ui +++ b/quanta/project/projectnewwebs.ui @@ -9,7 +9,7 @@ * * ***************************************************************************/ </comment> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ProjectNewWebS</cstring> </property> @@ -29,27 +29,27 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>620</width> <height>410</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32000</width> <height>32000</height> </size> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>imagelabel</cstring> </property> @@ -61,13 +61,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>115</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>115</width> <height>480</height> @@ -79,15 +79,15 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> </property> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <grid> <property name="name"> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>309</width> <height>16</height> @@ -126,7 +126,7 @@ <enum>Circular</enum> </property> </widget> - <widget class="QPushButton" row="1" column="3"> + <widget class="TQPushButton" row="1" column="3"> <property name="name"> <cstring>button</cstring> </property> @@ -176,15 +176,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel10</cstring> </property> @@ -202,14 +202,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>228</width> <height>20</height> </size> </property> </spacer> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>HTTP</string> @@ -224,12 +224,12 @@ <cstring>protocolCombo</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>siteUrl</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -237,12 +237,12 @@ <string>Protocol:</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>commandLine</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel9</cstring> </property> @@ -283,7 +283,7 @@ <tabstop>commandLine</tabstop> <tabstop>button</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kled.h</includehint> <includehint>uploadtreeview.h</includehint> diff --git a/quanta/project/projectoptions.ui b/quanta/project/projectoptions.ui index 163f1d4c..a2879e94 100644 --- a/quanta/project/projectoptions.ui +++ b/quanta/project/projectoptions.ui @@ -9,7 +9,7 @@ * * ***************************************************************************/ </comment> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ProjectOptions</cstring> </property> @@ -36,17 +36,17 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="2" column="5"> + <widget class="TQPushButton" row="2" column="5"> <property name="name"> <cstring>buttonToolbar</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32767</height> @@ -56,17 +56,17 @@ <string>...</string> </property> </widget> - <widget class="QPushButton" row="1" column="5"> + <widget class="TQPushButton" row="1" column="5"> <property name="name"> <cstring>buttonTmpl</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32767</height> @@ -76,7 +76,7 @@ <string>...</string> </property> </widget> - <widget class="QLineEdit" row="3" column="4" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="3" column="4" rowspan="1" colspan="2"> <property name="name"> <cstring>lineEmail</cstring> </property> @@ -88,7 +88,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>0</height> @@ -98,7 +98,7 @@ <string></string> </property> </widget> - <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="3" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>lineAuthor</cstring> </property> @@ -111,7 +111,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="4" column="1" rowspan="1" colspan="5"> + <widget class="TQLineEdit" row="4" column="1" rowspan="1" colspan="5"> <property name="name"> <cstring>lineExclude</cstring> </property> @@ -124,7 +124,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>linePrjToolbar</cstring> </property> @@ -137,7 +137,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>linePrjTmpl</cstring> </property> @@ -150,7 +150,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="5"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="5"> <property name="name"> <cstring>linePrjName</cstring> </property> @@ -162,7 +162,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>0</height> @@ -172,7 +172,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -191,7 +191,7 @@ <cstring>linePrjName</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -202,7 +202,7 @@ <cstring>linePrjTmpl</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel1_2_2</cstring> </property> @@ -219,7 +219,7 @@ <cstring>linePrjToolbar</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -238,7 +238,7 @@ <cstring>lineAuthor</cstring> </property> </widget> - <widget class="QLabel" row="3" column="3"> + <widget class="TQLabel" row="3" column="3"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -257,7 +257,7 @@ <cstring>lineEmail</cstring> </property> </widget> - <widget class="QGroupBox" row="6" column="0" rowspan="1" colspan="6"> + <widget class="TQGroupBox" row="6" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>GroupBox5</cstring> </property> @@ -276,7 +276,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel1_2_3</cstring> </property> @@ -287,7 +287,7 @@ <cstring>dtdCombo</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1_3_2</cstring> </property> @@ -298,11 +298,11 @@ <cstring>viewCombo</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel3_2_2_2</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -315,17 +315,17 @@ <cstring>encodingCombo</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>encodingCombo</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>viewCombo</cstring> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <property name="name"> <cstring>dtdCombo</cstring> </property> @@ -335,7 +335,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -346,7 +346,7 @@ <cstring>lineExclude</cstring> </property> </widget> - <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="6"> + <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>checkCvsignore</cstring> </property> @@ -358,7 +358,7 @@ <b>NOTE:</b> This feature works only for local projects.</string> </property> </widget> - <widget class="QGroupBox" row="9" column="0" rowspan="1" colspan="6"> + <widget class="TQGroupBox" row="9" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>GroupBox5_debug</cstring> </property> @@ -377,7 +377,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel2_2_2</cstring> </property> @@ -388,7 +388,7 @@ <cstring>comboDebuggerClient</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>comboDebuggerClient</cstring> </property> @@ -404,7 +404,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>buttonDebuggerOptions</cstring> </property> @@ -420,7 +420,7 @@ <string>Optio&ns</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>checkDebuggerPersistentBreakpoints</cstring> </property> @@ -428,7 +428,7 @@ <string>Remember &breakpoints across sessions</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>checkDebuggerPersistentWatches</cstring> </property> @@ -441,7 +441,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="8" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="8" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>checkPersistentBookmarks</cstring> </property> @@ -449,7 +449,7 @@ <string>Use persistent boo&kmarks</string> </property> </widget> - <widget class="QCheckBox" row="7" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>checkPrefix</cstring> </property> @@ -465,7 +465,7 @@ <string>&Use preview prefix:</string> </property> </widget> - <widget class="QLineEdit" row="7" column="2" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="7" column="2" rowspan="1" colspan="4"> <property name="name"> <cstring>linePrefix</cstring> </property> @@ -531,10 +531,10 @@ <includes> <include location="local" impldecl="in implementation">projectoptions.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot>buttonTemplate_clicked()</slot> <slot>buttonToolbar_clicked()</slot> <slot>comboDebuggerClient_activated( int idx )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/project/projectoptions.ui.h b/quanta/project/projectoptions.ui.h index b6fc2202..5ee550ee 100644 --- a/quanta/project/projectoptions.ui.h +++ b/quanta/project/projectoptions.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index 86f4e221..871ae7bc 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -65,7 +65,7 @@ ProjectPrivate::ProjectPrivate(Project *p) : TQObject(), config(0L), m_dirWatch(0L), tempFile(0L), sessionTempFile(0L) { - parent = p; + tqparent = p; m_projectFiles.setAutoDelete(true); m_showUploadTreeviews = true; m_eventsEnabled = true; @@ -90,7 +90,7 @@ void ProjectPrivate::initActions(KActionCollection *ac) this, TQT_SLOT( slotOpenProject() ), ac, "project_open" ); m_projectRecent = - KStdAction::openRecent(parent, TQT_SLOT(slotOpenProject(const KURL&)), + KStdAction::openRecent(tqparent, TQT_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent"); m_projectRecent->setText(i18n("Open Recent Project")); m_projectRecent->setIcon("project_open"); @@ -131,25 +131,25 @@ void ProjectPrivate::initActions(KActionCollection *ac) ac, "project_insert_directory" ); rescanPrjDirAction = new KAction( i18n( "&Rescan Project Folder..." ), "reload", 0, - parent, TQT_SLOT( slotRescanPrjDir() ), + tqparent, TQT_SLOT( slotRescanPrjDir() ), ac, "project_rescan" ); uploadProjectAction = new KAction( i18n( "&Upload Project..." ), "up", Key_F8, - parent, TQT_SLOT( slotUpload() ), + tqparent, TQT_SLOT( slotUpload() ), ac, "project_upload" ); projectOptionAction = new KAction( i18n( "&Project Properties" ), "configure", SHIFT + Key_F7, - parent, TQT_SLOT( slotOptions() ), + tqparent, TQT_SLOT( slotOptions() ), ac, "project_options" ); saveAsProjectTemplateAction = new KAction( i18n( "Save as Project Template..." ), 0, - m_mainWindow, TQT_SLOT( slotFileSaveAsProjectTemplate() ), + TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotFileSaveAsProjectTemplate() ), ac, "save_project_template" ); saveSelectionAsProjectTemplateAction = new KAction( i18n( "Save Selection to Project Template File..." ), 0, - m_mainWindow, TQT_SLOT( slotFileSaveSelectionAsProjectTemplate() ), + TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotFileSaveSelectionAsProjectTemplate() ), ac, "save_selection_project_template" ); adjustActions(); } @@ -157,7 +157,7 @@ void ProjectPrivate::initActions(KActionCollection *ac) void ProjectPrivate::adjustActions() { - bool projectExists = parent->hasProject(); + bool projectExists = tqparent->hasProject(); closeprjAction->setEnabled(projectExists); openPrjViewAction->setEnabled(projectExists); savePrjViewAction->setEnabled(projectExists); @@ -173,7 +173,7 @@ void ProjectPrivate::adjustActions() saveSelectionAsProjectTemplateAction->setEnabled(projectExists); adjustViewActions(); - parent->slotShowProjectToolbar(projectExists); + tqparent->slotShowProjectToolbar(projectExists); } @@ -183,7 +183,7 @@ void ProjectPrivate::adjustViewActions() TQString oldItem = openPrjViewAction->currentText(); openPrjViewAction->clear(); openPrjViewAction->setItems(viewList); - int i = viewList.findIndex(oldItem); + int i = viewList.tqfindIndex(oldItem); if (i > -1) openPrjViewAction->setCurrentItem(i); deletePrjViewAction->clear(); @@ -211,7 +211,7 @@ void ProjectPrivate::init() { projectURL = KURL(); templateURL = KURL(); - projectName = TQString::null; + projectName = TQString(); m_modified = false; m_defaultDTD = qConfig.defaultDocType; excludeRx.setPattern(".*~$"); @@ -223,11 +223,11 @@ void ProjectPrivate::init() m_debuggerPersistentBreakpoints = false; m_debuggerPersistentWatches = false; m_excludeCvsignore = false; - currentProjectView = TQString::null; + currentProjectView = TQString(); m_projectFiles.clear(); - m_mailingList = TQString::null; - m_teamLeader.name = TQString::null; - m_teamLeader.email = TQString::null; + m_mailingList = TQString(); + m_teamLeader.name = TQString(); + m_teamLeader.email = TQString(); m_taskLeaders.clear(); m_subprojectLeaders.clear(); m_subprojects.clear(); @@ -254,34 +254,34 @@ void ProjectPrivate::openCurrentView() TQDomElement el2 = itemNodes.item(j).cloneNode().toElement(); KURL url = baseURL; QuantaCommon::setUrl(url,el2.attribute("url")); - url = QExtFileInfo::toAbsolute(url, baseURL); + url = TQExtFileInfo::toAbsolute(url, baseURL); if (el2.nodeName() == "viewitem") { urlsInView.append(url); - if (!ViewManager::ref()->isOpened(url) && QExtFileInfo::exists(url, true, m_mainWindow)) + if (!ViewManager::ref()->isOpened(url) && TQExtFileInfo::exists(url, true, m_mainWindow)) urlsToOpen.append(url); } else { if (el2.nodeName() == "viewtoolbar") { - parent->loadToolbarFile(url); + tqparent->loadToolbarFile(url); } } } // first we open what we want, might be that a wanted file is already open! - parent->openFiles(urlsToOpen, m_defaultEncoding); + tqparent->openFiles(urlsToOpen, m_defaultEncoding); // second we close what we don't want KURL::List openURLs = ViewManager::ref()->openedFiles(true); // get open urls KURL::List::Iterator it; for ( it = openURLs.begin(); it != openURLs.end(); ++it ) { - if (urlsInView.findIndex( *it ) == -1) - parent->closeFile (*it); + if (urlsInView.tqfindIndex( *it ) == -1) + tqparent->closeFile (*it); } break; } } TQStringList viewList = projectViewList(); - int i = viewList.findIndex(currentProjectView); + int i = viewList.tqfindIndex(currentProjectView); if (i > -1) openPrjViewAction->setCurrentItem(i); adjustViewActions(); @@ -299,7 +299,7 @@ void ProjectPrivate::insertFiles( KURL::List files ) { TQDomElement el; TQDomNodeList nl = dom.elementsByTagName("item"); - parent->statusMsg( i18n("Adding files to the project...") ); + tqparent->statusMsg( i18n("Adding files to the project...") ); progressBar->setTotalSteps(2 * files.count() - 2); progressBar->setValue(0); progressBar->setTextEnabled(true); @@ -307,7 +307,7 @@ void ProjectPrivate::insertFiles( KURL::List files ) KURL::List::Iterator it; for ( it = files.begin(); it != files.end(); ++it ) { - if (m_projectFiles.contains(*it)) + if (m_projectFiles.tqcontains(*it)) { it = files.erase(it); --it; @@ -322,13 +322,13 @@ void ProjectPrivate::insertFiles( KURL::List files ) url.setPath(url.directory(false)); while ( baseURL.isParentOf(url) ) { - if (!m_projectFiles.contains(url)) + if (!m_projectFiles.tqcontains(url)) { el = dom.createElement("item"); - el.setAttribute("url", QuantaCommon::qUrl(QExtFileInfo::toRelative(url, baseURL, false))); + el.setAttribute("url", QuantaCommon::qUrl(TQExtFileInfo::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::null); + emit eventHappened("after_project_add", url.url(), TQString()); m_modified = true; } url.setPath(url.directory(false)); @@ -337,10 +337,10 @@ void ProjectPrivate::insertFiles( KURL::List files ) url = *it; if (!excludeRx.exactMatch(url.path())) { - el.setAttribute("url", QuantaCommon::qUrl(QExtFileInfo::toRelative(url, baseURL, false))); + el.setAttribute("url", QuantaCommon::qUrl(TQExtFileInfo::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::null); + emit eventHappened("after_project_add", url.url(), TQString()); m_modified = true; } } @@ -350,19 +350,19 @@ void ProjectPrivate::insertFiles( KURL::List files ) progressBar->setValue(0); progressBar->setTextEnabled(false); - parent->reloadTree(&(m_projectFiles), false, TQStringList()); - parent->newStatus(); - parent->statusMsg(TQString::null); + tqparent->reloadTree(&(m_projectFiles), false, TQStringList()); + tqparent->newtqStatus(); + tqparent->statusMsg(TQString()); } /** insert files from dir recursive */ -void ProjectPrivate::insertFiles(const KURL& pathURL, const TQString& mask ) +void ProjectPrivate::insertFiles(const KURL& pathURL, const TQString& tqmask ) { KURL::List list; list.append(pathURL); - list += QExtFileInfo::allFiles(pathURL, mask, m_mainWindow); + list += TQExtFileInfo::allFiles(pathURL, tqmask, m_mainWindow); insertFiles(list); } @@ -371,7 +371,7 @@ void ProjectPrivate::loadProjectXML() { //TODO: Optimize reading. For example iterate through all the nodes and handle them //according to the found node type - parent->statusMsg( i18n("Reading the project file...") ); + tqparent->statusMsg( i18n("Reading the project file...") ); TQDomNode no; TQDomElement el; KURL url; @@ -380,7 +380,7 @@ void ProjectPrivate::loadProjectXML() if ( projectNode.isNull() || projectName.isEmpty() ) { - parent->hideSplash(); + tqparent->hideSplash(); KMessageBox::sorry(m_mainWindow, i18n("Invalid project file.") ); adjustActions(); return; @@ -464,7 +464,7 @@ void ProjectPrivate::loadProjectXML() if (tmpString != QuantaCommon::qUrl(templateURL) ) { el = no.toElement(); - url = QExtFileInfo::toRelative(templateURL, baseURL); + url = TQExtFileInfo::toRelative(templateURL, baseURL); if(el.isNull()) { el = dom.createElement("templates"); @@ -476,7 +476,7 @@ void ProjectPrivate::loadProjectXML() el.firstChild().setNodeValue(QuantaCommon::qUrl(url)); } } - templateURL = QExtFileInfo::toAbsolute(templateURL, baseURL); + templateURL = TQExtFileInfo::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 = QExtFileInfo::toRelative(toolbarURL, baseURL); + url = TQExtFileInfo::toRelative(toolbarURL, baseURL); if(el.isNull()) { el = dom.createElement("toolbars"); @@ -504,7 +504,7 @@ void ProjectPrivate::loadProjectXML() el.firstChild().setNodeValue(QuantaCommon::qUrl(url)); } } - toolbarURL = QExtFileInfo::toAbsolute(toolbarURL, baseURL); + toolbarURL = TQExtFileInfo::toAbsolute(toolbarURL, baseURL); no = projectNode.namedItem("exclude"); m_excludeCvsignore = (no.toElement().attribute("cvsignore", "false") == "true"); @@ -524,9 +524,9 @@ void ProjectPrivate::loadProjectXML() } else if (!excludeStr.endsWith("*")) str = excludeStr + "/*|"+ excludeStr + "$"; - str.replace(".","\\."); - str.replace("*",".*"); - str.replace("?","."); + str.tqreplace(".","\\."); + str.tqreplace("*",".*"); + str.tqreplace("?","."); regExpStr.append(str); if (i+1 < excludeList.count()) regExpStr.append("|"); @@ -564,9 +564,9 @@ void ProjectPrivate::loadProjectXML() line = line + "/*|"+ line + "$"; if (!line.startsWith("*")) line.prepend("^"); - line.replace(".","\\."); - line.replace("*",".*"); - line.replace("?","."); + line.tqreplace(".","\\."); + line.tqreplace("*",".*"); + line.tqreplace("?","."); rxStr += line + "|"; } regExpStr.prepend(rxStr); @@ -595,7 +595,7 @@ void ProjectPrivate::loadProjectXML() if (s != "--not set--" && !s.isEmpty()) ev.arguments << s; } - if (m_events->contains(el.attribute("name"))) + if (m_events->tqcontains(el.attribute("name"))) { (*m_events)[el.attribute("name")].append(ev); } else @@ -696,10 +696,10 @@ void ProjectPrivate::loadProjectXML() } - parent->statusMsg(TQString::null); - parent->newProjectLoaded(projectName, baseURL, templateURL); - parent->reloadTree(&(m_projectFiles), true, treeStatusFromXML()); - parent->newStatus(); + tqparent->statusMsg(TQString()); + tqparent->newProjectLoaded(projectName, baseURL, templateURL); + tqparent->reloadTree(&(m_projectFiles), true, treeStatusFromXML()); + tqparent->newtqStatus(); adjustActions(); } @@ -723,7 +723,7 @@ void ProjectPrivate::slotAcceptCreateProject() /* it is important to set the fields only if there is some input otherwise you set them to an empty string and the treeview will - not recognize it as parent url because: + not recognize it as tqparent url because: TQString::Null != "" */ if (!png->lineHost->text().isEmpty()) @@ -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 (!QExtFileInfo::createDir(baseURL, m_mainWindow)) + if (!TQExtFileInfo::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;//QExtFileInfo::toRelative(*it, baseURL ); + url = *it;//TQExtFileInfo::toRelative(*it, baseURL ); el = dom.createElement("item"); el.setAttribute("url",QuantaCommon::qUrl(url)); dom.firstChild().firstChild().appendChild( el ); @@ -806,7 +806,7 @@ void ProjectPrivate::slotAcceptCreateProject() { KURL url; QuantaCommon::setUrl(url, qConfig.globalDataDir + resourceDir + "templates/"); - parent->slotAddDirectory(url, false); + tqparent->slotAddDirectory(url, false); QuantaCommon::setUrl(templateURL, "templates/"); createTemplateDir = false; } @@ -814,7 +814,7 @@ void ProjectPrivate::slotAcceptCreateProject() { KURL url; QuantaCommon::setUrl(url, locateLocal("data", resourceDir + "templates/")); - parent->slotAddDirectory(url, false); + tqparent->slotAddDirectory(url, false); QuantaCommon::setUrl(templateURL, "templates/"); createTemplateDir = false; } @@ -823,28 +823,28 @@ void ProjectPrivate::slotAcceptCreateProject() { QuantaCommon::setUrl(templateURL, png->linePrjTmpl->text()); templateURL.adjustPath(1); - templateURL = QExtFileInfo::toAbsolute(templateURL, baseURL); - if (!QExtFileInfo::createDir(templateURL, m_mainWindow)) + templateURL = TQExtFileInfo::toAbsolute(templateURL, baseURL); + if (!TQExtFileInfo::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 = QExtFileInfo::toRelative(templateURL, baseURL); + url = TQExtFileInfo::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 = QExtFileInfo::toAbsolute(toolbarURL, baseURL); - if (!QExtFileInfo::createDir(toolbarURL, m_mainWindow)) + toolbarURL = TQExtFileInfo::toAbsolute(toolbarURL, baseURL); + if (!TQExtFileInfo::createDir(toolbarURL, m_mainWindow)) { QuantaCommon::dirCreationError(m_mainWindow, toolbarURL); } el = dom.firstChild().firstChild().namedItem("toolbars").toElement(); - url = QExtFileInfo::toRelative(toolbarURL, baseURL); + url = TQExtFileInfo::toRelative(toolbarURL, baseURL); el.firstChild().setNodeValue(QuantaCommon::qUrl(url)); #if KDE_IS_VERSION(3,4,89) @@ -887,10 +887,10 @@ void ProjectPrivate::slotDeleteProjectView(const TQString &view) el = node.cloneNode().toElement(); if (el.attribute("name") == view) { - node.parentNode().removeChild(node); + node.tqparentNode().removeChild(node); if (currentProjectView == view) currentProjectView = ""; - parent->setModified(); + tqparent->setModified(); adjustViewActions(); break; } @@ -917,9 +917,9 @@ void ProjectPrivate::slotSaveAsProjectView(bool askForName) { if (!askForName || KMessageBox::warningContinueCancel(m_mainWindow, i18n("<qt>A project view named <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>") - .arg(currentProjectView), TQString::null, i18n("Overwrite")) == KMessageBox::Continue) + .tqarg(currentProjectView), TQString(), i18n("Overwrite")) == KMessageBox::Continue) { - node.parentNode().removeChild(node); + node.tqparentNode().removeChild(node); break; } else { @@ -936,27 +936,27 @@ void ProjectPrivate::slotSaveAsProjectView(bool askForName) for ( it = openURLs.begin(); it != openURLs.end(); ++it ) { KURL url = (*it); - if (m_projectFiles.contains(url)) + if (m_projectFiles.tqcontains(url)) { item = dom.createElement("viewitem"); - item.setAttribute("url", QuantaCommon::qUrl(QExtFileInfo::toRelative(url, baseURL)) ); + item.setAttribute("url", QuantaCommon::qUrl(TQExtFileInfo::toRelative(url, baseURL)) ); el.appendChild(item); } } KURL::List toolbarList; - parent->getUserToolbarFiles(&toolbarList); + tqparent->getUserToolbarFiles(&toolbarList); for (uint i =0 ; i < toolbarList.count(); i++) { item = dom.createElement("viewtoolbar"); KURL url = toolbarList[i]; - url = QExtFileInfo::toRelative(url, baseURL); + url = TQExtFileInfo::toRelative(url, baseURL); item.setAttribute("url", QuantaCommon::qUrl(url) ); el.appendChild(item); } dom.firstChild().firstChild().appendChild( el ); - parent->setModified(); + tqparent->setModified(); adjustViewActions(); } @@ -994,7 +994,7 @@ bool ProjectPrivate::createEmptyDom() KURL sessionURL = projectURL; TQString fileName = projectURL.fileName(); if (fileName.endsWith(".webprj")) - fileName.replace(".webprj", ".session"); + fileName.tqreplace(".webprj", ".session"); else fileName += ".session"; sessionURL.setFileName(fileName); @@ -1008,7 +1008,7 @@ bool ProjectPrivate::createEmptyDom() tempFile->textStream()->setEncoding(TQTextStream::UnicodeUTF8); *(tempFile->textStream()) << str; tempFile->close(); - result = QExtFileInfo::createDir(baseURL, m_mainWindow); + result = TQExtFileInfo::createDir(baseURL, m_mainWindow); if (result) result = KIO::NetAccess::upload(tempFile->name(), projectURL, m_mainWindow); if (result) @@ -1055,8 +1055,8 @@ bool ProjectPrivate::createEmptyDom() if (!result) { - parent->hideSplash(); - KMessageBox::sorry(m_mainWindow, i18n("<qt>Cannot open file <b>%1</b> for writing.</qt>").arg(projectURL.prettyURL(0, KURL::StripFileProtocol))); + tqparent->hideSplash(); + KMessageBox::sorry(m_mainWindow, i18n("<qt>Cannot open file <b>%1</b> for writing.</qt>").tqarg(projectURL.prettyURL(0, KURL::StripFileProtocol))); delete tempFile; tempFile = 0L; delete sessionTempFile; @@ -1095,12 +1095,12 @@ void ProjectPrivate::getStatusFromTree() for ( unsigned int i = 0; i < nl.count(); i++ ) { el = nl.item(i).toElement(); - el.parentNode().removeChild( el ); + el.tqparentNode().removeChild( el ); i--; } TQStringList folderList; - parent->getTreeStatus( &folderList ); - // toplevel folder is always open in a project and QExtFileInfo::toRelative + tqparent->getTreetqStatus( &folderList ); + // toplevel folder is always open in a project and TQExtFileInfo::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( QExtFileInfo::toRelative(KURL(*it), baseURL) ) ); + el.setAttribute("url", QuantaCommon::qUrl( TQExtFileInfo::toRelative(KURL(*it), baseURL) ) ); root.appendChild( el ); } } @@ -1122,7 +1122,7 @@ void ProjectPrivate::slotNewProject() { TQWizard *wiz = new TQWizard(m_mainWindow, "new", true); wiz->setCaption(i18n("New Project Wizard")); - wiz->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + wiz->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); png = new ProjectNewGeneral(0L); @@ -1159,9 +1159,9 @@ void ProjectPrivate::slotNewProject() connect(wiz, TQT_SIGNAL(helpClicked()), TQT_SLOT(slotNewProjectHelpClicked())); connect( pnw, TQT_SIGNAL(enableMessagesWidget()), - parent, TQT_SIGNAL(enableMessageWidget())); + tqparent, TQT_SIGNAL(enableMessageWidget())); connect( pnw, TQT_SIGNAL(messages(const TQString&)), - parent, TQT_SLOT (slotGetMessages(const TQString&))); + tqparent, TQT_SLOT (slotGetMessages(const TQString&))); connect( pnw, TQT_SIGNAL(enableNextButton(TQWidget *,bool)), wiz, TQT_SLOT(setNextEnabled(TQWidget*,bool))); connect( pnw, TQT_SIGNAL(enableNextButton(TQWidget *,bool)), @@ -1170,7 +1170,7 @@ void ProjectPrivate::slotNewProject() TQStringList lst = DTDs::ref()->nickNameList(true); pnf->dtdCombo->insertStringList(lst); TQString defaultDTDName = DTDs::ref()->getDTDNickNameFromName(qConfig.defaultDocType.lower()); - int pos = lst.findIndex(defaultDTDName); + int pos = lst.tqfindIndex(defaultDTDName); if (pos >= 0) pnf->dtdCombo->setCurrentItem(pos); @@ -1197,48 +1197,48 @@ void ProjectPrivate::slotNewProject() delete wiz; adjustActions(); - parent->newStatus(); + tqparent->newtqStatus(); } /** close project and edited files */ void ProjectPrivate::slotCloseProject() { - if (!parent->hasProject()) return; + if (!tqparent->hasProject()) return; connect(ViewManager::ref(), TQT_SIGNAL(filesClosed(bool)), this, TQT_SLOT(slotProceedWithCloseProject(bool))); - parent->closeFiles(); + tqparent->closeFiles(); } void ProjectPrivate::slotProceedWithCloseProject(bool success) { disconnect(ViewManager::ref(), TQT_SIGNAL(filesClosed(bool)), this, TQT_SLOT(slotProceedWithCloseProject(bool))); if (!success) return; - emit eventHappened("before_project_close", baseURL.url(), TQString::null); + emit eventHappened("before_project_close", baseURL.url(), TQString()); if (!uploadProjectFile()) { if (KMessageBox::warningContinueCancel(m_mainWindow, i18n("Saving of project failed. Do you want to continue with closing (might cause data loss)?"), i18n("Project Saving Error"), KStdGuiItem::close()) == KMessageBox::Cancel) return; } - emit eventHappened("after_project_close", baseURL.url(), TQString::null); + emit eventHappened("after_project_close", baseURL.url(), TQString()); // empty dom tree dom.clear(); m_sessionDom.clear(); m_events->clear(); config->setGroup("Projects"); - config->writePathEntry("Last Project", TQString::null); + config->writePathEntry("Last Project", TQString()); init(); - parent->newProjectLoaded(projectName, baseURL, templateURL); - parent->reloadTree( &(m_projectFiles), true, TQStringList()); + tqparent->newProjectLoaded(projectName, baseURL, templateURL); + tqparent->reloadTree( &(m_projectFiles), true, TQStringList()); adjustActions(); m_projectRecent->setCurrentItem(-1); - parent->newStatus(); - kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); + tqparent->newtqStatus(); + kapp->tqprocessEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); } /** open project file */ void ProjectPrivate::slotOpenProject() { - KURL url = KFileDialog::getOpenURL( TQString::null, + KURL url = KFileDialog::getOpenURL( TQString(), "*.wpj *.webprj"+i18n("|Project Files\n*|All Files"), m_mainWindow, i18n("Open Project")); @@ -1252,7 +1252,7 @@ void ProjectPrivate::slotOpenProject() /* save project file */ bool ProjectPrivate::saveProject() { - if ( !parent->hasProject() ) return false; + if ( !tqparent->hasProject() ) return false; bool result = true; // remove old opened files TQDomElement el; @@ -1263,7 +1263,7 @@ bool ProjectPrivate::saveProject() el = nl.item(i).toElement(); if ( el.nodeName() == "openfile" ) { - el.parentNode().removeChild( el ); + el.tqparentNode().removeChild( el ); i--; } } @@ -1284,11 +1284,11 @@ bool ProjectPrivate::saveProject() f.close(); } m_modified = false; - parent->statusMsg(i18n( "Wrote project file %1" ).arg(m_tmpProjectFile)); + tqparent->statusMsg(i18n( "Wrote project file %1" ).tqarg(m_tmpProjectFile)); } else { - parent->hideSplash(); - KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for writing.</qt>").arg(m_tmpProjectFile)); + tqparent->hideSplash(); + KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for writing.</qt>").tqarg(m_tmpProjectFile)); result = false; } return result; @@ -1338,8 +1338,8 @@ void ProjectPrivate::loadProjectFromTemp(const KURL &url, const TQString &tempFi writeConfig(); } else { - parent->hideSplash(); - KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for reading.</qt>").arg(tempFile)); + tqparent->hideSplash(); + KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for reading.</qt>").tqarg(tempFile)); } } @@ -1350,14 +1350,14 @@ bool ProjectPrivate::loadProject(const KURL &url) return true; if (!url.isValid()) { - parent->hideSplash(); - KMessageBox::sorry(m_mainWindow, i18n("<qt>Malformed URL: <b>%1</b></qt>").arg(url.prettyURL())); + tqparent->hideSplash(); + KMessageBox::sorry(m_mainWindow, i18n("<qt>Malformed URL: <b>%1</b></qt>").tqarg(url.prettyURL())); return false; } if ( projectAlreadyOpen(url.url()) ) { - parent->hideSplash(); - if (KMessageBox::warningContinueCancel(m_mainWindow, i18n("<qt>The project<br><b>%1</b><br> seems to be used by another Quanta instance.<br>You may end up with data loss if you open the same project in two instances, modify and save them in both.<br><br>Do you want to proceed with open?</qt>").arg(url.prettyURL()), TQString::null, KStdGuiItem::open()) == KMessageBox::Cancel) + tqparent->hideSplash(); + if (KMessageBox::warningContinueCancel(m_mainWindow, i18n("<qt>The project<br><b>%1</b><br> seems to be used by another Quanta instance.<br>You may end up with data loss if you open the same project in two instances, modify and save them in both.<br><br>Do you want to proceed with open?</qt>").tqarg(url.prettyURL()), TQString(), KStdGuiItem::open()) == KMessageBox::Cancel) return false; } TQString projectTmpFile; @@ -1367,14 +1367,14 @@ bool ProjectPrivate::loadProject(const KURL &url) if (KIO::NetAccess::exists(url, false, m_mainWindow) && KIO::NetAccess::download(url, projectTmpFile, m_mainWindow)) { - if (parent->hasProject()) + if (tqparent->hasProject()) { slotCloseProject(); } KURL sessionURL = url; TQString fileName = url.fileName(); if (fileName.endsWith(".webprj")) - fileName.replace(".webprj", ".session"); + fileName.tqreplace(".webprj", ".session"); else fileName += ".session"; sessionURL.setFileName(fileName); @@ -1415,8 +1415,8 @@ bool ProjectPrivate::loadProject(const KURL &url) loadProjectFromTemp(url, projectTmpFile, sessionTmpFile); } else { - parent->hideSplash(); - KMessageBox::error(m_mainWindow, i18n("<qt>Cannot access the project file <b>%1</b>.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol))); + tqparent->hideSplash(); + KMessageBox::error(m_mainWindow, i18n("<qt>Cannot access the project file <b>%1</b>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); return false; } return true; @@ -1432,7 +1432,7 @@ void ProjectPrivate::slotAddFiles() if ( !list.isEmpty() ) { KURL firstURL = list.first(); - firstURL = QExtFileInfo::toRelative( firstURL, baseURL ); + firstURL = TQExtFileInfo::toRelative( firstURL, baseURL ); if ( firstURL.path().startsWith("/") || firstURL.path().startsWith(".")) { @@ -1448,7 +1448,7 @@ void ProjectPrivate::slotAddFiles() CopyTo *dlg = new CopyTo( baseURL); connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo*)), TQT_SLOT (slotDeleteCopytoDlg(CopyTo*))); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), parent, + connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), tqparent, TQT_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); list = dlg->copy( list, destination ); return; @@ -1470,7 +1470,7 @@ void ProjectPrivate::slotAddFiles() } } - parent->reloadTree( &(m_projectFiles), false, TQStringList()); + tqparent->reloadTree( &(m_projectFiles), false, TQStringList()); } } @@ -1487,7 +1487,7 @@ void ProjectPrivate::slotAddDirectory() KURL url = KURL(); url = KFileDialog::getExistingURL(baseURL.prettyURL(), m_mainWindow, i18n("Insert Folder in Project")); - parent->slotAddDirectory(url); + tqparent->slotAddDirectory(url); } @@ -1531,8 +1531,8 @@ void ProjectPrivate::slotDebuggerOptions() } else { - parent->hideSplash(); - KMessageBox::error(NULL, i18n("<qt>Unable to load the debugger plugin, error code %1 was returned: <b>%2</b>.</qt>").arg(errCode).arg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error")); + tqparent->hideSplash(); + KMessageBox::error(NULL, i18n("<qt>Unable to load the debugger plugin, error code %1 was returned: <b>%2</b>.</qt>").tqarg(errCode).tqarg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error")); } } } @@ -1556,7 +1556,7 @@ void ProjectPrivate::writeConfig() if (!projectURL.isEmpty()) { TQStringList projectList = QuantaCommon::readPathListEntry(config, "OpenProjects"); - if (projectList.contains( projectURL.url() ) == 0) + if (projectList.tqcontains( projectURL.url() ) == 0) { projectList.append( projectURL.url() ); config->writePathEntry("OpenProjects", projectList); @@ -1581,7 +1581,7 @@ void ProjectPrivate::removeFromConfig(const TQString & urlStr) config->reparseConfiguration(); config->setGroup("Projects"); TQStringList projectList = QuantaCommon::readPathListEntry(config, "OpenProjects"); - int i = projectList.findIndex( urlStr ); + int i = projectList.tqfindIndex( urlStr ); if ( i > -1) { projectList.remove(projectList.at(i)); @@ -1606,7 +1606,7 @@ bool ProjectPrivate::projectAlreadyOpen(const TQString & urlStr) config->reparseConfiguration(); config->setGroup("Projects"); TQStringList projectList = QuantaCommon::readPathListEntry(config, "OpenProjects"); - return (projectList.contains(urlStr) != 0); + return (projectList.tqcontains(urlStr) != 0); } @@ -1618,7 +1618,7 @@ bool ProjectPrivate::uploadProjectFile() KURL sessionURL = projectURL; TQString fileName = projectURL.fileName(); if (fileName.endsWith(".webprj")) - fileName.replace(".webprj", ".session"); + fileName.tqreplace(".webprj", ".session"); else fileName += ".session"; sessionURL.setFileName(fileName); @@ -1632,14 +1632,14 @@ bool ProjectPrivate::uploadProjectFile() tempFile = 0L; delete sessionTempFile; sessionTempFile = 0L; - m_tmpProjectFile = TQString::null; + m_tmpProjectFile = TQString(); return true; } if (KIO::NetAccess::upload(m_tmpProjectFile, projectURL, m_mainWindow) && KIO::NetAccess::upload(m_tmpSessionFile, sessionURL, m_mainWindow)) { removeFromConfig(projectURL.url()); // remove the project from the list of open projects if (quantaApp) - parent->statusMsg(i18n( "Uploaded project file %1" ).arg( projectURL.prettyURL())); + tqparent->statusMsg(i18n( "Uploaded project file %1" ).tqarg( projectURL.prettyURL())); // delete all temp files we used // first the one from creating a new project delete tempFile; @@ -1659,7 +1659,7 @@ bool ProjectPrivate::uploadProjectFile() { if (quantaApp) { - parent->statusMsg(TQString::null ); + tqparent->statusMsg(TQString() ); KMessageBox::error(m_mainWindow, KIO::NetAccess::lastErrorString()); } return false; diff --git a/quanta/project/projectprivate.h b/quanta/project/projectprivate.h index a0b37fa3..6c5adf12 100644 --- a/quanta/project/projectprivate.h +++ b/quanta/project/projectprivate.h @@ -48,15 +48,16 @@ struct EventAction; typedef TQMap<TQString, TQValueList<EventAction> > EventActions; class ProjectPrivate - : public QObject + : public TQObject { Q_OBJECT + TQ_OBJECT public: ProjectPrivate(Project *p); ~ProjectPrivate(); - Project *parent; + Project *tqparent; /** Point to the .webprj file */ KURL projectURL; TQString projectName; @@ -147,7 +148,7 @@ upload.*/ void insertFiles( KURL::List files ); /** insert files from dir recursive */ - void insertFiles(const KURL& pathURL, const TQString& mask ); + void insertFiles(const KURL& pathURL, const TQString& tqmask ); void loadProjectXML(); diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp index ce621c07..52f52908 100644 --- a/quanta/project/projectupload.cpp +++ b/quanta/project/projectupload.cpp @@ -63,7 +63,7 @@ #include "resource.h" ProjectUpload::ProjectUpload(const KURL& url, const TQString& profileName, bool showOnlyProfiles, bool quickUpload, bool markOnly, const char* name) - :ProjectUploadS( 0L, name, false, Qt::WDestructiveClose) + :ProjectUploadS( 0L, name, false, TQt::WDestructiveClose) { m_quickUpload = quickUpload; m_profilesOnly = showOnlyProfiles; @@ -73,7 +73,7 @@ ProjectUpload::ProjectUpload(const KURL& url, const TQString& profileName, bool startUrl = url; if (m_profilesOnly) { - clearWFlags(Qt::WDestructiveClose); + clearWFlags(TQt::WDestructiveClose); uploadFrame->hide(); buttonCancel->hide(); adjustSize(); @@ -172,13 +172,13 @@ void ProjectUpload::slotBuildTree() KURL u = m_project->projectBaseURL(); if (!startUrl.isEmpty()) { - u = QExtFileInfo::toAbsolute(startUrl, u); + u = TQExtFileInfo::toAbsolute(startUrl, u); } TQDict<KFileItem> projectDirFiles; if (startUrl.isEmpty() || strUrl.endsWith("/")) //upload a folder { - projectDirFiles = QExtFileInfo::allFilesDetailed(u, "*", this); + projectDirFiles = TQExtFileInfo::allFilesDetailed(u, "*", this); } else { projectDirFiles.insert(u.url(), new KFileItem(KFileItem::Unknown, KFileItem::Unknown, u, true)); @@ -197,9 +197,9 @@ void ProjectUpload::slotBuildTree() { QuantaCommon::setUrl(u, s); absUrl.setPath(m_project->projectBaseURL().path(1)+u.path(-1)); -/* if (!QExtFileInfo::exists(absUrl)) +/* if (!TQExtFileInfo::exists(absUrl)) continue; */ - KFileItem *p_item = projectDirFiles.find(absUrl.url()); + KFileItem *p_item = projectDirFiles.tqfind(absUrl.url()); if (!p_item) continue; KFileItem item(*p_item); @@ -207,19 +207,19 @@ void ProjectUpload::slotBuildTree() if ( it != 0 ) { int uploadedTime = -1; - if (m_uploadTimeList.contains(s)) + if (m_uploadTimeList.tqcontains(s)) uploadedTime = m_uploadTimeList[s]; int modifiedTime = item.time(KIO::UDS_MODIFICATION_TIME); el.setAttribute("modified_time", modifiedTime); - int uploadStatus = el.attribute("uploadstatus", "1").toInt(); - if (m_quickUpload || (forceUpload && uploadStatus == 0)) - uploadStatus = 1; - if (m_quickUpload || (uploadedTime != modifiedTime && uploadStatus != 0)) + int uploadtqStatus = el.attribute("uploadstatus", "1").toInt(); + if (m_quickUpload || (forceUpload && uploadtqStatus == 0)) + uploadtqStatus = 1; + if (m_quickUpload || (uploadedTime != modifiedTime && uploadtqStatus != 0)) { modified.append( u ); it->setSelected(true); } - if (uploadStatus == 2) + if (uploadtqStatus == 2) it->setConfirmUpload(true); totalProgress->setValue(i); } @@ -235,7 +235,7 @@ void ProjectUpload::slotBuildTree() totalText->setText(i18n("Total:")); totalProgress->setTotalSteps(1); totalProgress->setValue(0); - //hack to force repainting of the treeview + //hack to force tqrepainting of the treeview resize(width() + 1, height()); resize(width() - 1, height()); if (m_quickUpload) @@ -338,7 +338,7 @@ void ProjectUpload::startUpload() for ( uint i = 0; i < nl.count(); i++ ) { el = nl.item(i).toElement(); - if ( selectedList.contains(el.attribute("url"))) + if ( selectedList.tqcontains(el.attribute("url"))) { m_uploadTimeList[el.attribute("url")] = el.attribute("modified_time").toInt(); } @@ -362,7 +362,7 @@ void ProjectUpload::startUpload() if (!ok) return; for (it = needsConfirmation.begin(); it != needsConfirmation.end(); ++it) { - if (!confirmedList.contains(((UploadTreeFile*)(*it))->url().prettyURL(0, KURL::StripFileProtocol))) + if (!confirmedList.tqcontains(((UploadTreeFile*)(*it))->url().prettyURL(0, KURL::StripFileProtocol))) toUpload.remove(*it); } @@ -375,14 +375,14 @@ void ProjectUpload::startUpload() buttonUpload->setEnabled(false); KURL u = *baseUrl; u.setPath(u.protocol() == "file" ? "/" : ""); - if (QExtFileInfo::exists(u, false, this) || (u.protocol() == "webdav" && QExtFileInfo::exists(*baseUrl, false, this))) + if (TQExtFileInfo::exists(u, false, this) || (u.protocol() == "webdav" && TQExtFileInfo::exists(*baseUrl, false, this))) { upload(); return; } else { if (KMessageBox::warningContinueCancel(this, i18n("<qt><b>%1</b> seems to be unaccessible.<br>Do you want to proceed with upload?</qt>") - .arg(u.prettyURL(0, KURL::StripFileProtocol)),TQString::null,KStdGuiItem::cont()) == KMessageBox::Continue) + .tqarg(u.prettyURL(0, KURL::StripFileProtocol)),TQString(),KStdGuiItem::cont()) == KMessageBox::Continue) { upload(); return; @@ -425,7 +425,7 @@ void ProjectUpload::upload() } - KURL from = QExtFileInfo::toAbsolute(currentURL, m_project->projectBaseURL()); + KURL from = TQExtFileInfo::toAbsolute(currentURL, m_project->projectBaseURL()); to = *baseUrl; to.addPath( currentURL.path() ); if (to.fileName(false).isEmpty()) @@ -437,10 +437,10 @@ void ProjectUpload::upload() dir = to.upURL() ; } - if ( !madeDirs.contains(dir) ) + if ( !madeDirs.tqcontains(dir) ) { madeDirs.append( dir ); - if (!QExtFileInfo::createDir(dir, this)) + if (!TQExtFileInfo::createDir(dir, this)) { QuantaCommon::dirCreationError(this, KURL( dir.prettyURL(0, KURL::StripFileProtocol) )); buttonUpload->setEnabled(true); @@ -463,7 +463,7 @@ void ProjectUpload::upload() connect( job, TQT_SIGNAL( infoMessage( KIO::Job *,const TQString& ) ), this, TQT_SLOT( uploadMessage( KIO::Job *,const TQString& ) ) ); - labelCurFile->setText(i18n("Current: %1").arg(currentURL.fileName())); + labelCurFile->setText(i18n("Current: %1").tqarg(currentURL.fileName())); currentProgress->setProgress( 0 ); return; } else //it is a dir, so just go to the next item @@ -517,7 +517,7 @@ void ProjectUpload::selectModified() { TQListViewItem *it = list->findItem( (*file).path() ); it->setSelected(true); - it->repaint(); + it->tqrepaint(); } list->checkboxTree(); } @@ -564,7 +564,7 @@ void ProjectUpload::slotUploadNext() UploadTreeFile *itf = dynamic_cast<UploadTreeFile*>(it); if (itf) itf->setWhichPixmap( "check_clear" ); - it->repaint(); + it->tqrepaint(); } toUpload.remove( it ); @@ -639,7 +639,7 @@ void ProjectUpload::slotRemoveProfile() } else { TQString profileName = comboProfile->currentText(); - if (KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to remove the <b>%1</b> upload profile?</qt>").arg(profileName), + if (KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to remove the <b>%1</b> upload profile?</qt>").tqarg(profileName), i18n("Profile Removal"), KStdGuiItem::del()) == KMessageBox::Continue) { m_profilesNode.removeChild(m_currentProfileElement); @@ -652,7 +652,7 @@ void ProjectUpload::slotRemoveProfile() slotNewProfileSelected(currentProfile); if (profileName == defaultProfile()) { - KMessageBox::information(this, i18n("<qt>You have removed your default profile.<br>The new default profile will be <b>%1</b>.</qt>").arg(currentProfile), i18n("Profile Removal")); + KMessageBox::information(this, i18n("<qt>You have removed your default profile.<br>The new default profile will be <b>%1</b>.</qt>").tqarg(currentProfile), i18n("Profile Removal")); m_profilesNode.toElement().setAttribute("defaultProfile", currentProfile); } comboProfile->removeItem(idx); @@ -800,10 +800,10 @@ void ProjectUpload::loadRemoteUploadInfo() void ProjectUpload::saveRemoteUploadInfo() { - TQDomNode parent = m_currentProfileElement.parentNode(); + TQDomNode tqparent = m_currentProfileElement.tqparentNode(); TQDomNode profileNode = m_currentProfileElement.cloneNode(false); - parent.removeChild(m_currentProfileElement); - parent.appendChild(profileNode); + tqparent.removeChild(m_currentProfileElement); + tqparent.appendChild(profileNode); TQMap<TQString, int>::ConstIterator it; for (it = m_uploadTimeList.constBegin(); it != m_uploadTimeList.constEnd(); ++it) { diff --git a/quanta/project/projectupload.h b/quanta/project/projectupload.h index d76d1767..ca136dce 100644 --- a/quanta/project/projectupload.h +++ b/quanta/project/projectupload.h @@ -38,13 +38,14 @@ class UploadProfileDlgS; class ProjectUpload : public ProjectUploadS { Q_OBJECT + TQ_OBJECT public: /** Initializes the dialog. If showOnlyProfiles is true, the dialog displays only the list of profiles, no real upload can be performed. If quickUpload is true, the upload starts immediately without checking for modifications or confirmation from the user. The url will be uploaded to the default profile */ - ProjectUpload(const KURL& url, const TQString& profileName = TQString::null, bool showOnlyProfiles = false, bool quickUpload = false, bool markOnly = false, const char * name = 0); + ProjectUpload(const KURL& url, const TQString& profileName = TQString(), bool showOnlyProfiles = false, bool quickUpload = false, bool markOnly = false, const char * name = 0); ~ProjectUpload(); TQString defaultProfile(); diff --git a/quanta/project/projectuploads.ui b/quanta/project/projectuploads.ui index 19a2328c..9c94e17f 100644 --- a/quanta/project/projectuploads.ui +++ b/quanta/project/projectuploads.ui @@ -10,7 +10,7 @@ ***************************************************************************/ </comment> <author>(C) 2002-2004 Andras Mantia <[email protected]></author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>ProjectUploadS</cstring> </property> @@ -30,7 +30,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -46,15 +46,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -88,7 +88,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -121,7 +121,7 @@ </widget> </hbox> </widget> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>buttonUpload</cstring> </property> @@ -143,7 +143,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="3" column="2"> + <widget class="TQPushButton" row="3" column="2"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -172,14 +172,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>400</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>keepPasswords</cstring> </property> @@ -187,7 +187,7 @@ <string>&Keep passwords in memory</string> </property> </widget> - <widget class="QFrame" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQFrame" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>uploadFrame</cstring> </property> @@ -209,7 +209,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="4" column="1"> + <widget class="TQPushButton" row="4" column="1"> <property name="name"> <cstring>buttonInvert</cstring> </property> @@ -217,7 +217,7 @@ <string>&Invert</string> </property> </widget> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>buttonClear</cstring> </property> @@ -225,7 +225,7 @@ <string>&None</string> </property> </widget> - <widget class="QPushButton" row="6" column="1"> + <widget class="TQPushButton" row="6" column="1"> <property name="name"> <cstring>buttonCollapse</cstring> </property> @@ -233,7 +233,7 @@ <string>C&ollapse All</string> </property> </widget> - <widget class="QPushButton" row="7" column="1"> + <widget class="TQPushButton" row="7" column="1"> <property name="name"> <cstring>buttonUpdate</cstring> </property> @@ -244,7 +244,7 @@ <string>This will cause all files to appear already uploaded</string> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>buttonModified</cstring> </property> @@ -252,7 +252,7 @@ <string>&Modified</string> </property> </widget> - <widget class="QPushButton" row="5" column="1"> + <widget class="TQPushButton" row="5" column="1"> <property name="name"> <cstring>buttonExpand</cstring> </property> @@ -273,7 +273,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -289,7 +289,7 @@ <string>Selection:</string> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>buttonAll</cstring> </property> @@ -305,7 +305,7 @@ <string>&All</string> </property> </widget> - <widget class="QCheckBox" row="8" column="0"> + <widget class="TQCheckBox" row="8" column="0"> <property name="name"> <cstring>markAsUploaded</cstring> </property> @@ -323,7 +323,7 @@ <cstring>currentProgress</cstring> </property> </widget> - <widget class="QLabel" row="9" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="9" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>labelCurFile</cstring> </property> @@ -338,11 +338,11 @@ <property name="text"> <string>Current: [none]</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QLabel" row="11" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="11" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>totalText</cstring> </property> @@ -476,7 +476,7 @@ <includes> <include location="global" impldecl="in declaration">../treeviews/uploadtreeview.h</include> </includes> -<slots> +<Q_SLOTS> <slot>clearSelection()</slot> <slot>startUpload()</slot> <slot>selectAll()</slot> @@ -489,8 +489,8 @@ <slot>slotEditProfile()</slot> <slot>slotRemoveProfile()</slot> <slot>slotNewProfileSelected(const QString&)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>uploadtreeview.h</includehint> </includehints> diff --git a/quanta/project/projecturl.h b/quanta/project/projecturl.h index cf3eae66..02232234 100644 --- a/quanta/project/projecturl.h +++ b/quanta/project/projecturl.h @@ -32,26 +32,26 @@ class ProjectURL : public KURL { public: TQString fileDesc; - int uploadStatus; ///< The upload state, see UploadStatus + int uploadtqStatus; ///< The upload state, see UploadtqStatus bool documentFolder; TQDomElement domElement; ProjectURL() - : KURL(), uploadStatus(1), documentFolder(false) {} + : KURL(), uploadtqStatus(1), documentFolder(false) {} ProjectURL(const KURL& url) - : KURL(url), uploadStatus(1), documentFolder(false) {} + : KURL(url), uploadtqStatus(1), documentFolder(false) {} ProjectURL(const KURL& url, const TQString& desc, int status, bool docFolder) - : KURL(url), fileDesc(desc), uploadStatus(status), documentFolder(docFolder) {} + : KURL(url), fileDesc(desc), uploadtqStatus(status), documentFolder(docFolder) {} ProjectURL(const KURL& url, const TQString& desc, int status, bool docFolder, TQDomElement el) - : KURL(url), fileDesc(desc), uploadStatus(status), documentFolder(docFolder), domElement(el) {} + : KURL(url), fileDesc(desc), uploadtqStatus(status), documentFolder(docFolder), domElement(el) {} virtual ~ProjectURL() {} /** The default state for a file when uploading */ - enum UploadStatus + enum UploadtqStatus { NeverUpload = 0, ///< the files is not selected for upload, even if it was modified AlwaysUpload, ///< the file is automatically selected for upload if it was modified diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp index 1c467c7d..b24b123f 100644 --- a/quanta/project/rescanprj.cpp +++ b/quanta/project/rescanprj.cpp @@ -40,8 +40,8 @@ RescanPrj::RescanPrj(const ProjectList &p_prjFileList, const KURL& p_baseURL, const TQRegExp &p_excludeRx, - TQWidget *parent, const char *name, bool modal ) - : RescanPrjDir(parent,name,modal) + TQWidget *tqparent, const char *name, bool modal ) + : RescanPrjDir(tqparent,name,modal) { setCaption(name); @@ -87,7 +87,7 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list) { KURL url = static_cast<KIO::ListJob *>(job)->url(); url.adjustPath(-1); - // avoid creating these QStrings again and again + // avoid creating these TQStrings again and again static const TQString& dot = KGlobal::staticQString("."); static const TQString& dotdot = KGlobal::staticQString(".."); @@ -115,7 +115,7 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list) else u.setPath(linkDest); u.adjustPath(+1); - KURL u2 = QExtFileInfo::toRelative(u, baseURL); + KURL u2 = TQExtFileInfo::toRelative(u, baseURL); bool found = false; for (uint i = 0; i < urlList.count(); i++) if (urlList[i].url == u2) @@ -123,7 +123,7 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list) found = true; break; } - if (!prjFileList.contains(u) && !found) + if (!prjFileList.tqcontains(u) && !found) { linkItems.append(new KFileItem(item)); } else @@ -137,7 +137,7 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list) itemURL = item.url(); if (item.isDir()) itemURL.adjustPath(+1); - ProjectURL *proUrl = prjFileList.find(itemURL); + ProjectURL *proUrl = prjFileList.tqfind(itemURL); if (!proUrl) { urlEntry.url = prjFileList.toRelative(itemURL); @@ -162,7 +162,7 @@ void RescanPrj::resizeEvent ( TQResizeEvent *t ) { RescanPrjDir::resizeEvent(t); // listView->setColumnWidth(0,listView->width()-listView->columnWidth(1)-20); -// MainLayout->setGeometry(childrenRect()); +// MainLayout->setGeometry(tqchildrenRect()); } void RescanPrj::slotSelect() @@ -214,7 +214,7 @@ KURL::List RescanPrj::files() } if (!u.isEmpty()) - r.append( QExtFileInfo::toAbsolute(u, baseURL) ); + r.append( TQExtFileInfo::toAbsolute(u, baseURL) ); } } return r; @@ -227,7 +227,7 @@ void RescanPrj::slotListDone(KIO::Job *) if (m_listJobCount == 0) { progressText->setText(i18n("Building tree:")); - progressText->repaint(); + progressText->tqrepaint(); progress->setTotalSteps(urlList.count()); progress->setValue(0); URLListEntry urlEntry; diff --git a/quanta/project/rescanprj.h b/quanta/project/rescanprj.h index e1e61f04..39a03bb0 100644 --- a/quanta/project/rescanprj.h +++ b/quanta/project/rescanprj.h @@ -34,9 +34,10 @@ struct URLListEntry{ class RescanPrj : public RescanPrjDir { Q_OBJECT + TQ_OBJECT public: RescanPrj(const ProjectList &p_prjFileList, const KURL& p_baseURL, const TQRegExp &p_excludeRx, - TQWidget *parent=0, const char *name=0, bool modal = true); + TQWidget *tqparent=0, const char *name=0, bool modal = true); ~RescanPrj(); public slots: diff --git a/quanta/project/rescanprjdir.ui b/quanta/project/rescanprjdir.ui index d4fdf556..8cdafab6 100644 --- a/quanta/project/rescanprjdir.ui +++ b/quanta/project/rescanprjdir.ui @@ -9,7 +9,7 @@ * * ***************************************************************************/ </comment> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>RescanPrjDir</cstring> </property> @@ -29,7 +29,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>620</width> <height>540</height> @@ -50,7 +50,7 @@ <cstring>progress</cstring> </property> </widget> - <widget class="QLabel" row="11" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="11" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>progressText</cstring> </property> @@ -71,7 +71,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -83,13 +83,13 @@ <property name="name"> <cstring>Line2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>4</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>4</height> @@ -105,7 +105,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QPushButton" row="9" column="1"> + <widget class="TQPushButton" row="9" column="1"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -116,7 +116,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="8" column="1"> + <widget class="TQPushButton" row="8" column="1"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -130,7 +130,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="6" column="1"> + <widget class="TQPushButton" row="6" column="1"> <property name="name"> <cstring>buttonCollapse</cstring> </property> @@ -148,14 +148,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>144</height> </size> </property> </spacer> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>buttonSelect</cstring> </property> @@ -163,7 +163,7 @@ <string>&All</string> </property> </widget> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>buttonDeselect</cstring> </property> @@ -171,7 +171,7 @@ <string>&None</string> </property> </widget> - <widget class="QPushButton" row="5" column="1"> + <widget class="TQPushButton" row="5" column="1"> <property name="name"> <cstring>buttonExpand</cstring> </property> @@ -179,7 +179,7 @@ <string>E&xpand All</string> </property> </widget> - <widget class="QPushButton" row="10" column="1"> + <widget class="TQPushButton" row="10" column="1"> <property name="name"> <cstring>buttonHelp</cstring> </property> @@ -190,7 +190,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="4" column="1"> + <widget class="TQPushButton" row="4" column="1"> <property name="name"> <cstring>buttonInvert</cstring> </property> @@ -247,7 +247,7 @@ <tabstop>buttonCancel</tabstop> <tabstop>buttonHelp</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>uploadtreeview.h</includehint> diff --git a/quanta/project/subprojecteditdlgs.ui b/quanta/project/subprojecteditdlgs.ui index 422bf2b8..ac9470ed 100644 --- a/quanta/project/subprojecteditdlgs.ui +++ b/quanta/project/subprojecteditdlgs.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>SubprojectEditDlgS</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SubprojectEditDlgS</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -40,7 +40,7 @@ <cstring>nameEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel10</cstring> </property> @@ -51,7 +51,7 @@ <cstring>locationEdit</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>createNew</cstring> </property> @@ -69,5 +69,5 @@ <tabstop>locationEdit</tabstop> <tabstop>createNew</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/project/teammembersdlg.cpp b/quanta/project/teammembersdlg.cpp index ea3e415c..f2fe6ad2 100644 --- a/quanta/project/teammembersdlg.cpp +++ b/quanta/project/teammembersdlg.cpp @@ -42,8 +42,8 @@ extern TQString taskLeaderStr; extern TQString teamLeaderStr; extern TQString subprojectLeaderStr; -TeamMembersDlg::TeamMembersDlg(TQWidget *parent, const char *name) - : TeamMembersDlgS(parent, name) +TeamMembersDlg::TeamMembersDlg(TQWidget *tqparent, const char *name) + : TeamMembersDlgS(tqparent, name) { m_yourself = ""; } @@ -186,13 +186,13 @@ void TeamMembersDlg::slotDeleteMember() if (deleteYourself) { - if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove yourself (<b>%1</b>) from the project team?<br>If you do so, you should select another member as yourself.</qt>").arg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove yourself (<b>%1</b>) from the project team?<br>If you do so, you should select another member as yourself.</qt>").tqarg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue) { delete item; setYourself(""); } } else - if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove <b>%1</b> from the project team?</qt>").arg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove <b>%1</b> from the project team?</qt>").tqarg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue) { delete item; } @@ -213,7 +213,7 @@ bool TeamMembersDlg::checkDuplicates(TQListViewItem *item, const TQString &name, (role == i18n(subprojectLeaderStr.utf8()) && it.current()->text(SUBPROJECT_COL) == subProject) ) ) { - if (KMessageBox::warningYesNo(this, i18n("<qt>The <b>%1</b> role is already assigned to <b>%2</b>. Do you want to reassign it to the current member?</qt>").arg(role).arg(it.current()->text(NAME_COL)), TQString::null, i18n("Reassign"), i18n("Do Not Reassign")) == KMessageBox::Yes) + if (KMessageBox::warningYesNo(this, i18n("<qt>The <b>%1</b> role is already assigned to <b>%2</b>. Do you want to reassign it to the current member?</qt>").tqarg(role).tqarg(it.current()->text(NAME_COL)), TQString(), i18n("Reassign"), i18n("Do Not Reassign")) == KMessageBox::Yes) { it.current()->setText(ROLE_COL, i18n(simpleMemberStr.utf8())); return true; @@ -223,7 +223,7 @@ bool TeamMembersDlg::checkDuplicates(TQListViewItem *item, const TQString &name, } else if (nick.lower() == nickName.lower() && it.current() != item && (it.current()->text(EMAIL_COL) != email || it.current()->text(NAME_COL) != name)) { - KMessageBox::error(this, i18n("<qt>The <b>%1</b> nickname is already assigned to <b>%2 <%3></b>.</qt>").arg(nickName).arg(it.current()->text(NAME_COL)).arg(it.current()->text(EMAIL_COL))); + KMessageBox::error(this, i18n("<qt>The <b>%1</b> nickname is already assigned to <b>%2 <%3></b>.</qt>").tqarg(nickName).tqarg(it.current()->text(NAME_COL)).tqarg(it.current()->text(EMAIL_COL))); return false; } ++it; diff --git a/quanta/project/teammembersdlg.h b/quanta/project/teammembersdlg.h index 045c0a7c..2884fb1c 100644 --- a/quanta/project/teammembersdlg.h +++ b/quanta/project/teammembersdlg.h @@ -25,8 +25,9 @@ class TeamMembersDlg : public TeamMembersDlgS { Q_OBJECT + TQ_OBJECT public: - TeamMembersDlg(TQWidget *parent = 0, const char *name = 0); + TeamMembersDlg(TQWidget *tqparent = 0, const char *name = 0); ~TeamMembersDlg(); void setYourself(const TQString &name); diff --git a/quanta/project/teammembersdlgs.ui b/quanta/project/teammembersdlgs.ui index eb2689dc..0949cf88 100644 --- a/quanta/project/teammembersdlgs.ui +++ b/quanta/project/teammembersdlgs.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>TeamMembersDlgS</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>TeamMembersDlgS</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -32,7 +32,7 @@ <cstring>mailingListEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -40,7 +40,7 @@ <string>You are:</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>yourselfLabel</cstring> </property> @@ -52,11 +52,11 @@ <property name="text"> <string>Please select your identity from the member list.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> - <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -172,7 +172,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>100</width> <height>20</height> @@ -231,13 +231,13 @@ <tabstop>deleteMemberButton</tabstop> <tabstop>setToYourselfButton</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>slotAddMember()</slot> <slot>slotEditMember()</slot> <slot>slotDeleteMember()</slot> <slot>slotSetToYourself()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/quanta/project/uploadprofiledlgs.ui b/quanta/project/uploadprofiledlgs.ui index 851a133c..9d36a26e 100644 --- a/quanta/project/uploadprofiledlgs.ui +++ b/quanta/project/uploadprofiledlgs.ui @@ -10,7 +10,7 @@ ***************************************************************************/ </comment> <author>(C) 2004 Andras Mantia <[email protected]></author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>UploadProfileDlgS</cstring> </property> @@ -29,12 +29,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="10"> + <widget class="TQLineEdit" row="3" column="1" rowspan="1" colspan="10"> <property name="name"> <cstring>linePath</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -45,7 +45,7 @@ <cstring>lineHost</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -56,7 +56,7 @@ <cstring>lineUser</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -67,7 +67,7 @@ <cstring>linePath</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -78,7 +78,7 @@ <cstring>lineProfileName</cstring> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="5"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>defaultProfile</cstring> </property> @@ -86,7 +86,7 @@ <string>Use as &default profile</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>lineUser</cstring> </property> @@ -99,7 +99,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="2" column="3"> + <widget class="TQLabel" row="2" column="3"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -122,7 +122,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>90</width> <height>0</height> @@ -144,7 +144,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>90</width> <height>0</height> @@ -167,14 +167,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>445</width> <height>20</height> </size> </property> </spacer> - <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>lineHost</cstring> </property> @@ -187,12 +187,12 @@ </sizepolicy> </property> </widget> - <widget class="QComboBox" row="1" column="5" rowspan="1" colspan="3"> + <widget class="TQComboBox" row="1" column="5" rowspan="1" colspan="3"> <property name="name"> <cstring>comboProtocol</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="10"> + <widget class="TQLineEdit" row="1" column="10"> <property name="name"> <cstring>port</cstring> </property> @@ -205,7 +205,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="1" column="8" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="8" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -216,7 +216,7 @@ <cstring>port</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="6" rowspan="1" colspan="5"> + <widget class="TQCheckBox" row="2" column="6" rowspan="1" colspan="5"> <property name="name"> <cstring>keepPasswd</cstring> </property> @@ -256,14 +256,14 @@ is obscured, saving the password in any file is a security risk. Use this option </sizepolicy> </property> </widget> - <widget class="QLabel" row="1" column="4"> + <widget class="TQLabel" row="1" column="4"> <property name="name"> <cstring>TextLabel1</cstring> </property> <property name="text"> <string>&Protocol:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -306,5 +306,5 @@ is obscured, saving the password in any file is a security risk. Use this option <tabstop>okButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/project/uploadprofiles.cpp b/quanta/project/uploadprofiles.cpp index cb54c27f..779903ab 100644 --- a/quanta/project/uploadprofiles.cpp +++ b/quanta/project/uploadprofiles.cpp @@ -55,12 +55,12 @@ void UploadProfiles::readFromXML(const TQDomDocument &dom) bool UploadProfiles::removeFromMapAndXML(const TQString &name) { - UploadProfiles::Iterator it = find(name); + UploadProfiles::Iterator it = tqfind(name); if ( it == end() ) return false; // ok now remove TQDomElement el = (*it).domElement; - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); erase(name); return true; } diff --git a/quanta/project/uploadprofiles.h b/quanta/project/uploadprofiles.h index db83e125..07011e2e 100644 --- a/quanta/project/uploadprofiles.h +++ b/quanta/project/uploadprofiles.h @@ -94,7 +94,7 @@ private: TQWidget * createTreeview(const UploadProfile &profile); /** - creates a KURL from a QDomElement + creates a KURL from a TQDomElement @param e a TQDomElement where the path is saved diff --git a/quanta/project/uploadprofilespage.ui b/quanta/project/uploadprofilespage.ui index 745e0ba4..bd5ce2e4 100644 --- a/quanta/project/uploadprofilespage.ui +++ b/quanta/project/uploadprofilespage.ui @@ -11,7 +11,7 @@ ***************************************************************************/ </comment> <author>(C) 2004 by Andras Mantia</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>UploadProfilesPage</cstring> </property> @@ -30,15 +30,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pLabel</cstring> </property> @@ -62,7 +62,7 @@ <string>Edit Profiles</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>profileLabel</cstring> </property> @@ -78,7 +78,7 @@ <string>x</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>checkShowUploadTreeviews</cstring> </property> @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -118,8 +118,8 @@ <includes> <include location="local" impldecl="in implementation">uploadprofilespage.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot>buttonEditProfiles_clicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/project/uploadprofilespage.ui.h b/quanta/project/uploadprofilespage.ui.h index cb7aad06..054a3622 100644 --- a/quanta/project/uploadprofilespage.ui.h +++ b/quanta/project/uploadprofilespage.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ |