diff options
Diffstat (limited to 'kexi/plugins/forms/kexidataprovider.cpp')
| -rw-r--r-- | kexi/plugins/forms/kexidataprovider.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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; |