Drop TQT_BASE_OBJECT* defines

Signed-off-by: Michele Calgaro <[email protected]>

6 files changed, 12 insertions, 12 deletions

diff --git a/atlantik/client/selectconfiguration_widget.cpp b/atlantik/client/selectconfiguration_widget.cpp
index f8f55855..b8ea7cd7 100644
--- a/atlantik/client/selectconfiguration_widget.cpp
+++ b/atlantik/client/selectconfiguration_widget.cpp
@@ -127,11 +127,11 @@ void SelectConfiguration::gameOption(TQString title, TQString type, TQString val
 
 void SelectConfiguration::changeOption()
 {
-	ConfigOption *configOption = m_configMap[(TQObject *)TQT_BASE_OBJECT_NAME::sender()];
+	ConfigOption *configOption = m_configMap[(TQObject *)TQObject::sender()];
 	if (configOption)
 	{
-		kdDebug() << "checked " << ((TQCheckBox *)TQT_BASE_OBJECT_NAME::sender())->isChecked() << endl;
-		emit changeOption( configOption->id(), TQString::number( ((TQCheckBox *)TQT_BASE_OBJECT_NAME::sender())->isChecked() ) );
+		kdDebug() << "checked " << ((TQCheckBox *)TQObject::sender())->isChecked() << endl;
+		emit changeOption( configOption->id(), TQString::number( ((TQCheckBox *)TQObject::sender())->isChecked() ) );
 	}
 }
 
@@ -148,7 +148,7 @@ void SelectConfiguration::optionChanged(ConfigOption *configOption)
 
 void SelectConfiguration::optionChanged()
 {
-	TQString command = m_optionCommandMap[(TQObject *)TQT_BASE_OBJECT_NAME::sender()];
+	TQString command = m_optionCommandMap[(TQObject *)TQObject::sender()];
 
 	if (TQCheckBox *checkBox = m_checkBoxMap[command])
 	{
diff --git a/atlantik/libatlantikui/estatedetails.cpp b/atlantik/libatlantikui/estatedetails.cpp
index f89ad96e..03ff0f13 100644
--- a/atlantik/libatlantikui/estatedetails.cpp
+++ b/atlantik/libatlantikui/estatedetails.cpp
@@ -321,7 +321,7 @@ void EstateDetails::clearButtons()
 
 void EstateDetails::buttonPressed()
 {
-	emit buttonCommand(TQString(m_buttonCommandMap[(TQObject *)TQT_BASE_OBJECT_NAME::sender()]));
+	emit buttonCommand(TQString(m_buttonCommandMap[(TQObject *)TQObject::sender()]));
 }
 
 #include "estatedetails.moc"
diff --git a/kbattleship/kbattleship/kbattleshipclient.cpp b/kbattleship/kbattleship/kbattleshipclient.cpp
index d895e934..039dcc0c 100644
--- a/kbattleship/kbattleship/kbattleshipclient.cpp
+++ b/kbattleship/kbattleship/kbattleshipclient.cpp
@@ -44,7 +44,7 @@ void KBattleshipClient::init()
 	}
 
 	m_readNotifier = new TQSocketNotifier(fd(), TQSocketNotifier::Read, TQT_TQOBJECT(this));
-	TQT_BASE_OBJECT_NAME::connect(m_readNotifier, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReadData()));
+	TQObject::connect(m_readNotifier, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReadData()));
 	emit sigConnected();
 }
 
diff --git a/kbattleship/kbattleship/kbattleshipserver.cpp b/kbattleship/kbattleship/kbattleshipserver.cpp
index a864cb61..df171f7a 100644
--- a/kbattleship/kbattleship/kbattleshipserver.cpp
+++ b/kbattleship/kbattleship/kbattleshipserver.cpp
@@ -50,7 +50,7 @@ void KBattleshipServer::init()
 	m_service.setPort(m_port);
 	m_service.publishAsync();
 	m_connectNotifier = new TQSocketNotifier(fd(), TQSocketNotifier::Read, TQT_TQOBJECT(this));
-	TQT_BASE_OBJECT_NAME::connect(m_connectNotifier, TQT_SIGNAL(activated(int)), TQT_SLOT(slotNewConnection()));
+	TQObject::connect(m_connectNotifier, TQT_SIGNAL(activated(int)), TQT_SLOT(slotNewConnection()));
 }
 
 void KBattleshipServer::slotNewConnection()
diff --git a/kbattleship/kbattleship/kchatwidget.cpp b/kbattleship/kbattleship/kchatwidget.cpp
index f6b804ee..649fd777 100644
--- a/kbattleship/kbattleship/kchatwidget.cpp
+++ b/kbattleship/kbattleship/kchatwidget.cpp
@@ -61,7 +61,7 @@ void KChatWidget::slotReceivedMessage(const TQString &nickname, const TQString &
 
 bool KChatWidget::eventFilter(TQObject *obj, TQEvent *e)
 {
-	if(TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(commentEdit) && e->type() == TQEvent::Wheel)
+	if(obj == commentEdit && e->type() == TQEvent::Wheel)
 	{
 		kapp->notify(TQT_TQOBJECT(chatView), e);
 		return true;
diff --git a/kspaceduel/topwidget.cpp b/kspaceduel/topwidget.cpp
index cd8fd8dc..b8bef2e1 100644
--- a/kspaceduel/topwidget.cpp
+++ b/kspaceduel/topwidget.cpp
@@ -34,12 +34,12 @@ void MyTopLevelWidget::initGameWidgets( ){
    playfield->setFocusPolicy(TQ_StrongFocus);
    playfield->setFocus();
 
-   TQT_BASE_OBJECT_NAME::connect(TQT_TQOBJECT(playfield),TQT_SIGNAL(energy(int,int)),
+   TQObject::connect(TQT_TQOBJECT(playfield),TQT_SIGNAL(energy(int,int)),
                     TQT_SLOT(energy(int,int)));
-   TQT_BASE_OBJECT_NAME::connect(TQT_TQOBJECT(playfield),TQT_SIGNAL(hitPoints(int,int)),
+   TQObject::connect(TQT_TQOBJECT(playfield),TQT_SIGNAL(hitPoints(int,int)),
                     TQT_SLOT(hitPoints(int,int)));
-   TQT_BASE_OBJECT_NAME::connect(TQT_TQOBJECT(playfield),TQT_SIGNAL(wins(int,int)),TQT_SLOT(wins(int,int)));
-   TQT_BASE_OBJECT_NAME::connect(TQT_TQOBJECT(playfield),TQT_SIGNAL(setStatusText(const TQString &,int)),
+   TQObject::connect(TQT_TQOBJECT(playfield),TQT_SIGNAL(wins(int,int)),TQT_SLOT(wins(int,int)));
+   TQObject::connect(TQT_TQOBJECT(playfield),TQT_SIGNAL(setStatusText(const TQString &,int)),
                     TQT_SLOT(setStatusText(const TQString &,int)));
 
    setCentralWidget(w);