summaryrefslogtreecommitdiffstats
path: root/quanta/dialogs
diff options
context:
space:
mode:
Diffstat (limited to 'quanta/dialogs')
-rw-r--r--quanta/dialogs/actionconfigdialog.cpp48
-rw-r--r--quanta/dialogs/dtepeditdlg.cpp2
-rw-r--r--quanta/dialogs/dtepeditdlgs.ui4
-rw-r--r--quanta/dialogs/dtepstructureeditdlgs.ui4
-rw-r--r--quanta/dialogs/settings/abbreviation.cpp8
-rw-r--r--quanta/dialogs/settings/filemasks.cpp6
-rw-r--r--quanta/dialogs/specialchardialog.cpp6
-rw-r--r--quanta/dialogs/tagdialogs/corewidgetdlg.cpp12
-rw-r--r--quanta/dialogs/tagdialogs/tagattr.cpp4
-rw-r--r--quanta/dialogs/tagdialogs/tagattr.h2
-rw-r--r--quanta/dialogs/tagdialogs/tagdialog.cpp8
-rw-r--r--quanta/dialogs/tagdialogs/tagimgdlg.cpp16
-rw-r--r--quanta/dialogs/tagdialogs/tagimgdlgdata.cpp2
-rw-r--r--quanta/dialogs/tagdialogs/tagmaildlg.cpp10
-rw-r--r--quanta/dialogs/tagdialogs/tagwidget.cpp8
-rw-r--r--quanta/dialogs/tagdialogs/tagxml.cpp30
16 files changed, 85 insertions, 85 deletions
diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp
index 0ac7ede2..562d74ed 100644
--- a/quanta/dialogs/actionconfigdialog.cpp
+++ b/quanta/dialogs/actionconfigdialog.cpp
@@ -89,7 +89,7 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList,
for (int i = 0; i < tb->count(); i++)
{
toolbarName = tb->label(i);
- toolbarName.tqreplace(r, "");
+ toolbarName.replace(r, "");
item = new KListViewItem(actionTreeView, oldItem, i18n(toolbarName.utf8()));
actionTreeView->insertItem(item);
@@ -106,13 +106,13 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList,
action = ac->action(node.toElement().attribute("name").ascii());
if (action)
{
- oldActionItem = new KListViewItem(item, oldActionItem, action->text().tqreplace(r,""), action->shortcut().toString(), action->name());
+ oldActionItem = new KListViewItem(item, oldActionItem, action->text().replace(r,""), action->shortcut().toString(), action->name());
oldActionItem->setPixmap(0, SmallIcon(action->icon()) );
}
}
node = node.nextSibling();
}
- if (tb->label(tb->currentPageIndex()).tqreplace(r, "") == toolbarName)
+ if (tb->label(tb->currentPageIndex()).replace(r, "") == toolbarName)
{
item->setOpen(true);
if (item->firstChild())
@@ -142,7 +142,7 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList,
for (uint i = 0; i < acCount; i++)
{
action = ac->action(i);
- item = new KListViewItem(allActionsItem, action->text().tqreplace(r, ""), action->shortcut().toString(), action->name());
+ item = new KListViewItem(allActionsItem, action->text().replace(r, ""), action->shortcut().toString(), action->name());
item->setPixmap(0, SmallIcon(action->icon()) );
}
allActionsItem->sortChildItems(0, true);
@@ -168,7 +168,7 @@ void ActionConfigDialog::slotAddToolbar()
for (int i = 0; i < tb->count(); i++)
{
toolbarName = tb->label(i);
- if (!actionTreeView->tqfindItem(toolbarName, 0))
+ if (!actionTreeView->findItem(toolbarName, 0))
{
item = actionTreeView->lastItem();
if (item->tqparent())
@@ -231,7 +231,7 @@ void ActionConfigDialog::slotEditToolbar()
ToolbarEntry *p_toolbar = m_toolbarList[toolbarId];
if (p_toolbar)
{
- oldItem = actionTreeView->tqfindItem(toolbarName, 0);
+ oldItem = actionTreeView->findItem(toolbarName, 0);
item = new KListViewItem(actionTreeView, oldItem, toolbarName);
item->setOpen(oldItem->isOpen());
delete oldItem;
@@ -243,7 +243,7 @@ void ActionConfigDialog::slotEditToolbar()
action = ac->action(node.toElement().attribute("name").ascii());
if (action)
{
- oldItem = new KListViewItem(item, oldItem, action->text().tqreplace(TQRegExp("\\&(?!\\&)"),""), action->shortcut().toString(), action->name());
+ oldItem = new KListViewItem(item, oldItem, action->text().replace(TQRegExp("\\&(?!\\&)"),""), action->shortcut().toString(), action->name());
oldItem->setPixmap(0, SmallIcon(action->icon()));
}
}
@@ -309,7 +309,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item)
actionIcon->setIcon(s);
}
TQString actionText = el.attribute("text");
- actionText.tqreplace(TQRegExp("\\&(?!\\&)"),"");
+ actionText.replace(TQRegExp("\\&(?!\\&)"),"");
lineText->setText(actionText);
lineToolTip->setText( el.attribute("tooltip") );
selectedShortcut = action->shortcut();
@@ -406,7 +406,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item)
{
outputBox->setCurrentItem(2);
} else
- if (s == "tqreplace")
+ if (s == "replace")
{
outputBox->setCurrentItem(3);
} else
@@ -431,7 +431,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item)
{
errorBox->setCurrentItem(2);
} else
- if (s == "tqreplace")
+ if (s == "replace")
{
errorBox->setCurrentItem(3);
} else
@@ -472,7 +472,7 @@ void ActionConfigDialog::saveCurrentAction()
currentAction->setIcon(s);
TQString oldText = el.attribute("text");
s = lineText->text();
- s.tqreplace('&', "&&");
+ s.replace('&', "&&");
el.setAttribute("text", s);
currentAction->setText(s);
s = lineToolTip->text();
@@ -549,7 +549,7 @@ void ActionConfigDialog::saveCurrentAction()
case 2:{ item.setAttribute("output", "selection");
break;
}
- case 3:{ item.setAttribute("output", "tqreplace");
+ case 3:{ item.setAttribute("output", "replace");
break;
}
case 4:{ item.setAttribute("output", "new");
@@ -570,7 +570,7 @@ void ActionConfigDialog::saveCurrentAction()
case 2:{ item.setAttribute("error", "selection");
break;
}
- case 3:{ item.setAttribute("error", "tqreplace");
+ case 3:{ item.setAttribute("error", "replace");
break;
}
case 4:{ item.setAttribute("error", "new");
@@ -618,7 +618,7 @@ void ActionConfigDialog::saveCurrentAction()
if (p_toolbar)
{
TQDomNode node = p_toolbar->guiClient->domDocument().firstChild().firstChild().firstChild();
- bool placeOnToolbar = toolbarListBox->tqfindItem(toolbarName, TQt::ExactMatch);
+ bool placeOnToolbar = toolbarListBox->findItem(toolbarName, TQt::ExactMatch);
while (!node.isNull())
{
if (node.nodeName() == "Action" &&
@@ -658,7 +658,7 @@ void ActionConfigDialog::saveCurrentAction()
item.setAttribute("name",el.attribute("name"));
p_toolbar->guiClient->domDocument().firstChild().firstChild().appendChild(item);
//put it also in the treeview
- listItem = actionTreeView->tqfindItem(toolbarName, 0);
+ listItem = actionTreeView->findItem(toolbarName, 0);
if (listItem)
{
TQListViewItem *after = listItem->firstChild();
@@ -698,29 +698,29 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut)
{
TQString shortcutText = shortcut.toString();
TQString shortcutText2;
- int pos = shortcutText.tqfind(';');
+ int pos = shortcutText.find(';');
if (pos != -1)
{
shortcutText2 = shortcutText.mid(pos + 1);
shortcutText = shortcutText.left(pos);
}
TQString s = shortcutText;
- s.tqreplace('+', "\\+");
+ s.replace('+', "\\+");
TQRegExp shortcutRx("\\(" + s + "\\)|" + s + "$|" + s + ";");
s = shortcutText2;
- s.tqreplace('+', "\\+");
+ s.replace('+', "\\+");
TQRegExp shortcutRx2("\\(" + s + "\\)|" + s + "$|" + s + ";");
TQString global;
//check for conflicting global shortcuts
TQMap<TQString, TQString>::Iterator it;
for ( it = globalShortcuts.begin(); it != globalShortcuts.end(); ++it )
{
- if (it.data().tqcontains(shortcutRx))
+ if (it.data().contains(shortcutRx))
{
global = it.key();
break;
}
- if (!shortcutText2.isEmpty() && it.data().tqcontains(shortcutRx2))
+ if (!shortcutText2.isEmpty() && it.data().contains(shortcutRx2))
{
shortcutText = shortcutText2;
global = it.key();
@@ -737,12 +737,12 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut)
for (uint i = 0; i < ac->count(); i++)
{
KAction *action = ac->action(i);
- if (action != currentAction && action->shortcut().toString().tqcontains(shortcutRx))
+ if (action != currentAction && action->shortcut().toString().contains(shortcutRx))
{
global = action->text();
break;
}
- if (!shortcutText2.isEmpty() && action != currentAction && action->shortcut().toString().tqcontains(shortcutRx))
+ if (!shortcutText2.isEmpty() && action != currentAction && action->shortcut().toString().contains(shortcutRx))
{
shortcutText = shortcutText2;
global = action->text();
@@ -761,7 +761,7 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut)
selectedShortcut = shortcut;
} else
{
- global.tqreplace('&',"");
+ global.replace('&',"");
TQString s = i18n("The '%1' key combination has already been allocated "
"to the \"%2\" action.\n"
"Please choose a unique key combination.").
@@ -876,7 +876,7 @@ void ActionConfigDialog::slotAddContainerToolbar()
TQStringList lst;
for (i = 0; i < tb->count(); i++)
{
- if (!toolbarListBox->tqfindItem(tb->label(i), TQt::ExactMatch))
+ if (!toolbarListBox->findItem(tb->label(i), TQt::ExactMatch))
lst << tb->label(i);
}
diff --git a/quanta/dialogs/dtepeditdlg.cpp b/quanta/dialogs/dtepeditdlg.cpp
index 88201b3d..7a6120e4 100644
--- a/quanta/dialogs/dtepeditdlg.cpp
+++ b/quanta/dialogs/dtepeditdlg.cpp
@@ -94,7 +94,7 @@ void DTEPEditDlg::readGeneral()
TQString inherits = m_config->readEntry("Inherits");
TQStringList lst(DTDs::ref()->nameList());
inheritsCombo->insertStringList(lst);
- int idx = lst.tqfindIndex(inherits);
+ int idx = lst.findIndex(inherits);
if (idx == -1)
inheritsCombo->insertItem(inherits, 0);
else
diff --git a/quanta/dialogs/dtepeditdlgs.ui b/quanta/dialogs/dtepeditdlgs.ui
index 1167f46e..8c223417 100644
--- a/quanta/dialogs/dtepeditdlgs.ui
+++ b/quanta/dialogs/dtepeditdlgs.ui
@@ -1302,7 +1302,7 @@ Example: &lt;b&gt;Tags=style(type[text/css])&lt;/b&gt; means that both &lt;b&gt;
<string>Comma separated list of the local scope defining keywords</string>
</property>
<property name="whatsThis" stdset="0">
- <string>Comma separated list of the local scope defining keywords. Other structure group elements found under a structure node that was created based on a keyword from this list are treated as local elements. For example if this list tqcontains &lt;b&gt;function&lt;/b&gt;, it means that elements, like variables found under a &lt;b&gt;function&lt;/b&gt; are local, relative to the node that holds the &lt;b&gt;function&lt;/b&gt;.</string>
+ <string>Comma separated list of the local scope defining keywords. Other structure group elements found under a structure node that was created based on a keyword from this list are treated as local elements. For example if this list contains &lt;b&gt;function&lt;/b&gt;, it means that elements, like variables found under a &lt;b&gt;function&lt;/b&gt; are local, relative to the node that holds the &lt;b&gt;function&lt;/b&gt;.</string>
</property>
</widget>
<widget class="KLineEdit" row="3" column="1" rowspan="1" colspan="3">
@@ -1313,7 +1313,7 @@ Example: &lt;b&gt;Tags=style(type[text/css])&lt;/b&gt; means that both &lt;b&gt;
<string>Comma separated list of the local scope defining keywords</string>
</property>
<property name="whatsThis" stdset="0">
- <string>Comma separated list of the local scope defining keywords. Other structure group elements found under a structure node that was created based on a keyword from this list are treated as local elements. For example if this list tqcontains &lt;b&gt;function&lt;/b&gt;, it means that elements, like variables found under a &lt;b&gt;function&lt;/b&gt; are local, relative to the node that holds the &lt;b&gt;function&lt;/b&gt;.</string>
+ <string>Comma separated list of the local scope defining keywords. Other structure group elements found under a structure node that was created based on a keyword from this list are treated as local elements. For example if this list contains &lt;b&gt;function&lt;/b&gt;, it means that elements, like variables found under a &lt;b&gt;function&lt;/b&gt; are local, relative to the node that holds the &lt;b&gt;function&lt;/b&gt;.</string>
</property>
</widget>
<widget class="KLineEdit" row="2" column="1" rowspan="1" colspan="3">
diff --git a/quanta/dialogs/dtepstructureeditdlgs.ui b/quanta/dialogs/dtepstructureeditdlgs.ui
index b7813f8d..bcec6363 100644
--- a/quanta/dialogs/dtepstructureeditdlgs.ui
+++ b/quanta/dialogs/dtepstructureeditdlgs.ui
@@ -250,7 +250,7 @@
Example (simplified):&lt;br&gt;
&lt;b&gt;DefinitionRx=\$+([a-zA-Z]+)=new\\s[a-zA-Z]+;&lt;br&gt;
TypeRx=new\\s([a-zA-Z]+);&lt;/b&gt;&lt;br&gt;&lt;br&gt;
-This will match strings like &lt;b&gt;$fooObj=new foo;&lt;/b&gt;. Now this string is searched and it will tqfind &lt;b&gt;new foo;&lt;/b&gt;, where &lt;b&gt;foo&lt;/b&gt; is the first captured text (the regular expression matching &lt;b&gt;foo&lt;/b&gt; is between brackets).&lt;br&gt;
+This will match strings like &lt;b&gt;$fooObj=new foo;&lt;/b&gt;. Now this string is searched and it will find &lt;b&gt;new foo;&lt;/b&gt;, where &lt;b&gt;foo&lt;/b&gt; is the first captured text (the regular expression matching &lt;b&gt;foo&lt;/b&gt; is between brackets).&lt;br&gt;
So the type of &lt;b&gt;$fooObj&lt;/b&gt; is &lt;b&gt;foo&lt;/b&gt;.</string>
</property>
</widget>
@@ -298,7 +298,7 @@ Example 3:&lt;br&gt;
Example (simplified):&lt;br&gt;
&lt;b&gt;DefinitionRx=\$+([a-zA-Z]+)=new\\s[a-zA-Z]+;&lt;br&gt;
TypeRx=new\\s([a-zA-Z]+);&lt;/b&gt;&lt;br&gt;&lt;br&gt;
-This will match strings like &lt;b&gt;$fooObj=new foo;&lt;/b&gt;. Now this string is searched and it will tqfind &lt;b&gt;new foo;&lt;/b&gt;, where &lt;b&gt;foo&lt;/b&gt; is the first captured text (the regular expression matching &lt;b&gt;foo&lt;/b&gt; is between brackets).&lt;br&gt;
+This will match strings like &lt;b&gt;$fooObj=new foo;&lt;/b&gt;. Now this string is searched and it will find &lt;b&gt;new foo;&lt;/b&gt;, where &lt;b&gt;foo&lt;/b&gt; is the first captured text (the regular expression matching &lt;b&gt;foo&lt;/b&gt; is between brackets).&lt;br&gt;
So the type of &lt;b&gt;$fooObj&lt;/b&gt; is &lt;b&gt;foo&lt;/b&gt;.</string>
</property>
</widget>
diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp
index 1f1728ae..f41a98a1 100644
--- a/quanta/dialogs/settings/abbreviation.cpp
+++ b/quanta/dialogs/settings/abbreviation.cpp
@@ -76,8 +76,8 @@ void AbbreviationDlg::slotGroupChanged(const TQString& newGroupName)
for ( it = m_currentAbbrev->abbreviations.constBegin(); it != m_currentAbbrev->abbreviations.constEnd(); ++it )
{
templateStr = it.key();
- templateName = templateStr.mid(templateStr.tqfind(' ') + 1);
- templateStr = templateStr.left(templateStr.tqfind(' '));
+ templateName = templateStr.mid(templateStr.find(' ') + 1);
+ templateStr = templateStr.left(templateStr.find(' '));
new KListViewItem(templatesList, templateStr, templateName);
}
for ( TQStringList::ConstIterator dtepit = m_currentAbbrev->dteps.constBegin(); dtepit != m_currentAbbrev->dteps.constEnd(); ++dtepit )
@@ -95,7 +95,7 @@ void AbbreviationDlg::slotNewGroup()
TQString groupName = KInputDialog::getText(i18n("New Abbreviation Group"), i18n("Group name:"), "", &ok, this);
if (ok && !groupName.isEmpty())
{
- if (qConfig.abbreviations.tqcontains(groupName))
+ if (qConfig.abbreviations.contains(groupName))
{
KMessageBox::error(this, i18n("<qt>There is already an abbreviation group called <b>%1</b>. Choose an unique name for the new group.</qt>").tqarg(groupName), i18n("Group already exists"));
TQTimer::singleShot(0, this, TQT_SLOT(slotNewGroup()));
@@ -248,7 +248,7 @@ void AbbreviationDlg::saveTemplates()
el.setAttribute("code", it.data());
s = it.key();
s2 = "";
- pos = s.tqfind(' ');
+ pos = s.find(' ');
if (pos != -1)
{
s2 = s.mid(pos+1);
diff --git a/quanta/dialogs/settings/filemasks.cpp b/quanta/dialogs/settings/filemasks.cpp
index 04593921..58a601e8 100644
--- a/quanta/dialogs/settings/filemasks.cpp
+++ b/quanta/dialogs/settings/filemasks.cpp
@@ -43,12 +43,12 @@ void FileMasks::setToDefault()
for ( it = list.begin(); it != list.end(); ++it )
{
name = (*it)->name();
- if (name.tqcontains("text"))
+ if (name.contains("text"))
{
- if (!markup.tqcontains(name) && !script.tqcontains(name))
+ if (!markup.contains(name) && !script.contains(name))
text += name+"; ";
}
- if (name.tqcontains("image"))
+ if (name.contains("image"))
{
image += name +"; ";
}
diff --git a/quanta/dialogs/specialchardialog.cpp b/quanta/dialogs/specialchardialog.cpp
index 2caa497e..f8697123 100644
--- a/quanta/dialogs/specialchardialog.cpp
+++ b/quanta/dialogs/specialchardialog.cpp
@@ -52,7 +52,7 @@ void SpecialCharDialog::filterChars(const TQString& filter)
CharsListBox->insertStringList(charList);
else {
for (TQStringList::ConstIterator it = charList.begin(); it != charList.end(); ++it)
- if ( (*it).tqcontains(filter, false) )
+ if ( (*it).contains(filter, false) )
CharsListBox->insertItem(*it);
}
if (CharsListBox->currentItem() == -1 && CharsListBox->count())
@@ -67,8 +67,8 @@ TQString SpecialCharDialog::selection()
void SpecialCharDialog::insertCode()
{
TQString selected = CharsListBox->text(CharsListBox->currentItem());
- int begin = selected.tqfind("(&")+1;
- int length = selected.tqfind(";)") - begin + 1;
+ int begin = selected.find("(&")+1;
+ int length = selected.find(";)") - begin + 1;
m_selection = selected.mid(begin, length);
done(TQDialog::Accepted);
}
diff --git a/quanta/dialogs/tagdialogs/corewidgetdlg.cpp b/quanta/dialogs/tagdialogs/corewidgetdlg.cpp
index f45eea8f..815ecdf2 100644
--- a/quanta/dialogs/tagdialogs/corewidgetdlg.cpp
+++ b/quanta/dialogs/tagdialogs/corewidgetdlg.cpp
@@ -48,13 +48,13 @@ void CoreWidgetDlg::writeAttributes( TQDict<TQString> *d )
dict = d;
TQString *t; // value of attr.
- if (( t=d->tqfind("id") )) setValue(*t, lineId);
- if (( t=d->tqfind("class") )) setValue(*t, lineClass);
- if (( t=d->tqfind("style") )) setValue(*t, lineStyle);
- if (( t=d->tqfind("title") )) setValue(*t, lineTitle);
+ if (( t=d->find("id") )) setValue(*t, lineId);
+ if (( t=d->find("class") )) setValue(*t, lineClass);
+ if (( t=d->find("style") )) setValue(*t, lineStyle);
+ if (( t=d->find("title") )) setValue(*t, lineTitle);
- if (( t=d->tqfind("lang") )) setValue(*t, lineLang);
- if (( t=d->tqfind("dir") )) setValue(*t, lineDir);
+ if (( t=d->find("lang") )) setValue(*t, lineLang);
+ if (( t=d->find("dir") )) setValue(*t, lineDir);
}
diff --git a/quanta/dialogs/tagdialogs/tagattr.cpp b/quanta/dialogs/tagdialogs/tagattr.cpp
index 1ab0bdde..be05c44f 100644
--- a/quanta/dialogs/tagdialogs/tagattr.cpp
+++ b/quanta/dialogs/tagdialogs/tagattr.cpp
@@ -50,7 +50,7 @@ Attr_list::Attr_list( TQDomElement const& el, TQWidget *w, TQTag *dtdTag )
TQString method = el.attribute("method");
TQString interface = el.attribute("interface", "QuantaIf");
TQString arguments = el.attribute("arguments");
- arguments.tqreplace("%tagname%", m_dtdTag->name());
+ arguments.replace("%tagname%", m_dtdTag->name());
DCOPReply reply = QuantaCommon::callDCOPMethod(interface, method, arguments);
if (reply.isValid())
{
@@ -87,7 +87,7 @@ void Attr_list::setValue(const TQString &value)
}
-TQDomNode tqfindChild( TQDomNode &tqparent, const TQString &name )
+TQDomNode findChild( TQDomNode &tqparent, const TQString &name )
{
for ( TQDomNode n = tqparent.firstChild(); !n.isNull(); n = n.nextSibling() )
if ( n.nodeName() == name )
diff --git a/quanta/dialogs/tagdialogs/tagattr.h b/quanta/dialogs/tagdialogs/tagattr.h
index c9567eda..2206f896 100644
--- a/quanta/dialogs/tagdialogs/tagattr.h
+++ b/quanta/dialogs/tagdialogs/tagattr.h
@@ -37,7 +37,7 @@ class TQWidget;
class TQTag;
-TQDomNode tqfindChild( TQDomNode &tqparent, const TQString &name );
+TQDomNode findChild( TQDomNode &tqparent, const TQString &name );
class Attr
diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp
index 7a7ea593..ac9c8ffc 100644
--- a/quanta/dialogs/tagdialogs/tagdialog.cpp
+++ b/quanta/dialogs/tagdialogs/tagdialog.cpp
@@ -226,7 +226,7 @@ void TagDialog::parseTag()
{
TQDomNode node = nodeList.item(j);
TQString nodeTagName = node.toElement().attribute("name");
- if (groupList.tqcontains(nodeTagName) && dtdTag->commonGroups.tqcontains(nodeTagName)) //add the attributes of this common tag to a new tab
+ if (groupList.contains(nodeTagName) && dtdTag->commonGroups.contains(nodeTagName)) //add the attributes of this common tag to a new tab
{
TQString s;
TQTextStream str(&s, IO_ReadWrite);
@@ -325,11 +325,11 @@ TQString TagDialog::getAttributeString()
TQString TagDialog::getAttribute(const TQString& attr)
{
TQString attrStr = getAttributeString()+" ";
- int pos = attrStr.upper().tqfind(attr.upper());
+ int pos = attrStr.upper().find(attr.upper());
if (pos != -1)
{
- pos = attrStr.tqfind("=",pos+1) + 1;
- return attrStr.mid(pos, attrStr.tqfind(" ",pos) - pos);
+ pos = attrStr.find("=",pos+1) + 1;
+ return attrStr.mid(pos, attrStr.find(" ",pos) - pos);
}
else
{
diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp
index b52d3be9..95c41e4e 100644
--- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp
+++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp
@@ -145,7 +145,7 @@ void TagImgDlg::writeAttributes( TQDict<TQString> *d )
dict = d;
TQString *t; // value of attr.
- if (( t=d->tqfind("src") ))
+ if (( t=d->find("src") ))
{
lineImgSource->setText(*t);
KURL url = baseURL;
@@ -153,18 +153,18 @@ void TagImgDlg::writeAttributes( TQDict<TQString> *d )
url = QExtFileInfo::toAbsolute(url, baseURL);
slotImageSet( url );
}
- if ( (t=d->tqfind("alt")) )
+ if ( (t=d->find("alt")) )
setValue(*t, lineAltText);
- if ( (t=d->tqfind("width")) && lineWidth )
+ if ( (t=d->find("width")) && lineWidth )
setValue(*t, lineWidth);
- if ( (t=d->tqfind("height")) && lineHeight )
+ if ( (t=d->find("height")) && lineHeight )
setValue(*t, lineHeight);
- if ( (t=d->tqfind("hspace")) && lineHSpace)
+ if ( (t=d->find("hspace")) && lineHSpace)
setValue(*t, lineHSpace);
- if ( (t=d->tqfind("vspace")) && lineVSpace )
+ if ( (t=d->find("vspace")) && lineVSpace )
setValue(*t, lineVSpace);
- if ( (t=d->tqfind("align")) && comboAlign )
+ if ( (t=d->find("align")) && comboAlign )
setValue(*t, comboAlign);
- if ( (t=d->tqfind("border")) && spinBorder )
+ if ( (t=d->find("border")) && spinBorder )
setValue(*t, spinBorder);
}
diff --git a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp
index 07a44394..a761d62c 100644
--- a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp
+++ b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp
@@ -34,7 +34,7 @@ void TagImgDlg::initDialog(){
buttonImgSource->setText(i18n("..."));
grid->addMultiCellWidget(buttonImgSource, 0, 0, 4, 4);
- TQTag *imgTag = m_dtd->tagsList->tqfind("img");
+ TQTag *imgTag = m_dtd->tagsList->find("img");
if (!imgTag)
return;
diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.cpp b/quanta/dialogs/tagdialogs/tagmaildlg.cpp
index 0aa689d2..96cef91e 100644
--- a/quanta/dialogs/tagdialogs/tagmaildlg.cpp
+++ b/quanta/dialogs/tagdialogs/tagmaildlg.cpp
@@ -68,18 +68,18 @@ void TagMailDlg::slotSelectAddress()
n = n.simplifyWhiteSpace();
for( unsigned int i = 0; i < emails.count(); ++i ) {
if (!emails[i].isEmpty()) {
- if (n.isEmpty() || (emails[i].tqfind( "<" ) != -1))
+ if (n.isEmpty() || (emails[i].find( "<" ) != -1))
addr = "";
else { /* do we really need quotes around this name ? */
- if (n.tqfind(TQRegExp("[^ 0-9A-Za-z\\x0080-\\xFFFF]")) != -1)
+ if (n.find(TQRegExp("[^ 0-9A-Za-z\\x0080-\\xFFFF]")) != -1)
addr = qConfig.attrValueQuotation + n + qConfig.attrValueQuotation + " ";
else
addr = n + " ";
}
email = emails[i];
- if (!addr.isEmpty() && (email.tqfind( "<" ) == -1)
- && (email.tqfind( ">" ) == -1)
- && (email.tqfind( "," ) == -1))
+ if (!addr.isEmpty() && (email.find( "<" ) == -1)
+ && (email.find( ">" ) == -1)
+ && (email.find( "," ) == -1))
addr += "<" + email + ">";
else
addr += email;
diff --git a/quanta/dialogs/tagdialogs/tagwidget.cpp b/quanta/dialogs/tagdialogs/tagwidget.cpp
index 4eb79f24..f461e3a9 100644
--- a/quanta/dialogs/tagdialogs/tagwidget.cpp
+++ b/quanta/dialogs/tagdialogs/tagwidget.cpp
@@ -47,7 +47,7 @@ void TagWidget::updateDict(const TQString &attr, TQComboBox *combo )
delete s;
}
else
- dict->tqreplace(attr, s);
+ dict->replace(attr, s);
}
void TagWidget::setValue(const TQString &val, TQComboBox *combo)
@@ -92,7 +92,7 @@ void TagWidget::updateDict(const TQString &attr, TQLineEdit *line )
delete s;
}
else
- dict->tqreplace(attr, s);
+ dict->replace(attr, s);
}
void TagWidget::updateDict(const TQString &attr, TQSpinBox *spin )
@@ -104,7 +104,7 @@ void TagWidget::updateDict(const TQString &attr, TQSpinBox *spin )
delete s;
}
else
- dict->tqreplace(attr, s);
+ dict->replace(attr, s);
}
void TagWidget::updateDict(const TQString &attr, TQCheckBox *check )
@@ -113,7 +113,7 @@ void TagWidget::updateDict(const TQString &attr, TQCheckBox *check )
dict->remove(attr);
else
{
- if (!dict->tqfind(attr))
+ if (!dict->find(attr))
dict->insert(attr, new TQString(""));
}
}
diff --git a/quanta/dialogs/tagdialogs/tagxml.cpp b/quanta/dialogs/tagdialogs/tagxml.cpp
index a8428b20..0015c35e 100644
--- a/quanta/dialogs/tagdialogs/tagxml.cpp
+++ b/quanta/dialogs/tagdialogs/tagxml.cpp
@@ -56,7 +56,7 @@ void Tagxml::initialize(TQDomNode &d, TQTag *dtdTag)
//parse the tag XML file, in order to build up the dialog
for ( TQDomNode n = d.firstChild(); !n.isNull(); n = n.nextSibling() )
{
- TQDomNode location = tqfindChild(n,"location");
+ TQDomNode location = findChild(n,"location");
if ( location.isNull() )
continue;
@@ -69,7 +69,7 @@ void Tagxml::initialize(TQDomNode &d, TQTag *dtdTag)
int colspan = el.attribute("colspan","1").toInt()-1;
int rowspan = el.attribute("rowspan","1").toInt()-1;
- location = tqfindChild(n,"textlocation");
+ location = findChild(n,"textlocation");
el = location.toElement();
int textrow = el.attribute("row","0").toInt();
int textcol = el.attribute("col","0").toInt();
@@ -79,7 +79,7 @@ void Tagxml::initialize(TQDomNode &d, TQTag *dtdTag)
// qDebug("%s col:%d row:%d cs:%d, rs:%d", n.nodeName().data(), col,row,colspan,rowspan );
TQString tip;
- TQDomNode tooltip = tqfindChild( n ,"tooltip" );
+ TQDomNode tooltip = findChild( n ,"tooltip" );
if ( !tooltip.isNull() ) {
if ( tooltip.firstChild().isText() ) {
TQDomText text = tooltip.firstChild().toText();
@@ -87,7 +87,7 @@ void Tagxml::initialize(TQDomNode &d, TQTag *dtdTag)
}
}
TQString whatsThis;
- TQDomNode what = tqfindChild( n ,"whatsthis" );
+ TQDomNode what = findChild( n ,"whatsthis" );
if ( !what.isNull() ) {
if ( what.firstChild().isText() ) {
TQDomText text = what.firstChild().toText();
@@ -98,7 +98,7 @@ void Tagxml::initialize(TQDomNode &d, TQTag *dtdTag)
if ( n.nodeName() == "label" ) //a static label
{
TQLabel *label = new TQLabel(this);
- TQDomElement ltext = tqfindChild(n,"text").toElement();
+ TQDomElement ltext = findChild(n,"text").toElement();
if ( !ltext.isNull() )
label->setText( ltext.text().isEmpty() ? TQString("") : (ltext.text()+":") );
@@ -116,7 +116,7 @@ void Tagxml::initialize(TQDomNode &d, TQTag *dtdTag)
TQDomElement el(n.toElement());
TQString type = el.attribute("type","input");
- TQDomElement ltext = tqfindChild(n,"text").toElement();
+ TQDomElement ltext = findChild(n,"text").toElement();
if ( !ltext.isNull() && (type != "check") ) //if there is a text label for the attribute
{
TQLabel *label = new TQLabel(this);
@@ -152,7 +152,7 @@ void Tagxml::initialize(TQDomNode &d, TQTag *dtdTag)
TQCheckBox *w = new TQCheckBox(this);
grid->addMultiCellWidget( w, row, row+rowspan, col, col+colspan );
- TQDomElement ltext = tqfindChild(n,"text").toElement();
+ TQDomElement ltext = findChild(n,"text").toElement();
if ( !ltext.isNull() )
w->setText( ltext.text() );
if ( !tip.isNull() )
@@ -270,10 +270,10 @@ void Tagxml::readAttributes( TQDict<TQString> *d )
{
if (m_dtd->booleanAttributes == "simple")
{
- d->tqreplace(name, new TQString("") );
+ d->replace(name, new TQString("") );
} else
{
- d->tqreplace(name, new TQString(m_dtd->booleanTrue)); //it seems that browsers don't like <input disabled="false">, so if a checkbox is false, don't put in the tag at all
+ d->replace(name, new TQString(m_dtd->booleanTrue)); //it seems that browsers don't like <input disabled="false">, so if a checkbox is false, don't put in the tag at all
}
}
else
@@ -283,16 +283,16 @@ void Tagxml::readAttributes( TQDict<TQString> *d )
/* } else
{
value = (value == "checked")?m_dtd->booleanTrue:m_dtd->booleanFalse;
- d->tqreplace(name, new TQString(value));
+ d->replace(name, new TQString(value));
} */
} else
if (dynamic_cast<Attr_file *>(attr))
{
// value = KURL::encode_string(value);
- d->tqreplace(name, new TQString(value));
+ d->replace(name, new TQString(value));
} else {
- value.tqreplace(TQRegExp("&(?!amp;)"), "&amp;");
- d->tqreplace(name, new TQString(value) );
+ value.replace(TQRegExp("&(?!amp;)"), "&amp;");
+ d->replace(name, new TQString(value) );
}
}
@@ -313,9 +313,9 @@ void Tagxml::writeAttributes( TQDict<TQString> *d )
name = attr->attrName();
- TQString *v = d->tqfind(name);
+ TQString *v = d->find(name);
if ( v ) {
- v->tqreplace("&amp;","&");
+ v->replace("&amp;","&");
if ( dynamic_cast<Attr_check *>(attr) ) // checkbox
value = "checked";
else