Remove additional unneeded tq method conversions

11 files changed, 52 insertions, 52 deletions

diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp
index 939d9b91..3a8e8453 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.cpp
+++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp
@@ -232,7 +232,7 @@ KexiDBAutoField::setLabelPosition(LabelPosition position)
 		m_subwidget->show();
 	//! \todo support right-to-left tqlayout where positions are inverted
 	if (position==Top || position==Left) {
-		int align = d->label->tqalignment();
+		int align = d->label->alignment();
 		if(position == Top) {
 			d->tqlayout = (TQBoxLayout*) new TQVBoxLayout(this);
 			align |= AlignVertical_Mask;
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index 231003cf..db56b550 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -62,7 +62,7 @@ class KexiDBComboBox::Private
 	TQSize sizeHint; //!< A cache for KexiDBComboBox::sizeHint(), 
 	                //!< rebuilt by KexiDBComboBox::fontChange() and KexiDBComboBox::styleChange()
 	KexiDB::QueryColumnInfo* visibleColumnInfo;
-	TQPtrDict<char> *subWidgetsWithDisabledEvents; //! used to collect subwidget and its tqchildren (if isEditable is false)
+	TQPtrDict<char> *subWidgetsWithDisabledEvents; //! used to collect subwidget and its children (if isEditable is false)
 	bool isEditable : 1; //!< true is the combo box is editable
 	bool buttonPressed : 1;
 	bool mouseOver : 1;
@@ -259,7 +259,7 @@ bool KexiDBComboBox::handleMousePressEvent(TQMouseEvent *e)
 	    if ( arrowRect.contains( e->pos() ) ) {
 		d->arrowPressed = TRUE;
 		d->arrowDown    = TRUE;
-		tqrepaint( FALSE );
+		repaint( FALSE );
 	    }
 	} else {*/
 		showPopup();
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.h b/kexi/plugins/forms/widgets/kexidbcombobox.h
index dec6da1d..60ed78d1 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.h
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.h
@@ -111,7 +111,7 @@ class KEXIFORMUTILS_EXPORT KexiDBComboBox :
 
 		virtual bool eventFilter( TQObject *o, TQEvent *e );
 
-		//! \return internal editor's tqgeometry
+		//! \return internal editor's geometry
 		TQRect editorGeometry() const;
 
 		//! Creates editor. Reimplemented, because if the combo box is not editable, 
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index bcf28a58..17242953 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -125,13 +125,13 @@ KexiDBForm::~KexiDBForm()
 
 KexiDataAwareObjectInterface* KexiDBForm::dataAwareObject() const { return d->dataAwareObject; }
 
-//tqrepaint all tqchildren widgets
+//repaint all children widgets
 static void repaintAll(TQWidget *w)
 {
 	TQObjectList *list = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
 	TQObjectListIt it(*list);
 	for (TQObject *obj; (obj=it.current()); ++it ) {
-		TQT_TQWIDGET(obj)->tqrepaint();
+		TQT_TQWIDGET(obj)->repaint();
 	}
 	delete list;
 }
@@ -148,7 +148,7 @@ void
 KexiDBForm::drawRects(const TQValueList<TQRect> &list, int type)
 {
 	TQPainter p;
-	p.tqbegin(TQT_TQPAINTDEVICE(this), true);
+	p.begin(TQT_TQPAINTDEVICE(this), true);
 	bool unclipped = testWFlags( WPaintUnclipped );
 	setWFlags( WPaintUnclipped );
 
@@ -192,7 +192,7 @@ void
 KexiDBForm::clearForm()
 {
 	TQPainter p;
-	p.tqbegin(TQT_TQPAINTDEVICE(this), true);
+	p.begin(TQT_TQPAINTDEVICE(this), true);
 	bool unclipped = testWFlags( WPaintUnclipped );
 	setWFlags( WPaintUnclipped );
 
@@ -216,7 +216,7 @@ KexiDBForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &poi
 		toPoint = to->parentWidget()->mapTo(this, to->pos());
 
 	TQPainter p;
-	p.tqbegin(TQT_TQPAINTDEVICE(this), true);
+	p.begin(TQT_TQPAINTDEVICE(this), true);
 	bool unclipped = testWFlags( WPaintUnclipped );
 	setWFlags( WPaintUnclipped );
 
@@ -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->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->geometry().center()), to->parentWidget()->mapTo(this, to->geometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
@@ -313,18 +313,18 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form)
 			if (it.current()->widget()->focusPolicy() & TQ_TabFocus) {
 				//this widget has tab focus:
 				it.current()->widget()->installEventFilter(this);
-				//also filter events for data-aware tqchildren of this widget (i.e. KexiDBAutoField's editors)
-				TQObjectList *tqchildren = it.current()->widget()->queryList(TQWIDGET_OBJECT_NAME_STRING);
-				for (TQObjectListIt tqchildrenIt(*tqchildren); tqchildrenIt.current(); ++tqchildrenIt) {
-	//				if (dynamic_cast<KexiFormDataItemInterface*>(tqchildrenIt.current())) {
+				//also filter events for data-aware children of this widget (i.e. KexiDBAutoField's editors)
+				TQObjectList *children = it.current()->widget()->queryList(TQWIDGET_OBJECT_NAME_STRING);
+				for (TQObjectListIt childrenIt(*children); childrenIt.current(); ++childrenIt) {
+	//				if (dynamic_cast<KexiFormDataItemInterface*>(childrenIt.current())) {
 						kexipluginsdbg << "KexiDBForm::updateTabStopsOrder(): also adding '" 
-							<< tqchildrenIt.current()->className() << " " << tqchildrenIt.current()->name()  
+							<< childrenIt.current()->className() << " " << childrenIt.current()->name()  
 							<< "' child to filtered widgets" << endl;
-						//it.current()->widget()->installEventFilter(TQT_TQWIDGET(tqchildrenIt.current()));
-						tqchildrenIt.current()->installEventFilter(this);
+						//it.current()->widget()->installEventFilter(TQT_TQWIDGET(childrenIt.current()));
+						childrenIt.current()->installEventFilter(this);
 		//			}
 				}
-				delete tqchildren;
+				delete children;
 				if (fromWidget) {
 					kexipluginsdbg << "KexiDBForm::updateTabStopsOrder() tab order: " << fromWidget->name() 
 						<< " -> " << it.current()->widget()->name() << endl;
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index 3ff18406..5b8b2939 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -67,7 +67,7 @@ static TQPixmap* KexiDBImageBox_pmSmall = 0;
 KexiDBImageBox::KexiDBImageBox( bool designMode, TQWidget *parent, const char *name )
 	: KexiFrame( parent, name, TQt::WNoAutoErase )
 	, KexiFormDataItemInterface()
-	, m_tqalignment(TQt::AlignAuto|TQt::AlignTop)
+	, m_alignment(TQt::AlignAuto|TQt::AlignTop)
 	, m_designMode(designMode)
 	, m_readOnly(false)
 	, m_scaledContents(false)
@@ -176,7 +176,7 @@ void KexiDBImageBox::setValueInternal( const TQVariant& add, bool removeOld, boo
 		m_valueMimeType = TQString();
 		m_pixmap = TQPixmap();
 	}
-	tqrepaint();
+	repaint();
 }
 
 void KexiDBImageBox::setInvalidState( const TQString& displayText )
@@ -242,7 +242,7 @@ void KexiDBImageBox::setPixmapId(uint id)
 	if (m_insideSetData) //avoid recursion
 		return;
 	setData(KexiBLOBBuffer::self()->objectForId( id, /*unstored*/false ));
-	tqrepaint();
+	repaint();
 }
 
 uint KexiDBImageBox::storedPixmapId() const
@@ -257,7 +257,7 @@ uint KexiDBImageBox::storedPixmapId() const
 void KexiDBImageBox::setStoredPixmapId(uint id)
 {
 	setData(KexiBLOBBuffer::self()->objectForId( id, /*stored*/true ));
-	tqrepaint();
+	repaint();
 }
 
 bool KexiDBImageBox::hasScaledContents() const
@@ -276,14 +276,14 @@ void KexiDBImageBox::setScaledContents(bool set)
 {
 //todo	m_pixmapLabel->setScaledContents(set);
 	m_scaledContents = set;
-	tqrepaint();
+	repaint();
 }
 
 void KexiDBImageBox::setKeepAspectRatio(bool set)
 {
 	m_keepAspectRatio = set;
 	if (m_scaledContents)
-		tqrepaint();
+		repaint();
 }
 
 TQWidget* KexiDBImageBox::widget()
@@ -331,7 +331,7 @@ void KexiDBImageBox::handleInsertFromFileAction(const KURL& url)
 		if (!h)
 			return;
 		setData(h);
-		tqrepaint();
+		repaint();
 	}
 	else {
 		//db-aware
@@ -429,7 +429,7 @@ void KexiDBImageBox::handlePasteAction()
 		}
 	}
 	
-	tqrepaint();
+	repaint();
 	if (!dataSource().isEmpty()) {
 //		emit pixmapChanged();
 		signalValueChanged();
@@ -455,7 +455,7 @@ void KexiDBImageBox::clear()
 	//! @todo emit signal for setting "dirty" flag within the design
 
 //	m_pixmap = TQPixmap(); //will be loaded on demand
-	tqrepaint();
+	repaint();
 	if (!dataSource().isEmpty()) {
 //		emit pixmapChanged();//valueChanged(data());
 		signalValueChanged();
@@ -573,7 +573,7 @@ void KexiDBImageBox::updateActionStrings()
 				 (see doc/dev/settings.txt) */
 				beautifiedImageBoxName = beautifiedImageBoxName[0].upper() + beautifiedImageBoxName.mid(1);
 			}
-			TQToolTip::add(m_chooser, i18n("Click to show actions for \"%1\" image box").tqarg(beautifiedImageBoxName));
+			TQToolTip::add(m_chooser, i18n("Click to show actions for \"%1\" image box").arg(beautifiedImageBoxName));
 		}
 	}
 }
@@ -640,7 +640,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe )
 	if (m_designMode && pixmap().isNull()) {
 		TQPixmap pm(size()-TQSize(m, m));
 		TQPainter p2;
-		p2.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
+		p2.begin(TQT_TQPAINTDEVICE(&pm), this);
 		p2.fillRect(0,0,width(),height(), bg);
 
 		updatePixmap();
@@ -678,7 +678,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe )
 		//clearing needed here because we may need to draw a pixmap with transparency
 		p.fillRect(0,0,width(),height(), bg);
 
-		KexiUtils::drawPixmap( p, m, TQRect(TQPoint(0,0), internalSize), pixmap(), m_tqalignment, 
+		KexiUtils::drawPixmap( p, m, TQRect(TQPoint(0,0), internalSize), pixmap(), m_alignment, 
 			m_scaledContents, m_keepAspectRatio );
 	}
 	KexiFrame::drawFrame( &p );
@@ -697,7 +697,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe )
 	if (oldPalette.active().background()!=palette().active().background()) {
 		delete KexiDBImageBox_pm;
 		KexiDBImageBox_pm = 0;
-		tqrepaint();
+		repaint();
 	}
 }*/
 
@@ -715,11 +715,11 @@ void KexiDBImageBox::updatePixmap()
 	}
 }
 
-void KexiDBImageBox::setAlignment(int tqalignment)
+void KexiDBImageBox::setAlignment(int alignment)
 {
-	m_tqalignment = tqalignment;
+	m_alignment = alignment;
 	if (!m_scaledContents || m_keepAspectRatio)
-		tqrepaint();
+		repaint();
 }
 
 void KexiDBImageBox::setData(const KexiBLOBBuffer::Handle& handle)
@@ -839,7 +839,7 @@ bool KexiDBImageBox::eventFilter( TQObject * watched, TQEvent * e )
 {
 	if (TQT_BASE_OBJECT(watched)==TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(watched)==TQT_BASE_OBJECT(m_chooser)) { //we're watching chooser as well because it's a focus proxy even if invisible
 		if (e->type()==TQEvent::FocusIn || e->type()==TQEvent::FocusOut || e->type()==TQEvent::MouseButtonPress) {
-			update(); //to tqrepaint focus rect
+			update(); //to repaint focus rect
 		}
 	}
 	// hide popup menu as soon as it loses focus
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.h b/kexi/plugins/forms/widgets/kexidbimagebox.h
index a7adb3c8..860ee4c6 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.h
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.h
@@ -48,7 +48,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox :
 	TQ_PROPERTY( uint storedPixmapId READ storedPixmapId WRITE setStoredPixmapId DESIGNABLE false STORED true )
 	TQ_PROPERTY( bool scaledContents READ hasScaledContents WRITE setScaledContents )
 	TQ_PROPERTY( bool keepAspectRatio READ keepAspectRatio WRITE setKeepAspectRatio )
-	TQ_PROPERTY( int tqalignment READ tqalignment WRITE setAlignment )
+	TQ_PROPERTY( int alignment READ alignment WRITE setAlignment )
 //	TQ_PROPERTY( TQString originalFileName READ originalFileName WRITE setOriginalFileName DESIGNABLE false )
 //	TQ_OVERRIDE( FocusPolicy focusPolicy READ focusPolicy WRITE setFocusPolicy )
 	TQ_PROPERTY( bool dropDownButtonVisible READ dropDownButtonVisible WRITE setDropDownButtonVisible )
@@ -95,7 +95,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox :
 
 //		bool designMode() const { return m_designMode; }
 
-		int tqalignment() const { return m_tqalignment; }
+		int alignment() const { return m_alignment; }
 
 		bool keepAspectRatio() const { return m_keepAspectRatio; }
 
@@ -158,7 +158,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox :
 
 		void setScaledContents(bool set);
 
-		void setAlignment(int tqalignment);
+		void setAlignment(int alignment);
 
 		void setKeepAspectRatio(bool set);
 
@@ -258,7 +258,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox :
 //moved		KAction *m_insertFromFileAction, *m_saveAsAction, *m_cutAction, *m_copyAction, *m_pasteAction,
 //			*m_deleteAction, *m_propertiesAction;
 //		TQTimer m_clickTimer;
-		int m_tqalignment;
+		int m_alignment;
 		TQ_FocusPolicy m_focusPolicyInternal; //!< Used for focusPolicyInternal()
 		bool m_designMode : 1;
 		bool m_readOnly : 1;
diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp
index 2f653f00..adb833fa 100644
--- a/kexi/plugins/forms/widgets/kexidblabel.cpp
+++ b/kexi/plugins/forms/widgets/kexidblabel.cpp
@@ -63,7 +63,7 @@ KexiDBInternalLabel::KexiDBInternalLabel( KexiDBLabel* parent )
 	: TQLabel( parent )
 	, m_parentLabel(parent)
 {
-	int a = tqalignment() | TQt::WordBreak;
+	int a = alignment() | TQt::WordBreak;
 	a &= (0xffffff ^ TQt::AlignVertical_Mask);
 	a |= TQt::AlignTop;
 	setAlignment( a );
@@ -426,7 +426,7 @@ void KexiDBLabel::init()
 	d->internalLabel->hide();
 	d->frameColor = tqpalette().active().foreground();
 
-	setAlignment( d->internalLabel->tqalignment() );
+	setAlignment( d->internalLabel->alignment() );
 }
 
 void KexiDBLabel::updatePixmapLater() {
@@ -453,7 +453,7 @@ void KexiDBLabel::updatePixmap() {
 	d->internalLabel->setText( text() );
 	d->internalLabel->setFixedSize( size() );
 	d->internalLabel->setPalette( palette() );
-	d->internalLabel->setAlignment( tqalignment() );
+	d->internalLabel->setAlignment( alignment() );
 //	d->shadowPixmap = KPixmap(); //parallel repaints won't hurt us cause incomplete pixmap
 	KPixmap shadowPixmap = d->internalLabel->getShadowPixmap();
 	if (shadowPixmap.isNull())
@@ -461,7 +461,7 @@ void KexiDBLabel::updatePixmap() {
 	d->shadowPixmap = shadowPixmap;
 	d->shadowPosition = d->internalLabel->m_shadowRect.topLeft();
 	d->pixmapDirty = false;
-	tqrepaint();
+	repaint();
 }
 
 void KexiDBLabel::paintEvent( TQPaintEvent* e )
@@ -491,7 +491,7 @@ void KexiDBLabel::paintEvent( TQPaintEvent* e )
 			p.drawPixmap( d->internalLabel->m_shadowRect.topLeft(), d->shadowPixmap, clipRect );
 		}
 	}
-	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), tqalignment(), false );
+	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), alignment(), false );
 	TQLabel::paintEvent( e );
 }
 
@@ -577,7 +577,7 @@ void KexiDBLabel::setShadowEnabled( bool state ) {
 	d->pixmapDirty = true;
 	if (state)
 		d->internalLabel->updateFrame();
-	tqrepaint();
+	repaint();
 }
 
 void KexiDBLabel::resizeEvent( TQResizeEvent* e ) {
@@ -636,7 +636,7 @@ void KexiDBLabel::setText( const TQString& text ) {
 	TQLabel::setText( text );
 	//This is necessary for KexiFormDataItemInterface
 	valueChanged();
-	tqrepaint();
+	repaint();
 }
 
 bool KexiDBLabel::shadowEnabled() const
diff --git a/kexi/plugins/forms/widgets/kexidblineedit.cpp b/kexi/plugins/forms/widgets/kexidblineedit.cpp
index 5bb74e22..815adca9 100644
--- a/kexi/plugins/forms/widgets/kexidblineedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidblineedit.cpp
@@ -331,14 +331,14 @@ void KexiDBLineEdit::setColumnInfo(KexiDB::QueryColumnInfo* cinfo)
 /*todo
 void KexiDBLineEdit::paint( TQPainter *p )
 {
-	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), tqalignment(), hasFocus() );
+	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), alignment(), hasFocus() );
 }*/
 
 void KexiDBLineEdit::paintEvent ( TQPaintEvent *pe )
 {
 	KLineEdit::paintEvent( pe );
 	TQPainter p(this);
-	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), tqalignment(), hasFocus() );
+	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), alignment(), hasFocus() );
 }
 
 bool KexiDBLineEdit::event( TQEvent * e )
diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
index c4cbe4d0..b6ab6b03 100644
--- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
@@ -145,7 +145,7 @@ void KexiDBTextEdit::paintEvent ( TQPaintEvent *pe )
 {
 	KTextEdit::paintEvent( pe );
 	TQPainter p(this);
-	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), tqalignment(), hasFocus() );
+	KexiDBTextWidgetInterface::paint( this, &p, text().isEmpty(), alignment(), hasFocus() );
 }
 
 TQPopupMenu * KexiDBTextEdit::createPopupMenu(const TQPoint & pos)
diff --git a/kexi/plugins/forms/widgets/kexiframe.h b/kexi/plugins/forms/widgets/kexiframe.h
index 2f6ca562..ce51766c 100644
--- a/kexi/plugins/forms/widgets/kexiframe.h
+++ b/kexi/plugins/forms/widgets/kexiframe.h
@@ -53,7 +53,7 @@ class KEXIFORMUTILS_EXPORT KexiFrame : public TQFrame
 			GroupBoxPanel = TQFrame::GroupBoxPanel //!< rectangular group-box-like panel depending on the GUI style
 		};
 		Shape frameShape() const;
-		void setFrameShape( KexiFrame::Shape tqshape );
+		void setFrameShape( KexiFrame::Shape shape );
 		Shadow frameShadow() const;
 		void setFrameShadow( KexiFrame::Shadow shadow );
 #endif
diff --git a/kexi/plugins/forms/widgets/kexiframeutils_p.cpp b/kexi/plugins/forms/widgets/kexiframeutils_p.cpp
index 7adfbaa8..22a71001 100644
--- a/kexi/plugins/forms/widgets/kexiframeutils_p.cpp
+++ b/kexi/plugins/forms/widgets/kexiframeutils_p.cpp
@@ -69,9 +69,9 @@ ClassName::Shape ClassName::frameShape() const
 	return d->frameShape;
 }
 
-void ClassName::setFrameShape( ClassName::Shape tqshape )
+void ClassName::setFrameShape( ClassName::Shape shape )
 {
-	d->frameShape = tqshape;
+	d->frameShape = shape;
 	update();
 }