From 984c25aa6969e55896e9a13c8e7f7b8a58991a4e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:32:40 -0600 Subject: Rename old tq methods that no longer need a unique name --- tdeprint/management/kmdbcreator.cpp | 2 +- tdeprint/management/kmdriverdb.cpp | 2 +- tdeprint/management/kmdriverdbwidget.cpp | 2 +- tdeprint/management/kmiconview.cpp | 2 +- tdeprint/management/kminfopage.cpp | 2 +- tdeprint/management/kmpropmembers.cpp | 2 +- tdeprint/management/kmwbackend.cpp | 2 +- tdeprint/management/kmwend.cpp | 12 ++++++------ tdeprint/management/kmwfile.cpp | 2 +- tdeprint/management/kmwlpd.cpp | 2 +- tdeprint/management/kmwpassword.cpp | 2 +- tdeprint/management/kmwsocket.cpp | 2 +- tdeprint/management/kmwsocketutil.cpp | 2 +- tdeprint/management/kxmlcommanddlg.cpp | 4 ++-- tdeprint/management/networkscanner.cpp | 2 +- 15 files changed, 21 insertions(+), 21 deletions(-) (limited to 'tdeprint/management') diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp index 1a89d0a8e..3fab5929e 100644 --- a/tdeprint/management/kmdbcreator.cpp +++ b/tdeprint/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())); diff --git a/tdeprint/management/kmdriverdb.cpp b/tdeprint/management/kmdriverdb.cpp index 6fbab45ec..67bd25966 100644 --- a/tdeprint/management/kmdriverdb.cpp +++ b/tdeprint/management/kmdriverdb.cpp @@ -60,7 +60,7 @@ KMDriverDB::~KMDriverDB() TQString KMDriverDB::dbFile() { // this calls insure missing directories creation - TQString filename = locateLocal("data",TQString::tqfromLatin1("tdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem())); + TQString filename = locateLocal("data",TQString::fromLatin1("tdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem())); return filename; } diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp index e9c490206..579cae5df 100644 --- a/tdeprint/management/kmdriverdbwidget.cpp +++ b/tdeprint/management/kmdriverdbwidget.cpp @@ -105,7 +105,7 @@ void KMDriverDbWidget::setDriver(const TQString& manu, const TQString& model) // try by stripping the manufacturer name from // the beginning of the model string. This is // often the case with PPD files - item = m_model->findItem(model_.replace(0,manu.length()+1,TQString::tqfromLatin1(""))); + item = m_model->findItem(model_.replace(0,manu.length()+1,TQString::fromLatin1(""))); if (item) m_model->setCurrentItem(item); } diff --git a/tdeprint/management/kmiconview.cpp b/tdeprint/management/kmiconview.cpp index 905f4d248..a11458730 100644 --- a/tdeprint/management/kmiconview.cpp +++ b/tdeprint/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)) diff --git a/tdeprint/management/kminfopage.cpp b/tdeprint/management/kminfopage.cpp index 2c3e7a2fa..9987ccb4c 100644 --- a/tdeprint/management/kminfopage.cpp +++ b/tdeprint/management/kminfopage.cpp @@ -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)) diff --git a/tdeprint/management/kmpropmembers.cpp b/tdeprint/management/kmpropmembers.cpp index 4efbcf547..26671eed8 100644 --- a/tdeprint/management/kmpropmembers.cpp +++ b/tdeprint/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); TQVBoxLayout *main_ = new TQVBoxLayout(this, 10, 0); diff --git a/tdeprint/management/kmwbackend.cpp b/tdeprint/management/kmwbackend.cpp index e39b52f8d..cd98a8b07 100644 --- a/tdeprint/management/kmwbackend.cpp +++ b/tdeprint/management/kmwbackend.cpp @@ -102,7 +102,7 @@ void KMWBackend::updatePrinter(KMPrinter *p) else p->setType(KMPrinter::Printer); p->setOption("kde-backend",TQString::number(ID)); TQString s = m_buttons->selected()->text(); - s.replace(TQRegExp("&(?=\\w)"), TQString::tqfromLatin1("")); + s.replace(TQRegExp("&(?=\\w)"), TQString::fromLatin1("")); p->setOption("kde-backend-description",s); setNextPage((m_map.contains(ID) ? m_map[ID] : KMWizard::Error)); } diff --git a/tdeprint/management/kmwend.cpp b/tdeprint/management/kmwend.cpp index 54294fb13..2881b4ea0 100644 --- a/tdeprint/management/kmwend.cpp +++ b/tdeprint/management/kmwend.cpp @@ -42,11 +42,11 @@ KMWEnd::KMWEnd(TQWidget *parent, const char *name) void KMWEnd::initPrinter(KMPrinter *p) { TQString txt; - TQString s(TQString::tqfromLatin1("
  • %1: %2
    • ")); + TQString s(TQString::fromLatin1("
  • %1: %2
    • ")); int ID = p->option("kde-backend").toInt(); // general information - txt.append(TQString::tqfromLatin1("%1