Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 418e8f7a6f6d79b2cbc9d83b29ef53d01582f826)

2 files changed, 11 insertions, 11 deletions

diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp
index 31e90d55..0c82cdf1 100644
--- a/krdc/krdc.cpp
+++ b/krdc/krdc.cpp
@@ -490,14 +490,14 @@ void KRDC::switchToFullscreen(bool scaling)
 	pinButton->setIconSet(pinIconSet);
 	TQToolTip::add(pinButton, i18n("Autohide on/off"));
 	t->setToggle(FS_AUTOHIDE_ID);
-	t->addConnection(FS_AUTOHIDE_ID, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(setFsToolbarAutoHide(bool)));
+	t->addConnection(FS_AUTOHIDE_ID, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setFsToolbarAutoHide(bool)));
 
 	t->insertButton("view-restore", FS_FULLSCREEN_ID);
 	TDEToolBarButton *fullscreenButton = t->getButton(FS_FULLSCREEN_ID);
 	TQToolTip::add(fullscreenButton, i18n("Fullscreen"));
 	t->setToggle(FS_FULLSCREEN_ID);
 	t->setButton(FS_FULLSCREEN_ID, true);
-	t->addConnection(FS_FULLSCREEN_ID, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(enableFullscreen(bool)));
+	t->addConnection(FS_FULLSCREEN_ID, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableFullscreen(bool)));
 
 	m_popup = createPopupMenu(t);
 	t->insertButton("configure", FS_ADVANCED_ID, m_popup, true, i18n("Advanced options"));
@@ -517,18 +517,18 @@ void KRDC::switchToFullscreen(bool scaling)
 		TQToolTip::add(scaleButton, i18n("Scale view"));
 		t->setToggle(FS_SCALE_ID);
 		t->setButton(FS_SCALE_ID, scaling);
-		t->addConnection(FS_SCALE_ID, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(switchToFullscreen(bool)));
+		t->addConnection(FS_SCALE_ID, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(switchToFullscreen(bool)));
 	}
 
 	t->insertButton("iconify", FS_ICONIFY_ID);
 	TDEToolBarButton *iconifyButton = t->getButton(FS_ICONIFY_ID);
 	TQToolTip::add(iconifyButton, i18n("Minimize"));
-	t->addConnection(FS_ICONIFY_ID, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(iconify()));
+	t->addConnection(FS_ICONIFY_ID, TQT_SIGNAL(clicked()), this, TQT_SLOT(iconify()));
 
 	t->insertButton("close", FS_CLOSE_ID);
 	TDEToolBarButton *closeButton = t->getButton(FS_CLOSE_ID);
 	TQToolTip::add(closeButton, i18n("Close"));
-	t->addConnection(FS_CLOSE_ID, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(quit()));
+	t->addConnection(FS_CLOSE_ID, TQT_SIGNAL(clicked()), this, TQT_SLOT(quit()));
 
 	m_fsToolbar->setChild(t);
 
@@ -598,7 +598,7 @@ void KRDC::switchToNormal(bool scaling)
 		TQWhatsThis::add(fullscreenButton, i18n("Switches to full screen. If the remote desktop has a different screen resolution, Remote Desktop Connection will automatically switch to the nearest resolution."));
 		t->setToggle(0);
 		t->setButton(0, false);
-		t->addConnection(0, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(enableFullscreen(bool)));
+		t->addConnection(0, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableFullscreen(bool)));
 
 		if (m_view->supportsScaling()) {
 			t->insertButton("zoom-fit-best", 1, true, i18n("Scale"));
@@ -607,14 +607,14 @@ void KRDC::switchToNormal(bool scaling)
 			TQWhatsThis::add(scaleButton, i18n("This option scales the remote screen to fit your window size."));
 			t->setToggle(1);
 			t->setButton(1, scaling);
-			t->addConnection(1, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(switchToNormal(bool)));
+			t->addConnection(1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(switchToNormal(bool)));
 		}
 
 		t->insertButton("key_enter", 2, true, i18n("Special Keys"));
 		TDEToolBarButton *skButton = t->getButton(2);
 		TQToolTip::add(skButton, i18n("Enter special keys."));
 		TQWhatsThis::add(skButton, i18n("This option allows you to send special key combinations like Ctrl-Alt-Del to the remote host."));
-		t->addConnection(2, TQT_SIGNAL(clicked()), TQT_TQOBJECT(m_keyCaptureDialog), TQT_SLOT(execute()));
+		t->addConnection(2, TQT_SIGNAL(clicked()), m_keyCaptureDialog, TQT_SLOT(execute()));
 
 		if (m_popup) {
 			m_popup->deleteLater();
@@ -749,7 +749,7 @@ void KRDC::setSize(int w, int h)
 {
 	int dw, dh;
 
-	TQWidget *desktop = TQT_TQWIDGET(TQApplication::desktop());
+	TQWidget *desktop = TQApplication::desktop();
 	dw = desktop->width();
 	dh = desktop->height();
 
diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp
index 4494fcfd..057c6fe6 100644
--- a/krdc/rdp/krdpview.cpp
+++ b/krdc/rdp/krdpview.cpp
@@ -209,7 +209,7 @@ bool KRdpView::start()
 	SmartPtr<RdpHostPref> hp, rdpDefaults;
 	bool useTDEWallet = false;
 
-	TQWidget *desktop = TQT_TQWIDGET(TQApplication::desktop());
+	TQWidget *desktop = TQApplication::desktop();
 
 	if(!rdpAppDataConfigured)
 	{
@@ -228,7 +228,7 @@ bool KRdpView::start()
 
 	m_container->show();
 
-	m_process = new TDEProcess(TQT_TQOBJECT(m_container));
+	m_process = new TDEProcess(m_container);
 	*m_process << "rdesktop";
 	// Check for fullscreen mode
 	if ((hp->width() == 0) && (hp->height() == 0)) {