diff options
Diffstat (limited to 'kexi/plugins/forms')
20 files changed, 78 insertions, 78 deletions
diff --git a/kexi/plugins/forms/kexidataawarewidgetinfo.cpp b/kexi/plugins/forms/kexidataawarewidgetinfo.cpp index 0947c8a1..a6033c70 100644 --- a/kexi/plugins/forms/kexidataawarewidgetinfo.cpp +++ b/kexi/plugins/forms/kexidataawarewidgetinfo.cpp @@ -26,8 +26,8 @@ KexiDataAwareWidgetInfo::KexiDataAwareWidgetInfo(KFormDesigner::WidgetFactory *f } KexiDataAwareWidgetInfo::KexiDataAwareWidgetInfo(KFormDesigner::WidgetFactory *f, - const char* tqparentFactoryName, const char* inheritedClassName) - : KFormDesigner::WidgetInfo(f, tqparentFactoryName, inheritedClassName) + const char* parentFactoryName, const char* inheritedClassName) + : KFormDesigner::WidgetInfo(f, parentFactoryName, inheritedClassName) { init(); } diff --git a/kexi/plugins/forms/kexidataawarewidgetinfo.h b/kexi/plugins/forms/kexidataawarewidgetinfo.h index eddcf909..41e67d85 100644 --- a/kexi/plugins/forms/kexidataawarewidgetinfo.h +++ b/kexi/plugins/forms/kexidataawarewidgetinfo.h @@ -33,7 +33,7 @@ class KEXIFORMUTILS_EXPORT KexiDataAwareWidgetInfo : public KFormDesigner::Widge KexiDataAwareWidgetInfo(KFormDesigner::WidgetFactory *f); KexiDataAwareWidgetInfo(KFormDesigner::WidgetFactory *f, - const char* tqparentFactoryName, const char* inheritedClassName = 0); + const char* parentFactoryName, const char* inheritedClassName = 0); virtual ~KexiDataAwareWidgetInfo(); diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp index 400e6d37..3e1e5c4b 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->tqparentInterface()) //item with tqparent interface: collect tqparent instead... + if (formDataItem->parentInterface()) //item with tqparent interface: collect tqparent instead... continue; #if 0 //! @todo reenable when subform is moved to KexiDBForm KexiDBForm *dbForm = KexiUtils::findParent<KexiDBForm>(obj, "KexiDBForm"); //form's surface... @@ -183,7 +183,7 @@ bool KexiFormDataProvider::cursorAtNewRow() const return false; } -void KexiFormDataProvider::tqinvalidateDataSources( const TQDict<char>& invalidSources, +void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSources, KexiDB::QuerySchema* query) { //fill m_fieldNumbersForDataItems mapping from data item to field number @@ -222,7 +222,7 @@ void KexiFormDataProvider::tqinvalidateDataSources( const TQDict<char>& invalidS //all previous indices have corresponding data source // for (; i < (*it); i++) { // newIndices[i] = number++; - //kexipluginsdbg << "tqinvalidateDataSources(): " << i << " -> " << number-1 << endl; + //kexipluginsdbg << "invalidateDataSources(): " << i << " -> " << number-1 << endl; // } //this index have no corresponding data source // newIndices[i]=-1; @@ -230,14 +230,14 @@ void KexiFormDataProvider::tqinvalidateDataSources( const TQDict<char>& invalidS if (item) item->setInvalidState( TQString::tqfromLatin1("#") + i18n("NAME") + TQString::tqfromLatin1("?") ); m_dataItems.remove(*it); - kexipluginsdbg << "tqinvalidateDataSources(): " << (*it) << " -> " << -1 << endl; + kexipluginsdbg << "invalidateDataSources(): " << (*it) << " -> " << -1 << endl; // i++; } #endif //fill remaining part of the vector // for (; i < dataFieldsCount; i++) { //m_dataItems.count(); i++) { //newIndices[i] = number++; - //kexipluginsdbg << "tqinvalidateDataSources(): " << i << " -> " << number-1 << endl; + //kexipluginsdbg << "invalidateDataSources(): " << i << " -> " << number-1 << endl; //} #if 0 @@ -247,11 +247,11 @@ void KexiFormDataProvider::tqinvalidateDataSources( const TQDict<char>& invalidS bool ok; const int newIndex = newIndices.at( it.data(), &ok ); if (ok && newIndex!=-1) { - kexipluginsdbg << "tqinvalidateDataSources(): " << it.key()->dataSource() << ": " << it.data() << " -> " << newIndex << endl; + kexipluginsdbg << "invalidateDataSources(): " << it.key()->dataSource() << ": " << it.data() << " -> " << newIndex << endl; newFieldNumbersForDataItems.tqreplace(it.key(), newIndex); } else { - kexipluginsdbg << "tqinvalidateDataSources(): removing " << it.key()->dataSource() << endl; + kexipluginsdbg << "invalidateDataSources(): removing " << it.key()->dataSource() << endl; m_dataItems.remove(it.key()); it.key()->setInvalidState( TQString::tqfromLatin1("#") + i18n("NAME") + TQString::tqfromLatin1("?") ); } @@ -266,7 +266,7 @@ void KexiFormDataProvider::tqinvalidateDataSources( const TQDict<char>& invalidS query->debug(); //if (query && m_dataItems.count()!=query->fieldCount()) { - // kdWarning() << "KexiFormDataProvider::tqinvalidateDataSources(): m_dataItems.count()!=query->fieldCount() (" + // kdWarning() << "KexiFormDataProvider::invalidateDataSources(): m_dataItems.count()!=query->fieldCount() (" // << m_dataItems.count() << "," << query->fieldCount() << ")" << endl; //} //i = 0; diff --git a/kexi/plugins/forms/kexidataprovider.h b/kexi/plugins/forms/kexidataprovider.h index f1e9d755..9c630cb4 100644 --- a/kexi/plugins/forms/kexidataprovider.h +++ b/kexi/plugins/forms/kexidataprovider.h @@ -74,7 +74,7 @@ class KEXIFORMUTILS_EXPORT KexiFormDataProvider : public KexiDataItemChangesList \a invalidSources is the set of data sources that should be omitted for fillDataItems(). Used by KexiFormView::initDataSource(). */ - void tqinvalidateDataSources( const TQDict<char>& invalidSources, + void invalidateDataSources( const TQDict<char>& invalidSources, KexiDB::QuerySchema* query = 0 ); /*! Fills the same data provided by \a value to every data item (other than \a item) diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp index 5f379e6e..8683c2bb 100644 --- a/kexi/plugins/forms/kexidbfactory.cpp +++ b/kexi/plugins/forms/kexidbfactory.cpp @@ -646,7 +646,7 @@ KexiDBFactory::isPropertyVisibleInternal(const TQCString& classname, TQWidget *w } else if(classname == "KexiDBCheckBox") { //hide text property if the widget is a child of an autofield beause there's already "caption" for this purpose - if (property=="text" && w && dynamic_cast<KFormDesigner::WidgetWithSubpropertiesInterface*>(w->tqparentWidget())) + if (property=="text" && w && dynamic_cast<KFormDesigner::WidgetWithSubpropertiesInterface*>(w->parentWidget())) return false; ok = property!="autoRepeat"; } diff --git a/kexi/plugins/forms/kexidbfactory.h b/kexi/plugins/forms/kexidbfactory.h index f15f8c39..79873b72 100644 --- a/kexi/plugins/forms/kexidbfactory.h +++ b/kexi/plugins/forms/kexidbfactory.h @@ -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 &tqparentNode, TQDomDocument &tqparent) {} + //TQDomElement &parentNode, TQDomDocument &tqparent) {} //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.cpp b/kexi/plugins/forms/kexiformdataiteminterface.cpp index 9a861917..c588c7b1 100644 --- a/kexi/plugins/forms/kexiformdataiteminterface.cpp +++ b/kexi/plugins/forms/kexiformdataiteminterface.cpp @@ -61,8 +61,8 @@ void KexiFormDataItemInterface::setDisplayDefaultValue(TQWidget* widget, bool di void KexiFormDataItemInterface::cancelEditor() { - TQWidget *tqparentWidget = dynamic_cast<TQWidget*>(this)->tqparentWidget(); - KexiFormScrollView* view = KexiUtils::findParent<KexiFormScrollView>(tqparentWidget, "KexiFormScrollView"); + TQWidget *parentWidget = dynamic_cast<TQWidget*>(this)->parentWidget(); + KexiFormScrollView* view = KexiUtils::findParent<KexiFormScrollView>(parentWidget, "KexiFormScrollView"); if (view) view->cancelEditor(); } diff --git a/kexi/plugins/forms/kexiformmanager.cpp b/kexi/plugins/forms/kexiformmanager.cpp index 9f288418..ce9b142b 100644 --- a/kexi/plugins/forms/kexiformmanager.cpp +++ b/kexi/plugins/forms/kexiformmanager.cpp @@ -70,7 +70,7 @@ KAction* KexiFormManager::action( const char* name ) KexiFormView* formViewWidget = dynamic_cast<KexiFormView*>(scrollViewWidget->tqparent()); if (!formViewWidget) return 0; - return formViewWidget->tqparentDialog()->mainWin()->actionCollection()->action(n.data()); + return formViewWidget->parentDialog()->mainWin()->actionCollection()->action(n.data()); } KexiFormView* KexiFormManager::activeFormViewWidget() const @@ -90,7 +90,7 @@ void KexiFormManager::enableAction( const char* name, bool enable ) KexiFormView* formViewWidget = activeFormViewWidget(); if (!formViewWidget) return; -// if (TQString(name)=="tqlayout_menu") +// if (TQString(name)=="layout_menu") // kdDebug() << "!!!!!!!!!!! " << enable << endl; formViewWidget->setAvailable(translateName( name ).latin1(), enable); } diff --git a/kexi/plugins/forms/kexiformmanager.h b/kexi/plugins/forms/kexiformmanager.h index d25cf78e..34decc1d 100644 --- a/kexi/plugins/forms/kexiformmanager.h +++ b/kexi/plugins/forms/kexiformmanager.h @@ -77,7 +77,7 @@ TQString KexiFormManager::translateName( const char* name ) const { TQString n( name ); //translate to our name space: - if (n.startsWith("align_") || n.startsWith("adjust_") || n.startsWith("tqlayout_") + if (n.startsWith("align_") || n.startsWith("adjust_") || n.startsWith("layout_") || n=="format_raise" || n=="format_raise" || n=="taborder" | n=="break_layout") { n.prepend("formpart_"); diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp index 2486416e..3f1d3466 100644 --- a/kexi/plugins/forms/kexiformpart.cpp +++ b/kexi/plugins/forms/kexiformpart.cpp @@ -428,7 +428,7 @@ void KexiFormPart::slotAssignAction() if (!formViewWidget) return; - KexiMainWindow * mainWin = formViewWidget->tqparentDialog()->mainWin(); + KexiMainWindow * mainWin = formViewWidget->parentDialog()->mainWin(); KexiActionSelectionDialog dlg(mainWin, dbform, data, propSet->property("name").value().toCString()); diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp index 2ddcb123..057e0a33 100644 --- a/kexi/plugins/forms/kexiformscrollview.cpp +++ b/kexi/plugins/forms/kexiformscrollview.cpp @@ -557,7 +557,7 @@ void KexiFormScrollView::handleDataWidgetAction(const TQString& actionName) item = dynamic_cast<KexiFormDataItemInterface*>(w); if (item) break; - w = w->tqparentWidget(); + w = w->parentWidget(); } if (item) item->handleAction(actionName); diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp index 189d515f..3f30fff2 100644 --- a/kexi/plugins/forms/kexiformview.cpp +++ b/kexi/plugins/forms/kexiformview.cpp @@ -121,12 +121,12 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *tqparent, plugSharedAction("edit_redo", KFormDesigner::FormManager::self(), TQT_SLOT(redo())); plugSharedAction("formpart_layout_menu", KFormDesigner::FormManager::self(), 0 ); - plugSharedAction("formpart_layout_hbox", KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHBox()) ); - plugSharedAction("formpart_layout_vbox", KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVBox()) ); - plugSharedAction("formpart_layout_grid", KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutGrid()) ); + plugSharedAction("formpart_layout_hbox", KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()) ); + plugSharedAction("formpart_layout_vbox", KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()) ); + plugSharedAction("formpart_layout_grid", KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()) ); #ifdef KEXI_SHOW_SPLITTER_WIDGET - plugSharedAction("formpart_layout_hsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHSplitter()) ); - plugSharedAction("formpart_layout_vsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVSplitter()) ); + plugSharedAction("formpart_layout_hsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()) ); + plugSharedAction("formpart_layout_vsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()) ); #endif plugSharedAction("formpart_break_layout", KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()) ); @@ -167,7 +167,7 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *tqparent, KexiFormView::~KexiFormView() { if (m_cursor) { - KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection(); + KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection(); conn->deleteCursor(m_cursor); m_cursor = 0; } @@ -184,7 +184,7 @@ void KexiFormView::deleteQuery() { if (m_cursor) { - KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection(); + KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection(); conn->deleteCursor(m_cursor); m_cursor = 0; } @@ -229,7 +229,7 @@ KexiFormView::initForm() KFormDesigner::FormManager::self(), TQT_SLOT(slotHistoryCommandExecuted())); } - const bool newForm = tqparentDialog()->id() < 0; + const bool newForm = parentDialog()->id() < 0; KexiDB::FieldList *fields = 0; if (newForm) { @@ -296,7 +296,7 @@ void KexiFormView::updateAutoFieldsDataSource() //(this data has not been stored in the form) TQString dataSourceString( m_dbform->dataSource() ); TQCString dataSourceMimeTypeString( m_dbform->dataSourceMimeType() ); - KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection(); + KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection(); KexiDB::TableOrQuerySchema tableOrQuery( conn, dataSourceString.latin1(), dataSourceMimeTypeString=="kexi/table"); if (!tableOrQuery.table() && !tableOrQuery.query()) @@ -325,7 +325,7 @@ void KexiFormView::updateValuesForSubproperties() //(this data has not been stored in the form) TQString dataSourceString( m_dbform->dataSource() ); TQCString dataSourceMimeTypeString( m_dbform->dataSourceMimeType() ); - KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection(); + KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection(); KexiDB::TableOrQuerySchema tableOrQuery( conn, dataSourceString.latin1(), dataSourceMimeTypeString=="kexi/table"); if (!tableOrQuery.table() && !tableOrQuery.query()) @@ -390,7 +390,7 @@ KexiFormView::loadForm() { //@todo also load m_resizeMode ! - kexipluginsdbg << "KexiFormView::loadForm() Loading the form with id : " << tqparentDialog()->id() << endl; + kexipluginsdbg << "KexiFormView::loadForm() Loading the form with id : " << parentDialog()->id() << endl; // If we are previewing the Form, use the tempData instead of the form stored in the db if(viewMode()==Kexi::DataViewMode && !tempData()->tempForm.isNull() ) { @@ -416,7 +416,7 @@ KexiFormView::loadForm() void KexiFormView::slotPropertySetSwitched(KoProperty::Set *set, bool forceReload, const TQCString& propertyToSelect) { -// if (set && tqparentDialog()!=tqparentDialog()->mainWin()->currentDialog()) +// if (set && parentDialog()!=parentDialog()->mainWin()->currentDialog()) if (form() != KFormDesigner::FormManager::self()->activeForm()) return; //this is not the current form view m_propertySet = set; @@ -470,7 +470,7 @@ tristate KexiFormView::afterSwitchFrom(int mode) { if (mode == 0 || mode == Kexi::DesignViewMode) { - if (tqparentDialog()->neverSaved()) { + if (parentDialog()->neverSaved()) { m_dbform->resize(TQSize(400, 300)); m_scrollView->refreshContentsSizeLater(true,true); //m_delayedFormContentsResizeOnShow = false; @@ -521,7 +521,7 @@ KexiFormView::afterSwitchFrom(int mode) initDataSource(); //handle events for this form - m_scrollView->setMainWidgetForEventHandling(tqparentDialog()->mainWin(), m_dbform); + m_scrollView->setMainWidgetForEventHandling(parentDialog()->mainWin(), m_dbform); //set focus on 1st focusable widget which has valid dataSource property set if (!m_dbform->orderedFocusWidgets()->isEmpty()) { @@ -555,7 +555,7 @@ KexiFormView::afterSwitchFrom(int mode) //dirty only if it's a new object if (mode == 0) - setDirty( tqparentDialog()->partItem()->neverSaved() ); + setDirty( parentDialog()->partItem()->neverSaved() ); if (mode==Kexi::DataViewMode && viewMode()==Kexi::DesignViewMode) { // slotPropertySetSwitched @@ -590,7 +590,7 @@ void KexiFormView::initDataSource() //collect all data-aware widgets and create query schema m_scrollView->setMainDataSourceWidget(m_dbform); sources = m_scrollView->usedDataSources(); - conn = tqparentDialog()->mainWin()->project()->dbConnection(); + conn = parentDialog()->mainWin()->project()->dbConnection(); if (dataSourceMimeTypeString.isEmpty() /*table type is the default*/ || dataSourceMimeTypeString=="kexi/table") { @@ -681,7 +681,7 @@ void KexiFormView::initDataSource() if (ok) //input cancelled m_cursor = conn->executeQuery( *m_query, params ); } - m_scrollView->tqinvalidateDataSources( invalidSources, m_query ); + m_scrollView->invalidateDataSources( invalidSources, m_query ); ok = m_cursor!=0; } @@ -730,7 +730,7 @@ KexiFormView::storeNewData(const KexiDB::SchemaData& sdata, bool &cancel) } if (!storeData()) { //failure: remove object's schema data to avoid garbage - KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection(); + KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection(); conn->removeObject( s->id() ); delete s; return 0; @@ -742,12 +742,12 @@ tristate KexiFormView::storeData(bool dontAsk) { Q_UNUSED(dontAsk); - kexipluginsdbg << "KexiDBForm::storeData(): " << tqparentDialog()->partItem()->name() - << " [" << tqparentDialog()->id() << "]" << endl; + kexipluginsdbg << "KexiDBForm::storeData(): " << parentDialog()->partItem()->name() + << " [" << parentDialog()->id() << "]" << endl; //-- first, store local BLOBs, so identifiers can be updated //! @todo remove unused data stored previously - KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection(); + KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection(); KexiDB::TableSchema *blobsTable = conn->tableSchema("kexi__blobs"); if (!blobsTable) { //compatibility check for older Kexi project versions //! @todo show message about missing kexi__blobs? @@ -767,7 +767,7 @@ KexiFormView::storeData(bool dontAsk) } KexiBLOBBuffer *blobBuf = KexiBLOBBuffer::self(); KexiFormView *designFormView - = dynamic_cast<KexiFormView*>( tqparentDialog()->viewForMode(Kexi::DesignViewMode) ); + = dynamic_cast<KexiFormView*>( parentDialog()->viewForMode(Kexi::DesignViewMode) ); if (designFormView) { for (TQMapConstIterator<TQWidget*, KexiBLOBBuffer::Id_t> it = tempData()->unsavedLocalBLOBs.constBegin(); it!=tempData()->unsavedLocalBLOBs.constEnd(); ++it) @@ -874,7 +874,7 @@ KexiFormView::slotWidgetSelected(KFormDesigner::Form *f, bool multiple) KFormDesigner::Container *container = f->activeContainer(); setAvailable("formpart_break_layout", container ? - (container->tqlayoutType() != KFormDesigner::Container::NoLayout) : false ); + (container->layoutType() != KFormDesigner::Container::NoLayout) : false ); } void @@ -890,7 +890,7 @@ KexiFormView::slotFormWidgetSelected(KFormDesigner::Form *f) setAvailable("formpart_layout_hbox", true); setAvailable("formpart_layout_vbox", true); setAvailable("formpart_layout_grid", true); - setAvailable("formpart_break_layout", (f->toplevelContainer()->tqlayoutType() != KFormDesigner::Container::NoLayout)); + setAvailable("formpart_break_layout", (f->toplevelContainer()->layoutType() != KFormDesigner::Container::NoLayout)); } void @@ -967,9 +967,9 @@ KexiFormView::setRedoEnabled(bool enabled) TQSize KexiFormView::preferredSizeHint(const TQSize& otherSize) { - if (tqparentDialog()->neverSaved()) { + if (parentDialog()->neverSaved()) { //ignore otherSize if possible -// return KexiViewBase::preferredSizeHint( (tqparentDialog() && tqparentDialog()->mdiParent()) ? TQSize(10000,10000) : otherSize); +// return KexiViewBase::preferredSizeHint( (parentDialog() && parentDialog()->mdiParent()) ? TQSize(10000,10000) : otherSize); } return (m_dbform->size() @@ -1087,7 +1087,7 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s if (fields.isEmpty()) return; - KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection(); + KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection(); KexiDB::TableOrQuerySchema tableOrQuery(conn, sourceName.latin1(), sourceMimeType=="kexi/table"); if (!tableOrQuery.table() && !tableOrQuery.query()) { kexipluginswarn << "KexiFormView::insertAutoFields(): no such table/query \"" @@ -1132,7 +1132,7 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s while (targetContainerWidget && !dynamic_cast<KFormDesigner::Container*>(targetContainerWidget)) { - targetContainerWidget = targetContainerWidget->tqparentWidget(); + targetContainerWidget = targetContainerWidget->parentWidget(); } if (dynamic_cast<KFormDesigner::Container*>(targetContainerWidget)) targetContainer = dynamic_cast<KFormDesigner::Container*>(targetContainerWidget); @@ -1264,12 +1264,12 @@ void KexiFormView::updateActions(bool activated) }*/ /* -void KexiFormView::tqparentDialogDetached() +void KexiFormView::parentDialogDetached() { m_dbform->updateTabStopsOrder(form()); } -void KexiFormView::tqparentDialogAttached(KMdiChildFrm *) +void KexiFormView::parentDialogAttached(KMdiChildFrm *) { m_dbform->updateTabStopsOrder(form()); }*/ diff --git a/kexi/plugins/forms/kexiformview.h b/kexi/plugins/forms/kexiformview.h index e699afa1..b05a544c 100644 --- a/kexi/plugins/forms/kexiformview.h +++ b/kexi/plugins/forms/kexiformview.h @@ -141,7 +141,7 @@ class KEXIFORMUTILS_EXPORT KexiFormView : public KexiDataAwareView virtual tristate storeData(bool dontAsk = false); KexiFormPart::TempData* tempData() const { - return dynamic_cast<KexiFormPart::TempData*>(tqparentDialog()->tempData()); } + return dynamic_cast<KexiFormPart::TempData*>(parentDialog()->tempData()); } KexiFormPart* formPart() const { return dynamic_cast<KexiFormPart*>(part()); } //moved to formmanager void disableWidgetActions(); diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp index 4926a334..521dce2a 100644 --- a/kexi/plugins/forms/widgets/kexidbautofield.cpp +++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp @@ -193,7 +193,7 @@ KexiDBAutoField::createEditor() TQWidget::setFocusPolicy(newSubwidget->focusPolicy()); } setFocusProxy(newSubwidget); //ok? - if (tqparentWidget()) + if (parentWidget()) newSubwidget->setPalette( tqApp->palette() ); copyPropertiesToEditor(); // KFormDesigner::installRecursiveEventFilter(newSubwidget, this); diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp index a908c2fd..f977a962 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp @@ -477,9 +477,9 @@ TQVariant KexiDBComboBox::valueFromInternalEditor() TQPoint KexiDBComboBox::mapFromParentToGlobal(const TQPoint& pos) const { // const KexiFormScrollView* view = KexiUtils::findParentConst<const KexiFormScrollView>(this, "KexiFormScrollView"); - if (!tqparentWidget()) + if (!parentWidget()) return TQPoint(-1,-1); - return tqparentWidget()->mapToGlobal(pos); + return parentWidget()->mapToGlobal(pos); // return view->viewport()->mapToGlobal(pos); } diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp index 8c9534d2..cca955e5 100644 --- a/kexi/plugins/forms/widgets/kexidbform.cpp +++ b/kexi/plugins/forms/widgets/kexidbform.cpp @@ -210,10 +210,10 @@ void KexiDBForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &point) { TQPoint fromPoint, toPoint; - if(from && from->tqparentWidget() && (from != this)) - fromPoint = from->tqparentWidget()->mapTo(this, from->pos()); - if(to && to->tqparentWidget() && (to != this)) - toPoint = to->tqparentWidget()->mapTo(this, to->pos()); + if(from && from->parentWidget() && (from != this)) + fromPoint = from->parentWidget()->mapTo(this, from->pos()); + if(to && to->parentWidget() && (to != this)) + toPoint = to->parentWidget()->mapTo(this, to->pos()); TQPainter p; p.tqbegin(TQT_TQPAINTDEVICE(this), true); @@ -234,7 +234,7 @@ KexiDBForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &poi TQPixmap pix2 = TQPixmap::grabWidget(to); if((from != this) && (to != this)) - p.drawLine( from->tqparentWidget()->mapTo(this, from->tqgeometry().center()), to->tqparentWidget()->mapTo(this, to->tqgeometry().center()) ); + p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) ); p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1); p.drawPixmap(toPoint.x(), toPoint.y(), pix2); @@ -425,7 +425,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) while (dataItemIface) { if (dataItemIface->keyPressed(ke)) return false; - dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(dataItemIface->tqparentInterface()); //try in tqparent, e.g. in combobox + dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(dataItemIface->parentInterface()); //try in tqparent, e.g. in combobox } break; } @@ -491,13 +491,13 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) if (tab || backtab) { //the watched widget can be a subwidget of a real widget, e.g. a drop down button of image box: find it while (!KexiFormPart::library()->widgetInfoForClassName(realWidget->className())) - realWidget = realWidget->tqparentWidget(); + realWidget = realWidget->parentWidget(); if (!realWidget) return true; //ignore //the watched widget can be a subwidget of a real widget, e.g. autofield: find it //TQWidget* realWidget = TQT_TQWIDGET(watched); - while (dynamic_cast<KexiDataItemInterface*>(realWidget) && dynamic_cast<KexiDataItemInterface*>(realWidget)->tqparentInterface()) - realWidget = dynamic_cast<TQWidget*>( dynamic_cast<KexiDataItemInterface*>(realWidget)->tqparentInterface() ); + while (dynamic_cast<KexiDataItemInterface*>(realWidget) && dynamic_cast<KexiDataItemInterface*>(realWidget)->parentInterface()) + realWidget = dynamic_cast<TQWidget*>( dynamic_cast<KexiDataItemInterface*>(realWidget)->parentInterface() ); d->setOrderedFocusWidgetsIteratorTo( realWidget ); kexipluginsdbg << realWidget->name() << endl; @@ -585,7 +585,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) TQWidget *dataItem = dynamic_cast<TQWidget*>(watched); while (dataItem) { while (dataItem && !dynamic_cast<KexiDataItemInterface*>(dataItem)) - dataItem = dataItem->tqparentWidget(); + dataItem = dataItem->parentWidget(); if (!dataItem) break; kexipluginsdbg << "KexiDBForm: FocusIn: FOUND " << dataItem->className() << " " << dataItem->name() << endl; @@ -600,7 +600,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) break; } else - dataItem = dataItem->tqparentWidget(); + dataItem = dataItem->parentWidget(); dataItem->update(); } diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index 5f2f20e3..0e79fada 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -608,9 +608,9 @@ void KexiDBImageBox::setDataSource( const TQString &ds ) if (!m_lineWidthChanged) { KexiFrame::setLineWidth( ds.isEmpty() ? 0 : 1 ); } - if (!m_paletteBackgroundColorChanged && tqparentWidget()) { + if (!m_paletteBackgroundColorChanged && parentWidget()) { KexiFrame::setPaletteBackgroundColor( - dataSource().isEmpty() ? tqparentWidget()->paletteBackgroundColor() : tqpalette().active().base() ); + dataSource().isEmpty() ? parentWidget()->paletteBackgroundColor() : tqpalette().active().base() ); } } diff --git a/kexi/plugins/forms/widgets/kexidblineedit.h b/kexi/plugins/forms/widgets/kexidblineedit.h index 4457a8d0..92a87280 100644 --- a/kexi/plugins/forms/widgets/kexidblineedit.h +++ b/kexi/plugins/forms/widgets/kexidblineedit.h @@ -38,7 +38,7 @@ void setLighterGrayBackgroundColor(TQWidget* widget); //! @short Line edit widget for Kexi forms /*! Handles many data types. User input is validated by using validators - and/or input tqmasks. + and/or input masks. */ class KEXIFORMUTILS_EXPORT KexiDBLineEdit : public KLineEdit, diff --git a/kexi/plugins/forms/widgets/kexidbsubform.cpp b/kexi/plugins/forms/widgets/kexidbsubform.cpp index 8cb4f795..6fcd851a 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 *tqparentForm, TQWidget *tqparent, const char *name) -: TQScrollView(tqparent, name), m_parentForm(tqparentForm), m_form(0), m_widget(0) +KexiDBSubForm::KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *tqparent, const char *name) +: TQScrollView(tqparent, name), m_parentForm(parentForm), m_form(0), m_widget(0) { setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); viewport()->setPaletteBackgroundColor(tqcolorGroup().mid()); @@ -74,7 +74,7 @@ KexiDBSubForm::setFormName(const TQString &name) return; } - TQWidget *pw = tqparentWidget(); + TQWidget *pw = parentWidget(); KexiFormView *view = 0; TQStringList list; while(pw) { @@ -87,18 +87,18 @@ KexiDBSubForm::setFormName(const TQString &name) } else if(! view && pw->isA("KexiFormView")) view = static_cast<KexiFormView*>(pw); // we need a KexiFormView* - pw = pw->tqparentWidget(); + pw = pw->parentWidget(); } - if (!view || !view->tqparentDialog() || !view->tqparentDialog()->mainWin() - || !view->tqparentDialog()->mainWin()->project()->dbConnection()) + if (!view || !view->parentDialog() || !view->parentDialog()->mainWin() + || !view->parentDialog()->mainWin()->project()->dbConnection()) return; - KexiDB::Connection *conn = view->tqparentDialog()->mainWin()->project()->dbConnection(); + KexiDB::Connection *conn = view->parentDialog()->mainWin()->project()->dbConnection(); // we check if there is a form with this name int id = KexiDB::idForObjectName(*conn, name, KexiPart::FormObjectType); - if((id == 0) || (id == view->tqparentDialog()->id())) // == our form + if((id == 0) || (id == view->parentDialog()->id())) // == our form return; // because of recursion when loading // we create the container widget diff --git a/kexi/plugins/forms/widgets/kexidbsubform.h b/kexi/plugins/forms/widgets/kexidbsubform.h index ea2bdbd3..cbbc6250 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 *tqparentForm, TQWidget *tqparent, const char *name); + KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *tqparent, const char *name); ~KexiDBSubForm() {} //! \return the name of the subform to display inside this widget |