Replace 'Event' #define strings

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

4 files changed, 11 insertions, 11 deletions

diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index 088d0a48..5fb89443 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -338,7 +338,7 @@ bool KexiDBComboBox::eventFilter( TQObject *o, TQEvent *e )
 		}
 		else if (e->type()==TQEvent::Enter) {
 			if (!d->isEditable 
-				|| /*over button if editable combo*/buttonGeometry().contains( TQT_TQMOUSEEVENT(e)->pos() )) 
+				|| /*over button if editable combo*/buttonGeometry().contains( static_cast<TQMouseEvent*>(e)->pos() )) 
 			{
 				d->mouseOver = true;
 				update();
@@ -346,7 +346,7 @@ bool KexiDBComboBox::eventFilter( TQObject *o, TQEvent *e )
 		}
 		else if (e->type()==TQEvent::MouseMove) {
 			if (d->isEditable) {
-				const bool overButton = buttonGeometry().contains( TQT_TQMOUSEEVENT(e)->pos() );
+				const bool overButton = buttonGeometry().contains( static_cast<TQMouseEvent*>(e)->pos() );
 				if (overButton != d->mouseOver) {
 					d->mouseOver = overButton;
 					update();
@@ -359,7 +359,7 @@ bool KexiDBComboBox::eventFilter( TQObject *o, TQEvent *e )
 		}
 		else if (e->type()==TQEvent::KeyPress) {
 			// handle F2/F4
-			if (handleKeyPressEvent(TQT_TQKEYEVENT(e)))
+			if (handleKeyPressEvent(static_cast<TQKeyEvent*>(e)))
 				return true;
 		}
 		else if (e->type()==TQEvent::FocusOut) {
@@ -372,11 +372,11 @@ bool KexiDBComboBox::eventFilter( TQObject *o, TQEvent *e )
 	else if (!d->isEditable && d->subWidgetsWithDisabledEvents && d->subWidgetsWithDisabledEvents->find(o)) {
 		if (e->type()==TQEvent::MouseButtonPress) {
 			// clicking the subwidget should mean the same as clicking the combo box (i.e. show the popup)
-			if (handleMousePressEvent(TQT_TQMOUSEEVENT(e)))
+			if (handleMousePressEvent(static_cast<TQMouseEvent*>(e)))
 				return true;
 		}
 		else if (e->type()==TQEvent::KeyPress) {
-			if (handleKeyPressEvent(TQT_TQKEYEVENT(e)))
+			if (handleKeyPressEvent(static_cast<TQKeyEvent*>(e)))
 				return true;
 		}
 		return e->type()!=TQEvent::Paint;
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index 0fb4519e..81ce6684 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -394,7 +394,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 		kexipluginsdbg << "RESIZE" << endl;
 	if (e->type()==TQEvent::KeyPress) {
 		if (preview()) {
-			TQKeyEvent *ke = TQT_TQKEYEVENT(e);
+			TQKeyEvent *ke = static_cast<TQKeyEvent*>(e);
 			const int key = ke->key();
 			bool tab = ke->state() == TQt::NoButton && key == TQt::Key_Tab;
 			bool backtab = ((ke->state() == TQt::NoButton || ke->state() == TQt::ShiftButton) && key == TQt::Key_Backtab)
@@ -569,7 +569,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 	}
 	else if (e->type()==TQEvent::FocusIn) {
 		bool focusDataWidget = preview();
-		if (TQT_TQFOCUSEVENT(e)->reason()==TQFocusEvent::Popup) {
+		if (static_cast<TQFocusEvent*>(e)->reason()==TQFocusEvent::Popup) {
 			kdDebug() << "->>> focus IN, popup" <<endl;
 			focusDataWidget = !d->popupFocused;
 			d->popupFocused = false;
@@ -608,7 +608,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 		}
 	}
 	else if (e->type()==TQEvent::FocusOut) {
-		if (TQT_TQFOCUSEVENT(e)->reason()==TQFocusEvent::Popup) {
+		if (static_cast<TQFocusEvent*>(e)->reason()==TQFocusEvent::Popup) {
 			//d->widgetFocusedBeforePopup = (TQWidget*)watched;
 			d->popupFocused = true;
 		}
@@ -616,7 +616,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 			d->popupFocused = false;
 //			d->widgetFocusedBeforePopup = 0;
 //		kdDebug() << "e->type()==TQEvent::FocusOut " << watched->className() << " " <<watched->name() << endl;
-//		UNSET_FOCUS_USING_REASON(watched, TQT_TQFOCUSEVENT(e)->reason());
+//		UNSET_FOCUS_USING_REASON(watched, static_cast<TQFocusEvent*>(e)->reason());
 	}
 	return KexiDBFormBase::eventFilter(watched, e);
 }
diff --git a/kexi/plugins/forms/widgets/kexidblineedit.cpp b/kexi/plugins/forms/widgets/kexidblineedit.cpp
index 5d1fadf6..5e2ac08a 100644
--- a/kexi/plugins/forms/widgets/kexidblineedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidblineedit.cpp
@@ -346,7 +346,7 @@ bool KexiDBLineEdit::event( TQEvent * e )
 	const bool ret = KLineEdit::event( e );
 	KexiDBTextWidgetInterface::event(e, this, text().isEmpty());
 	if (e->type()==TQEvent::FocusOut) {
-		TQFocusEvent *fe = TQT_TQFOCUSEVENT(e);
+		TQFocusEvent *fe = static_cast<TQFocusEvent*>(e);
 //		if (fe->reason()!=TQFocusEvent::ActiveWindow && fe->reason()!=TQFocusEvent::Popup) {
 		if (fe->reason()==TQFocusEvent::Tab || fe->reason()==TQFocusEvent::Backtab) {
 		//display aligned to left after loosing the focus (only if this is tab/backtab event)
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index daf536c5..9c9c5f22 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -1630,7 +1630,7 @@ bool KexiCSVImportDialog::eventFilter ( TQObject * watched, TQEvent * e )
 		return true;
 
 	if (watched == m_startAtLineSpinBox && t==TQEvent::KeyPress) {
-		TQKeyEvent *ke = TQT_TQKEYEVENT(e);
+		TQKeyEvent *ke = static_cast<TQKeyEvent*>(e);
 		if (ke->key()==TQt::Key_Enter || ke->key()==TQt::Key_Return) {
 			m_table->setFocus();
 			return true;