From feaf6d62da1685a34fbc8c201f31da681f04e2a7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: [PATCH] Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/tellico@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/borrowerdialog.cpp | 16 +++++------ src/borroweritem.cpp | 4 +-- src/collection.cpp | 8 +++--- src/collection.h | 2 +- src/collectionfieldsdialog.cpp | 4 +-- src/configdialog.cpp | 12 ++++---- src/controller.cpp | 4 +-- src/core/drophandler.cpp | 2 +- src/detailedentryitem.cpp | 4 +-- src/detailedlistview.cpp | 4 +-- src/entry.cpp | 10 +++---- src/entry.h | 2 +- src/entryeditdialog.cpp | 16 +++++------ src/entrygroupitem.cpp | 4 +-- src/entryiconview.cpp | 14 ++++----- src/entryitem.cpp | 4 +-- src/entryitem.h | 2 +- src/entrymerger.cpp | 4 +-- src/entryupdater.cpp | 8 +++--- src/entryview.cpp | 4 +-- src/exportdialog.cpp | 4 +-- src/fetch/amazonfetcher.cpp | 16 +++++------ src/fetch/amazonfetcher.h | 2 +- src/fetch/animenfofetcher.cpp | 12 ++++---- src/fetch/animenfofetcher.h | 2 +- src/fetch/arxivfetcher.cpp | 12 ++++---- src/fetch/arxivfetcher.h | 2 +- src/fetch/bibsonomyfetcher.cpp | 12 ++++---- src/fetch/bibsonomyfetcher.h | 2 +- src/fetch/citebasefetcher.cpp | 12 ++++---- src/fetch/citebasefetcher.h | 2 +- src/fetch/configwidget.cpp | 2 +- src/fetch/crossreffetcher.cpp | 12 ++++---- src/fetch/crossreffetcher.h | 2 +- src/fetch/discogsfetcher.cpp | 12 ++++---- src/fetch/discogsfetcher.h | 2 +- src/fetch/entrezfetcher.cpp | 10 +++---- src/fetch/entrezfetcher.h | 2 +- src/fetch/execexternalfetcher.cpp | 10 +++---- src/fetch/fetchmanager.cpp | 36 +++++++++++------------ src/fetch/gcstarpluginfetcher.cpp | 10 +++---- src/fetch/googlescholarfetcher.cpp | 12 ++++---- src/fetch/googlescholarfetcher.h | 2 +- src/fetch/ibsfetcher.cpp | 12 ++++---- src/fetch/ibsfetcher.h | 2 +- src/fetch/imdbfetcher.cpp | 30 +++++++++---------- src/fetch/imdbfetcher.h | 2 +- src/fetch/isbndbfetcher.cpp | 12 ++++---- src/fetch/isbndbfetcher.h | 2 +- src/fetch/srufetcher.cpp | 18 ++++++------ src/fetch/srufetcher.h | 2 +- src/fetch/yahoofetcher.cpp | 12 ++++---- src/fetch/yahoofetcher.h | 2 +- src/fetch/z3950fetcher.cpp | 12 ++++---- src/fetchdialog.cpp | 6 ++-- src/fetcherconfigdialog.cpp | 8 +++--- src/filterdialog.cpp | 16 +++++------ src/filteritem.cpp | 4 +-- src/filterview.cpp | 2 +- src/groupview.cpp | 4 +-- src/gui/boolfieldwidget.cpp | 4 +-- src/gui/choicefieldwidget.cpp | 4 +-- src/gui/collectiontypecombo.cpp | 2 +- src/gui/combobox.cpp | 2 +- src/gui/combobox.h | 2 +- src/gui/datefieldwidget.cpp | 4 +-- src/gui/datewidget.cpp | 2 +- src/gui/fieldwidget.cpp | 26 ++++++++--------- src/gui/imagefieldwidget.cpp | 4 +-- src/gui/imagewidget.cpp | 2 +- src/gui/lineedit.cpp | 2 +- src/gui/linefieldwidget.cpp | 4 +-- src/gui/listview.cpp | 2 +- src/gui/numberfieldwidget.cpp | 4 +-- src/gui/overlaywidget.cpp | 6 ++-- src/gui/parafieldwidget.cpp | 4 +-- src/gui/previewdialog.cpp | 4 +-- src/gui/progress.cpp | 4 +-- src/gui/ratingfieldwidget.cpp | 4 +-- src/gui/ratingwidget.cpp | 4 +-- src/gui/stringmapdialog.cpp | 4 +-- src/gui/tabcontrol.cpp | 4 +-- src/gui/tablefieldwidget.cpp | 4 +-- src/gui/urlfieldwidget.cpp | 4 +-- src/importdialog.cpp | 8 +++--- src/isbnvalidator.cpp | 4 +-- src/lccnvalidator.cpp | 2 +- src/loandialog.cpp | 8 +++--- src/loanitem.cpp | 4 +-- src/loanview.cpp | 2 +- src/mainwindow.cpp | 4 +-- src/newstuff/dialog.cpp | 4 +-- src/newstuff/manager.cpp | 2 +- src/newstuff/newscript.cpp | 6 ++-- src/newstuff/newscript.h | 2 +- src/newstuff/providerloader.cpp | 4 +-- src/newstuff/providerloader.h | 4 +-- src/reportdialog.cpp | 4 +-- src/statusbar.cpp | 2 +- src/translators/alexandriaimporter.cpp | 4 +-- src/translators/amcimporter.cpp | 4 +-- src/translators/audiofileimporter.cpp | 4 +-- src/translators/bibtexexporter.cpp | 6 ++-- src/translators/bibteximporter.cpp | 4 +-- src/translators/bibtexmlexporter.cpp | 10 +++---- src/translators/btparse/btparse.h | 2 +- src/translators/btparse/input.c | 4 +-- src/translators/btparse/lex_auxiliary.c | 16 +++++------ src/translators/csvexporter.cpp | 6 ++-- src/translators/csvimporter.cpp | 6 ++-- src/translators/filelistingimporter.cpp | 4 +-- src/translators/freedbimporter.cpp | 4 +-- src/translators/griffith2tellico.py | 6 ++-- src/translators/htmlexporter.cpp | 6 ++-- src/translators/onixexporter.cpp | 6 ++-- src/translators/pilotdbexporter.cpp | 6 ++-- src/translators/tellicoimporter.cpp | 2 +- src/translators/tellicoxmlexporter.cpp | 38 ++++++++++++------------- src/translators/xsltexporter.cpp | 6 ++-- src/translators/xsltimporter.cpp | 4 +-- src/upcvalidator.cpp | 4 +-- src/viewstack.cpp | 2 +- 122 files changed, 392 insertions(+), 392 deletions(-) diff --git a/src/borrowerdialog.cpp b/src/borrowerdialog.cpp index d7a8b22..9969be4 100644 --- a/src/borrowerdialog.cpp +++ b/src/borrowerdialog.cpp @@ -25,21 +25,21 @@ using Tellico::BorrowerDialog; -BorrowerDialog::Item::Item(KListView* tqparent_, const KABC::Addressee& add_) - : KListViewItem(tqparent_), m_uid(add_.uid()) { +BorrowerDialog::Item::Item(KListView* parent_, const KABC::Addressee& add_) + : KListViewItem(parent_), m_uid(add_.uid()) { setText(0, add_.realName()); setPixmap(0, SmallIcon(TQString::tqfromLatin1("kaddressbook"))); } -BorrowerDialog::Item::Item(KListView* tqparent_, const Data::Borrower& bor_) - : KListViewItem(tqparent_), m_uid(bor_.uid()) { +BorrowerDialog::Item::Item(KListView* parent_, const Data::Borrower& bor_) + : KListViewItem(parent_), m_uid(bor_.uid()) { setText(0, bor_.name()); setPixmap(0, SmallIcon(TQString::tqfromLatin1("tellico"))); } // default button is going to be used as a print button, so it's separated -BorrowerDialog::BorrowerDialog(TQWidget* tqparent_, const char* name_/*=0*/) - : KDialogBase(tqparent_, name_, true, i18n("Select Borrower"), Ok|Cancel) { +BorrowerDialog::BorrowerDialog(TQWidget* parent_, const char* name_/*=0*/) + : KDialogBase(parent_, name_, true, i18n("Select Borrower"), Ok|Cancel) { TQWidget* mainWidget = new TQWidget(this, "BorrowerDialog mainWidget"); setMainWidget(mainWidget); TQVBoxLayout* topLayout = new TQVBoxLayout(mainWidget, 0, KDialog::spacingHint()); @@ -124,8 +124,8 @@ Tellico::Data::BorrowerPtr BorrowerDialog::borrower() { } // static -Tellico::Data::BorrowerPtr BorrowerDialog::getBorrower(TQWidget* tqparent_) { - BorrowerDialog dlg(tqparent_); +Tellico::Data::BorrowerPtr BorrowerDialog::getBorrower(TQWidget* parent_) { + BorrowerDialog dlg(parent_); if(dlg.exec() == TQDialog::Accepted) { return dlg.borrower(); diff --git a/src/borroweritem.cpp b/src/borroweritem.cpp index 9b920e8..13d82ca 100644 --- a/src/borroweritem.cpp +++ b/src/borroweritem.cpp @@ -19,8 +19,8 @@ using Tellico::BorrowerItem; -BorrowerItem::BorrowerItem(GUI::ListView* tqparent_, Data::BorrowerPtr borrower_) - : GUI::CountedItem(tqparent_), m_borrower(borrower_) { +BorrowerItem::BorrowerItem(GUI::ListView* parent_, Data::BorrowerPtr borrower_) + : GUI::CountedItem(parent_), m_borrower(borrower_) { setText(0, borrower_->name()); setPixmap(0, SmallIcon(TQString::tqfromLatin1("kaddressbook"))); } diff --git a/src/collection.cpp b/src/collection.cpp index 0e4b06b..2e194ea 100644 --- a/src/collection.cpp +++ b/src/collection.cpp @@ -262,7 +262,7 @@ bool Collection::modifyField(FieldPtr newField_) { if(oldField->formatFlag() != newField_->formatFlag()) { // tqinvalidate cached format strings of all entry attributes of this name for(EntryVecIt it = m_entries.begin(); it != m_entries.end(); ++it) { - it->tqinvalidateFormattedFieldValue(fieldName); + it->invalidateFormattedFieldValue(fieldName); } resetGroups = true; } @@ -325,7 +325,7 @@ bool Collection::modifyField(FieldPtr newField_) { if(resetGroups) { myLog() << "Collection::modifyField() - invalidating groups" << endl; - tqinvalidateGroups(); + invalidateGroups(); } // now to update all entries if the field is a dependent and the description changed @@ -681,7 +681,7 @@ TQStringList Collection::entryGroupNamesByField(EntryPtr entry_, const TQString& return values.toList(); } -void Collection::tqinvalidateGroups() { +void Collection::invalidateGroups() { TQDictIterator dictIt(m_entryGroupDicts); for( ; dictIt.current(); ++dictIt) { dictIt.current()->clear(); @@ -690,7 +690,7 @@ void Collection::tqinvalidateGroups() { // populateDicts() will make signals that the group view is connected to, block those blockSignals(true); for(EntryVecIt it = m_entries.begin(); it != m_entries.end(); ++it) { - it->tqinvalidateFormattedFieldValue(); + it->invalidateFormattedFieldValue(); it->clearGroups(); } blockSignals(false); diff --git a/src/collection.h b/src/collection.h index db7acca..c76b1f8 100644 --- a/src/collection.h +++ b/src/collection.h @@ -298,7 +298,7 @@ public: /** * Invalidates all group names in the collection. */ - void tqinvalidateGroups(); + void invalidateGroups(); /** * Returns true if the collection contains at least one Image field. * diff --git a/src/collectionfieldsdialog.cpp b/src/collectionfieldsdialog.cpp index 1a5e408..ab68873 100644 --- a/src/collectionfieldsdialog.cpp +++ b/src/collectionfieldsdialog.cpp @@ -52,8 +52,8 @@ FieldListBox::FieldListBox(TQListBox* listbox_, Data::FieldPtr field_, TQListBox : GUI::ListBoxText(listbox_, field_->title(), after_), m_field(field_) { } -CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* tqparent_, const char* name_/*=0*/) - : KDialogBase(tqparent_, name_, false, i18n("Collection Fields"), Help|Default|Ok|Apply|Cancel, Ok, false), +CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* parent_, const char* name_/*=0*/) + : KDialogBase(parent_, name_, false, i18n("Collection Fields"), Help|Default|Ok|Apply|Cancel, Ok, false), m_coll(coll_), m_defaultCollection(0), m_currentField(0), diff --git a/src/configdialog.cpp b/src/configdialog.cpp index 62b9945..edf0b6d 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -71,9 +71,9 @@ namespace { using Tellico::SourceListViewItem; using Tellico::ConfigDialog; -SourceListViewItem::SourceListViewItem(KListView* tqparent_, const GeneralFetcherInfo& info_, +SourceListViewItem::SourceListViewItem(KListView* parent_, const GeneralFetcherInfo& info_, const TQString& groupName_) - : KListViewItem(tqparent_, info_.name), m_info(info_), + : KListViewItem(parent_, info_.name), m_info(info_), m_configGroup(groupName_), m_newSource(groupName_.isNull()), m_fetcher(0) { TQPixmap pix = Fetch::Manager::fetcherIcon(info_.type); if(!pix.isNull()) { @@ -81,9 +81,9 @@ SourceListViewItem::SourceListViewItem(KListView* tqparent_, const GeneralFetche } } -SourceListViewItem::SourceListViewItem(KListView* tqparent_, TQListViewItem* after_, +SourceListViewItem::SourceListViewItem(KListView* parent_, TQListViewItem* after_, const GeneralFetcherInfo& info_, const TQString& groupName_) - : KListViewItem(tqparent_, after_, info_.name), m_info(info_), + : KListViewItem(parent_, after_, info_.name), m_info(info_), m_configGroup(groupName_), m_newSource(groupName_.isNull()), m_fetcher(0) { TQPixmap pix = Fetch::Manager::fetcherIcon(info_.type); if(!pix.isNull()) { @@ -99,9 +99,9 @@ void SourceListViewItem::setFetcher(Fetch::Fetcher::Ptr fetcher) { } } -ConfigDialog::ConfigDialog(TQWidget* tqparent_, const char* name_/*=0*/) +ConfigDialog::ConfigDialog(TQWidget* parent_, const char* name_/*=0*/) : KDialogBase(IconList, i18n("Configure Tellico"), Help|Ok|Apply|Cancel|Default, - Ok, tqparent_, name_, true, false) + Ok, parent_, name_, true, false) , m_modifying(false) , m_okClicked(false) { setupGeneralPage(); diff --git a/src/controller.cpp b/src/controller.cpp index 770ef79..1713047 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -50,8 +50,8 @@ using Tellico::Controller; Controller* Controller::s_self = 0; -Controller::Controller(MainWindow* tqparent_, const char* name_) - : TQObject(tqparent_, name_), m_mainWindow(tqparent_), m_working (false), m_widgetWithSelection(0) { +Controller::Controller(MainWindow* parent_, const char* name_) + : TQObject(parent_, name_), m_mainWindow(parent_), m_working (false), m_widgetWithSelection(0) { } void Controller::addObserver(Observer* obs) { diff --git a/src/core/drophandler.cpp b/src/core/drophandler.cpp index 6deb2e1..0535e61 100644 --- a/src/core/drophandler.cpp +++ b/src/core/drophandler.cpp @@ -21,7 +21,7 @@ using Tellico::DropHandler; -DropHandler::DropHandler(TQObject* tqparent_) : TQObject(tqparent_) { +DropHandler::DropHandler(TQObject* parent_) : TQObject(parent_) { } DropHandler::~DropHandler() { diff --git a/src/detailedentryitem.cpp b/src/detailedentryitem.cpp index 4904e19..51455a1 100644 --- a/src/detailedentryitem.cpp +++ b/src/detailedentryitem.cpp @@ -32,8 +32,8 @@ namespace { using Tellico::DetailedEntryItem; -DetailedEntryItem::DetailedEntryItem(DetailedListView* tqparent_, Data::EntryPtr entry_) - : EntryItem(tqparent_, entry_), m_state(Normal), m_time(0), m_timer(0) { +DetailedEntryItem::DetailedEntryItem(DetailedListView* parent_, Data::EntryPtr entry_) + : EntryItem(parent_, entry_), m_state(Normal), m_time(0), m_timer(0) { } DetailedEntryItem::~DetailedEntryItem() { diff --git a/src/detailedlistview.cpp b/src/detailedlistview.cpp index 3256bcb..8590126 100644 --- a/src/detailedlistview.cpp +++ b/src/detailedlistview.cpp @@ -41,8 +41,8 @@ namespace { using Tellico::DetailedListView; -DetailedListView::DetailedListView(TQWidget* tqparent_, const char* name_/*=0*/) - : GUI::ListView(tqparent_, name_), m_filter(0), +DetailedListView::DetailedListView(TQWidget* parent_, const char* name_/*=0*/) + : GUI::ListView(parent_, name_), m_filter(0), m_prevSortColumn(-1), m_prev2SortColumn(-1), m_firstSection(-1), m_pixWidth(50), m_pixHeight(50) { // myDebug() << "DetailedListView()" << endl; diff --git a/src/entry.cpp b/src/entry.cpp index db16e0a..c733608 100644 --- a/src/entry.cpp +++ b/src/entry.cpp @@ -228,7 +228,7 @@ bool Entry::setField(const TQString& name_, const TQString& value_) { if(!m_fields.isEmpty() && m_fields.tqcontains(name_)) { m_fields.remove(name_); } - tqinvalidateFormattedFieldValue(name_); + invalidateFormattedFieldValue(name_); return true; } @@ -259,7 +259,7 @@ bool Entry::setField(const TQString& name_, const TQString& value_) { } else { m_fields.insert(Tellico::shareString(name_), value_); } - tqinvalidateFormattedFieldValue(name_); + invalidateFormattedFieldValue(name_); return true; } @@ -333,7 +333,7 @@ bool Entry::isOwned() { } // a null string means tqinvalidate all -void Entry::tqinvalidateFormattedFieldValue(const TQString& name_) { +void Entry::invalidateFormattedFieldValue(const TQString& name_) { if(name_.isNull()) { m_formattedFields.clear(); } else if(!m_formattedFields.isEmpty() && m_formattedFields.tqcontains(name_)) { @@ -436,12 +436,12 @@ int Entry::compareValues(EntryPtr e1, EntryPtr e2, FieldPtr f) { // myDebug() << "match without articles" << endl; return 3; } - // try removing everything between tqparentheses + // try removing everything between parentheses TQRegExp rx(TQString::tqfromLatin1("\\s*\\(.*\\)\\s*")); s1.remove(rx); s2.remove(rx); if(!s1.isEmpty() && s1 == s2) { -// myDebug() << "match without tqparentheses" << endl; +// myDebug() << "match without parentheses" << endl; return 2; } if(f->flags() & Field::AllowMultiple) { diff --git a/src/entry.h b/src/entry.h index c589411..295a6d5 100644 --- a/src/entry.h +++ b/src/entry.h @@ -213,7 +213,7 @@ public: * * @param name The name of the field that changed. TQString() means tqinvalidate all fields. */ - void tqinvalidateFormattedFieldValue(const TQString& name=TQString()); + void invalidateFormattedFieldValue(const TQString& name=TQString()); static int compareValues(EntryPtr entry1, EntryPtr entry2, FieldPtr field); static int compareValues(EntryPtr entry1, EntryPtr entry2, const TQString& field, ConstCollPtr coll); diff --git a/src/entryeditdialog.cpp b/src/entryeditdialog.cpp index bccfef7..442fba3 100644 --- a/src/entryeditdialog.cpp +++ b/src/entryeditdialog.cpp @@ -47,8 +47,8 @@ namespace { using Tellico::EntryEditDialog; -EntryEditDialog::EntryEditDialog(TQWidget* tqparent_, const char* name_) - : KDialogBase(tqparent_, name_, false, i18n("Edit Entry"), Help|User1|User2|User3|Apply|Close, User1, false, +EntryEditDialog::EntryEditDialog(TQWidget* parent_, const char* name_) + : KDialogBase(parent_, name_, false, i18n("Edit Entry"), Help|User1|User2|User3|Apply|Close, User1, false, KGuiItem(i18n("&New Entry"))), m_currColl(0), m_tabs(new GUI::TabControl(this)), @@ -250,8 +250,8 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) { // I don't want anything to be hidden, Keramik has a bug if I don't do this it.current()->setMinimumHeight(it.current()->tqsizeHint().height()); // the tqparent of the grid is the page that got added to the tabs - it.current()->tqparentWidget()->tqlayout()->tqinvalidate(); - it.current()->tqparentWidget()->setMinimumHeight(it.current()->tqparentWidget()->tqsizeHint().height()); + it.current()->parentWidget()->tqlayout()->tqinvalidate(); + it.current()->parentWidget()->setMinimumHeight(it.current()->parentWidget()->tqsizeHint().height()); } setUpdatesEnabled(true); @@ -561,12 +561,12 @@ void EntryEditDialog::removeField(Data::CollPtr, Data::FieldPtr field_) { if(m_currColl->fieldCategories().tqfindIndex(field_->category()) == -1) { // myDebug() << "last field in the category" << endl; // fragile, widget's tqparent is the grid, whose tqparent is the tab page - TQWidget* w = widget->tqparentWidget()->tqparentWidget(); + TQWidget* w = widget->parentWidget()->parentWidget(); m_tabs->removePage(w); delete w; // automatically deletes child widget } else { // much of this replicates code in setLayout() - TQGridLayout* tqlayout = static_cast(widget->tqparentWidget()->tqlayout()); + TQGridLayout* tqlayout = static_cast(widget->parentWidget()->tqlayout()); delete widget; // automatically removes from tqlayout TQValueVector expands(NCOLS, false); @@ -705,7 +705,7 @@ void EntryEditDialog::modifyField(Data::CollPtr coll_, Data::FieldPtr oldField_, // need to update label widths if(newField_->title() != oldField_->title()) { int maxWidth = 0; - TQObjectList* childList = widget->tqparentWidget()->queryList("Tellico::GUI::FieldWidget", 0, false, false); + TQObjectList* childList = widget->parentWidget()->queryList("Tellico::GUI::FieldWidget", 0, false, false); TQObjectListIt it(*childList); for(it.toFirst(); it.current(); ++it) { maxWidth = TQMAX(maxWidth, static_cast(TQT_TQWIDGET(it.current()))->labelWidth()); @@ -719,7 +719,7 @@ void EntryEditDialog::modifyField(Data::CollPtr coll_, Data::FieldPtr oldField_, // field widgets's tqparent is the grid, whose tqparent is the tab page // this is for singleCategory fields if(newField_->category() != oldField_->category()) { - m_tabs->setTabLabel(widget->tqparentWidget()->tqparentWidget(), newField_->category()); + m_tabs->setTabLabel(widget->parentWidget()->parentWidget(), newField_->category()); } } } diff --git a/src/entrygroupitem.cpp b/src/entrygroupitem.cpp index 14b1573..c6a36ab 100644 --- a/src/entrygroupitem.cpp +++ b/src/entrygroupitem.cpp @@ -27,8 +27,8 @@ using Tellico::EntryGroupItem; -EntryGroupItem::EntryGroupItem(GUI::ListView* tqparent_, Data::EntryGroup* group_, int fieldType_) - : GUI::CountedItem(tqparent_), m_group(group_), m_fieldType(fieldType_) { +EntryGroupItem::EntryGroupItem(GUI::ListView* parent_, Data::EntryGroup* group_, int fieldType_) + : GUI::CountedItem(parent_), m_group(group_), m_fieldType(fieldType_) { setText(0, group_->groupName()); m_emptyGroup = group_->groupName() == i18n(Data::Collection::s_emptyGroupTitle); } diff --git a/src/entryiconview.cpp b/src/entryiconview.cpp index 08fcc19..68931db 100644 --- a/src/entryiconview.cpp +++ b/src/entryiconview.cpp @@ -42,8 +42,8 @@ namespace { using Tellico::EntryIconView; using Tellico::EntryIconViewItem; -EntryIconView::EntryIconView(TQWidget* tqparent_, const char* name_/*=0*/) - : KIconView(tqparent_, name_), m_coll(0), m_maxAllowedIconWidth(MAX_ENTRY_ICON_SIZE), +EntryIconView::EntryIconView(TQWidget* parent_, const char* name_/*=0*/) + : KIconView(parent_, name_), m_coll(0), m_maxAllowedIconWidth(MAX_ENTRY_ICON_SIZE), m_maxIconWidth(MIN_ENTRY_ICON_SIZE), m_maxIconHeight(MIN_ENTRY_ICON_SIZE), m_comparison(0) { setAutoArrange(true); @@ -310,14 +310,14 @@ int EntryIconView::compare(const EntryIconViewItem* item1, EntryIconViewItem* it /* *********************************************************** */ -EntryIconViewItem::EntryIconViewItem(EntryIconView* tqparent_, Data::EntryPtr entry_) - : KIconViewItem(tqparent_, entry_->title()), m_entry(entry_), m_usesImage(false) { +EntryIconViewItem::EntryIconViewItem(EntryIconView* parent_, Data::EntryPtr entry_) + : KIconViewItem(parent_, entry_->title()), m_entry(entry_), m_usesImage(false) { setDragEnabled(false); - const TQString& imageField = tqparent_->imageField(); + const TQString& imageField = parent_->imageField(); if(!imageField.isEmpty()) { TQPixmap p = ImageFactory::pixmap(m_entry->field(imageField), - tqparent_->maxAllowedIconWidth(), - tqparent_->maxAllowedIconWidth()); + parent_->maxAllowedIconWidth(), + parent_->maxAllowedIconWidth()); if(!p.isNull()) { setPixmap(p); m_usesImage = true; diff --git a/src/entryitem.cpp b/src/entryitem.cpp index b2f4f14..2a1a3bf 100644 --- a/src/entryitem.cpp +++ b/src/entryitem.cpp @@ -25,8 +25,8 @@ EntryItem::EntryItem(GUI::ListView* tqparent, Data::EntryPtr entry) : GUI::ListViewItem(tqparent), m_entry(entry), m_isDetailedList(true) { } -EntryItem::EntryItem(GUI::CountedItem* tqparent_, Data::EntryPtr entry_) - : GUI::ListViewItem(tqparent_), m_entry(entry_), m_isDetailedList(false) { +EntryItem::EntryItem(GUI::CountedItem* parent_, Data::EntryPtr entry_) + : GUI::ListViewItem(parent_), m_entry(entry_), m_isDetailedList(false) { setText(0, m_entry->title()); setPixmap(0, UserIcon(entry_->collection()->typeName())); } diff --git a/src/entryitem.h b/src/entryitem.h index d0063c9..4c99207 100644 --- a/src/entryitem.h +++ b/src/entryitem.h @@ -42,7 +42,7 @@ public: */ EntryItem(GUI::ListView* tqparent, Data::EntryPtr entry); /** - * This constructor is for items which have other KListViewItems as tqparents. It + * This constructor is for items which have other KListViewItems as parents. It * initializes the text in the first column, as well. * * @param tqparent A pointer to the tqparent diff --git a/src/entrymerger.cpp b/src/entrymerger.cpp index 61ed0f8..073d32f 100644 --- a/src/entrymerger.cpp +++ b/src/entrymerger.cpp @@ -26,8 +26,8 @@ using Tellico::EntryMerger; -EntryMerger::EntryMerger(Data::EntryVec entries_, TQObject* tqparent_) - : TQObject(tqparent_), m_entriesToCheck(entries_), m_origCount(entries_.count()), m_cancelled(false) { +EntryMerger::EntryMerger(Data::EntryVec entries_, TQObject* parent_) + : TQObject(parent_), m_entriesToCheck(entries_), m_origCount(entries_.count()), m_cancelled(false) { m_entriesLeft = m_entriesToCheck; Kernel::self()->beginCommandGroup(i18n("Merge Entries")); diff --git a/src/entryupdater.cpp b/src/entryupdater.cpp index f95ad11..10e2297 100644 --- a/src/entryupdater.cpp +++ b/src/entryupdater.cpp @@ -37,8 +37,8 @@ using Tellico::EntryUpdater; // for each entry, we loop over all available fetchers // then we loop over all entries -EntryUpdater::EntryUpdater(Data::CollPtr coll_, Data::EntryVec entries_, TQObject* tqparent_) - : TQObject(tqparent_), m_coll(coll_), m_entriesToUpdate(entries_), m_cancelled(false) { +EntryUpdater::EntryUpdater(Data::CollPtr coll_, Data::EntryVec entries_, TQObject* parent_) + : TQObject(parent_), m_coll(coll_), m_entriesToUpdate(entries_), m_cancelled(false) { // for now, we're assuming all entries are same collection type m_fetchers = Fetch::Manager::self()->createUpdateFetchers(m_coll->type()); for(Fetch::FetcherVec::Iterator it = m_fetchers.begin(); it != m_fetchers.end(); ++it) { @@ -50,8 +50,8 @@ EntryUpdater::EntryUpdater(Data::CollPtr coll_, Data::EntryVec entries_, TQObjec init(); } -EntryUpdater::EntryUpdater(const TQString& source_, Data::CollPtr coll_, Data::EntryVec entries_, TQObject* tqparent_) - : TQObject(tqparent_) +EntryUpdater::EntryUpdater(const TQString& source_, Data::CollPtr coll_, Data::EntryVec entries_, TQObject* parent_) + : TQObject(parent_) , m_coll(coll_) , m_entriesToUpdate(entries_) , m_cancelled(false) { diff --git a/src/entryview.cpp b/src/entryview.cpp index 9019d18..37659d7 100644 --- a/src/entryview.cpp +++ b/src/entryview.cpp @@ -40,7 +40,7 @@ using Tellico::EntryView; -EntryView::EntryView(TQWidget* tqparent_, const char* name_) : KHTMLPart(tqparent_, name_), +EntryView::EntryView(TQWidget* parent_, const char* name_) : KHTMLPart(parent_, name_), m_entry(0), m_handler(0), m_run(0), m_tempFile(0), m_useGradientImages(true), m_checkCommonFile(true) { setJScriptEnabled(false); setJavaEnabled(false); @@ -266,7 +266,7 @@ void EntryView::slotRefresh() { // do some contortions in case the url is relative // need to interpret it relative to document URL instead of xslt file // the current node under the mouse vould be the text node inside -// the anchor node, so iterate up the tqparents +// the anchor node, so iterate up the parents void EntryView::slotOpenURL(const KURL& url_) { if(url_.protocol() == Latin1Literal("tc")) { // handle this internally diff --git a/src/exportdialog.cpp b/src/exportdialog.cpp index f82eede..bfa8da7 100644 --- a/src/exportdialog.cpp +++ b/src/exportdialog.cpp @@ -44,8 +44,8 @@ using Tellico::ExportDialog; -ExportDialog::ExportDialog(Export::Format format_, Data::CollPtr coll_, TQWidget* tqparent_, const char* name_) - : KDialogBase(tqparent_, name_, true /*modal*/, i18n("Export Options"), Ok|Cancel), +ExportDialog::ExportDialog(Export::Format format_, Data::CollPtr coll_, TQWidget* parent_, const char* name_) + : KDialogBase(parent_, name_, true /*modal*/, i18n("Export Options"), Ok|Cancel), m_format(format_), m_coll(coll_), m_exporter(exporter(format_)) { TQWidget* widget = new TQWidget(this); TQVBoxLayout* topLayout = new TQVBoxLayout(widget, 0, spacingHint()); diff --git a/src/fetch/amazonfetcher.cpp b/src/fetch/amazonfetcher.cpp index fee207a..e67bba6 100644 --- a/src/fetch/amazonfetcher.cpp +++ b/src/fetch/amazonfetcher.cpp @@ -82,8 +82,8 @@ const AmazonFetcher::SiteData& AmazonFetcher::siteData(int site_) { return dataVector[site_]; } -AmazonFetcher::AmazonFetcher(Site site_, TQObject* tqparent_, const char* name_) - : Fetcher(tqparent_, name_), m_xsltHandler(0), m_site(site_), m_imageSize(MediumImage), +AmazonFetcher::AmazonFetcher(Site site_, TQObject* parent_, const char* name_) + : Fetcher(parent_, name_), m_xsltHandler(0), m_site(site_), m_imageSize(MediumImage), m_access(TQString::tqfromLatin1(AMAZON_ACCESS_KEY)), m_assoc(TQString::tqfromLatin1(AMAZON_ASSOC_TOKEN)), m_addLinkField(true), m_limit(AMAZON_MAX_RETURNS_TOTAL), m_countOffset(0), m_page(1), m_total(-1), m_numResults(0), m_job(0), m_started(false) { @@ -397,7 +397,7 @@ void AmazonFetcher::slotComplete(KIO::Job* job_) { } // for some reason, Amazon will return an error simply when a valid ISBN is not found // I really want to ignore that, so check the IsValid element in the Request element - TQDomNode isValidNode = n.tqparentNode().namedItem(TQString::tqfromLatin1("IsValid")); + TQDomNode isValidNode = n.parentNode().namedItem(TQString::tqfromLatin1("IsValid")); if(m_key == ISBN && isValidNode.toElement().text().lower() == Latin1Literal("true")) { continue; } @@ -793,7 +793,7 @@ void AmazonFetcher::updateEntry(Data::EntryPtr entry_) { void AmazonFetcher::parseTitle(Data::EntryPtr entry, int collType) { Q_UNUSED(collType); - // assume that everything in brackets or tqparentheses is extra + // assume that everything in brackets or parentheses is extra TQRegExp rx(TQString::tqfromLatin1("[\\(\\[](.*)[\\)\\]]")); rx.setMinimal(true); TQString title = entry->field(TQString::tqfromLatin1("title")); @@ -834,12 +834,12 @@ bool AmazonFetcher::parseTitleToken(Data::EntryPtr entry, const TQString& token) return res; } -Tellico::Fetch::ConfigWidget* AmazonFetcher::configWidget(TQWidget* tqparent_) const { - return new AmazonFetcher::ConfigWidget(tqparent_, this); +Tellico::Fetch::ConfigWidget* AmazonFetcher::configWidget(TQWidget* parent_) const { + return new AmazonFetcher::ConfigWidget(parent_, this); } -AmazonFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const AmazonFetcher* fetcher_/*=0*/) - : Fetch::ConfigWidget(tqparent_) { +AmazonFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const AmazonFetcher* fetcher_/*=0*/) + : Fetch::ConfigWidget(parent_) { TQGridLayout* l = new TQGridLayout(optionsWidget(), 4, 2); l->setSpacing(4); l->setColStretch(1, 10); diff --git a/src/fetch/amazonfetcher.h b/src/fetch/amazonfetcher.h index ed7b97a..cf7b1fb 100644 --- a/src/fetch/amazonfetcher.h +++ b/src/fetch/amazonfetcher.h @@ -141,7 +141,7 @@ Q_OBJECT TQ_OBJECT public: - ConfigWidget(TQWidget* tqparent_, const AmazonFetcher* fetcher = 0); + ConfigWidget(TQWidget* parent_, const AmazonFetcher* fetcher = 0); virtual void saveConfig(KConfigGroup& config); virtual TQString preferredName() const; diff --git a/src/fetch/animenfofetcher.cpp b/src/fetch/animenfofetcher.cpp index 3a93281..393313a 100644 --- a/src/fetch/animenfofetcher.cpp +++ b/src/fetch/animenfofetcher.cpp @@ -39,8 +39,8 @@ namespace { using Tellico::Fetch::AnimeNfoFetcher; -AnimeNfoFetcher::AnimeNfoFetcher(TQObject* tqparent_, const char* name_ /*=0*/) - : Fetcher(tqparent_, name_), m_started(false) { +AnimeNfoFetcher::AnimeNfoFetcher(TQObject* parent_, const char* name_ /*=0*/) + : Fetcher(parent_, name_), m_started(false) { } TQString AnimeNfoFetcher::defaultName() { @@ -360,12 +360,12 @@ void AnimeNfoFetcher::updateEntry(Data::EntryPtr entry_) { emit signalDone(this); // always need to emit this if not continuing with the search } -Tellico::Fetch::ConfigWidget* AnimeNfoFetcher::configWidget(TQWidget* tqparent_) const { - return new AnimeNfoFetcher::ConfigWidget(tqparent_); +Tellico::Fetch::ConfigWidget* AnimeNfoFetcher::configWidget(TQWidget* parent_) const { + return new AnimeNfoFetcher::ConfigWidget(parent_); } -AnimeNfoFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_) - : Fetch::ConfigWidget(tqparent_) { +AnimeNfoFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_) + : Fetch::ConfigWidget(parent_) { TQVBoxLayout* l = new TQVBoxLayout(optionsWidget()); l->addWidget(new TQLabel(i18n("This source has no options."), optionsWidget())); l->addStretch(); diff --git a/src/fetch/animenfofetcher.h b/src/fetch/animenfofetcher.h index df43b87..ead205e 100644 --- a/src/fetch/animenfofetcher.h +++ b/src/fetch/animenfofetcher.h @@ -57,7 +57,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: - ConfigWidget(TQWidget* tqparent_); + ConfigWidget(TQWidget* parent_); virtual void saveConfig(KConfigGroup&) {} virtual TQString preferredName() const; }; diff --git a/src/fetch/arxivfetcher.cpp b/src/fetch/arxivfetcher.cpp index b176d88..6586d94 100644 --- a/src/fetch/arxivfetcher.cpp +++ b/src/fetch/arxivfetcher.cpp @@ -40,8 +40,8 @@ namespace { using Tellico::Fetch::ArxivFetcher; -ArxivFetcher::ArxivFetcher(TQObject* tqparent_) - : Fetcher(tqparent_), m_xsltHandler(0), m_start(0), m_job(0), m_started(false) { +ArxivFetcher::ArxivFetcher(TQObject* parent_) + : Fetcher(parent_), m_xsltHandler(0), m_start(0), m_job(0), m_started(false) { } ArxivFetcher::~ArxivFetcher() { @@ -345,12 +345,12 @@ void ArxivFetcher::updateEntrySynchronous(Data::EntryPtr entry) { } } -Tellico::Fetch::ConfigWidget* ArxivFetcher::configWidget(TQWidget* tqparent_) const { - return new ArxivFetcher::ConfigWidget(tqparent_, this); +Tellico::Fetch::ConfigWidget* ArxivFetcher::configWidget(TQWidget* parent_) const { + return new ArxivFetcher::ConfigWidget(parent_, this); } -ArxivFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const ArxivFetcher*) - : Fetch::ConfigWidget(tqparent_) { +ArxivFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const ArxivFetcher*) + : Fetch::ConfigWidget(parent_) { TQVBoxLayout* l = new TQVBoxLayout(optionsWidget()); l->addWidget(new TQLabel(i18n("This source has no options."), optionsWidget())); l->addStretch(); diff --git a/src/fetch/arxivfetcher.h b/src/fetch/arxivfetcher.h index be64c0e..2afcf43 100644 --- a/src/fetch/arxivfetcher.h +++ b/src/fetch/arxivfetcher.h @@ -59,7 +59,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: - ConfigWidget(TQWidget* tqparent_, const ArxivFetcher* fetcher = 0); + ConfigWidget(TQWidget* parent_, const ArxivFetcher* fetcher = 0); virtual void saveConfig(KConfigGroup& config); virtual TQString preferredName() const; }; diff --git a/src/fetch/bibsonomyfetcher.cpp b/src/fetch/bibsonomyfetcher.cpp index b2e7d2e..a6fd18a 100644 --- a/src/fetch/bibsonomyfetcher.cpp +++ b/src/fetch/bibsonomyfetcher.cpp @@ -35,8 +35,8 @@ namespace { using Tellico::Fetch::BibsonomyFetcher; -BibsonomyFetcher::BibsonomyFetcher(TQObject* tqparent_) - : Fetcher(tqparent_), m_job(0), m_started(false) { +BibsonomyFetcher::BibsonomyFetcher(TQObject* parent_) + : Fetcher(parent_), m_job(0), m_started(false) { } BibsonomyFetcher::~BibsonomyFetcher() { @@ -188,12 +188,12 @@ void BibsonomyFetcher::updateEntry(Data::EntryPtr entry_) { emit signalDone(this); // always need to emit this if not continuing with the search } -Tellico::Fetch::ConfigWidget* BibsonomyFetcher::configWidget(TQWidget* tqparent_) const { - return new BibsonomyFetcher::ConfigWidget(tqparent_, this); +Tellico::Fetch::ConfigWidget* BibsonomyFetcher::configWidget(TQWidget* parent_) const { + return new BibsonomyFetcher::ConfigWidget(parent_, this); } -BibsonomyFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const BibsonomyFetcher*) - : Fetch::ConfigWidget(tqparent_) { +BibsonomyFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const BibsonomyFetcher*) + : Fetch::ConfigWidget(parent_) { TQVBoxLayout* l = new TQVBoxLayout(optionsWidget()); l->addWidget(new TQLabel(i18n("This source has no options."), optionsWidget())); l->addStretch(); diff --git a/src/fetch/bibsonomyfetcher.h b/src/fetch/bibsonomyfetcher.h index 530e286..133c309 100644 --- a/src/fetch/bibsonomyfetcher.h +++ b/src/fetch/bibsonomyfetcher.h @@ -54,7 +54,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: - ConfigWidget(TQWidget* tqparent_, const BibsonomyFetcher* fetcher = 0); + ConfigWidget(TQWidget* parent_, const BibsonomyFetcher* fetcher = 0); virtual void saveConfig(KConfigGroup& config); virtual TQString preferredName() const; }; diff --git a/src/fetch/citebasefetcher.cpp b/src/fetch/citebasefetcher.cpp index 177530c..744950e 100644 --- a/src/fetch/citebasefetcher.cpp +++ b/src/fetch/citebasefetcher.cpp @@ -36,8 +36,8 @@ namespace { using Tellico::Fetch::CitebaseFetcher; -CitebaseFetcher::CitebaseFetcher(TQObject* tqparent_) - : Fetcher(tqparent_), m_job(0), m_started(false) { +CitebaseFetcher::CitebaseFetcher(TQObject* parent_) + : Fetcher(parent_), m_job(0), m_started(false) { } CitebaseFetcher::~CitebaseFetcher() { @@ -227,12 +227,12 @@ void CitebaseFetcher::updateEntrySynchronous(Data::EntryPtr entry) { } } -Tellico::Fetch::ConfigWidget* CitebaseFetcher::configWidget(TQWidget* tqparent_) const { - return new CitebaseFetcher::ConfigWidget(tqparent_, this); +Tellico::Fetch::ConfigWidget* CitebaseFetcher::configWidget(TQWidget* parent_) const { + return new CitebaseFetcher::ConfigWidget(parent_, this); } -CitebaseFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const CitebaseFetcher*) - : Fetch::ConfigWidget(tqparent_) { +CitebaseFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const CitebaseFetcher*) + : Fetch::ConfigWidget(parent_) { TQVBoxLayout* l = new TQVBoxLayout(optionsWidget()); l->addWidget(new TQLabel(i18n("This source has no options."), optionsWidget())); l->addStretch(); diff --git a/src/fetch/citebasefetcher.h b/src/fetch/citebasefetcher.h index b91433b..ffafc2e 100644 --- a/src/fetch/citebasefetcher.h +++ b/src/fetch/citebasefetcher.h @@ -55,7 +55,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: - ConfigWidget(TQWidget* tqparent_, const CitebaseFetcher* fetcher = 0); + ConfigWidget(TQWidget* parent_, const CitebaseFetcher* fetcher = 0); virtual void saveConfig(KConfigGroup& config); virtual TQString preferredName() const; }; diff --git a/src/fetch/configwidget.cpp b/src/fetch/configwidget.cpp index 3ceeea3..97ff608 100644 --- a/src/fetch/configwidget.cpp +++ b/src/fetch/configwidget.cpp @@ -22,7 +22,7 @@ using Tellico::Fetch::ConfigWidget; -ConfigWidget::ConfigWidget(TQWidget* tqparent_) : TQWidget(tqparent_), m_modified(false), m_accepted(false) { +ConfigWidget::ConfigWidget(TQWidget* parent_) : TQWidget(parent_), m_modified(false), m_accepted(false) { TQHBoxLayout* boxLayout = new TQHBoxLayout(this); boxLayout->setSpacing(10); diff --git a/src/fetch/crossreffetcher.cpp b/src/fetch/crossreffetcher.cpp index 6840e6d..2969e60 100644 --- a/src/fetch/crossreffetcher.cpp +++ b/src/fetch/crossreffetcher.cpp @@ -44,8 +44,8 @@ namespace { using Tellico::Fetch::CrossRefFetcher; -CrossRefFetcher::CrossRefFetcher(TQObject* tqparent_) - : Fetcher(tqparent_), m_xsltHandler(0), m_job(0), m_started(false) { +CrossRefFetcher::CrossRefFetcher(TQObject* parent_) + : Fetcher(parent_), m_xsltHandler(0), m_job(0), m_started(false) { } CrossRefFetcher::~CrossRefFetcher() { @@ -326,12 +326,12 @@ void CrossRefFetcher::updateEntrySynchronous(Data::EntryPtr entry) { } } -Tellico::Fetch::ConfigWidget* CrossRefFetcher::configWidget(TQWidget* tqparent_) const { - return new CrossRefFetcher::ConfigWidget(tqparent_, this); +Tellico::Fetch::ConfigWidget* CrossRefFetcher::configWidget(TQWidget* parent_) const { + return new CrossRefFetcher::ConfigWidget(parent_, this); } -CrossRefFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const CrossRefFetcher* fetcher_) - : Fetch::ConfigWidget(tqparent_) { +CrossRefFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const CrossRefFetcher* fetcher_) + : Fetch::ConfigWidget(parent_) { TQGridLayout* l = new TQGridLayout(optionsWidget(), 4, 2); l->setSpacing(4); l->setColStretch(1, 10); diff --git a/src/fetch/crossreffetcher.h b/src/fetch/crossreffetcher.h index 7b502c6..8852358 100644 --- a/src/fetch/crossreffetcher.h +++ b/src/fetch/crossreffetcher.h @@ -60,7 +60,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: - ConfigWidget(TQWidget* tqparent_, const CrossRefFetcher* fetcher = 0); + ConfigWidget(TQWidget* parent_, const CrossRefFetcher* fetcher = 0); virtual void saveConfig(KConfigGroup& config); virtual TQString preferredName() const; private: diff --git a/src/fetch/discogsfetcher.cpp b/src/fetch/discogsfetcher.cpp index a92219a..b569940 100644 --- a/src/fetch/discogsfetcher.cpp +++ b/src/fetch/discogsfetcher.cpp @@ -42,8 +42,8 @@ namespace { using Tellico::Fetch::DiscogsFetcher; -DiscogsFetcher::DiscogsFetcher(TQObject* tqparent_, const char* name_) - : Fetcher(tqparent_, name_), m_xsltHandler(0), +DiscogsFetcher::DiscogsFetcher(TQObject* parent_, const char* name_) + : Fetcher(parent_, name_), m_xsltHandler(0), m_limit(DISCOGS_MAX_RETURNS_TOTAL), m_job(0), m_started(false), m_apiKey(TQString::tqfromLatin1(DISCOGS_API_KEY)) { } @@ -342,12 +342,12 @@ void DiscogsFetcher::updateEntry(Data::EntryPtr entry_) { emit signalDone(this); // always need to emit this if not continuing with the search } -Tellico::Fetch::ConfigWidget* DiscogsFetcher::configWidget(TQWidget* tqparent_) const { - return new DiscogsFetcher::ConfigWidget(tqparent_, this); +Tellico::Fetch::ConfigWidget* DiscogsFetcher::configWidget(TQWidget* parent_) const { + return new DiscogsFetcher::ConfigWidget(parent_, this); } -DiscogsFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const DiscogsFetcher* fetcher_) - : Fetch::ConfigWidget(tqparent_) { +DiscogsFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const DiscogsFetcher* fetcher_) + : Fetch::ConfigWidget(parent_) { TQGridLayout* l = new TQGridLayout(optionsWidget(), 2, 2); l->setSpacing(4); l->setColStretch(1, 10); diff --git a/src/fetch/discogsfetcher.h b/src/fetch/discogsfetcher.h index cddb0b1..2c30465 100644 --- a/src/fetch/discogsfetcher.h +++ b/src/fetch/discogsfetcher.h @@ -76,7 +76,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: - ConfigWidget(TQWidget* tqparent_, const DiscogsFetcher* fetcher = 0); + ConfigWidget(TQWidget* parent_, const DiscogsFetcher* fetcher = 0); virtual void saveConfig(KConfigGroup&); virtual TQString preferredName() const; private: diff --git a/src/fetch/entrezfetcher.cpp b/src/fetch/entrezfetcher.cpp index 83fee42..99f01f1 100644 --- a/src/fetch/entrezfetcher.cpp +++ b/src/fetch/entrezfetcher.cpp @@ -45,7 +45,7 @@ namespace { using Tellico::Fetch::EntrezFetcher; -EntrezFetcher::EntrezFetcher(TQObject* tqparent_, const char* name_) : Fetcher(tqparent_, name_), m_xsltHandler(0), +EntrezFetcher::EntrezFetcher(TQObject* parent_, const char* name_) : Fetcher(parent_, name_), m_xsltHandler(0), m_step(Begin), m_started(false) { } @@ -463,12 +463,12 @@ void EntrezFetcher::updateEntry(Data::EntryPtr entry_) { emit signalDone(this); // always need to emit this if not continuing with the search } -Tellico::Fetch::ConfigWidget* EntrezFetcher::configWidget(TQWidget* tqparent_) const { - return new EntrezFetcher::ConfigWidget(tqparent_, this); +Tellico::Fetch::ConfigWidget* EntrezFetcher::configWidget(TQWidget* parent_) const { + return new EntrezFetcher::ConfigWidget(parent_, this); } -EntrezFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const EntrezFetcher* fetcher_/*=0*/) - : Fetch::ConfigWidget(tqparent_) { +EntrezFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const EntrezFetcher* fetcher_/*=0*/) + : Fetch::ConfigWidget(parent_) { TQVBoxLayout* l = new TQVBoxLayout(optionsWidget()); l->addWidget(new TQLabel(i18n("This source has no options."), optionsWidget())); l->addStretch(); diff --git a/src/fetch/entrezfetcher.h b/src/fetch/entrezfetcher.h index bd94fdc..bc8af9f 100644 --- a/src/fetch/entrezfetcher.h +++ b/src/fetch/entrezfetcher.h @@ -63,7 +63,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: - ConfigWidget(TQWidget* tqparent_, const EntrezFetcher* fetcher=0); + ConfigWidget(TQWidget* parent_, const EntrezFetcher* fetcher=0); virtual void saveConfig(KConfigGroup& config); virtual TQString preferredName() const; }; diff --git a/src/fetch/execexternalfetcher.cpp b/src/fetch/execexternalfetcher.cpp index 88f8cd5..3c11c20 100644 --- a/src/fetch/execexternalfetcher.cpp +++ b/src/fetch/execexternalfetcher.cpp @@ -70,7 +70,7 @@ TQStringList ExecExternalFetcher::parseArguments(const TQString& str_) { return args; } -ExecExternalFetcher::ExecExternalFetcher(TQObject* tqparent_, const char* name_/*=0*/) : Fetcher(tqparent_, name_), +ExecExternalFetcher::ExecExternalFetcher(TQObject* parent_, const char* name_/*=0*/) : Fetcher(parent_, name_), m_started(false), m_collType(-1), m_formatType(-1), m_canUpdate(false), m_process(0), m_deleteOnRemove(false) { } @@ -331,12 +331,12 @@ void ExecExternalFetcher::updateEntry(Data::EntryPtr entry_) { startSearch(args); } -Tellico::Fetch::ConfigWidget* ExecExternalFetcher::configWidget(TQWidget* tqparent_) const { - return new ExecExternalFetcher::ConfigWidget(tqparent_, this); +Tellico::Fetch::ConfigWidget* ExecExternalFetcher::configWidget(TQWidget* parent_) const { + return new ExecExternalFetcher::ConfigWidget(parent_, this); } -ExecExternalFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const ExecExternalFetcher* fetcher_/*=0*/) - : Fetch::ConfigWidget(tqparent_), m_deleteOnRemove(false) { +ExecExternalFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const ExecExternalFetcher* fetcher_/*=0*/) + : Fetch::ConfigWidget(parent_), m_deleteOnRemove(false) { TQGridLayout* l = new TQGridLayout(optionsWidget(), 5, 2); l->setSpacing(4); l->setColStretch(1, 10); diff --git a/src/fetch/fetchmanager.cpp b/src/fetch/fetchmanager.cpp index f7bc4c3..e0b176c 100644 --- a/src/fetch/fetchmanager.cpp +++ b/src/fetch/fetchmanager.cpp @@ -463,32 +463,32 @@ Tellico::Fetch::TypePairList Manager::typeList() { // called when creating a new fetcher -Tellico::Fetch::ConfigWidget* Manager::configWidget(TQWidget* tqparent_, Type type_, const TQString& name_) { +Tellico::Fetch::ConfigWidget* Manager::configWidget(TQWidget* parent_, Type type_, const TQString& name_) { ConfigWidget* w = 0; switch(type_) { #ifdef AMAZON_SUPPORT case Amazon: - w = new AmazonFetcher::ConfigWidget(tqparent_); + w = new AmazonFetcher::ConfigWidget(parent_); break; #endif #ifdef IMDB_SUPPORT case IMDB: - w = new IMDBFetcher::ConfigWidget(tqparent_); + w = new IMDBFetcher::ConfigWidget(parent_); break; #endif #ifdef HAVE_YAZ case Z3950: - w = new Z3950Fetcher::ConfigWidget(tqparent_); + w = new Z3950Fetcher::ConfigWidget(parent_); break; #endif case SRU: - w = new SRUConfigWidget(tqparent_); + w = new SRUConfigWidget(parent_); break; case Entrez: - w = new EntrezFetcher::ConfigWidget(tqparent_); + w = new EntrezFetcher::ConfigWidget(parent_); break; case ExecExternal: - w = new ExecExternalFetcher::ConfigWidget(tqparent_); + w = new ExecExternalFetcher::ConfigWidget(parent_); if(!name_.isEmpty() && m_scriptMap.tqcontains(name_)) { // bundledScriptHasExecPath() actually needs to write the exec path // back to the config so the configWidget can read it. But if the spec file @@ -512,37 +512,37 @@ Tellico::Fetch::ConfigWidget* Manager::configWidget(TQWidget* tqparent_, Type ty } break; case Yahoo: - w = new YahooFetcher::ConfigWidget(tqparent_); + w = new YahooFetcher::ConfigWidget(parent_); break; case AnimeNfo: - w = new AnimeNfoFetcher::ConfigWidget(tqparent_); + w = new AnimeNfoFetcher::ConfigWidget(parent_); break; case IBS: - w = new IBSFetcher::ConfigWidget(tqparent_); + w = new IBSFetcher::ConfigWidget(parent_); break; case ISBNdb: - w = new ISBNdbFetcher::ConfigWidget(tqparent_); + w = new ISBNdbFetcher::ConfigWidget(parent_); break; case GCstarPlugin: - w = new GCstarPluginFetcher::ConfigWidget(tqparent_); + w = new GCstarPluginFetcher::ConfigWidget(parent_); break; case CrossRef: - w = new CrossRefFetcher::ConfigWidget(tqparent_); + w = new CrossRefFetcher::ConfigWidget(parent_); break; case Arxiv: - w = new ArxivFetcher::ConfigWidget(tqparent_); + w = new ArxivFetcher::ConfigWidget(parent_); break; case Citebase: - w = new CitebaseFetcher::ConfigWidget(tqparent_); + w = new CitebaseFetcher::ConfigWidget(parent_); break; case Bibsonomy: - w = new BibsonomyFetcher::ConfigWidget(tqparent_); + w = new BibsonomyFetcher::ConfigWidget(parent_); break; case GoogleScholar: - w = new GoogleScholarFetcher::ConfigWidget(tqparent_); + w = new GoogleScholarFetcher::ConfigWidget(parent_); break; case Discogs: - w = new DiscogsFetcher::ConfigWidget(tqparent_); + w = new DiscogsFetcher::ConfigWidget(parent_); break; case Unknown: kdWarning() << "Fetch::Manager::configWidget() - no widget defined for type = " << type_ << endl; diff --git a/src/fetch/gcstarpluginfetcher.cpp b/src/fetch/gcstarpluginfetcher.cpp index 3129c78..d6d049c 100644 --- a/src/fetch/gcstarpluginfetcher.cpp +++ b/src/fetch/gcstarpluginfetcher.cpp @@ -178,7 +178,7 @@ TQString GCstarPluginFetcher::gcstarType(int collType_) { return TQString(); } -GCstarPluginFetcher::GCstarPluginFetcher(TQObject* tqparent_, const char* name_/*=0*/) : Fetcher(tqparent_, name_), +GCstarPluginFetcher::GCstarPluginFetcher(TQObject* parent_, const char* name_/*=0*/) : Fetcher(parent_, name_), m_started(false), m_collType(-1), m_process(0) { } @@ -383,12 +383,12 @@ void GCstarPluginFetcher::updateEntry(Data::EntryPtr entry_) { emit signalDone(this); // always need to emit this if not continuing with the search } -Tellico::Fetch::ConfigWidget* GCstarPluginFetcher::configWidget(TQWidget* tqparent_) const { - return new GCstarPluginFetcher::ConfigWidget(tqparent_, this); +Tellico::Fetch::ConfigWidget* GCstarPluginFetcher::configWidget(TQWidget* parent_) const { + return new GCstarPluginFetcher::ConfigWidget(parent_, this); } -GCstarPluginFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const GCstarPluginFetcher* fetcher_/*=0*/) - : Fetch::ConfigWidget(tqparent_), m_needPluginList(true) { +GCstarPluginFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const GCstarPluginFetcher* fetcher_/*=0*/) + : Fetch::ConfigWidget(parent_), m_needPluginList(true) { TQGridLayout* l = new TQGridLayout(optionsWidget(), 3, 4); l->setSpacing(4); l->setColStretch(1, 10); diff --git a/src/fetch/googlescholarfetcher.cpp b/src/fetch/googlescholarfetcher.cpp index 1d14043..d7773d2 100644 --- a/src/fetch/googlescholarfetcher.cpp +++ b/src/fetch/googlescholarfetcher.cpp @@ -34,8 +34,8 @@ namespace { using Tellico::Fetch::GoogleScholarFetcher; -GoogleScholarFetcher::GoogleScholarFetcher(TQObject* tqparent_, const char* name_) - : Fetcher(tqparent_, name_), +GoogleScholarFetcher::GoogleScholarFetcher(TQObject* parent_, const char* name_) + : Fetcher(parent_, name_), m_limit(GOOGLE_MAX_RETURNS_TOTAL), m_start(0), m_job(0), m_started(false), m_cookieIsSet(false) { m_bibtexRx = TQRegExp(TQString::tqfromLatin1("]*scholar\\.bib[^>]*)\"")); @@ -215,12 +215,12 @@ void GoogleScholarFetcher::updateEntry(Data::EntryPtr entry_) { emit signalDone(this); // always need to emit this if not continuing with the search } -Tellico::Fetch::ConfigWidget* GoogleScholarFetcher::configWidget(TQWidget* tqparent_) const { - return new GoogleScholarFetcher::ConfigWidget(tqparent_, this); +Tellico::Fetch::ConfigWidget* GoogleScholarFetcher::configWidget(TQWidget* parent_) const { + return new GoogleScholarFetcher::ConfigWidget(parent_, this); } -GoogleScholarFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const GoogleScholarFetcher*/*=0*/) - : Fetch::ConfigWidget(tqparent_) { +GoogleScholarFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const GoogleScholarFetcher*/*=0*/) + : Fetch::ConfigWidget(parent_) { TQVBoxLayout* l = new TQVBoxLayout(optionsWidget()); l->addWidget(new TQLabel(i18n("This source has no options."), optionsWidget())); l->addStretch(); diff --git a/src/fetch/googlescholarfetcher.h b/src/fetch/googlescholarfetcher.h index 9391d1f..adc58f8 100644 --- a/src/fetch/googlescholarfetcher.h +++ b/src/fetch/googlescholarfetcher.h @@ -68,7 +68,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: - ConfigWidget(TQWidget* tqparent_, const GoogleScholarFetcher* fetcher = 0); + ConfigWidget(TQWidget* parent_, const GoogleScholarFetcher* fetcher = 0); virtual void saveConfig(KConfigGroup&) {} virtual TQString preferredName() const; }; diff --git a/src/fetch/ibsfetcher.cpp b/src/fetch/ibsfetcher.cpp index 855d2f0..734c431 100644 --- a/src/fetch/ibsfetcher.cpp +++ b/src/fetch/ibsfetcher.cpp @@ -39,8 +39,8 @@ namespace { using Tellico::Fetch::IBSFetcher; -IBSFetcher::IBSFetcher(TQObject* tqparent_, const char* name_ /*=0*/) - : Fetcher(tqparent_, name_), m_started(false) { +IBSFetcher::IBSFetcher(TQObject* parent_, const char* name_ /*=0*/) + : Fetcher(parent_, name_), m_started(false) { } TQString IBSFetcher::defaultName() { @@ -397,12 +397,12 @@ void IBSFetcher::updateEntry(Data::EntryPtr entry_) { emit signalDone(this); // always need to emit this if not continuing with the search } -Tellico::Fetch::ConfigWidget* IBSFetcher::configWidget(TQWidget* tqparent_) const { - return new IBSFetcher::ConfigWidget(tqparent_); +Tellico::Fetch::ConfigWidget* IBSFetcher::configWidget(TQWidget* parent_) const { + return new IBSFetcher::ConfigWidget(parent_); } -IBSFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_) - : Fetch::ConfigWidget(tqparent_) { +IBSFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_) + : Fetch::ConfigWidget(parent_) { TQVBoxLayout* l = new TQVBoxLayout(optionsWidget()); l->addWidget(new TQLabel(i18n("This source has no options."), optionsWidget())); l->addStretch(); diff --git a/src/fetch/ibsfetcher.h b/src/fetch/ibsfetcher.h index b607b3a..c2a588c 100644 --- a/src/fetch/ibsfetcher.h +++ b/src/fetch/ibsfetcher.h @@ -57,7 +57,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: - ConfigWidget(TQWidget* tqparent_); + ConfigWidget(TQWidget* parent_); virtual void saveConfig(KConfigGroup&) {} virtual TQString preferredName() const; }; diff --git a/src/fetch/imdbfetcher.cpp b/src/fetch/imdbfetcher.cpp index 5db3a49..d70429f 100644 --- a/src/fetch/imdbfetcher.cpp +++ b/src/fetch/imdbfetcher.cpp @@ -74,7 +74,7 @@ void IMDBFetcher::initRegExps() { s_titleRx->setMinimal(true); } -IMDBFetcher::IMDBFetcher(TQObject* tqparent_, const char* name_) : Fetcher(tqparent_, name_), +IMDBFetcher::IMDBFetcher(TQObject* parent_, const char* name_) : Fetcher(parent_, name_), m_job(0), m_started(false), m_fetchImages(true), m_host(TQString::tqfromLatin1(IMDB_SERVER)), m_limit(IMDB_MAX_RESULTS), m_countOffset(0) { if(!s_tagRx) { @@ -261,10 +261,10 @@ void IMDBFetcher::slotComplete(KIO::Job* job_) { void IMDBFetcher::parseSingleTitleResult() { // myDebug() << "IMDBFetcher::parseSingleTitleResult()" << endl; s_titleRx->search(Tellico::decodeHTML(TQString(m_data))); - // split title at tqparenthesis + // split title at parenthesis const TQString cap1 = s_titleRx->cap(1); int pPos = cap1.tqfind('('); - // FIXME: maybe remove tqparentheses here? + // FIXME: maybe remove parentheses here? SearchResult* r = new SearchResult(this, pPos == -1 ? cap1 : cap1.left(pPos), pPos == -1 ? TQString() : cap1.mid(pPos), @@ -344,11 +344,11 @@ void IMDBFetcher::parseTitleBlock(const TQString& str_) { int count = 0; int start = s_anchorTitleRx->search(str_); while(m_started && start > -1) { - // split title at tqparenthesis + // split title at parenthesis const TQString cap1 = s_anchorTitleRx->cap(1); // the anchor url const TQString cap2 = s_anchorTitleRx->cap(2).stripWhiteSpace(); // the anchor text start += s_anchorTitleRx->matchedLength(); - int pPos = cap2.tqfind('('); // if it has tqparentheses, use that for description + int pPos = cap2.tqfind('('); // if it has parentheses, use that for description TQString desc; if(pPos > -1) { int pPos2 = cap2.tqfind(')', pPos+1); @@ -356,7 +356,7 @@ void IMDBFetcher::parseTitleBlock(const TQString& str_) { desc = cap2.mid(pPos+1, pPos2-pPos-1); } } else { - // tqparenthesis might be outside anchor tag + // parenthesis might be outside anchor tag int end = s_anchorTitleRx->search(str_, start); if(end == -1) { end = str_.length(); @@ -434,7 +434,7 @@ void IMDBFetcher::parseSingleNameResult() { desc.truncate(0); bool isEpisode = false; len = s_anchorTitleRx->cap(0).length(); - // split title at tqparenthesis + // split title at parenthesis const TQString cap2 = s_anchorTitleRx->cap(2).stripWhiteSpace(); int pPos = cap2.tqfind('('); if(pPos > -1) { @@ -479,7 +479,7 @@ void IMDBFetcher::parseSingleNameResult() { break; } - // FIXME: maybe remove tqparentheses here? + // FIXME: maybe remove parentheses here? SearchResult* r = new SearchResult(this, pPos == -1 ? cap2 : cap2.left(pPos), desc, TQString()); KURL u(m_url, s_anchorTitleRx->cap(1)); // relative URL constructor u.setQuery(TQString()); @@ -528,7 +528,7 @@ void IMDBFetcher::parseMultipleNameResults() { while(pos > -1 && pos < end && m_matches.size() < m_limit) { KURL u(m_url, s_anchorNameRx->cap(1)); s = s_anchorNameRx->cap(2).stripWhiteSpace() + ' '; - // if more than one exact, add tqparentheses + // if more than one exact, add parentheses if(nameMap.tqcontains(s) && nameMap[s] > 0) { // fix the first one that didn't have a number if(nameMap[s] == 1) { @@ -700,7 +700,7 @@ Tellico::Data::EntryPtr IMDBFetcher::parseEntry(const TQString& str_) { void IMDBFetcher::doTitle(const TQString& str_, Data::EntryPtr entry_) { if(s_titleRx->search(str_) > -1) { const TQString cap1 = s_titleRx->cap(1); - // titles always have tqparentheses + // titles always have parentheses int pPos = cap1.tqfind('('); TQString title = cap1.left(pPos).stripWhiteSpace(); // remove first and last quotes is there @@ -708,7 +708,7 @@ void IMDBFetcher::doTitle(const TQString& str_, Data::EntryPtr entry_) { title = title.mid(1, title.length()-2); } entry_->setField(TQString::tqfromLatin1("title"), title); - // remove tqparenthesis + // remove parenthesis uint pPos2 = pPos+1; while(pPos2 < cap1.length() && cap1[pPos2].isDigit()) { ++pPos2; @@ -1123,12 +1123,12 @@ void IMDBFetcher::updateEntry(Data::EntryPtr entry_) { emit signalDone(this); // always need to emit this if not continuing with the search } -Tellico::Fetch::ConfigWidget* IMDBFetcher::configWidget(TQWidget* tqparent_) const { - return new IMDBFetcher::ConfigWidget(tqparent_, this); +Tellico::Fetch::ConfigWidget* IMDBFetcher::configWidget(TQWidget* parent_) const { + return new IMDBFetcher::ConfigWidget(parent_, this); } -IMDBFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const IMDBFetcher* fetcher_/*=0*/) - : Fetch::ConfigWidget(tqparent_) { +IMDBFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const IMDBFetcher* fetcher_/*=0*/) + : Fetch::ConfigWidget(parent_) { TQGridLayout* l = new TQGridLayout(optionsWidget(), 4, 2); l->setSpacing(4); l->setColStretch(1, 10); diff --git a/src/fetch/imdbfetcher.h b/src/fetch/imdbfetcher.h index fd68b62..9b6b5ce 100644 --- a/src/fetch/imdbfetcher.h +++ b/src/fetch/imdbfetcher.h @@ -66,7 +66,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: - ConfigWidget(TQWidget* tqparent_, const IMDBFetcher* fetcher = 0); + ConfigWidget(TQWidget* parent_, const IMDBFetcher* fetcher = 0); virtual void saveConfig(KConfigGroup& config); virtual TQString preferredName() const; diff --git a/src/fetch/isbndbfetcher.cpp b/src/fetch/isbndbfetcher.cpp index 92fb084..3c6c093 100644 --- a/src/fetch/isbndbfetcher.cpp +++ b/src/fetch/isbndbfetcher.cpp @@ -39,8 +39,8 @@ namespace { using Tellico::Fetch::ISBNdbFetcher; -ISBNdbFetcher::ISBNdbFetcher(TQObject* tqparent_, const char* name_) - : Fetcher(tqparent_, name_), m_xsltHandler(0), +ISBNdbFetcher::ISBNdbFetcher(TQObject* parent_, const char* name_) + : Fetcher(parent_, name_), m_xsltHandler(0), m_limit(ISBNDB_MAX_RETURNS_TOTAL), m_page(1), m_total(-1), m_countOffset(0), m_job(0), m_started(false) { } @@ -332,12 +332,12 @@ void ISBNdbFetcher::updateEntry(Data::EntryPtr entry_) { emit signalDone(this); // always need to emit this if not continuing with the search } -Tellico::Fetch::ConfigWidget* ISBNdbFetcher::configWidget(TQWidget* tqparent_) const { - return new ISBNdbFetcher::ConfigWidget(tqparent_, this); +Tellico::Fetch::ConfigWidget* ISBNdbFetcher::configWidget(TQWidget* parent_) const { + return new ISBNdbFetcher::ConfigWidget(parent_, this); } -ISBNdbFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const ISBNdbFetcher*/*=0*/) - : Fetch::ConfigWidget(tqparent_) { +ISBNdbFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const ISBNdbFetcher*/*=0*/) + : Fetch::ConfigWidget(parent_) { TQVBoxLayout* l = new TQVBoxLayout(optionsWidget()); l->addWidget(new TQLabel(i18n("This source has no options."), optionsWidget())); l->addStretch(); diff --git a/src/fetch/isbndbfetcher.h b/src/fetch/isbndbfetcher.h index f5983b2..835f1c0 100644 --- a/src/fetch/isbndbfetcher.h +++ b/src/fetch/isbndbfetcher.h @@ -58,7 +58,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: - ConfigWidget(TQWidget* tqparent_, const ISBNdbFetcher* fetcher = 0); + ConfigWidget(TQWidget* parent_, const ISBNdbFetcher* fetcher = 0); virtual void saveConfig(KConfigGroup&) {} virtual TQString preferredName() const; }; diff --git a/src/fetch/srufetcher.cpp b/src/fetch/srufetcher.cpp index 96ca7d4..6719a53 100644 --- a/src/fetch/srufetcher.cpp +++ b/src/fetch/srufetcher.cpp @@ -51,12 +51,12 @@ namespace { using Tellico::Fetch::SRUFetcher; using Tellico::Fetch::SRUConfigWidget; -SRUFetcher::SRUFetcher(TQObject* tqparent_, const char* name_) - : Fetcher(tqparent_, name_), m_job(0), m_MARCXMLHandler(0), m_MODSHandler(0), m_started(false) { +SRUFetcher::SRUFetcher(TQObject* parent_, const char* name_) + : Fetcher(parent_, name_), m_job(0), m_MARCXMLHandler(0), m_MODSHandler(0), m_started(false) { } SRUFetcher::SRUFetcher(const TQString& name_, const TQString& host_, uint port_, const TQString& path_, - TQObject* tqparent_) : Fetcher(tqparent_), + TQObject* parent_) : Fetcher(parent_), m_host(host_), m_port(port_), m_path(path_), m_job(0), m_MARCXMLHandler(0), m_MODSHandler(0), m_started(false) { m_name = name_; // m_name is protected in super class @@ -412,9 +412,9 @@ bool SRUFetcher::initMODSHandler() { return true; } -Tellico::Fetch::Fetcher::Ptr SRUFetcher::libraryOfCongress(TQObject* tqparent_) { +Tellico::Fetch::Fetcher::Ptr SRUFetcher::libraryOfCongress(TQObject* parent_) { return new SRUFetcher(i18n("Library of Congress (US)"), TQString::tqfromLatin1("z3950.loc.gov"), 7090, - TQString::tqfromLatin1("voyager"), tqparent_); + TQString::tqfromLatin1("voyager"), parent_); } // static @@ -425,12 +425,12 @@ Tellico::StringMap SRUFetcher::customFields() { return map; } -Tellico::Fetch::ConfigWidget* SRUFetcher::configWidget(TQWidget* tqparent_) const { - return new SRUConfigWidget(tqparent_, this); +Tellico::Fetch::ConfigWidget* SRUFetcher::configWidget(TQWidget* parent_) const { + return new SRUConfigWidget(parent_, this); } -SRUConfigWidget::SRUConfigWidget(TQWidget* tqparent_, const SRUFetcher* fetcher_ /*=0*/) - : ConfigWidget(tqparent_) { +SRUConfigWidget::SRUConfigWidget(TQWidget* parent_, const SRUFetcher* fetcher_ /*=0*/) + : ConfigWidget(parent_) { TQGridLayout* l = new TQGridLayout(optionsWidget(), 4, 2); l->setSpacing(4); l->setColStretch(1, 10); diff --git a/src/fetch/srufetcher.h b/src/fetch/srufetcher.h index d62b866..4e745dc 100644 --- a/src/fetch/srufetcher.h +++ b/src/fetch/srufetcher.h @@ -114,7 +114,7 @@ Q_OBJECT friend class SRUFetcher; public: - SRUConfigWidget(TQWidget* tqparent_, const SRUFetcher* fetcher = 0); + SRUConfigWidget(TQWidget* parent_, const SRUFetcher* fetcher = 0); virtual void saveConfig(KConfigGroup& config); virtual TQString preferredName() const; diff --git a/src/fetch/yahoofetcher.cpp b/src/fetch/yahoofetcher.cpp index d625cad..6e74d60 100644 --- a/src/fetch/yahoofetcher.cpp +++ b/src/fetch/yahoofetcher.cpp @@ -40,8 +40,8 @@ namespace { using Tellico::Fetch::YahooFetcher; -YahooFetcher::YahooFetcher(TQObject* tqparent_, const char* name_) - : Fetcher(tqparent_, name_), m_xsltHandler(0), +YahooFetcher::YahooFetcher(TQObject* parent_, const char* name_) + : Fetcher(parent_, name_), m_xsltHandler(0), m_limit(YAHOO_MAX_RETURNS_TOTAL), m_job(0), m_started(false) { } @@ -382,12 +382,12 @@ void YahooFetcher::updateEntry(Data::EntryPtr entry_) { emit signalDone(this); // always need to emit this if not continuing with the search } -Tellico::Fetch::ConfigWidget* YahooFetcher::configWidget(TQWidget* tqparent_) const { - return new YahooFetcher::ConfigWidget(tqparent_, this); +Tellico::Fetch::ConfigWidget* YahooFetcher::configWidget(TQWidget* parent_) const { + return new YahooFetcher::ConfigWidget(parent_, this); } -YahooFetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const YahooFetcher*/*=0*/) - : Fetch::ConfigWidget(tqparent_) { +YahooFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const YahooFetcher*/*=0*/) + : Fetch::ConfigWidget(parent_) { TQVBoxLayout* l = new TQVBoxLayout(optionsWidget()); l->addWidget(new TQLabel(i18n("This source has no options."), optionsWidget())); l->addStretch(); diff --git a/src/fetch/yahoofetcher.h b/src/fetch/yahoofetcher.h index d7b2082..1c295c8 100644 --- a/src/fetch/yahoofetcher.h +++ b/src/fetch/yahoofetcher.h @@ -69,7 +69,7 @@ public: class ConfigWidget : public Fetch::ConfigWidget { public: - ConfigWidget(TQWidget* tqparent_, const YahooFetcher* fetcher = 0); + ConfigWidget(TQWidget* parent_, const YahooFetcher* fetcher = 0); virtual void saveConfig(KConfigGroup&) {} virtual TQString preferredName() const; }; diff --git a/src/fetch/z3950fetcher.cpp b/src/fetch/z3950fetcher.cpp index 465df5c..d0bffa3 100644 --- a/src/fetch/z3950fetcher.cpp +++ b/src/fetch/z3950fetcher.cpp @@ -59,8 +59,8 @@ namespace { using Tellico::Fetch::Z3950Fetcher; -Z3950Fetcher::Z3950Fetcher(TQObject* tqparent_, const char* name_) - : Fetcher(tqparent_, name_), m_conn(0), m_port(Z3950_DEFAULT_PORT), m_esn(Z3950_DEFAULT_ESN), +Z3950Fetcher::Z3950Fetcher(TQObject* parent_, const char* name_) + : Fetcher(parent_, name_), m_conn(0), m_port(Z3950_DEFAULT_PORT), m_esn(Z3950_DEFAULT_ESN), m_started(false), m_done(true), m_MARC21XMLHandler(0), m_UNIMARCXMLHandler(0), m_MODSHandler(0) { } @@ -503,12 +503,12 @@ void Z3950Fetcher::updateEntry(Data::EntryPtr entry_) { emit signalDone(this); // always need to emit this if not continuing with the search } -Tellico::Fetch::ConfigWidget* Z3950Fetcher::configWidget(TQWidget* tqparent_) const { - return new Z3950Fetcher::ConfigWidget(tqparent_, this); +Tellico::Fetch::ConfigWidget* Z3950Fetcher::configWidget(TQWidget* parent_) const { + return new Z3950Fetcher::ConfigWidget(parent_, this); } -Z3950Fetcher::ConfigWidget::ConfigWidget(TQWidget* tqparent_, const Z3950Fetcher* fetcher_/*=0*/) - : Fetch::ConfigWidget(tqparent_) { +Z3950Fetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const Z3950Fetcher* fetcher_/*=0*/) + : Fetch::ConfigWidget(parent_) { TQGridLayout* l = new TQGridLayout(optionsWidget(), 7, 2); l->setSpacing(4); l->setColStretch(1, 10); diff --git a/src/fetchdialog.cpp b/src/fetchdialog.cpp index 18a17c8..f80a1aa 100644 --- a/src/fetchdialog.cpp +++ b/src/fetchdialog.cpp @@ -82,8 +82,8 @@ class FetchDialog::SearchResultItem : public Tellico::GUI::ListViewItem { Fetch::SearchResult* m_result; }; -FetchDialog::FetchDialog(TQWidget* tqparent_, const char* name_) - : KDialogBase(tqparent_, name_, false, i18n("Internet Search"), 0), +FetchDialog::FetchDialog(TQWidget* parent_, const char* name_) + : KDialogBase(parent_, name_, false, i18n("Internet Search"), 0), m_timer(new TQTimer(this)), m_started(false) { m_collType = Kernel::self()->collectionType(); @@ -288,7 +288,7 @@ FetchDialog::~FetchDialog() { saveDialogSize(TQString::tqfromLatin1("Fetch Dialog Options")); KConfigGroup config(kapp->config(), "Fetch Dialog Options"); - config.writeEntry("Splitter Sizes", static_cast(m_listView->tqparentWidget())->sizes()); + config.writeEntry("Splitter Sizes", static_cast(m_listView->parentWidget())->sizes()); config.writeEntry("Search Key", m_keyCombo->currentData().toInt()); config.writeEntry("Search Source", m_sourceCombo->currentText()); } diff --git a/src/fetcherconfigdialog.cpp b/src/fetcherconfigdialog.cpp index 1e1a3e3..9d9b22a 100644 --- a/src/fetcherconfigdialog.cpp +++ b/src/fetcherconfigdialog.cpp @@ -35,8 +35,8 @@ namespace { using Tellico::FetcherConfigDialog; -FetcherConfigDialog::FetcherConfigDialog(TQWidget* tqparent_) - : KDialogBase(tqparent_, "fetcher dialog", true, i18n("Data Source Properties"), +FetcherConfigDialog::FetcherConfigDialog(TQWidget* parent_) + : KDialogBase(parent_, "fetcher dialog", true, i18n("Data Source Properties"), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help) , m_newSource(true) , m_useDefaultName(true) @@ -45,8 +45,8 @@ FetcherConfigDialog::FetcherConfigDialog(TQWidget* tqparent_) } FetcherConfigDialog::FetcherConfigDialog(const TQString& sourceName_, Fetch::Type type_, bool updateOverwrite_, - Fetch::ConfigWidget* configWidget_, TQWidget* tqparent_) - : KDialogBase(tqparent_, "fetcher dialog", true, i18n("Data Source Properties"), + Fetch::ConfigWidget* configWidget_, TQWidget* parent_) + : KDialogBase(parent_, "fetcher dialog", true, i18n("Data Source Properties"), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help) , m_newSource(false) , m_useDefaultName(false) diff --git a/src/filterdialog.cpp b/src/filterdialog.cpp index d2cecd8..9da4ebb 100644 --- a/src/filterdialog.cpp +++ b/src/filterdialog.cpp @@ -42,8 +42,8 @@ using Tellico::FilterRuleWidget; using Tellico::FilterRuleWidgetLister; using Tellico::FilterDialog; -FilterRuleWidget::FilterRuleWidget(FilterRule* rule_, TQWidget* tqparent_, const char* name_/*=0*/) - : TQHBox(tqparent_, name_), m_editRegExp(0), m_editRegExpDialog(0) { +FilterRuleWidget::FilterRuleWidget(FilterRule* rule_, TQWidget* parent_, const char* name_/*=0*/) + : TQHBox(parent_, name_), m_editRegExp(0), m_editRegExpDialog(0) { initLists(); initWidget(); @@ -207,8 +207,8 @@ namespace { static const int FILTER_MAX_RULES = 8; } -FilterRuleWidgetLister::FilterRuleWidgetLister(TQWidget* tqparent_, const char* name_) - : KWidgetLister(FILTER_MIN_RULE_WIDGETS, FILTER_MAX_RULES, tqparent_, name_) { +FilterRuleWidgetLister::FilterRuleWidgetLister(TQWidget* parent_, const char* name_) + : KWidgetLister(FILTER_MIN_RULE_WIDGETS, FILTER_MAX_RULES, parent_, name_) { // slotClear(); } @@ -253,8 +253,8 @@ void FilterRuleWidgetLister::setFocus() { } } -TQWidget* FilterRuleWidgetLister::createWidget(TQWidget* tqparent_) { - TQWidget* w = new FilterRuleWidget(static_cast(0), tqparent_); +TQWidget* FilterRuleWidgetLister::createWidget(TQWidget* parent_) { + TQWidget* w = new FilterRuleWidget(static_cast(0), parent_); connect(w, TQT_SIGNAL(signalModified()), TQT_SIGNAL(signalModified())); return w; } @@ -277,8 +277,8 @@ namespace { // modal dialog so I don't have to worry about updating stuff // don't show apply button if not saving, i.e. just modifying existing filter -FilterDialog::FilterDialog(Mode mode_, TQWidget* tqparent_, const char* name_/*=0*/) - : KDialogBase(tqparent_, name_, true, +FilterDialog::FilterDialog(Mode mode_, TQWidget* parent_, const char* name_/*=0*/) + : KDialogBase(parent_, name_, true, (mode_ == CreateFilter ? i18n("Advanced Filter") : i18n("Modify Filter")), (mode_ == CreateFilter ? Help|Ok|Apply|Cancel : Help|Ok|Cancel), Ok, false), diff --git a/src/filteritem.cpp b/src/filteritem.cpp index fe598df..655e889 100644 --- a/src/filteritem.cpp +++ b/src/filteritem.cpp @@ -20,8 +20,8 @@ using Tellico::FilterItem; -FilterItem::FilterItem(GUI::ListView* tqparent_, Filter::Ptr filter_) - : GUI::CountedItem(tqparent_), m_filter(filter_) { +FilterItem::FilterItem(GUI::ListView* parent_, Filter::Ptr filter_) + : GUI::CountedItem(parent_), m_filter(filter_) { setText(0, filter_->name()); setPixmap(0, SmallIcon(TQString::tqfromLatin1("filter"))); } diff --git a/src/filterview.cpp b/src/filterview.cpp index 6a52e54..850b494 100644 --- a/src/filterview.cpp +++ b/src/filterview.cpp @@ -29,7 +29,7 @@ using Tellico::FilterView; -FilterView::FilterView(TQWidget* tqparent_, const char* name_) : GUI::ListView(tqparent_, name_), m_notSortedYet(true) { +FilterView::FilterView(TQWidget* parent_, const char* name_) : GUI::ListView(parent_, name_), m_notSortedYet(true) { addColumn(i18n("Filter")); header()->setStretchEnabled(true, 0); setResizeMode(TQListView::NoColumn); diff --git a/src/groupview.cpp b/src/groupview.cpp index 16bf8e1..50ad3d0 100644 --- a/src/groupview.cpp +++ b/src/groupview.cpp @@ -38,8 +38,8 @@ using Tellico::GroupView; -GroupView::GroupView(TQWidget* tqparent_, const char* name_/*=0*/) - : GUI::ListView(tqparent_, name_), m_notSortedYet(true), m_coll(0) { +GroupView::GroupView(TQWidget* parent_, const char* name_/*=0*/) + : GUI::ListView(parent_, name_), m_notSortedYet(true), m_coll(0) { addColumn(TQString()); // header text gets updated later header()->setStretchEnabled(true, 0); setResizeMode(TQListView::NoColumn); diff --git a/src/gui/boolfieldwidget.cpp b/src/gui/boolfieldwidget.cpp index ae625be..a3a9649 100644 --- a/src/gui/boolfieldwidget.cpp +++ b/src/gui/boolfieldwidget.cpp @@ -21,8 +21,8 @@ using Tellico::GUI::BoolFieldWidget; -BoolFieldWidget::BoolFieldWidget(Data::FieldPtr field_, TQWidget* tqparent_, const char* name_/*=0*/) - : FieldWidget(field_, tqparent_, name_) { +BoolFieldWidget::BoolFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const char* name_/*=0*/) + : FieldWidget(field_, parent_, name_) { m_checkBox = new TQCheckBox(this); connect(m_checkBox, TQT_SIGNAL(clicked()), TQT_SIGNAL(modified())); diff --git a/src/gui/choicefieldwidget.cpp b/src/gui/choicefieldwidget.cpp index 8e0240b..83e31f9 100644 --- a/src/gui/choicefieldwidget.cpp +++ b/src/gui/choicefieldwidget.cpp @@ -21,8 +21,8 @@ using Tellico::GUI::ChoiceFieldWidget; -ChoiceFieldWidget::ChoiceFieldWidget(Data::FieldPtr field_, TQWidget* tqparent_, const char* name_/*=0*/) - : FieldWidget(field_, tqparent_, name_), m_comboBox(0) { +ChoiceFieldWidget::ChoiceFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const char* name_/*=0*/) + : FieldWidget(field_, parent_, name_), m_comboBox(0) { m_comboBox = new KComboBox(this); connect(m_comboBox, TQT_SIGNAL(activated(int)), TQT_SIGNAL(modified())); diff --git a/src/gui/collectiontypecombo.cpp b/src/gui/collectiontypecombo.cpp index 727d26f..c255c87 100644 --- a/src/gui/collectiontypecombo.cpp +++ b/src/gui/collectiontypecombo.cpp @@ -17,7 +17,7 @@ using Tellico::GUI::CollectionTypeCombo; -CollectionTypeCombo::CollectionTypeCombo(TQWidget* tqparent_) : ComboBox(tqparent_) { +CollectionTypeCombo::CollectionTypeCombo(TQWidget* parent_) : ComboBox(parent_) { reset(); } diff --git a/src/gui/combobox.cpp b/src/gui/combobox.cpp index c5b3dfe..d6457f1 100644 --- a/src/gui/combobox.cpp +++ b/src/gui/combobox.cpp @@ -17,7 +17,7 @@ using Tellico::GUI::ComboBox; -ComboBox::ComboBox(TQWidget* tqparent_) : KComboBox(tqparent_) { +ComboBox::ComboBox(TQWidget* parent_) : KComboBox(parent_) { setEditable(false); } diff --git a/src/gui/combobox.h b/src/gui/combobox.h index 98a411b..2fa98c4 100644 --- a/src/gui/combobox.h +++ b/src/gui/combobox.h @@ -31,7 +31,7 @@ namespace Tellico { */ class ComboBox : public KComboBox { public: - ComboBox(TQWidget* tqparent_); + ComboBox(TQWidget* parent_); void clear(); const TQVariant& currentData() const; diff --git a/src/gui/datefieldwidget.cpp b/src/gui/datefieldwidget.cpp index 281cee6..8f308f8 100644 --- a/src/gui/datefieldwidget.cpp +++ b/src/gui/datefieldwidget.cpp @@ -17,8 +17,8 @@ using Tellico::GUI::DateFieldWidget; -DateFieldWidget::DateFieldWidget(Data::FieldPtr field_, TQWidget* tqparent_, const char* name_/*=0*/) - : FieldWidget(field_, tqparent_, name_) { +DateFieldWidget::DateFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const char* name_/*=0*/) + : FieldWidget(field_, parent_, name_) { m_widget = new DateWidget(this); connect(m_widget, TQT_SIGNAL(signalModified()), TQT_SIGNAL(modified())); diff --git a/src/gui/datewidget.cpp b/src/gui/datewidget.cpp index 054741a..7a2d99b 100644 --- a/src/gui/datewidget.cpp +++ b/src/gui/datewidget.cpp @@ -40,7 +40,7 @@ SpinBox::SpinBox(int min, int max, TQWidget *tqparent) : TQSpinBox(min, max, 1, setSpecialValueText(TQChar(' ')); } -DateWidget::DateWidget(TQWidget* tqparent_, const char* name_) : TQWidget(tqparent_, name_) { +DateWidget::DateWidget(TQWidget* parent_, const char* name_) : TQWidget(parent_, name_) { TQHBoxLayout* l = new TQHBoxLayout(this, 0, 4); KLocale* locale = KGlobal::locale(); diff --git a/src/gui/fieldwidget.cpp b/src/gui/fieldwidget.cpp index 0983217..dac9da8 100644 --- a/src/gui/fieldwidget.cpp +++ b/src/gui/fieldwidget.cpp @@ -45,38 +45,38 @@ using Tellico::GUI::FieldWidget; const TQRegExp FieldWidget::s_semiColon = TQRegExp(TQString::tqfromLatin1("\\s*;\\s*")); -FieldWidget* FieldWidget::create(Data::FieldPtr field_, TQWidget* tqparent_, const char* name_) { +FieldWidget* FieldWidget::create(Data::FieldPtr field_, TQWidget* parent_, const char* name_) { switch (field_->type()) { case Data::Field::Line: - return new GUI::LineFieldWidget(field_, tqparent_, name_); + return new GUI::LineFieldWidget(field_, parent_, name_); case Data::Field::Para: - return new GUI::ParaFieldWidget(field_, tqparent_, name_); + return new GUI::ParaFieldWidget(field_, parent_, name_); case Data::Field::Bool: - return new GUI::BoolFieldWidget(field_, tqparent_, name_); + return new GUI::BoolFieldWidget(field_, parent_, name_); case Data::Field::Number: - return new GUI::NumberFieldWidget(field_, tqparent_, name_); + return new GUI::NumberFieldWidget(field_, parent_, name_); case Data::Field::Choice: - return new GUI::ChoiceFieldWidget(field_, tqparent_, name_); + return new GUI::ChoiceFieldWidget(field_, parent_, name_); case Data::Field::Table: case Data::Field::Table2: - return new GUI::TableFieldWidget(field_, tqparent_, name_); + return new GUI::TableFieldWidget(field_, parent_, name_); case Data::Field::Date: - return new GUI::DateFieldWidget(field_, tqparent_, name_); + return new GUI::DateFieldWidget(field_, parent_, name_); case Data::Field::URL: - return new GUI::URLFieldWidget(field_, tqparent_, name_); + return new GUI::URLFieldWidget(field_, parent_, name_); case Data::Field::Image: - return new GUI::ImageFieldWidget(field_, tqparent_, name_); + return new GUI::ImageFieldWidget(field_, parent_, name_); case Data::Field::Rating: - return new GUI::RatingFieldWidget(field_, tqparent_, name_); + return new GUI::RatingFieldWidget(field_, parent_, name_); case Data::Field::ReadOnly: case Data::Field::Dependent: @@ -89,8 +89,8 @@ FieldWidget* FieldWidget::create(Data::FieldPtr field_, TQWidget* tqparent_, con } } -FieldWidget::FieldWidget(Data::FieldPtr field_, TQWidget* tqparent_, const char* name_/*=0*/) - : TQWidget(tqparent_, name_), m_field(field_) { +FieldWidget::FieldWidget(Data::FieldPtr field_, TQWidget* parent_, const char* name_/*=0*/) + : TQWidget(parent_, name_), m_field(field_) { TQHBoxLayout* l = new TQHBoxLayout(this, 2, 2); // tqparent, margin, spacing l->addSpacing(4); // add some more space in the columns between widgets if(TQCString(tqstyle().name()).lower().tqfind("keramik", 0, false) > -1) { diff --git a/src/gui/imagefieldwidget.cpp b/src/gui/imagefieldwidget.cpp index 253f5f3..9acc732 100644 --- a/src/gui/imagefieldwidget.cpp +++ b/src/gui/imagefieldwidget.cpp @@ -18,8 +18,8 @@ using Tellico::GUI::ImageFieldWidget; -ImageFieldWidget::ImageFieldWidget(Data::FieldPtr field_, TQWidget* tqparent_, const char* name_/*=0*/) - : FieldWidget(field_, tqparent_, name_) { +ImageFieldWidget::ImageFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const char* name_/*=0*/) + : FieldWidget(field_, parent_, name_) { m_widget = new ImageWidget(this); m_widget->setLinkOnlyChecked(field_->property(TQString::tqfromLatin1("link")) == Latin1Literal("true")); diff --git a/src/gui/imagewidget.cpp b/src/gui/imagewidget.cpp index 575c734..3fe7353 100644 --- a/src/gui/imagewidget.cpp +++ b/src/gui/imagewidget.cpp @@ -40,7 +40,7 @@ namespace { using Tellico::GUI::ImageWidget; -ImageWidget::ImageWidget(TQWidget* tqparent_, const char* name_) : TQWidget(tqparent_, name_) { +ImageWidget::ImageWidget(TQWidget* parent_, const char* name_) : TQWidget(parent_, name_) { TQHBoxLayout* l = new TQHBoxLayout(this); l->setMargin(IMAGE_WIDGET_BUTTON_MARGIN); m_label = new TQLabel(this); diff --git a/src/gui/lineedit.cpp b/src/gui/lineedit.cpp index 68a403d..e5da745 100644 --- a/src/gui/lineedit.cpp +++ b/src/gui/lineedit.cpp @@ -23,7 +23,7 @@ using Tellico::GUI::LineEdit; -LineEdit::LineEdit(TQWidget* tqparent_, const char* name_) : KLineEdit(tqparent_, name_) +LineEdit::LineEdit(TQWidget* parent_, const char* name_) : KLineEdit(parent_, name_) , m_drawHint(false) , m_allowSpellCheck(false) , m_enableSpellCheck(true) diff --git a/src/gui/linefieldwidget.cpp b/src/gui/linefieldwidget.cpp index acc5e33..ccf00d1 100644 --- a/src/gui/linefieldwidget.cpp +++ b/src/gui/linefieldwidget.cpp @@ -21,8 +21,8 @@ using Tellico::GUI::LineFieldWidget; -LineFieldWidget::LineFieldWidget(Data::FieldPtr field_, TQWidget* tqparent_, const char* name_/*=0*/) - : FieldWidget(field_, tqparent_, name_) { +LineFieldWidget::LineFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const char* name_/*=0*/) + : FieldWidget(field_, parent_, name_) { m_lineEdit = new GUI::LineEdit(this); m_lineEdit->setAllowSpellCheck(true); diff --git a/src/gui/listview.cpp b/src/gui/listview.cpp index 1816da6..5ea04cd 100644 --- a/src/gui/listview.cpp +++ b/src/gui/listview.cpp @@ -25,7 +25,7 @@ using Tellico::GUI::ListView; using Tellico::GUI::ListViewItem; -ListView::ListView(TQWidget* tqparent_, const char* name_) : KListView(tqparent_, name_/*=0*/), +ListView::ListView(TQWidget* parent_, const char* name_) : KListView(parent_, name_/*=0*/), m_sortStyle(SortByText), m_isClear(true) { setSelectionMode(TQListView::Extended); connect(this, TQT_SIGNAL(selectionChanged()), diff --git a/src/gui/numberfieldwidget.cpp b/src/gui/numberfieldwidget.cpp index 9f249c6..e2e038a 100644 --- a/src/gui/numberfieldwidget.cpp +++ b/src/gui/numberfieldwidget.cpp @@ -22,8 +22,8 @@ using Tellico::GUI::NumberFieldWidget; -NumberFieldWidget::NumberFieldWidget(Data::FieldPtr field_, TQWidget* tqparent_, const char* name_/*=0*/) - : FieldWidget(field_, tqparent_, name_), m_lineEdit(0), m_spinBox(0) { +NumberFieldWidget::NumberFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const char* name_/*=0*/) + : FieldWidget(field_, parent_, name_), m_lineEdit(0), m_spinBox(0) { if(field_->flags() & Data::Field::AllowMultiple) { initLineEdit(); diff --git a/src/gui/overlaywidget.cpp b/src/gui/overlaywidget.cpp index 54d27fe..cc7bfea 100644 --- a/src/gui/overlaywidget.cpp +++ b/src/gui/overlaywidget.cpp @@ -43,7 +43,7 @@ void OverlayWidget::reposition() { return; } - setMaximumSize(tqparentWidget()->size()); + setMaximumSize(parentWidget()->size()); adjustSize(); TQPoint p; @@ -71,8 +71,8 @@ void OverlayWidget::reposition() { // Position in the toplevelwidget's coordinates TQPoint pTopLevel = m_anchor->mapTo(tqtopLevelWidget(), p); - // Position in the widget's tqparentWidget coordinates - TQPoint pParent = tqparentWidget()->mapFrom(tqtopLevelWidget(), pTopLevel); + // Position in the widget's parentWidget coordinates + TQPoint pParent = parentWidget()->mapFrom(tqtopLevelWidget(), pTopLevel); // keep it on the screen if(pParent.x() < 0) { pParent.rx() = 0; diff --git a/src/gui/parafieldwidget.cpp b/src/gui/parafieldwidget.cpp index ba3b583..84af710 100644 --- a/src/gui/parafieldwidget.cpp +++ b/src/gui/parafieldwidget.cpp @@ -19,8 +19,8 @@ using Tellico::GUI::ParaFieldWidget; -ParaFieldWidget::ParaFieldWidget(Data::FieldPtr field_, TQWidget* tqparent_, const char* name_/*=0*/) - : FieldWidget(field_, tqparent_, name_) { +ParaFieldWidget::ParaFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const char* name_/*=0*/) + : FieldWidget(field_, parent_, name_) { m_textEdit = new KTextEdit(this); m_textEdit->setTextFormat(TQt::PlainText); diff --git a/src/gui/previewdialog.cpp b/src/gui/previewdialog.cpp index 856fcd0..a875382 100644 --- a/src/gui/previewdialog.cpp +++ b/src/gui/previewdialog.cpp @@ -22,8 +22,8 @@ using Tellico::GUI::PreviewDialog; -PreviewDialog::PreviewDialog(TQWidget* tqparent_) - : KDialogBase(tqparent_, "template preview dialog", false /* modal */, +PreviewDialog::PreviewDialog(TQWidget* parent_) + : KDialogBase(parent_, "template preview dialog", false /* modal */, i18n("Template Preview"), KDialogBase::Ok) , m_tempDir(new KTempDir()) { m_tempDir->setAutoDelete(true); diff --git a/src/gui/progress.cpp b/src/gui/progress.cpp index 725d7a0..3ecb98e 100644 --- a/src/gui/progress.cpp +++ b/src/gui/progress.cpp @@ -16,10 +16,10 @@ using Tellico::GUI::Progress; -Progress::Progress(TQWidget* tqparent_) : KProgress(tqparent_) { +Progress::Progress(TQWidget* parent_) : KProgress(parent_) { } -Progress::Progress(int totalSteps_, TQWidget* tqparent_) : KProgress(totalSteps_, tqparent_) { +Progress::Progress(int totalSteps_, TQWidget* parent_) : KProgress(totalSteps_, parent_) { } bool Progress::isDone() const { diff --git a/src/gui/ratingfieldwidget.cpp b/src/gui/ratingfieldwidget.cpp index 3887725..77b1677 100644 --- a/src/gui/ratingfieldwidget.cpp +++ b/src/gui/ratingfieldwidget.cpp @@ -17,8 +17,8 @@ using Tellico::GUI::RatingFieldWidget; -RatingFieldWidget::RatingFieldWidget(Data::FieldPtr field_, TQWidget* tqparent_, const char* name_/*=0*/) - : FieldWidget(field_, tqparent_, name_) { +RatingFieldWidget::RatingFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const char* name_/*=0*/) + : FieldWidget(field_, parent_, name_) { m_rating = new RatingWidget(field_, this); connect(m_rating, TQT_SIGNAL(modified()), TQT_SIGNAL(modified())); diff --git a/src/gui/ratingwidget.cpp b/src/gui/ratingwidget.cpp index 4bfa9ec..52b7367 100644 --- a/src/gui/ratingwidget.cpp +++ b/src/gui/ratingwidget.cpp @@ -49,8 +49,8 @@ const TQPixmap& RatingWidget::pixmap(const TQString& value_) { return *pix; } -RatingWidget::RatingWidget(Data::FieldPtr field_, TQWidget* tqparent_, const char* name_/*=0*/) - : TQHBox(tqparent_, name_), m_field(field_), m_currIndex(-1) { +RatingWidget::RatingWidget(Data::FieldPtr field_, TQWidget* parent_, const char* name_/*=0*/) + : TQHBox(parent_, name_), m_field(field_), m_currIndex(-1) { m_pixOn = UserIcon(TQString::tqfromLatin1("star_on")); m_pixOff = UserIcon(TQString::tqfromLatin1("star_off")); setSpacing(0); diff --git a/src/gui/stringmapdialog.cpp b/src/gui/stringmapdialog.cpp index c542fe5..fbd6f6a 100644 --- a/src/gui/stringmapdialog.cpp +++ b/src/gui/stringmapdialog.cpp @@ -27,8 +27,8 @@ using Tellico::StringMapDialog; -StringMapDialog::StringMapDialog(const TQMap& map_, TQWidget* tqparent_, const char* name_/*=0*/, bool modal_/*=false*/) - : KDialogBase(tqparent_, name_, modal_, TQString(), Ok|Cancel) { +StringMapDialog::StringMapDialog(const TQMap& map_, TQWidget* parent_, const char* name_/*=0*/, bool modal_/*=false*/) + : KDialogBase(parent_, name_, modal_, TQString(), Ok|Cancel) { TQWidget* page = new TQWidget(this); TQVBoxLayout* l = new TQVBoxLayout(page, 0, KDialog::spacingHint()); diff --git a/src/gui/tabcontrol.cpp b/src/gui/tabcontrol.cpp index 208d8e4..f3c2bf2 100644 --- a/src/gui/tabcontrol.cpp +++ b/src/gui/tabcontrol.cpp @@ -18,8 +18,8 @@ using Tellico::GUI::TabControl; -TabControl::TabControl(TQWidget* tqparent_, const char* name_/*=0*/) - : TQTabWidget(tqparent_, name_) { +TabControl::TabControl(TQWidget* parent_, const char* name_/*=0*/) + : TQTabWidget(parent_, name_) { } TQTabBar* TabControl::tabBar() const { diff --git a/src/gui/tablefieldwidget.cpp b/src/gui/tablefieldwidget.cpp index bac3ea0..449fbbb 100644 --- a/src/gui/tablefieldwidget.cpp +++ b/src/gui/tablefieldwidget.cpp @@ -30,8 +30,8 @@ namespace { using Tellico::GUI::TableFieldWidget; -TableFieldWidget::TableFieldWidget(Data::FieldPtr field_, TQWidget* tqparent_, const char* name_/*=0*/) - : FieldWidget(field_, tqparent_, name_), m_field(field_), m_row(-1), m_col(-1) { +TableFieldWidget::TableFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const char* name_/*=0*/) + : FieldWidget(field_, parent_, name_), m_field(field_), m_row(-1), m_col(-1) { bool ok; m_columns = Tellico::toUInt(field_->property(TQString::tqfromLatin1("columns")), &ok); diff --git a/src/gui/urlfieldwidget.cpp b/src/gui/urlfieldwidget.cpp index 3c7c720..0ecc37d 100644 --- a/src/gui/urlfieldwidget.cpp +++ b/src/gui/urlfieldwidget.cpp @@ -32,8 +32,8 @@ TQString URLFieldWidget::URLCompletion::makeCompletion(const TQString& text_) { return KURLCompletion::makeCompletion(text_); } -URLFieldWidget::URLFieldWidget(Data::FieldPtr field_, TQWidget* tqparent_, const char* name_/*=0*/) - : FieldWidget(field_, tqparent_, name_), m_run(0) { +URLFieldWidget::URLFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const char* name_/*=0*/) + : FieldWidget(field_, parent_, name_), m_run(0) { m_requester = new KURLRequester(this); m_requester->lineEdit()->setCompletionObject(new URLCompletion()); diff --git a/src/importdialog.cpp b/src/importdialog.cpp index 9985902..86f6c27 100644 --- a/src/importdialog.cpp +++ b/src/importdialog.cpp @@ -50,8 +50,8 @@ const unsigned Tellico::Import::Importer::s_stepSize = 20; using Tellico::ImportDialog; -ImportDialog::ImportDialog(Import::Format format_, const KURL::List& urls_, TQWidget* tqparent_, const char* name_) - : KDialogBase(tqparent_, name_, true /*modal*/, i18n("Import Options"), Ok|Cancel), +ImportDialog::ImportDialog(Import::Format format_, const KURL::List& urls_, TQWidget* parent_, const char* name_) + : KDialogBase(parent_, name_, true /*modal*/, i18n("Import Options"), Ok|Cancel), m_coll(0), m_importer(importer(format_, urls_)) { TQWidget* widget = new TQWidget(this); @@ -362,8 +362,8 @@ void ImportDialog::slotOk() { void ImportDialog::slotUpdateAction() { // distasteful hack // selectedId() is new in QT 3.2 -// m_importer->slotActionChanged(dynamic_cast(m_radioAppend->tqparentWidget())->selectedId()); - TQButtonGroup* bg = static_cast(m_radioAppend->tqparentWidget()); +// m_importer->slotActionChanged(dynamic_cast(m_radioAppend->parentWidget())->selectedId()); + TQButtonGroup* bg = static_cast(m_radioAppend->parentWidget()); m_importer->slotActionChanged(bg->id(bg->selected())); } diff --git a/src/isbnvalidator.cpp b/src/isbnvalidator.cpp index 6eb2636..a3a9034 100644 --- a/src/isbnvalidator.cpp +++ b/src/isbnvalidator.cpp @@ -53,8 +53,8 @@ TQString ISBNValidator::cleanValue(TQString isbn) { return isbn; } -ISBNValidator::ISBNValidator(TQObject* tqparent_, const char* name_/*=0*/) - : TQValidator(tqparent_, name_) { +ISBNValidator::ISBNValidator(TQObject* parent_, const char* name_/*=0*/) + : TQValidator(parent_, name_) { } TQValidator::State ISBNValidator::validate(TQString& input_, int& pos_) const { diff --git a/src/lccnvalidator.cpp b/src/lccnvalidator.cpp index 9b103dd..bee8d35 100644 --- a/src/lccnvalidator.cpp +++ b/src/lccnvalidator.cpp @@ -16,7 +16,7 @@ using Tellico::LCCNValidator; -LCCNValidator::LCCNValidator(TQObject* tqparent_) : TQRegExpValidator(tqparent_) { +LCCNValidator::LCCNValidator(TQObject* parent_) : TQRegExpValidator(parent_) { TQRegExp rx(TQString::tqfromLatin1("[a-z ]{0,3}" "(" "\\d{2}-?\\d{1,6}" diff --git a/src/loandialog.cpp b/src/loandialog.cpp index 5835c53..5d67a8f 100644 --- a/src/loandialog.cpp +++ b/src/loandialog.cpp @@ -36,14 +36,14 @@ using Tellico::LoanDialog; -LoanDialog::LoanDialog(const Data::EntryVec& entries_, TQWidget* tqparent_, const char* name_/*=0*/) - : KDialogBase(tqparent_, name_, true, i18n("Loan Dialog"), Ok|Cancel), +LoanDialog::LoanDialog(const Data::EntryVec& entries_, TQWidget* parent_, const char* name_/*=0*/) + : KDialogBase(parent_, name_, true, i18n("Loan Dialog"), Ok|Cancel), m_mode(Add), m_borrower(0), m_entries(entries_), m_loan(0) { init(); } -LoanDialog::LoanDialog(Data::LoanPtr loan_, TQWidget* tqparent_, const char* name_/*=0*/) - : KDialogBase(tqparent_, name_, true, i18n("Modify Loan"), Ok|Cancel), +LoanDialog::LoanDialog(Data::LoanPtr loan_, TQWidget* parent_, const char* name_/*=0*/) + : KDialogBase(parent_, name_, true, i18n("Modify Loan"), Ok|Cancel), m_mode(Modify), m_borrower(loan_->borrower()), m_loan(loan_) { m_entries.append(m_loan->entry()); diff --git a/src/loanitem.cpp b/src/loanitem.cpp index 3bdb757..744397d 100644 --- a/src/loanitem.cpp +++ b/src/loanitem.cpp @@ -17,8 +17,8 @@ using Tellico::LoanItem; -LoanItem::LoanItem(GUI::CountedItem* tqparent_, Tellico::Data::LoanPtr loan_) - : Tellico::EntryItem(tqparent_, loan_->entry()), m_loan(loan_) { +LoanItem::LoanItem(GUI::CountedItem* parent_, Tellico::Data::LoanPtr loan_) + : Tellico::EntryItem(parent_, loan_->entry()), m_loan(loan_) { } void LoanItem::doubleClicked() { diff --git a/src/loanview.cpp b/src/loanview.cpp index f18c6ab..b2e4347 100644 --- a/src/loanview.cpp +++ b/src/loanview.cpp @@ -29,7 +29,7 @@ using Tellico::LoanView; -LoanView::LoanView(TQWidget* tqparent_, const char* name_) : GUI::ListView(tqparent_, name_), m_notSortedYet(true) { +LoanView::LoanView(TQWidget* parent_, const char* name_) : GUI::ListView(parent_, name_), m_notSortedYet(true) { addColumn(i18n("Borrower")); header()->setStretchEnabled(true, 0); setResizeMode(TQListView::NoColumn); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index d915d72..c09b3c4 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -97,7 +97,7 @@ namespace { using Tellico::MainWindow; -MainWindow::MainWindow(TQWidget* tqparent_/*=0*/, const char* name_/*=0*/) : KMainWindow(tqparent_, name_), +MainWindow::MainWindow(TQWidget* parent_/*=0*/, const char* name_/*=0*/) : KMainWindow(parent_, name_), ApplicationInterface(), m_updateAll(0), m_statusBar(0), @@ -1592,7 +1592,7 @@ void MainWindow::slotHandleConfigChange() { suffixes != Config::nameSuffixList() || prefixes != Config::surnamePrefixList()) { // tqinvalidate all groups - Data::Document::self()->collection()->tqinvalidateGroups(); + Data::Document::self()->collection()->invalidateGroups(); // refreshing the title causes the group view to refresh Controller::self()->slotRefreshField(Data::Document::self()->collection()->fieldByName(TQString::tqfromLatin1("title"))); } diff --git a/src/newstuff/dialog.cpp b/src/newstuff/dialog.cpp index 6cacc72..8e6f229 100644 --- a/src/newstuff/dialog.cpp +++ b/src/newstuff/dialog.cpp @@ -90,8 +90,8 @@ private: InstalltqStatus m_status; }; -Dialog::Dialog(NewStuff::DataType type_, TQWidget* tqparent_) - : KDialogBase(KDialogBase::Plain, i18n("Get Hot New Stuff"), 0, (KDialogBase::ButtonCode)0, tqparent_) +Dialog::Dialog(NewStuff::DataType type_, TQWidget* parent_) + : KDialogBase(KDialogBase::Plain, i18n("Get Hot New Stuff"), 0, (KDialogBase::ButtonCode)0, parent_) , m_manager(new Manager(TQT_TQOBJECT(this))) , m_type(type_) , m_timer(new TQTimer(this)) diff --git a/src/newstuff/manager.cpp b/src/newstuff/manager.cpp index 01d9932..deff143 100644 --- a/src/newstuff/manager.cpp +++ b/src/newstuff/manager.cpp @@ -42,7 +42,7 @@ using Tellico::NewStuff::Manager; -Manager::Manager(TQObject* tqparent_) : TQObject(tqparent_), m_tempFile(0) { +Manager::Manager(TQObject* parent_) : TQObject(parent_), m_tempFile(0) { m_infoList.setAutoDelete(true); } diff --git a/src/newstuff/newscript.cpp b/src/newstuff/newscript.cpp index e942d06..3a47dd1 100644 --- a/src/newstuff/newscript.cpp +++ b/src/newstuff/newscript.cpp @@ -20,11 +20,11 @@ using Tellico::NewStuff::NewScript; -NewScript::NewScript(Manager* manager_, TQWidget* tqparentWidget_) +NewScript::NewScript(Manager* manager_, TQWidget* parentWidget_) #if KDE_IS_VERSION(3,3,90) - : KNewStuffSecure(TQString::tqfromLatin1("tellico/data-source"), tqparentWidget_) + : KNewStuffSecure(TQString::tqfromLatin1("tellico/data-source"), parentWidget_) #else - : TQObject(tqparentWidget_) + : TQObject(parentWidget_) #endif , m_manager(manager_), m_success(false) { } diff --git a/src/newstuff/newscript.h b/src/newstuff/newscript.h index 9fd694e..d8b7a43 100644 --- a/src/newstuff/newscript.h +++ b/src/newstuff/newscript.h @@ -36,7 +36,7 @@ Q_OBJECT TQ_OBJECT public: - NewScript(Manager* manager, TQWidget* tqparentWidget = 0); + NewScript(Manager* manager, TQWidget* parentWidget = 0); virtual ~NewScript() {} const KURL& url() const { return m_url; } diff --git a/src/newstuff/providerloader.cpp b/src/newstuff/providerloader.cpp index 1cad0ef..4288cdd 100644 --- a/src/newstuff/providerloader.cpp +++ b/src/newstuff/providerloader.cpp @@ -30,8 +30,8 @@ using Tellico::NewStuff::ProviderLoader; -ProviderLoader::ProviderLoader( TQWidget *tqparentWidget ) : - mParentWidget( tqparentWidget ), mTryAlt(true) +ProviderLoader::ProviderLoader( TQWidget *parentWidget ) : + mParentWidget( parentWidget ), mTryAlt(true) { mProviders.setAutoDelete( true ); } diff --git a/src/newstuff/providerloader.h b/src/newstuff/providerloader.h index a492dcc..37ca7d1 100644 --- a/src/newstuff/providerloader.h +++ b/src/newstuff/providerloader.h @@ -41,9 +41,9 @@ public: /** * Constructor. * - * @param tqparentWidget the tqparent widget + * @param parentWidget the tqparent widget */ - ProviderLoader( TQWidget *tqparentWidget ); + ProviderLoader( TQWidget *parentWidget ); /** * Starts asynchronously loading the list of providers of the diff --git a/src/reportdialog.cpp b/src/reportdialog.cpp index cfdfe8b..7b0d815 100644 --- a/src/reportdialog.cpp +++ b/src/reportdialog.cpp @@ -49,8 +49,8 @@ namespace { using Tellico::ReportDialog; // default button is going to be used as a print button, so it's separated -ReportDialog::ReportDialog(TQWidget* tqparent_, const char* name_/*=0*/) - : KDialogBase(tqparent_, name_, false, i18n("Collection Report"), Close, Close), +ReportDialog::ReportDialog(TQWidget* parent_, const char* name_/*=0*/) + : KDialogBase(parent_, name_, false, i18n("Collection Report"), Close, Close), m_exporter(0) { TQWidget* mainWidget = new TQWidget(this, "ReportDialog mainWidget"); setMainWidget(mainWidget); diff --git a/src/statusbar.cpp b/src/statusbar.cpp index 2e8ef67..c0e00a6 100644 --- a/src/statusbar.cpp +++ b/src/statusbar.cpp @@ -31,7 +31,7 @@ using Tellico::StatusBar; StatusBar* StatusBar::s_self = 0; -StatusBar::StatusBar(TQWidget* tqparent_) : KStatusBar(tqparent_) { +StatusBar::StatusBar(TQWidget* parent_) : KStatusBar(parent_) { s_self = this; // don't care about text and id diff --git a/src/translators/alexandriaimporter.cpp b/src/translators/alexandriaimporter.cpp index 2c67408..1df5116 100644 --- a/src/translators/alexandriaimporter.cpp +++ b/src/translators/alexandriaimporter.cpp @@ -179,7 +179,7 @@ Tellico::Data::CollPtr AlexandriaImporter::collection() { return m_coll; } -TQWidget* AlexandriaImporter::widget(TQWidget* tqparent_, const char* name_/*=0*/) { +TQWidget* AlexandriaImporter::widget(TQWidget* parent_, const char* name_/*=0*/) { if(m_widget) { return m_widget; } @@ -187,7 +187,7 @@ TQWidget* AlexandriaImporter::widget(TQWidget* tqparent_, const char* name_/*=0* m_libraryDir = TQDir::home(); m_libraryDir.setFilter(TQDir::Dirs | TQDir::Readable | TQDir::NoSymLinks); - m_widget = new TQWidget(tqparent_, name_); + m_widget = new TQWidget(parent_, name_); TQVBoxLayout* l = new TQVBoxLayout(m_widget); TQGroupBox* box = new TQGroupBox(2, Qt::Horizontal, i18n("Alexandria Options"), m_widget); diff --git a/src/translators/amcimporter.cpp b/src/translators/amcimporter.cpp index 399d7a7..d988d55 100644 --- a/src/translators/amcimporter.cpp +++ b/src/translators/amcimporter.cpp @@ -260,14 +260,14 @@ TQStringList AMCImporter::parseCast(const TQString& text_) { } else if(text_.at(pos) == '(') { if(nPar == 0) { person = text_.mid(oldPos, pos-oldPos).stripWhiteSpace(); - oldPos = pos+1; // add one to go past tqparenthesis + oldPos = pos+1; // add one to go past parenthesis } ++nPar; } else if(text_.at(pos) == ')') { --nPar; if(nPar == 0) { role = text_.mid(oldPos, pos-oldPos).stripWhiteSpace(); - oldPos = pos+1; // add one to go past tqparenthesis + oldPos = pos+1; // add one to go past parenthesis } } } diff --git a/src/translators/audiofileimporter.cpp b/src/translators/audiofileimporter.cpp index 0d23fa5..539c03e 100644 --- a/src/translators/audiofileimporter.cpp +++ b/src/translators/audiofileimporter.cpp @@ -329,12 +329,12 @@ Tellico::Data::CollPtr AudioFileImporter::collection() { #endif } -TQWidget* AudioFileImporter::widget(TQWidget* tqparent_, const char* name_) { +TQWidget* AudioFileImporter::widget(TQWidget* parent_, const char* name_) { if(m_widget) { return m_widget; } - m_widget = new TQWidget(tqparent_, name_); + m_widget = new TQWidget(parent_, name_); TQVBoxLayout* l = new TQVBoxLayout(m_widget); TQVGroupBox* box = new TQVGroupBox(i18n("Audio File Options"), m_widget); diff --git a/src/translators/bibtexexporter.cpp b/src/translators/bibtexexporter.cpp index d1aa57b..867dda3 100644 --- a/src/translators/bibtexexporter.cpp +++ b/src/translators/bibtexexporter.cpp @@ -190,12 +190,12 @@ bool BibtexExporter::exec() { return FileHandler::writeTextURL(url(), text, options() & ExportUTF8, options() & Export::ExportForce); } -TQWidget* BibtexExporter::widget(TQWidget* tqparent_, const char* name_/*=0*/) { - if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(tqparent_)) { +TQWidget* BibtexExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { + if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) { return m_widget; } - m_widget = new TQWidget(tqparent_, name_); + m_widget = new TQWidget(parent_, name_); TQVBoxLayout* l = new TQVBoxLayout(m_widget); TQGroupBox* box = new TQGroupBox(1, Qt::Horizontal, i18n("Bibtex Options"), m_widget); diff --git a/src/translators/bibteximporter.cpp b/src/translators/bibteximporter.cpp index 8394f6a..97ab55c 100644 --- a/src/translators/bibteximporter.cpp +++ b/src/translators/bibteximporter.cpp @@ -278,12 +278,12 @@ void BibtexImporter::slotCancel() { m_cancelled = true; } -TQWidget* BibtexImporter::widget(TQWidget* tqparent_, const char* name_/*=0*/) { +TQWidget* BibtexImporter::widget(TQWidget* parent_, const char* name_/*=0*/) { if(m_widget) { return m_widget; } - m_widget = new TQWidget(tqparent_, name_); + m_widget = new TQWidget(parent_, name_); TQVBoxLayout* l = new TQVBoxLayout(m_widget); TQButtonGroup* box = new TQVButtonGroup(i18n("Bibtex Options"), m_widget); diff --git a/src/translators/bibtexmlexporter.cpp b/src/translators/bibtexmlexporter.cpp index 153fd3f..85934b2 100644 --- a/src/translators/bibtexmlexporter.cpp +++ b/src/translators/bibtexmlexporter.cpp @@ -99,7 +99,7 @@ bool BibtexmlExporter::exec() { StringSet usedKeys; TQString type, key, newKey, value, elemName, parElemName; - TQDomElement btElem, entryElem, tqparentElem, fieldElem; + TQDomElement btElem, entryElem, parentElem, fieldElem; for(Data::EntryVec::ConstIterator entryIt = entries().begin(); entryIt != entries().end(); ++entryIt) { key = entryIt->field(keyField); if(key.isEmpty()) { @@ -157,15 +157,15 @@ bool BibtexmlExporter::exec() { elemName = TQString::tqfromLatin1("keyword"); } - tqparentElem = dom.createElement(parElemName); + parentElem = dom.createElement(parElemName); const TQStringList values = entryIt->fields(field->name(), false); for(TQStringList::ConstIterator it = values.begin(); it != values.end(); ++it) { fieldElem = dom.createElement(elemName); fieldElem.appendChild(dom.createTextNode(*it)); - tqparentElem.appendChild(fieldElem); + parentElem.appendChild(fieldElem); } - if(tqparentElem.hasChildNodes()) { - entryElem.appendChild(tqparentElem); + if(parentElem.hasChildNodes()) { + entryElem.appendChild(parentElem); } } else { fieldElem = dom.createElement(elemName); diff --git a/src/translators/btparse/btparse.h b/src/translators/btparse/btparse.h index c2d0200..df5206c 100644 --- a/src/translators/btparse/btparse.h +++ b/src/translators/btparse/btparse.h @@ -254,7 +254,7 @@ extern "C" { * First, we might need a prototype for strdup() (because the zzcr_ast * macro uses it, and that macro is used in pccts/ast.c -- which I don't * want to modify if I can help it, because it's someone else's code). - * This is to accomodate AIX, where including aptqparently doesn't + * This is to accomodate AIX, where including apparently doesn't * declare strdup() (reported by Reiner Schlotte * ), and compiling bibtex.c (which * includes pccts/ast.c) crashes because of this (yes, yes, I know it diff --git a/src/translators/btparse/input.c b/src/translators/btparse/input.c index c50468e..03668af 100644 --- a/src/translators/btparse/input.c +++ b/src/translators/btparse/input.c @@ -164,7 +164,7 @@ finish_parse (int **err_counts) @RETURNS : false if there were serious errors in the recently-parsed input true otherwise (no errors or just warnings) @DESCRIPTION: Gets the "error status" bitmap relative to a saved set of - error counts and tqmasks of non-serious errors. + error counts and masks of non-serious errors. @GLOBALS : @CALLS : @CALLERS : @@ -178,7 +178,7 @@ parse_status (int *saved_counts) /* * This bit-twiddling fetches the error status (which has a bit - * for each error class), tqmasks off the bits for trivial errors + * for each error class), masks off the bits for trivial errors * to get "true" if there were any serious errors, and then * returns the opposite of that. */ diff --git a/src/translators/btparse/lex_auxiliary.c b/src/translators/btparse/lex_auxiliary.c index 9e5b452..097fcb6 100644 --- a/src/translators/btparse/lex_auxiliary.c +++ b/src/translators/btparse/lex_auxiliary.c @@ -107,7 +107,7 @@ static int JunkCount; /* non-whitespace chars at toplevel */ * brace depth within a string; we can only end the current string * when this is zero * ParenDepth: - * tqparenthesis depth within a string; needed for @comment entries + * parenthesis depth within a string; needed for @comment entries * that are paren-delimited (because the comment in that case is * a paren-delimited string) * StringOpener: @@ -117,7 +117,7 @@ static int JunkCount; /* non-whitespace chars at toplevel */ * StringStart: * line on which current string started; if we detect an aptqparent * runaway, this is used to report where the runaway started - * AptqparentRunaway: + * ApparentRunaway: * flags if we have already detected (and warned) that the current * string appears to be a runaway, so that we don't warn again * (and again and again and again) @@ -130,9 +130,9 @@ static int JunkCount; /* non-whitespace chars at toplevel */ */ static char StringOpener = '\0'; /* '{' or '"' */ static int BraceDepth; /* depth of brace-nesting */ -static int ParenDepth; /* depth of tqparenthesis-nesting */ +static int ParenDepth; /* depth of parenthesis-nesting */ static int StringStart = -1; /* start line of current string */ -static int AptqparentRunaway; /* current string looks like runaway */ +static int ApparentRunaway; /* current string looks like runaway */ static int QuoteWarned; /* already warned about " in string? */ @@ -590,7 +590,7 @@ void start_string (char start_char) BraceDepth = 0; ParenDepth = 0; StringStart = zzline; - AptqparentRunaway = 0; + ApparentRunaway = 0; QuoteWarned = 0; if (start_char == '{') open_brace (); @@ -598,7 +598,7 @@ void start_string (char start_char) ParenDepth++; if (start_char == '"' && EntryState == in_comment) { - lexical_error ("comment entries must be delimited by either braces or tqparentheses"); + lexical_error ("comment entries must be delimited by either braces or parentheses"); EntryState = toplevel; zzmode (START); return; @@ -878,7 +878,7 @@ void check_runaway_string (void) } - if (!AptqparentRunaway) /* haven't already warned about it */ + if (!ApparentRunaway) /* haven't already warned about it */ { enum { none, entry, field, giveup } guess; @@ -930,7 +930,7 @@ void check_runaway_string (void) { lexical_warning ("possible runaway string started at line %d", StringStart); - AptqparentRunaway = 1; + ApparentRunaway = 1; } } diff --git a/src/translators/csvexporter.cpp b/src/translators/csvexporter.cpp index 4d4d32e..ef608b7 100644 --- a/src/translators/csvexporter.cpp +++ b/src/translators/csvexporter.cpp @@ -98,12 +98,12 @@ bool CSVExporter::exec() { return FileHandler::writeTextURL(url(), text, options() & ExportUTF8, options() & Export::ExportForce); } -TQWidget* CSVExporter::widget(TQWidget* tqparent_, const char* name_/*=0*/) { - if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(tqparent_)) { +TQWidget* CSVExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { + if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) { return m_widget; } - m_widget = new TQWidget(tqparent_, name_); + m_widget = new TQWidget(parent_, name_); TQVBoxLayout* l = new TQVBoxLayout(m_widget); TQGroupBox* box = new TQGroupBox(1, Qt::Horizontal, i18n("CSV Options"), m_widget); diff --git a/src/translators/csvimporter.cpp b/src/translators/csvimporter.cpp index 683a3d1..b23dd93 100644 --- a/src/translators/csvimporter.cpp +++ b/src/translators/csvimporter.cpp @@ -210,12 +210,12 @@ Tellico::Data::CollPtr CSVImporter::collection() { return m_coll; } -TQWidget* CSVImporter::widget(TQWidget* tqparent_, const char* name_) { - if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(tqparent_)) { +TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) { + if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) { return m_widget; } - m_widget = new TQWidget(tqparent_, name_); + m_widget = new TQWidget(parent_, name_); TQVBoxLayout* l = new TQVBoxLayout(m_widget); TQGroupBox* group = new TQGroupBox(1, Qt::Horizontal, i18n("CSV Options"), m_widget); diff --git a/src/translators/filelistingimporter.cpp b/src/translators/filelistingimporter.cpp index 00e0709..8f3afe1 100644 --- a/src/translators/filelistingimporter.cpp +++ b/src/translators/filelistingimporter.cpp @@ -180,12 +180,12 @@ Tellico::Data::CollPtr FileListingImporter::collection() { return m_coll; } -TQWidget* FileListingImporter::widget(TQWidget* tqparent_, const char* name_) { +TQWidget* FileListingImporter::widget(TQWidget* parent_, const char* name_) { if(m_widget) { return m_widget; } - m_widget = new TQWidget(tqparent_, name_); + m_widget = new TQWidget(parent_, name_); TQVBoxLayout* l = new TQVBoxLayout(m_widget); TQVGroupBox* box = new TQVGroupBox(i18n("File Listing Options"), m_widget); diff --git a/src/translators/freedbimporter.cpp b/src/translators/freedbimporter.cpp index 1364b4e..155f79e 100644 --- a/src/translators/freedbimporter.cpp +++ b/src/translators/freedbimporter.cpp @@ -479,11 +479,11 @@ void FreeDBImporter::readCDText(const TQCString& drive_) { } #undef SETFIELD -TQWidget* FreeDBImporter::widget(TQWidget* tqparent_, const char* name_/*=0*/) { +TQWidget* FreeDBImporter::widget(TQWidget* parent_, const char* name_/*=0*/) { if(m_widget) { return m_widget; } - m_widget = new TQWidget(tqparent_, name_); + m_widget = new TQWidget(parent_, name_); TQVBoxLayout* l = new TQVBoxLayout(m_widget); TQGroupBox* bigbox = new TQGroupBox(1, Qt::Horizontal, i18n("Audio CD Options"), m_widget); diff --git a/src/translators/griffith2tellico.py b/src/translators/griffith2tellico.py index 31c947e..19bf583 100755 --- a/src/translators/griffith2tellico.py +++ b/src/translators/griffith2tellico.py @@ -149,7 +149,7 @@ class BasicTellicoDOM: else: field = key - tqparentNode = self.__doc.createElement(field + 's') + parentNode = self.__doc.createElement(field + 's') for value in values: if len(value) == 0: continue @@ -173,9 +173,9 @@ class BasicTellicoDOM: else: node.appendChild(self.__doc.createTextNode(value.strip())) - if node.hasChildNodes(): tqparentNode.appendChild(node) + if node.hasChildNodes(): parentNode.appendChild(node) - if tqparentNode.hasChildNodes(): entryNode.appendChild(tqparentNode) + if parentNode.hasChildNodes(): entryNode.appendChild(parentNode) self.__collection.appendChild(entryNode) diff --git a/src/translators/htmlexporter.cpp b/src/translators/htmlexporter.cpp index b8a38c0..77a09c0 100644 --- a/src/translators/htmlexporter.cpp +++ b/src/translators/htmlexporter.cpp @@ -454,12 +454,12 @@ void HTMLExporter::writeImages(Data::CollPtr coll_) { } } -TQWidget* HTMLExporter::widget(TQWidget* tqparent_, const char* name_/*=0*/) { - if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(tqparent_)) { +TQWidget* HTMLExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { + if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) { return m_widget; } - m_widget = new TQWidget(tqparent_, name_); + m_widget = new TQWidget(parent_, name_); TQVBoxLayout* l = new TQVBoxLayout(m_widget); TQGroupBox* box = new TQGroupBox(1, Qt::Horizontal, i18n("HTML Options"), m_widget); diff --git a/src/translators/onixexporter.cpp b/src/translators/onixexporter.cpp index d58e9fe..e0d0de3 100644 --- a/src/translators/onixexporter.cpp +++ b/src/translators/onixexporter.cpp @@ -165,12 +165,12 @@ TQString ONIXExporter::text() { return m_handler->applyStylesheet(output.toString()); } -TQWidget* ONIXExporter::widget(TQWidget* tqparent_, const char* name_/*=0*/) { - if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(tqparent_)) { +TQWidget* ONIXExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { + if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) { return m_widget; } - m_widget = new TQWidget(tqparent_, name_); + m_widget = new TQWidget(parent_, name_); TQVBoxLayout* l = new TQVBoxLayout(m_widget); TQGroupBox* box = new TQGroupBox(1, Qt::Horizontal, i18n("ONIX Archive Options"), m_widget); diff --git a/src/translators/pilotdbexporter.cpp b/src/translators/pilotdbexporter.cpp index 03115e9..caab986 100644 --- a/src/translators/pilotdbexporter.cpp +++ b/src/translators/pilotdbexporter.cpp @@ -199,12 +199,12 @@ bool PilotDBExporter::exec() { return FileHandler::writeDataURL(url(), pdb.data(), options() & Export::ExportForce); } -TQWidget* PilotDBExporter::widget(TQWidget* tqparent_, const char* name_/*=0*/) { - if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(tqparent_)) { +TQWidget* PilotDBExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { + if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) { return m_widget; } - m_widget = new TQWidget(tqparent_, name_); + m_widget = new TQWidget(parent_, name_); TQVBoxLayout* l = new TQVBoxLayout(m_widget); TQGroupBox* box = new TQGroupBox(1, Qt::Horizontal, i18n("PilotDB Options"), m_widget); diff --git a/src/translators/tellicoimporter.cpp b/src/translators/tellicoimporter.cpp index ae06500..3f97074 100644 --- a/src/translators/tellicoimporter.cpp +++ b/src/translators/tellicoimporter.cpp @@ -214,7 +214,7 @@ void TellicoImporter::loadXMLData(const TQByteArray& data_, bool loadImages_) { // removeChild only works for immediate tqchildren // remove _default field if(addFields) { - fieldelems.item(0).tqparentNode().removeChild(fieldelems.item(0)); + fieldelems.item(0).parentNode().removeChild(fieldelems.item(0)); } } diff --git a/src/translators/tellicoxmlexporter.cpp b/src/translators/tellicoxmlexporter.cpp index 397366b..011d991 100644 --- a/src/translators/tellicoxmlexporter.cpp +++ b/src/translators/tellicoxmlexporter.cpp @@ -114,7 +114,7 @@ TQString TellicoXMLExporter::exportXMLString() const { return exportXML().toString(); } -void TellicoXMLExporter::exportCollectionXML(TQDomDocument& dom_, TQDomElement& tqparent_, bool format_) const { +void TellicoXMLExporter::exportCollectionXML(TQDomDocument& dom_, TQDomElement& parent_, bool format_) const { Data::CollPtr coll = collection(); if(!coll) { kdWarning() << "TellicoXMLExporter::exportCollectionXML() - no collection pointer!" << endl; @@ -173,7 +173,7 @@ void TellicoXMLExporter::exportCollectionXML(TQDomDocument& dom_, TQDomElement& exportGroupXML(dom_, collElem); } - tqparent_.appendChild(collElem); + parent_.appendChild(collElem); // the borrowers and filters are in the tellico object, not the collection if(options() & Export::ExportComplete) { @@ -183,7 +183,7 @@ void TellicoXMLExporter::exportCollectionXML(TQDomDocument& dom_, TQDomElement& exportBorrowerXML(dom_, bElem, bIt); } if(bElem.hasChildNodes()) { - tqparent_.appendChild(bElem); + parent_.appendChild(bElem); } TQDomElement fElem = dom_.createElement(TQString::tqfromLatin1("filters")); @@ -192,12 +192,12 @@ void TellicoXMLExporter::exportCollectionXML(TQDomDocument& dom_, TQDomElement& exportFilterXML(dom_, fElem, fIt); } if(fElem.hasChildNodes()) { - tqparent_.appendChild(fElem); + parent_.appendChild(fElem); } } } -void TellicoXMLExporter::exportFieldXML(TQDomDocument& dom_, TQDomElement& tqparent_, Data::FieldPtr field_) const { +void TellicoXMLExporter::exportFieldXML(TQDomDocument& dom_, TQDomElement& parent_, Data::FieldPtr field_) const { TQDomElement elem = dom_.createElement(TQString::tqfromLatin1("field")); elem.setAttribute(TQString::tqfromLatin1("name"), field_->name()); @@ -227,10 +227,10 @@ void TellicoXMLExporter::exportFieldXML(TQDomDocument& dom_, TQDomElement& tqpar elem.appendChild(e); } - tqparent_.appendChild(elem); + parent_.appendChild(elem); } -void TellicoXMLExporter::exportEntryXML(TQDomDocument& dom_, TQDomElement& tqparent_, Data::EntryPtr entry_, bool format_) const { +void TellicoXMLExporter::exportEntryXML(TQDomDocument& dom_, TQDomElement& parent_, Data::EntryPtr entry_, bool format_) const { TQDomElement entryElem = dom_.createElement(TQString::tqfromLatin1("entry")); entryElem.setAttribute(TQString::tqfromLatin1("id"), entry_->id()); @@ -333,10 +333,10 @@ void TellicoXMLExporter::exportEntryXML(TQDomDocument& dom_, TQDomElement& tqpar } } // end field loop - tqparent_.appendChild(entryElem); + parent_.appendChild(entryElem); } -void TellicoXMLExporter::exportImageXML(TQDomDocument& dom_, TQDomElement& tqparent_, const TQString& id_) const { +void TellicoXMLExporter::exportImageXML(TQDomDocument& dom_, TQDomElement& parent_, const TQString& id_) const { if(id_.isEmpty()) { myDebug() << "TellicoXMLExporter::exportImageXML() - empty image!" << endl; return; @@ -374,10 +374,10 @@ void TellicoXMLExporter::exportImageXML(TQDomDocument& dom_, TQDomElement& tqpar imgElem.setAttribute(TQString::tqfromLatin1("link"), TQString::tqfromLatin1("true")); } } - tqparent_.appendChild(imgElem); + parent_.appendChild(imgElem); } -void TellicoXMLExporter::exportGroupXML(TQDomDocument& dom_, TQDomElement& tqparent_) const { +void TellicoXMLExporter::exportGroupXML(TQDomDocument& dom_, TQDomElement& parent_) const { Data::EntryVec vec = entries(); // need a copy for ::tqcontains(); bool exportAll = collection()->entries().count() == vec.count(); // iterate over each group, which are the first tqchildren @@ -398,12 +398,12 @@ void TellicoXMLExporter::exportGroupXML(TQDomDocument& dom_, TQDomElement& tqpar groupElem.appendChild(entryRefElem); } if(groupElem.hasChildNodes()) { - tqparent_.appendChild(groupElem); + parent_.appendChild(groupElem); } } } -void TellicoXMLExporter::exportFilterXML(TQDomDocument& dom_, TQDomElement& tqparent_, FilterPtr filter_) const { +void TellicoXMLExporter::exportFilterXML(TQDomDocument& dom_, TQDomElement& parent_, FilterPtr filter_) const { TQDomElement filterElem = dom_.createElement(TQString::tqfromLatin1("filter")); filterElem.setAttribute(TQString::tqfromLatin1("name"), filter_->name()); @@ -439,17 +439,17 @@ void TellicoXMLExporter::exportFilterXML(TQDomDocument& dom_, TQDomElement& tqpa filterElem.appendChild(ruleElem); } - tqparent_.appendChild(filterElem); + parent_.appendChild(filterElem); } -void TellicoXMLExporter::exportBorrowerXML(TQDomDocument& dom_, TQDomElement& tqparent_, +void TellicoXMLExporter::exportBorrowerXML(TQDomDocument& dom_, TQDomElement& parent_, Data::BorrowerPtr borrower_) const { if(borrower_->isEmpty()) { return; } TQDomElement bElem = dom_.createElement(TQString::tqfromLatin1("borrower")); - tqparent_.appendChild(bElem); + parent_.appendChild(bElem); bElem.setAttribute(TQString::tqfromLatin1("name"), borrower_->name()); bElem.setAttribute(TQString::tqfromLatin1("uid"), borrower_->uid()); @@ -471,12 +471,12 @@ void TellicoXMLExporter::exportBorrowerXML(TQDomDocument& dom_, TQDomElement& tq } } -TQWidget* TellicoXMLExporter::widget(TQWidget* tqparent_, const char* name_/*=0*/) { - if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(tqparent_)) { +TQWidget* TellicoXMLExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { + if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) { return m_widget; } - m_widget = new TQWidget(tqparent_, name_); + m_widget = new TQWidget(parent_, name_); TQVBoxLayout* l = new TQVBoxLayout(m_widget); TQGroupBox* box = new TQGroupBox(1, Qt::Horizontal, i18n("Tellico XML Options"), m_widget); diff --git a/src/translators/xsltexporter.cpp b/src/translators/xsltexporter.cpp index 09636f2..e797f7e 100644 --- a/src/translators/xsltexporter.cpp +++ b/src/translators/xsltexporter.cpp @@ -58,12 +58,12 @@ bool XSLTExporter::exec() { options() & ExportUTF8, options() & Export::ExportForce); } -TQWidget* XSLTExporter::widget(TQWidget* tqparent_, const char* name_/*=0*/) { - if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(tqparent_)) { +TQWidget* XSLTExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { + if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) { return m_widget; } - m_widget = new TQWidget(tqparent_, name_); + m_widget = new TQWidget(parent_, name_); TQVBoxLayout* l = new TQVBoxLayout(m_widget); TQGroupBox* group = new TQGroupBox(1, Qt::Horizontal, i18n("XSLT Options"), m_widget); diff --git a/src/translators/xsltimporter.cpp b/src/translators/xsltimporter.cpp index 62f7255..eb4cd2a 100644 --- a/src/translators/xsltimporter.cpp +++ b/src/translators/xsltimporter.cpp @@ -86,13 +86,13 @@ Tellico::Data::CollPtr XSLTImporter::collection() { return m_coll; } -TQWidget* XSLTImporter::widget(TQWidget* tqparent_, const char* name_) { +TQWidget* XSLTImporter::widget(TQWidget* parent_, const char* name_) { // if the url has already been set, then there's no widget if(!m_xsltURL.isEmpty()) { return 0; } - m_widget = new TQWidget(tqparent_, name_); + m_widget = new TQWidget(parent_, name_); TQVBoxLayout* l = new TQVBoxLayout(m_widget); TQGroupBox* box = new TQGroupBox(1, Qt::Vertical, i18n("XSLT Options"), m_widget); diff --git a/src/upcvalidator.cpp b/src/upcvalidator.cpp index 4e51179..8746595 100644 --- a/src/upcvalidator.cpp +++ b/src/upcvalidator.cpp @@ -18,8 +18,8 @@ using Tellico::UPCValidator; -UPCValidator::UPCValidator(TQObject* tqparent_, const char* name_/*=0*/) - : TQValidator(tqparent_, name_), m_checkISBN(false) { +UPCValidator::UPCValidator(TQObject* parent_, const char* name_/*=0*/) + : TQValidator(parent_, name_), m_checkISBN(false) { } TQValidator::State UPCValidator::validate(TQString& input_, int& pos_) const { diff --git a/src/viewstack.cpp b/src/viewstack.cpp index 529c262..5af9e23 100644 --- a/src/viewstack.cpp +++ b/src/viewstack.cpp @@ -24,7 +24,7 @@ using Tellico::ViewStack; -ViewStack::ViewStack(TQWidget* tqparent_, const char* name_/*=0*/) : TQWidgetStack(tqparent_, name_), +ViewStack::ViewStack(TQWidget* parent_, const char* name_/*=0*/) : TQWidgetStack(parent_, name_), m_entryView(new EntryView(this)), m_iconView(new EntryIconView(this)) { TQWhatsThis::add(m_entryView->view(), i18n("The Entry View shows a formatted view of the entry's " "contents."));