diff --git a/bibletime/frontend/keychooser/cbookkeychooser.cpp b/bibletime/frontend/keychooser/cbookkeychooser.cpp
index 4e1a6c8..4cc006c 100644
--- a/bibletime/frontend/keychooser/cbookkeychooser.cpp
+++ b/bibletime/frontend/keychooser/cbookkeychooser.cpp
@@ -250,7 +250,7 @@ void CBookKeyChooser::setupCombo(const TQString key, const int depth, const int
 
 /** A keychooser changed. Update and emit a signal if necessary. */
 void CBookKeyChooser::keyChooserChanged(int /*newIndex*/) {
-	const int activeID = boxes[TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))]; //no so good code!
+	const int activeID = boxes[const_cast<TQObject*>(sender())]; //no so good code!
 
 	TQStringList items;
 	CKeyChooserWidget* chooser;
diff --git a/bibletime/frontend/keychooser/ckeychooserwidget.cpp b/bibletime/frontend/keychooser/ckeychooserwidget.cpp
index 8ad137e..a099506 100644
--- a/bibletime/frontend/keychooser/ckeychooserwidget.cpp
+++ b/bibletime/frontend/keychooser/ckeychooserwidget.cpp
@@ -43,7 +43,7 @@ bool CKCComboBox::eventFilter( TQObject *o, TQEvent *e ) {
 	if (e->type() == TQEvent::FocusOut) {
 		TQFocusEvent* f = TQT_TQFOCUSEVENT(e);
 
-		if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lineEdit()) && f->reason() == TQFocusEvent::Tab) {
+		if (o == lineEdit() && f->reason() == TQFocusEvent::Tab) {
 			int index = listBox()->index( listBox()->findItem(currentText()) );
 			if (index == -1) {
 				index = 0;// return 0 if not found
@@ -64,7 +64,7 @@ bool CKCComboBox::eventFilter( TQObject *o, TQEvent *e ) {
 			emit activated(currentText());
 			return false;
 		}
-		else if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this)) {
+		else if (o == this) {
 			emit activated(currentText());
 			return false;
 		}