diff options
Diffstat (limited to 'kexi/plugins/forms')
53 files changed, 128 insertions, 128 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: |