From e985f7e545f4739493965aad69bbecb136dc9346 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 16 Jun 2011 19:02:47 +0000 Subject: 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 --- kommander/editor/functionsimpl.cpp | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'kommander/editor/functionsimpl.cpp') diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp index a758ab30..991377f8 100644 --- a/kommander/editor/functionsimpl.cpp +++ b/kommander/editor/functionsimpl.cpp @@ -130,13 +130,13 @@ TQString FunctionsDialog::currentFunctionText() function = s + "."; } if (groupComboBox->currentText() == "Kommander") - return TQString("%1%2%3").arg(prefix).arg(functionListBox->currentText()).arg(params()); + return TQString("%1%2%3").tqarg(prefix).tqarg(functionListBox->currentText()).tqarg(params()); else if (groupComboBox->currentItem() == m_DCOP || groupComboBox->currentItem() == m_Slots) - return TQString("%1%2.%3%4").arg(prefix).arg(widgetComboBox->currentText().section(' ', 0, 0)) - .arg(functionListBox->currentText().left(functionListBox->currentText().find('('))).arg(params()); + return TQString("%1%2.%3%4").tqarg(prefix).tqarg(widgetComboBox->currentText().section(' ', 0, 0)) + .tqarg(functionListBox->currentText().left(functionListBox->currentText().tqfind('('))).tqarg(params()); else - return TQString("%1%2%3%4").arg(prefix).arg(function) - .arg(functionListBox->currentText()).arg(params()); + return TQString("%1%2%3%4").tqarg(prefix).tqarg(function) + .tqarg(functionListBox->currentText()).tqarg(params()); } void FunctionsDialog::groupChanged(int index) @@ -147,15 +147,15 @@ void FunctionsDialog::groupChanged(int index) if (index == m_Slots) { KommanderWidget* a_atw = dynamic_cast(m_widgetList[widgetComboBox->currentText()]); - TQStringList pFunctions = TQStringList::fromStrList(a_atw->object()->metaObject()->slotNames(true)); + TQStringList pFunctions = TQStringList::fromStrList(a_atw->object()->tqmetaObject()->slotNames(true)); for (uint i=0; iinsertItem(name); @@ -195,13 +195,13 @@ void FunctionsDialog::functionChanged(int) { KommanderWidget* w = dynamic_cast(m_widgetList[widgetComboBox->currentText()]); TQObject *o = w->object(); - TQString slotHelp = i18n("To learn more about the slot, look at the documentation of the base Qt/KDE class, most probably %1.").arg(o->metaObject()->superClassName() ? TQString(o->metaObject()->superClassName()) : TQString(o->className()) ); + TQString slotHelp = i18n("To learn more about the slot, look at the documentation of the base TQt/KDE class, most probably %1.").tqarg(o->tqmetaObject()->tqsuperClassName() ? TQString(o->tqmetaObject()->tqsuperClassName()) : TQString(o->className()) ); TQString slotName = functionListBox->currentText(); TQString slot = m_slotList[slotName]; descriptionText->clear(); descriptionText->setText(i18n("

%1

" "

Description: %2\n

Syntax: %3%4") - .arg(slotName).arg(slotHelp).arg(slot).arg("")); + .tqarg(slotName).tqarg(slotHelp).tqarg(slot).tqarg("")); } else { int index = groupComboBox->currentItem(); @@ -224,8 +224,8 @@ void FunctionsDialog::functionChanged(int) descriptionText->clear(); descriptionText->setText(i18n("

%1

" "

Description: %2\n

Syntax: %3%4") - .arg(functionListBox->currentText()).arg(m_function.description()) - .arg(m_function.prototype(pflags)).arg(defArgs)); + .tqarg(functionListBox->currentText()).tqarg(m_function.description()) + .tqarg(m_function.prototype(pflags)).tqarg(defArgs)); } showParameters(); @@ -238,7 +238,7 @@ void FunctionsDialog::copyText() insertedText->getCursorPosition(¶, &i); // int cursorPos = insertedText->cursorPosition(); insertedText->insert(text); - insertedText->setCursorPosition(para, i + text.find('(') + 1); + insertedText->setCursorPosition(para, i + text.tqfind('(') + 1); } void FunctionsDialog::showParameters() @@ -262,7 +262,7 @@ void FunctionsDialog::showParameters() if (i < argsCount) { type = slotArgs[i].remove(TQRegExp("\\*|\\&|const\\s")); - labels[i]->setText(TQString("%1:").arg(type)); + labels[i]->setText(TQString("%1:").tqarg(type)); } quotes[i]->setChecked(true); quotes[i]->setShown(false); @@ -279,7 +279,7 @@ void FunctionsDialog::showParameters() combos[i]->setShown(false); edits[i]->setShown(i < argsCount); edits[i]->clear(); - if (type == "TQString") + if (type == TQSTRING_OBJECT_NAME_STRING) { quotes[i]->setShown(i < argsCount); } @@ -303,7 +303,7 @@ void FunctionsDialog::showParameters() { labels[i]->setShown(i < argsCount); if (i < argsCount) - labels[i]->setText(TQString("%1:").arg(m_function.argumentName(i))); + labels[i]->setText(TQString("%1:").tqarg(m_function.argumentName(i))); quotes[i]->setChecked(true); quotes[i]->setShown(false); if (m_function.argumentType(i) == "bool") @@ -336,7 +336,7 @@ void FunctionsDialog::showParameters() combos[i]->setShown(false); edits[i]->setShown(i < argsCount); edits[i]->clear(); - if (m_function.argumentType(i) == "TQString") + if (m_function.argumentType(i) == TQSTRING_OBJECT_NAME_STRING) { quotes[i]->setShown(i < argsCount); } @@ -362,8 +362,8 @@ TQString FunctionsDialog::params() TQString s = edits[i]->text(); if (!s.isEmpty() || i < m_function.minArg()) { - if (quotes[i]->isChecked() && ( (!slotsShown && m_function.argumentType(i) == "TQString") - || (slotsShown && labels[i]->text().startsWith("TQString")) ) ) + if (quotes[i]->isChecked() && ( (!slotsShown && m_function.argumentType(i) == TQSTRING_OBJECT_NAME_STRING) + || (slotsShown && labels[i]->text().startsWith(TQSTRING_OBJECT_NAME_STRING)) ) ) s = '"' + s + '"'; pars.append(s); } @@ -383,7 +383,7 @@ TQString FunctionsDialog::params() } TQString a_param = pars.join(", "); if (params) - return TQString("(%1)").arg(a_param); + return TQString("(%1)").tqarg(a_param); else return a_param; } -- cgit v1.2.1