summaryrefslogtreecommitdiffstats
path: root/kdeprint/management
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
commit6e21bc798ba1066147d69dcc2d5c222ffafb9a90 (patch)
tree36613dfe2f86f8ccb96a30f3880507341228eeb0 /kdeprint/management
parent1e9fe867b0def399c63c42f35e83c3575e91ff83 (diff)
downloadtdelibs-6e21bc798ba1066147d69dcc2d5c222ffafb9a90.tar.gz
tdelibs-6e21bc798ba1066147d69dcc2d5c222ffafb9a90.zip
rename the following methods:
tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdeprint/management')
-rw-r--r--kdeprint/management/cjanuswidget.cpp2
-rw-r--r--kdeprint/management/kmconfigfilter.cpp2
-rw-r--r--kdeprint/management/kmdbcreator.cpp2
-rw-r--r--kdeprint/management/kmdriverdb.cpp20
-rw-r--r--kdeprint/management/kmdriverdbwidget.cpp10
-rw-r--r--kdeprint/management/kminstancepage.cpp8
-rw-r--r--kdeprint/management/kmjobviewer.cpp2
-rw-r--r--kdeprint/management/kmspecialprinterdlg.cpp2
-rw-r--r--kdeprint/management/kmwbackend.cpp2
-rw-r--r--kdeprint/management/kmwclass.cpp2
-rw-r--r--kdeprint/management/kmwdriver.cpp2
-rw-r--r--kdeprint/management/kmwizard.cpp4
-rw-r--r--kdeprint/management/kmwlocal.cpp4
-rw-r--r--kdeprint/management/kmwname.cpp2
-rw-r--r--kdeprint/management/kmwsocketutil.cpp2
-rw-r--r--kdeprint/management/kxmlcommanddlg.cpp26
-rw-r--r--kdeprint/management/kxmlcommandselector.cpp6
-rw-r--r--kdeprint/management/networkscanner.cpp2
-rw-r--r--kdeprint/management/smbview.cpp4
19 files changed, 52 insertions, 52 deletions
diff --git a/kdeprint/management/cjanuswidget.cpp b/kdeprint/management/cjanuswidget.cpp
index 856ab8a62..4163a87fe 100644
--- a/kdeprint/management/cjanuswidget.cpp
+++ b/kdeprint/management/cjanuswidget.cpp
@@ -241,7 +241,7 @@ CJanusWidget::CPage* CJanusWidget::findPage(TQListBoxItem *i)
TQListBoxItem* CJanusWidget::findPrevItem(CPage *p)
{
- if (m_pages.tqfindRef(p) == -1)
+ if (m_pages.findRef(p) == -1)
m_pages.last();
else
m_pages.prev();
diff --git a/kdeprint/management/kmconfigfilter.cpp b/kdeprint/management/kmconfigfilter.cpp
index ab643c341..967a67908 100644
--- a/kdeprint/management/kmconfigfilter.cpp
+++ b/kdeprint/management/kmconfigfilter.cpp
@@ -97,7 +97,7 @@ void KMConfigFilter::loadConfig(KConfig *conf)
{
if (!it.current()->isSpecial() && !it.current()->isVirtual())
{
- KListBox *lb = (m_plist.tqfind(it.current()->printerName()) == m_plist.end() ? m_list1 : m_list2);
+ KListBox *lb = (m_plist.find(it.current()->printerName()) == m_plist.end() ? m_list1 : m_list2);
lb->insertItem(SmallIcon(it.current()->pixmap()), it.current()->printerName());
}
}
diff --git a/kdeprint/management/kmdbcreator.cpp b/kdeprint/management/kmdbcreator.cpp
index fb76b5baf..7bdefbe0e 100644
--- a/kdeprint/management/kmdbcreator.cpp
+++ b/kdeprint/management/kmdbcreator.cpp
@@ -133,7 +133,7 @@ void KMDBCreator::slotReceivedStdout(KProcess*, char *buf, int len)
// the toInt() will return 0. If that occurs for the first number,
// then the number of steps will be also 0.
bool ok;
- int p = str.tqfind('\n');
+ int p = str.find('\n');
int n = str.mid(0, p).toInt(&ok);
// process the number received
diff --git a/kdeprint/management/kmdriverdb.cpp b/kdeprint/management/kmdriverdb.cpp
index ec5f8c42b..973be686e 100644
--- a/kdeprint/management/kmdriverdb.cpp
+++ b/kdeprint/management/kmdriverdb.cpp
@@ -110,23 +110,23 @@ void KMDriverDB::slotDbCreated()
KMDBEntryList* KMDriverDB::findEntry(const TQString& manu, const TQString& model)
{
- TQDict<KMDBEntryList> *models = m_entries.tqfind(manu);
+ TQDict<KMDBEntryList> *models = m_entries.find(manu);
if (models)
- return models->tqfind(model);
+ return models->find(model);
return 0;
}
KMDBEntryList* KMDriverDB::findPnpEntry(const TQString& manu, const TQString& model)
{
- TQDict<KMDBEntryList> *models = m_pnpentries.tqfind(manu);
+ TQDict<KMDBEntryList> *models = m_pnpentries.find(manu);
if (models)
- return models->tqfind(model);
+ return models->find(model);
return 0;
}
TQDict<KMDBEntryList>* KMDriverDB::findModels(const TQString& manu)
{
- return m_entries.tqfind(manu);
+ return m_entries.find(manu);
}
void KMDriverDB::insertEntry(KMDBEntry *entry)
@@ -140,14 +140,14 @@ void KMDriverDB::insertEntry(KMDBEntry *entry)
}
// insert it in normal entries
- TQDict<KMDBEntryList> *models = m_entries.tqfind(entry->manufacturer);
+ TQDict<KMDBEntryList> *models = m_entries.find(entry->manufacturer);
if (!models)
{
models = new TQDict<KMDBEntryList>(17,false);
models->setAutoDelete(true);
m_entries.insert(entry->manufacturer,models);
}
- KMDBEntryList *list = models->tqfind(entry->model);
+ KMDBEntryList *list = models->find(entry->model);
if (!list)
{
list = new KMDBEntryList;
@@ -159,14 +159,14 @@ void KMDriverDB::insertEntry(KMDBEntry *entry)
if (!entry->pnpmanufacturer.isEmpty() && !entry->pnpmodel.isEmpty())
{
// insert it in PNP entries
- models = m_pnpentries.tqfind(entry->manufacturer);
+ models = m_pnpentries.find(entry->manufacturer);
if (!models)
{
models = new TQDict<KMDBEntryList>(17,false);
models->setAutoDelete(true);
m_pnpentries.insert(entry->manufacturer,models);
}
- list = models->tqfind(entry->model);
+ list = models->find(entry->model);
if (!list)
{
list = new KMDBEntryList;
@@ -209,7 +209,7 @@ void KMDriverDB::loadDbFile()
line = t.readLine().stripWhiteSpace();
if (line.isEmpty())
continue;
- int p = line.tqfind('=');
+ int p = line.find('=');
if (p == -1)
continue;
words.clear();
diff --git a/kdeprint/management/kmdriverdbwidget.cpp b/kdeprint/management/kmdriverdbwidget.cpp
index d67377485..e8a00c44d 100644
--- a/kdeprint/management/kmdriverdbwidget.cpp
+++ b/kdeprint/management/kmdriverdbwidget.cpp
@@ -95,17 +95,17 @@ KMDriverDbWidget::~KMDriverDbWidget()
void KMDriverDbWidget::setDriver(const TQString& manu, const TQString& model)
{
- TQListBoxItem *item = m_manu->tqfindItem(manu);
+ TQListBoxItem *item = m_manu->findItem(manu);
TQString model_(model);
if (item)
{
m_manu->setCurrentItem(item);
- item = m_model->tqfindItem(model_);
+ item = m_model->findItem(model_);
if (!item)
// try by stripping the manufacturer name from
// the beginning of the model string. This is
// often the case with PPD files
- item = m_model->tqfindItem(model_.replace(0,manu.length()+1,TQString::tqfromLatin1("")));
+ item = m_model->findItem(model_.replace(0,manu.length()+1,TQString::tqfromLatin1("")));
if (item)
m_model->setCurrentItem(item);
}
@@ -203,11 +203,11 @@ void KMDriverDbWidget::slotPostscriptToggled(bool on)
{
if (on)
{
- TQListBoxItem *item = m_manu->tqfindItem("GENERIC");
+ TQListBoxItem *item = m_manu->findItem("GENERIC");
if (item)
{
m_manu->setCurrentItem(item);
- item = m_model->tqfindItem( "POSTSCRIPT PRINTER" );
+ item = m_model->findItem( "POSTSCRIPT PRINTER" );
if ( item )
{
m_model->setCurrentItem( item );
diff --git a/kdeprint/management/kminstancepage.cpp b/kdeprint/management/kminstancepage.cpp
index 47bae6132..a2d024546 100644
--- a/kdeprint/management/kminstancepage.cpp
+++ b/kdeprint/management/kminstancepage.cpp
@@ -121,9 +121,9 @@ void KMInstancePage::setPrinter(KMPrinter *p)
//iif (!oldText.isEmpty())
//{
- TQListBoxItem *item = m_view->tqfindItem(oldText);
+ TQListBoxItem *item = m_view->findItem(oldText);
if (!item)
- item = m_view->tqfindItem(i18n("(Default)"));
+ item = m_view->findItem(i18n("(Default)"));
if (item)
m_view->setSelected(item,true);
//}
@@ -138,7 +138,7 @@ void KMInstancePage::slotNew()
i18n("(Default)"),&ok,this);
if (ok)
{
- if (name.tqfind(TQRegExp("[/\\s]")) != -1)
+ if (name.find(TQRegExp("[/\\s]")) != -1)
KMessageBox::error(this, i18n("Instance name must not contain any spaces or slashes."));
else
{
@@ -183,7 +183,7 @@ void KMInstancePage::slotCopy()
i18n("(Default)"),&ok,this);
if (ok)
{
- if (name.tqfind(TQRegExp("[/\\s]")) != -1)
+ if (name.find(TQRegExp("[/\\s]")) != -1)
KMessageBox::error(this, i18n("Instance name must not contain any spaces or slashes."));
else
{
diff --git a/kdeprint/management/kmjobviewer.cpp b/kdeprint/management/kmjobviewer.cpp
index ebdfacf81..508595998 100644
--- a/kdeprint/management/kmjobviewer.cpp
+++ b/kdeprint/management/kmjobviewer.cpp
@@ -586,7 +586,7 @@ void KMJobViewer::loadPluginActions()
KAction *act = actionCollection()->action("job_restart");
for (int i=0;i<act->containerCount();i++)
{
- if (menuBar()->tqfindItem(act->itemId(i), &menu))
+ if (menuBar()->findItem(act->itemId(i), &menu))
{
menuindex = mpopindex = menu->indexOf(act->itemId(i))+1;
break;
diff --git a/kdeprint/management/kmspecialprinterdlg.cpp b/kdeprint/management/kmspecialprinterdlg.cpp
index c444091e7..346e858f4 100644
--- a/kdeprint/management/kmspecialprinterdlg.cpp
+++ b/kdeprint/management/kmspecialprinterdlg.cpp
@@ -186,7 +186,7 @@ void KMSpecialPrinterDlg::setPrinter(KMPrinter *printer)
{
m_command->setCommand(printer->option("kde-special-command"));
m_usefile->setChecked(printer->option("kde-special-file") == "1");
- int index = m_mimelist.tqfindIndex(printer->option("kde-special-mimetype"));
+ int index = m_mimelist.findIndex(printer->option("kde-special-mimetype"));
m_mimetype->setCurrentItem(index == -1 ? 0 : index);
m_extension->setText(printer->option("kde-special-extension"));
m_name->setText(printer->name());
diff --git a/kdeprint/management/kmwbackend.cpp b/kdeprint/management/kmwbackend.cpp
index 0a2958737..d05564115 100644
--- a/kdeprint/management/kmwbackend.cpp
+++ b/kdeprint/management/kmwbackend.cpp
@@ -104,7 +104,7 @@ void KMWBackend::updatePrinter(KMPrinter *p)
TQString s = m_buttons->selected()->text();
s.replace(TQRegExp("&(?=\\w)"), TQString::tqfromLatin1(""));
p->setOption("kde-backend-description",s);
- setNextPage((m_map.tqcontains(ID) ? m_map[ID] : KMWizard::Error));
+ setNextPage((m_map.contains(ID) ? m_map[ID] : KMWizard::Error));
}
void KMWBackend::addBackend( int ID, bool on, int nextpage )
diff --git a/kdeprint/management/kmwclass.cpp b/kdeprint/management/kmwclass.cpp
index 77544b08f..2e27db0c9 100644
--- a/kdeprint/management/kmwclass.cpp
+++ b/kdeprint/management/kmwclass.cpp
@@ -94,7 +94,7 @@ void KMWClass::initPrinter(KMPrinter *p)
{
TQPtrListIterator<KMPrinter> it(*list);
for (;it.current();++it)
- if (it.current()->instanceName().isEmpty() && !it.current()->isClass(true) && !it.current()->isSpecial() && !members.tqcontains(it.current()->name()))
+ if (it.current()->instanceName().isEmpty() && !it.current()->isClass(true) && !it.current()->isSpecial() && !members.contains(it.current()->name()))
m_list1->insertItem(SmallIcon(it.current()->pixmap()), it.current()->name());
m_list1->sort();
}
diff --git a/kdeprint/management/kmwdriver.cpp b/kdeprint/management/kmwdriver.cpp
index 45ce3afe7..d0a38e17d 100644
--- a/kdeprint/management/kmwdriver.cpp
+++ b/kdeprint/management/kmwdriver.cpp
@@ -49,7 +49,7 @@ void KMWDriver::initPrinter(KMPrinter *p)
{
// use auto-detection info instead: split the string
// into make/model pair at the first space character
- int p = autoDetect.tqfind( ' ' );
+ int p = autoDetect.find( ' ' );
if ( p != -1 )
{
TQString manu = autoDetect.left( p ), model = autoDetect.mid( p+1 );
diff --git a/kdeprint/management/kmwizard.cpp b/kdeprint/management/kmwizard.cpp
index 2a3fca450..fead7c4e3 100644
--- a/kdeprint/management/kmwizard.cpp
+++ b/kdeprint/management/kmwizard.cpp
@@ -178,14 +178,14 @@ void KMWizard::configure(int start, int end, bool inclusive)
void KMWizard::setNextPage(int page, int next)
{
- KMWizardPage *p = m_pagepool.tqfind(page);
+ KMWizardPage *p = m_pagepool.find(page);
if (p)
p->setNextPage(next);
}
void KMWizard::setCurrentPage(int ID, bool back)
{
- KMWizardPage *page = m_pagepool.tqfind(ID);
+ KMWizardPage *page = m_pagepool.find(ID);
if (!page)
{
KMessageBox::error(this,i18n("Unable to find the requested page."),i18n("Add Printer Wizard"));
diff --git a/kdeprint/management/kmwlocal.cpp b/kdeprint/management/kmwlocal.cpp
index af283af7d..c581bdf3c 100644
--- a/kdeprint/management/kmwlocal.cpp
+++ b/kdeprint/management/kmwlocal.cpp
@@ -78,7 +78,7 @@ bool KMWLocal::isValid(TQString& msg)
msg = i18n("The URI is empty","Empty URI.");
return false;
}
- else if (m_uris.tqfindIndex(m_localuri->text()) == -1)
+ else if (m_uris.findIndex(m_localuri->text()) == -1)
{
if (KMessageBox::warningContinueCancel(this, i18n("The local URI doesn't correspond to a detected port. Continue?")) == KMessageBox::Cancel)
{
@@ -173,7 +173,7 @@ void KMWLocal::initialize()
++it;
TQString uri = *it;
- int p = uri.tqfind( ':' );
+ int p = uri.find( ':' );
TQString desc = *(++it), prot = ( p != -1 ? uri.left( p ) : TQString::null );
TQString printer = *(++it);
int index(-1);
diff --git a/kdeprint/management/kmwname.cpp b/kdeprint/management/kmwname.cpp
index 43f6f3fad..d46b104a7 100644
--- a/kdeprint/management/kmwname.cpp
+++ b/kdeprint/management/kmwname.cpp
@@ -48,7 +48,7 @@ bool KMWName::isValid(TQString& msg)
msg = i18n("You must supply at least a name.");
return false;
}
- else if (text(0).tqfind(TQRegExp("\\s")) != -1)
+ else if (text(0).find(TQRegExp("\\s")) != -1)
{
QString conv = text(0);
conv.replace(TQRegExp("\\s"), "");
diff --git a/kdeprint/management/kmwsocketutil.cpp b/kdeprint/management/kmwsocketutil.cpp
index 31dad2249..a8a89e3ad 100644
--- a/kdeprint/management/kmwsocketutil.cpp
+++ b/kdeprint/management/kmwsocketutil.cpp
@@ -209,7 +209,7 @@ TQString localRootIP()
if (infos.count() > 0)
{
TQString IPstr = infos.first()->address()->nodeName();
- int p = IPstr.tqfindRev('.');
+ int p = IPstr.findRev('.');
IPstr.truncate(p);
return IPstr;
}
diff --git a/kdeprint/management/kxmlcommanddlg.cpp b/kdeprint/management/kxmlcommanddlg.cpp
index 9d6688001..474f9b61b 100644
--- a/kdeprint/management/kxmlcommanddlg.cpp
+++ b/kdeprint/management/kxmlcommanddlg.cpp
@@ -52,7 +52,7 @@
TQString generateId(const TQMap<TQString, DrBase*>& map)
{
int index(-1);
- while (map.tqcontains(TQString::tqfromLatin1("item%1").arg(++index))) ;
+ while (map.contains(TQString::tqfromLatin1("item%1").arg(++index))) ;
return TQString::tqfromLatin1("item%1").arg(index);
}
@@ -454,7 +454,7 @@ void KXmlCommandAdvancedDlg::viewItem(TQListViewItem *item)
m_name->setText(item->text(1));
m_desc->setText(item->text(0));
- DrBase *opt = (m_opts.tqcontains(item->text(1)) ? m_opts[item->text(1)] : 0);
+ DrBase *opt = (m_opts.contains(item->text(1)) ? m_opts[item->text(1)] : 0);
if (opt)
{
bool isgroup = (opt->type() < DrBase::String);
@@ -498,8 +498,8 @@ void KXmlCommandAdvancedDlg::viewItem(TQListViewItem *item)
m_addopt->setEnabled(isgroup);
TQListViewItem *prevItem = findPrev(item), *nextItem = findNext(item);
- DrBase *prevOpt = (prevItem && m_opts.tqcontains(prevItem->text(1)) ? m_opts[prevItem->text(1)] : 0);
- DrBase *nextOpt = (nextItem && m_opts.tqcontains(nextItem->text(1)) ? m_opts[nextItem->text(1)] : 0);
+ DrBase *prevOpt = (prevItem && m_opts.contains(prevItem->text(1)) ? m_opts[prevItem->text(1)] : 0);
+ DrBase *nextOpt = (nextItem && m_opts.contains(nextItem->text(1)) ? m_opts[nextItem->text(1)] : 0);
m_up->setEnabled(prevOpt && !(prevOpt->type() < DrBase::String && opt->type() >= DrBase::String));
m_down->setEnabled(nextOpt && !(isgroup && nextOpt->type() >= DrBase::String));
@@ -571,7 +571,7 @@ void KXmlCommandAdvancedDlg::slotApplyChanges()
m_apply->setEnabled(false);
- DrBase *opt = (m_opts.tqcontains(item->text(1)) ? m_opts[item->text(1)] : 0);
+ DrBase *opt = (m_opts.contains(item->text(1)) ? m_opts[item->text(1)] : 0);
m_opts.remove(item->text(1));
delete opt;
@@ -735,9 +735,9 @@ void KXmlCommandAdvancedDlg::slotMoveDown()
void KXmlCommandAdvancedDlg::slotCommandChanged(const TQString& cmd)
{
- m_inputfile->parentWidget()->setEnabled(cmd.tqfind("%filterinput") != -1);
- m_outputfile->parentWidget()->setEnabled(cmd.tqfind("%filteroutput") != -1);
- m_view->setEnabled(cmd.tqfind("%filterargs") != -1);
+ m_inputfile->parentWidget()->setEnabled(cmd.find("%filterinput") != -1);
+ m_outputfile->parentWidget()->setEnabled(cmd.find("%filteroutput") != -1);
+ m_view->setEnabled(cmd.find("%filterargs") != -1);
m_name->parentWidget()->setEnabled(m_view->isEnabled());
slotSelectionChanged((m_view->isEnabled() ? m_view->currentItem() : 0));
m_view->setOpen(m_view->firstChild(), m_view->isEnabled());
@@ -751,7 +751,7 @@ void KXmlCommandAdvancedDlg::slotValueSelected(TQListViewItem *item)
void KXmlCommandAdvancedDlg::slotOptionRenamed(TQListViewItem *item, int)
{
- if (item && m_opts.tqcontains(item->text(1)))
+ if (item && m_opts.contains(item->text(1)))
{
DrBase *opt = m_opts[item->text(1)];
opt->set("text", item->text(0));
@@ -767,7 +767,7 @@ void KXmlCommandAdvancedDlg::recreateGroup(TQListViewItem *item, DrGroup *grp)
TQListViewItem *child = item->firstChild();
while (child)
{
- DrBase *opt = (m_opts.tqcontains(child->text(1)) ? m_opts[child->text(1)] : 0);
+ DrBase *opt = (m_opts.contains(child->text(1)) ? m_opts[child->text(1)] : 0);
if (opt)
{
if (opt->type() == DrBase::Group)
@@ -807,7 +807,7 @@ bool KXmlCommandAdvancedDlg::editCommand(KXmlCommand *xmlcmd, TQWidget *parent)
xmlcmd->setComment( xmldlg->m_comment->text().replace( TQRegExp( "\n" ), " " ) );
// need to recreate the driver tree structure
- DrMain *driver = (xmldlg->m_opts.tqcontains("__root__") ? static_cast<DrMain*>(xmldlg->m_opts["__root__"]) : 0);
+ DrMain *driver = (xmldlg->m_opts.contains("__root__") ? static_cast<DrMain*>(xmldlg->m_opts["__root__"]) : 0);
if (!driver && xmldlg->m_opts.count() > 0)
{
kdDebug() << "KXmlCommandAdvancedDlg: driver structure not found, creating one" << endl;
@@ -951,7 +951,7 @@ void KXmlCommandDlg::setCommand(KXmlCommand *xmlCmd)
item->setRenameEnabled(0, true);
}
- int index = m_mimelist.tqfindIndex(xmlCmd->mimeType());
+ int index = m_mimelist.findIndex(xmlCmd->mimeType());
if (index != -1)
m_mimetype->setCurrentItem(index);
else
@@ -964,7 +964,7 @@ void KXmlCommandDlg::setCommand(KXmlCommand *xmlCmd)
for (TQStringList::ConstIterator it=list.begin(); it!=list.end(); ++it)
{
m_selectedmime->insertItem(*it);
- delete m_availablemime->tqfindItem(*it, TQt::ExactMatch);
+ delete m_availablemime->findItem(*it, TQt::ExactMatch);
}
}
diff --git a/kdeprint/management/kxmlcommandselector.cpp b/kdeprint/management/kxmlcommandselector.cpp
index 8162c7b6c..f46222fba 100644
--- a/kdeprint/management/kxmlcommandselector.cpp
+++ b/kdeprint/management/kxmlcommandselector.cpp
@@ -137,7 +137,7 @@ void KXmlCommandSelector::loadCommands()
}
m_cmd->insertStringList(desclist);
- int index = m_cmdlist.tqfindIndex(thisCmd);
+ int index = m_cmdlist.findIndex(thisCmd);
if (index != -1)
m_cmd->setCurrentItem(index);
if (m_cmd->currentItem() != -1 && m_cmd->isEnabled())
@@ -156,7 +156,7 @@ TQString KXmlCommandSelector::command() const
void KXmlCommandSelector::setCommand(const TQString& cmd)
{
- int index = m_cmdlist.tqfindIndex(cmd);
+ int index = m_cmdlist.findIndex(cmd);
if (m_usefilter)
m_usefilter->setChecked(index != -1);
@@ -176,7 +176,7 @@ void KXmlCommandSelector::slotAddCommand()
{
bool added(true);
- if (m_cmdlist.tqfindIndex(cmdId) != -1)
+ if (m_cmdlist.findIndex(cmdId) != -1)
{
if (KMessageBox::warningContinueCancel(
this,
diff --git a/kdeprint/management/networkscanner.cpp b/kdeprint/management/networkscanner.cpp
index ab025748b..73466cdbb 100644
--- a/kdeprint/management/networkscanner.cpp
+++ b/kdeprint/management/networkscanner.cpp
@@ -80,7 +80,7 @@ TQString NetworkScanner::NetworkScannerPrivate::localPrefix()
if (infos.count() > 0)
{
TQString IPstr = infos.first()->address()->nodeName();
- int p = IPstr.tqfindRev('.');
+ int p = IPstr.findRev('.');
IPstr.truncate(p);
return IPstr;
}
diff --git a/kdeprint/management/smbview.cpp b/kdeprint/management/smbview.cpp
index bbe2a07f9..f13670591 100644
--- a/kdeprint/management/smbview.cpp
+++ b/kdeprint/management/smbview.cpp
@@ -140,7 +140,7 @@ void SmbView::init()
while (!smb_stream.atEnd ())
{
TQString smb_line = smb_stream.readLine ();
- if (smb_line.tqcontains (wins_keyword, FALSE) > 0)
+ if (smb_line.contains (wins_keyword, FALSE) > 0)
{
TQString key = smb_line.section ('=', 0, 0);
key = key.stripWhiteSpace();
@@ -216,7 +216,7 @@ void SmbView::processGroups()
clear();
for (TQStringList::ConstIterator it=grps.begin(); it!=grps.end(); ++it)
{
- int p = (*it).tqfind("<1d>");
+ int p = (*it).find("<1d>");
if (p == -1)
continue;
TQListViewItem *item = new TQListViewItem(this,(*it).left(p).stripWhiteSpace());