Replace 'Event' #define strings

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit d7ae9fb514226c126e04cfe4f34800beb9f4ea19)

4 files changed, 13 insertions, 13 deletions

diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index 1c313ba29..0920928bd 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -3408,18 +3408,18 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 {
 	//KexiVDebug << "eventFilter: " <<e->type() << " " <<obj->name()<<endl;
 	if (e->type()==TQEvent::KeyPress) {
-		KexiVDebug << "KEY EVENT " << TQString::number(TQT_TQKEYEVENT(e)->key(), 16) << endl;
+		KexiVDebug << "KEY EVENT " << TQString::number(static_cast<TQKeyEvent*>(e)->key(), 16) << endl;
 		KexiVDebug << endl;
 	}
 	if (e->type()==TQEvent::AccelOverride) {
-		//KexiVDebug << "AccelOverride EVENT " << TQT_TQKEYEVENT(e)->key() << " " << TQT_TQKEYEVENT(e)->state() == ControlButton << endl;
+		//KexiVDebug << "AccelOverride EVENT " << static_cast<TQKeyEvent*>(e)->key() << " " << static_cast<TQKeyEvent*>(e)->state() == ControlButton << endl;
 
 		//avoid sending CTRL+Tab key twice for tabbed/ideal mode, epecially for win32
-		if (TQT_TQKEYEVENT(e)->key()==TQt::Key_Tab && TQT_TQKEYEVENT(e)->state() == ControlButton) {
+		if (static_cast<TQKeyEvent*>(e)->key()==TQt::Key_Tab && static_cast<TQKeyEvent*>(e)->state() == ControlButton) {
 			if (d->action_window_next->shortcut().keyCodeQt()==TQt::Key_Tab+TQt::CTRL && d->action_window_next->shortcut().count()==1
 				&& (mdiMode()==KMdi::TabPageMode || mdiMode()==KMdi::IDEAlMode))
 			{
-				TQT_TQKEYEVENT(e)->accept();
+				static_cast<TQKeyEvent*>(e)->accept();
 			}
 		}
 	}
@@ -3536,7 +3536,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 
 	//remember currently focued window invalidate act.
 	if (e->type()==TQEvent::FocusOut) {
-		if (TQT_TQFOCUSEVENT(e)->reason()==TQFocusEvent::Popup) {
+		if (static_cast<TQFocusEvent*>(e)->reason()==TQFocusEvent::Popup) {
 			if (KexiUtils::hasParent(TQT_TQOBJECT(d->curDialog), TQT_TQOBJECT(focus_w))) {
 				invalidateSharedActions(TQT_TQOBJECT(d->curDialog));
 				d->focus_before_popup=d->curDialog;
@@ -3558,14 +3558,14 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 			d->focus_before_popup=0;
 			return true;
 		} else if (e->type()==TQEvent::FocusOut) {
-			if (TQT_TQFOCUSEVENT(e)->reason()==TQFocusEvent::Tab) {
+			if (static_cast<TQFocusEvent*>(e)->reason()==TQFocusEvent::Tab) {
 				//activate current child:
 				if (d->curDialog) {
 					d->curDialog->activate();
 					return true;
 				}
 			}
-			else if (TQT_TQFOCUSEVENT(e)->reason()==TQFocusEvent::Popup) {
+			else if (static_cast<TQFocusEvent*>(e)->reason()==TQFocusEvent::Popup) {
 				d->focus_before_popup=w;
 			}
 			//invalidateSharedActions();
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
index 3870f09e4..b6cb9f44d 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
@@ -338,7 +338,7 @@ bool KexiSimplePrintPreviewWindow::event( TQEvent * e )
 {
 	TQEvent::Type t = e->type();
 	if (t==TQEvent::KeyPress) {
-		TQKeyEvent *ke = TQT_TQKEYEVENT(e);
+		TQKeyEvent *ke = static_cast<TQKeyEvent*>(e);
 		const int k = ke->key();
 		bool ok = true;
 		if (k==TQt::Key_Equal || k==TQt::Key_Plus)
@@ -358,7 +358,7 @@ bool KexiSimplePrintPreviewWindow::event( TQEvent * e )
 		}
 	}
 	else if (t==TQEvent::AccelOverride) {
-		TQKeyEvent *ke = TQT_TQKEYEVENT(e);
+		TQKeyEvent *ke = static_cast<TQKeyEvent*>(e);
 		const int k = ke->key();
 		bool ok = true;
 		if (k==TQt::Key_PageUp)
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index 9f3e5de74..c738d1923 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -658,7 +658,7 @@ bool KexiStartupDialog::eventFilter( TQObject *o, TQEvent *e )
 {
 	if (o==d->templatesWidget_IconListBox && d->templatesWidget_IconListBox) {
 		if (e->type()==TQEvent::KeyPress 
-			&& (TQT_TQKEYEVENT(e)->key()==Key_Enter || TQT_TQKEYEVENT(e)->key()==Key_Return)
+			&& (static_cast<TQKeyEvent*>(e)->key()==Key_Enter || static_cast<TQKeyEvent*>(e)->key()==Key_Return)
 			|| e->type()==TQEvent::MouseButtonDblClick) 
 		{
 			const int t_id = d->templatesWidget->activePageIndex();
diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp
index 7b0aa5c84..61aa07353 100644
--- a/kexi/main/startup/KexiStartupFileDialog.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog.cpp
@@ -409,9 +409,9 @@ void KexiStartupFileDialog::setFocus()
 bool KexiStartupFileDialog::eventFilter ( TQObject * watched, TQEvent * e )
 {
 	//filter-out ESC key
-	if (e->type()==TQEvent::KeyPress && TQT_TQKEYEVENT(e)->key()==TQt::Key_Escape
-	 && TQT_TQKEYEVENT(e)->state()==TQt::NoButton) {
-		TQT_TQKEYEVENT(e)->accept();
+	if (e->type()==TQEvent::KeyPress && static_cast<TQKeyEvent*>(e)->key()==TQt::Key_Escape
+	 && static_cast<TQKeyEvent*>(e)->state()==TQt::NoButton) {
+		static_cast<TQKeyEvent*>(e)->accept();
 		emit rejected();
 		return true;
 	}