From 89c017c3d5126cabd96acce26f538b37b48c085f Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: [PATCH] rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/tellico@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/borrowerdialog.h | 10 +++++----- src/borroweritem.h | 2 +- src/collectionfieldsdialog.cpp | 2 +- src/collectionfieldsdialog.h | 6 +++--- src/configdialog.cpp | 2 +- src/configdialog.h | 8 ++++---- src/controller.h | 8 ++++---- src/core/drophandler.h | 2 +- src/detailedentryitem.h | 2 +- src/detailedlistview.h | 4 ++-- src/entry.h | 8 ++++---- src/entryeditdialog.cpp | 10 +++++----- src/entryeditdialog.h | 4 ++-- src/entrygroupitem.h | 2 +- src/entryiconview.h | 4 ++-- src/entryitem.cpp | 4 ++-- src/entryitem.h | 10 +++++----- src/entrymerger.h | 2 +- src/entryupdater.h | 4 ++-- src/entryview.h | 4 ++-- src/exportdialog.h | 2 +- src/fetch/amazonfetcher.h | 4 ++-- src/fetch/animenfofetcher.h | 4 ++-- src/fetch/arxivfetcher.h | 4 ++-- src/fetch/bibsonomyfetcher.h | 4 ++-- src/fetch/citebasefetcher.h | 4 ++-- src/fetch/configwidget.h | 2 +- src/fetch/crossreffetcher.h | 4 ++-- src/fetch/discogsfetcher.h | 4 ++-- src/fetch/entrezfetcher.h | 4 ++-- src/fetch/execexternalfetcher.h | 6 +++--- src/fetch/fetcher.h | 4 ++-- src/fetch/fetchmanager.h | 2 +- src/fetch/gcstarpluginfetcher.h | 6 +++--- src/fetch/googlescholarfetcher.h | 4 ++-- src/fetch/ibsfetcher.h | 4 ++-- src/fetch/imdbfetcher.h | 4 ++-- src/fetch/isbndbfetcher.h | 4 ++-- src/fetch/srufetcher.h | 8 ++++---- src/fetch/yahoofetcher.h | 4 ++-- src/fetch/z3950fetcher.h | 6 +++--- src/fetchdialog.h | 2 +- src/fetcherconfigdialog.h | 4 ++-- src/filterdialog.h | 10 +++++----- src/filteritem.h | 2 +- src/filterview.h | 2 +- src/groupview.h | 4 ++-- src/gui/boolfieldwidget.h | 2 +- src/gui/choicefieldwidget.h | 2 +- src/gui/collectiontypecombo.h | 2 +- src/gui/counteditem.h | 4 ++-- src/gui/datefieldwidget.h | 2 +- src/gui/datewidget.cpp | 2 +- src/gui/datewidget.h | 4 ++-- src/gui/fieldwidget.cpp | 2 +- src/gui/fieldwidget.h | 4 ++-- src/gui/imagefieldwidget.h | 2 +- src/gui/imagewidget.h | 2 +- src/gui/kwidgetlister.cpp | 8 ++++---- src/gui/kwidgetlister.h | 6 +++--- src/gui/lineedit.h | 2 +- src/gui/linefieldwidget.h | 2 +- src/gui/listview.cpp | 4 ++-- src/gui/listview.h | 12 ++++++------ src/gui/numberfieldwidget.h | 2 +- src/gui/overlaywidget.cpp | 2 +- src/gui/overlaywidget.h | 2 +- src/gui/parafieldwidget.h | 2 +- src/gui/previewdialog.h | 2 +- src/gui/progress.h | 4 ++-- src/gui/ratingfieldwidget.h | 2 +- src/gui/ratingwidget.h | 2 +- src/gui/richtextlabel.cpp | 4 ++-- src/gui/richtextlabel.h | 4 ++-- src/gui/stringmapdialog.h | 2 +- src/gui/tabcontrol.h | 2 +- src/gui/tablefieldwidget.h | 2 +- src/gui/urlfieldwidget.h | 2 +- src/importdialog.h | 2 +- src/isbnvalidator.h | 2 +- src/lccnvalidator.h | 2 +- src/loandialog.h | 6 +++--- src/loanitem.h | 2 +- src/loanview.h | 2 +- src/mainwindow.h | 2 +- src/newstuff/dialog.cpp | 2 +- src/newstuff/dialog.h | 2 +- src/newstuff/manager.h | 2 +- src/newstuff/providerloader.h | 2 +- src/reportdialog.h | 4 ++-- src/statusbar.h | 2 +- src/tellico_kernel.cpp | 4 ++-- src/tellico_kernel.h | 6 +++--- src/translators/alexandriaimporter.h | 2 +- src/translators/audiofileimporter.h | 2 +- src/translators/bibtexexporter.cpp | 2 +- src/translators/bibtexexporter.h | 2 +- src/translators/bibteximporter.h | 2 +- src/translators/btparse/err.h | 18 +++++++++--------- src/translators/btparse/input.c | 10 +++++----- src/translators/btparse/lex_auxiliary.c | 2 +- src/translators/btparse/parse_auxiliary.c | 6 +++--- src/translators/btparse/postprocess.c | 4 ++-- src/translators/csvexporter.cpp | 2 +- src/translators/csvexporter.h | 2 +- src/translators/csvimporter.cpp | 2 +- src/translators/csvimporter.h | 2 +- src/translators/exporter.h | 2 +- src/translators/freedbimporter.cpp | 2 +- src/translators/freedbimporter.h | 2 +- src/translators/htmlexporter.cpp | 2 +- src/translators/htmlexporter.h | 2 +- src/translators/onixexporter.cpp | 2 +- src/translators/pilotdbexporter.cpp | 2 +- src/translators/pilotdbexporter.h | 2 +- src/translators/tellicoxmlexporter.cpp | 4 ++-- src/translators/tellicoxmlexporter.h | 14 +++++++------- src/translators/xsltexporter.cpp | 2 +- src/translators/xsltexporter.h | 2 +- src/translators/xsltimporter.h | 2 +- src/upcvalidator.h | 2 +- src/viewstack.h | 2 +- 122 files changed, 225 insertions(+), 225 deletions(-) diff --git a/src/borrowerdialog.h b/src/borrowerdialog.h index 0b490b5..9bb6d02 100644 --- a/src/borrowerdialog.h +++ b/src/borrowerdialog.h @@ -37,7 +37,7 @@ Q_OBJECT TQ_OBJECT public: - static Data::BorrowerPtr getBorrower(TQWidget* tqparent); + static Data::BorrowerPtr getBorrower(TQWidget* parent); private slots: void selectItem(const TQString& name); @@ -48,10 +48,10 @@ private: /** * The constructor sets up the dialog. * - * @param tqparent A pointer to the tqparent widget + * @param parent A pointer to the parent widget * @param name The widget name */ - BorrowerDialog(TQWidget* tqparent, const char* name=0); + BorrowerDialog(TQWidget* parent, const char* name=0); Data::BorrowerPtr borrower(); TQString m_uid; @@ -61,8 +61,8 @@ private: class Item : public KListViewItem { public: - Item(KListView* tqparent, const KABC::Addressee& addressee); - Item(KListView* tqparent, const Data::Borrower& borrower); + Item(KListView* parent, const KABC::Addressee& addressee); + Item(KListView* parent, const Data::Borrower& borrower); const TQString& uid() const { return m_uid; } private: diff --git a/src/borroweritem.h b/src/borroweritem.h index 9adca82..ad0b7d6 100644 --- a/src/borroweritem.h +++ b/src/borroweritem.h @@ -24,7 +24,7 @@ namespace Tellico { */ class BorrowerItem : public GUI::CountedItem { public: - BorrowerItem(GUI::ListView* tqparent, Data::BorrowerPtr filter); + BorrowerItem(GUI::ListView* parent, Data::BorrowerPtr filter); virtual bool isBorrowerItem() const { return true; } Data::BorrowerPtr borrower() { return m_borrower; } diff --git a/src/collectionfieldsdialog.cpp b/src/collectionfieldsdialog.cpp index 3491bb4..61102a2 100644 --- a/src/collectionfieldsdialog.cpp +++ b/src/collectionfieldsdialog.cpp @@ -112,7 +112,7 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa TQGroupBox* propGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Field Properties"), vbox); TQWidget* grid = new TQWidget(propGroup); - // (tqparent, nrows, ncols, margin, spacing) + // (parent, nrows, ncols, margin, spacing) TQGridLayout* tqlayout = new TQGridLayout(grid, 4, 4, 0, KDialog::spacingHint()); int row = -1; diff --git a/src/collectionfieldsdialog.h b/src/collectionfieldsdialog.h index 7647bec..a3691cc 100644 --- a/src/collectionfieldsdialog.h +++ b/src/collectionfieldsdialog.h @@ -57,11 +57,11 @@ public: /** * The constructor sets up the dialog. * - * @param coll A pointer to the collection tqparent of all the attributes - * @param tqparent A pointer to the tqparent widget + * @param coll A pointer to the collection parent of all the attributes + * @param parent A pointer to the parent widget * @param name The widget name */ - CollectionFieldsDialog(Data::CollPtr coll, TQWidget* tqparent, const char* name=0); + CollectionFieldsDialog(Data::CollPtr coll, TQWidget* parent, const char* name=0); ~CollectionFieldsDialog(); signals: diff --git a/src/configdialog.cpp b/src/configdialog.cpp index 609aae4..9922cbe 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -830,7 +830,7 @@ void ConfigDialog::slotRemoveSourceClicked() { Fetch::ConfigWidget* cw = m_configWidgets[item]; if(cw) { m_removedConfigWidgets.append(cw); - // it gets deleted by the tqparent + // it gets deleted by the parent } m_configWidgets.remove(item); delete item; diff --git a/src/configdialog.h b/src/configdialog.h index 4bf0fe5..f051857 100644 --- a/src/configdialog.h +++ b/src/configdialog.h @@ -53,10 +53,10 @@ public: /** * The constructor sets up the Tabbed dialog pages. * - * @param tqparent A pointer to the tqparent widget + * @param parent A pointer to the parent widget * @param name The widget name */ - ConfigDialog(TQWidget* tqparent, const char* name=0); + ConfigDialog(TQWidget* parent, const char* name=0); virtual ~ConfigDialog(); /** @@ -200,10 +200,10 @@ public: class SourceListViewItem : public KListViewItem { public: - SourceListViewItem(KListView* tqparent, const GeneralFetcherInfo& info, + SourceListViewItem(KListView* parent, const GeneralFetcherInfo& info, const TQString& groupName = TQString()); - SourceListViewItem(KListView* tqparent, TQListViewItem* after, + SourceListViewItem(KListView* parent, TQListViewItem* after, const GeneralFetcherInfo& info, const TQString& groupName = TQString()); void setConfigGroup(const TQString& s) { m_configGroup = s; } diff --git a/src/controller.h b/src/controller.h index 462d0bb..d928dde 100644 --- a/src/controller.h +++ b/src/controller.h @@ -44,8 +44,8 @@ public: /** * Initializes the singleton. Should just be called once, from Tellico::MainWindow */ - static void init(MainWindow* tqparent, const char* name=0) { - if(!s_self) s_self = new Controller(tqparent, name); + static void init(MainWindow* parent, const char* name=0) { + if(!s_self) s_self = new Controller(parent, name); } const Data::EntryVec& selectedEntries() const { return m_selectedEntries; } @@ -108,7 +108,7 @@ public: public slots: /** * When a collection is added to the document, certain actions need to be taken - * by the tqparent app. The collection toolbar is updated, the entry count is set, and + * by the parent app. The collection toolbar is updated, the entry count is set, and * the collection's modified signal is connected to the @ref GroupView widget. * * @param coll A pointer to the collection being added @@ -149,7 +149,7 @@ signals: private: static Controller* s_self; - Controller(MainWindow* tqparent, const char* name); + Controller(MainWindow* parent, const char* name); void blockAllSignals(bool block) const; bool canCheckIn() const; diff --git a/src/core/drophandler.h b/src/core/drophandler.h index 0c64659..a5d88c2 100644 --- a/src/core/drophandler.h +++ b/src/core/drophandler.h @@ -24,7 +24,7 @@ Q_OBJECT TQ_OBJECT public: - DropHandler(TQObject* tqparent); + DropHandler(TQObject* parent); ~DropHandler(); protected: diff --git a/src/detailedentryitem.h b/src/detailedentryitem.h index 719e7d0..dfff520 100644 --- a/src/detailedentryitem.h +++ b/src/detailedentryitem.h @@ -30,7 +30,7 @@ class DetailedEntryItem : public EntryItem { public: enum State { Normal, New, Modified }; - DetailedEntryItem(DetailedListView* tqparent, Data::EntryPtr entry); + DetailedEntryItem(DetailedListView* parent, Data::EntryPtr entry); ~DetailedEntryItem(); void setState(State state); diff --git a/src/detailedlistview.h b/src/detailedlistview.h index c0efa9d..a5f718d 100644 --- a/src/detailedlistview.h +++ b/src/detailedlistview.h @@ -41,10 +41,10 @@ public: /** * The constructor initializes the popup menu, but no columns are inserted. * - * @param tqparent A pointer to the tqparent widget + * @param parent A pointer to the parent widget * @param name The widget name */ - DetailedListView(TQWidget* tqparent, const char* name=0); + DetailedListView(TQWidget* parent, const char* name=0); ~DetailedListView(); /** diff --git a/src/entry.h b/src/entry.h index 295a6d5..c4cbc8b 100644 --- a/src/entry.h +++ b/src/entry.h @@ -72,7 +72,7 @@ public: * The constructor, which automatically sets the id to the current number * of entries in the collection. * - * @param coll A pointer to the tqparent collection object + * @param coll A pointer to the parent collection object */ Entry(CollPtr coll); Entry(CollPtr coll, int id); @@ -140,7 +140,7 @@ public: bool setField(const TQString& fieldName, const TQString& value); bool setField(Data::FieldPtr field, const TQString& value); /** - * Returns a pointer to the tqparent collection of the entry. + * Returns a pointer to the parent collection of the entry. * * @return The collection pointer */ @@ -201,8 +201,8 @@ public: */ TQStringList formattedFieldValues() const { return m_formattedFields.values(); } /** - * Returns a boolean indicating if the entry's tqparent collection recognizes - * it existence, that is, the tqparent collection has this entry in its list. + * Returns a boolean indicating if the entry's parent collection recognizes + * it existence, that is, the parent collection has this entry in its list. * * @return Whether the entry is owned or not */ diff --git a/src/entryeditdialog.cpp b/src/entryeditdialog.cpp index 6fc90fa..e185b24 100644 --- a/src/entryeditdialog.cpp +++ b/src/entryeditdialog.cpp @@ -155,12 +155,12 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) { // if this tqlayout model is changed, be sure to check slotUpdateField() TQWidget* page = new TQWidget(m_tabs); - // (tqparent, margin, spacing) + // (parent, margin, spacing) TQVBoxLayout* boxLayout = new TQVBoxLayout(page, 0, 0); TQWidget* grid = new TQWidget(page); gridList.append(grid); - // (tqparent, nrows, ncols, margin, spacing) + // (parent, nrows, ncols, margin, spacing) // spacing gets a bit weird, if there are absolutely no Choice fields, // then spacing should be 5, which is set later TQGridLayout* tqlayout = new TQGridLayout(grid, 0, NCOLS, 8, 2); @@ -249,7 +249,7 @@ 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 + // the parent of the grid is the page that got added to the tabs it.current()->parentWidget()->tqlayout()->tqinvalidate(); it.current()->parentWidget()->setMinimumHeight(it.current()->parentWidget()->tqsizeHint().height()); } @@ -560,7 +560,7 @@ void EntryEditDialog::removeField(Data::CollPtr, Data::FieldPtr field_) { // so the category should be gone from the category list if(m_currColl->fieldCategories().findIndex(field_->category()) == -1) { // myDebug() << "last field in the category" << endl; - // fragile, widget's tqparent is the grid, whose tqparent is the tab page + // fragile, widget's parent is the grid, whose parent is the tab page TQWidget* w = widget->parentWidget()->parentWidget(); m_tabs->removePage(w); delete w; // automatically deletes child widget @@ -716,7 +716,7 @@ void EntryEditDialog::modifyField(Data::CollPtr coll_, Data::FieldPtr oldField_, delete childList; } // this is very fragile! - // field widgets's tqparent is the grid, whose tqparent is the tab page + // field widgets's parent is the grid, whose parent is the tab page // this is for singleCategory fields if(newField_->category() != oldField_->category()) { m_tabs->setTabLabel(widget->parentWidget()->parentWidget(), newField_->category()); diff --git a/src/entryeditdialog.h b/src/entryeditdialog.h index 7dafffd..e645b81 100644 --- a/src/entryeditdialog.h +++ b/src/entryeditdialog.h @@ -39,7 +39,7 @@ Q_OBJECT friend class GUI::FieldWidget; public: - EntryEditDialog(TQWidget* tqparent, const char* name); + EntryEditDialog(TQWidget* parent, const char* name); /** * Checks to see if any data needs to be saved. Returns @p true if it's ok to continue with @@ -75,7 +75,7 @@ public: * Updates a widget when its field has been modified. The category may have changed, completions may have * been added or removed, or what-have-you. * - * @param coll A pointer to the tqparent collection + * @param coll A pointer to the parent collection * @param oldField A pointer to the old field, which should have the same name as the new one * @param newField A pointer to the new field */ diff --git a/src/entrygroupitem.h b/src/entrygroupitem.h index e665132..68e9fd5 100644 --- a/src/entrygroupitem.h +++ b/src/entrygroupitem.h @@ -29,7 +29,7 @@ namespace Tellico { */ class EntryGroupItem : public GUI::CountedItem { public: - EntryGroupItem(GUI::ListView* tqparent, Data::EntryGroup* group, int fieldType); + EntryGroupItem(GUI::ListView* parent, Data::EntryGroup* group, int fieldType); virtual bool isEntryGroupItem() const { return true; } Data::EntryGroup* group() const { return m_group; } diff --git a/src/entryiconview.h b/src/entryiconview.h index f7ac00b..a258123 100644 --- a/src/entryiconview.h +++ b/src/entryiconview.h @@ -38,7 +38,7 @@ Q_OBJECT friend class EntryIconViewItem; public: - EntryIconView(TQWidget* tqparent, const char* name = 0); + EntryIconView(TQWidget* parent, const char* name = 0); ~EntryIconView(); EntryIconViewItem* firstItem() const; @@ -101,7 +101,7 @@ private: class EntryIconViewItem : public KIconViewItem { public: - EntryIconViewItem(EntryIconView* tqparent, Data::EntryPtr entry); + EntryIconViewItem(EntryIconView* parent, Data::EntryPtr entry); ~EntryIconViewItem(); EntryIconView* iconView() const { return static_cast(KIconViewItem::iconView()); } diff --git a/src/entryitem.cpp b/src/entryitem.cpp index 2a1a3bf..750fd92 100644 --- a/src/entryitem.cpp +++ b/src/entryitem.cpp @@ -21,8 +21,8 @@ using Tellico::EntryItem; -EntryItem::EntryItem(GUI::ListView* tqparent, Data::EntryPtr entry) - : GUI::ListViewItem(tqparent), m_entry(entry), m_isDetailedList(true) { +EntryItem::EntryItem(GUI::ListView* parent, Data::EntryPtr entry) + : GUI::ListViewItem(parent), m_entry(entry), m_isDetailedList(true) { } EntryItem::EntryItem(GUI::CountedItem* parent_, Data::EntryPtr entry_) diff --git a/src/entryitem.h b/src/entryitem.h index 4c99207..667f12e 100644 --- a/src/entryitem.h +++ b/src/entryitem.h @@ -37,19 +37,19 @@ public: * This constructor is for items which are direct tqchildren of a ListView object, * which is just the @ref DetailedListView. * - * @param tqparent A pointer to the tqparent + * @param parent A pointer to the parent * @param entry A pointer to the entry to which the item refers */ - EntryItem(GUI::ListView* tqparent, Data::EntryPtr entry); + EntryItem(GUI::ListView* parent, Data::EntryPtr entry); /** * 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 + * @param parent A pointer to the parent * @param text The text in the first column * @param entry A pointer to the entry to which the item refers */ - EntryItem(GUI::CountedItem* tqparent, Data::EntryPtr entry); + EntryItem(GUI::CountedItem* parent, Data::EntryPtr entry); virtual bool isEntryItem() const { return true; } @@ -73,7 +73,7 @@ public: private: Data::EntryPtr m_entry; - // if the tqparent is a DetailedListView + // if the parent is a DetailedListView // this way, I don't have to call listView()->isA("Tellico::DetailedListView") every time // when I want to do funky comparisons bool m_isDetailedList : 1; diff --git a/src/entrymerger.h b/src/entrymerger.h index 795c668..f397fa8 100644 --- a/src/entrymerger.h +++ b/src/entrymerger.h @@ -27,7 +27,7 @@ class EntryMerger : public TQObject { Q_OBJECT TQ_OBJECT public: - EntryMerger(Data::EntryVec entries, TQObject* tqparent); + EntryMerger(Data::EntryVec entries, TQObject* parent); public slots: void slotCancel(); diff --git a/src/entryupdater.h b/src/entryupdater.h index faced3b..75d1fcc 100644 --- a/src/entryupdater.h +++ b/src/entryupdater.h @@ -29,8 +29,8 @@ class EntryUpdater : public TQObject { Q_OBJECT TQ_OBJECT public: - EntryUpdater(Data::CollPtr coll, Data::EntryVec entries, TQObject* tqparent); - EntryUpdater(const TQString& fetcher, Data::CollPtr coll, Data::EntryVec entries, TQObject* tqparent); + EntryUpdater(Data::CollPtr coll, Data::EntryVec entries, TQObject* parent); + EntryUpdater(const TQString& fetcher, Data::CollPtr coll, Data::EntryVec entries, TQObject* parent); ~EntryUpdater(); public slots: diff --git a/src/entryview.h b/src/entryview.h index f6d4744..1a0ad76 100644 --- a/src/entryview.h +++ b/src/entryview.h @@ -39,10 +39,10 @@ public: /** * The EntryView shows a HTML representation of the data in the entry. * - * @param tqparent TQWidget tqparent + * @param parent TQWidget parent * @param name TQObject name */ - EntryView(TQWidget* tqparent, const char* name=0); + EntryView(TQWidget* parent, const char* name=0); /** */ virtual ~EntryView(); diff --git a/src/exportdialog.h b/src/exportdialog.h index 19a6cbe..afec56c 100644 --- a/src/exportdialog.h +++ b/src/exportdialog.h @@ -36,7 +36,7 @@ Q_OBJECT TQ_OBJECT public: - ExportDialog(Export::Format format, Data::CollPtr coll, TQWidget* tqparent, const char* name); + ExportDialog(Export::Format format, Data::CollPtr coll, TQWidget* parent, const char* name); ~ExportDialog(); TQString fileFilter(); diff --git a/src/fetch/amazonfetcher.h b/src/fetch/amazonfetcher.h index cf7b1fb..0341f28 100644 --- a/src/fetch/amazonfetcher.h +++ b/src/fetch/amazonfetcher.h @@ -68,7 +68,7 @@ public: NoImage=3 }; - AmazonFetcher(Site site, TQObject* tqparent, const char* name = 0); + AmazonFetcher(Site site, TQObject* parent, const char* name = 0); virtual ~AmazonFetcher(); virtual TQString source() const; @@ -94,7 +94,7 @@ public: /** * Returns a widget for modifying the fetcher's config. */ - virtual Fetch::ConfigWidget* configWidget(TQWidget* tqparent) const ; + virtual Fetch::ConfigWidget* configWidget(TQWidget* parent) const ; static StringMap customFields(); diff --git a/src/fetch/animenfofetcher.h b/src/fetch/animenfofetcher.h index ead205e..7cf0790 100644 --- a/src/fetch/animenfofetcher.h +++ b/src/fetch/animenfofetcher.h @@ -37,7 +37,7 @@ Q_OBJECT TQ_OBJECT public: - AnimeNfoFetcher(TQObject* tqparent, const char* name = 0); + AnimeNfoFetcher(TQObject* parent, const char* name = 0); virtual ~AnimeNfoFetcher() {} virtual TQString source() const; @@ -53,7 +53,7 @@ public: virtual void updateEntry(Data::EntryPtr entry); - virtual Fetch::ConfigWidget* configWidget(TQWidget* tqparent) const; + virtual Fetch::ConfigWidget* configWidget(TQWidget* parent) const; class ConfigWidget : public Fetch::ConfigWidget { public: diff --git a/src/fetch/arxivfetcher.h b/src/fetch/arxivfetcher.h index 2afcf43..eeff875 100644 --- a/src/fetch/arxivfetcher.h +++ b/src/fetch/arxivfetcher.h @@ -37,7 +37,7 @@ Q_OBJECT TQ_OBJECT public: - ArxivFetcher(TQObject* tqparent); + ArxivFetcher(TQObject* parent); ~ArxivFetcher(); virtual TQString source() const; @@ -55,7 +55,7 @@ public: virtual void updateEntry(Data::EntryPtr entry); virtual void updateEntrySynchronous(Data::EntryPtr entry); - virtual Fetch::ConfigWidget* configWidget(TQWidget* tqparent) const; + virtual Fetch::ConfigWidget* configWidget(TQWidget* parent) const; class ConfigWidget : public Fetch::ConfigWidget { public: diff --git a/src/fetch/bibsonomyfetcher.h b/src/fetch/bibsonomyfetcher.h index 133c309..4f2ad6f 100644 --- a/src/fetch/bibsonomyfetcher.h +++ b/src/fetch/bibsonomyfetcher.h @@ -34,7 +34,7 @@ Q_OBJECT TQ_OBJECT public: - BibsonomyFetcher(TQObject* tqparent); + BibsonomyFetcher(TQObject* parent); ~BibsonomyFetcher(); virtual TQString source() const; @@ -50,7 +50,7 @@ public: virtual void updateEntry(Data::EntryPtr entry); - virtual Fetch::ConfigWidget* configWidget(TQWidget* tqparent) const; + virtual Fetch::ConfigWidget* configWidget(TQWidget* parent) const; class ConfigWidget : public Fetch::ConfigWidget { public: diff --git a/src/fetch/citebasefetcher.h b/src/fetch/citebasefetcher.h index ffafc2e..6305284 100644 --- a/src/fetch/citebasefetcher.h +++ b/src/fetch/citebasefetcher.h @@ -34,7 +34,7 @@ Q_OBJECT TQ_OBJECT public: - CitebaseFetcher(TQObject* tqparent); + CitebaseFetcher(TQObject* parent); ~CitebaseFetcher(); virtual TQString source() const; @@ -51,7 +51,7 @@ public: virtual void updateEntry(Data::EntryPtr entry); virtual void updateEntrySynchronous(Data::EntryPtr entry); - virtual Fetch::ConfigWidget* configWidget(TQWidget* tqparent) const; + virtual Fetch::ConfigWidget* configWidget(TQWidget* parent) const; class ConfigWidget : public Fetch::ConfigWidget { public: diff --git a/src/fetch/configwidget.h b/src/fetch/configwidget.h index f0a981c..f8374ee 100644 --- a/src/fetch/configwidget.h +++ b/src/fetch/configwidget.h @@ -34,7 +34,7 @@ Q_OBJECT TQ_OBJECT public: - ConfigWidget(TQWidget* tqparent); + ConfigWidget(TQWidget* parent); virtual ~ConfigWidget() {} void setAccepted(bool accepted_) { m_accepted = accepted_; } diff --git a/src/fetch/crossreffetcher.h b/src/fetch/crossreffetcher.h index 8852358..960ed30 100644 --- a/src/fetch/crossreffetcher.h +++ b/src/fetch/crossreffetcher.h @@ -39,7 +39,7 @@ Q_OBJECT TQ_OBJECT public: - CrossRefFetcher(TQObject* tqparent); + CrossRefFetcher(TQObject* parent); ~CrossRefFetcher(); virtual TQString source() const; @@ -56,7 +56,7 @@ public: virtual void updateEntry(Data::EntryPtr entry); virtual void updateEntrySynchronous(Data::EntryPtr entry); - virtual Fetch::ConfigWidget* configWidget(TQWidget* tqparent) const; + virtual Fetch::ConfigWidget* configWidget(TQWidget* parent) const; class ConfigWidget : public Fetch::ConfigWidget { public: diff --git a/src/fetch/discogsfetcher.h b/src/fetch/discogsfetcher.h index 2c30465..b2d9b48 100644 --- a/src/fetch/discogsfetcher.h +++ b/src/fetch/discogsfetcher.h @@ -46,7 +46,7 @@ Q_OBJECT public: /** */ - DiscogsFetcher(TQObject* tqparent, const char* name = 0); + DiscogsFetcher(TQObject* parent, const char* name = 0); /** */ virtual ~DiscogsFetcher(); @@ -70,7 +70,7 @@ public: /** * Returns a widget for modifying the fetcher's config. */ - virtual Fetch::ConfigWidget* configWidget(TQWidget* tqparent) const; + virtual Fetch::ConfigWidget* configWidget(TQWidget* parent) const; static StringMap customFields(); diff --git a/src/fetch/entrezfetcher.h b/src/fetch/entrezfetcher.h index bc8af9f..214faa2 100644 --- a/src/fetch/entrezfetcher.h +++ b/src/fetch/entrezfetcher.h @@ -40,7 +40,7 @@ Q_OBJECT TQ_OBJECT public: - EntrezFetcher(TQObject* tqparent, const char* name=0); + EntrezFetcher(TQObject* parent, const char* name=0); /** */ virtual ~EntrezFetcher(); @@ -57,7 +57,7 @@ public: virtual bool canFetch(int type) const; virtual void readConfigHook(const KConfigGroup& config); virtual void updateEntry(Data::EntryPtr entry); - virtual Fetch::ConfigWidget* configWidget(TQWidget* tqparent) const; + virtual Fetch::ConfigWidget* configWidget(TQWidget* parent) const; static StringMap customFields(); diff --git a/src/fetch/execexternalfetcher.h b/src/fetch/execexternalfetcher.h index 99e3fc8..7720564 100644 --- a/src/fetch/execexternalfetcher.h +++ b/src/fetch/execexternalfetcher.h @@ -43,7 +43,7 @@ Q_OBJECT TQ_OBJECT public: - ExecExternalFetcher(TQObject* tqparent, const char* name=0); + ExecExternalFetcher(TQObject* parent, const char* name=0); /** */ virtual ~ExecExternalFetcher(); @@ -59,13 +59,13 @@ public: virtual Type type() const { return ExecExternal; } virtual bool canFetch(int type) const; virtual void readConfigHook(const KConfigGroup& config); - virtual Fetch::ConfigWidget* configWidget(TQWidget* tqparent) const; + virtual Fetch::ConfigWidget* configWidget(TQWidget* parent) const; const TQString& execPath() const { return m_path; } class ConfigWidget : public Fetch::ConfigWidget { public: - ConfigWidget(TQWidget* tqparent = 0, const ExecExternalFetcher* fetcher = 0); + ConfigWidget(TQWidget* parent = 0, const ExecExternalFetcher* fetcher = 0); ~ConfigWidget(); void readConfig(KConfig* config); diff --git a/src/fetch/fetcher.h b/src/fetch/fetcher.h index 09f5b2c..d2fc301 100644 --- a/src/fetch/fetcher.h +++ b/src/fetch/fetcher.h @@ -45,7 +45,7 @@ public: /** */ - Fetcher(TQObject* tqparent, const char* name = 0) : TQObject(tqparent, name), KShared(), + Fetcher(TQObject* parent, const char* name = 0) : TQObject(parent, name), KShared(), m_updateOverwrite(false), m_hasMoreResults(false), m_messager(0) {} /** @@ -114,7 +114,7 @@ public: /** * Returns a widget for modifying the fetcher's config. */ - virtual ConfigWidget* configWidget(TQWidget* tqparent) const = 0; + virtual ConfigWidget* configWidget(TQWidget* parent) const = 0; signals: // void signaltqStatus(const TQString& status); diff --git a/src/fetch/fetchmanager.h b/src/fetch/fetchmanager.h index c43b997..8bb7f23 100644 --- a/src/fetch/fetchmanager.h +++ b/src/fetch/fetchmanager.h @@ -62,7 +62,7 @@ public: const FetcherVec& fetchers() const { return m_fetchers; } FetcherVec fetchers(int type); TypePairList typeList(); - ConfigWidget* configWidget(TQWidget* tqparent, Type type, const TQString& name); + ConfigWidget* configWidget(TQWidget* parent, Type type, const TQString& name); // create fetcher for updating an entry FetcherVec createUpdateFetchers(int collType); diff --git a/src/fetch/gcstarpluginfetcher.h b/src/fetch/gcstarpluginfetcher.h index 0bda3b0..9a0789f 100644 --- a/src/fetch/gcstarpluginfetcher.h +++ b/src/fetch/gcstarpluginfetcher.h @@ -39,7 +39,7 @@ Q_OBJECT public: - GCstarPluginFetcher(TQObject* tqparent, const char* name=0); + GCstarPluginFetcher(TQObject* parent, const char* name=0); /** */ virtual ~GCstarPluginFetcher(); @@ -55,7 +55,7 @@ public: virtual Type type() const { return GCstarPlugin; } virtual bool canFetch(int type) const; virtual void readConfigHook(const KConfigGroup& config); - virtual Fetch::ConfigWidget* configWidget(TQWidget* tqparent) const; + virtual Fetch::ConfigWidget* configWidget(TQWidget* parent) const; class ConfigWidget; friend class ConfigWidget; @@ -96,7 +96,7 @@ Q_OBJECT TQ_OBJECT public: - ConfigWidget(TQWidget* tqparent, const GCstarPluginFetcher* fetcher = 0); + ConfigWidget(TQWidget* parent, const GCstarPluginFetcher* fetcher = 0); ~ConfigWidget(); virtual void saveConfig(KConfigGroup& config); diff --git a/src/fetch/googlescholarfetcher.h b/src/fetch/googlescholarfetcher.h index adc58f8..de3996b 100644 --- a/src/fetch/googlescholarfetcher.h +++ b/src/fetch/googlescholarfetcher.h @@ -40,7 +40,7 @@ Q_OBJECT public: /** */ - GoogleScholarFetcher(TQObject* tqparent, const char* name = 0); + GoogleScholarFetcher(TQObject* parent, const char* name = 0); /** */ virtual ~GoogleScholarFetcher(); @@ -64,7 +64,7 @@ public: /** * Returns a widget for modifying the fetcher's config. */ - virtual Fetch::ConfigWidget* configWidget(TQWidget* tqparent) const; + virtual Fetch::ConfigWidget* configWidget(TQWidget* parent) const; class ConfigWidget : public Fetch::ConfigWidget { public: diff --git a/src/fetch/ibsfetcher.h b/src/fetch/ibsfetcher.h index c2a588c..0b8760a 100644 --- a/src/fetch/ibsfetcher.h +++ b/src/fetch/ibsfetcher.h @@ -37,7 +37,7 @@ Q_OBJECT TQ_OBJECT public: - IBSFetcher(TQObject* tqparent, const char* name = 0); + IBSFetcher(TQObject* parent, const char* name = 0); virtual ~IBSFetcher() {} virtual TQString source() const; @@ -53,7 +53,7 @@ public: virtual void updateEntry(Data::EntryPtr entry); - virtual Fetch::ConfigWidget* configWidget(TQWidget* tqparent) const; + virtual Fetch::ConfigWidget* configWidget(TQWidget* parent) const; class ConfigWidget : public Fetch::ConfigWidget { public: diff --git a/src/fetch/imdbfetcher.h b/src/fetch/imdbfetcher.h index 9b6b5ce..c49417e 100644 --- a/src/fetch/imdbfetcher.h +++ b/src/fetch/imdbfetcher.h @@ -41,7 +41,7 @@ Q_OBJECT TQ_OBJECT public: - IMDBFetcher(TQObject* tqparent, const char* name=0); + IMDBFetcher(TQObject* parent, const char* name=0); /** */ virtual ~IMDBFetcher(); @@ -60,7 +60,7 @@ public: virtual void updateEntry(Data::EntryPtr entry); - virtual Fetch::ConfigWidget* configWidget(TQWidget* tqparent) const; + virtual Fetch::ConfigWidget* configWidget(TQWidget* parent) const; static StringMap customFields(); diff --git a/src/fetch/isbndbfetcher.h b/src/fetch/isbndbfetcher.h index 835f1c0..791ac4e 100644 --- a/src/fetch/isbndbfetcher.h +++ b/src/fetch/isbndbfetcher.h @@ -38,7 +38,7 @@ Q_OBJECT TQ_OBJECT public: - ISBNdbFetcher(TQObject* tqparent = 0, const char* name = 0); + ISBNdbFetcher(TQObject* parent = 0, const char* name = 0); ~ISBNdbFetcher(); virtual TQString source() const; @@ -54,7 +54,7 @@ public: virtual void updateEntry(Data::EntryPtr entry); - virtual Fetch::ConfigWidget* configWidget(TQWidget* tqparent) const; + virtual Fetch::ConfigWidget* configWidget(TQWidget* parent) const; class ConfigWidget : public Fetch::ConfigWidget { public: diff --git a/src/fetch/srufetcher.h b/src/fetch/srufetcher.h index 4e745dc..7dd9584 100644 --- a/src/fetch/srufetcher.h +++ b/src/fetch/srufetcher.h @@ -55,9 +55,9 @@ friend class SRUConfigWidget; public: /** */ - SRUFetcher(TQObject* tqparent, const char* name = 0); + SRUFetcher(TQObject* parent, const char* name = 0); SRUFetcher(const TQString& name, const TQString& host, uint port, const TQString& dbname, - TQObject* tqparent); + TQObject* parent); /** */ virtual ~SRUFetcher(); @@ -79,11 +79,11 @@ public: static StringMap customFields(); - virtual ConfigWidget* configWidget(TQWidget* tqparent) const; + virtual ConfigWidget* configWidget(TQWidget* parent) const; static TQString defaultName(); - static Fetcher::Ptr libraryOfCongress(TQObject* tqparent); + static Fetcher::Ptr libraryOfCongress(TQObject* parent); private slots: void slotData(KIO::Job* job, const TQByteArray& data); diff --git a/src/fetch/yahoofetcher.h b/src/fetch/yahoofetcher.h index 1c295c8..1044c3d 100644 --- a/src/fetch/yahoofetcher.h +++ b/src/fetch/yahoofetcher.h @@ -42,7 +42,7 @@ Q_OBJECT public: /** */ - YahooFetcher(TQObject* tqparent, const char* name = 0); + YahooFetcher(TQObject* parent, const char* name = 0); /** */ virtual ~YahooFetcher(); @@ -65,7 +65,7 @@ public: /** * Returns a widget for modifying the fetcher's config. */ - virtual Fetch::ConfigWidget* configWidget(TQWidget* tqparent) const; + virtual Fetch::ConfigWidget* configWidget(TQWidget* parent) const; class ConfigWidget : public Fetch::ConfigWidget { public: diff --git a/src/fetch/z3950fetcher.h b/src/fetch/z3950fetcher.h index a183871..5286b70 100644 --- a/src/fetch/z3950fetcher.h +++ b/src/fetch/z3950fetcher.h @@ -53,7 +53,7 @@ Q_OBJECT TQ_OBJECT public: - Z3950Fetcher(TQObject* tqparent, const char* name = 0); + Z3950Fetcher(TQObject* parent, const char* name = 0); virtual ~Z3950Fetcher(); @@ -75,7 +75,7 @@ public: static StringMap customFields(); - virtual Fetch::ConfigWidget* configWidget(TQWidget* tqparent) const; + virtual Fetch::ConfigWidget* configWidget(TQWidget* parent) const; class ConfigWidget; friend class ConfigWidget; @@ -125,7 +125,7 @@ Q_OBJECT TQ_OBJECT public: - ConfigWidget(TQWidget* tqparent, const Z3950Fetcher* fetcher = 0); + ConfigWidget(TQWidget* parent, const Z3950Fetcher* fetcher = 0); virtual ~ConfigWidget(); virtual void saveConfig(KConfigGroup& config_); virtual TQString preferredName() const; diff --git a/src/fetchdialog.h b/src/fetchdialog.h index d690515..40f77c8 100644 --- a/src/fetchdialog.h +++ b/src/fetchdialog.h @@ -59,7 +59,7 @@ public: /** * Constructor */ - FetchDialog(TQWidget* tqparent, const char* name = 0); + FetchDialog(TQWidget* parent, const char* name = 0); ~FetchDialog(); public slots: diff --git a/src/fetcherconfigdialog.h b/src/fetcherconfigdialog.h index 5150c29..e53c808 100644 --- a/src/fetcherconfigdialog.h +++ b/src/fetcherconfigdialog.h @@ -38,9 +38,9 @@ Q_OBJECT TQ_OBJECT public: - FetcherConfigDialog(TQWidget* tqparent); + FetcherConfigDialog(TQWidget* parent); FetcherConfigDialog(const TQString& sourceName, Fetch::Type type, bool updateOverwrite, - Fetch::ConfigWidget* configWidget, TQWidget* tqparent); + Fetch::ConfigWidget* configWidget, TQWidget* parent); TQString sourceName() const; Fetch::Type sourceType() const; diff --git a/src/filterdialog.h b/src/filterdialog.h index 99823d8..26509ba 100644 --- a/src/filterdialog.h +++ b/src/filterdialog.h @@ -54,7 +54,7 @@ public: * Constructor. You give a @ref FilterRule as parameter, which will * be used to initialize the widget. */ - FilterRuleWidget(FilterRule* rule, TQWidget* tqparent, const char* name=0); + FilterRuleWidget(FilterRule* rule, TQWidget* parent, const char* name=0); /** * Set the rule. The rule is accepted regardless of the return @@ -102,7 +102,7 @@ Q_OBJECT TQ_OBJECT public: - FilterRuleWidgetLister(TQWidget* tqparent, const char* name=0); + FilterRuleWidgetLister(TQWidget* parent, const char* name=0); const TQPtrList& widgetList() const; void setFilter(Filter::Ptr filter); @@ -116,7 +116,7 @@ signals: protected: virtual void clearWidget(TQWidget* widget); - virtual TQWidget* createWidget(TQWidget* tqparent); + virtual TQWidget* createWidget(TQWidget* parent); }; /** @@ -135,10 +135,10 @@ public: /** * The constructor sets up the dialog. * - * @param tqparent A pointer to the tqparent widget + * @param parent A pointer to the parent widget * @param name The widget name */ - FilterDialog(Mode mode, TQWidget* tqparent, const char* name=0); + FilterDialog(Mode mode, TQWidget* parent, const char* name=0); FilterPtr currentFilter(); void setFilter(FilterPtr filter); diff --git a/src/filteritem.h b/src/filteritem.h index 874b2ab..c777b5a 100644 --- a/src/filteritem.h +++ b/src/filteritem.h @@ -24,7 +24,7 @@ namespace Tellico { */ class FilterItem : public GUI::CountedItem { public: - FilterItem(GUI::ListView* tqparent, Tellico::Filter::Ptr filter); + FilterItem(GUI::ListView* parent, Tellico::Filter::Ptr filter); virtual bool isFilterItem() const { return true; } Filter::Ptr filter() { return m_filter; } diff --git a/src/filterview.h b/src/filterview.h index 8fbb1a5..818c0ee 100644 --- a/src/filterview.h +++ b/src/filterview.h @@ -30,7 +30,7 @@ Q_OBJECT TQ_OBJECT public: - FilterView(TQWidget* tqparent, const char* name=0); + FilterView(TQWidget* parent, const char* name=0); virtual bool isSelectable(GUI::ListViewItem*) const; diff --git a/src/groupview.h b/src/groupview.h index 40a40f9..78a1909 100644 --- a/src/groupview.h +++ b/src/groupview.h @@ -47,10 +47,10 @@ public: /** * The constructor sets up the single column, and initializes the popup menu. * - * @param tqparent A pointer to the tqparent widget + * @param parent A pointer to the parent widget * @param name The widget name */ - GroupView(TQWidget* tqparent, const char* name=0); + GroupView(TQWidget* parent, const char* name=0); /** * Returns the name of the field by which the entries are grouped diff --git a/src/gui/boolfieldwidget.h b/src/gui/boolfieldwidget.h index 0181f31..9507bad 100644 --- a/src/gui/boolfieldwidget.h +++ b/src/gui/boolfieldwidget.h @@ -31,7 +31,7 @@ Q_OBJECT TQ_OBJECT public: - BoolFieldWidget(Data::FieldPtr field, TQWidget* tqparent, const char* name=0); + BoolFieldWidget(Data::FieldPtr field, TQWidget* parent, const char* name=0); virtual ~BoolFieldWidget() {} virtual TQString text() const; diff --git a/src/gui/choicefieldwidget.h b/src/gui/choicefieldwidget.h index 35c40b9..0bcaf48 100644 --- a/src/gui/choicefieldwidget.h +++ b/src/gui/choicefieldwidget.h @@ -30,7 +30,7 @@ Q_OBJECT TQ_OBJECT public: - ChoiceFieldWidget(Data::FieldPtr field, TQWidget* tqparent, const char* name=0); + ChoiceFieldWidget(Data::FieldPtr field, TQWidget* parent, const char* name=0); virtual ~ChoiceFieldWidget() {} virtual TQString text() const; diff --git a/src/gui/collectiontypecombo.h b/src/gui/collectiontypecombo.h index bcc9e7f..8b36937 100644 --- a/src/gui/collectiontypecombo.h +++ b/src/gui/collectiontypecombo.h @@ -22,7 +22,7 @@ namespace GUI { class CollectionTypeCombo : public ComboBox { public: - CollectionTypeCombo(TQWidget* tqparent); + CollectionTypeCombo(TQWidget* parent); void reset(); void setCurrentType(int type); int currentType() const { return currentData().toInt(); } diff --git a/src/gui/counteditem.h b/src/gui/counteditem.h index 7e3b9a1..3aff0b7 100644 --- a/src/gui/counteditem.h +++ b/src/gui/counteditem.h @@ -28,8 +28,8 @@ namespace Tellico { */ class CountedItem : public GUI::ListViewItem { public: - CountedItem(ListView* tqparent) : ListViewItem(tqparent) {} - CountedItem(ListViewItem* tqparent) : ListViewItem(tqparent) {} + CountedItem(ListView* parent) : ListViewItem(parent) {} + CountedItem(ListViewItem* parent) : ListViewItem(parent) {} virtual int compare(TQListViewItem* item, int col, bool ascending) const; /** diff --git a/src/gui/datefieldwidget.h b/src/gui/datefieldwidget.h index 573b7dc..0730d11 100644 --- a/src/gui/datefieldwidget.h +++ b/src/gui/datefieldwidget.h @@ -31,7 +31,7 @@ Q_OBJECT TQ_OBJECT public: - DateFieldWidget(Data::FieldPtr field, TQWidget* tqparent, const char* name=0); + DateFieldWidget(Data::FieldPtr field, TQWidget* parent, const char* name=0); virtual ~DateFieldWidget() {} virtual TQString text() const; diff --git a/src/gui/datewidget.cpp b/src/gui/datewidget.cpp index 7a2d99b..a8cc726 100644 --- a/src/gui/datewidget.cpp +++ b/src/gui/datewidget.cpp @@ -32,7 +32,7 @@ using Tellico::GUI::SpinBox; using Tellico::GUI::DateWidget; -SpinBox::SpinBox(int min, int max, TQWidget *tqparent) : TQSpinBox(min, max, 1, tqparent) +SpinBox::SpinBox(int min, int max, TQWidget *parent) : TQSpinBox(min, max, 1, parent) { editor()->tqsetAlignment(AlignRight); // I want to be able to omit the day diff --git a/src/gui/datewidget.h b/src/gui/datewidget.h index 9575af9..7a1a599 100644 --- a/src/gui/datewidget.h +++ b/src/gui/datewidget.h @@ -32,7 +32,7 @@ Q_OBJECT TQ_OBJECT public: - SpinBox(int min, int max, TQWidget *tqparent); + SpinBox(int min, int max, TQWidget *parent); }; /** @@ -43,7 +43,7 @@ Q_OBJECT TQ_OBJECT public: - DateWidget(TQWidget* tqparent, const char* name = 0); + DateWidget(TQWidget* parent, const char* name = 0); ~DateWidget() {} TQDate date() const; diff --git a/src/gui/fieldwidget.cpp b/src/gui/fieldwidget.cpp index 500c6c8..3940fc4 100644 --- a/src/gui/fieldwidget.cpp +++ b/src/gui/fieldwidget.cpp @@ -91,7 +91,7 @@ FieldWidget* FieldWidget::create(Data::FieldPtr field_, TQWidget* parent_, const 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 + TQHBoxLayout* l = new TQHBoxLayout(this, 2, 2); // parent, margin, spacing l->addSpacing(4); // add some more space in the columns between widgets if(TQCString(tqstyle().name()).lower().find("keramik", 0, false) > -1) { l->setMargin(1); diff --git a/src/gui/fieldwidget.h b/src/gui/fieldwidget.h index 1bd9582..4c70658 100644 --- a/src/gui/fieldwidget.h +++ b/src/gui/fieldwidget.h @@ -40,7 +40,7 @@ Q_OBJECT TQ_OBJECT public: - FieldWidget(Data::FieldPtr field, TQWidget* tqparent, const char* name=0); + FieldWidget(Data::FieldPtr field, TQWidget* parent, const char* name=0); virtual ~FieldWidget() {} Data::FieldPtr field() const { return m_field; } @@ -59,7 +59,7 @@ public: virtual void addCompletionObjectItem(const TQString&) {} // factory function - static FieldWidget* create(Data::FieldPtr field, TQWidget* tqparent, const char* name=0); + static FieldWidget* create(Data::FieldPtr field, TQWidget* parent, const char* name=0); public slots: virtual void insertDefault(); diff --git a/src/gui/imagefieldwidget.h b/src/gui/imagefieldwidget.h index 81b952d..bef6816 100644 --- a/src/gui/imagefieldwidget.h +++ b/src/gui/imagefieldwidget.h @@ -31,7 +31,7 @@ Q_OBJECT TQ_OBJECT public: - ImageFieldWidget(Data::FieldPtr field, TQWidget* tqparent, const char* name=0); + ImageFieldWidget(Data::FieldPtr field, TQWidget* parent, const char* name=0); virtual ~ImageFieldWidget() {} virtual TQString text() const; diff --git a/src/gui/imagewidget.h b/src/gui/imagewidget.h index 76a7304..a30ec9e 100644 --- a/src/gui/imagewidget.h +++ b/src/gui/imagewidget.h @@ -37,7 +37,7 @@ Q_OBJECT TQ_OBJECT public: - ImageWidget(TQWidget* tqparent, const char* name = 0); + ImageWidget(TQWidget* parent, const char* name = 0); virtual ~ImageWidget() {} const TQString& id() const { return m_imageID; } diff --git a/src/gui/kwidgetlister.cpp b/src/gui/kwidgetlister.cpp index 49045a1..ae0e711 100644 --- a/src/gui/kwidgetlister.cpp +++ b/src/gui/kwidgetlister.cpp @@ -41,8 +41,8 @@ #include -KWidgetLister::KWidgetLister( int minWidgets, int maxWidgets, TQWidget *tqparent, const char* name ) - : TQWidget( tqparent, name ) +KWidgetLister::KWidgetLister( int minWidgets, int maxWidgets, TQWidget *parent, const char* name ) + : TQWidget( parent, name ) { mWidgetList.setAutoDelete(TRUE); @@ -146,9 +146,9 @@ void KWidgetLister::clearWidget( TQWidget* /*aWidget*/ ) { } -TQWidget* KWidgetLister::createWidget( TQWidget* tqparent ) +TQWidget* KWidgetLister::createWidget( TQWidget* parent ) { - return new TQWidget( tqparent ); + return new TQWidget( parent ); } void KWidgetLister::setNumberOfShownWidgetsTo( int aNum ) diff --git a/src/gui/kwidgetlister.h b/src/gui/kwidgetlister.h index c57f1e4..3e98fd3 100644 --- a/src/gui/kwidgetlister.h +++ b/src/gui/kwidgetlister.h @@ -64,7 +64,7 @@ class KWidgetLister : public TQWidget Q_OBJECT TQ_OBJECT public: - KWidgetLister( int minWidgets=1, int maxWidgets=8, TQWidget* tqparent=0, const char* name=0 ); + KWidgetLister( int minWidgets=1, int maxWidgets=8, TQWidget* parent=0, const char* name=0 ); virtual ~KWidgetLister(); protected slots: @@ -97,7 +97,7 @@ protected: when showing it on screen. Make sure you call this implementaion, though, since you cannot put the widget on screen from derived classes (@p mLayout is private). - Make sure the tqparent of the TQWidget to add is this KWidgetLister. */ + Make sure the parent of the TQWidget to add is this KWidgetLister. */ virtual void addWidgetAtEnd(TQWidget *w =0); /** Removes a single (always the last) widget. Doesn't care if there are still only @ref mMinWidgets left on screen and whether it @@ -114,7 +114,7 @@ protected: classes, we are forced to emulate this by forcing the implementers of subclasses of KWidgetLister to reimplement this function which replaces the "@p new @p T" call. */ - virtual TQWidget* createWidget( TQWidget *tqparent ); + virtual TQWidget* createWidget( TQWidget *parent ); /** Sets the number of widgets on scrren to exactly @p aNum. Doesn't check if @p aNum is inside the range @p [mMinWidgets,mMaxWidgets]. */ diff --git a/src/gui/lineedit.h b/src/gui/lineedit.h index 1c42cbe..5f86d84 100644 --- a/src/gui/lineedit.h +++ b/src/gui/lineedit.h @@ -32,7 +32,7 @@ Q_OBJECT TQ_OBJECT public: - LineEdit(TQWidget* tqparent = 0, const char* name = 0); + LineEdit(TQWidget* parent = 0, const char* name = 0); virtual void setText(const TQString& text); void setHint(const TQString& hint); diff --git a/src/gui/linefieldwidget.h b/src/gui/linefieldwidget.h index cdbfb28..0e965e1 100644 --- a/src/gui/linefieldwidget.h +++ b/src/gui/linefieldwidget.h @@ -29,7 +29,7 @@ Q_OBJECT TQ_OBJECT public: - LineFieldWidget(Data::FieldPtr field, TQWidget* tqparent, const char* name=0); + LineFieldWidget(Data::FieldPtr field, TQWidget* parent, const char* name=0); virtual ~LineFieldWidget() {} virtual TQString text() const; diff --git a/src/gui/listview.cpp b/src/gui/listview.cpp index 0d03228..f5595ea 100644 --- a/src/gui/listview.cpp +++ b/src/gui/listview.cpp @@ -71,8 +71,8 @@ bool ListView::isSelectable(ListViewItem* item_) const { } // selecting multiple items is ok - // only when tqparent is open. Be careful to check for existence of tqparent - if(item_->tqparent() && !item_->tqparent()->isOpen()) { + // only when parent is open. Be careful to check for existence of parent + if(item_->parent() && !item_->parent()->isOpen()) { return false; } diff --git a/src/gui/listview.h b/src/gui/listview.h index 8f31977..6f2ec8b 100644 --- a/src/gui/listview.h +++ b/src/gui/listview.h @@ -52,7 +52,7 @@ public: SortByCount = 1 }; - ListView(TQWidget* tqparent, const char* name = 0); + ListView(TQWidget* parent, const char* name = 0); virtual ~ListView(); void clearSelection(); @@ -132,11 +132,11 @@ private: */ class ListViewItem : public KListViewItem { public: - ListViewItem(ListView* tqparent) : KListViewItem(tqparent), m_sortWeight(-1) {} - ListViewItem(ListView* tqparent, TQListViewItem* after) : KListViewItem(tqparent, after), m_sortWeight(-1) {} - ListViewItem(ListViewItem* tqparent) : KListViewItem(tqparent), m_sortWeight(-1) {} - ListViewItem(ListView* tqparent, const TQString& text) : KListViewItem(tqparent, text), m_sortWeight(-1) {} - ListViewItem(ListViewItem* tqparent, const TQString& text) : KListViewItem(tqparent, text), m_sortWeight(-1) {} + ListViewItem(ListView* parent) : KListViewItem(parent), m_sortWeight(-1) {} + ListViewItem(ListView* parent, TQListViewItem* after) : KListViewItem(parent, after), m_sortWeight(-1) {} + ListViewItem(ListViewItem* parent) : KListViewItem(parent), m_sortWeight(-1) {} + ListViewItem(ListView* parent, const TQString& text) : KListViewItem(parent, text), m_sortWeight(-1) {} + ListViewItem(ListViewItem* parent, const TQString& text) : KListViewItem(parent, text), m_sortWeight(-1) {} virtual ~ListViewItem(); virtual int realChildCount() const { return childCount(); } diff --git a/src/gui/numberfieldwidget.h b/src/gui/numberfieldwidget.h index 6c9fd82..7edb874 100644 --- a/src/gui/numberfieldwidget.h +++ b/src/gui/numberfieldwidget.h @@ -31,7 +31,7 @@ Q_OBJECT TQ_OBJECT public: - NumberFieldWidget(Data::FieldPtr field, TQWidget* tqparent, const char* name=0); + NumberFieldWidget(Data::FieldPtr field, TQWidget* parent, const char* name=0); virtual ~NumberFieldWidget() {} virtual TQString text() const; diff --git a/src/gui/overlaywidget.cpp b/src/gui/overlaywidget.cpp index cc7bfea..fd5c02b 100644 --- a/src/gui/overlaywidget.cpp +++ b/src/gui/overlaywidget.cpp @@ -17,7 +17,7 @@ using Tellico::GUI::OverlayWidget; -OverlayWidget::OverlayWidget(TQWidget* tqparent, TQWidget* anchor) : TQFrame(tqparent) +OverlayWidget::OverlayWidget(TQWidget* parent, TQWidget* anchor) : TQFrame(parent) , m_anchor(anchor) , m_corner(TopRight) { m_anchor->installEventFilter(this); diff --git a/src/gui/overlaywidget.h b/src/gui/overlaywidget.h index 80eb245..0349e00 100644 --- a/src/gui/overlaywidget.h +++ b/src/gui/overlaywidget.h @@ -30,7 +30,7 @@ Q_OBJECT TQ_OBJECT public: - OverlayWidget(TQWidget* tqparent, TQWidget* anchor); + OverlayWidget(TQWidget* parent, TQWidget* anchor); void setCorner(Corner corner); Corner corner() const { return m_corner; } diff --git a/src/gui/parafieldwidget.h b/src/gui/parafieldwidget.h index f672bfb..760943e 100644 --- a/src/gui/parafieldwidget.h +++ b/src/gui/parafieldwidget.h @@ -30,7 +30,7 @@ Q_OBJECT TQ_OBJECT public: - ParaFieldWidget(Data::FieldPtr field, TQWidget* tqparent, const char* name=0); + ParaFieldWidget(Data::FieldPtr field, TQWidget* parent, const char* name=0); virtual ~ParaFieldWidget() {} virtual TQString text() const; diff --git a/src/gui/previewdialog.h b/src/gui/previewdialog.h index a0f7893..2dc5f0c 100644 --- a/src/gui/previewdialog.h +++ b/src/gui/previewdialog.h @@ -31,7 +31,7 @@ Q_OBJECT TQ_OBJECT public: - PreviewDialog(TQWidget* tqparent); + PreviewDialog(TQWidget* parent); ~PreviewDialog(); void setXSLTFile(const TQString& file); diff --git a/src/gui/progress.h b/src/gui/progress.h index 4e01853..4df7b98 100644 --- a/src/gui/progress.h +++ b/src/gui/progress.h @@ -27,8 +27,8 @@ Q_OBJECT TQ_OBJECT public: - Progress(TQWidget* tqparent); - Progress(int totalSteps, TQWidget* tqparent); + Progress(TQWidget* parent); + Progress(int totalSteps, TQWidget* parent); bool isDone() const; void setDone(); diff --git a/src/gui/ratingfieldwidget.h b/src/gui/ratingfieldwidget.h index f985ea2..91adb0c 100644 --- a/src/gui/ratingfieldwidget.h +++ b/src/gui/ratingfieldwidget.h @@ -29,7 +29,7 @@ Q_OBJECT TQ_OBJECT public: - RatingFieldWidget(Data::FieldPtr field, TQWidget* tqparent, const char* name=0); + RatingFieldWidget(Data::FieldPtr field, TQWidget* parent, const char* name=0); virtual ~RatingFieldWidget() {} virtual TQString text() const; diff --git a/src/gui/ratingwidget.h b/src/gui/ratingwidget.h index 9a3e477..ff694e7 100644 --- a/src/gui/ratingwidget.h +++ b/src/gui/ratingwidget.h @@ -37,7 +37,7 @@ Q_OBJECT typedef TQPtrList LabelList; public: - RatingWidget(Data::FieldPtr field, TQWidget* tqparent, const char* name = 0); + RatingWidget(Data::FieldPtr field, TQWidget* parent, const char* name = 0); void clear(); TQString text() const; diff --git a/src/gui/richtextlabel.cpp b/src/gui/richtextlabel.cpp index a0b3a01..632f771 100644 --- a/src/gui/richtextlabel.cpp +++ b/src/gui/richtextlabel.cpp @@ -19,11 +19,11 @@ using Tellico::GUI::RichTextLabel; -RichTextLabel::RichTextLabel(TQWidget* tqparent) : TQTextEdit(tqparent) { +RichTextLabel::RichTextLabel(TQWidget* parent) : TQTextEdit(parent) { init(); } -RichTextLabel::RichTextLabel(const TQString& text, TQWidget* tqparent) : TQTextEdit(text, TQString(), tqparent) { +RichTextLabel::RichTextLabel(const TQString& text, TQWidget* parent) : TQTextEdit(text, TQString(), parent) { init(); } diff --git a/src/gui/richtextlabel.h b/src/gui/richtextlabel.h index 9f57fb6..e8c4777 100644 --- a/src/gui/richtextlabel.h +++ b/src/gui/richtextlabel.h @@ -27,8 +27,8 @@ Q_OBJECT TQ_OBJECT public: - RichTextLabel(TQWidget* tqparent); - RichTextLabel(const TQString& text, TQWidget* tqparent); + RichTextLabel(TQWidget* parent); + RichTextLabel(const TQString& text, TQWidget* parent); virtual TQSize tqsizeHint() const; diff --git a/src/gui/stringmapdialog.h b/src/gui/stringmapdialog.h index a0dec9f..dafcc46 100644 --- a/src/gui/stringmapdialog.h +++ b/src/gui/stringmapdialog.h @@ -41,7 +41,7 @@ Q_OBJECT TQ_OBJECT public: - StringMapDialog(const TQMap& stringMap, TQWidget* tqparent, const char* name=0, bool modal=false); + StringMapDialog(const TQMap& stringMap, TQWidget* parent, const char* name=0, bool modal=false); /** * Sets the titles for the key and value columns. diff --git a/src/gui/tabcontrol.h b/src/gui/tabcontrol.h index a99c94b..8c53854 100644 --- a/src/gui/tabcontrol.h +++ b/src/gui/tabcontrol.h @@ -30,7 +30,7 @@ public: /** * Constructor */ - TabControl(TQWidget* tqparent, const char* name=0); + TabControl(TQWidget* parent, const char* name=0); TQTabBar* tabBar() const; void setTabBarHidden(bool hide); diff --git a/src/gui/tablefieldwidget.h b/src/gui/tablefieldwidget.h index 03060b2..7e41783 100644 --- a/src/gui/tablefieldwidget.h +++ b/src/gui/tablefieldwidget.h @@ -31,7 +31,7 @@ Q_OBJECT TQ_OBJECT public: - TableFieldWidget(Data::FieldPtr field, TQWidget* tqparent, const char* name=0); + TableFieldWidget(Data::FieldPtr field, TQWidget* parent, const char* name=0); virtual ~TableFieldWidget() {} virtual TQString text() const; diff --git a/src/gui/urlfieldwidget.h b/src/gui/urlfieldwidget.h index 15c8087..8f1933d 100644 --- a/src/gui/urlfieldwidget.h +++ b/src/gui/urlfieldwidget.h @@ -34,7 +34,7 @@ Q_OBJECT TQ_OBJECT public: - URLFieldWidget(Data::FieldPtr field, TQWidget* tqparent, const char* name=0); + URLFieldWidget(Data::FieldPtr field, TQWidget* parent, const char* name=0); virtual ~URLFieldWidget(); virtual TQString text() const; diff --git a/src/importdialog.h b/src/importdialog.h index 70d187e..b99e9ff 100644 --- a/src/importdialog.h +++ b/src/importdialog.h @@ -38,7 +38,7 @@ Q_OBJECT TQ_OBJECT public: - ImportDialog(Import::Format format, const KURL::List& urls, TQWidget* tqparent, const char* name); + ImportDialog(Import::Format format, const KURL::List& urls, TQWidget* parent, const char* name); ~ImportDialog(); Data::CollPtr collection(); diff --git a/src/isbnvalidator.h b/src/isbnvalidator.h index 0747823..56e324e 100644 --- a/src/isbnvalidator.h +++ b/src/isbnvalidator.h @@ -27,7 +27,7 @@ namespace Tellico { */ class ISBNValidator : public TQValidator { public: - ISBNValidator(TQObject* tqparent, const char* name=0); + ISBNValidator(TQObject* parent, const char* name=0); /** * Certain conditions are checked. Character, length and position diff --git a/src/lccnvalidator.h b/src/lccnvalidator.h index 27a7366..c3a6aa8 100644 --- a/src/lccnvalidator.h +++ b/src/lccnvalidator.h @@ -31,7 +31,7 @@ namespace Tellico { class LCCNValidator : public TQRegExpValidator { public: - LCCNValidator(TQObject* tqparent); + LCCNValidator(TQObject* parent); /** * Returns the formalized version as dictated by LOC search diff --git a/src/loandialog.h b/src/loandialog.h index 5cf8354..8c87b80 100644 --- a/src/loandialog.h +++ b/src/loandialog.h @@ -40,11 +40,11 @@ public: /** * The constructor sets up the dialog. * - * @param tqparent A pointer to the tqparent widget + * @param parent A pointer to the parent widget * @param name The widget name */ - LoanDialog(const Data::EntryVec& entries, TQWidget* tqparent, const char* name=0); - LoanDialog(Data::LoanPtr loan, TQWidget* tqparent, const char* name=0); + LoanDialog(const Data::EntryVec& entries, TQWidget* parent, const char* name=0); + LoanDialog(Data::LoanPtr loan, TQWidget* parent, const char* name=0); virtual ~LoanDialog(); KCommand* createCommand(); diff --git a/src/loanitem.h b/src/loanitem.h index e1e60a1..5e79139 100644 --- a/src/loanitem.h +++ b/src/loanitem.h @@ -24,7 +24,7 @@ namespace Tellico { */ class LoanItem : public Tellico::EntryItem { public: - LoanItem(GUI::CountedItem* tqparent, Data::LoanPtr loan); + LoanItem(GUI::CountedItem* parent, Data::LoanPtr loan); virtual bool isLoanItem() const { return true; } Data::LoanPtr loan() { return m_loan; } diff --git a/src/loanview.h b/src/loanview.h index 60ee88a..e9eb563 100644 --- a/src/loanview.h +++ b/src/loanview.h @@ -33,7 +33,7 @@ Q_OBJECT TQ_OBJECT public: - LoanView(TQWidget* tqparent, const char* name=0); + LoanView(TQWidget* parent, const char* name=0); virtual bool isSelectable(GUI::ListViewItem*) const; diff --git a/src/mainwindow.h b/src/mainwindow.h index 31e9517..b08ddb2 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -81,7 +81,7 @@ public: /** * The main window constructor, calls all init functions to create the application. */ - MainWindow(TQWidget* tqparent=0, const char* name=0); + MainWindow(TQWidget* parent=0, const char* name=0); /** * Opens the initial file. diff --git a/src/newstuff/dialog.cpp b/src/newstuff/dialog.cpp index e2d9c21..646793a 100644 --- a/src/newstuff/dialog.cpp +++ b/src/newstuff/dialog.cpp @@ -60,7 +60,7 @@ using Tellico::NewStuff::Dialog; class Dialog::Item : public GUI::ListViewItem { public: - Item(GUI::ListView* tqparent) : GUI::ListViewItem(tqparent) {} + Item(GUI::ListView* parent) : GUI::ListViewItem(parent) {} InstalltqStatus status() const { return m_status; } void settqStatus(InstalltqStatus status) { diff --git a/src/newstuff/dialog.h b/src/newstuff/dialog.h index b719b72..2afb0f2 100644 --- a/src/newstuff/dialog.h +++ b/src/newstuff/dialog.h @@ -46,7 +46,7 @@ Q_OBJECT TQ_OBJECT public: - Dialog(DataType type, TQWidget* tqparent); + Dialog(DataType type, TQWidget* parent); virtual ~Dialog(); TQPtrList dataSourceInfo() const { return m_manager->dataSourceInfo(); } diff --git a/src/newstuff/manager.h b/src/newstuff/manager.h index 53c6726..8b33dd4 100644 --- a/src/newstuff/manager.h +++ b/src/newstuff/manager.h @@ -59,7 +59,7 @@ Q_OBJECT TQ_OBJECT public: - Manager(TQObject* tqparent); + Manager(TQObject* parent); ~Manager(); void install(DataType type, KNS::Entry* entry); diff --git a/src/newstuff/providerloader.h b/src/newstuff/providerloader.h index 37ca7d1..5dd8c17 100644 --- a/src/newstuff/providerloader.h +++ b/src/newstuff/providerloader.h @@ -41,7 +41,7 @@ public: /** * Constructor. * - * @param parentWidget the tqparent widget + * @param parentWidget the parent widget */ ProviderLoader( TQWidget *parentWidget ); diff --git a/src/reportdialog.h b/src/reportdialog.h index ea0579e..ee05e45 100644 --- a/src/reportdialog.h +++ b/src/reportdialog.h @@ -37,10 +37,10 @@ public: /** * The constructor sets up the dialog. * - * @param tqparent A pointer to the tqparent widget + * @param parent A pointer to the parent widget * @param name The widget name */ - ReportDialog(TQWidget* tqparent, const char* name=0); + ReportDialog(TQWidget* parent, const char* name=0); virtual ~ReportDialog(); public slots: diff --git a/src/statusbar.h b/src/statusbar.h index b0d510e..7991277 100644 --- a/src/statusbar.h +++ b/src/statusbar.h @@ -51,7 +51,7 @@ private: friend class MainWindow; - StatusBar(TQWidget* tqparent); + StatusBar(TQWidget* parent); KStatusBarLabel* m_mainLabel; KStatusBarLabel* m_countLabel; diff --git a/src/tellico_kernel.cpp b/src/tellico_kernel.cpp index a1f8200..4268681 100644 --- a/src/tellico_kernel.cpp +++ b/src/tellico_kernel.cpp @@ -46,8 +46,8 @@ using Tellico::Kernel; Kernel* Kernel::s_self = 0; -Kernel::Kernel(MainWindow* tqparent) : m_widget(tqparent) - , m_commandHistory(tqparent->actionCollection()) +Kernel::Kernel(MainWindow* parent) : m_widget(parent) + , m_commandHistory(parent->actionCollection()) , m_commandGroup(0) { } diff --git a/src/tellico_kernel.h b/src/tellico_kernel.h index bafa022..3ed211b 100644 --- a/src/tellico_kernel.h +++ b/src/tellico_kernel.h @@ -45,10 +45,10 @@ public: /** * Initializes the singleton. Should just be called once, from Tellico::MainWindow */ - static void init(MainWindow* tqparent) { if(!s_self) s_self = new Kernel(tqparent); } + static void init(MainWindow* parent) { if(!s_self) s_self = new Kernel(parent); } /** - * Returns a pointer to the tqparent widget. This is mainly used for error dialogs and the like. + * Returns a pointer to the parent widget. This is mainly used for error dialogs and the like. * * @return The widget pointer */ @@ -130,7 +130,7 @@ private: static Kernel* s_self; // all constructors are private - Kernel(MainWindow* tqparent); + Kernel(MainWindow* parent); Kernel(const Kernel&); Kernel& operator=(const Kernel&); diff --git a/src/translators/alexandriaimporter.h b/src/translators/alexandriaimporter.h index 9bec25d..7ac5162 100644 --- a/src/translators/alexandriaimporter.h +++ b/src/translators/alexandriaimporter.h @@ -50,7 +50,7 @@ public: virtual Data::CollPtr collection(); /** */ - virtual TQWidget* widget(TQWidget* tqparent, const char* name=0); + virtual TQWidget* widget(TQWidget* parent, const char* name=0); virtual bool canImport(int type) const; public slots: diff --git a/src/translators/audiofileimporter.h b/src/translators/audiofileimporter.h index 5733860..a02e2bc 100644 --- a/src/translators/audiofileimporter.h +++ b/src/translators/audiofileimporter.h @@ -45,7 +45,7 @@ public: virtual Data::CollPtr collection(); /** */ - virtual TQWidget* widget(TQWidget* tqparent, const char* name=0); + virtual TQWidget* widget(TQWidget* parent, const char* name=0); virtual bool canImport(int type) const; public slots: diff --git a/src/translators/bibtexexporter.cpp b/src/translators/bibtexexporter.cpp index d51e061..2135c67 100644 --- a/src/translators/bibtexexporter.cpp +++ b/src/translators/bibtexexporter.cpp @@ -191,7 +191,7 @@ bool BibtexExporter::exec() { } TQWidget* BibtexExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { - if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) { + if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) { return m_widget; } diff --git a/src/translators/bibtexexporter.h b/src/translators/bibtexexporter.h index b626e88..ea7189c 100644 --- a/src/translators/bibtexexporter.h +++ b/src/translators/bibtexexporter.h @@ -40,7 +40,7 @@ public: virtual TQString formatString() const; virtual TQString fileFilter() const; - virtual TQWidget* widget(TQWidget* tqparent, const char* name=0); + virtual TQWidget* widget(TQWidget* parent, const char* name=0); virtual void readOptions(KConfig*); virtual void saveOptions(KConfig*); diff --git a/src/translators/bibteximporter.h b/src/translators/bibteximporter.h index e0d248c..4d9fe2b 100644 --- a/src/translators/bibteximporter.h +++ b/src/translators/bibteximporter.h @@ -64,7 +64,7 @@ public: * @return A pointer to a @ref BibtexCollection, or 0 if none can be created. */ virtual Data::CollPtr collection(); - virtual TQWidget* widget(TQWidget* tqparent, const char* name=0); + virtual TQWidget* widget(TQWidget* parent, const char* name=0); virtual bool canImport(int type) const; public slots: diff --git a/src/translators/btparse/err.h b/src/translators/btparse/err.h index a9ba6da..d16615d 100644 --- a/src/translators/btparse/err.h +++ b/src/translators/btparse/err.h @@ -61,13 +61,13 @@ * hidden and does not need to be saved during a "save state" operation */ /* maximum of 32 bits/unsigned int and must be 8 bits/byte */ -static SetWordType bittqmask[] = { +static SetWordType bitmask[] = { 0x00000001, 0x00000002, 0x00000004, 0x00000008, 0x00000010, 0x00000020, 0x00000040, 0x00000080 }; void -zzresynch(SetWordType *wd,SetWordType tqmask) +zzresynch(SetWordType *wd,SetWordType mask) { static int consumed = 1; @@ -77,10 +77,10 @@ zzresynch(SetWordType *wd,SetWordType tqmask) if ( !consumed ) {zzCONSUME; return;} /* if current token is in resynch set, we've got what we wanted */ - if ( wd[LA(1)]&tqmask || LA(1) == zzEOF_TOKEN ) {consumed=0; return;} + if ( wd[LA(1)]&mask || LA(1) == zzEOF_TOKEN ) {consumed=0; return;} /* scan until we find something in the resynch set */ - while ( !(wd[LA(1)]&tqmask) && LA(1) != zzEOF_TOKEN ) {zzCONSUME;} + while ( !(wd[LA(1)]&mask) && LA(1) != zzEOF_TOKEN ) {zzCONSUME;} consumed=1; } @@ -237,11 +237,11 @@ zzedecode(SetWordType *a) if ( zzset_deg(a)>1 ) fprintf(stderr, " {"); do { register SetWordType t = *p; - register SetWordType *b = &(bittqmask[0]); + register SetWordType *b = &(bitmask[0]); do { if ( t & *b ) fprintf(stderr, " %s", zztokens[e]); e++; - } while (++b < &(bittqmask[sizeof(SetWordType)*8])); + } while (++b < &(bitmask[sizeof(SetWordType)*8])); } while (++p < endp); if ( zzset_deg(a)>1 ) fprintf(stderr, " }"); } @@ -271,7 +271,7 @@ zzsyn(char *text, int tok, char *egroup, SetWordType *eset, int etok, int k, cha int zzset_el(unsigned b, SetWordType *p) { - return( p[BSETDIVWORD(b)] & bittqmask[BSETMODWORD(b)] ); + return( p[BSETDIVWORD(b)] & bitmask[BSETMODWORD(b)] ); } int @@ -289,10 +289,10 @@ zzset_deg(SetWordType *a) while ( p < endp ) { register SetWordType t = *p; - register SetWordType *b = &(bittqmask[0]); + register SetWordType *b = &(bitmask[0]); do { if (t & *b) ++degree; - } while (++b < &(bittqmask[sizeof(SetWordType)*8])); + } while (++b < &(bitmask[sizeof(SetWordType)*8])); p++; } diff --git a/src/translators/btparse/input.c b/src/translators/btparse/input.c index 03668af..dbb7b44 100644 --- a/src/translators/btparse/input.c +++ b/src/translators/btparse/input.c @@ -174,7 +174,7 @@ finish_parse (int **err_counts) static boolean parse_status (int *saved_counts) { - ushort ignore_etqmask; + ushort ignore_emask; /* * This bit-twiddling fetches the error status (which has a bit @@ -182,9 +182,9 @@ parse_status (int *saved_counts) * to get "true" if there were any serious errors, and then * returns the opposite of that. */ - ignore_etqmask = + ignore_emask = (1<tqparent()) == TQT_BASE_OBJECT(parent_)) { + if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) { return m_widget; } diff --git a/src/translators/csvexporter.h b/src/translators/csvexporter.h index ee300cf..77b5e6b 100644 --- a/src/translators/csvexporter.h +++ b/src/translators/csvexporter.h @@ -40,7 +40,7 @@ public: virtual TQString formatString() const; virtual TQString fileFilter() const; - virtual TQWidget* widget(TQWidget* tqparent, const char* name=0); + virtual TQWidget* widget(TQWidget* parent, const char* name=0); virtual void readOptions(KConfig* config); virtual void saveOptions(KConfig* config); diff --git a/src/translators/csvimporter.cpp b/src/translators/csvimporter.cpp index 532fbcf..cf233bd 100644 --- a/src/translators/csvimporter.cpp +++ b/src/translators/csvimporter.cpp @@ -211,7 +211,7 @@ Tellico::Data::CollPtr CSVImporter::collection() { } TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) { - if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) { + if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) { return m_widget; } diff --git a/src/translators/csvimporter.h b/src/translators/csvimporter.h index d12f3c0..9cadf92 100644 --- a/src/translators/csvimporter.h +++ b/src/translators/csvimporter.h @@ -56,7 +56,7 @@ public: virtual Data::CollPtr collection(); /** */ - virtual TQWidget* widget(TQWidget* tqparent, const char* name=0); + virtual TQWidget* widget(TQWidget* parent, const char* name=0); virtual bool validImport() const; diff --git a/src/translators/exporter.h b/src/translators/exporter.h index 3085609..0f7b55f 100644 --- a/src/translators/exporter.h +++ b/src/translators/exporter.h @@ -74,7 +74,7 @@ public: */ virtual void reset() {} - virtual TQWidget* widget(TQWidget* tqparent, const char* name=0) = 0; + virtual TQWidget* widget(TQWidget* parent, const char* name=0) = 0; virtual void readOptions(KConfig*) {} virtual void saveOptions(KConfig*) {} diff --git a/src/translators/freedbimporter.cpp b/src/translators/freedbimporter.cpp index fa864b6..8a13ed3 100644 --- a/src/translators/freedbimporter.cpp +++ b/src/translators/freedbimporter.cpp @@ -505,7 +505,7 @@ TQWidget* FreeDBImporter::widget(TQWidget* parent_, const char* name_/*=0*/) { // cddb cache stuff m_buttonGroup = new TQButtonGroup(m_widget); - m_buttonGroup->hide(); // only use as button tqparent + m_buttonGroup->hide(); // only use as button parent m_buttonGroup->setExclusive(true); m_buttonGroup->insert(m_radioCDROM); m_buttonGroup->insert(m_radioCache); diff --git a/src/translators/freedbimporter.h b/src/translators/freedbimporter.h index 22003ee..22c7036 100644 --- a/src/translators/freedbimporter.h +++ b/src/translators/freedbimporter.h @@ -45,7 +45,7 @@ public: virtual Data::CollPtr collection(); /** */ - virtual TQWidget* widget(TQWidget* tqparent, const char* name=0); + virtual TQWidget* widget(TQWidget* parent, const char* name=0); virtual bool canImport(int type) const; public slots: diff --git a/src/translators/htmlexporter.cpp b/src/translators/htmlexporter.cpp index 8ea2218..333ebfd 100644 --- a/src/translators/htmlexporter.cpp +++ b/src/translators/htmlexporter.cpp @@ -455,7 +455,7 @@ void HTMLExporter::writeImages(Data::CollPtr coll_) { } TQWidget* HTMLExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { - if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) { + if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) { return m_widget; } diff --git a/src/translators/htmlexporter.h b/src/translators/htmlexporter.h index 421d09e..0f7371d 100644 --- a/src/translators/htmlexporter.h +++ b/src/translators/htmlexporter.h @@ -52,7 +52,7 @@ public: virtual TQString formatString() const; virtual TQString fileFilter() const; - virtual TQWidget* widget(TQWidget* tqparent, const char* name=0); + virtual TQWidget* widget(TQWidget* parent, const char* name=0); virtual void readOptions(KConfig*); virtual void saveOptions(KConfig*); diff --git a/src/translators/onixexporter.cpp b/src/translators/onixexporter.cpp index e0d0de3..65b85ee 100644 --- a/src/translators/onixexporter.cpp +++ b/src/translators/onixexporter.cpp @@ -166,7 +166,7 @@ TQString ONIXExporter::text() { } TQWidget* ONIXExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { - if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) { + if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) { return m_widget; } diff --git a/src/translators/pilotdbexporter.cpp b/src/translators/pilotdbexporter.cpp index f5ec13b..a4f2e72 100644 --- a/src/translators/pilotdbexporter.cpp +++ b/src/translators/pilotdbexporter.cpp @@ -200,7 +200,7 @@ bool PilotDBExporter::exec() { } TQWidget* PilotDBExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { - if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) { + if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) { return m_widget; } diff --git a/src/translators/pilotdbexporter.h b/src/translators/pilotdbexporter.h index 8b3e4b2..f827e2c 100644 --- a/src/translators/pilotdbexporter.h +++ b/src/translators/pilotdbexporter.h @@ -37,7 +37,7 @@ public: virtual TQString formatString() const; virtual TQString fileFilter() const; - virtual TQWidget* widget(TQWidget* tqparent, const char* name=0); + virtual TQWidget* widget(TQWidget* parent, const char* name=0); virtual void readOptions(KConfig* cfg); virtual void saveOptions(KConfig* cfg); diff --git a/src/translators/tellicoxmlexporter.cpp b/src/translators/tellicoxmlexporter.cpp index 9d9d033..221a11b 100644 --- a/src/translators/tellicoxmlexporter.cpp +++ b/src/translators/tellicoxmlexporter.cpp @@ -262,7 +262,7 @@ void TellicoXMLExporter::exportEntryXML(TQDomDocument& dom_, TQDomElement& paren // if multiple versions are allowed, split them into separate elements if(fIt->flags() & Data::Field::AllowMultiple) { - // tqparent element if field contains multiple values, child of entryElem + // parent element if field contains multiple values, child of entryElem // who cares about grammar, just add an 's' to the name TQDomElement parElem = dom_.createElement(fieldName + 's'); entryElem.appendChild(parElem); @@ -472,7 +472,7 @@ void TellicoXMLExporter::exportBorrowerXML(TQDomDocument& dom_, TQDomElement& pa } TQWidget* TellicoXMLExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { - if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) { + if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) { return m_widget; } diff --git a/src/translators/tellicoxmlexporter.h b/src/translators/tellicoxmlexporter.h index 1fe4f43..666bdde 100644 --- a/src/translators/tellicoxmlexporter.h +++ b/src/translators/tellicoxmlexporter.h @@ -59,13 +59,13 @@ public: static const unsigned syntaxVersion; private: - void exportCollectionXML(TQDomDocument& doc, TQDomElement& tqparent, bool format) const; - void exportFieldXML(TQDomDocument& doc, TQDomElement& tqparent, Data::FieldPtr field) const; - void exportEntryXML(TQDomDocument& doc, TQDomElement& tqparent, Data::EntryPtr entry, bool format) const; - void exportImageXML(TQDomDocument& doc, TQDomElement& tqparent, const TQString& imageID) const; - void exportGroupXML(TQDomDocument& doc, TQDomElement& tqparent) const; - void exportFilterXML(TQDomDocument& doc, TQDomElement& tqparent, FilterPtr filter) const; - void exportBorrowerXML(TQDomDocument& doc, TQDomElement& tqparent, Data::BorrowerPtr borrower) const; + void exportCollectionXML(TQDomDocument& doc, TQDomElement& parent, bool format) const; + void exportFieldXML(TQDomDocument& doc, TQDomElement& parent, Data::FieldPtr field) const; + void exportEntryXML(TQDomDocument& doc, TQDomElement& parent, Data::EntryPtr entry, bool format) const; + void exportImageXML(TQDomDocument& doc, TQDomElement& parent, const TQString& imageID) const; + void exportGroupXML(TQDomDocument& doc, TQDomElement& parent) const; + void exportFilterXML(TQDomDocument& doc, TQDomElement& parent, FilterPtr filter) const; + void exportBorrowerXML(TQDomDocument& doc, TQDomElement& parent, Data::BorrowerPtr borrower) const; // keep track of which images were written, since some entries could have same image mutable StringSet m_images; diff --git a/src/translators/xsltexporter.cpp b/src/translators/xsltexporter.cpp index e797f7e..f7151fd 100644 --- a/src/translators/xsltexporter.cpp +++ b/src/translators/xsltexporter.cpp @@ -59,7 +59,7 @@ bool XSLTExporter::exec() { } TQWidget* XSLTExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { - if(m_widget && TQT_BASE_OBJECT(m_widget->tqparent()) == TQT_BASE_OBJECT(parent_)) { + if(m_widget && TQT_BASE_OBJECT(m_widget->parent()) == TQT_BASE_OBJECT(parent_)) { return m_widget; } diff --git a/src/translators/xsltexporter.h b/src/translators/xsltexporter.h index 2a626f2..b14afd3 100644 --- a/src/translators/xsltexporter.h +++ b/src/translators/xsltexporter.h @@ -32,7 +32,7 @@ public: virtual TQString formatString() const; virtual TQString fileFilter() const; - virtual TQWidget* widget(TQWidget* tqparent, const char* name=0); + virtual TQWidget* widget(TQWidget* parent, const char* name=0); private: TQWidget* m_widget; diff --git a/src/translators/xsltimporter.h b/src/translators/xsltimporter.h index 16aa6d2..25357de 100644 --- a/src/translators/xsltimporter.h +++ b/src/translators/xsltimporter.h @@ -41,7 +41,7 @@ public: virtual Data::CollPtr collection(); /** */ - virtual TQWidget* widget(TQWidget* tqparent, const char* name=0); + virtual TQWidget* widget(TQWidget* parent, const char* name=0); void setXSLTURL(const KURL& url) { m_xsltURL = url; } private: diff --git a/src/upcvalidator.h b/src/upcvalidator.h index 6239486..540857f 100644 --- a/src/upcvalidator.h +++ b/src/upcvalidator.h @@ -26,7 +26,7 @@ Q_OBJECT TQ_OBJECT public: - UPCValidator(TQObject* tqparent, const char* name=0); + UPCValidator(TQObject* parent, const char* name=0); virtual TQValidator::State validate(TQString& input, int& pos) const; virtual void fixup(TQString& input) const; diff --git a/src/viewstack.h b/src/viewstack.h index 0a73e01..ac0701a 100644 --- a/src/viewstack.h +++ b/src/viewstack.h @@ -30,7 +30,7 @@ Q_OBJECT TQ_OBJECT public: - ViewStack(TQWidget* tqparent, const char* name = 0); + ViewStack(TQWidget* parent, const char* name = 0); EntryView* entryView() const { return m_entryView; } EntryIconView* iconView() const { return m_iconView; }