diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:57:02 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:57:02 -0600 |
commit | a51cd9949c4e6c726a84a61de3cfadd30cefb5c7 (patch) | |
tree | a65321bcfdb90583bcc7ef3a90fa357f6632e54c /tdeprint | |
parent | 984c25aa6969e55896e9a13c8e7f7b8a58991a4e (diff) | |
download | tdelibs-a51cd9949c4e6c726a84a61de3cfadd30cefb5c7.tar.gz tdelibs-a51cd9949c4e6c726a84a61de3cfadd30cefb5c7.zip |
Remove additional unneeded tq method conversions
Diffstat (limited to 'tdeprint')
-rw-r--r-- | tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp | 4 | ||||
-rw-r--r-- | tdeprint/cups/cupsdconf2/locationdialog.cpp | 2 | ||||
-rw-r--r-- | tdeprint/cups/imagepreview.cpp | 2 | ||||
-rw-r--r-- | tdeprint/cups/kpimagepage.cpp | 2 | ||||
-rw-r--r-- | tdeprint/driver.cpp | 2 | ||||
-rw-r--r-- | tdeprint/driveritem.cpp | 2 | ||||
-rw-r--r-- | tdeprint/kmjobmanager.cpp | 2 | ||||
-rw-r--r-- | tdeprint/kmmanager.cpp | 2 | ||||
-rw-r--r-- | tdeprint/kpgeneralpage.cpp | 6 | ||||
-rw-r--r-- | tdeprint/kpqtpage.cpp | 2 | ||||
-rw-r--r-- | tdeprint/kprintdialog.cpp | 6 | ||||
-rw-r--r-- | tdeprint/lpr/lpchelper.cpp | 8 | ||||
-rw-r--r-- | tdeprint/lpr/lpchelper.h | 4 | ||||
-rw-r--r-- | tdeprint/lpr/printcapreader.cpp | 2 | ||||
-rw-r--r-- | tdeprint/management/kmiconview.cpp | 4 | ||||
-rw-r--r-- | tdeprint/management/kmjobviewer.cpp | 6 | ||||
-rw-r--r-- | tdeprint/management/kmlistview.cpp | 4 | ||||
-rw-r--r-- | tdeprint/management/kmwdriverselect.cpp | 6 | ||||
-rw-r--r-- | tdeprint/management/kmwinfobase.cpp | 12 | ||||
-rw-r--r-- | tdeprint/tests/drawdemo.cpp | 4 |
20 files changed, 41 insertions, 41 deletions
diff --git a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp index 092e1a7e5..d11851c60 100644 --- a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp @@ -127,7 +127,7 @@ void CupsdSecurityPage::slotAdd() { if (KMessageBox::warningContinueCancel(this, i18n("This location is already defined. Do you want to replace the existing one?"),TQString::null,i18n("Replace")) == KMessageBox::Continue) { - index = locs_.tqat(); + index = locs_.at(); locs_.remove(); break; } @@ -149,7 +149,7 @@ void CupsdSecurityPage::slotAdd() void CupsdSecurityPage::slotEdit(int index) { - CupsLocation *loc = locs_.tqat(index); + CupsLocation *loc = locs_.at(index); LocationDialog::editLocation(loc, this, conf_); } diff --git a/tdeprint/cups/cupsdconf2/locationdialog.cpp b/tdeprint/cups/cupsdconf2/locationdialog.cpp index 7e1858cc7..3896f7845 100644 --- a/tdeprint/cups/cupsdconf2/locationdialog.cpp +++ b/tdeprint/cups/cupsdconf2/locationdialog.cpp @@ -128,7 +128,7 @@ void LocationDialog::setInfos(CupsdConf *conf) void LocationDialog::fillLocation(CupsLocation *loc) { - loc->resource_ = conf_->resources_.tqat(resource_->currentItem()); + loc->resource_ = conf_->resources_.at(resource_->currentItem()); loc->resourcename_ = loc->resource_->path_; loc->authtype_ = authtype_->currentItem(); loc->authclass_ = (loc->authtype_ == AUTHTYPE_NONE ? AUTHCLASS_ANONYMOUS : authclass_->currentItem()); diff --git a/tdeprint/cups/imagepreview.cpp b/tdeprint/cups/imagepreview.cpp index 9912c1886..e2401d6d3 100644 --- a/tdeprint/cups/imagepreview.cpp +++ b/tdeprint/cups/imagepreview.cpp @@ -51,7 +51,7 @@ void ImagePreview::setParameters(int brightness, int hue, int saturation, int ga hue_ = hue; saturation_ = saturation; gamma_ = gamma; - tqrepaint(); + repaint(); } void ImagePreview::paintEvent(TQPaintEvent*){ diff --git a/tdeprint/cups/kpimagepage.cpp b/tdeprint/cups/kpimagepage.cpp index 13332dee3..701ffbc4d 100644 --- a/tdeprint/cups/kpimagepage.cpp +++ b/tdeprint/cups/kpimagepage.cpp @@ -192,7 +192,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) TQString whatsThisPreviewPositionImagePage = i18n( " <qt> " " <p><b>Position Preview Thumbnail</b></p> " " <p>This position preview thumbnail indicates the position of the image on the paper sheet. " - " <p>Click on horizontal and vertical radio buttons to move image tqalignment on paper around. Options are: " + " <p>Click on horizontal and vertical radio buttons to move image alignment on paper around. Options are: " " <ul> " " <li> center </li>" " <li> top </li>" diff --git a/tdeprint/driver.cpp b/tdeprint/driver.cpp index 3bcc50066..abc468f7a 100644 --- a/tdeprint/driver.cpp +++ b/tdeprint/driver.cpp @@ -627,7 +627,7 @@ void DrListOption::setChoice(int choicenum) { if (choicenum >= 0 && choicenum < (int)m_choices.count()) { - setValueText(m_choices.tqat(choicenum)->name()); + setValueText(m_choices.at(choicenum)->name()); } } diff --git a/tdeprint/driveritem.cpp b/tdeprint/driveritem.cpp index 500443581..1ce2f5625 100644 --- a/tdeprint/driveritem.cpp +++ b/tdeprint/driveritem.cpp @@ -133,7 +133,7 @@ bool DriverItem::updateConflict() m_conflict = (m_item->conflict()); } } - tqrepaint(); + repaint(); return m_conflict; } diff --git a/tdeprint/kmjobmanager.cpp b/tdeprint/kmjobmanager.cpp index 918c14ff2..30a1fb993 100644 --- a/tdeprint/kmjobmanager.cpp +++ b/tdeprint/kmjobmanager.cpp @@ -53,7 +53,7 @@ void KMJobManager::discardAllJobs() void KMJobManager::removeDiscardedJobs() { for (uint i=0;i<m_jobs.count();i++) - if (m_jobs.tqat(i)->isDiscarded()) + if (m_jobs.at(i)->isDiscarded()) { m_jobs.remove(i); i--; diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp index e995f86af..3316244de 100644 --- a/tdeprint/kmmanager.cpp +++ b/tdeprint/kmmanager.cpp @@ -253,7 +253,7 @@ TQPtrList<KMPrinter>* KMManager::printerList(bool reload) // remove discarded printers for (uint i=0; i<m_printers.count(); i++) { - KMPrinter *prt = m_printers.tqat(i); + KMPrinter *prt = m_printers.at(i); if (prt->isDiscarded()) { m_printers.remove(i); diff --git a/tdeprint/kpgeneralpage.cpp b/tdeprint/kpgeneralpage.cpp index 3b93e59af..ad889a6a9 100644 --- a/tdeprint/kpgeneralpage.cpp +++ b/tdeprint/kpgeneralpage.cpp @@ -622,17 +622,17 @@ void KPGeneralPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef) DrListOption *opt; if ((opt=(DrListOption*)driver()->findOption("PageSize")) != NULL) { - DrBase *ch = opt->choices()->tqat(m_pagesize->currentItem()); + DrBase *ch = opt->choices()->at(m_pagesize->currentItem()); if (incldef || ch->name() != opt->get("default")) opts["PageSize"] = ch->name(); } if ((opt=(DrListOption*)driver()->findOption("MediaType")) != NULL) { - DrBase *ch = opt->choices()->tqat(m_papertype->currentItem()); + DrBase *ch = opt->choices()->at(m_papertype->currentItem()); if (incldef || ch->name() != opt->get("default")) opts["MediaType"] = ch->name(); } if ((opt=(DrListOption*)driver()->findOption("InputSlot")) != NULL) { - DrBase *ch = opt->choices()->tqat(m_inputslot->currentItem()); + DrBase *ch = opt->choices()->at(m_inputslot->currentItem()); if (incldef || ch->name() != opt->get("default")) opts["InputSlot"] = ch->name(); } diff --git a/tdeprint/kpqtpage.cpp b/tdeprint/kpqtpage.cpp index 4049ab4f8..5b91e4fb5 100644 --- a/tdeprint/kpqtpage.cpp +++ b/tdeprint/kpqtpage.cpp @@ -305,7 +305,7 @@ void KPQtPage::getOptions(TQMap<TQString,TQString>& opts, bool incldef) DrListOption *opt = static_cast<DrListOption*>(driver()->findOption("PageSize")); if (opt) { - DrBase *ch = opt->choices()->tqat(m_pagesize->currentItem()); + DrBase *ch = opt->choices()->at(m_pagesize->currentItem()); if (ch && (incldef || ch->name() != opt->get("default"))) { opts["PageSize"] = ch->name(); diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp index 358ee70cd..50595e443 100644 --- a/tdeprint/kprintdialog.cpp +++ b/tdeprint/kprintdialog.cpp @@ -824,7 +824,7 @@ void KPrintDialog::reload() // remove printer dependent pages (usually from plugin) TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING))); for (uint i=0; i<d->m_pages.count(); i++) - if (d->m_pages.tqat(i)->onlyRealPrinters()) + if (d->m_pages.at(i)->onlyRealPrinters()) { KPrintDialogPage *page = d->m_pages.take(i--); if (tabs) @@ -952,10 +952,10 @@ void KPrintDialog::enableDialogPage( int index, bool flag ) if ( d->m_pages.count() > 1 ) { TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING))); - tabs->setTabEnabled( d->m_pages.tqat( index ), flag ); + tabs->setTabEnabled( d->m_pages.at( index ), flag ); } else - d->m_pages.tqat( 0 )->setEnabled( flag ); + d->m_pages.at( 0 )->setEnabled( flag ); } void KPrintDialog::slotOpenFileDialog() diff --git a/tdeprint/lpr/lpchelper.cpp b/tdeprint/lpr/lpchelper.cpp index c921a803c..05d09c40a 100644 --- a/tdeprint/lpr/lpchelper.cpp +++ b/tdeprint/lpr/lpchelper.cpp @@ -72,7 +72,7 @@ KMPrinter::PrinterState LpcHelper::state(KMPrinter *prt) const return state(prt->printerName()); } -void LpcHelper::parseStatusLPR(TQTextStream &t) +void LpcHelper::parsetStatusLPR(TQTextStream &t) { TQString printer, line; int p(-1); @@ -107,7 +107,7 @@ void LpcHelper::parseStatusLPR(TQTextStream &t) } } -void LpcHelper::parseStatusLPRng(TQTextStream& t) +void LpcHelper::parsetStatusLPRng(TQTextStream& t) { TQStringList l; int p(-1); @@ -152,10 +152,10 @@ void LpcHelper::updateStates() { default: case LprSettings::LPR: - parseStatusLPR(t); + parsetStatusLPR(t); break; case LprSettings::LPRng: - parseStatusLPRng(t); + parsetStatusLPRng(t); break; } proc.close(); diff --git a/tdeprint/lpr/lpchelper.h b/tdeprint/lpr/lpchelper.h index b1e20f089..24aec6bda 100644 --- a/tdeprint/lpr/lpchelper.h +++ b/tdeprint/lpr/lpchelper.h @@ -46,8 +46,8 @@ public: protected: bool changeState(const TQString&, const TQString&, TQString&); - void parseStatusLPR(TQTextStream&); - void parseStatusLPRng(TQTextStream&); + void parsetStatusLPR(TQTextStream&); + void parsetStatusLPRng(TQTextStream&); int parseStateChangeLPR(const TQString&, const TQString&); int parseStateChangeLPRng(const TQString&, const TQString&); diff --git a/tdeprint/lpr/printcapreader.cpp b/tdeprint/lpr/printcapreader.cpp index 00016c14f..718ffca21 100644 --- a/tdeprint/lpr/printcapreader.cpp +++ b/tdeprint/lpr/printcapreader.cpp @@ -56,7 +56,7 @@ void PrintcapReader::unputLine(const TQString& s) PrintcapEntry* PrintcapReader::nextEntry() { - if (!m_stream.tqdevice()) + if (!m_stream.device()) return NULL; TQString line, comment, name, fields, buf; diff --git a/tdeprint/management/kmiconview.cpp b/tdeprint/management/kmiconview.cpp index a11458730..0978c0782 100644 --- a/tdeprint/management/kmiconview.cpp +++ b/tdeprint/management/kmiconview.cpp @@ -114,7 +114,7 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode) setPixmap(SmallIcon(m_pixmap, 0, iconstate)); } //if (update) - // tqrepaint(); + // repaint(); setDiscarded(false); } @@ -180,7 +180,7 @@ void KMIconView::setPrinterList(TQPtrList<KMPrinter> *list) } for (uint i=0; i<m_items.count(); i++) - if (m_items.tqat(i)->isDiscarded()) + if (m_items.at(i)->isDiscarded()) { delete m_items.take(i); i--; diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp index 9fca665a7..19c46224f 100644 --- a/tdeprint/management/kmjobviewer.cpp +++ b/tdeprint/management/kmjobviewer.cpp @@ -398,7 +398,7 @@ void KMJobViewer::updateJobs() } for (uint i=0; i<m_items.count(); i++) - if (m_items.tqat(i)->isDiscarded()) + if (m_items.at(i)->isDiscarded()) { delete m_items.take(i); i--; @@ -510,7 +510,7 @@ void KMJobViewer::slotMove(int prID) { if (prID >= 0 && prID < (int)(m_printers.count())) { - KMPrinter *p = m_printers.tqat(prID); + KMPrinter *p = m_printers.at(prID); send(KMJob::Move,i18n("Move to %1").arg(p->printerName()),p->printerName()); } } @@ -540,7 +540,7 @@ void KMJobViewer::slotPrinterSelected(int prID) { if (prID >= 0 && prID < (int)(m_printers.count()+1)) { - TQString prname = (prID == 0 ? i18n("All Printers") : m_printers.tqat(prID-1)->printerName()); + TQString prname = (prID == 0 ? i18n("All Printers") : m_printers.at(prID-1)->printerName()); emit printerChanged(this, prname); } } diff --git a/tdeprint/management/kmlistview.cpp b/tdeprint/management/kmlistview.cpp index 4332a8678..4bddf9203 100644 --- a/tdeprint/management/kmlistview.cpp +++ b/tdeprint/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) @@ -216,7 +216,7 @@ void KMListView::setPrinterList(TQPtrList<KMPrinter> *list) TQPtrList<KMListViewItem> deleteList; deleteList.setAutoDelete(true); for (uint i=0; i<m_items.count(); i++) - if (m_items.tqat(i)->isDiscarded()) + if (m_items.at(i)->isDiscarded()) { // instance items are put in front of the list // so that they are destroyed first diff --git a/tdeprint/management/kmwdriverselect.cpp b/tdeprint/management/kmwdriverselect.cpp index e3d253660..88b9410d5 100644 --- a/tdeprint/management/kmwdriverselect.cpp +++ b/tdeprint/management/kmwdriverselect.cpp @@ -93,7 +93,7 @@ void KMWDriverSelect::updatePrinter(KMPrinter *p) int index = m_list->currentItem(); if (m_entries && index >= 0 && index < (int)(m_entries->count())) { - KMDBEntry *entry = m_entries->tqat(index); + KMDBEntry *entry = m_entries->at(index); p->setDbEntry(entry); p->setDriverInfo(entry->description); } @@ -107,8 +107,8 @@ void KMWDriverSelect::updatePrinter(KMPrinter *p) void KMWDriverSelect::slotDriverComment() { int index = m_list->currentItem(); - if (m_entries && index >=0 && index < (int)(m_entries->count()) && !m_entries->tqat(index)->drivercomment.isEmpty()) - KMessageBox::information(this, m_entries->tqat(index)->drivercomment, TQString::null, TQString::null, KMessageBox::AllowLink); + if (m_entries && index >=0 && index < (int)(m_entries->count()) && !m_entries->at(index)->drivercomment.isEmpty()) + KMessageBox::information(this, m_entries->at(index)->drivercomment, TQString::null, TQString::null, KMessageBox::AllowLink); else KMessageBox::error(this, i18n("No information about the selected driver.")); } diff --git a/tdeprint/management/kmwinfobase.cpp b/tdeprint/management/kmwinfobase.cpp index 993576334..218d077ee 100644 --- a/tdeprint/management/kmwinfobase.cpp +++ b/tdeprint/management/kmwinfobase.cpp @@ -56,19 +56,19 @@ void KMWInfoBase::setInfo(const TQString& s) void KMWInfoBase::setLabel(int i, const TQString& s) { if (i >= 0 && i < m_nlines) - m_labels.tqat(i)->setText(s); + m_labels.at(i)->setText(s); } void KMWInfoBase::setText(int i, const TQString& s) { if (i >= 0 && i < m_nlines) - m_edits.tqat(i)->setText(s); + m_edits.at(i)->setText(s); } TQString KMWInfoBase::text(int i) { if (i >= 0 && i < m_nlines) - return m_edits.tqat(i)->text(); + return m_edits.at(i)->text(); return TQString::null; } @@ -76,15 +76,15 @@ void KMWInfoBase::setCurrent(int i) { if (i >= 0 && i < m_nlines) { - m_edits.tqat(i)->selectAll(); - m_edits.tqat(i)->setFocus(); + m_edits.at(i)->selectAll(); + m_edits.at(i)->setFocus(); } } TQLineEdit* KMWInfoBase::lineEdit( int i ) { if ( i >= 0 && i < m_nlines ) - return m_edits.tqat( i ); + return m_edits.at( i ); else return NULL; } diff --git a/tdeprint/tests/drawdemo.cpp b/tdeprint/tests/drawdemo.cpp index 20fc3d12e..443cc89e8 100644 --- a/tdeprint/tests/drawdemo.cpp +++ b/tdeprint/tests/drawdemo.cpp @@ -78,7 +78,7 @@ void drawFonts( TQPainter *p ) // -// This function draws some tqshapes +// This function draws some shapes // void drawShapes( TQPainter *p ) @@ -115,7 +115,7 @@ struct DrawThing { DrawThing ourDrawFunctions[] = { { drawColorWheel, "Draw color wheel" }, { drawFonts, "Draw fonts" }, - { drawShapes, "Draw tqshapes" }, + { drawShapes, "Draw shapes" }, { 0, 0 } }; |