diff options
Diffstat (limited to 'kexi/plugins')
124 files changed, 388 insertions, 388 deletions
diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp index 9318bb5e..61585840 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog.cpp +++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp @@ -51,18 +51,18 @@ typedef KListViewItemTemplate<TQString> ActionSelectorDialogListItemBase; class ActionSelectorDialogListItem : public ActionSelectorDialogListItemBase { public: - ActionSelectorDialogListItem(const TQString& data, TQListView *tqparent, TQString label1) - : ActionSelectorDialogListItemBase(data, tqparent, label1) + ActionSelectorDialogListItem(const TQString& data, TQListView *parent, TQString label1) + : ActionSelectorDialogListItemBase(data, parent, label1) , fifoSorting(true) { - m_sortKey.sprintf("%2.2d", tqparent->childCount()); + m_sortKey.sprintf("%2.2d", parent->childCount()); } - ActionSelectorDialogListItem(const TQString& data, TQListViewItem *tqparent, TQString label1) - : ActionSelectorDialogListItemBase(data, tqparent, label1) + ActionSelectorDialogListItem(const TQString& data, TQListViewItem *parent, TQString label1) + : ActionSelectorDialogListItemBase(data, parent, label1) , fifoSorting(true) { - m_sortKey.sprintf("%2.2d", tqparent->childCount()); + m_sortKey.sprintf("%2.2d", parent->childCount()); } virtual TQString key( int column, bool ascending ) const @@ -78,8 +78,8 @@ protected: //--------------------------------------- -ActionsListViewBase::ActionsListViewBase(TQWidget* tqparent) - : KListView(tqparent) +ActionsListViewBase::ActionsListViewBase(TQWidget* parent) + : KListView(parent) { setResizeMode(TQListView::AllColumns); addColumn(""); @@ -115,8 +115,8 @@ void ActionsListViewBase::selectAction(const TQString& actionName) //--------------------------------------- -KActionsListViewBase::KActionsListViewBase(TQWidget* tqparent, KexiMainWindow* mainWin) - : ActionsListViewBase(tqparent) +KActionsListViewBase::KActionsListViewBase(TQWidget* parent, KexiMainWindow* mainWin) + : ActionsListViewBase(parent) , m_mainWin(mainWin) { } @@ -156,8 +156,8 @@ void KActionsListViewBase::init() class KActionsListView : public KActionsListViewBase { public: - KActionsListView(TQWidget* tqparent, KexiMainWindow* mainWin) - : KActionsListViewBase(tqparent, mainWin) + KActionsListView(TQWidget* parent, KexiMainWindow* mainWin) + : KActionsListViewBase(parent, mainWin) { } virtual ~KActionsListView() {} @@ -172,8 +172,8 @@ public: class CurrentFormActionsListView : public KActionsListViewBase { public: - CurrentFormActionsListView(TQWidget* tqparent, KexiMainWindow* mainWin) - : KActionsListViewBase(tqparent, mainWin) + CurrentFormActionsListView(TQWidget* parent, KexiMainWindow* mainWin) + : KActionsListViewBase(parent, mainWin) { } virtual ~CurrentFormActionsListView() {} @@ -188,8 +188,8 @@ public: class ActionCategoriesListView : public ActionsListViewBase { public: - ActionCategoriesListView(TQWidget* tqparent) //, KexiProject& project) - : ActionsListViewBase(tqparent) + ActionCategoriesListView(TQWidget* parent) //, KexiProject& project) + : ActionsListViewBase(parent) { TQListViewItem *item = new ActionSelectorDialogListItem("noaction", this, i18n("No action") ); const TQPixmap noIcon( KexiUtils::emptyIcon(KIcon::Small) ); @@ -243,8 +243,8 @@ public: class ActionToExecuteListView : public ActionsListViewBase { public: - ActionToExecuteListView(TQWidget* tqparent) - : ActionsListViewBase(tqparent) + ActionToExecuteListView(TQWidget* parent) + : ActionsListViewBase(parent) { } @@ -394,9 +394,9 @@ public: //------------------------------------- -KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQWidget *tqparent, +KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQWidget *parent, const KexiFormEventAction::ActionData& action, const TQCString& actionWidgetName) - : KDialogBase(tqparent, "actionSelectorDialog", true, i18n("Assigning Action to Command Button"), + : KDialogBase(parent, "actionSelectorDialog", true, i18n("Assigning Action to Command Button"), KDialogBase::Ok | KDialogBase::Cancel ) , d( new KexiActionSelectionDialogPrivate() ) { diff --git a/kexi/plugins/forms/kexiactionselectiondialog.h b/kexi/plugins/forms/kexiactionselectiondialog.h index a9c4d549..a2c4066d 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog.h +++ b/kexi/plugins/forms/kexiactionselectiondialog.h @@ -39,7 +39,7 @@ class KEXIFORMUTILS_EXPORT KexiActionSelectionDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - KexiActionSelectionDialog(KexiMainWindow* mainWin, TQWidget *tqparent, + KexiActionSelectionDialog(KexiMainWindow* mainWin, TQWidget *parent, const KexiFormEventAction::ActionData& action, const TQCString& actionWidgetName); ~KexiActionSelectionDialog(); diff --git a/kexi/plugins/forms/kexiactionselectiondialog_p.h b/kexi/plugins/forms/kexiactionselectiondialog_p.h index a2579074..488805ee 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog_p.h +++ b/kexi/plugins/forms/kexiactionselectiondialog_p.h @@ -26,7 +26,7 @@ class ActionsListViewBase : public KListView { public: - ActionsListViewBase(TQWidget* tqparent); + ActionsListViewBase(TQWidget* parent); virtual ~ActionsListViewBase(); //! \return item for action \a actionName @@ -40,7 +40,7 @@ class KActionsListViewBase : public ActionsListViewBase Q_OBJECT TQ_OBJECT public: - KActionsListViewBase(TQWidget* tqparent, KexiMainWindow* mainWin); + KActionsListViewBase(TQWidget* parent, KexiMainWindow* mainWin); virtual ~KActionsListViewBase(); void init(); virtual bool isActionVisible(const char* actionName, int actionCategories) const = 0; diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp index 7e5b9b85..e89ba9cb 100644 --- a/kexi/plugins/forms/kexidataprovider.cpp +++ b/kexi/plugins/forms/kexidataprovider.cpp @@ -64,7 +64,7 @@ void KexiFormDataProvider::setMainDataSourceWidget(TQWidget* mainWidget) KexiFormDataItemInterface* const formDataItem = dynamic_cast<KexiFormDataItemInterface*>(obj); if (!formDataItem) continue; - if (formDataItem->parentInterface()) //item with tqparent interface: collect tqparent instead... + if (formDataItem->parentInterface()) //item with parent interface: collect parent instead... continue; #if 0 //! @todo reenable when subform is moved to KexiDBForm KexiDBForm *dbForm = KexiUtils::findParent<KexiDBForm>(obj, "KexiDBForm"); //form's surface... diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp index 74f9af05..e9ff4177 100644 --- a/kexi/plugins/forms/kexidatasourcepage.cpp +++ b/kexi/plugins/forms/kexidatasourcepage.cpp @@ -43,8 +43,8 @@ #include <koproperty/property.h> #include <koproperty/utils.h> -KexiDataSourcePage::KexiDataSourcePage(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name) + : TQWidget(parent, name) , m_insideClearDataSourceSelection(false) { TQVBoxLayout *vlyr = new TQVBoxLayout(this); diff --git a/kexi/plugins/forms/kexidatasourcepage.h b/kexi/plugins/forms/kexidatasourcepage.h index 914a869b..748d5d3d 100644 --- a/kexi/plugins/forms/kexidatasourcepage.h +++ b/kexi/plugins/forms/kexidatasourcepage.h @@ -41,7 +41,7 @@ class KEXIFORMUTILS_EXPORT KexiDataSourcePage : public TQWidget TQ_OBJECT public: - KexiDataSourcePage(TQWidget *tqparent, const char *name = 0); + KexiDataSourcePage(TQWidget *parent, const char *name = 0); virtual ~KexiDataSourcePage(); KexiDataSourceComboBox* dataSourceCombo() const { return m_dataSourceCombo; } diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp index 8683c2bb..89f8ae11 100644 --- a/kexi/plugins/forms/kexidbfactory.cpp +++ b/kexi/plugins/forms/kexidbfactory.cpp @@ -69,8 +69,8 @@ ////////////////////////////////////////// -KexiDBFactory::KexiDBFactory(TQObject *tqparent, const char *name, const TQStringList &) - : KFormDesigner::WidgetFactory(tqparent, name) +KexiDBFactory::KexiDBFactory(TQObject *parent, const char *name, const TQStringList &) + : KFormDesigner::WidgetFactory(parent, name) { KFormDesigner::WidgetInfo *wi; wi = new KexiDataAwareWidgetInfo(this); diff --git a/kexi/plugins/forms/kexidbfactory.h b/kexi/plugins/forms/kexidbfactory.h index 79873b72..67ee3527 100644 --- a/kexi/plugins/forms/kexidbfactory.h +++ b/kexi/plugins/forms/kexidbfactory.h @@ -37,10 +37,10 @@ class KexiDBFactory : public KFormDesigner::WidgetFactory TQ_OBJECT public: - KexiDBFactory(TQObject *tqparent, const char *name, const TQStringList &args); + KexiDBFactory(TQObject *parent, const char *name, const TQStringList &args); virtual ~KexiDBFactory(); - virtual TQWidget *createWidget(const TQCString &classname, TQWidget *tqparent, const char *name, + virtual TQWidget *createWidget(const TQCString &classname, TQWidget *parent, const char *name, KFormDesigner::Container *container, int options = DefaultOptions ); virtual void createCustomActions(KActionCollection* col); @@ -51,7 +51,7 @@ class KexiDBFactory : public KFormDesigner::WidgetFactory virtual bool clearWidgetContent(const TQCString &classname, TQWidget *w); //virtual void saveSpecialProperty(const TQString &classname, const TQString &name, const TQVariant &value, TQWidget *w, - //TQDomElement &parentNode, TQDomDocument &tqparent) {} + //TQDomElement &parentNode, TQDomDocument &parent) {} //virtual void readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w, KFormDesigner::ObjectTreeItem *item) {} virtual TQValueList<TQCString> autoSaveProperties(const TQCString &classname); diff --git a/kexi/plugins/forms/kexiformdataiteminterface.h b/kexi/plugins/forms/kexiformdataiteminterface.h index 1cb7a11f..a1d41482 100644 --- a/kexi/plugins/forms/kexiformdataiteminterface.h +++ b/kexi/plugins/forms/kexiformdataiteminterface.h @@ -118,7 +118,7 @@ class KEXIFORMUTILS_EXPORT KexiFormDataItemInterface : public KexiDataItemInterf virtual void undoChanges(); /* Cancels editing of the widget's data. This method just looks for - the (grand)tqparent KexiFormScrollView object and calls + the (grand)parent KexiFormScrollView object and calls KexiFormScrollView::cancelEditor(). */ void cancelEditor(); diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp index cd6f5ac3..4e066bd6 100644 --- a/kexi/plugins/forms/kexiformeventhandler.cpp +++ b/kexi/plugins/forms/kexiformeventhandler.cpp @@ -68,9 +68,9 @@ KexiPart::Info* KexiFormEventAction::ActionData::decodeString( //------------------------------------- -KexiFormEventAction::KexiFormEventAction(KexiMainWindow *mainWin, TQObject* tqparent, +KexiFormEventAction::KexiFormEventAction(KexiMainWindow *mainWin, TQObject* parent, const TQString& actionName, const TQString& objectName, const TQString& actionOption) - : KAction(tqparent), m_mainWin(mainWin), m_actionName(actionName), m_objectName(objectName) + : KAction(parent), m_mainWin(mainWin), m_actionName(actionName), m_objectName(objectName) , m_actionOption(actionOption) { } @@ -94,7 +94,7 @@ void KexiFormEventAction::activate() bool actionCancelled = false; if (m_actionOption.isEmpty()) { // backward compatibility (good defaults) if (part->info()->isExecuteSupported()) - part->execute(item, tqparent()); + part->execute(item, parent()); else m_mainWin->openObject(item, Kexi::DataViewMode, actionCancelled); } @@ -103,7 +103,7 @@ void KexiFormEventAction::activate() if (m_actionOption == "open") m_mainWin->openObject(item, Kexi::DataViewMode, actionCancelled); else if (m_actionOption == "execute") - part->execute(item, tqparent()); + part->execute(item, parent()); else if (m_actionOption == "print") { if (part->info()->isPrintingSupported()) m_mainWin->printItem(item); diff --git a/kexi/plugins/forms/kexiformeventhandler.h b/kexi/plugins/forms/kexiformeventhandler.h index 6e020e25..e882eeb8 100644 --- a/kexi/plugins/forms/kexiformeventhandler.h +++ b/kexi/plugins/forms/kexiformeventhandler.h @@ -84,7 +84,7 @@ class KEXIFORMUTILS_EXPORT KexiFormEventAction : public KAction //!< @see ActionToExecuteListView::showActionsForMimeType() }; - KexiFormEventAction(KexiMainWindow *mainWin, TQObject* tqparent, const TQString& actionName, + KexiFormEventAction(KexiMainWindow *mainWin, TQObject* parent, const TQString& actionName, const TQString& objectName, const TQString& actionOption); virtual ~KexiFormEventAction(); diff --git a/kexi/plugins/forms/kexiformmanager.cpp b/kexi/plugins/forms/kexiformmanager.cpp index 3c76e7d9..9674f4fe 100644 --- a/kexi/plugins/forms/kexiformmanager.cpp +++ b/kexi/plugins/forms/kexiformmanager.cpp @@ -35,13 +35,13 @@ #include <koproperty/property.h> #include <widget/kexicustompropertyfactory.h> -KexiFormManager::KexiFormManager(KexiPart::Part *tqparent, const char* name) - : KFormDesigner::FormManager(tqparent, +KexiFormManager::KexiFormManager(KexiPart::Part *parent, const char* name) + : KFormDesigner::FormManager(parent, KFormDesigner::FormManager::HideEventsInPopupMenu | KFormDesigner::FormManager::SkipFileActions | KFormDesigner::FormManager::HideSignalSlotConnections , name) - , m_part(tqparent) + , m_part(parent) { m_emitSelectionSignalsUpdatesPropertySet = true; KexiCustomPropertyFactory::init(); @@ -67,7 +67,7 @@ KAction* KexiFormManager::action( const char* name ) KexiFormScrollView *scrollViewWidget = dynamic_cast<KexiFormScrollView*>(dbform->dataAwareObject()); if (!scrollViewWidget) return 0; - KexiFormView* formViewWidget = dynamic_cast<KexiFormView*>(scrollViewWidget->tqparent()); + KexiFormView* formViewWidget = dynamic_cast<KexiFormView*>(scrollViewWidget->parent()); if (!formViewWidget) return 0; return formViewWidget->parentDialog()->mainWin()->actionCollection()->action(n.data()); @@ -82,7 +82,7 @@ KexiFormView* KexiFormManager::activeFormViewWidget() const KexiFormScrollView *scrollViewWidget = dynamic_cast<KexiFormScrollView*>(dbform->dataAwareObject()); if (!scrollViewWidget) return 0; - return dynamic_cast<KexiFormView*>(scrollViewWidget->tqparent()); + return dynamic_cast<KexiFormView*>(scrollViewWidget->parent()); } void KexiFormManager::enableAction( const char* name, bool enable ) diff --git a/kexi/plugins/forms/kexiformmanager.h b/kexi/plugins/forms/kexiformmanager.h index 34decc1d..6cde85dc 100644 --- a/kexi/plugins/forms/kexiformmanager.h +++ b/kexi/plugins/forms/kexiformmanager.h @@ -34,7 +34,7 @@ class KEXIFORMUTILS_EXPORT KexiFormManager : public KFormDesigner::FormManager TQ_OBJECT public: - KexiFormManager(KexiPart::Part *tqparent, const char* name = 0); + KexiFormManager(KexiPart::Part *parent, const char* name = 0); virtual ~KexiFormManager(); virtual KAction* action( const char* name ); diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp index e03a0779..9c4e3173 100644 --- a/kexi/plugins/forms/kexiformpart.cpp +++ b/kexi/plugins/forms/kexiformpart.cpp @@ -77,8 +77,8 @@ class KexiFormPart::Private KexiDataSourceComboBox *dataSourceCombo; }; -KexiFormPart::KexiFormPart(TQObject *tqparent, const char *name, const TQStringList &l) - : KexiPart::Part(tqparent, name, l) +KexiFormPart::KexiFormPart(TQObject *parent, const char *name, const TQStringList &l) + : KexiPart::Part(parent, name, l) , d(new Private()) { // REGISTERED ID: @@ -233,7 +233,7 @@ KexiFormPart::createTempData(KexiDialogBase* dialog) return new KexiFormPart::TempData(TQT_TQOBJECT(dialog)); } -KexiViewBase* KexiFormPart::createView(TQWidget *tqparent, KexiDialogBase* dialog, +KexiViewBase* KexiFormPart::createView(TQWidget *parent, KexiDialogBase* dialog, KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>*) { Q_UNUSED( viewMode ); @@ -243,7 +243,7 @@ KexiViewBase* KexiFormPart::createView(TQWidget *tqparent, KexiDialogBase* dialo if (!win || !win->project() || !win->project()->dbConnection()) return 0; - KexiFormView *view = new KexiFormView(win, tqparent, item.name().latin1(), + KexiFormView *view = new KexiFormView(win, parent, item.name().latin1(), win->project()->dbConnection() ); return view; @@ -424,7 +424,7 @@ void KexiFormPart::slotAssignAction() KexiFormScrollView *scrollViewWidget = dynamic_cast<KexiFormScrollView*>(dbform->dataAwareObject()); if (!scrollViewWidget) return; - KexiFormView* formViewWidget = dynamic_cast<KexiFormView*>(scrollViewWidget->tqparent()); + KexiFormView* formViewWidget = dynamic_cast<KexiFormView*>(scrollViewWidget->parent()); if (!formViewWidget) return; @@ -538,8 +538,8 @@ void KexiFormPart::slotWidgetCreatedByFormsLibrary(TQWidget* widget) //---------------- -KexiFormPart::TempData::TempData(TQObject* tqparent) - : KexiDialogTempData(tqparent) +KexiFormPart::TempData::TempData(TQObject* parent) + : KexiDialogTempData(parent) { } diff --git a/kexi/plugins/forms/kexiformpart.h b/kexi/plugins/forms/kexiformpart.h index df5c6b53..fe667061 100644 --- a/kexi/plugins/forms/kexiformpart.h +++ b/kexi/plugins/forms/kexiformpart.h @@ -52,7 +52,7 @@ class KEXIFORMUTILS_EXPORT KexiFormPart : public KexiPart::Part TQ_OBJECT public: - KexiFormPart(TQObject *tqparent, const char *name, const TQStringList &); + KexiFormPart(TQObject *parent, const char *name, const TQStringList &); virtual ~KexiFormPart(); //! \return a pointer to Forms Widget Library. @@ -65,7 +65,7 @@ class KEXIFORMUTILS_EXPORT KexiFormPart : public KexiPart::Part class TempData : public KexiDialogTempData { public: - TempData(TQObject* tqparent); + TempData(TQObject* parent); ~TempData(); TQGuardedPtr<KFormDesigner::Form> form; TQGuardedPtr<KFormDesigner::Form> previewForm; @@ -85,7 +85,7 @@ class KEXIFORMUTILS_EXPORT KexiFormPart : public KexiPart::Part protected: virtual KexiDialogTempData* createTempData(KexiDialogBase* dialog); - virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog, + virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, KexiPart::Item &item, int viewMode = Kexi::DataViewMode, TQMap<TQString,TQString>* staticObjectArgs = 0); virtual void initPartActions(); diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp index 5996061f..df5191ed 100644 --- a/kexi/plugins/forms/kexiformscrollview.cpp +++ b/kexi/plugins/forms/kexiformscrollview.cpp @@ -30,8 +30,8 @@ #include <kpopupmenu.h> #include <kdebug.h> -KexiFormScrollView::KexiFormScrollView(TQWidget *tqparent, bool preview) - : KexiScrollView(tqparent, preview) +KexiFormScrollView::KexiFormScrollView(TQWidget *parent, bool preview) + : KexiScrollView(parent, preview) , KexiRecordNavigatorHandler() , KexiSharedActionClient() , KexiDataAwareObjectInterface() @@ -71,7 +71,7 @@ KexiFormScrollView::show() #if 0 //moved to KexiFormView, OK? //now get resize mode settings for entire form if (m_preview) { - KexiFormView* fv = dynamic_cast<KexiFormView*>(tqparent()); + KexiFormView* fv = dynamic_cast<KexiFormView*>(parent()); int resizeMode = fv ? fv->resizeMode() : KexiFormView::ResizeAuto; if (resizeMode == KexiFormView::ResizeAuto) setResizePolicy(AutoOneFit); diff --git a/kexi/plugins/forms/kexiformscrollview.h b/kexi/plugins/forms/kexiformscrollview.h index 61c13a8f..d8326a57 100644 --- a/kexi/plugins/forms/kexiformscrollview.h +++ b/kexi/plugins/forms/kexiformscrollview.h @@ -51,7 +51,7 @@ class KEXIFORMUTILS_EXPORT KexiFormScrollView : KEXI_DATAAWAREOBJECTINTERFACE public: - KexiFormScrollView(TQWidget *tqparent, bool preview); + KexiFormScrollView(TQWidget *parent, bool preview); virtual ~KexiFormScrollView(); void setForm(KFormDesigner::Form *form) { m_form = form; } diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp index 3b12588c..01ec080f 100644 --- a/kexi/plugins/forms/kexiformview.cpp +++ b/kexi/plugins/forms/kexiformview.cpp @@ -60,9 +60,9 @@ //! @todo #define KEXI_SHOW_SPLITTER_WIDGET -KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *tqparent, +KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *parent, const char *name, bool /*dbAware*/) - : KexiDataAwareView( mainWin, tqparent, name ) + : KexiDataAwareView( mainWin, parent, name ) , m_propertySet(0) , m_resizeMode(KexiFormView::ResizeDefault) , m_query(0) diff --git a/kexi/plugins/forms/kexiformview.h b/kexi/plugins/forms/kexiformview.h index b05a544c..8bc1cb79 100644 --- a/kexi/plugins/forms/kexiformview.h +++ b/kexi/plugins/forms/kexiformview.h @@ -65,8 +65,8 @@ class KEXIFORMUTILS_EXPORT KexiFormView : public KexiDataAwareView NoResize = 2 /*! @todo */ }; -// KexiFormView(KexiMainWindow *win, TQWidget *tqparent, const char *name, KexiDB::Connection *conn); - KexiFormView(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0, +// KexiFormView(KexiMainWindow *win, TQWidget *parent, const char *name, KexiDB::Connection *conn); + KexiFormView(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0, bool dbAware = true); virtual ~KexiFormView(); diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp index 521dce2a..7ebc522f 100644 --- a/kexi/plugins/forms/widgets/kexidbautofield.cpp +++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp @@ -72,8 +72,8 @@ class KexiDBAutoField::Private //------------------------------------- KexiDBAutoField::KexiDBAutoField(const TQString &text, WidgetType type, LabelPosition pos, - TQWidget *tqparent, const char *name, bool designMode) - : TQWidget(tqparent, name) + TQWidget *parent, const char *name, bool designMode) + : TQWidget(parent, name) , KexiFormDataItemInterface() , KFormDesigner::DesignTimeDynamicChildWidgetHandler() , d( new Private() ) @@ -82,8 +82,8 @@ KexiDBAutoField::KexiDBAutoField(const TQString &text, WidgetType type, LabelPos init(text, type, pos); } -KexiDBAutoField::KexiDBAutoField(TQWidget *tqparent, const char *name, bool designMode, LabelPosition pos) - : TQWidget(tqparent, name) +KexiDBAutoField::KexiDBAutoField(TQWidget *parent, const char *name, bool designMode, LabelPosition pos) + : TQWidget(parent, name) , KexiFormDataItemInterface() , KFormDesigner::DesignTimeDynamicChildWidgetHandler() , d( new Private() ) diff --git a/kexi/plugins/forms/widgets/kexidbautofield.h b/kexi/plugins/forms/widgets/kexidbautofield.h index f13e701e..653e4067 100644 --- a/kexi/plugins/forms/widgets/kexidbautofield.h +++ b/kexi/plugins/forms/widgets/kexidbautofield.h @@ -64,8 +64,8 @@ class KEXIFORMUTILS_EXPORT KexiDBAutoField : enum LabelPosition { Left = 300, Top, NoLabel }; KexiDBAutoField(const TQString &text, WidgetType type, LabelPosition pos, - TQWidget *tqparent = 0, const char *name = 0, bool designMode = true); - KexiDBAutoField(TQWidget *tqparent = 0, const char *name = 0, bool designMode = true, + TQWidget *parent = 0, const char *name = 0, bool designMode = true); + KexiDBAutoField(TQWidget *parent = 0, const char *name = 0, bool designMode = true, LabelPosition pos = Left); virtual ~KexiDBAutoField(); diff --git a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp index c704a985..c1a8f5d4 100644 --- a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp @@ -23,8 +23,8 @@ #include <kexiutils/utils.h> #include <kexidb/queryschema.h> -KexiDBCheckBox::KexiDBCheckBox(const TQString &text, TQWidget *tqparent, const char *name) - : TQCheckBox(text, tqparent, name), KexiFormDataItemInterface() +KexiDBCheckBox::KexiDBCheckBox(const TQString &text, TQWidget *parent, const char *name) + : TQCheckBox(text, parent, name), KexiFormDataItemInterface() , m_invalidState(false) , m_tristateChanged(false) , m_tristate(TristateDefault) diff --git a/kexi/plugins/forms/widgets/kexidbcheckbox.h b/kexi/plugins/forms/widgets/kexidbcheckbox.h index 8a65f33a..aba3314c 100644 --- a/kexi/plugins/forms/widgets/kexidbcheckbox.h +++ b/kexi/plugins/forms/widgets/kexidbcheckbox.h @@ -35,7 +35,7 @@ class KEXIFORMUTILS_EXPORT KexiDBCheckBox : public TQCheckBox, public KexiFormDa Q_ENUMS( Tristate ) public: - KexiDBCheckBox(const TQString &text, TQWidget *tqparent, const char *name=0); + KexiDBCheckBox(const TQString &text, TQWidget *parent, const char *name=0); virtual ~KexiDBCheckBox(); inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); } diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp index f194908f..81c66ba6 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp @@ -72,8 +72,8 @@ class KexiDBComboBox::Private //------------------------------------- -KexiDBComboBox::KexiDBComboBox(TQWidget *tqparent, const char *name, bool designMode) - : KexiDBAutoField(tqparent, name, designMode, NoLabel) +KexiDBComboBox::KexiDBComboBox(TQWidget *parent, const char *name, bool designMode) + : KexiDBAutoField(parent, name, designMode, NoLabel) , KexiComboBoxBase() , d(new Private()) { diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.h b/kexi/plugins/forms/widgets/kexidbcombobox.h index 2639b1f9..4e780aa3 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.h +++ b/kexi/plugins/forms/widgets/kexidbcombobox.h @@ -44,7 +44,7 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox : TQ_OVERRIDE(bool autoCaption DESIGNABLE false) public: - KexiDBComboBox(TQWidget *tqparent, const char *name=0, bool designMode = true); + KexiDBComboBox(TQWidget *parent, const char *name=0, bool designMode = true); virtual ~KexiDBComboBox(); //! Implemented for KexiComboBoxBase: form has no 'related data' model (only the full database model) @@ -147,7 +147,7 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox : //! Implemented for KexiComboBoxBase virtual void acceptRequested(); - //! Implement this to return a position \a pos mapped from tqparent (e.g. viewport) + //! Implement this to return a position \a pos mapped from parent (e.g. viewport) //! to global coordinates. TQPoint(-1, -1) should be returned if this cannot be computed. virtual TQPoint mapFromParentToGlobal(const TQPoint& pos) const; diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp index 9638f93a..8394ef58 100644 --- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp @@ -28,8 +28,8 @@ #include <kexiutils/utils.h> #include <kexidb/queryschema.h> -KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name), KexiFormDataItemInterface() +KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char *name) + : TQWidget(parent, name), KexiFormDataItemInterface() { m_invalidState = false; m_cleared = false; diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.h b/kexi/plugins/forms/widgets/kexidbdateedit.h index b611590e..4b02a3bc 100644 --- a/kexi/plugins/forms/widgets/kexidbdateedit.h +++ b/kexi/plugins/forms/widgets/kexidbdateedit.h @@ -47,7 +47,7 @@ class KEXIFORMUTILS_EXPORT KexiDBDateEdit : public TQWidget, public KexiFormData public: enum Order { DMY = TQDateEdit::DMY, MDY = TQDateEdit::MDY, YMD = TQDateEdit::YMD, YDM = TQDateEdit::YDM }; - KexiDBDateEdit(const TQDate &date, TQWidget *tqparent, const char *name=0); + KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char *name=0); virtual ~KexiDBDateEdit(); inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); } diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp index e99e4651..ea9dede7 100644 --- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp @@ -27,8 +27,8 @@ #include <kdatetbl.h> #include <kexiutils/utils.h> -KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name), KexiFormDataItemInterface() +KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *parent, const char *name) + : TQWidget(parent, name), KexiFormDataItemInterface() { m_invalidState = false; m_cleared = false; diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.h b/kexi/plugins/forms/widgets/kexidbdatetimeedit.h index b5bbaec0..b28ff069 100644 --- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.h +++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.h @@ -42,7 +42,7 @@ class KEXIFORMUTILS_EXPORT KexiDBDateTimeEdit : public TQWidget, public KexiForm public: enum Order { DMY, MDY, YMD, YDM }; - KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *tqparent, const char *name=0); + KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *parent, const char *name=0); virtual ~KexiDBDateTimeEdit(); inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); } diff --git a/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp b/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp index c0eb17d3..99afcbd6 100644 --- a/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp +++ b/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp @@ -22,8 +22,8 @@ #include <tqlineedit.h> -KexiDBDoubleSpinBox::KexiDBDoubleSpinBox(TQWidget *tqparent, const char *name) - : KDoubleSpinBox(tqparent, name) , KexiFormDataItemInterface() +KexiDBDoubleSpinBox::KexiDBDoubleSpinBox(TQWidget *parent, const char *name) + : KDoubleSpinBox(parent, name) , KexiFormDataItemInterface() { connect(this, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotValueChanged())); } diff --git a/kexi/plugins/forms/widgets/kexidbdoublespinbox.h b/kexi/plugins/forms/widgets/kexidbdoublespinbox.h index 1445980c..e693245b 100644 --- a/kexi/plugins/forms/widgets/kexidbdoublespinbox.h +++ b/kexi/plugins/forms/widgets/kexidbdoublespinbox.h @@ -35,7 +35,7 @@ class KEXIFORMUTILS_EXPORT KexiDBDoubleSpinBox : public KDoubleSpinBox, public K TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly DESIGNABLE true ) public: - KexiDBDoubleSpinBox(TQWidget *tqparent, const char *name=0); + KexiDBDoubleSpinBox(TQWidget *parent, const char *name=0); virtual ~KexiDBDoubleSpinBox(); inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); } diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp index c2a705c0..88ddf93f 100644 --- a/kexi/plugins/forms/widgets/kexidbform.cpp +++ b/kexi/plugins/forms/widgets/kexidbform.cpp @@ -100,9 +100,9 @@ class KexiDBForm::Private //======================== -KexiDBForm::KexiDBForm(TQWidget *tqparent, KexiDataAwareObjectInterface* dataAwareObject, +KexiDBForm::KexiDBForm(TQWidget *parent, KexiDataAwareObjectInterface* dataAwareObject, const char *name/*, KexiDB::Connection *conn*/) - : KexiDBFormBase(tqparent, name) + : KexiDBFormBase(parent, name) , KexiFormDataItemInterface() , d(new Private()) { @@ -425,11 +425,11 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) while (dataItemIface) { if (dataItemIface->keyPressed(ke)) return false; - dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(dataItemIface->parentInterface()); //try in tqparent, e.g. in combobox + dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(dataItemIface->parentInterface()); //try in parent, e.g. in combobox } break; } - o = o->tqparent(); + o = o->parent(); } // try to handle global shortcuts at the KexiDataAwareObjectInterface // level (e.g. for "next record" action) diff --git a/kexi/plugins/forms/widgets/kexidbform.h b/kexi/plugins/forms/widgets/kexidbform.h index cbfdc8ee..fc0d25c2 100644 --- a/kexi/plugins/forms/widgets/kexidbform.h +++ b/kexi/plugins/forms/widgets/kexidbform.h @@ -50,7 +50,7 @@ class KEXIFORMUTILS_EXPORT KexiDBForm : //original "size" property is not designable, so here's a custom (not storable) replacement TQ_PROPERTY( TQSize sizeInternal READ sizeInternal WRITE resizeInternal DESIGNABLE true STORED false ) public: - KexiDBForm(TQWidget *tqparent, KexiDataAwareObjectInterface* dataAwareObject, const char *name="kexi_dbform"); + KexiDBForm(TQWidget *parent, KexiDataAwareObjectInterface* dataAwareObject, const char *name="kexi_dbform"); virtual ~KexiDBForm(); KexiDataAwareObjectInterface* dataAwareObject() const; diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index 0e79fada..4165c000 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -64,8 +64,8 @@ static TQPixmap* KexiDBImageBox_pm = 0; static KStaticDeleter<TQPixmap> KexiDBImageBox_pmSmallDeleter; static TQPixmap* KexiDBImageBox_pmSmall = 0; -KexiDBImageBox::KexiDBImageBox( bool designMode, TQWidget *tqparent, const char *name ) - : KexiFrame( tqparent, name, TQt::WNoAutoErase ) +KexiDBImageBox::KexiDBImageBox( bool designMode, TQWidget *parent, const char *name ) + : KexiFrame( parent, name, TQt::WNoAutoErase ) , KexiFormDataItemInterface() , m_tqalignment(TQt::AlignAuto|TQt::AlignTop) , m_designMode(designMode) diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.h b/kexi/plugins/forms/widgets/kexidbimagebox.h index 85b54cd5..32b4e9b1 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.h +++ b/kexi/plugins/forms/widgets/kexidbimagebox.h @@ -56,7 +56,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox : TQ_OVERRIDE( FocusPolicy focusPolicy READ focusPolicyInternal WRITE setFocusPolicy ) public: - KexiDBImageBox( bool designMode, TQWidget *tqparent, const char *name = 0 ); + KexiDBImageBox( bool designMode, TQWidget *parent, const char *name = 0 ); virtual ~KexiDBImageBox(); inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); } diff --git a/kexi/plugins/forms/widgets/kexidbintspinbox.cpp b/kexi/plugins/forms/widgets/kexidbintspinbox.cpp index 7d5ae6ee..a48d06c8 100644 --- a/kexi/plugins/forms/widgets/kexidbintspinbox.cpp +++ b/kexi/plugins/forms/widgets/kexidbintspinbox.cpp @@ -23,8 +23,8 @@ #include <tqlineedit.h> #include <knumvalidator.h> -KexiDBIntSpinBox::KexiDBIntSpinBox(TQWidget *tqparent, const char *name) - : KIntSpinBox(tqparent, name) , KexiFormDataItemInterface() +KexiDBIntSpinBox::KexiDBIntSpinBox(TQWidget *parent, const char *name) + : KIntSpinBox(parent, name) , KexiFormDataItemInterface() { connect(this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged())); } diff --git a/kexi/plugins/forms/widgets/kexidbintspinbox.h b/kexi/plugins/forms/widgets/kexidbintspinbox.h index 9827cd5f..a76ab0dd 100644 --- a/kexi/plugins/forms/widgets/kexidbintspinbox.h +++ b/kexi/plugins/forms/widgets/kexidbintspinbox.h @@ -35,7 +35,7 @@ class KEXIFORMUTILS_EXPORT KexiDBIntSpinBox : public KIntSpinBox, public KexiFor TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly DESIGNABLE true ) public: - KexiDBIntSpinBox(TQWidget *tqparent, const char *name=0); + KexiDBIntSpinBox(TQWidget *parent, const char *name=0); virtual ~KexiDBIntSpinBox(); inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); } diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp index 8226d3c4..0fc3525c 100644 --- a/kexi/plugins/forms/widgets/kexidblabel.cpp +++ b/kexi/plugins/forms/widgets/kexidblabel.cpp @@ -59,9 +59,9 @@ class KexiDBInternalLabel : public TQLabel { KexiDBLabel *m_parentLabel; }; -KexiDBInternalLabel::KexiDBInternalLabel( KexiDBLabel* tqparent ) - : TQLabel( tqparent ) - , m_parentLabel(tqparent) +KexiDBInternalLabel::KexiDBInternalLabel( KexiDBLabel* parent ) + : TQLabel( parent ) + , m_parentLabel(parent) { int a = tqalignment() | TQt::WordBreak; a &= (0xffffff ^ TQt::AlignVertical_Mask); @@ -395,8 +395,8 @@ class KexiDBLabel::Private //========================================================= -KexiDBLabel::KexiDBLabel( TQWidget *tqparent, const char *name, WFlags f ) - : TQLabel( tqparent, name, f ) +KexiDBLabel::KexiDBLabel( TQWidget *parent, const char *name, WFlags f ) + : TQLabel( parent, name, f ) , KexiDBTextWidgetInterface() , KexiFormDataItemInterface() , d( new Private() ) @@ -404,8 +404,8 @@ KexiDBLabel::KexiDBLabel( TQWidget *tqparent, const char *name, WFlags f ) init(); } -KexiDBLabel::KexiDBLabel( const TQString& text, TQWidget *tqparent, const char *name, WFlags f ) - : TQLabel( tqparent, name, f ) +KexiDBLabel::KexiDBLabel( const TQString& text, TQWidget *parent, const char *name, WFlags f ) + : TQLabel( parent, name, f ) , KexiDBTextWidgetInterface() , KexiFormDataItemInterface() , d( new Private() ) diff --git a/kexi/plugins/forms/widgets/kexidblabel.h b/kexi/plugins/forms/widgets/kexidblabel.h index af396a12..f99ddc76 100644 --- a/kexi/plugins/forms/widgets/kexidblabel.h +++ b/kexi/plugins/forms/widgets/kexidblabel.h @@ -51,8 +51,8 @@ class KEXIFORMUTILS_EXPORT KexiDBLabel : public TQLabel, protected KexiDBTextWid TQ_PROPERTY( TQColor frameColor READ frameColor WRITE setFrameColor DESIGNABLE true ) public: - KexiDBLabel( TQWidget *tqparent, const char *name = 0, WFlags f = 0 ); - KexiDBLabel( const TQString& text, TQWidget *tqparent, const char *name = 0, WFlags f = 0 ); + KexiDBLabel( TQWidget *parent, const char *name = 0, WFlags f = 0 ); + KexiDBLabel( const TQString& text, TQWidget *parent, const char *name = 0, WFlags f = 0 ); virtual ~KexiDBLabel(); inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); } diff --git a/kexi/plugins/forms/widgets/kexidblineedit.cpp b/kexi/plugins/forms/widgets/kexidblineedit.cpp index 0b1709e1..5bb74e22 100644 --- a/kexi/plugins/forms/widgets/kexidblineedit.cpp +++ b/kexi/plugins/forms/widgets/kexidblineedit.cpp @@ -40,8 +40,8 @@ class KexiDBLineEdit_ReadOnlyValidator : public TQValidator { public: - KexiDBLineEdit_ReadOnlyValidator( TQObject * tqparent ) - : TQValidator(tqparent) + KexiDBLineEdit_ReadOnlyValidator( TQObject * parent ) + : TQValidator(parent) { } ~KexiDBLineEdit_ReadOnlyValidator() {} @@ -50,8 +50,8 @@ class KexiDBLineEdit_ReadOnlyValidator : public TQValidator //----- -KexiDBLineEdit::KexiDBLineEdit(TQWidget *tqparent, const char *name) - : KLineEdit(tqparent, name) +KexiDBLineEdit::KexiDBLineEdit(TQWidget *parent, const char *name) + : KLineEdit(parent, name) , KexiDBTextWidgetInterface() , KexiFormDataItemInterface() //moved , m_dateFormatter(0) @@ -303,7 +303,7 @@ void KexiDBLineEdit::setColumnInfo(KexiDB::QueryColumnInfo* cinfo) if (!cinfo) return; -//! @todo handle input tqmask (via TQLineEdit::setInputMask()) using a special KexiDB::FieldInputMask class +//! @todo handle input mask (via TQLineEdit::setInputMask()) using a special KexiDB::FieldInputMask class setValidator( new KexiDB::FieldValidator(*cinfo->field, this) ); #if 0 // moved to KexiTextFormatter diff --git a/kexi/plugins/forms/widgets/kexidblineedit.h b/kexi/plugins/forms/widgets/kexidblineedit.h index 92a87280..9d85dac5 100644 --- a/kexi/plugins/forms/widgets/kexidblineedit.h +++ b/kexi/plugins/forms/widgets/kexidblineedit.h @@ -53,7 +53,7 @@ class KEXIFORMUTILS_EXPORT KexiDBLineEdit : TQ_OVERRIDE(bool readOnly READ isReadOnly WRITE setReadOnly DESIGNABLE true) public: - KexiDBLineEdit(TQWidget *tqparent, const char *name=0); + KexiDBLineEdit(TQWidget *parent, const char *name=0); virtual ~KexiDBLineEdit(); inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); } diff --git a/kexi/plugins/forms/widgets/kexidbsubform.cpp b/kexi/plugins/forms/widgets/kexidbsubform.cpp index 283631c3..9c24df4a 100644 --- a/kexi/plugins/forms/widgets/kexidbsubform.cpp +++ b/kexi/plugins/forms/widgets/kexidbsubform.cpp @@ -29,8 +29,8 @@ #include <formeditor/container.h> #include <formeditor/formmanager.h> -KexiDBSubForm::KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *tqparent, const char *name) -: TQScrollView(tqparent, name), m_parentForm(parentForm), m_form(0), m_widget(0) +KexiDBSubForm::KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *parent, const char *name) +: TQScrollView(parent, name), m_parentForm(parentForm), m_form(0), m_widget(0) { setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); viewport()->setPaletteBackgroundColor(tqcolorGroup().mid()); diff --git a/kexi/plugins/forms/widgets/kexidbsubform.h b/kexi/plugins/forms/widgets/kexidbsubform.h index cbbc6250..c09e5e83 100644 --- a/kexi/plugins/forms/widgets/kexidbsubform.h +++ b/kexi/plugins/forms/widgets/kexidbsubform.h @@ -32,7 +32,7 @@ class KEXIFORMUTILS_EXPORT KexiDBSubForm : public TQScrollView TQ_PROPERTY(TQString formName READ formName WRITE setFormName DESIGNABLE true) public: - KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *tqparent, const char *name); + KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *parent, const char *name); ~KexiDBSubForm() {} //! \return the name of the subform to display inside this widget diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp index 6f6aa89d..c4cbe4d0 100644 --- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp @@ -28,8 +28,8 @@ #include <tqpainter.h> -KexiDBTextEdit::KexiDBTextEdit(TQWidget *tqparent, const char *name) - : KTextEdit(tqparent, name) +KexiDBTextEdit::KexiDBTextEdit(TQWidget *parent, const char *name) + : KTextEdit(parent, name) , KexiDBTextWidgetInterface() , KexiFormDataItemInterface() , m_menuExtender(TQT_TQOBJECT(this), this) diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.h b/kexi/plugins/forms/widgets/kexidbtextedit.h index c6f64136..8e92ee6f 100644 --- a/kexi/plugins/forms/widgets/kexidbtextedit.h +++ b/kexi/plugins/forms/widgets/kexidbtextedit.h @@ -38,7 +38,7 @@ class KEXIFORMUTILS_EXPORT KexiDBTextEdit : TQ_PROPERTY(TQCString dataSourceMimeType READ dataSourceMimeType WRITE setDataSourceMimeType DESIGNABLE true) public: - KexiDBTextEdit(TQWidget *tqparent, const char *name=0); + KexiDBTextEdit(TQWidget *parent, const char *name=0); virtual ~KexiDBTextEdit(); inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); } diff --git a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp index f2546a44..b136fa0d 100644 --- a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp @@ -29,8 +29,8 @@ #include <kdatetbl.h> #include <kexiutils/utils.h> -KexiDBTimeEdit::KexiDBTimeEdit(const TQTime &time, TQWidget *tqparent, const char *name) - : TQTimeEdit(time, tqparent, name), KexiFormDataItemInterface() +KexiDBTimeEdit::KexiDBTimeEdit(const TQTime &time, TQWidget *parent, const char *name) + : TQTimeEdit(time, parent, name), KexiFormDataItemInterface() { m_invalidState = false; setAutoAdvance(true); diff --git a/kexi/plugins/forms/widgets/kexidbtimeedit.h b/kexi/plugins/forms/widgets/kexidbtimeedit.h index 6b29a7ac..808316e6 100644 --- a/kexi/plugins/forms/widgets/kexidbtimeedit.h +++ b/kexi/plugins/forms/widgets/kexidbtimeedit.h @@ -37,7 +37,7 @@ class KEXIFORMUTILS_EXPORT KexiDBTimeEdit : public TQTimeEdit, public KexiFormDa TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly DESIGNABLE true ) public: - KexiDBTimeEdit(const TQTime &time, TQWidget *tqparent, const char *name=0); + KexiDBTimeEdit(const TQTime &time, TQWidget *parent, const char *name=0); virtual ~KexiDBTimeEdit(); inline TQString dataSource() const { return KexiFormDataItemInterface::dataSource(); } diff --git a/kexi/plugins/forms/widgets/kexidbutils.cpp b/kexi/plugins/forms/widgets/kexidbutils.cpp index ba9f2aec..3f12b3dd 100644 --- a/kexi/plugins/forms/widgets/kexidbutils.cpp +++ b/kexi/plugins/forms/widgets/kexidbutils.cpp @@ -37,8 +37,8 @@ TQColor lighterGrayBackgroundColor(const TQPalette& palette) //------- -KexiDBWidgetContextMenuExtender::KexiDBWidgetContextMenuExtender( TQObject* tqparent, KexiDataItemInterface* iface ) - : TQObject(tqparent) +KexiDBWidgetContextMenuExtender::KexiDBWidgetContextMenuExtender( TQObject* parent, KexiDataItemInterface* iface ) + : TQObject(parent) , m_iface(iface) , m_contextMenuHasTitle(false) { diff --git a/kexi/plugins/forms/widgets/kexidbutils.h b/kexi/plugins/forms/widgets/kexidbutils.h index 06f49406..f4100c73 100644 --- a/kexi/plugins/forms/widgets/kexidbutils.h +++ b/kexi/plugins/forms/widgets/kexidbutils.h @@ -31,7 +31,7 @@ TQColor lighterGrayBackgroundColor(const TQPalette& palette); class KexiDBWidgetContextMenuExtender : public TQObject { public: - KexiDBWidgetContextMenuExtender( TQObject* tqparent, KexiDataItemInterface* iface ); + KexiDBWidgetContextMenuExtender( TQObject* parent, KexiDataItemInterface* iface ); ~KexiDBWidgetContextMenuExtender(); //! Creates title for context menu \a menu diff --git a/kexi/plugins/forms/widgets/kexiframe.cpp b/kexi/plugins/forms/widgets/kexiframe.cpp index b33581d7..09266ae4 100644 --- a/kexi/plugins/forms/widgets/kexiframe.cpp +++ b/kexi/plugins/forms/widgets/kexiframe.cpp @@ -43,8 +43,8 @@ class KexiFrame::Private //========================================================= -KexiFrame::KexiFrame( TQWidget * tqparent, const char * name, WFlags f ) - : TQFrame(tqparent, name, f) +KexiFrame::KexiFrame( TQWidget * parent, const char * name, WFlags f ) + : TQFrame(parent, name, f) , d( new Private() ) { //defaults diff --git a/kexi/plugins/forms/widgets/kexiframe.h b/kexi/plugins/forms/widgets/kexiframe.h index d960cefd..2f6ca562 100644 --- a/kexi/plugins/forms/widgets/kexiframe.h +++ b/kexi/plugins/forms/widgets/kexiframe.h @@ -33,7 +33,7 @@ class KEXIFORMUTILS_EXPORT KexiFrame : public TQFrame //todo TQ_OVERRIDE( Shadow frameShadow READ frameShadow WRITE setFrameShadow ) public: - KexiFrame( TQWidget * tqparent, const char * name = 0, WFlags f = 0 ); + KexiFrame( TQWidget * parent, const char * name = 0, WFlags f = 0 ); virtual ~KexiFrame(); virtual const TQColor& frameColor() const; diff --git a/kexi/plugins/forms/widgets/kexipushbutton.cpp b/kexi/plugins/forms/widgets/kexipushbutton.cpp index 95d0b92e..dbff6c4b 100644 --- a/kexi/plugins/forms/widgets/kexipushbutton.cpp +++ b/kexi/plugins/forms/widgets/kexipushbutton.cpp @@ -20,8 +20,8 @@ #include "kexipushbutton.h" -KexiPushButton::KexiPushButton( const TQString & text, TQWidget * tqparent, const char * name ) -: KPushButton(text, tqparent, name) +KexiPushButton::KexiPushButton( const TQString & text, TQWidget * parent, const char * name ) +: KPushButton(text, parent, name) { } diff --git a/kexi/plugins/forms/widgets/kexipushbutton.h b/kexi/plugins/forms/widgets/kexipushbutton.h index 3dd8f0a9..4f9ec5f7 100644 --- a/kexi/plugins/forms/widgets/kexipushbutton.h +++ b/kexi/plugins/forms/widgets/kexipushbutton.h @@ -33,7 +33,7 @@ class KEXIFORMUTILS_EXPORT KexiPushButton : public KPushButton TQ_PROPERTY(TQString onClickActionOption READ onClickActionOption WRITE setOnClickActionOption DESIGNABLE true) public: - KexiPushButton( const TQString & text, TQWidget * tqparent, const char * name = 0 ); + KexiPushButton( const TQString & text, TQWidget * parent, const char * name = 0 ); ~KexiPushButton(); public slots: diff --git a/kexi/plugins/importexport/csv/kexicsv_importexportpart.cpp b/kexi/plugins/importexport/csv/kexicsv_importexportpart.cpp index 7037b29a..0ca5b7d2 100644 --- a/kexi/plugins/importexport/csv/kexicsv_importexportpart.cpp +++ b/kexi/plugins/importexport/csv/kexicsv_importexportpart.cpp @@ -26,8 +26,8 @@ #include <kgenericfactory.h> -KexiCSVImportExportPart::KexiCSVImportExportPart(TQObject *tqparent, const char *name, const TQStringList &args) - : KexiInternalPart(tqparent, name, args) +KexiCSVImportExportPart::KexiCSVImportExportPart(TQObject *parent, const char *name, const TQStringList &args) + : KexiInternalPart(parent, name, args) { } @@ -36,12 +36,12 @@ KexiCSVImportExportPart::~KexiCSVImportExportPart() } TQWidget *KexiCSVImportExportPart::createWidget(const char* widgetClass, KexiMainWindow* mainWin, - TQWidget *tqparent, const char *objName, TQMap<TQString,TQString>* args ) + TQWidget *parent, const char *objName, TQMap<TQString,TQString>* args ) { if (0==qstrcmp(widgetClass, "KexiCSVImportDialog")) { KexiCSVImportDialog::Mode mode = (args && (*args)["sourceType"]=="file") ? KexiCSVImportDialog::File : KexiCSVImportDialog::Clipboard; - KexiCSVImportDialog *dlg = new KexiCSVImportDialog( mode, mainWin, tqparent, objName ); + KexiCSVImportDialog *dlg = new KexiCSVImportDialog( mode, mainWin, parent, objName ); m_cancelled = dlg->cancelled(); if (m_cancelled) { delete dlg; @@ -55,7 +55,7 @@ TQWidget *KexiCSVImportExportPart::createWidget(const char* widgetClass, KexiMai KexiCSVExport::Options options; if (!options.assign( *args )) return 0; - KexiCSVExportWizard *dlg = new KexiCSVExportWizard( options, mainWin, tqparent, objName); + KexiCSVExportWizard *dlg = new KexiCSVExportWizard( options, mainWin, parent, objName); m_cancelled = dlg->cancelled(); if (m_cancelled) { delete dlg; diff --git a/kexi/plugins/importexport/csv/kexicsv_importexportpart.h b/kexi/plugins/importexport/csv/kexicsv_importexportpart.h index c4a666e3..bd40c2f5 100644 --- a/kexi/plugins/importexport/csv/kexicsv_importexportpart.h +++ b/kexi/plugins/importexport/csv/kexicsv_importexportpart.h @@ -27,12 +27,12 @@ class KexiCSVImportExportPart : public KexiInternalPart { public: - KexiCSVImportExportPart(TQObject *tqparent, const char *name, const TQStringList &args); + KexiCSVImportExportPart(TQObject *parent, const char *name, const TQStringList &args); virtual ~KexiCSVImportExportPart(); /*! Reimplemented to return wizard object. */ virtual TQWidget *createWidget(const char* widgetClass, KexiMainWindow* mainWin, - TQWidget *tqparent, const char *objName = 0, TQMap<TQString,TQString>* args = 0); + TQWidget *parent, const char *objName = 0, TQMap<TQString,TQString>* args = 0); /*! Reimplemented to execute a command \a commandName (nonvisual). The result are put into the \a args. */ virtual bool executeCommand(KexiMainWindow* mainWin, const char* commandName, diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp index 956681b1..6e985901 100644 --- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp @@ -44,8 +44,8 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options, - KexiMainWindow* mainWin, TQWidget * tqparent, const char * name ) - : KWizard(tqparent, name) + KexiMainWindow* mainWin, TQWidget * parent, const char * name ) + : KWizard(parent, name) , m_options(options) // , m_mode(mode) // , m_itemId(itemId) diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.h b/kexi/plugins/importexport/csv/kexicsvexportwizard.h index ef2bd17b..27213159 100644 --- a/kexi/plugins/importexport/csv/kexicsvexportwizard.h +++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.h @@ -46,7 +46,7 @@ class KexiCSVExportWizard : public KWizard public: KexiCSVExportWizard( const KexiCSVExport::Options& options, KexiMainWindow* mainWin, - TQWidget * tqparent = 0, const char * name = 0 ); + TQWidget * parent = 0, const char * name = 0 ); virtual ~KexiCSVExportWizard(); diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index 01601230..18398d39 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -102,8 +102,8 @@ class KexiCSVImportDialogTable : public TQTable { public: - KexiCSVImportDialogTable( TQWidget * tqparent = 0, const char * name = 0 ) - : TQTable(tqparent, name) { + KexiCSVImportDialogTable( TQWidget * parent = 0, const char * name = 0 ) + : TQTable(parent, name) { f = font(); f.setBold(true); } @@ -137,7 +137,7 @@ void installRecursiveEventFilter(TQObject *filter, TQObject *object) } KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, - TQWidget * tqparent, const char * name + TQWidget * parent, const char * name ) : KDialogBase( KDialogBase::Plain, @@ -146,7 +146,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, , (mode==File ? User1 : (ButtonCode)0) |Ok|Cancel, Ok, - tqparent, + parent, name ? name : "KexiCSVImportDialog", true, false, diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.h b/kexi/plugins/importexport/csv/kexicsvimportdialog.h index dd8a51df..cbb4ac6b 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.h +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.h @@ -85,7 +85,7 @@ class KexiCSVImportDialog : public KDialogBase enum Header { TEXT, NUMBER, DATE, CURRENCY }; //! @todo what about making it kexidb-independent? - KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, TQWidget * tqparent, + KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, TQWidget * parent, const char * name = 0/*, TQRect const & rect*/); virtual ~KexiCSVImportDialog(); diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp index 23fee674..ed1a5b30 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp @@ -66,13 +66,13 @@ bool KexiCSVImportOptions::operator!= ( const KexiCSVImportOptions & opt ) const //---------------------------------- KexiCSVImportOptionsDialog::KexiCSVImportOptionsDialog( - const KexiCSVImportOptions& options, TQWidget* tqparent ) + const KexiCSVImportOptions& options, TQWidget* parent ) : KDialogBase( KDialogBase::Plain, i18n( "CSV Import Options" ), Ok|Cancel, Ok, - tqparent, + parent, "KexiCSVImportOptionsDialog", true, false diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.h b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.h index 51319bbf..35d8b5cd 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.h +++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.h @@ -46,7 +46,7 @@ class KexiCSVImportOptionsDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - KexiCSVImportOptionsDialog( const KexiCSVImportOptions& options, TQWidget* tqparent = 0 ); + KexiCSVImportOptionsDialog( const KexiCSVImportOptions& options, TQWidget* parent = 0 ); virtual ~KexiCSVImportOptionsDialog(); KexiCSVImportOptions options() const; diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp index f490795b..48d907b9 100644 --- a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp +++ b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp @@ -32,8 +32,8 @@ #define KEXICSV_OTHER_DELIMITER_INDEX 4 -KexiCSVDelimiterWidget::KexiCSVDelimiterWidget( bool lineEditOnBottom, TQWidget * tqparent ) - : TQWidget(tqparent, "KexiCSVDelimiterWidget") +KexiCSVDelimiterWidget::KexiCSVDelimiterWidget( bool lineEditOnBottom, TQWidget * parent ) + : TQWidget(parent, "KexiCSVDelimiterWidget") , m_availableDelimiters(KEXICSV_OTHER_DELIMITER_INDEX) { @@ -129,8 +129,8 @@ void KexiCSVDelimiterWidget::setDelimiter(const TQString& delimiter) //---------------------------------------------------- -KexiCSVTextQuoteComboBox::KexiCSVTextQuoteComboBox( TQWidget * tqparent ) - : KComboBox(tqparent, "KexiCSVTextQuoteComboBox") +KexiCSVTextQuoteComboBox::KexiCSVTextQuoteComboBox( TQWidget * parent ) + : KComboBox(parent, "KexiCSVTextQuoteComboBox") { insertItem( "\"" ); insertItem( "'" ); @@ -154,8 +154,8 @@ void KexiCSVTextQuoteComboBox::setTextQuote(const TQString& textQuote) //---------------------------------------------------- -KexiCSVInfoLabel::KexiCSVInfoLabel( const TQString& labelText, TQWidget* tqparent ) - : TQWidget(tqparent, "KexiCSVInfoLabel") +KexiCSVInfoLabel::KexiCSVInfoLabel( const TQString& labelText, TQWidget* parent ) + : TQWidget(parent, "KexiCSVInfoLabel") { TQVBoxLayout *vbox = new TQVBoxLayout( this, 0, KDialogBase::spacingHint() ); TQHBoxLayout *hbox = new TQHBoxLayout( this ); diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.h b/kexi/plugins/importexport/csv/kexicsvwidgets.h index 7a163ee0..3c420c7a 100644 --- a/kexi/plugins/importexport/csv/kexicsvwidgets.h +++ b/kexi/plugins/importexport/csv/kexicsvwidgets.h @@ -50,7 +50,7 @@ class KexiCSVInfoLabel : public TQWidget \pre [icon] [labeltext] [filename] [comment] */ - KexiCSVInfoLabel( const TQString& labelText, TQWidget* tqparent ); + KexiCSVInfoLabel( const TQString& labelText, TQWidget* parent ); void setFileName( const TQString& fileName ); void setLabelText( const TQString& text ); @@ -79,7 +79,7 @@ class KexiCSVDelimiterWidget : public TQWidget TQ_OBJECT public: - KexiCSVDelimiterWidget( bool lineEditOnBottom, TQWidget * tqparent = 0 ); + KexiCSVDelimiterWidget( bool lineEditOnBottom, TQWidget * parent = 0 ); TQString delimiter() const { return m_delimiter; } void setDelimiter(const TQString& delimiter); @@ -106,7 +106,7 @@ class KexiCSVDelimiterWidget : public TQWidget class KexiCSVTextQuoteComboBox : public KComboBox { public: - KexiCSVTextQuoteComboBox( TQWidget * tqparent = 0 ); + KexiCSVTextQuoteComboBox( TQWidget * parent = 0 ); TQString textQuote() const; diff --git a/kexi/plugins/macros/kexiactions/kexivariable.h b/kexi/plugins/macros/kexiactions/kexivariable.h index da3f47e2..c6b093cf 100644 --- a/kexi/plugins/macros/kexiactions/kexivariable.h +++ b/kexi/plugins/macros/kexiactions/kexivariable.h @@ -68,7 +68,7 @@ namespace KexiMacro { } private: - /// The tqparent @a KexiAction implementation. + /// The parent @a KexiAction implementation. ACTIONIMPL* m_actionimpl; }; } diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp index efce73c0..b7e89e9a 100644 --- a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp +++ b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp @@ -107,8 +107,8 @@ class KexiMacroDesignView::Private }; -KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *tqparent, ::KoMacro::Macro* const macro) - : KexiMacroView(mainwin, tqparent, macro, "KexiMacroDesignView") +KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *parent, ::KoMacro::Macro* const macro) + : KexiMacroView(mainwin, parent, macro, "KexiMacroDesignView") , d( new Private() ) { // The table's data-model. diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.h b/kexi/plugins/macros/kexipart/keximacrodesignview.h index e982f1bd..3529ea0c 100644 --- a/kexi/plugins/macros/kexipart/keximacrodesignview.h +++ b/kexi/plugins/macros/kexipart/keximacrodesignview.h @@ -49,10 +49,10 @@ class KexiMacroDesignView : public KexiMacroView * * \param mainwin The \a KexiMainWindow instance this \a KexiViewBase * belongs to. - * \param tqparent The tqparent widget this widget should be displayed in. + * \param parent The parent widget this widget should be displayed in. * \param macro The \a KoMacro::Macro instance this view is for. */ - KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *tqparent, ::KoMacro::Macro* const macro); + KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *parent, ::KoMacro::Macro* const macro); /** * Destructor. diff --git a/kexi/plugins/macros/kexipart/keximacroerror.h b/kexi/plugins/macros/kexipart/keximacroerror.h index d902d6a4..e03afbcd 100644 --- a/kexi/plugins/macros/kexipart/keximacroerror.h +++ b/kexi/plugins/macros/kexipart/keximacroerror.h @@ -57,7 +57,7 @@ class KexiMacroError : public KexiMacroErrorBase /** * Constructor. * - * @param mainwin The tqparent @a KexiMainWindow instance. + * @param mainwin The parent @a KexiMainWindow instance. * @param context The @a KoMacro::Context where the error happened. */ KexiMacroError(KexiMainWindow* mainwin, KSharedPtr<KoMacro::Context> context); diff --git a/kexi/plugins/macros/kexipart/keximacropart.cpp b/kexi/plugins/macros/kexipart/keximacropart.cpp index 1fddbd78..ad9babd3 100644 --- a/kexi/plugins/macros/kexipart/keximacropart.cpp +++ b/kexi/plugins/macros/kexipart/keximacropart.cpp @@ -54,8 +54,8 @@ class KexiMacroPart::Private public: }; -KexiMacroPart::KexiMacroPart(TQObject *tqparent, const char *name, const TQStringList &l) - : KexiPart::Part(tqparent, name, l) +KexiMacroPart::KexiMacroPart(TQObject *parent, const char *name, const TQStringList &l) + : KexiPart::Part(parent, name, l) , d( new Private() ) { //kdDebug() << "KexiMacroPart::KexiMacroPart() Ctor" << endl; @@ -123,7 +123,7 @@ void KexiMacroPart::initInstanceActions() //createSharedAction(Kexi::DesignViewMode, i18n("Execute Macro"), "exec", 0, "data_execute"); } -KexiViewBase* KexiMacroPart::createView(TQWidget* tqparent, KexiDialogBase* dialog, KexiPart::Item& item, int viewMode, TQMap<TQString,TQString>*) +KexiViewBase* KexiMacroPart::createView(TQWidget* parent, KexiDialogBase* dialog, KexiPart::Item& item, int viewMode, TQMap<TQString,TQString>*) { const TQString itemname = item.name(); //kdDebug() << "KexiMacroPart::createView() itemname=" << itemname << endl; @@ -140,14 +140,14 @@ KexiViewBase* KexiMacroPart::createView(TQWidget* tqparent, KexiDialogBase* dial KexiMainWindow *win = dialog->mainWin(); if(win && win->project() && win->project()->dbConnection()) { if(viewMode == Kexi::DesignViewMode) { - return new KexiMacroDesignView(win, tqparent, macro); + return new KexiMacroDesignView(win, parent, macro); } if(viewMode == Kexi::TextViewMode) { - return new KexiMacroTextView(win, tqparent, macro); + return new KexiMacroTextView(win, parent, macro); } if(viewMode == Kexi::DataViewMode) { // Called if the macro should be executed. - return new KexiMacroView(win, tqparent, macro); + return new KexiMacroView(win, parent, macro); } } } diff --git a/kexi/plugins/macros/kexipart/keximacropart.h b/kexi/plugins/macros/kexipart/keximacropart.h index 0ea70c06..374679c0 100644 --- a/kexi/plugins/macros/kexipart/keximacropart.h +++ b/kexi/plugins/macros/kexipart/keximacropart.h @@ -37,11 +37,11 @@ class KexiMacroPart : public KexiPart::Part /** * Constructor. * - * \param tqparent The tqparent TQObject this part is child of. + * \param parent The parent TQObject this part is child of. * \param name The name this part has. * \param args Optional list of arguments passed to this part. */ - KexiMacroPart(TQObject *tqparent, const char *name, const TQStringList& args); + KexiMacroPart(TQObject *parent, const char *name, const TQStringList& args); /** * Destructor. @@ -64,12 +64,12 @@ class KexiMacroPart : public KexiPart::Part /** * Create a new view. * - * \param tqparent The tqparent TQWidget the new view is displayed in. + * \param parent The parent TQWidget the new view is displayed in. * \param dialog The \a KexiDialogBase the view is child of. * \param item The \a KexiPart::Item this view is for. * \param viewMode The viewmode we like to have a view for. */ - virtual KexiViewBase* createView(TQWidget *tqparent, + virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, KexiPart::Item& item, int viewMode = Kexi::DesignViewMode, diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp index aed4a9bd..e67794be 100644 --- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp +++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp @@ -53,8 +53,8 @@ class KexiMacroProperty::Private TQString name; }; -KexiMacroProperty::KexiMacroProperty(KoProperty::Property* tqparent, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name) - : KoProperty::CustomProperty(tqparent) +KexiMacroProperty::KexiMacroProperty(KoProperty::Property* parent, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name) + : KoProperty::CustomProperty(parent) , d( new Private() ) { d->macroitem = macroitem; @@ -164,8 +164,8 @@ KoProperty::Property* KexiMacroProperty::createProperty(KSharedPtr<KoMacro::Macr * KexiMacroPropertyFactory */ -KexiMacroPropertyFactory::KexiMacroPropertyFactory(TQObject* tqparent) - : KoProperty::CustomPropertyFactory(tqparent) +KexiMacroPropertyFactory::KexiMacroPropertyFactory(TQObject* parent) + : KoProperty::CustomPropertyFactory(parent) { } @@ -173,14 +173,14 @@ KexiMacroPropertyFactory::~KexiMacroPropertyFactory() { } -KoProperty::CustomProperty* KexiMacroPropertyFactory::createCustomProperty(KoProperty::Property* tqparent) +KoProperty::CustomProperty* KexiMacroPropertyFactory::createCustomProperty(KoProperty::Property* parent) { - kdDebug()<<"KexiMacroPropertyFactory::createCustomProperty tqparent="<<tqparent->name()<<endl; + kdDebug()<<"KexiMacroPropertyFactory::createCustomProperty parent="<<parent->name()<<endl; - KoProperty::CustomProperty* customproperty = tqparent->customProperty(); + KoProperty::CustomProperty* customproperty = parent->customProperty(); KexiMacroProperty* parentcustomproperty = dynamic_cast<KexiMacroProperty*>(customproperty); if(! parentcustomproperty) { - kdWarning() << "KexiMacroPropertyFactory::createCustomProperty() tqparent=" << tqparent->name() << " has an invalid customproperty." << endl; + kdWarning() << "KexiMacroPropertyFactory::createCustomProperty() parent=" << parent->name() << " has an invalid customproperty." << endl; return 0; } @@ -189,7 +189,7 @@ KoProperty::CustomProperty* KexiMacroPropertyFactory::createCustomProperty(KoPro const TQString name = parentcustomproperty->name(); Q_ASSERT(! name.isEmpty()); - KexiMacroProperty* macroproperty = new KexiMacroProperty(tqparent, macroitem, name); + KexiMacroProperty* macroproperty = new KexiMacroProperty(parent, macroitem, name); if(! macroproperty->variable().data()) { delete macroproperty; macroproperty = 0; return 0; @@ -232,12 +232,12 @@ class ListBoxItem : public TQListBoxText virtual ~ListBoxItem() {} void setEnabled(bool enabled) { m_enabled = enabled; } virtual int width(const TQListBox* lb) const { - Q_ASSERT( dynamic_cast<KComboBox*>( lb->tqparent() ) ); - return static_cast<KComboBox*>( lb->tqparent() )->lineEdit()->width() + 2; + Q_ASSERT( dynamic_cast<KComboBox*>( lb->parent() ) ); + return static_cast<KComboBox*>( lb->parent() )->lineEdit()->width() + 2; } virtual int height(const TQListBox* lb) const { - Q_ASSERT( dynamic_cast<KComboBox*>( lb->tqparent() ) ); - return m_enabled ? static_cast<KComboBox*>( lb->tqparent() )->height() + 2 : 0; + Q_ASSERT( dynamic_cast<KComboBox*>( lb->parent() ) ); + return m_enabled ? static_cast<KComboBox*>( lb->parent() )->height() + 2 : 0; } private: bool m_enabled; @@ -281,7 +281,7 @@ class EditListBoxItem : public ListBoxItem protected: virtual void paint(TQPainter* p) { if(! m_widget) return; - Q_ASSERT( dynamic_cast<KComboBox*>( listBox()->tqparent() ) ); + Q_ASSERT( dynamic_cast<KComboBox*>( listBox()->parent() ) ); const int w = width(listBox()); const int h = height(listBox()); m_widget->setFixedSize(w - 2, h - 2); @@ -342,7 +342,7 @@ class EditListBoxItem : public ListBoxItem variable->text(), // caption TQString(), // description type, // type - 0 //parentproperty // tqparent + 0 //parentproperty // parent ); m_widget = KoProperty::FactoryManager::self()->createWidgetForProperty(m_prop); @@ -367,8 +367,8 @@ class EditListBoxItem : public ListBoxItem class ListBox : public TQListBox { public: - ListBox(KComboBox* tqparent, KexiMacroProperty* macroproperty) - : TQListBox(tqparent) + ListBox(KComboBox* parent, KexiMacroProperty* macroproperty) + : TQListBox(parent) , m_macroproperty(macroproperty) , m_edititem(0) { @@ -501,8 +501,8 @@ class KexiMacroPropertyWidget::Private ListBox* listbox; }; -KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property, TQWidget* tqparent) - : KoProperty::Widget(property, tqparent) +KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property, TQWidget* parent) + : KoProperty::Widget(property, parent) , d( new Private() ) { kdDebug() << "KexiMacroPropertyWidget::KexiMacroPropertyWidget() Ctor" << endl; diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.h b/kexi/plugins/macros/kexipart/keximacroproperty.h index b80857d1..9419304e 100644 --- a/kexi/plugins/macros/kexipart/keximacroproperty.h +++ b/kexi/plugins/macros/kexipart/keximacroproperty.h @@ -47,24 +47,24 @@ class KexiMacroProperty public: /** Constructor. */ - explicit KexiMacroProperty(KoProperty::Property* tqparent, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name); + explicit KexiMacroProperty(KoProperty::Property* parent, KSharedPtr<KoMacro::MacroItem> macroitem, const TQString& name); /** Destructor. */ virtual ~KexiMacroProperty(); - /** @return the tqparent @a KoProperty::Property instance. */ + /** @return the parent @a KoProperty::Property instance. */ KoProperty::Property* parentProperty() const; /** This function is called by @ref KoProperty::Property::setValue() when a custom property is set. You don't have to modify the property value, it is done by Property class. - You just have to update child or tqparent properties value (m_property->tqparent()->setValue()). + You just have to update child or parent properties value (m_property->parent()->setValue()). Note that, when calling Property::setValue, you <b>need</b> to set useCustomProperty (3rd parameter) to false, or there will be infinite recursion. */ virtual void setValue(const TQVariant &value, bool rememberOldValue); /** This function is called by @ref KoProperty::Property::value() when a custom property is set and @ref handleValue() is true. - You should return property's value, taken from tqparent's value.*/ + You should return property's value, taken from parent's value.*/ virtual TQVariant value() const; /** Tells whether CustomProperty should be used to get the property's value. @@ -111,18 +111,18 @@ class KexiMacroPropertyFactory : public KoProperty::CustomPropertyFactory { public: /** Constructor. */ - explicit KexiMacroPropertyFactory(TQObject* tqparent); + explicit KexiMacroPropertyFactory(TQObject* parent); /** Destructor. */ virtual ~KexiMacroPropertyFactory(); - /** @return a new instance of custom property for @p tqparent. + /** @return a new instance of custom property for @p parent. Implement this for property types you want to support. - Use tqparent->type() to get type of the property. */ - virtual KoProperty::CustomProperty* createCustomProperty(KoProperty::Property* tqparent); + Use parent->type() to get type of the property. */ + virtual KoProperty::CustomProperty* createCustomProperty(KoProperty::Property* parent); /** @return a new instance of custom property for @p property. Implement this for property editor types you want to support. - Use tqparent->type() to get type of the property. */ + Use parent->type() to get type of the property. */ virtual KoProperty::Widget* createCustomWidget(KoProperty::Property* property); /** Initializes this factory. The factory may register itself at @@ -144,7 +144,7 @@ class KexiMacroPropertyWidget : public KoProperty::Widget public: /** Constructor. */ - explicit KexiMacroPropertyWidget(KoProperty::Property* property, TQWidget* tqparent = 0); + explicit KexiMacroPropertyWidget(KoProperty::Property* property, TQWidget* parent = 0); /** Destructor. */ virtual ~KexiMacroPropertyWidget(); diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.cpp b/kexi/plugins/macros/kexipart/keximacrotextview.cpp index 11d9cee5..e35ee5b2 100644 --- a/kexi/plugins/macros/kexipart/keximacrotextview.cpp +++ b/kexi/plugins/macros/kexipart/keximacrotextview.cpp @@ -41,8 +41,8 @@ class KexiMacroTextView::Private }; -KexiMacroTextView::KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *tqparent, ::KoMacro::Macro* const macro) - : KexiMacroView(mainwin, tqparent, macro, "KexiMacroTextView") +KexiMacroTextView::KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *parent, ::KoMacro::Macro* const macro) + : KexiMacroView(mainwin, parent, macro, "KexiMacroTextView") , d( new Private() ) { TQHBoxLayout* tqlayout = new TQHBoxLayout(this); diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.h b/kexi/plugins/macros/kexipart/keximacrotextview.h index 5101c30b..0acfa9ef 100644 --- a/kexi/plugins/macros/kexipart/keximacrotextview.h +++ b/kexi/plugins/macros/kexipart/keximacrotextview.h @@ -40,10 +40,10 @@ class KexiMacroTextView : public KexiMacroView * * \param mainwin The \a KexiMainWindow instance this \a KexiViewBase * belongs to. - * \param tqparent The tqparent widget this widget should be displayed in. + * \param parent The parent widget this widget should be displayed in. * \param macro The \a KoMacro::Macro instance this view is for. */ - KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *tqparent, ::KoMacro::Macro* const macro); + KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *parent, ::KoMacro::Macro* const macro); /** * Destructor. diff --git a/kexi/plugins/macros/kexipart/keximacroview.cpp b/kexi/plugins/macros/kexipart/keximacroview.cpp index e13483c1..e9f9cd33 100644 --- a/kexi/plugins/macros/kexipart/keximacroview.cpp +++ b/kexi/plugins/macros/kexipart/keximacroview.cpp @@ -62,8 +62,8 @@ class KexiMacroView::Private }; -KexiMacroView::KexiMacroView(KexiMainWindow *mainwin, TQWidget *tqparent, KoMacro::Macro* const macro, const char* name) - : KexiViewBase(mainwin, tqparent, (name ? name : "KexiMacroView")) +KexiMacroView::KexiMacroView(KexiMainWindow *mainwin, TQWidget *parent, KoMacro::Macro* const macro, const char* name) + : KexiViewBase(mainwin, parent, (name ? name : "KexiMacroView")) , d( new Private(macro) ) { //kdDebug() << "KexiMacroView::KexiMacroView() Ctor" << endl; @@ -164,7 +164,7 @@ void KexiMacroView::execute(TQObject* sender) KSharedPtr<KoMacro::Context> context = d->macro->execute(sender); if(context->hadException()) { KexiMacroError* error = new KexiMacroError( - mainWin(), // The tqparent KexiMainWindow + mainWin(), // The parent KexiMainWindow context // The KoMacro::Context where the error occured. ); error->exec(); diff --git a/kexi/plugins/macros/kexipart/keximacroview.h b/kexi/plugins/macros/kexipart/keximacroview.h index 0c44419b..f98d394d 100644 --- a/kexi/plugins/macros/kexipart/keximacroview.h +++ b/kexi/plugins/macros/kexipart/keximacroview.h @@ -50,10 +50,10 @@ class KexiMacroView : public KexiViewBase * * \param mainwin The \a KexiMainWindow instance this \a KexiViewBase * belongs to. - * \param tqparent The tqparent widget this widget should be displayed in. + * \param parent The parent widget this widget should be displayed in. * \param macro The \a KoMacro::Macro instance this view is for. */ - KexiMacroView(KexiMainWindow *mainwin, TQWidget *tqparent, ::KoMacro::Macro* const macro, const char* name = 0); + KexiMacroView(KexiMainWindow *mainwin, TQWidget *parent, ::KoMacro::Macro* const macro, const char* name = 0); /** * Destructor. diff --git a/kexi/plugins/macros/lib/context.h b/kexi/plugins/macros/lib/context.h index 558ff0aa..2bb1bef3 100644 --- a/kexi/plugins/macros/lib/context.h +++ b/kexi/plugins/macros/lib/context.h @@ -121,7 +121,7 @@ namespace KoMacro { /** * This slot extends the slot above with the passed * @a Context @p context which will be used as - * tqparent context for this context. + * parent context for this context. */ virtual void activate(KSharedPtr<Context> context); diff --git a/kexi/plugins/macros/lib/manager.h b/kexi/plugins/macros/lib/manager.h index ae32aad9..733ffb75 100644 --- a/kexi/plugins/macros/lib/manager.h +++ b/kexi/plugins/macros/lib/manager.h @@ -64,7 +64,7 @@ namespace KoMacro { * * // Finally free the publishedobject instance we created. We * // need to free it manualy cause PublishedObject doesn't - * // got a TQObject tqparent as argument. + * // got a TQObject parent as argument. * delete publishedobject; * * // Finally free the manager-instance. It's always needed diff --git a/kexi/plugins/migration/keximigrationpart.cpp b/kexi/plugins/migration/keximigrationpart.cpp index 5d4830ef..a3a099e0 100644 --- a/kexi/plugins/migration/keximigrationpart.cpp +++ b/kexi/plugins/migration/keximigrationpart.cpp @@ -23,8 +23,8 @@ #include <kgenericfactory.h> -KexiMigrationPart::KexiMigrationPart(TQObject *tqparent, const char *name, const TQStringList &args) - : KexiInternalPart(tqparent, name, args) +KexiMigrationPart::KexiMigrationPart(TQObject *parent, const char *name, const TQStringList &args) + : KexiInternalPart(parent, name, args) { } @@ -33,11 +33,11 @@ KexiMigrationPart::~KexiMigrationPart() } TQWidget *KexiMigrationPart::createWidget(const char* /*widgetClass*/, KexiMainWindow* mainWin, - TQWidget *tqparent, const char *objName, TQMap<TQString,TQString>* args ) + TQWidget *parent, const char *objName, TQMap<TQString,TQString>* args ) { Q_UNUSED( mainWin ); - KexiMigration::ImportWizard *w = new KexiMigration::ImportWizard(tqparent, args); + KexiMigration::ImportWizard *w = new KexiMigration::ImportWizard(parent, args); w->setName(objName); return w; } diff --git a/kexi/plugins/migration/keximigrationpart.h b/kexi/plugins/migration/keximigrationpart.h index b41656a6..12d38fa5 100644 --- a/kexi/plugins/migration/keximigrationpart.h +++ b/kexi/plugins/migration/keximigrationpart.h @@ -26,13 +26,13 @@ class KexiMigrationPart : public KexiInternalPart { public: - KexiMigrationPart(TQObject *tqparent, const char *name, const TQStringList &args); + KexiMigrationPart(TQObject *parent, const char *name, const TQStringList &args); virtual ~KexiMigrationPart(); /*! Reimplement this if your internal part has to return widgets or TQDialog objects. */ virtual TQWidget *createWidget(const char* /*widgetClass*/, KexiMainWindow* mainWin, - TQWidget *tqparent, const char *objName = 0, TQMap<TQString,TQString>* args = 0); + TQWidget *parent, const char *objName = 0, TQMap<TQString,TQString>* args = 0); }; #endif diff --git a/kexi/plugins/queries/kexiaddparamdialog.cpp b/kexi/plugins/queries/kexiaddparamdialog.cpp index 4b1141be..9b7f5db9 100644 --- a/kexi/plugins/queries/kexiaddparamdialog.cpp +++ b/kexi/plugins/queries/kexiaddparamdialog.cpp @@ -26,8 +26,8 @@ #include "kexiaddparamdialog.moc" #include "kexiaddparamwidget.h" -KexiAddParamDialog::KexiAddParamDialog(TQWidget *tqparent) - : KDialogBase(tqparent, "kexiaddparamdialog", true, i18n("Add Parameter"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true) +KexiAddParamDialog::KexiAddParamDialog(TQWidget *parent) + : KDialogBase(parent, "kexiaddparamdialog", true, i18n("Add Parameter"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true) { m_wid=new KexiAddParamWidget(makeVBoxMainWidget()); for (int i=1;i<=KexiDataProvider::Parameter::maxType;i++) diff --git a/kexi/plugins/queries/kexiaddparamdialog.h b/kexi/plugins/queries/kexiaddparamdialog.h index 2aa27bf7..3c543941 100644 --- a/kexi/plugins/queries/kexiaddparamdialog.h +++ b/kexi/plugins/queries/kexiaddparamdialog.h @@ -30,7 +30,7 @@ class KexiAddParamDialog : public KDialogBase TQ_OBJECT public: - KexiAddParamDialog(TQWidget *tqparent); + KexiAddParamDialog(TQWidget *parent); virtual ~KexiAddParamDialog(); TQString parameterName(); int parameterType(); diff --git a/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp b/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp index 938d407f..555a84cf 100644 --- a/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp +++ b/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp @@ -27,9 +27,9 @@ #include <tqlineedit.h> #include <tqobjectlist.h> -KexiDynamicQueryParameterDialog::KexiDynamicQueryParameterDialog(TQWidget *tqparent, +KexiDynamicQueryParameterDialog::KexiDynamicQueryParameterDialog(TQWidget *parent, KexiDataProvider::Parameters *values, const KexiDataProvider::ParameterList &list): - KDialogBase(tqparent, "paramddialog", true, i18n("Query Parameters"), + KDialogBase(parent, "paramddialog", true, i18n("Query Parameters"), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true ) { m_values=values; diff --git a/kexi/plugins/queries/kexidynamicqueryparameterdialog.h b/kexi/plugins/queries/kexidynamicqueryparameterdialog.h index 60137c1f..afa9163d 100644 --- a/kexi/plugins/queries/kexidynamicqueryparameterdialog.h +++ b/kexi/plugins/queries/kexidynamicqueryparameterdialog.h @@ -31,7 +31,7 @@ class KexiDynamicQueryParameterDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - KexiDynamicQueryParameterDialog(TQWidget *tqparent,KexiDataProvider::Parameters *, const KexiDataProvider::ParameterList &); + KexiDynamicQueryParameterDialog(TQWidget *parent,KexiDataProvider::Parameters *, const KexiDataProvider::ParameterList &); virtual ~KexiDynamicQueryParameterDialog(); protected: diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp index be16b70d..e215ab90 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp @@ -139,8 +139,8 @@ static bool sortingAllowed(const TQString& fieldName, const TQString& tableName) //========================================================= KexiQueryDesignerGuiEditor::KexiQueryDesignerGuiEditor( - KexiMainWindow *mainWin, TQWidget *tqparent, const char *name) - : KexiViewBase(mainWin, tqparent, name) + KexiMainWindow *mainWin, TQWidget *parent, const char *name) + : KexiViewBase(mainWin, parent, name) , d( new Private() ) { d->conn = mainWin->project()->dbConnection(); @@ -916,8 +916,8 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal( if (!criteriaArgument) {//try table.field criteriaArgument = criterias[tableName+"."+fieldName]; } - if (criteriaArgument) {//criteria expression is just a tqparent of argument - criteriaExpr = criteriaArgument->tqparent()->toBinary(); + if (criteriaArgument) {//criteria expression is just a parent of argument + criteriaExpr = criteriaArgument->parent()->toBinary(); usedCriterias.insert(criteriaArgument, (char*)1); //save info. about used criteria } } @@ -1002,7 +1002,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal( if (usedCriterias[it.current()]) continue; //unused: append a new row - KexiDB::BinaryExpr *criteriaExpr = criteriaArgument->tqparent()->toBinary(); + KexiDB::BinaryExpr *criteriaExpr = criteriaArgument->parent()->toBinary(); if (!criteriaExpr) { kexipluginswarn << "KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal(): " "criteriaExpr is not a binary expr" << endl; diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.h b/kexi/plugins/queries/kexiquerydesignerguieditor.h index 587e60a6..c97c140d 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.h +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.h @@ -62,7 +62,7 @@ class KexiQueryDesignerGuiEditor : public KexiViewBase TQ_OBJECT public: - KexiQueryDesignerGuiEditor(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0); + KexiQueryDesignerGuiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0); virtual ~KexiQueryDesignerGuiEditor(); // KexiDB::QuerySchema *schema(); diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp index e6eb9835..37fab0e6 100644 --- a/kexi/plugins/queries/kexiquerydesignersql.cpp +++ b/kexi/plugins/queries/kexiquerydesignersql.cpp @@ -99,8 +99,8 @@ class KexiQueryDesignerSQLView::Private //=================== -KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name) - : KexiViewBase(mainWin, tqparent, name) +KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWidget *parent, const char *name) + : KexiViewBase(mainWin, parent, name) , d( new Private() ) { d->splitter = new TQSplitter(this); diff --git a/kexi/plugins/queries/kexiquerydesignersql.h b/kexi/plugins/queries/kexiquerydesignersql.h index ae07d457..fe535b0d 100644 --- a/kexi/plugins/queries/kexiquerydesignersql.h +++ b/kexi/plugins/queries/kexiquerydesignersql.h @@ -38,7 +38,7 @@ class KexiQueryDesignerSQLView : public KexiViewBase TQ_OBJECT public: - KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0); + KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0); virtual ~KexiQueryDesignerSQLView(); TQString sqlText() const; diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp index 0321ff2b..7cc62620 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp @@ -31,8 +31,8 @@ #include "kexiquerydesignersqlhistory.h" -KexiQueryDesignerSQLHistory::KexiQueryDesignerSQLHistory(TQWidget *tqparent, const char *name) - : TQScrollView(tqparent, name) +KexiQueryDesignerSQLHistory::KexiQueryDesignerSQLHistory(TQWidget *parent, const char *name) + : TQScrollView(parent, name) { viewport()->setPaletteBackgroundColor(white); diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.h b/kexi/plugins/queries/kexiquerydesignersqlhistory.h index 6709a22f..a6d55285 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.h +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.h @@ -65,7 +65,7 @@ class KexiQueryDesignerSQLHistory : public TQScrollView TQ_OBJECT public: - KexiQueryDesignerSQLHistory(TQWidget *tqparent, const char *name=0); + KexiQueryDesignerSQLHistory(TQWidget *parent, const char *name=0); virtual ~KexiQueryDesignerSQLHistory(); KPopupMenu* popupMenu() const; diff --git a/kexi/plugins/queries/kexiquerypart.cpp b/kexi/plugins/queries/kexiquerypart.cpp index c9ce5755..d0c71eae 100644 --- a/kexi/plugins/queries/kexiquerypart.cpp +++ b/kexi/plugins/queries/kexiquerypart.cpp @@ -37,8 +37,8 @@ //------------------------------------------------ -KexiQueryPart::KexiQueryPart(TQObject *tqparent, const char *name, const TQStringList &l) - : KexiPart::Part(tqparent, name, l) +KexiQueryPart::KexiQueryPart(TQObject *parent, const char *name, const TQStringList &l) + : KexiPart::Part(parent, name, l) { // REGISTERED ID: m_registeredPartID = (int)KexiPart::QueryObjectType; @@ -65,18 +65,18 @@ KexiQueryPart::createTempData(KexiDialogBase* dialog) } KexiViewBase* -KexiQueryPart::createView(TQWidget *tqparent, KexiDialogBase* dialog, KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>*) +KexiQueryPart::createView(TQWidget *parent, KexiDialogBase* dialog, KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>*) { Q_UNUSED( item ); kdDebug() << "KexiQueryPart::createView()" << endl; if (viewMode == Kexi::DataViewMode) { - return new KexiQueryView(dialog->mainWin(), tqparent, "dataview"); + return new KexiQueryView(dialog->mainWin(), parent, "dataview"); } else if (viewMode == Kexi::DesignViewMode) { KexiQueryDesignerGuiEditor* view = new KexiQueryDesignerGuiEditor( - dialog->mainWin(), tqparent, "guieditor"); + dialog->mainWin(), parent, "guieditor"); //needed for updating tables combo box: KexiProject *prj = dialog->mainWin()->project(); connect(prj, TQT_SIGNAL(newItemStored(KexiPart::Item&)), @@ -91,7 +91,7 @@ KexiQueryPart::createView(TQWidget *tqparent, KexiDialogBase* dialog, KexiPart:: return view; } else if (viewMode == Kexi::TextViewMode) { - return new KexiQueryDesignerSQLView(dialog->mainWin(), tqparent, "sqldesigner"); + return new KexiQueryDesignerSQLView(dialog->mainWin(), parent, "sqldesigner"); } return 0; @@ -213,8 +213,8 @@ tristate KexiQueryPart::rename(KexiMainWindow *win, KexiPart::Item &item, const //---------------- -KexiQueryPart::TempData::TempData(KexiDialogBase* tqparent, KexiDB::Connection *conn) - : KexiDialogTempData(TQT_TQOBJECT(tqparent)) +KexiQueryPart::TempData::TempData(KexiDialogBase* parent, KexiDB::Connection *conn) + : KexiDialogTempData(TQT_TQOBJECT(parent)) , KexiDB::Connection::TableSchemaChangeListenerInterface() , queryChangedInPreviousView(false) , m_query(0) @@ -253,7 +253,7 @@ void KexiQueryPart::TempData::registerTableSchemaChanges(KexiDB::QuerySchema *q) tristate KexiQueryPart::TempData::closeListener() { - KexiDialogBase* dlg = static_cast<KexiDialogBase*>(TQT_TQWIDGET(tqparent())); + KexiDialogBase* dlg = static_cast<KexiDialogBase*>(TQT_TQWIDGET(parent())); return dlg->mainWin()->closeDialog(dlg); } @@ -270,7 +270,7 @@ void KexiQueryPart::TempData::setQuery(KexiDB::QuerySchema *query) return; if (m_query /* query not owned by dialog */ - && (static_cast<KexiDialogBase*>(TQT_TQWIDGET(tqparent()))->schemaData() != static_cast<KexiDB::SchemaData*>( m_query ))) + && (static_cast<KexiDialogBase*>(TQT_TQWIDGET(parent()))->schemaData() != static_cast<KexiDB::SchemaData*>( m_query ))) { delete m_query; } diff --git a/kexi/plugins/queries/kexiquerypart.h b/kexi/plugins/queries/kexiquerypart.h index aee905e6..1fb2063c 100644 --- a/kexi/plugins/queries/kexiquerypart.h +++ b/kexi/plugins/queries/kexiquerypart.h @@ -47,7 +47,7 @@ class KexiQueryPart : public KexiPart::Part TQ_OBJECT public: - KexiQueryPart(TQObject *tqparent, const char *name, const TQStringList &); + KexiQueryPart(TQObject *parent, const char *name, const TQStringList &); virtual ~KexiQueryPart(); virtual bool remove(KexiMainWindow *win, KexiPart::Item &item); @@ -57,7 +57,7 @@ class KexiQueryPart : public KexiPart::Part public KexiDB::Connection::TableSchemaChangeListenerInterface { public: - TempData(KexiDialogBase* tqparent, KexiDB::Connection *conn); + TempData(KexiDialogBase* parent, KexiDB::Connection *conn); virtual ~TempData(); virtual tristate closeListener(); void clearQuery(); @@ -66,7 +66,7 @@ class KexiQueryPart : public KexiPart::Part /*! Assigns query \a query for this data. Existing query (available using query()) is deleted but only - if it is not owned by tqparent dialog (i.e. != KexiDialogBase::schemaData()). + if it is not owned by parent dialog (i.e. != KexiDialogBase::schemaData()). \a query can be 0. If \a query is equal to existing query, nothing is performed. */ @@ -102,7 +102,7 @@ class KexiQueryPart : public KexiPart::Part protected: virtual KexiDialogTempData* createTempData(KexiDialogBase* dialog); - virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog, + virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, KexiPart::Item &item, int viewMode = Kexi::DataViewMode, TQMap<TQString,TQString>* staticObjectArgs = 0); // virtual void initPartActions( KActionCollection *col ); diff --git a/kexi/plugins/queries/kexiqueryview.cpp b/kexi/plugins/queries/kexiqueryview.cpp index 9d7cc542..c57224ea 100644 --- a/kexi/plugins/queries/kexiqueryview.cpp +++ b/kexi/plugins/queries/kexiqueryview.cpp @@ -50,8 +50,8 @@ class KexiQueryView::Private //--------------------------------------------------------------------------------- -KexiQueryView::KexiQueryView(KexiMainWindow *win, TQWidget *tqparent, const char *name) - : KexiDataTable(win, tqparent, name) +KexiQueryView::KexiQueryView(KexiMainWindow *win, TQWidget *parent, const char *name) + : KexiDataTable(win, parent, name) , d( new Private() ) { tableView()->setInsertingEnabled(false); //default diff --git a/kexi/plugins/queries/kexiqueryview.h b/kexi/plugins/queries/kexiqueryview.h index b1f183ad..e089bfc4 100644 --- a/kexi/plugins/queries/kexiqueryview.h +++ b/kexi/plugins/queries/kexiqueryview.h @@ -35,7 +35,7 @@ class KexiQueryView : public KexiDataTable TQ_OBJECT public: - KexiQueryView(KexiMainWindow *win, TQWidget *tqparent, const char *name=0); + KexiQueryView(KexiMainWindow *win, TQWidget *parent, const char *name=0); ~KexiQueryView(); protected: diff --git a/kexi/plugins/relations/kexirelationmaindlg.cpp b/kexi/plugins/relations/kexirelationmaindlg.cpp index ded97e1c..6c5fae1d 100644 --- a/kexi/plugins/relations/kexirelationmaindlg.cpp +++ b/kexi/plugins/relations/kexirelationmaindlg.cpp @@ -32,8 +32,8 @@ #include "kexirelationwidget.h" #include "kexirelationview.h" -KexiRelationMainDlg::KexiRelationMainDlg(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name) - : KexiViewBase(mainWin, tqparent, name) +KexiRelationMainDlg::KexiRelationMainDlg(KexiMainWindow *mainWin, TQWidget *parent, const char *name) + : KexiViewBase(mainWin, parent, name) { kdDebug() << "KexiRelationMainDlg()" << endl; // setIcon(SmallIcon("relation")); diff --git a/kexi/plugins/relations/kexirelationmaindlg.h b/kexi/plugins/relations/kexirelationmaindlg.h index 4dbc7698..a2f8ca57 100644 --- a/kexi/plugins/relations/kexirelationmaindlg.h +++ b/kexi/plugins/relations/kexirelationmaindlg.h @@ -31,7 +31,7 @@ class KexiRelationMainDlg : public KexiViewBase TQ_OBJECT public: - KexiRelationMainDlg(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0); + KexiRelationMainDlg(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0); ~KexiRelationMainDlg(); virtual TQSize tqsizeHint() const; diff --git a/kexi/plugins/relations/kexirelationpartimpl.cpp b/kexi/plugins/relations/kexirelationpartimpl.cpp index 9d08527b..7656f46d 100644 --- a/kexi/plugins/relations/kexirelationpartimpl.cpp +++ b/kexi/plugins/relations/kexirelationpartimpl.cpp @@ -28,8 +28,8 @@ #include <kiconloader.h> #include <kdebug.h> -KexiRelationPartImpl::KexiRelationPartImpl(TQObject *tqparent, const char *name, const TQStringList &args) - : KexiInternalPart(tqparent, name, args) +KexiRelationPartImpl::KexiRelationPartImpl(TQObject *parent, const char *name, const TQStringList &args) + : KexiInternalPart(parent, name, args) { kdDebug() << "KexiRelationPartImpl()" << endl; } @@ -40,9 +40,9 @@ KexiRelationPartImpl::~KexiRelationPartImpl() /*TQWidget * KexiRelationPartImpl::createWidget(const char* , KexiMainWindow* mainWin, - TQWidget *tqparent, const char *objName) + TQWidget *parent, const char *objName) { - return new KexiRelationWidget(mainWin, tqparent, objName); + return new KexiRelationWidget(mainWin, parent, objName); }*/ /*KexiDialogBase * @@ -62,14 +62,14 @@ KexiRelationPartImpl::createDialog(KexiMainWindow* mainWin, const char *) }*/ KexiViewBase * -KexiRelationPartImpl::createView(KexiMainWindow* mainWin, TQWidget *tqparent, const char *) +KexiRelationPartImpl::createView(KexiMainWindow* mainWin, TQWidget *parent, const char *) { // kdDebug() << "KexiRelationPartImpl::createDialog()" << endl; // KexiDialogBase * dlg = new KexiDialogBase(mainWin, i18n("Relations")); // dlg->setIcon(SmallIcon("relation")); // dlg->setDocID( mainWin->generatePrivateDocID() ); - KexiRelationMainDlg *view = new KexiRelationMainDlg(mainWin, tqparent, "relations"); + KexiRelationMainDlg *view = new KexiRelationMainDlg(mainWin, parent, "relations"); // dlg->addView(view); // dlg->show(); // dlg->registerDialog(); diff --git a/kexi/plugins/relations/kexirelationpartimpl.h b/kexi/plugins/relations/kexirelationpartimpl.h index 58ee5674..fc16fbe0 100644 --- a/kexi/plugins/relations/kexirelationpartimpl.h +++ b/kexi/plugins/relations/kexirelationpartimpl.h @@ -28,18 +28,18 @@ class KexiRelationPartImpl : public KexiInternalPart TQ_OBJECT public: - KexiRelationPartImpl(TQObject *tqparent, const char *name, const TQStringList &args); + KexiRelationPartImpl(TQObject *parent, const char *name, const TQStringList &args); virtual ~KexiRelationPartImpl(); protected: // virtual TQWidget *createWidget(const char* widgetClass, KexiMainWindow* mainWin, -// TQWidget *tqparent, const char *objName=0); +// TQWidget *parent, const char *objName=0); - virtual KexiViewBase *createView(KexiMainWindow* mainWin, TQWidget *tqparent, + virtual KexiViewBase *createView(KexiMainWindow* mainWin, TQWidget *parent, const char *objName=0); - //virtual KexiDialogBase *createWindow(KexiMainWindow *tqparent); - //virtual TQWidget *createWidget(TQWidget *tqparent, KexiMainWindow *win); + //virtual KexiDialogBase *createWindow(KexiMainWindow *parent); + //virtual TQWidget *createWidget(TQWidget *parent, KexiMainWindow *win); }; #endif diff --git a/kexi/plugins/reports/kexireportfactory.cpp b/kexi/plugins/reports/kexireportfactory.cpp index d863bc9f..f45b30bf 100644 --- a/kexi/plugins/reports/kexireportfactory.cpp +++ b/kexi/plugins/reports/kexireportfactory.cpp @@ -33,8 +33,8 @@ #include "reportwidgets.h" #include "kexireportfactory.h" -KexiReportFactory::KexiReportFactory(TQObject *tqparent, const char *name, const TQStringList &) - : KFormDesigner::WidgetFactory(tqparent, name) +KexiReportFactory::KexiReportFactory(TQObject *parent, const char *name, const TQStringList &) + : KFormDesigner::WidgetFactory(parent, name) { KFormDesigner::WidgetInfo *wView = new KFormDesigner::WidgetInfo(this); wView->setPixmap("report"); diff --git a/kexi/plugins/reports/kexireportfactory.h b/kexi/plugins/reports/kexireportfactory.h index 1813fce7..e7c5f13a 100644 --- a/kexi/plugins/reports/kexireportfactory.h +++ b/kexi/plugins/reports/kexireportfactory.h @@ -29,11 +29,11 @@ class KexiReportFactory : public KFormDesigner::WidgetFactory TQ_OBJECT public: - KexiReportFactory(TQObject *tqparent, const char *name, const TQStringList &args); + KexiReportFactory(TQObject *parent, const char *name, const TQStringList &args); virtual ~KexiReportFactory(); virtual TQString name(); - virtual TQWidget *createWidget(const TQCString &classname, TQWidget *tqparent, const char *name, KFormDesigner::Container *container, + virtual TQWidget *createWidget(const TQCString &classname, TQWidget *parent, const char *name, KFormDesigner::Container *container, int options = DefaultOptions); virtual bool createMenuActions(const TQCString &classname, TQWidget *w, TQPopupMenu *menu, @@ -42,7 +42,7 @@ class KexiReportFactory : public KFormDesigner::WidgetFactory virtual bool previewWidget(const TQCString &, TQWidget *, KFormDesigner::Container *); //virtual void saveSpecialProperty(const TQString &classname, const TQString &name, const TQVariant &value, TQWidget *w, - //TQDomElement &parentNode, TQDomDocument &tqparent) {} + //TQDomElement &parentNode, TQDomDocument &parent) {} //virtual void readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w, KFormDesigner::ObjectTreeItem *item) {} virtual TQValueList<TQCString> autoSaveProperties(const TQCString &classname); diff --git a/kexi/plugins/reports/kexireportform.cpp b/kexi/plugins/reports/kexireportform.cpp index 4e04beae..89423b03 100644 --- a/kexi/plugins/reports/kexireportform.cpp +++ b/kexi/plugins/reports/kexireportform.cpp @@ -26,8 +26,8 @@ #include "kexireportform.h" -KexiReportForm::KexiReportForm(TQWidget *tqparent, const char *name/*, KexiDB::Connection *conn*/) - : TQWidget(tqparent, name) +KexiReportForm::KexiReportForm(TQWidget *parent, const char *name/*, KexiDB::Connection *conn*/) + : TQWidget(parent, name) { //m_conn = conn; kexipluginsdbg << "KexiReportForm::KexiReportForm(): " << endl; diff --git a/kexi/plugins/reports/kexireportform.h b/kexi/plugins/reports/kexireportform.h index 9f13fbc9..8813a2c3 100644 --- a/kexi/plugins/reports/kexireportform.h +++ b/kexi/plugins/reports/kexireportform.h @@ -33,7 +33,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportForm : public TQWidget, public KFormDesig TQ_OBJECT public: - KexiReportForm(TQWidget *tqparent, const char *name="kexi_dbform"); + KexiReportForm(TQWidget *parent, const char *name="kexi_dbform"); virtual ~KexiReportForm(); /*TQString datasource() const { return m_ds; } diff --git a/kexi/plugins/reports/kexireportpart.cpp b/kexi/plugins/reports/kexireportpart.cpp index 6b9c6bc3..08c4cf7c 100644 --- a/kexi/plugins/reports/kexireportpart.cpp +++ b/kexi/plugins/reports/kexireportpart.cpp @@ -43,8 +43,8 @@ KFormDesigner::WidgetLibrary* KexiReportPart::static_reportsLibrary = 0L; -KexiReportPart::KexiReportPart(TQObject *tqparent, const char *name, const TQStringList &l) - : KexiPart::Part(tqparent, name, l) +KexiReportPart::KexiReportPart(TQObject *parent, const char *name, const TQStringList &l) + : KexiPart::Part(parent, name, l) { // REGISTERED ID: m_registeredPartID = (int)KexiPart::ReportObjectType; @@ -101,7 +101,7 @@ KexiReportPart::createTempData(KexiDialogBase* dialog) } KexiViewBase* -KexiReportPart::createView(TQWidget *tqparent, KexiDialogBase* dialog, +KexiReportPart::createView(TQWidget *parent, KexiDialogBase* dialog, KexiPart::Item &item, int, TQMap<TQString,TQString>*) { kexipluginsdbg << "KexiReportPart::createView()" << endl; @@ -109,7 +109,7 @@ KexiReportPart::createView(TQWidget *tqparent, KexiDialogBase* dialog, if (!win || !win->project() || !win->project()->dbConnection()) return 0; - KexiReportView *view = new KexiReportView(win, tqparent, item.name().latin1(), + KexiReportView *view = new KexiReportView(win, parent, item.name().latin1(), win->project()->dbConnection() ); return view; @@ -128,8 +128,8 @@ KexiReportPart::i18nMessage(const TQCString& englishMessage, KexiDialogBase* dlg //--------------- -KexiReportPart::TempData::TempData(TQObject* tqparent) - : KexiDialogTempData(tqparent) +KexiReportPart::TempData::TempData(TQObject* parent) + : KexiDialogTempData(parent) { } diff --git a/kexi/plugins/reports/kexireportpart.h b/kexi/plugins/reports/kexireportpart.h index ee93580f..47f9d4ef 100644 --- a/kexi/plugins/reports/kexireportpart.h +++ b/kexi/plugins/reports/kexireportpart.h @@ -45,7 +45,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportPart : public KexiPart::Part TQ_OBJECT public: - KexiReportPart(TQObject *tqparent, const char *name, const TQStringList &); + KexiReportPart(TQObject *parent, const char *name, const TQStringList &); virtual ~KexiReportPart(); //! \return a pointer to Reports Widget Library. @@ -58,7 +58,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportPart : public KexiPart::Part class TempData : public KexiDialogTempData { public: - TempData(TQObject* tqparent); + TempData(TQObject* parent); ~TempData(); TQGuardedPtr<KFormDesigner::Form> form; TQGuardedPtr<KFormDesigner::Form> previewForm; @@ -73,7 +73,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportPart : public KexiPart::Part protected: virtual KexiDialogTempData* createTempData(KexiDialogBase* dialog); - virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog, + virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, KexiPart::Item &item, int viewMode = Kexi::DataViewMode, TQMap<TQString,TQString>* staticObjectArgs = 0); virtual void initPartActions(); diff --git a/kexi/plugins/reports/kexireportview.cpp b/kexi/plugins/reports/kexireportview.cpp index 403c0277..2de5f4a7 100644 --- a/kexi/plugins/reports/kexireportview.cpp +++ b/kexi/plugins/reports/kexireportview.cpp @@ -39,8 +39,8 @@ #define NO_DSWIZARD -KexiReportScrollView::KexiReportScrollView(TQWidget *tqparent, bool preview) - : KexiScrollView(tqparent, preview) +KexiReportScrollView::KexiReportScrollView(TQWidget *parent, bool preview) + : KexiScrollView(parent, preview) { if(preview) { setRecordNavigatorVisible(true); @@ -61,7 +61,7 @@ KexiReportScrollView::show() //now get resize mode settings for entire form if (m_preview) { - KexiReportView* fv = dynamic_cast<KexiReportView*>(tqparent()); + KexiReportView* fv = dynamic_cast<KexiReportView*>(parent()); int resizeMode = fv ? fv->resizeMode() : KexiReportView::ResizeAuto; if (resizeMode == KexiReportView::ResizeAuto) setResizePolicy(AutoOneFit); @@ -80,9 +80,9 @@ KexiReportScrollView::slotResizingStarted() ////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////// -KexiReportView::KexiReportView(KexiMainWindow *win, TQWidget *tqparent, const char *name, +KexiReportView::KexiReportView(KexiMainWindow *win, TQWidget *parent, const char *name, KexiDB::Connection *conn) - : KexiViewBase(win, tqparent, name), m_propertySet(0), m_conn(conn) + : KexiViewBase(win, parent, name), m_propertySet(0), m_conn(conn) , m_resizeMode(KexiReportView::ResizeDefault) { TQHBoxLayout *l = new TQHBoxLayout(this); diff --git a/kexi/plugins/reports/kexireportview.h b/kexi/plugins/reports/kexireportview.h index 2b88c181..df4b3190 100644 --- a/kexi/plugins/reports/kexireportview.h +++ b/kexi/plugins/reports/kexireportview.h @@ -37,7 +37,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportScrollView : public KexiScrollView TQ_OBJECT public: - KexiReportScrollView(TQWidget *tqparent, bool preview); + KexiReportScrollView(TQWidget *parent, bool preview); virtual ~KexiReportScrollView(); void setForm(KFormDesigner::Form *form) { m_form = form; } @@ -73,7 +73,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportView : public KexiViewBase NoResize = 2 /*! @todo */ }; - KexiReportView(KexiMainWindow *win, TQWidget *tqparent, const char *name, KexiDB::Connection *conn); + KexiReportView(KexiMainWindow *win, TQWidget *parent, const char *name, KexiDB::Connection *conn); virtual ~KexiReportView(); KexiDB::Connection* connection() { return m_conn; } diff --git a/kexi/plugins/reports/reportwidgets.cpp b/kexi/plugins/reports/reportwidgets.cpp index c3ca65e4..7cea50a3 100644 --- a/kexi/plugins/reports/reportwidgets.cpp +++ b/kexi/plugins/reports/reportwidgets.cpp @@ -28,16 +28,16 @@ #include "kexireportview.h" #include "reportwidgets.h" -Label::Label(const TQString &text, TQWidget *tqparent, const char *name) -: TQLabel(text, tqparent, name) +Label::Label(const TQString &text, TQWidget *parent, const char *name) +: TQLabel(text, parent, name) { setPaletteBackgroundColor(white); } //////////////////////////////////////////////////////////////////// -ReportLine::ReportLine(TQWidget *tqparent, const char *name) -: TQWidget(tqparent, name) +ReportLine::ReportLine(TQWidget *parent, const char *name) +: TQWidget(parent, name) { m_lineStyle = (ReportLineStyle)TQt::SolidLine; m_lineWidth = 1; @@ -113,8 +113,8 @@ ReportLine::paintEvent (TQPaintEvent *ev) //////////////////////////////////////////////////////////////////// -PicLabel::PicLabel(const TQPixmap &pix, TQWidget *tqparent, const char *name) - : TQLabel(tqparent, name) +PicLabel::PicLabel(const TQPixmap &pix, TQWidget *parent, const char *name) + : TQLabel(parent, name) { setPixmap(pix); setScaledContents(false); @@ -131,8 +131,8 @@ PicLabel::setProperty(const char *name, const TQVariant &value) //////////////////////////////////////////////////////////////////// -KexiSubReport::KexiSubReport(TQWidget *tqparent, const char *name) -: TQScrollView(tqparent, name), m_form(0), m_widget(0) +KexiSubReport::KexiSubReport(TQWidget *parent, const char *name) +: TQScrollView(parent, name), m_form(0), m_widget(0) { setFrameStyle(TQFrame::Plain | TQFrame::Box); viewport()->setPaletteBackgroundColor(white); diff --git a/kexi/plugins/reports/reportwidgets.h b/kexi/plugins/reports/reportwidgets.h index 9e587556..1452f41e 100644 --- a/kexi/plugins/reports/reportwidgets.h +++ b/kexi/plugins/reports/reportwidgets.h @@ -38,7 +38,7 @@ class KexiSubReport : public TQScrollView TQ_PROPERTY(TQString reportName READ reportName WRITE setReportName DESIGNABLE true); public: - KexiSubReport(TQWidget *tqparent, const char *name); + KexiSubReport(TQWidget *parent, const char *name); ~KexiSubReport() {} //! \return the name of the subreport inside the db @@ -59,7 +59,7 @@ class Label : public TQLabel TQ_OBJECT public: - Label(const TQString &text, TQWidget *tqparent, const char *name); + Label(const TQString &text, TQWidget *parent, const char *name); ~Label() {} }; @@ -70,7 +70,7 @@ class PicLabel : public TQLabel TQ_OBJECT public: - PicLabel(const TQPixmap &pix, TQWidget *tqparent, const char *name); + PicLabel(const TQPixmap &pix, TQWidget *parent, const char *name); ~PicLabel() {} virtual bool setProperty(const char *name, const TQVariant &value); @@ -91,7 +91,7 @@ class ReportLine : public TQWidget DashDot = TQt::DashDotLine, DashDotDot = TQt::DashDotDotLine }; enum CapStyle { Flat = TQt::FlatCap, Square = TQt::SquareCap, Round = TQt::RoundCap }; - ReportLine(TQWidget *tqparent, const char *name); + ReportLine(TQWidget *parent, const char *name); ~ReportLine(){;} ReportLineStyle lineStyle() const; diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp index 50a875b3..421bc31f 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp @@ -64,8 +64,8 @@ class KexiScriptDesignViewPrivate KTextBrowser* statusbrowser; }; -KexiScriptDesignView::KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *tqparent, Kross::Api::ScriptAction* scriptaction) - : KexiViewBase(mainWin, tqparent, "KexiScriptDesignView") +KexiScriptDesignView::KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *parent, Kross::Api::ScriptAction* scriptaction) + : KexiViewBase(mainWin, parent, "KexiScriptDesignView") , d( new KexiScriptDesignViewPrivate() ) { d->scriptaction = scriptaction; diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.h b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.h index ac5240ed..b3dec360 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.h +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.h @@ -53,7 +53,7 @@ class KexiScriptDesignView : public KexiViewBase /** * Constructor. */ - KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *tqparent, Kross::Api::ScriptAction* scriptaction); + KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *parent, Kross::Api::ScriptAction* scriptaction); /** * Destructor. diff --git a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp index a6f2dfc1..8aec288b 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp @@ -41,8 +41,8 @@ class KexiScriptEditor::Private Private() : scriptaction(0) {} }; -KexiScriptEditor::KexiScriptEditor(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name) - : KexiEditor(mainWin, tqparent, name) +KexiScriptEditor::KexiScriptEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *name) + : KexiEditor(mainWin, parent, name) , d( new Private() ) { } diff --git a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.h b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.h index 22415a7b..a00e3aa2 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.h +++ b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.h @@ -43,7 +43,7 @@ class KexiScriptEditor : public KexiEditor /** * Constructor. */ - KexiScriptEditor(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0); + KexiScriptEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0); /** * Destructor. diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp index b778bc75..cb66734d 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp @@ -44,8 +44,8 @@ class KexiScriptPart::Private Kross::Api::ScriptGUIClient* scriptguiclient; }; -KexiScriptPart::KexiScriptPart(TQObject *tqparent, const char *name, const TQStringList &l) - : KexiPart::Part(tqparent, name, l) +KexiScriptPart::KexiScriptPart(TQObject *parent, const char *name, const TQStringList &l) + : KexiPart::Part(parent, name, l) , d( new Private() ) { d->scriptguiclient = 0; @@ -159,7 +159,7 @@ void KexiScriptPart::initInstanceActions() createSharedAction(Kexi::DesignViewMode, i18n("Configure Editor..."), "configure", 0, "script_config_editor"); } -KexiViewBase* KexiScriptPart::createView(TQWidget *tqparent, KexiDialogBase* dialog, KexiPart::Item& item, int viewMode, TQMap<TQString,TQString>*) +KexiViewBase* KexiScriptPart::createView(TQWidget *parent, KexiDialogBase* dialog, KexiPart::Item& item, int viewMode, TQMap<TQString,TQString>*) { TQString partname = item.name(); if( ! partname.isNull() ) { @@ -181,7 +181,7 @@ KexiViewBase* KexiScriptPart::createView(TQWidget *tqparent, KexiDialogBase* dia } if(viewMode == Kexi::DesignViewMode) { - return new KexiScriptDesignView(win, tqparent, scriptaction); + return new KexiScriptDesignView(win, parent, scriptaction); } } return 0; diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.h b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.h index eca7a001..b2928a8f 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.h +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.h @@ -42,11 +42,11 @@ class KexiScriptPart : public KexiPart::Part /** * Constructor. * - * \param tqparent The tqparent TQObject this part is child of. + * \param parent The parent TQObject this part is child of. * \param name The name this part has. * \param args Optional list of arguments passed to this part. */ - KexiScriptPart(TQObject *tqparent, const char *name, const TQStringList& args); + KexiScriptPart(TQObject *parent, const char *name, const TQStringList& args); /** * Destructor. @@ -69,12 +69,12 @@ class KexiScriptPart : public KexiPart::Part /** * Create a new view. * - * \param tqparent The tqparent TQWidget the new view is displayed in. + * \param parent The parent TQWidget the new view is displayed in. * \param dialog The \a KexiDialogBase the view is child of. * \param item The \a KexiPart::Item this view is for. * \param viewMode The viewmode we like to have a view for. */ - virtual KexiViewBase* createView(TQWidget *tqparent, + virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, KexiPart::Item& item, int viewMode = Kexi::DesignViewMode, diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py index bdec927b..6f75bdea 100644 --- a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py +++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py @@ -89,9 +89,9 @@ def runGuiApp(copycenter, name): #-------------------------------------------------------------------- class ListViewDialog(qt.QDialog): - def __init__(self, tqparent, caption): - qt.QDialog.__init__(self, tqparent, "ProgressDialog", 1) - self.tqparent = tqparent + def __init__(self, parent, caption): + qt.QDialog.__init__(self, parent, "ProgressDialog", 1) + self.parent = parent self.setCaption(caption) tqlayout = qt.QVBoxLayout(self) box = qt.QVBox(self) @@ -124,9 +124,9 @@ def runGuiApp(copycenter, name): #-------------------------------------------------------------------- class CopyJobWidget(qt.QVBox): - def __init__(self,dialog,tqparent): + def __init__(self,dialog,parent): self.dialog = dialog - qt.QVBox.__init__(self,tqparent) + qt.QVBox.__init__(self,parent) self.setSpacing(6) typebox = qt.QHBox(self) typebox.setSpacing(6) @@ -165,7 +165,7 @@ def runGuiApp(copycenter, name): def doubleClicked(self, **args): print "CopyJobWidget.doubleClicked" item = self.listview.selectedItem() - if item and item.tqparent(): item.startRename(1) + if item and item.parent(): item.startRename(1) def readOptions(self,domnode,plugininst): print "CopyJobWidget.readOptions plugintype=\"%s\"" % plugininst.plugintype @@ -442,13 +442,13 @@ def runGuiApp(copycenter, name): #-------------------------------------------------------------------- class DataSelector(qt.QVGroupBox): - def __init__(self, plugintype, title, caption, tqparent, dialog, items): + def __init__(self, plugintype, title, caption, parent, dialog, items): self.plugintype = plugintype self.pluginimpl = None self.dialog = dialog self.mainbox = None - qt.QVGroupBox.__init__(self,title,tqparent) + qt.QVGroupBox.__init__(self,title,parent) self.setInsideMargin(6) self.setInsideSpacing(0) @@ -520,7 +520,7 @@ def runGuiApp(copycenter, name): #-------------------------------------------------------------------- class Dialog(qt.QDialog): - def __init__(self, copycenter, tqparent): + def __init__(self, copycenter, parent): self.copycenter = copycenter import qt @@ -528,7 +528,7 @@ def runGuiApp(copycenter, name): import sys self.ListViewDialog = ListViewDialog - qt.QDialog.__init__(self, tqparent, "Dialog", 1, qt.Qt.WDestructiveClose) + qt.QDialog.__init__(self, parent, "Dialog", 1, qt.Qt.WDestructiveClose) self.setCaption("Copy Center") tqlayout = qt.QVBoxLayout(self) box = qt.QVBox(self) diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py index 85023ee4..e8241405 100644 --- a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py +++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py @@ -53,9 +53,9 @@ class CopyCenterPlugin: def finish(self): """ Called if reading is finished.""" self.connection.finish() - def createWidget(self, dialog, tqparent): + def createWidget(self, dialog, parent): """ Create and return a widget to modify the plugin settings. """ - return self.copycenterplugin.createWidget(dialog, self, tqparent) + return self.copycenterplugin.createWidget(dialog, self, parent) class Source(Plugin): """ Specialization of the Plugin class to implement the @@ -196,7 +196,7 @@ class CopyCenterPlugin: self.drivermanager = krosskexidb.DriverManager() self.copycenter = copycenter - def createWidget(self, dialog, plugin, tqparent): + def createWidget(self, dialog, plugin, parent): """ Each plugin may provide a qt.QWidget back to the CopyCenter.py. The widget will be used to configure our plugin settings. """ @@ -208,12 +208,12 @@ class CopyCenterPlugin: self.dialog = dialog self.mainbox = None class ProjectBox(qt.QHBox): - def __init__(self,main,copycenterplugin,plugin,tqparent): + def __init__(self,main,copycenterplugin,plugin,parent): self.main = main self.copycenterplugin = copycenterplugin self.plugin = plugin - qt.QHBox.__init__(self,tqparent) + qt.QHBox.__init__(self,parent) prjlabel = qt.QLabel("Project File:",self) self.prjcombo = qt.QComboBox(self) self.prjcombo.setEditable(True) @@ -244,8 +244,8 @@ class CopyCenterPlugin: if str(filename) != "": self.prjcombo.setCurrentText(str(filename)) class DriverBox(qt.QVBox): - def __init__(self,main,tqparent): - qt.QVBox.__init__(self,tqparent) + def __init__(self,main,parent): + qt.QVBox.__init__(self,parent) self.main = main self.copycenterplugin = main.copycenterplugin self.plugin = main.plugin @@ -364,8 +364,8 @@ class CopyCenterPlugin: if str(filename) != "": self.sockfileedit.setText(str(filename)) class TableBox(qt.QHBox): - def __init__(self,copycenterplugin,plugin,tqparent): - qt.QHBox.__init__(self,tqparent) + def __init__(self,copycenterplugin,plugin,parent): + qt.QHBox.__init__(self,parent) self.copycenterplugin = copycenterplugin self.plugin = plugin tablelabel = qt.QLabel("Table:",self) @@ -405,8 +405,8 @@ class CopyCenterPlugin: dialog.show() class FieldBox(qt.QHBox): - def __init__(self,copycenterplugin,plugin,tqparent): - qt.QHBox.__init__(self,tqparent) + def __init__(self,copycenterplugin,plugin,parent): + qt.QHBox.__init__(self,parent) self.copycenterplugin = copycenterplugin self.plugin = plugin self.tablename = "" @@ -462,15 +462,15 @@ class CopyCenterPlugin: self.fieldsbtn.setEnabled(False) class MainBox(qt.QHBox): - def __init__(self,copycenterplugin,plugin,tqparent): - qt.QHBox.__init__(self,tqparent) + def __init__(self,copycenterplugin,plugin,parent): + qt.QHBox.__init__(self,parent) self.copycenterplugin = copycenterplugin self.plugin = plugin - self.prjbox = ProjectBox(self,copycenterplugin,plugin,tqparent) - self.driverbox = DriverBox(self,tqparent) + self.prjbox = ProjectBox(self,copycenterplugin,plugin,parent) + self.driverbox = DriverBox(self,parent) - statusbar = qt.QHBox(tqparent) + statusbar = qt.QHBox(parent) statusbar.setSpacing(2) #self.statuslabel = qt.QLabel("Disconnected",statusbar) #statusbar.setStretchFactor(self.statuslabel,1) @@ -482,9 +482,9 @@ class CopyCenterPlugin: self.disconnectbtn.setEnabled(False) qt.QObject.connect(self.disconnectbtn, qt.SIGNAL("clicked()"),self.disconnectClicked) - #self.connectionbox = ConnectionBox(copycenterplugin,plugin,tqparent) - self.tablebox = TableBox(copycenterplugin,plugin,tqparent) - self.fieldbox = FieldBox(copycenterplugin,plugin,tqparent) + #self.connectionbox = ConnectionBox(copycenterplugin,plugin,parent) + self.tablebox = TableBox(copycenterplugin,plugin,parent) + self.fieldbox = FieldBox(copycenterplugin,plugin,parent) qt.QObject.connect(self.tablebox.tableedit, qt.SIGNAL("textChanged(const QString&)"), self.fieldbox.tableChanged) if self.plugin.options['project'] != '': @@ -499,7 +499,7 @@ class CopyCenterPlugin: pass if self.plugin.plugintype == "Destination": - #typebox = qt.QHBox(tqparent) + #typebox = qt.QHBox(parent) #label = qt.QLabel("Operation:",typebox) #combobox = qt.QComboBox(typebox) #combobox.insertItem("Append") @@ -511,15 +511,15 @@ class CopyCenterPlugin: #typebox.setStretchFactor(combobox,1) pass elif self.plugin.plugintype == "Source": - wherebox = qt.QHBox(tqparent) + wherebox = qt.QHBox(parent) wherelabel = qt.QLabel("Where:",wherebox) self.whereedit = qt.QLineEdit(self.plugin.options['where'],wherebox) - #orderbox = qt.QHBox(tqparent) + #orderbox = qt.QHBox(parent) #orderlabel = qt.QLabel("Order By:",orderbox) #orderedit = qt.QLineEdit("",orderbox) - #errbox = qt.QHBox(tqparent) + #errbox = qt.QHBox(parent) #errlabel = qt.QLabel("On Error:",errbox) #errcombo = qt.QComboBox(errbox) #errcombo.insertItem("Ask") @@ -640,7 +640,7 @@ class CopyCenterPlugin: pass return "" - mainbox = MainBox(self,plugin,tqparent) + mainbox = MainBox(self,plugin,parent) plugin.widget = mainbox return mainbox diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py index de553b92..678cf40b 100644 --- a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py +++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py @@ -39,8 +39,8 @@ class CopyCenterPlugin: def finish(self): self.isfinished = True self.widget.disconnectClicked() - def createWidget(self,dialog,tqparent): - return self.copycenterplugin.widget(dialog, self, tqparent) + def createWidget(self,dialog,parent): + return self.copycenterplugin.widget(dialog, self, parent) class Source(Plugin): plugintype = "Source" @@ -209,7 +209,7 @@ class CopyCenterPlugin: """ Constructor. """ pass - def widget(self,dialog,plugin,tqparent): + def widget(self,dialog,plugin,parent): """ Each plugin may provide a qt.QWidget back to the CopyCenter.py. The widget will be used to configure our plugin settings. """ @@ -246,7 +246,7 @@ class CopyCenterPlugin: class FieldsDialog(ListViewDialog): def __init__(self, mainwidget): - ListViewDialog.__init__(self,tqparent,"Fields") + ListViewDialog.__init__(self,parent,"Fields") self.mainwidget = mainwidget self.listview.setSelectionMode(qt.QListView.Multi) self.listview.setSorting(-1) @@ -280,14 +280,14 @@ class CopyCenterPlugin: class MainWidget(qt.QHBox): - def __init__(self,plugin,dialog,tqparent): + def __init__(self,plugin,dialog,parent): import qt import qtsql - qt.QHBox.__init__(self,tqparent) + qt.QHBox.__init__(self,parent) self.dialog = dialog self.plugin = plugin - self.connectionbox = qt.QVBox(tqparent) + self.connectionbox = qt.QVBox(parent) self.connectionbox.setSpacing(2) driverbox = qt.QHBox(self.connectionbox) @@ -331,7 +331,7 @@ class CopyCenterPlugin: dblabel.setBuddy(self.dbedit) dbbox.setStretchFactor(self.dbedit,1) - statusbar = qt.QHBox(tqparent) + statusbar = qt.QHBox(parent) statusbar.setSpacing(2) statusbar.setStretchFactor(qt.QWidget(statusbar),1) self.connectbtn = qt.QPushButton("Connect",statusbar) @@ -340,7 +340,7 @@ class CopyCenterPlugin: self.disconnectbtn.setEnabled(False) qt.QObject.connect(self.disconnectbtn, qt.SIGNAL("clicked()"),self.disconnectClicked) - tablebox = qt.QHBox(tqparent) + tablebox = qt.QHBox(parent) tablelabel = qt.QLabel("Table:",tablebox) self.tableedit = qt.QLineEdit(self.plugin.options['table'],tablebox) qt.QObject.connect(self.tableedit, qt.SIGNAL("textChanged(const QString&)"), self.tableEditChanged) @@ -350,7 +350,7 @@ class CopyCenterPlugin: tablelabel.setBuddy(self.tableedit) tablebox.setStretchFactor(self.tableedit,1) - fieldbox = qt.QHBox(tqparent) + fieldbox = qt.QHBox(parent) fieldlabel = qt.QLabel("Fields:",fieldbox) self.fieldedit = qt.QLineEdit(self.plugin.options['fields'],fieldbox) self.fieldbtn = qt.QPushButton("...",fieldbox) @@ -360,7 +360,7 @@ class CopyCenterPlugin: fieldbox.setStretchFactor(self.fieldedit,1) if self.plugin.plugintype == "Source": - box = qt.QHBox(tqparent) + box = qt.QHBox(parent) wherelabel = qt.QLabel("Where:",box) self.whereedit = qt.QLineEdit(self.plugin.options['where'],box) wherelabel.setBuddy(self.whereedit) @@ -368,9 +368,9 @@ class CopyCenterPlugin: elif self.plugin.plugintype == "Destination": class OperationBox(qt.QVBox): - def __init__(self, mainwidget, tqparent): + def __init__(self, mainwidget, parent): self.mainwidget = mainwidget - qt.QVBox.__init__(self, tqparent) + qt.QVBox.__init__(self, parent) opbox = qt.QHBox(self) operationlabel = qt.QLabel("Operation:",opbox) self.mainwidget.operationedit = qt.QComboBox(opbox) @@ -401,7 +401,7 @@ class CopyCenterPlugin: 1: showUpdate, }[ self.mainwidget.operationedit.currentItem() ](self) if self.box != None: self.box.show() - OperationBox(self,tqparent) + OperationBox(self,parent) def tableEditChanged(self,text): if self.plugin.database != None and self.plugin.database.isOpen(): @@ -491,5 +491,5 @@ class CopyCenterPlugin: print "database is closed now!" self.updateConnectState() - plugin.widget = MainWidget(plugin,self.dialog,tqparent) + plugin.widget = MainWidget(plugin,self.dialog,parent) return plugin.widget diff --git a/kexi/plugins/tables/kexilookupcolumnpage.cpp b/kexi/plugins/tables/kexilookupcolumnpage.cpp index 33e12d64..443f26d4 100644 --- a/kexi/plugins/tables/kexilookupcolumnpage.cpp +++ b/kexi/plugins/tables/kexilookupcolumnpage.cpp @@ -122,8 +122,8 @@ class KexiLookupColumnPage::Private //---------------------------------------------- -KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *tqparent) - : TQWidget(tqparent) +KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent) + : TQWidget(parent) , d(new Private()) { setName("KexiLookupColumnPage"); diff --git a/kexi/plugins/tables/kexilookupcolumnpage.h b/kexi/plugins/tables/kexilookupcolumnpage.h index f7b79bb2..d5c6d174 100644 --- a/kexi/plugins/tables/kexilookupcolumnpage.h +++ b/kexi/plugins/tables/kexilookupcolumnpage.h @@ -48,7 +48,7 @@ class KexiLookupColumnPage : public TQWidget TQ_OBJECT public: - KexiLookupColumnPage(TQWidget *tqparent); + KexiLookupColumnPage(TQWidget *parent); virtual ~KexiLookupColumnPage(); public slots: diff --git a/kexi/plugins/tables/kexitabledesigner_dataview.cpp b/kexi/plugins/tables/kexitabledesigner_dataview.cpp index e1b8ddb9..36283c1f 100644 --- a/kexi/plugins/tables/kexitabledesigner_dataview.cpp +++ b/kexi/plugins/tables/kexitabledesigner_dataview.cpp @@ -26,8 +26,8 @@ #include "kexidatatableview.h" #include "keximainwindow.h" -KexiTableDesigner_DataView::KexiTableDesigner_DataView(KexiMainWindow *win, TQWidget *tqparent) - : KexiDataTable(win, tqparent, "KexiTableDesigner_DataView", true/*db-aware*/) +KexiTableDesigner_DataView::KexiTableDesigner_DataView(KexiMainWindow *win, TQWidget *parent) + : KexiDataTable(win, parent, "KexiTableDesigner_DataView", true/*db-aware*/) { } diff --git a/kexi/plugins/tables/kexitabledesigner_dataview.h b/kexi/plugins/tables/kexitabledesigner_dataview.h index 1a974fd8..75552f27 100644 --- a/kexi/plugins/tables/kexitabledesigner_dataview.h +++ b/kexi/plugins/tables/kexitabledesigner_dataview.h @@ -29,7 +29,7 @@ class KexiTableDesigner_DataView : public KexiDataTable TQ_OBJECT public: - KexiTableDesigner_DataView(KexiMainWindow *win, TQWidget *tqparent); + KexiTableDesigner_DataView(KexiMainWindow *win, TQWidget *parent); virtual ~KexiTableDesigner_DataView(); diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp index 0e743bd1..84ea686c 100644 --- a/kexi/plugins/tables/kexitabledesignerview.cpp +++ b/kexi/plugins/tables/kexitabledesignerview.cpp @@ -104,8 +104,8 @@ static TQVariant tryCastTQVariant( const TQVariant& fromVal, TQVariant::Type toT } -KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *tqparent) - : KexiDataTable(win, tqparent, "KexiTableDesignerView", false/*not db-aware*/) +KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *parent) + : KexiDataTable(win, parent, "KexiTableDesignerView", false/*not db-aware*/) , KexiTableDesignerInterface() , d( new KexiTableDesignerViewPrivate(this) ) { diff --git a/kexi/plugins/tables/kexitabledesignerview.h b/kexi/plugins/tables/kexitabledesignerview.h index b7ff7a23..13ce495d 100644 --- a/kexi/plugins/tables/kexitabledesignerview.h +++ b/kexi/plugins/tables/kexitabledesignerview.h @@ -60,7 +60,7 @@ class KexiTableDesignerView : public KexiDataTable, public KexiTableDesignerInte public: /*! Creates a new alter table dialog. */ - KexiTableDesignerView(KexiMainWindow *win, TQWidget *tqparent); + KexiTableDesignerView(KexiMainWindow *win, TQWidget *parent); virtual ~KexiTableDesignerView(); @@ -219,7 +219,7 @@ class KexiTableDesignerView : public KexiDataTable, public KexiTableDesignerInte Assigns primary key icon and value for property set \a propertySet, and deselects it from previous pkey's row. \a aWasPKey is internal. - If \a commandGroup is not 0, it is used as tqparent group for storing actions' history. */ + If \a commandGroup is not 0, it is used as parent group for storing actions' history. */ void switchPrimaryKey(KoProperty::Set &propertySet, bool set, bool aWasPKey = false, CommandGroup* commandGroup = 0); diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp index 1ee3d049..4efd237a 100644 --- a/kexi/plugins/tables/kexitablepart.cpp +++ b/kexi/plugins/tables/kexitablepart.cpp @@ -54,8 +54,8 @@ class KexiTablePart::Private TQGuardedPtr<KexiLookupColumnPage> lookupColumnPage; }; -KexiTablePart::KexiTablePart(TQObject *tqparent, const char *name, const TQStringList &l) - : KexiPart::Part(tqparent, name, l) +KexiTablePart::KexiTablePart(TQObject *parent, const char *name, const TQStringList &l) + : KexiPart::Part(parent, name, l) , d(new Private()) { // REGISTERED ID: @@ -96,7 +96,7 @@ KexiDialogTempData* KexiTablePart::createTempData(KexiDialogBase* dialog) return new KexiTablePart::TempData(TQT_TQOBJECT(dialog)); } -KexiViewBase* KexiTablePart::createView(TQWidget *tqparent, KexiDialogBase* dialog, +KexiViewBase* KexiTablePart::createView(TQWidget *parent, KexiDialogBase* dialog, KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>*) { KexiMainWindow *win = dialog->mainWin(); @@ -111,7 +111,7 @@ KexiViewBase* KexiTablePart::createView(TQWidget *tqparent, KexiDialogBase* dial } if (viewMode == Kexi::DesignViewMode) { - KexiTableDesignerView *t = new KexiTableDesignerView(win, tqparent); + KexiTableDesignerView *t = new KexiTableDesignerView(win, parent); return t; } else if (viewMode == Kexi::DataViewMode) { @@ -119,7 +119,7 @@ KexiViewBase* KexiTablePart::createView(TQWidget *tqparent, KexiDialogBase* dial return 0; //todo: message //we're not setting table schema here -it will be forced to set // in KexiTableDesigner_DataView::afterSwitchFrom() - KexiTableDesigner_DataView *t = new KexiTableDesigner_DataView(win, tqparent); + KexiTableDesigner_DataView *t = new KexiTableDesigner_DataView(win, parent); return t; } return 0; @@ -171,7 +171,7 @@ KexiTablePart::dataSource() } #endif -tristate KexiTablePart::askForClosingObjectsUsingTableSchema(TQWidget *tqparent, KexiDB::Connection& conn, +tristate KexiTablePart::askForClosingObjectsUsingTableSchema(TQWidget *parent, KexiDB::Connection& conn, KexiDB::TableSchema& table, const TQString& msg) { TQPtrList<KexiDB::Connection::TableSchemaChangeListenerInterface>* listeners @@ -185,7 +185,7 @@ tristate KexiTablePart::askForClosingObjectsUsingTableSchema(TQWidget *tqparent, openedObjectsStr += TQString("<li>%1</li>").tqarg(it.current()->listenerInfoString); } openedObjectsStr += "</ul>"; - int r = KMessageBox::questionYesNo(tqparent, + int r = KMessageBox::questionYesNo(parent, "<p>"+msg+"</p><p>"+openedObjectsStr+"</p><p>" +i18n("Do you want to close all windows for these objects?"), TQString(), KGuiItem(i18n("Close windows"),"fileclose"), KStdGuiItem::cancel()); @@ -278,8 +278,8 @@ KexiTableDataSource::cursor(KexiProject * /*project*/, //---------------- -KexiTablePart::TempData::TempData(TQObject* tqparent) - : KexiDialogTempData(tqparent) +KexiTablePart::TempData::TempData(TQObject* parent) + : KexiDialogTempData(parent) , table(0) , tableSchemaChangedInPreviousView(true /*to force reloading on startup*/ ) { diff --git a/kexi/plugins/tables/kexitablepart.h b/kexi/plugins/tables/kexitablepart.h index 68825138..6042f365 100644 --- a/kexi/plugins/tables/kexitablepart.h +++ b/kexi/plugins/tables/kexitablepart.h @@ -38,7 +38,7 @@ class KexiTablePart : public KexiPart::Part TQ_OBJECT public: - KexiTablePart(TQObject *tqparent, const char *name, const TQStringList &); + KexiTablePart(TQObject *parent, const char *name, const TQStringList &); virtual ~KexiTablePart(); virtual bool remove(KexiMainWindow *win, KexiPart::Item &item); @@ -51,7 +51,7 @@ class KexiTablePart : public KexiPart::Part class TempData : public KexiDialogTempData { public: - TempData(TQObject* tqparent); + TempData(TQObject* parent); KexiDB::TableSchema *table; /*! true, if \a table member has changed in previous view. Used on view switching. We're checking this flag to see if we should refresh data for DataViewMode. */ @@ -59,7 +59,7 @@ class KexiTablePart : public KexiPart::Part }; static tristate askForClosingObjectsUsingTableSchema( - TQWidget *tqparent, KexiDB::Connection& conn, + TQWidget *parent, KexiDB::Connection& conn, KexiDB::TableSchema& table, const TQString& msg); virtual TQString i18nMessage(const TQCString& englishMessage, @@ -70,7 +70,7 @@ class KexiTablePart : public KexiPart::Part protected: virtual KexiDialogTempData* createTempData(KexiDialogBase* dialog); - virtual KexiViewBase* createView(TQWidget *tqparent, KexiDialogBase* dialog, + virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, KexiPart::Item &item, int viewMode = Kexi::DataViewMode, TQMap<TQString,TQString>* staticObjectArgs = 0); virtual void initPartActions(); |