Rename old tq methods that no longer need a unique name

1 files changed, 10 insertions, 10 deletions

diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp
index 01ec080f..3b7968de 100644
--- a/kexi/plugins/forms/kexiformview.cpp
+++ b/kexi/plugins/forms/kexiformview.cpp
@@ -345,8 +345,8 @@ void KexiFormView::updateValuesForSubproperties()
 				kexipluginsdbg << "KexiFormView::loadForm(): delayed setting of the subproperty: widget="
 					<< it.current()->widget()->name() << " prop=" << subpropIt.key() << " val=" << subpropIt.data() << endl;
 
-				const int count = subwidget->tqmetaObject()->findProperty(subpropIt.key().latin1(), true);
-				const TQMetaProperty *meta = count!=-1 ? subwidget->tqmetaObject()->property(count, true) : 0;
+				const int count = subwidget->metaObject()->findProperty(subpropIt.key().latin1(), true);
+				const TQMetaProperty *meta = count!=-1 ? subwidget->metaObject()->property(count, true) : 0;
 				if (meta) {
 					// Special case: the property value of type enum (set) but is saved as a string list,
 					// not as int, so we need to translate it to int. It's been created as such
@@ -371,7 +371,7 @@ void KexiFormView::updateValuesForSubproperties()
 static void setUnsavedBLOBIdsForDataViewMode( 
 	TQWidget* widget, const TQMap<TQCString, KexiBLOBBuffer::Id_t>& unsavedLocalBLOBsByName)
 {
-	if (-1 != widget->tqmetaObject()->findProperty("pixmapId")) {
+	if (-1 != widget->metaObject()->findProperty("pixmapId")) {
 		const KexiBLOBBuffer::Id_t blobID = unsavedLocalBLOBsByName[ widget->name() ];
 		if (blobID > 0)
 			widget->setProperty("pixmapId", (uint /* KexiBLOBBuffer::Id_t is unsafe and unsupported by TQVariant - will be fixed in TQt4*/)blobID);
@@ -525,9 +525,9 @@ KexiFormView::afterSwitchFrom(int mode)
 
 		//set focus on 1st focusable widget which has valid dataSource property set
 		if (!m_dbform->orderedFocusWidgets()->isEmpty()) {
-//			TQWidget *www = tqfocusWidget();
-			//if (Kexi::hasParent(this, tqApp->tqfocusWidget())) {
-				KexiUtils::unsetFocusWithReason(tqApp->tqfocusWidget(), TQFocusEvent::Tab);
+//			TQWidget *www = focusWidget();
+			//if (Kexi::hasParent(this, tqApp->focusWidget())) {
+				KexiUtils::unsetFocusWithReason(tqApp->focusWidget(), TQFocusEvent::Tab);
 			//}
 
 			TQPtrListIterator<TQWidget> it(*m_dbform->orderedFocusWidgets());
@@ -999,14 +999,14 @@ void
 KexiFormView::setFocusInternal()
 {
 	if (viewMode() == Kexi::DataViewMode) {
-		if (m_dbform->tqfocusWidget()) {
+		if (m_dbform->focusWidget()) {
 			//better-looking focus
 			if (m_setFocusInternalOnce) {
 				KexiUtils::setFocusWithReason(m_setFocusInternalOnce, TQFocusEvent::Other);//Tab);
 				m_setFocusInternalOnce = 0;
 			}
 			else {
-				//ok? SET_FOCUS_USING_REASON(m_dbform->tqfocusWidget(), TQFocusEvent::Other);//Tab);
+				//ok? SET_FOCUS_USING_REASON(m_dbform->focusWidget(), TQFocusEvent::Other);//Tab);
 			}
 			return;
 		}
@@ -1173,8 +1173,8 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s
 //		newWidget->setDataSource(column->aliasOrName());
 //		newWidget->setFieldTypeInternal((int)column->field->type());
 //		newWidget->setFieldCaptionInternal(column->captionOrAliasOrName());
-		//resize again because autofield's type changed what can lead to changed tqsizeHint() 
-//		newWidget->resize(newWidget->tqsizeHint());
+		//resize again because autofield's type changed what can lead to changed sizeHint() 
+//		newWidget->resize(newWidget->sizeHint());
 		KFormDesigner::WidgetList list;
 		list.append(newWidget);
 		KFormDesigner::AdjustSizeCommand *adjustCommand