From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001
From: tpearson
Date: Fri, 7 Jan 2011 03:45:53 +0000
Subject: Revert automated changes Sorry guys, they are just not ready for
prime time Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
kdeprint/management/cjanuswidget.cpp | 20 ++++-----
kdeprint/management/cjanuswidget.h | 6 +--
kdeprint/management/kiconselectaction.cpp | 2 +-
kdeprint/management/kmconfigcommand.cpp | 2 +-
kdeprint/management/kmconfigfilter.cpp | 4 +-
kdeprint/management/kmconfigfonts.cpp | 4 +-
kdeprint/management/kmconfiggeneral.cpp | 18 ++++----
kdeprint/management/kmconfigjobs.cpp | 2 +-
kdeprint/management/kmconfigpreview.cpp | 6 +--
kdeprint/management/kmdbcreator.cpp | 4 +-
kdeprint/management/kmdbcreator.h | 2 +-
kdeprint/management/kmdriverdb.cpp | 28 ++++++------
kdeprint/management/kmdriverdb.h | 6 +--
kdeprint/management/kmdriverdbwidget.cpp | 16 +++----
kdeprint/management/kmiconview.cpp | 8 ++--
kdeprint/management/kmiconview.h | 2 +-
kdeprint/management/kminfopage.cpp | 22 +++++-----
kdeprint/management/kminstancepage.cpp | 14 +++---
kdeprint/management/kmjobviewer.cpp | 14 +++---
kdeprint/management/kmjobviewer.h | 2 +-
kdeprint/management/kmlistview.cpp | 10 ++---
kdeprint/management/kmlistview.h | 4 +-
kdeprint/management/kmmainview.cpp | 68 ++++++++++++++---------------
kdeprint/management/kmmainview.h | 2 +-
kdeprint/management/kmprinterview.cpp | 6 +--
kdeprint/management/kmprinterview.h | 2 +-
kdeprint/management/kmpropbackend.cpp | 2 +-
kdeprint/management/kmpropcontainer.cpp | 2 +-
kdeprint/management/kmpropdriver.cpp | 2 +-
kdeprint/management/kmpropgeneral.cpp | 2 +-
kdeprint/management/kmpropmembers.cpp | 2 +-
kdeprint/management/kmspecialprinterdlg.cpp | 8 ++--
kdeprint/management/kmwbackend.cpp | 16 +++----
kdeprint/management/kmwbackend.h | 2 +-
kdeprint/management/kmwclass.cpp | 4 +-
kdeprint/management/kmwdriver.cpp | 4 +-
kdeprint/management/kmwend.cpp | 14 +++---
kdeprint/management/kmwfile.cpp | 2 +-
kdeprint/management/kmwizard.cpp | 8 ++--
kdeprint/management/kmwlocal.cpp | 4 +-
kdeprint/management/kmwlpd.cpp | 6 +--
kdeprint/management/kmwname.cpp | 4 +-
kdeprint/management/kmwpassword.cpp | 8 ++--
kdeprint/management/kmwsocket.cpp | 4 +-
kdeprint/management/kmwsocketutil.cpp | 22 +++++-----
kdeprint/management/kmwsocketutil.h | 2 +-
kdeprint/management/kxmlcommanddlg.cpp | 60 ++++++++++++-------------
kdeprint/management/kxmlcommandselector.cpp | 8 ++--
kdeprint/management/networkscanner.cpp | 26 +++++------
kdeprint/management/networkscanner.h | 2 +-
kdeprint/management/sidepixmap.cpp | 4 +-
kdeprint/management/sidepixmap.h | 2 +-
kdeprint/management/smbview.cpp | 4 +-
53 files changed, 249 insertions(+), 249 deletions(-)
(limited to 'kdeprint/management')
diff --git a/kdeprint/management/cjanuswidget.cpp b/kdeprint/management/cjanuswidget.cpp
index 1cb6693e8..7bad07264 100644
--- a/kdeprint/management/cjanuswidget.cpp
+++ b/kdeprint/management/cjanuswidget.cpp
@@ -118,7 +118,7 @@ void CJanusWidget::CListBox::computeWidth()
item = item->next();
}
if (verticalScrollBar()->isVisible())
- w += verticalScrollBar()->tqsizeHint().width();
+ w += verticalScrollBar()->sizeHint().width();
w += (frameWidth()*2);
setFixedWidth(w);
}
@@ -169,7 +169,7 @@ void CJanusWidget::addPage(TQWidget *w, const TQString& text, const TQString& he
page->m_text = text;
page->m_header = header;
page->m_pixmap = pix;
- page->m_item = new CListBoxItem(m_iconlist,tqfindPrevItem(page),pix,text);
+ page->m_item = new CListBoxItem(m_iconlist,findPrevItem(page),pix,text);
m_iconlist->computeWidth();
m_stack->addWidget(w,m_pages.count());
@@ -179,10 +179,10 @@ void CJanusWidget::addPage(TQWidget *w, const TQString& text, const TQString& he
void CJanusWidget::enablePage(TQWidget *w)
{
- CPage *page = tqfindPage(w);
+ CPage *page = findPage(w);
if (page && !page->m_item)
{
- page->m_item = new CListBoxItem(m_iconlist,tqfindPrevItem(page),page->m_pixmap,page->m_text);
+ page->m_item = new CListBoxItem(m_iconlist,findPrevItem(page),page->m_pixmap,page->m_text);
m_iconlist->computeWidth();
if (m_iconlist->count() == 1)
m_iconlist->setSelected(page->m_item,true);
@@ -191,7 +191,7 @@ void CJanusWidget::enablePage(TQWidget *w)
void CJanusWidget::disablePage(TQWidget *w)
{
- CPage *page = tqfindPage(w);
+ CPage *page = findPage(w);
if (page && page->m_item)
{
bool needReselect(m_iconlist->isSelected(page->m_item));
@@ -208,7 +208,7 @@ void CJanusWidget::disablePage(TQWidget *w)
void CJanusWidget::slotSelected(TQListBoxItem *item)
{
- CPage *page = tqfindPage(item);
+ CPage *page = findPage(item);
if (page)
{
m_stack->raiseWidget(page->m_widget);
@@ -221,7 +221,7 @@ void CJanusWidget::slotSelected(TQListBoxItem *item)
}
}
-CJanusWidget::CPage* CJanusWidget::tqfindPage(TQWidget *w)
+CJanusWidget::CPage* CJanusWidget::findPage(TQWidget *w)
{
TQPtrListIterator it(m_pages);
for (;it.current();++it)
@@ -230,7 +230,7 @@ CJanusWidget::CPage* CJanusWidget::tqfindPage(TQWidget *w)
return 0;
}
-CJanusWidget::CPage* CJanusWidget::tqfindPage(TQListBoxItem *i)
+CJanusWidget::CPage* CJanusWidget::findPage(TQListBoxItem *i)
{
TQPtrListIterator it(m_pages);
for (;it.current();++it)
@@ -239,9 +239,9 @@ CJanusWidget::CPage* CJanusWidget::tqfindPage(TQListBoxItem *i)
return 0;
}
-TQListBoxItem* CJanusWidget::tqfindPrevItem(CPage *p)
+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/cjanuswidget.h b/kdeprint/management/cjanuswidget.h
index 5ed401e49..2b06aed21 100644
--- a/kdeprint/management/cjanuswidget.h
+++ b/kdeprint/management/cjanuswidget.h
@@ -49,9 +49,9 @@ public:
class CListBoxItem;
private:
- CPage* tqfindPage(TQWidget *w);
- CPage* tqfindPage(TQListBoxItem *i);
- TQListBoxItem* tqfindPrevItem(CPage*);
+ CPage* findPage(TQWidget *w);
+ CPage* findPage(TQListBoxItem *i);
+ TQListBoxItem* findPrevItem(CPage*);
private:
TQPtrList m_pages;
diff --git a/kdeprint/management/kiconselectaction.cpp b/kdeprint/management/kiconselectaction.cpp
index 538d6660b..d2c4c873f 100644
--- a/kdeprint/management/kiconselectaction.cpp
+++ b/kdeprint/management/kiconselectaction.cpp
@@ -85,7 +85,7 @@ int KIconSelectAction::plug(TQWidget* widget, int index)
{
KToolBar* bar = static_cast(widget);
int id = KAction::getToolButtonID();
- // To have a correct tqlayout in the toolbar, a non
+ // To have a correct layout in the toolbar, a non
// empty icon has to be used. Use "unknown" by default.
QString iconName = (currentItem() != -1 ? d->m_iconlst[currentItem()] : "unknown");
diff --git a/kdeprint/management/kmconfigcommand.cpp b/kdeprint/management/kmconfigcommand.cpp
index 5a1d1b54b..21a1a330b 100644
--- a/kdeprint/management/kmconfigcommand.cpp
+++ b/kdeprint/management/kmconfigcommand.cpp
@@ -47,7 +47,7 @@ KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name)
QVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
l0->addWidget(gb);
l0->addStretch(1);
- QVBoxLayout *l2 = new TQVBoxLayout(gb->tqlayout(), KDialog::spacingHint());
+ QVBoxLayout *l2 = new TQVBoxLayout(gb->layout(), KDialog::spacingHint());
l2->addWidget(lab);
l2->addWidget(sel);
}
diff --git a/kdeprint/management/kmconfigfilter.cpp b/kdeprint/management/kmconfigfilter.cpp
index bfcf2bf81..10dff4749 100644
--- a/kdeprint/management/kmconfigfilter.cpp
+++ b/kdeprint/management/kmconfigfilter.cpp
@@ -63,7 +63,7 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name)
QVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
l0->addWidget(box, 1);
- QVBoxLayout *l1 = new TQVBoxLayout(box->tqlayout(), KDialog::spacingHint());
+ QVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint());
l1->addWidget(lab);
QGridLayout *l2 = new TQGridLayout(0, 4, 3, 0, KDialog::spacingHint());
l1->addLayout(l2);
@@ -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/kmconfigfonts.cpp b/kdeprint/management/kmconfigfonts.cpp
index 16006b2bb..e59f75728 100644
--- a/kdeprint/management/kmconfigfonts.cpp
+++ b/kdeprint/management/kmconfigfonts.cpp
@@ -61,9 +61,9 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name)
QLabel *lab0 = new TQLabel(i18n("Additional director&y:"), box2);
lab0->setBuddy(m_addpath);
- QVBoxLayout *l0 = new TQVBoxLayout(box->tqlayout(), KDialog::spacingHint());
+ QVBoxLayout *l0 = new TQVBoxLayout(box->layout(), KDialog::spacingHint());
l0->addWidget(m_embedfonts);
- QVBoxLayout *l1 = new TQVBoxLayout(box2->tqlayout(), KDialog::spacingHint());
+ QVBoxLayout *l1 = new TQVBoxLayout(box2->layout(), KDialog::spacingHint());
l1->addWidget(m_fontpath);
QHBoxLayout *l2 = new TQHBoxLayout(0, 0, KDialog::spacingHint());
l1->addLayout(l2);
diff --git a/kdeprint/management/kmconfiggeneral.cpp b/kdeprint/management/kmconfiggeneral.cpp
index d6f35b071..c729c6516 100644
--- a/kdeprint/management/kmconfiggeneral.cpp
+++ b/kdeprint/management/kmconfiggeneral.cpp
@@ -57,7 +57,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
QGroupBox *m_testpagebox = new TQGroupBox(0, Qt::Vertical, i18n("Test Page"), this);
m_defaulttestpage = new TQCheckBox(i18n("&Specify personal test page"), m_testpagebox, "TestPageCheck");
m_testpage = new KURLRequester(m_testpagebox,"TestPage");
- m_preview = new KPushButton(KGuiItem(i18n("Preview..."), "filetqfind"), m_testpagebox);
+ m_preview = new KPushButton(KGuiItem(i18n("Preview..."), "filefind"), m_testpagebox);
connect(m_defaulttestpage,TQT_SIGNAL(toggled(bool)),m_testpage,TQT_SLOT(setEnabled(bool)));
connect(m_defaulttestpage,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(setEnabledPreviewButton(bool)));
connect(m_preview,TQT_SIGNAL(clicked()),TQT_SLOT(slotTestPagePreview()));
@@ -70,16 +70,16 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
m_statusmsg = new TQCheckBox(i18n("Sho&w printing status message box"), m_statusbox);
m_uselast = new TQCheckBox(i18n("De&faults to the last printer used in the application"), m_statusbox);
- //tqlayout
+ //layout
QVBoxLayout *lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
lay0->addWidget(m_timerbox);
lay0->addWidget(m_testpagebox);
lay0->addWidget(m_statusbox);
lay0->addStretch(1);
- QVBoxLayout *lay1 = new TQVBoxLayout(m_timerbox->tqlayout(),
+ QVBoxLayout *lay1 = new TQVBoxLayout(m_timerbox->layout(),
KDialog::spacingHint());
lay1->addWidget(m_timer);
- QVBoxLayout *lay2 = new TQVBoxLayout(m_testpagebox->tqlayout(),
+ QVBoxLayout *lay2 = new TQVBoxLayout(m_testpagebox->layout(),
KDialog::spacingHint());
QHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 0);
lay2->addWidget(m_defaulttestpage);
@@ -87,7 +87,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
lay2->addLayout(lay3);
lay3->addStretch(1);
lay3->addWidget(m_preview);
- QVBoxLayout *lay4 = new TQVBoxLayout(m_statusbox->tqlayout(),
+ QVBoxLayout *lay4 = new TQVBoxLayout(m_statusbox->layout(),
KDialog::spacingHint());
lay4->addWidget(m_statusmsg);
lay4->addWidget(m_uselast);
@@ -114,7 +114,7 @@ void KMConfigGeneral::loadConfig(KConfig *conf)
m_defaulttestpage->setChecked(true);
m_testpage->setURL(tpage);
}
- m_statusmsg->setChecked(conf->readBoolEntry("ShowtqStatusMsg", true));
+ m_statusmsg->setChecked(conf->readBoolEntry("ShowStatusMsg", true));
m_uselast->setChecked(conf->readBoolEntry("UseLast", true));
}
@@ -123,10 +123,10 @@ void KMConfigGeneral::saveConfig(KConfig *conf)
conf->setGroup("General");
conf->writeEntry("TimerDelay",m_timer->value());
conf->writePathEntry("TestPage",(m_defaulttestpage->isChecked() ? m_testpage->url() : TQString::null));
- if (m_defaulttestpage->isChecked() && KMimeMagic::self()->tqfindFileType(m_testpage->url())->mimeType() != "application/postscript")
+ if (m_defaulttestpage->isChecked() && KMimeMagic::self()->findFileType(m_testpage->url())->mimeType() != "application/postscript")
KMessageBox::sorry(this, i18n("The selected test page is not a PostScript file. You may not "
"be able to test your printer anymore."));
- conf->writeEntry("ShowtqStatusMsg", m_statusmsg->isChecked());
+ conf->writeEntry("ShowStatusMsg", m_statusmsg->isChecked());
conf->writeEntry("UseLast", m_uselast->isChecked());
}
@@ -136,7 +136,7 @@ void KMConfigGeneral::slotTestPagePreview()
if (tpage.isEmpty())
KMessageBox::error(this, i18n("Empty file name."));
else
- KRun::runURL(KURL( tpage ), KMimeMagic::self()->tqfindFileType(tpage)->mimeType());
+ KRun::runURL(KURL( tpage ), KMimeMagic::self()->findFileType(tpage)->mimeType());
}
#include "kmconfiggeneral.moc"
diff --git a/kdeprint/management/kmconfigjobs.cpp b/kdeprint/management/kmconfigjobs.cpp
index b28cf46da..1aaf0ec26 100644
--- a/kdeprint/management/kmconfigjobs.cpp
+++ b/kdeprint/management/kmconfigjobs.cpp
@@ -44,7 +44,7 @@ KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name)
QVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
l0->addWidget(box, 0);
l0->addStretch(1);
- QVBoxLayout *l1 = new TQVBoxLayout(box->tqlayout(), KDialog::spacingHint());
+ QVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint());
l1->addWidget(m_limit);
}
diff --git a/kdeprint/management/kmconfigpreview.cpp b/kdeprint/management/kmconfigpreview.cpp
index a84df457a..1bd9f46e5 100644
--- a/kdeprint/management/kmconfigpreview.cpp
+++ b/kdeprint/management/kmconfigpreview.cpp
@@ -34,7 +34,7 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name)
{
setPageName(i18n("Preview"));
setPageHeader(i18n("Preview Settings"));
- setPagePixmap("filetqfind");
+ setPagePixmap("filefind");
TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Preview Program"), this);
@@ -43,14 +43,14 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name)
QLabel *lab = new TQLabel(box);
lab->setText(i18n("You can use an external preview program (PS viewer) instead of the "
"KDE built-in preview system. Note that if the KDE default PS viewer "
- "(KGhostView) cannot be found, KDE tries automatically to tqfind another "
+ "(KGhostView) cannot be found, KDE tries automatically to find another "
"external PostScript viewer"));
lab->setTextFormat(Qt::RichText);
QVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
l0->addWidget(box);
l0->addStretch(1);
- QVBoxLayout *l1 = new TQVBoxLayout(box->tqlayout(), KDialog::spacingHint());
+ QVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint());
l1->addWidget(lab);
l1->addWidget(m_useext);
l1->addWidget(m_program);
diff --git a/kdeprint/management/kmdbcreator.cpp b/kdeprint/management/kmdbcreator.cpp
index cce83605d..3b271ff00 100644
--- a/kdeprint/management/kmdbcreator.cpp
+++ b/kdeprint/management/kmdbcreator.cpp
@@ -109,7 +109,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena
{
if (!m_dlg)
{
- m_dlg = new TQProgressDialog(parent->tqtopLevelWidget(),"progress-dialog",true);
+ m_dlg = new TQProgressDialog(parent->topLevelWidget(),"progress-dialog",true);
m_dlg->setLabelText(i18n("Please wait while KDE rebuilds a driver database."));
m_dlg->setCaption(i18n("Driver Database"));
connect(m_dlg,TQT_SIGNAL(canceled()),TQT_SLOT(slotCancelled()));
@@ -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/kmdbcreator.h b/kdeprint/management/kmdbcreator.h
index d4281a51d..82fa5469e 100644
--- a/kdeprint/management/kmdbcreator.h
+++ b/kdeprint/management/kmdbcreator.h
@@ -28,7 +28,7 @@
class TQWidget;
class TQProgressDialog;
-class KMDBCreator : public TQObject
+class KMDBCreator : public QObject
{
Q_OBJECT
public:
diff --git a/kdeprint/management/kmdriverdb.cpp b/kdeprint/management/kmdriverdb.cpp
index adb7fb807..6e275a6d4 100644
--- a/kdeprint/management/kmdriverdb.cpp
+++ b/kdeprint/management/kmdriverdb.cpp
@@ -60,7 +60,7 @@ KMDriverDB::~KMDriverDB()
TQString KMDriverDB::dbFile()
{
// this calls insure missing directories creation
- QString filename = locateLocal("data",TQString::tqfromLatin1("kdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem()));
+ QString filename = locateLocal("data",TQString::fromLatin1("kdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem()));
return filename;
}
@@ -110,23 +110,23 @@ void KMDriverDB::slotDbCreated()
KMDBEntryList* KMDriverDB::findEntry(const TQString& manu, const TQString& model)
{
- TQDict *models = m_entries.tqfind(manu);
+ TQDict *models = m_entries.find(manu);
if (models)
- return models->tqfind(model);
+ return models->find(model);
return 0;
}
-KMDBEntryList* KMDriverDB::tqfindPnpEntry(const TQString& manu, const TQString& model)
+KMDBEntryList* KMDriverDB::findPnpEntry(const TQString& manu, const TQString& model)
{
- TQDict *models = m_pnpentries.tqfind(manu);
+ TQDict *models = m_pnpentries.find(manu);
if (models)
- return models->tqfind(model);
+ return models->find(model);
return 0;
}
-TQDict* KMDriverDB::tqfindModels(const TQString& manu)
+TQDict* 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 *models = m_entries.tqfind(entry->manufacturer);
+ TQDict *models = m_entries.find(entry->manufacturer);
if (!models)
{
models = new TQDict(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(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();
@@ -235,7 +235,7 @@ void KMDriverDB::loadDbFile()
else if (words[0] == "RECOMMANDED" && entry && words[1].lower() == "yes")
entry->recommended = true;
else if (words[0] == "DRIVERCOMMENT" && entry)
- entry->drivercomment = (""+words[1].tqreplace("<", "<").tqreplace(">", ">")+"");
+ entry->drivercomment = (""+words[1].replace("<", "<").replace(">", ">")+"");
}
if (entry)
insertEntry(entry);
diff --git a/kdeprint/management/kmdriverdb.h b/kdeprint/management/kmdriverdb.h
index e18ce971e..1ffecdc0a 100644
--- a/kdeprint/management/kmdriverdb.h
+++ b/kdeprint/management/kmdriverdb.h
@@ -29,7 +29,7 @@
class KMDBCreator;
-class KMDriverDB : public TQObject
+class KMDriverDB : public QObject
{
Q_OBJECT
public:
@@ -40,8 +40,8 @@ public:
void init(TQWidget *parent = 0);
KMDBEntryList* findEntry(const TQString& manu, const TQString& model);
- KMDBEntryList* tqfindPnpEntry(const TQString& manu, const TQString& model);
- TQDict* tqfindModels(const TQString& manu);
+ KMDBEntryList* findPnpEntry(const TQString& manu, const TQString& model);
+ TQDict* findModels(const TQString& manu);
const TQDict< TQDict >& manufacturers() const { return m_entries; }
protected:
diff --git a/kdeprint/management/kmdriverdbwidget.cpp b/kdeprint/management/kmdriverdbwidget.cpp
index 45b305087..fdd3d263c 100644
--- a/kdeprint/management/kmdriverdbwidget.cpp
+++ b/kdeprint/management/kmdriverdbwidget.cpp
@@ -58,7 +58,7 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name)
l1->setBuddy(m_manu);
l2->setBuddy(m_model);
- // build tqlayout
+ // build layout
QVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10);
QGridLayout *sub1_ = new TQGridLayout(0, 2, 3, 0, 0);
QHBoxLayout *sub2_ = new TQHBoxLayout(0, 0, 10);
@@ -95,17 +95,17 @@ KMDriverDbWidget::~KMDriverDbWidget()
void KMDriverDbWidget::setDriver(const TQString& manu, const TQString& model)
{
- QListBoxItem *item = m_manu->tqfindItem(manu);
+ QListBoxItem *item = m_manu->findItem(manu);
QString 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_.tqreplace(0,manu.length()+1,TQString::tqfromLatin1("")));
+ item = m_model->findItem(model_.replace(0,manu.length()+1,TQString::fromLatin1("")));
if (item)
m_model->setCurrentItem(item);
}
@@ -186,7 +186,7 @@ void KMDriverDbWidget::slotError(const TQString& msg)
void KMDriverDbWidget::slotManufacturerSelected(const TQString& name)
{
m_model->clear();
- TQDict *models = KMDriverDB::self()->tqfindModels(name);
+ TQDict *models = KMDriverDB::self()->findModels(name);
if (models)
{
QStrIList ilist(true);
@@ -203,18 +203,18 @@ void KMDriverDbWidget::slotPostscriptToggled(bool on)
{
if (on)
{
- QListBoxItem *item = m_manu->tqfindItem("GENERIC");
+ QListBoxItem *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 );
return;
}
}
- KMessageBox::error(this,i18n("Unable to tqfind the PostScript driver."));
+ KMessageBox::error(this,i18n("Unable to find the PostScript driver."));
m_postscript->setChecked(false);
}
}
diff --git a/kdeprint/management/kmiconview.cpp b/kdeprint/management/kmiconview.cpp
index 8fbe0ecea..5d16e34d0 100644
--- a/kdeprint/management/kmiconview.cpp
+++ b/kdeprint/management/kmiconview.cpp
@@ -99,7 +99,7 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode)
setText(TQString::null);
setText(p->name());
}
- setKey(TQString::tqfromLatin1("%1_%2").arg((p->isSpecial() ? "special" : (p->isClass(false) ? "class" : "printer"))).arg(p->name()));
+ setKey(TQString::fromLatin1("%1_%2").arg((p->isSpecial() ? "special" : (p->isClass(false) ? "class" : "printer"))).arg(p->name()));
m_isclass = p->isClass(false);
}
if (mode != m_mode || ((oldstate&0x4) != (m_state&0x4)) || (p && p->pixmap() != m_pixmap))
@@ -114,7 +114,7 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode)
setPixmap(SmallIcon(m_pixmap, 0, iconstate));
}
//if (update)
- // tqrepaint();
+ // repaint();
setDiscarded(false);
}
@@ -137,7 +137,7 @@ KMIconView::~KMIconView()
{
}
-KMIconViewItem* KMIconView::tqfindItem(KMPrinter *p)
+KMIconViewItem* KMIconView::findItem(KMPrinter *p)
{
if (p)
{
@@ -167,7 +167,7 @@ void KMIconView::setPrinterList(TQPtrList *list)
// only keep real printers (no instances)
if (!it.current()->instanceName().isEmpty())
continue;
- item = tqfindItem(it.current());
+ item = findItem(it.current());
if (!item)
{
item = new KMIconViewItem(this,it.current());
diff --git a/kdeprint/management/kmiconview.h b/kdeprint/management/kmiconview.h
index 96bf92b84..1c3aeb542 100644
--- a/kdeprint/management/kmiconview.h
+++ b/kdeprint/management/kmiconview.h
@@ -68,7 +68,7 @@ protected slots:
void slotSelectionChanged();
private:
- KMIconViewItem* tqfindItem(KMPrinter *p);
+ KMIconViewItem* findItem(KMPrinter *p);
private:
TQPtrList m_items;
diff --git a/kdeprint/management/kminfopage.cpp b/kdeprint/management/kminfopage.cpp
index d6db9ec43..e06fa3c28 100644
--- a/kdeprint/management/kminfopage.cpp
+++ b/kdeprint/management/kminfopage.cpp
@@ -32,7 +32,7 @@ KMInfoPage::KMInfoPage(TQWidget *parent, const char *name)
{
m_title = new TQLabel(this);
m_titlepixmap = new TQLabel(this);
- m_titlepixmap->tqsetAlignment(Qt::AlignCenter);
+ m_titlepixmap->setAlignment(Qt::AlignCenter);
KSeparator* sep = new KSeparator( KSeparator::HLine, this);
m_type = new TQLabel(this);
m_description = new TQLabel(this);
@@ -42,19 +42,19 @@ KMInfoPage::KMInfoPage(TQWidget *parent, const char *name)
m_uri = new TQLabel(this);
m_device = new TQLabel(this);
QLabel *m_loclabel = new TQLabel(i18n("Physical Location", "Location:"), this);
- m_loclabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter);
+ m_loclabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
QLabel *m_desclabel = new TQLabel(i18n("Description:"), this);
- m_desclabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter);
+ m_desclabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
QLabel *m_typelabel = new TQLabel(i18n("Type:"), this);
- m_typelabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter);
- QLabel *m_statelabel = new TQLabel(i18n("tqStatus", "State:"), this);
- m_statelabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter);
+ m_typelabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+ QLabel *m_statelabel = new TQLabel(i18n("Status", "State:"), this);
+ m_statelabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
QLabel *m_urilabel = new TQLabel(i18n("URI:"), this);
- m_urilabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter);
+ m_urilabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
m_devlabel = new TQLabel(i18n("Device:"), this);
- m_devlabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter);
+ m_devlabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
QLabel *m_modellabel = new TQLabel(i18n("Model:"), this);
- m_modellabel->tqsetAlignment(Qt::AlignRight|Qt::AlignVCenter);
+ m_modellabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
QGridLayout *lay0 = new TQGridLayout(this, 11, 2, 0, 5);
QHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 10);
@@ -107,7 +107,7 @@ void KMInfoPage::setPrinter(KMPrinter *p)
}
else
{
- m_title->setText(TQString::tqfromLatin1("%1").arg(p->name()));
+ m_title->setText(TQString::fromLatin1("%1").arg(p->name()));
m_titlepixmap->setPixmap(SmallIcon(p->pixmap()));
if (p->isImplicit()) m_type->setText(i18n("Implicit class"));
else if (p->isClass(false))
@@ -133,7 +133,7 @@ void KMInfoPage::setPrinter(KMPrinter *p)
}
else
{
- // double decoding in case printer name tqcontains
+ // double decoding in case printer name contains
// annoying chars like '#'
KURL dev(p->device());
m_device->setText(KURL::decode_string(dev.prettyURL()));
diff --git a/kdeprint/management/kminstancepage.cpp b/kdeprint/management/kminstancepage.cpp
index 8089c3890..6e6fcc391 100644
--- a/kdeprint/management/kminstancepage.cpp
+++ b/kdeprint/management/kminstancepage.cpp
@@ -121,9 +121,9 @@ void KMInstancePage::setPrinter(KMPrinter *p)
//iif (!oldText.isEmpty())
//{
- QListBoxItem *item = m_view->tqfindItem(oldText);
+ QListBoxItem *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
{
@@ -208,9 +208,9 @@ void KMInstancePage::slotSettings()
if (!src.isEmpty())
{
if (src == i18n("(Default)")) src = TQString::null;
- KMPrinter *pr = KMFactory::self()->virtualManager()->tqfindInstance(m_printer,src);
+ KMPrinter *pr = KMFactory::self()->virtualManager()->findInstance(m_printer,src);
if ( !pr )
- KMessageBox::error( this, i18n( "Unable to tqfind instance %1." ).arg( m_view->currentText() ) );
+ KMessageBox::error( this, i18n( "Unable to find instance %1." ).arg( m_view->currentText() ) );
else if ( !pr->isSpecial() && !KMFactory::self()->manager()->completePrinterShort( pr ) )
KMessageBox::error( this, i18n( "Unable to retrieve printer information. Message from printing system: %1." ).arg( KMFactory::self()->manager()->errorMsg() ) );
else
@@ -259,7 +259,7 @@ void KMInstancePage::slotTest()
{
if (src == i18n("(Default)"))
src = TQString::null;
- KMPrinter *mpr = KMFactory::self()->virtualManager()->tqfindInstance(m_printer,src);
+ KMPrinter *mpr = KMFactory::self()->virtualManager()->findInstance(m_printer,src);
if (!mpr)
KMessageBox::error(this,i18n("Internal error: printer not found."));
else if (KMessageBox::warningContinueCancel(this, i18n("You are about to print a test page on %1. Do you want to continue?").arg(mpr->printerName()), TQString::null, i18n("Print Test Page"), "printTestPage") == KMessageBox::Continue)
diff --git a/kdeprint/management/kmjobviewer.cpp b/kdeprint/management/kmjobviewer.cpp
index 03c3dc620..a5e419fc6 100644
--- a/kdeprint/management/kmjobviewer.cpp
+++ b/kdeprint/management/kmjobviewer.cpp
@@ -149,7 +149,7 @@ void KMJobViewer::updateCaption()
if (!m_prname.isEmpty())
{
setCaption(i18n("Print Jobs for %1").arg(m_prname));
- KMPrinter *prt = KMManager::self()->tqfindPrinter(m_prname);
+ KMPrinter *prt = KMManager::self()->findPrinter(m_prname);
if (prt)
pixname = prt->pixmap();
}
@@ -183,7 +183,7 @@ void KMJobViewer::addToManager()
}
else if (!m_prname.isEmpty())
{
- KMPrinter *prt = KMManager::self()->tqfindPrinter( m_prname );
+ KMPrinter *prt = KMManager::self()->findPrinter( m_prname );
bool isSpecial = ( prt ? prt->isSpecial() : false );
m_manager->addPrinter(m_prname, (KMJobManager::JobType)m_type, isSpecial);
}
@@ -235,7 +235,7 @@ void KMJobViewer::init()
m_view->addColumn(i18n("Job ID"));
m_view->addColumn(i18n("Owner"));
m_view->addColumn(i18n("Name"), 150);
- m_view->addColumn(i18n("tqStatus", "State"));
+ m_view->addColumn(i18n("Status", "State"));
m_view->addColumn(i18n("Size (KB)"));
m_view->addColumn(i18n("Page(s)"));
m_view->setColumnAlignment(5,Qt::AlignRight|Qt::AlignVCenter);
@@ -280,7 +280,7 @@ void KMJobViewer::initActions()
connect(m_userfield, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotUserChanged()));
connect(uact, TQT_SIGNAL(toggled(bool)), m_userfield, TQT_SLOT(setEnabled(bool)));
m_userfield->setEnabled(false);
- m_userfield->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+ m_userfield->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
KWidgetAction *ufact = new KWidgetAction(m_userfield, i18n("User Name"), 0, 0, 0, actionCollection(), "view_username");
if (!m_pop)
@@ -387,7 +387,7 @@ void KMJobViewer::updateJobs()
for (;it.current();++it)
{
KMJob *j(it.current());
- JobItem *item = tqfindItem(j->uri());
+ JobItem *item = findItem(j->uri());
if (item)
{
item->setDiscarded(false);
@@ -407,7 +407,7 @@ void KMJobViewer::updateJobs()
slotSelectionChanged();
}
-JobItem* KMJobViewer::tqfindItem(const TQString& uri)
+JobItem* KMJobViewer::findItem(const TQString& uri)
{
TQPtrListIterator it(m_items);
for (;it.current();++it)
@@ -586,7 +586,7 @@ void KMJobViewer::loadPluginActions()
KAction *act = actionCollection()->action("job_restart");
for (int i=0;icontainerCount();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/kmjobviewer.h b/kdeprint/management/kmjobviewer.h
index 2838ee17e..98cd73656 100644
--- a/kdeprint/management/kmjobviewer.h
+++ b/kdeprint/management/kmjobviewer.h
@@ -91,7 +91,7 @@ protected:
void init();
void updateJobs();
void initActions();
- JobItem* tqfindItem(const TQString& uri);
+ JobItem* findItem(const TQString& uri);
void jobSelection(TQPtrList& l);
void send(int cmd, const TQString& name, const TQString& arg = TQString::null);
void loadPrinters();
diff --git a/kdeprint/management/kmlistview.cpp b/kdeprint/management/kmlistview.cpp
index 2ffc9b730..e754cfe1d 100644
--- a/kdeprint/management/kmlistview.cpp
+++ b/kdeprint/management/kmlistview.cpp
@@ -89,7 +89,7 @@ void KMListViewItem::updatePrinter(KMPrinter *p)
}
setDiscarded(false);
if (update)
- tqrepaint();
+ repaint();
}
void KMListViewItem::paintCell(TQPainter *p, const TQColorGroup& cg, int c, int w, int a)
@@ -147,7 +147,7 @@ void KMListView::slotRightButtonClicked(TQListViewItem *item, const TQPoint& p,
emit rightButtonClicked(item && item->depth() == 2 ? item->text(0) : TQString::null, p);
}
-KMListViewItem* KMListView::tqfindItem(KMPrinter *p)
+KMListViewItem* KMListView::findItem(KMPrinter *p)
{
if (p)
{
@@ -169,7 +169,7 @@ KMListViewItem* KMListView::tqfindItem(KMPrinter *p)
return 0;
}
-KMListViewItem* KMListView::tqfindItem(const TQString& prname)
+KMListViewItem* KMListView::findItem(const TQString& prname)
{
TQPtrListIterator it(m_items);
for (; it.current(); ++it)
@@ -192,12 +192,12 @@ void KMListView::setPrinterList(TQPtrList *list)
KMListViewItem *item (0);
for (;it.current();++it)
{
- item = tqfindItem(it.current());
+ item = findItem(it.current());
if (!item)
{
if (it.current()->isVirtual())
{
- KMListViewItem *pItem = tqfindItem(it.current()->printerName());
+ KMListViewItem *pItem = findItem(it.current()->printerName());
if (!pItem)
continue;
item = new KMListViewItem(pItem, it.current());
diff --git a/kdeprint/management/kmlistview.h b/kdeprint/management/kmlistview.h
index c037eba4f..e9a6b29e5 100644
--- a/kdeprint/management/kmlistview.h
+++ b/kdeprint/management/kmlistview.h
@@ -48,8 +48,8 @@ protected slots:
void slotOnViewport();
protected:
- KMListViewItem* tqfindItem(KMPrinter*);
- KMListViewItem* tqfindItem(const TQString&);
+ KMListViewItem* findItem(KMPrinter*);
+ KMListViewItem* findItem(const TQString&);
private:
TQPtrList m_items;
diff --git a/kdeprint/management/kmmainview.cpp b/kdeprint/management/kmmainview.cpp
index 11b77a48e..f422832cc 100644
--- a/kdeprint/management/kmmainview.cpp
+++ b/kdeprint/management/kmmainview.cpp
@@ -68,7 +68,7 @@ int kdeprint_management_add_printer_wizard( TQWidget* parent )
{
flag = 1;
// check if the printer already exists, and ask confirmation if needed.
- if (KMFactory::self()->manager()->tqfindPrinter(dlg.printer()->name()) != 0)
+ if (KMFactory::self()->manager()->findPrinter(dlg.printer()->name()) != 0)
if (KMessageBox::warningContinueCancel(parent,i18n("The printer %1 already exists. Continuing will overwrite existing printer. Do you want to continue?").arg(dlg.printer()->name())) == KMessageBox::Cancel)
flag = 0;
// try to add printer only if flag is true.
@@ -99,16 +99,16 @@ KMMainView::KMMainView(TQWidget *parent, const char *name, KActionCollection *co
m_menubar->setIconText( KToolBar::IconTextRight );
m_menubar->setMovingEnabled( false );
- // tqlayout
- QVBoxLayout *m_tqlayout = new TQVBoxLayout(this, 0, 0);
- m_tqlayout->addWidget(m_toolbar);
- m_tqlayout->addWidget( m_menubar );
- m_boxtqlayout = new TQBoxLayout(TQBoxLayout::TopToBottom, 0, 0);
- m_tqlayout->addLayout(m_boxtqlayout);
- m_boxtqlayout->addWidget(m_printerview);
- m_boxtqlayout->addWidget(m_printerpages);
- m_tqlayout->addSpacing(5);
- m_tqlayout->addWidget(m_plugin, 0);
+ // layout
+ QVBoxLayout *m_layout = new TQVBoxLayout(this, 0, 0);
+ m_layout->addWidget(m_toolbar);
+ m_layout->addWidget( m_menubar );
+ m_boxlayout = new TQBoxLayout(TQBoxLayout::TopToBottom, 0, 0);
+ m_layout->addLayout(m_boxlayout);
+ m_boxlayout->addWidget(m_printerview);
+ m_boxlayout->addWidget(m_printerpages);
+ m_layout->addSpacing(5);
+ m_layout->addWidget(m_plugin, 0);
// connections
connect(KMTimer::self(),TQT_SIGNAL(timeout()),TQT_SLOT(slotTimer()));
@@ -374,7 +374,7 @@ void KMMainView::slotTimer()
void KMMainView::slotPrinterSelected(const TQString& prname)
{
- KMPrinter *p = KMManager::self()->tqfindPrinter(prname);
+ KMPrinter *p = KMManager::self()->findPrinter(prname);
m_current = p;
if (p && !p->isSpecial())
KMFactory::self()->manager()->completePrinter(p);
@@ -384,26 +384,26 @@ void KMMainView::slotPrinterSelected(const TQString& prname)
// problem).
//if (m_toolbar->isEnabled())
//{
- int tqmask = (m_manager->hasManagement() ? m_manager->printerOperationMask() : 0);
+ int mask = (m_manager->hasManagement() ? m_manager->printerOperationMask() : 0);
bool sp = !(p && p->isSpecial());
-// m_actions->action("printer_remove")->setEnabled(!sp || ((tqmask & KMManager::PrinterRemoval) && p && p->isLocal() && !p->isImplicit()));
- m_actions->action("printer_remove")->setEnabled(!sp || ((tqmask & KMManager::PrinterRemoval) && p && !p->isImplicit()));
- m_actions->action("printer_configure")->setEnabled(!sp || ((tqmask & KMManager::PrinterConfigure) && p && !p->isClass(true) /*&& p->isLocal()*/));
- m_actions->action("printer_hard_default")->setEnabled((sp && (tqmask & KMManager::PrinterDefault) && p && !p->isClass(true) && !p->isHardDefault() && p->isLocal()));
+// m_actions->action("printer_remove")->setEnabled(!sp || ((mask & KMManager::PrinterRemoval) && p && p->isLocal() && !p->isImplicit()));
+ m_actions->action("printer_remove")->setEnabled(!sp || ((mask & KMManager::PrinterRemoval) && p && !p->isImplicit()));
+ m_actions->action("printer_configure")->setEnabled(!sp || ((mask & KMManager::PrinterConfigure) && p && !p->isClass(true) /*&& p->isLocal()*/));
+ m_actions->action("printer_hard_default")->setEnabled((sp && (mask & KMManager::PrinterDefault) && p && !p->isClass(true) && !p->isHardDefault() && p->isLocal()));
m_actions->action("printer_soft_default")->setEnabled((p && !p->isSoftDefault()));
- m_actions->action("printer_test")->setEnabled((sp && (tqmask & KMManager::PrinterTesting) && p && !p->isClass(true)));
- bool sttqmask = (sp && (tqmask & KMManager::PrinterEnabling) && p);
- m_actions->action("printer_state_change")->setEnabled(sttqmask && p->isLocal());
- m_actions->action("printer_spool_change")->setEnabled(sttqmask);
- m_actions->action("printer_start")->setEnabled((sttqmask && p->state() == KMPrinter::Stopped));
- m_actions->action("printer_stop")->setEnabled((sttqmask && p->state() != KMPrinter::Stopped));
- m_actions->action("printer_enable")->setEnabled((sttqmask && !p->acceptJobs()));
- m_actions->action("printer_disable")->setEnabled((sttqmask && p->acceptJobs()));
-
- m_actions->action("printer_add")->setEnabled((tqmask & KMManager::PrinterCreation));
- tqmask = m_manager->serverOperationMask();
- m_actions->action("server_restart")->setEnabled((tqmask & KMManager::ServerRestarting));
- m_actions->action("server_configure")->setEnabled((tqmask & KMManager::ServerConfigure));
+ m_actions->action("printer_test")->setEnabled((sp && (mask & KMManager::PrinterTesting) && p && !p->isClass(true)));
+ bool stmask = (sp && (mask & KMManager::PrinterEnabling) && p);
+ m_actions->action("printer_state_change")->setEnabled(stmask && p->isLocal());
+ m_actions->action("printer_spool_change")->setEnabled(stmask);
+ m_actions->action("printer_start")->setEnabled((stmask && p->state() == KMPrinter::Stopped));
+ m_actions->action("printer_stop")->setEnabled((stmask && p->state() != KMPrinter::Stopped));
+ m_actions->action("printer_enable")->setEnabled((stmask && !p->acceptJobs()));
+ m_actions->action("printer_disable")->setEnabled((stmask && p->acceptJobs()));
+
+ m_actions->action("printer_add")->setEnabled((mask & KMManager::PrinterCreation));
+ mask = m_manager->serverOperationMask();
+ m_actions->action("server_restart")->setEnabled((mask & KMManager::ServerRestarting));
+ m_actions->action("server_configure")->setEnabled((mask & KMManager::ServerConfigure));
KMFactory::self()->manager()->validatePluginActions(m_actions, p);
//}
@@ -428,7 +428,7 @@ void KMMainView::slotChangeView(int ID)
void KMMainView::slotRightButtonClicked(const TQString& prname, const TQPoint& p)
{
- KMPrinter *printer = KMManager::self()->tqfindPrinter(prname);
+ KMPrinter *printer = KMManager::self()->findPrinter(prname);
// construct popup menu
m_pop->clear();
if (printer)
@@ -622,11 +622,11 @@ void KMMainView::setOrientation(int o)
}
int KMMainView::orientation() const
-{ return (m_boxtqlayout->direction() == TQBoxLayout::LeftToRight ? Qt::Horizontal : Qt::Vertical); }
+{ return (m_boxlayout->direction() == TQBoxLayout::LeftToRight ? Qt::Horizontal : Qt::Vertical); }
void KMMainView::slotChangeDirection(int d)
{
- m_boxtqlayout->setDirection(d == 1 ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom);
+ m_boxlayout->setDirection(d == 1 ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom);
}
void KMMainView::slotTest()
@@ -807,7 +807,7 @@ void KMMainView::loadPluginActions()
KMFactory::self()->manager()->createPluginActions(m_actions);
TQValueList pactions = m_actions->actions("plugin");
int index = m_pactionsindex;
- //TQPopupMenu *menu = m_menubar->tqfindItem( m_menubar->idAt( 1 ) )->popup();
+ //TQPopupMenu *menu = m_menubar->findItem( m_menubar->idAt( 1 ) )->popup();
TQPopupMenu *menu = m_menubar->getButton( 1 )->popup();
for (TQValueList::Iterator it=pactions.begin(); it!=pactions.end(); ++it)
{
diff --git a/kdeprint/management/kmmainview.h b/kdeprint/management/kmmainview.h
index 597b44663..8f60aec2d 100644
--- a/kdeprint/management/kmmainview.h
+++ b/kdeprint/management/kmmainview.h
@@ -122,7 +122,7 @@ private:
int m_pactionsindex;
QStringList m_toollist;
bool m_first;
- QBoxLayout *m_boxtqlayout;
+ QBoxLayout *m_boxlayout;
class KMainWindowPrivate;
KMainWindowPrivate *d;
KToolBar *m_menubar;
diff --git a/kdeprint/management/kmprinterview.cpp b/kdeprint/management/kmprinterview.cpp
index f43f8f62a..794683f54 100644
--- a/kdeprint/management/kmprinterview.cpp
+++ b/kdeprint/management/kmprinterview.cpp
@@ -47,7 +47,7 @@ KMPrinterView::KMPrinterView(TQWidget *parent, const char *name)
connect(m_listview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&)));
setViewType(m_type);
- tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+ setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
}
KMPrinterView::~KMPrinterView()
@@ -105,9 +105,9 @@ void KMPrinterView::slotPrinterSelected(const TQString& p)
m_current = p;
}
-TQSize KMPrinterView::tqminimumSizeHint() const
+TQSize KMPrinterView::minimumSizeHint() const
{
- return TQWidgetStack::tqminimumSizeHint();
+ return TQWidgetStack::minimumSizeHint();
}
#include "kmprinterview.moc"
diff --git a/kdeprint/management/kmprinterview.h b/kdeprint/management/kmprinterview.h
index d6cf04de3..5ea565dba 100644
--- a/kdeprint/management/kmprinterview.h
+++ b/kdeprint/management/kmprinterview.h
@@ -42,7 +42,7 @@ public:
void setViewType(ViewType t);
ViewType viewType() const { return m_type; }
- TQSize tqminimumSizeHint() const;
+ TQSize minimumSizeHint() const;
signals:
void printerSelected(const TQString&);
diff --git a/kdeprint/management/kmpropbackend.cpp b/kdeprint/management/kmpropbackend.cpp
index 468f5e84a..ea6434563 100644
--- a/kdeprint/management/kmpropbackend.cpp
+++ b/kdeprint/management/kmpropbackend.cpp
@@ -34,7 +34,7 @@ KMPropBackend::KMPropBackend(TQWidget *parent, const char *name)
QLabel *l1 = new TQLabel(i18n("Printer type:"), this);
QLabel *l2 = new TQLabel(i18n("URI:"), this);
- // tqlayout
+ // layout
QGridLayout *main_ = new TQGridLayout(this, 3, 2, 10, 7);
main_->setColStretch(0,0);
main_->setColStretch(1,1);
diff --git a/kdeprint/management/kmpropcontainer.cpp b/kdeprint/management/kmpropcontainer.cpp
index 363fd7029..90be6da19 100644
--- a/kdeprint/management/kmpropcontainer.cpp
+++ b/kdeprint/management/kmpropcontainer.cpp
@@ -56,7 +56,7 @@ void KMPropContainer::setWidget(KMPropWidget *w)
connect(m_button,TQT_SIGNAL(clicked()),m_widget,TQT_SLOT(slotChange()));
connect(m_widget,TQT_SIGNAL(enable(bool)),TQT_SIGNAL(enable(bool)));
connect(m_widget,TQT_SIGNAL(enableChange(bool)),TQT_SLOT(slotEnableChange(bool)));
- QVBoxLayout *lay = dynamic_cast(tqlayout());
+ QVBoxLayout *lay = dynamic_cast(layout());
if (lay)
{
lay->insertWidget(0,m_widget,1);
diff --git a/kdeprint/management/kmpropdriver.cpp b/kdeprint/management/kmpropdriver.cpp
index c20a8c4e0..6b88f63ea 100644
--- a/kdeprint/management/kmpropdriver.cpp
+++ b/kdeprint/management/kmpropdriver.cpp
@@ -37,7 +37,7 @@ KMPropDriver::KMPropDriver(TQWidget *parent, const char *name)
QLabel *l2 = new TQLabel(i18n("Printer model:"), this);
QLabel *l3 = new TQLabel(i18n("Driver info:"), this);
- // tqlayout
+ // layout
QGridLayout *main_ = new TQGridLayout(this, 4, 2, 10, 7);
main_->setColStretch(0,0);
main_->setColStretch(1,1);
diff --git a/kdeprint/management/kmpropgeneral.cpp b/kdeprint/management/kmpropgeneral.cpp
index 3691076ab..1c9389941 100644
--- a/kdeprint/management/kmpropgeneral.cpp
+++ b/kdeprint/management/kmpropgeneral.cpp
@@ -38,7 +38,7 @@ KMPropGeneral::KMPropGeneral(TQWidget *parent, const char *name)
QLabel *l2 = new TQLabel(i18n("Physical Location", "Location:"), this);
QLabel *l3 = new TQLabel(i18n("Description:"), this);
- // tqlayout
+ // layout
QGridLayout *main_ = new TQGridLayout(this, 4, 2, 10, 7);
main_->setColStretch(0,0);
main_->setColStretch(1,1);
diff --git a/kdeprint/management/kmpropmembers.cpp b/kdeprint/management/kmpropmembers.cpp
index 6fa76cba9..775c71f89 100644
--- a/kdeprint/management/kmpropmembers.cpp
+++ b/kdeprint/management/kmpropmembers.cpp
@@ -29,7 +29,7 @@ KMPropMembers::KMPropMembers(TQWidget *parent, const char *name)
: KMPropWidget(parent,name)
{
m_members = new TQTextView(this);
- m_members->setPaper(tqcolorGroup().background());
+ m_members->setPaper(colorGroup().background());
m_members->setFrameStyle(TQFrame::NoFrame);
QVBoxLayout *main_ = new TQVBoxLayout(this, 10, 0);
diff --git a/kdeprint/management/kmspecialprinterdlg.cpp b/kdeprint/management/kmspecialprinterdlg.cpp
index c9cd1eb2d..20d8d17b7 100644
--- a/kdeprint/management/kmspecialprinterdlg.cpp
+++ b/kdeprint/management/kmspecialprinterdlg.cpp
@@ -103,7 +103,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
TQWhatsThis::add(m_usefile,
i18n("The command will use an output file. If checked, make sure the "
- "command tqcontains an output tag.
"));
+ "command contains an output tag.
"));
TQWhatsThis::add(m_command,
i18n("The command to execute when printing on this special printer. Either enter "
"the command to execute directly, or associate/create a command object with/for "
@@ -122,7 +122,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
TQWhatsThis::add(m_extensionlabel, extensionWhatsThis);
TQWhatsThis::add(m_extension, extensionWhatsThis);
- // tqlayout creation
+ // layout creation
QVBoxLayout *l0 = new TQVBoxLayout(dummy, 0, 10);
QGridLayout *l1 = new TQGridLayout(0, 3, 3, 0, 5);
l0->addLayout(l1);
@@ -138,7 +138,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
l0->addWidget(sep);
l0->addWidget(m_gb);
l0->addWidget(m_outfile_gb);
- QGridLayout *l6 = new TQGridLayout(m_outfile_gb->tqlayout(), 3, 2, 10);
+ QGridLayout *l6 = new TQGridLayout(m_outfile_gb->layout(), 3, 2, 10);
l6->addMultiCellWidget( m_usefile, 0, 0, 0, 1 );
l6->addWidget(m_mimetypelabel, 1, 0);
l6->addWidget(m_mimetype, 1, 1);
@@ -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 eb5c6e4b9..53803d383 100644
--- a/kdeprint/management/kmwbackend.cpp
+++ b/kdeprint/management/kmwbackend.cpp
@@ -56,8 +56,8 @@ KMWBackend::KMWBackend(TQWidget *parent, const char *name)
m_buttons = new TQButtonGroup(this);
m_buttons->hide();
- m_tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
- m_tqlayout->addStretch(1);
+ m_layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+ m_layout->addStretch(1);
m_count = 0;
}
@@ -91,7 +91,7 @@ void KMWBackend::initPrinter(KMPrinter *p)
else if (p->members().count() > 0) ID = KMWizard::Class;
}
- if (m_buttons->tqfind(ID))
+ if (m_buttons->find(ID))
m_buttons->setButton(ID);
}
@@ -102,9 +102,9 @@ void KMWBackend::updatePrinter(KMPrinter *p)
else p->setType(KMPrinter::Printer);
p->setOption("kde-backend",TQString::number(ID));
QString s = m_buttons->selected()->text();
- s.tqreplace(TQRegExp("&(?=\\w)"), TQString::tqfromLatin1(""));
+ s.replace(TQRegExp("&(?=\\w)"), TQString::fromLatin1(""));
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 )
@@ -154,7 +154,7 @@ void KMWBackend::addBackend(int ID, const TQString& txt, bool on, const TQString
if (ID == -1)
{
KSeparator* sep = new KSeparator( KSeparator::HLine, this);
- m_tqlayout->insertWidget(m_count, sep);
+ m_layout->insertWidget(m_count, sep);
}
else
{
@@ -164,14 +164,14 @@ void KMWBackend::addBackend(int ID, const TQString& txt, bool on, const TQString
TQWhatsThis::add( btn, whatsThis );
m_buttons->insert(btn, ID);
m_map[ID] = (nextpage == -1 ? ID : nextpage); // use nextpage if specified, default to ID
- m_tqlayout->insertWidget(m_count, btn);
+ m_layout->insertWidget(m_count, btn);
}
m_count++;
}
void KMWBackend::enableBackend(int ID, bool on)
{
- QButton *btn = m_buttons->tqfind(ID);
+ QButton *btn = m_buttons->find(ID);
if (btn)
btn->setEnabled(on);
}
diff --git a/kdeprint/management/kmwbackend.h b/kdeprint/management/kmwbackend.h
index 421ce4db4..2013b8035 100644
--- a/kdeprint/management/kmwbackend.h
+++ b/kdeprint/management/kmwbackend.h
@@ -42,7 +42,7 @@ public:
private:
QButtonGroup *m_buttons;
- QVBoxLayout *m_tqlayout;
+ QVBoxLayout *m_layout;
// keep a map between button ID and the real next page to switch to. This enables
// to have different backends switching to the same page (like backends requiring
// a password). If the next page is not given when adding the backend, the ID is
diff --git a/kdeprint/management/kmwclass.cpp b/kdeprint/management/kmwclass.cpp
index c308d5aa2..d432af8e1 100644
--- a/kdeprint/management/kmwclass.cpp
+++ b/kdeprint/management/kmwclass.cpp
@@ -94,7 +94,7 @@ void KMWClass::initPrinter(KMPrinter *p)
{
TQPtrListIterator 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();
}
@@ -103,7 +103,7 @@ void KMWClass::initPrinter(KMPrinter *p)
m_list2->clear();
for (TQStringList::ConstIterator it=members.begin(); it!=members.end(); ++it)
{
- KMPrinter *pr = mgr->tqfindPrinter(*it);
+ KMPrinter *pr = mgr->findPrinter(*it);
if (pr) m_list2->insertItem(SmallIcon(pr->pixmap()), *it);
}
m_list2->sort();
diff --git a/kdeprint/management/kmwdriver.cpp b/kdeprint/management/kmwdriver.cpp
index eae9d4ef9..a50454d0b 100644
--- a/kdeprint/management/kmwdriver.cpp
+++ b/kdeprint/management/kmwdriver.cpp
@@ -49,11 +49,11 @@ 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 );
- KMDBEntryList *l = KMDriverDB::self()->tqfindPnpEntry( manu, model );
+ KMDBEntryList *l = KMDriverDB::self()->findPnpEntry( manu, model );
if ( l && l->count() > 0 )
{
m_widget->setDriver( l->getFirst()->manufacturer, l->getFirst()->model );
diff --git a/kdeprint/management/kmwend.cpp b/kdeprint/management/kmwend.cpp
index 3616cb1ce..5fd3c7fc0 100644
--- a/kdeprint/management/kmwend.cpp
+++ b/kdeprint/management/kmwend.cpp
@@ -42,11 +42,11 @@ KMWEnd::KMWEnd(TQWidget *parent, const char *name)
void KMWEnd::initPrinter(KMPrinter *p)
{
QString txt;
- QString s(TQString::tqfromLatin1("%1: %2"));
+ QString s(TQString::fromLatin1("%1: %2"));
int ID = p->option("kde-backend").toInt();
// general information
- txt.append(TQString::tqfromLatin1("%1").arg(i18n("General")));
+ txt.append(TQString::fromLatin1("%1").arg(i18n("General")));
txt.append(s.arg(i18n("Type")).arg(p->option("kde-backend-description")));
txt.append(s.arg(i18n("Name")).arg(p->name()));
txt.append(s.arg(i18n("Location")).arg(p->location()));
@@ -56,9 +56,9 @@ void KMWEnd::initPrinter(KMPrinter *p)
if (ID == KMWizard::Class)
{
// class members
- txt.append(TQString::tqfromLatin1("%1").arg(i18n("Members")));
+ txt.append(TQString::fromLatin1("%1").arg(i18n("Members")));
QStringList m(p->members());
- QString s1(TQString::tqfromLatin1("- %1
"));
+ QString s1(TQString::fromLatin1("- %1
"));
for (TQStringList::ConstIterator it=m.begin(); it!=m.end(); ++it)
txt.append(s1.arg(*it));
txt.append("
");
@@ -66,7 +66,7 @@ void KMWEnd::initPrinter(KMPrinter *p)
else
{
// backend information
- txt.append(TQString::tqfromLatin1("%1").arg(i18n("Backend")));
+ txt.append(TQString::fromLatin1("%1").arg(i18n("Backend")));
KURL url ( p->device() );
switch (ID)
{
@@ -91,7 +91,7 @@ void KMWEnd::initPrinter(KMPrinter *p)
if (url.hasUser()) txt.append(s.arg(i18n("Account")).arg(url.user()));
break;
default:
- // double decoding in case the printer name tqcontains chars like '#' that are
+ // double decoding in case the printer name contains chars like '#' that are
// not decoded by "prettyURL".
txt.append(s.arg(i18n("URI")).arg(KURL( p->device()).prettyURL()));
break;
@@ -101,7 +101,7 @@ void KMWEnd::initPrinter(KMPrinter *p)
if (p->option("kde-driver") == "raw" || p->driver())
{
// driver information
- txt.append(TQString::tqfromLatin1("%1").arg(i18n("Driver")));
+ txt.append(TQString::fromLatin1("%1").arg(i18n("Driver")));
if (p->option("kde-driver") == "raw")
txt.append(s.arg(i18n("Type")).arg(i18n("Raw printer")));
else
diff --git a/kdeprint/management/kmwfile.cpp b/kdeprint/management/kmwfile.cpp
index 33deb0836..9daeee77b 100644
--- a/kdeprint/management/kmwfile.cpp
+++ b/kdeprint/management/kmwfile.cpp
@@ -72,6 +72,6 @@ bool KMWFile::isValid(TQString& msg)
void KMWFile::updatePrinter(KMPrinter *p)
{
- QString dev = TQString::tqfromLatin1("file:%1").arg(m_url->url());
+ QString dev = TQString::fromLatin1("file:%1").arg(m_url->url());
p->setDevice(dev);
}
diff --git a/kdeprint/management/kmwizard.cpp b/kdeprint/management/kmwizard.cpp
index 7a4fa3aa8..6a793dd5a 100644
--- a/kdeprint/management/kmwizard.cpp
+++ b/kdeprint/management/kmwizard.cpp
@@ -86,7 +86,7 @@ KMWizard::KMWizard(TQWidget *parent, const char *name)
m_side = 0;
}
- // tqlayout
+ // layout
TQVBoxLayout *main0_ = new TQVBoxLayout(this, 10, 10);
QVBoxLayout *main_ = new TQVBoxLayout(0, 0, 0);
TQHBoxLayout *main1_ = new TQHBoxLayout(0, 0, 10);
@@ -178,17 +178,17 @@ 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 tqfind the requested page."),i18n("Add Printer Wizard"));
+ KMessageBox::error(this,i18n("Unable to find the requested page."),i18n("Add Printer Wizard"));
return;
}
diff --git a/kdeprint/management/kmwlocal.cpp b/kdeprint/management/kmwlocal.cpp
index cb5ac7bb1..1a89babe0 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;
QString uri = *it;
- int p = uri.tqfind( ':' );
+ int p = uri.find( ':' );
QString desc = *(++it), prot = ( p != -1 ? uri.left( p ) : TQString::null );
QString printer = *(++it);
int index(-1);
diff --git a/kdeprint/management/kmwlpd.cpp b/kdeprint/management/kmwlpd.cpp
index ef223a55a..c2686b481 100644
--- a/kdeprint/management/kmwlpd.cpp
+++ b/kdeprint/management/kmwlpd.cpp
@@ -58,7 +58,7 @@ bool KMWLpd::isValid(TQString& msg)
// check LPD queue
if (!checkLpdQueue(text(0).latin1(),text(1).latin1()))
{
- if (KMessageBox::warningContinueCancel(this, i18n("Cannot tqfind queue %1 on server %2; do you want to continue anyway?").arg(text(1)).arg(text(0))) == KMessageBox::Cancel)
+ if (KMessageBox::warningContinueCancel(this, i18n("Cannot find queue %1 on server %2; do you want to continue anyway?").arg(text(1)).arg(text(0))) == KMessageBox::Cancel)
return false;
}
return true;
@@ -66,7 +66,7 @@ bool KMWLpd::isValid(TQString& msg)
void KMWLpd::updatePrinter(KMPrinter *p)
{
- QString dev = TQString::tqfromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1));
+ QString dev = TQString::fromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1));
p->setDevice(dev);
}
@@ -81,7 +81,7 @@ bool checkLpdQueue(const char *host, const char *queue)
char res[64] = {0};
snprintf(res,64,"%c%s\n",(char)4,queue);
- if (sock.writeBlock(res, strlen(res)) != (TQ_LONG)(strlen(res)))
+ if (sock.writeBlock(res, strlen(res)) != (Q_LONG)(strlen(res)))
return false;
char buf[1024] = {0};
diff --git a/kdeprint/management/kmwname.cpp b/kdeprint/management/kmwname.cpp
index 709b986ea..d46b104a7 100644
--- a/kdeprint/management/kmwname.cpp
+++ b/kdeprint/management/kmwname.cpp
@@ -48,10 +48,10 @@ 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.tqreplace(TQRegExp("\\s"), "");
+ conv.replace(TQRegExp("\\s"), "");
int result = KMessageBox::warningYesNoCancel(this,
i18n("It is usually not a good idea to include spaces "
"in printer name: it may prevent your printer from "
diff --git a/kdeprint/management/kmwpassword.cpp b/kdeprint/management/kmwpassword.cpp
index ef3e74011..a84b8f904 100644
--- a/kdeprint/management/kmwpassword.cpp
+++ b/kdeprint/management/kmwpassword.cpp
@@ -66,7 +66,7 @@ KMWPassword::KMWPassword(TQWidget *parent, const char *name)
connect(btn3,TQT_SIGNAL(toggled(bool)),m_login,TQT_SLOT(setEnabled(bool)));
connect(btn3,TQT_SIGNAL(toggled(bool)),m_password,TQT_SLOT(setEnabled(bool)));
- // tqlayout
+ // layout
TQVBoxLayout *main_ = new TQVBoxLayout( this, 0, 0 );
main_->addWidget( infotext_ );
main_->addSpacing( 10 );
@@ -99,12 +99,12 @@ void KMWPassword::initPrinter( KMPrinter* p )
if ( p->option( "kde-backend" ).toInt() != KMWizard::SMB )
{
int ID = m_btngroup->selectedId();
- m_btngroup->tqfind( 1 )->hide();
+ m_btngroup->find( 1 )->hide();
if ( ID == 1 )
m_btngroup->setButton( 0 );
}
else
- m_btngroup->tqfind( 1 )->show();
+ m_btngroup->find( 1 )->show();
}
void KMWPassword::updatePrinter(KMPrinter *p)
@@ -121,7 +121,7 @@ void KMWPassword::updatePrinter(KMPrinter *p)
p->setOption( "kde-password", TQString::null );
break;
case 1:
- p->setOption( "kde-login", TQString::tqfromLatin1( "guest" ) );
+ p->setOption( "kde-login", TQString::fromLatin1( "guest" ) );
p->setOption( "kde-password", TQString::null );
break;
case 2:
diff --git a/kdeprint/management/kmwsocket.cpp b/kdeprint/management/kmwsocket.cpp
index f50c5c6b6..749ab8ea7 100644
--- a/kdeprint/management/kmwsocket.cpp
+++ b/kdeprint/management/kmwsocket.cpp
@@ -66,7 +66,7 @@ KMWSocket::KMWSocket(TQWidget *parent, const char *name)
connect( m_scanner, TQT_SIGNAL( scanStarted() ), parent, TQT_SLOT( disableWizard() ) );
connect( m_scanner, TQT_SIGNAL( scanFinished() ), parent, TQT_SLOT( enableWizard() ) );
- // tqlayout
+ // layout
QHBoxLayout *lay3 = new TQHBoxLayout(this, 0, 10);
QVBoxLayout *lay2 = new TQVBoxLayout(0, 0, 0);
@@ -88,7 +88,7 @@ KMWSocket::~KMWSocket()
void KMWSocket::updatePrinter(KMPrinter *p)
{
- QString dev = TQString::tqfromLatin1("socket://%1:%2").arg(m_printer->text()).arg(m_port->text());
+ QString dev = TQString::fromLatin1("socket://%1:%2").arg(m_printer->text()).arg(m_port->text());
p->setDevice(dev);
}
diff --git a/kdeprint/management/kmwsocketutil.cpp b/kdeprint/management/kmwsocketutil.cpp
index 658a3c4a7..d3f838ce7 100644
--- a/kdeprint/management/kmwsocketutil.cpp
+++ b/kdeprint/management/kmwsocketutil.cpp
@@ -49,27 +49,27 @@ SocketConfig::SocketConfig(KMWSocketUtil *util, TQWidget *parent, const char *na
QWidget *dummy = new TQWidget(this);
setMainWidget(dummy);
KIntValidator *val = new KIntValidator( this );
- QLabel *tqmasklabel = new TQLabel(i18n("&Subnetwork:"),dummy);
+ QLabel *masklabel = new TQLabel(i18n("&Subnetwork:"),dummy);
QLabel *portlabel = new TQLabel(i18n("&Port:"),dummy);
QLabel *toutlabel = new TQLabel(i18n("&Timeout (ms):"),dummy);
QLineEdit *mm = new TQLineEdit(dummy);
- mm->setText(TQString::tqfromLatin1(".[0-255]"));
+ mm->setText(TQString::fromLatin1(".[0-255]"));
mm->setReadOnly(true);
mm->setFixedWidth(fontMetrics().width(mm->text())+10);
- tqmask_ = new TQLineEdit(dummy);
- tqmask_->tqsetAlignment(Qt::AlignRight);
+ mask_ = new TQLineEdit(dummy);
+ mask_->setAlignment(Qt::AlignRight);
port_ = new TQComboBox(true,dummy);
if ( port_->lineEdit() )
port_->lineEdit()->setValidator( val );
tout_ = new TQLineEdit(dummy);
tout_->setValidator( val );
- tqmasklabel->setBuddy(tqmask_);
+ masklabel->setBuddy(mask_);
portlabel->setBuddy(port_);
toutlabel->setBuddy(tout_);
- tqmask_->setText(util->root_);
+ mask_->setText(util->root_);
port_->insertItem("631");
port_->insertItem("9100");
port_->insertItem("9101");
@@ -79,13 +79,13 @@ SocketConfig::SocketConfig(KMWSocketUtil *util, TQWidget *parent, const char *na
QGridLayout *main_ = new TQGridLayout(dummy, 3, 2, 0, 10);
QHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 5);
- main_->addWidget(tqmasklabel, 0, 0);
+ main_->addWidget(masklabel, 0, 0);
main_->addWidget(portlabel, 1, 0);
main_->addWidget(toutlabel, 2, 0);
main_->addLayout(lay1, 0, 1);
main_->addWidget(port_, 1, 1);
main_->addWidget(tout_, 2, 1);
- lay1->addWidget(tqmask_,1);
+ lay1->addWidget(mask_,1);
lay1->addWidget(mm,0);
resize(250,130);
@@ -100,7 +100,7 @@ void SocketConfig::slotOk()
{
QString msg;
QRegExp re("(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})");
- if (!re.exactMatch(tqmask_->text()))
+ if (!re.exactMatch(mask_->text()))
msg = i18n("Wrong subnetwork specification.");
else
{
@@ -189,7 +189,7 @@ void KMWSocketUtil::configureScan(TQWidget *parent)
SocketConfig *dlg = new SocketConfig(this,parent);
if (dlg->exec())
{
- root_ = dlg->tqmask_->text();
+ root_ = dlg->mask_->text();
port_ = dlg->port_->currentText().toInt();
timeout_ = dlg->tout_->text().toInt();
}
@@ -209,7 +209,7 @@ TQString localRootIP()
if (infos.count() > 0)
{
QString IPstr = infos.first()->address()->nodeName();
- int p = IPstr.tqfindRev('.');
+ int p = IPstr.findRev('.');
IPstr.truncate(p);
return IPstr;
}
diff --git a/kdeprint/management/kmwsocketutil.h b/kdeprint/management/kmwsocketutil.h
index 563dd3712..ad17b8113 100644
--- a/kdeprint/management/kmwsocketutil.h
+++ b/kdeprint/management/kmwsocketutil.h
@@ -48,7 +48,7 @@ protected slots:
void slotOk();
private:
- QLineEdit *tqmask_, *tout_;
+ QLineEdit *mask_, *tout_;
QComboBox *port_;
};
diff --git a/kdeprint/management/kxmlcommanddlg.cpp b/kdeprint/management/kxmlcommanddlg.cpp
index 029143753..24e6f4adf 100644
--- a/kdeprint/management/kxmlcommanddlg.cpp
+++ b/kdeprint/management/kxmlcommanddlg.cpp
@@ -52,11 +52,11 @@
TQString generateId(const TQMap& map)
{
int index(-1);
- while (map.tqcontains(TQString::tqfromLatin1("item%1").arg(++index))) ;
- return TQString::tqfromLatin1("item%1").arg(index);
+ while (map.contains(TQString::fromLatin1("item%1").arg(++index))) ;
+ return TQString::fromLatin1("item%1").arg(index);
}
-TQListViewItem* tqfindPrev(TQListViewItem *item)
+TQListViewItem* findPrev(TQListViewItem *item)
{
QListViewItem *prev = item->itemAbove();
while (prev && prev->depth() > item->depth())
@@ -67,7 +67,7 @@ TQListViewItem* tqfindPrev(TQListViewItem *item)
return 0;
}
-TQListViewItem* tqfindNext(TQListViewItem *item)
+TQListViewItem* findNext(TQListViewItem *item)
{
QListViewItem *next = item->itemBelow();
while (next && next->depth() > item->depth())
@@ -230,9 +230,9 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
l5->addWidget(m_edit1, 0, 1);
l5->addWidget(m_edit2, 1, 1);
- QGridLayout *l8 = new TQGridLayout(gb_input->tqlayout(), 2, 2,
+ QGridLayout *l8 = new TQGridLayout(gb_input->layout(), 2, 2,
KDialog::spacingHint());
- QGridLayout *l9 = new TQGridLayout(gb_output->tqlayout(), 2, 2,
+ QGridLayout *l9 = new TQGridLayout(gb_output->layout(), 2, 2,
KDialog::spacingHint());
l8->addWidget(m_inputfilelab, 0, 0);
l8->addWidget(m_inputpipelab, 1, 0);
@@ -243,7 +243,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
l9->addWidget(m_outputfile, 0, 1);
l9->addWidget(m_outputpipe, 1, 1);
- QVBoxLayout *l11 = new TQVBoxLayout(gb->tqlayout());
+ QVBoxLayout *l11 = new TQVBoxLayout(gb->layout());
l11->addWidget(m_stack);
TQVBoxLayout *l12 = new TQVBoxLayout( 0, 0, 0 );
@@ -296,7 +296,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
TQWhatsThis::add( m_format, i18n(
"The format of the option. This determines how the option is formatted "
"for inclusion in the global command line. The tag %value can be used "
- "to represent the user selection. This tag will be tqreplaced at run-time by a "
+ "to represent the user selection. This tag will be replaced at run-time by a "
"string representation of the option value." ) );
TQWhatsThis::add( m_formatlab, TQWhatsThis::textFor( m_format ) );
TQWhatsThis::add( m_default, i18n(
@@ -311,7 +311,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
"value does not match with the actual default value of the underlying utility." ) );
TQWhatsThis::add( m_command, i18n(
"The full command line to execute the associated underlying utility. This "
- "command line is based on a mechanism of tags that are tqreplaced at run-time. "
+ "command line is based on a mechanism of tags that are replaced at run-time. "
"The supported tags are:"
"- %filterargs: command options
"
"- %filterinput: input specification
"
@@ -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);
@@ -497,9 +497,9 @@ void KXmlCommandAdvancedDlg::viewItem(TQListViewItem *item)
m_addgrp->setEnabled(isgroup);
m_addopt->setEnabled(isgroup);
- QListViewItem *prevItem = tqfindPrev(item), *nextItem = tqfindNext(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);
+ QListViewItem *prevItem = findPrev(item), *nextItem = findNext(item);
+ 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;
@@ -706,10 +706,10 @@ void KXmlCommandAdvancedDlg::removeItem(TQListViewItem *item)
void KXmlCommandAdvancedDlg::slotMoveUp()
{
QListViewItem *item = m_view->currentItem(), *prev = 0;
- if (item && (prev=tqfindPrev(item)))
+ if (item && (prev=findPrev(item)))
{
QListViewItem *after(0);
- if ((after=tqfindPrev(prev)) != 0)
+ if ((after=findPrev(prev)) != 0)
item->moveItem(after);
else
{
@@ -725,7 +725,7 @@ void KXmlCommandAdvancedDlg::slotMoveUp()
void KXmlCommandAdvancedDlg::slotMoveDown()
{
QListViewItem *item = m_view->currentItem(), *next = 0;
- if (item && (next=tqfindNext(item)))
+ if (item && (next=findNext(item)))
{
item->moveItem(next);
m_view->setSelected(item, true);
@@ -735,10 +735,10 @@ void KXmlCommandAdvancedDlg::slotMoveDown()
void KXmlCommandAdvancedDlg::slotCommandChanged(const TQString& cmd)
{
- m_inputfile->tqparentWidget()->setEnabled(cmd.tqfind("%filterinput") != -1);
- m_outputfile->tqparentWidget()->setEnabled(cmd.tqfind("%filteroutput") != -1);
- m_view->setEnabled(cmd.tqfind("%filterargs") != -1);
- m_name->tqparentWidget()->setEnabled(m_view->isEnabled());
+ 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)
QListViewItem *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)
@@ -804,10 +804,10 @@ bool KXmlCommandAdvancedDlg::editCommand(KXmlCommand *xmlcmd, TQWidget *parent)
xmlcmd->setIo(xmldlg->m_inputpipe->text(), true, true);
xmlcmd->setIo(xmldlg->m_outputfile->text(), false, false);
xmlcmd->setIo(xmldlg->m_outputpipe->text(), false, true);
- xmlcmd->setComment( xmldlg->m_comment->text().tqreplace( TQRegExp( "\n" ), " " ) );
+ 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(xmldlg->m_opts["__root__"]) : 0);
+ DrMain *driver = (xmldlg->m_opts.contains("__root__") ? static_cast(xmldlg->m_opts["__root__"]) : 0);
if (!driver && xmldlg->m_opts.count() > 0)
{
kdDebug() << "KXmlCommandAdvancedDlg: driver structure not found, creating one" << endl;
@@ -895,14 +895,14 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
l6->addWidget(m_mimetypelab, 0);
l6->addWidget(m_mimetype, 1);
l7->addWidget(m_gb1);
- QGridLayout *l2 = new TQGridLayout(m_gb1->tqlayout(), 4, 3, 10);
+ QGridLayout *l2 = new TQGridLayout(m_gb1->layout(), 4, 3, 10);
l2->addMultiCellWidget(m_availablemime, 0, 3, 2, 2);
l2->addMultiCellWidget(m_selectedmime, 0, 3, 0, 0);
l2->addWidget(m_addmime, 1, 1);
l2->addWidget(m_removemime, 2, 1);
l2->setRowStretch(0, 1);
l2->setRowStretch(3, 1);
- QHBoxLayout *l4 = new TQHBoxLayout(m_gb2->tqlayout(), 10);
+ QHBoxLayout *l4 = new TQHBoxLayout(m_gb2->layout(), 10);
l4->addWidget(m_requirements);
QVBoxLayout *l8 = new TQVBoxLayout(0, 0, 0);
l4->addLayout(l8);
@@ -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, Qt::ExactMatch);
+ delete m_availablemime->findItem(*it, Qt::ExactMatch);
}
}
@@ -1025,7 +1025,7 @@ void KXmlCommandDlg::slotRemoveMime()
void KXmlCommandDlg::slotEditCommand()
{
- KXmlCommandAdvancedDlg::editCommand(m_cmd, tqparentWidget());
+ KXmlCommandAdvancedDlg::editCommand(m_cmd, parentWidget());
}
void KXmlCommandDlg::slotAddReq()
diff --git a/kdeprint/management/kxmlcommandselector.cpp b/kdeprint/management/kxmlcommandselector.cpp
index c6eccda28..4e57b3922 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,
@@ -275,7 +275,7 @@ void KXmlCommandSelector::slotHelpCommand()
{
KPopupFrame *pop = new KPopupFrame( m_helpbtn );
KActiveLabel *lab = new KActiveLabel( m_help, pop );
- lab->resize( lab->tqsizeHint() );
+ lab->resize( lab->sizeHint() );
pop->setMainWidget( lab );
pop->exec( m_helpbtn->mapToGlobal( TQPoint( m_helpbtn->width(), 0 ) ) );
pop->close( 0 );
diff --git a/kdeprint/management/networkscanner.cpp b/kdeprint/management/networkscanner.cpp
index 72d2ad68d..41b368ab0 100644
--- a/kdeprint/management/networkscanner.cpp
+++ b/kdeprint/management/networkscanner.cpp
@@ -80,7 +80,7 @@ TQString NetworkScanner::NetworkScannerPrivate::localPrefix()
if (infos.count() > 0)
{
QString IPstr = infos.first()->address()->nodeName();
- int p = IPstr.tqfindRev('.');
+ int p = IPstr.findRev('.');
IPstr.truncate(p);
return IPstr;
}
@@ -157,7 +157,7 @@ void NetworkScanner::slotScanClicked()
if ( !d->scanning )
{
if ( d->localPrefix() == d->prefixaddress ||
- KMessageBox::warningContinueCancel( this->tqparentWidget(),
+ KMessageBox::warningContinueCancel( this->parentWidget(),
i18n( "You are about to scan a subnet (%1.*) that does not "
"correspond to the current subnet of this computer (%2.*). Do you want "
"to scan the specified subnet anyway?" ).arg( d->prefixaddress ).arg( d->localPrefix() ),
@@ -312,7 +312,7 @@ void NetworkScanner::setPort( int p )
bool NetworkScanner::checkPrinter( const TQString& host, int port )
{
- // try first to tqfind it in the SocketInfo list
+ // try first to find it in the SocketInfo list
TQPtrListIterator it( d->printers );
for ( ; it.current(); ++it )
{
@@ -335,27 +335,27 @@ NetworkScannerConfig::NetworkScannerConfig(NetworkScanner *scanner, const char *
QWidget *dummy = new TQWidget(this);
setMainWidget(dummy);
KIntValidator *val = new KIntValidator( this );
- QLabel *tqmasklabel = new TQLabel(i18n("&Subnetwork:"),dummy);
+ QLabel *masklabel = new TQLabel(i18n("&Subnetwork:"),dummy);
QLabel *portlabel = new TQLabel(i18n("&Port:"),dummy);
QLabel *toutlabel = new TQLabel(i18n("&Timeout (ms):"),dummy);
QLineEdit *mm = new TQLineEdit(dummy);
- mm->setText(TQString::tqfromLatin1(".[0-255]"));
+ mm->setText(TQString::fromLatin1(".[0-255]"));
mm->setReadOnly(true);
mm->setFixedWidth(fontMetrics().width(mm->text())+10);
- tqmask_ = new TQLineEdit(dummy);
- tqmask_->tqsetAlignment(Qt::AlignRight);
+ mask_ = new TQLineEdit(dummy);
+ mask_->setAlignment(Qt::AlignRight);
port_ = new TQComboBox(true,dummy);
if ( port_->lineEdit() )
port_->lineEdit()->setValidator( val );
tout_ = new TQLineEdit(dummy);
tout_->setValidator( val );
- tqmasklabel->setBuddy(tqmask_);
+ masklabel->setBuddy(mask_);
portlabel->setBuddy(port_);
toutlabel->setBuddy(tout_);
- tqmask_->setText(scanner_->subnet());
+ mask_->setText(scanner_->subnet());
port_->insertItem("631");
port_->insertItem("9100");
port_->insertItem("9101");
@@ -365,13 +365,13 @@ NetworkScannerConfig::NetworkScannerConfig(NetworkScanner *scanner, const char *
QGridLayout *main_ = new TQGridLayout(dummy, 3, 2, 0, 10);
QHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 5);
- main_->addWidget(tqmasklabel, 0, 0);
+ main_->addWidget(masklabel, 0, 0);
main_->addWidget(portlabel, 1, 0);
main_->addWidget(toutlabel, 2, 0);
main_->addLayout(lay1, 0, 1);
main_->addWidget(port_, 1, 1);
main_->addWidget(tout_, 2, 1);
- lay1->addWidget(tqmask_,1);
+ lay1->addWidget(mask_,1);
lay1->addWidget(mm,0);
resize(250,130);
@@ -386,7 +386,7 @@ void NetworkScannerConfig::slotOk()
{
QString msg;
QRegExp re("(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})");
- if (!re.exactMatch(tqmask_->text()))
+ if (!re.exactMatch(mask_->text()))
msg = i18n("Wrong subnetwork specification.");
else
{
@@ -412,7 +412,7 @@ void NetworkScannerConfig::slotOk()
}
scanner_->setTimeout( tout_->text().toInt() );
- scanner_->setSubnet( tqmask_->text() );
+ scanner_->setSubnet( mask_->text() );
scanner_->setPort( port_->currentText().toInt() );
KDialogBase::slotOk();
diff --git a/kdeprint/management/networkscanner.h b/kdeprint/management/networkscanner.h
index 19996c163..462d26427 100644
--- a/kdeprint/management/networkscanner.h
+++ b/kdeprint/management/networkscanner.h
@@ -87,7 +87,7 @@ protected slots:
void slotOk();
private:
- QLineEdit *tqmask_, *tout_;
+ QLineEdit *mask_, *tout_;
QComboBox *port_;
NetworkScanner *scanner_;
};
diff --git a/kdeprint/management/sidepixmap.cpp b/kdeprint/management/sidepixmap.cpp
index 696d7b025..99a1e6198 100644
--- a/kdeprint/management/sidepixmap.cpp
+++ b/kdeprint/management/sidepixmap.cpp
@@ -32,7 +32,7 @@ SidePixmap::SidePixmap(TQWidget *parent, const char *name)
m_tileup.load(locate("data", "kdeprint/tileup.png"));
m_tiledown.load(locate("data", "kdeprint/tiledown.png"));
- tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum));
+ setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum));
}
bool SidePixmap::isValid()
@@ -42,7 +42,7 @@ bool SidePixmap::isValid()
&& (m_side.width() == m_tiledown.width()));
}
-TQSize SidePixmap::tqsizeHint() const
+TQSize SidePixmap::sizeHint() const
{
return (TQSize(m_side.width()+lineWidth(), 300+lineWidth()));
}
diff --git a/kdeprint/management/sidepixmap.h b/kdeprint/management/sidepixmap.h
index 93324a251..33db2275c 100644
--- a/kdeprint/management/sidepixmap.h
+++ b/kdeprint/management/sidepixmap.h
@@ -29,7 +29,7 @@ class KDEPRINT_EXPORT SidePixmap : public QFrame
{
public:
SidePixmap(TQWidget *parent = 0, const char *name = 0);
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
bool isValid();
protected:
diff --git a/kdeprint/management/smbview.cpp b/kdeprint/management/smbview.cpp
index 104820193..08f8487f7 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;
QListViewItem *item = new TQListViewItem(this,(*it).left(p).stripWhiteSpace());
--
cgit v1.2.1