Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

2 files changed, 24 insertions, 24 deletions

diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp
index 44a94f02c..feb1a6692 100644
--- a/konqueror/sidebar/web_module/web_module.cpp
+++ b/konqueror/sidebar/web_module/web_module.cpp
@@ -36,30 +36,30 @@ KonqSideBarWebModule::KonqSideBarWebModule(TDEInstance *instance, TQObject *pare
 	: KonqSidebarPlugin(instance, parent, widgetParent, desktopName, name)
 {
 	_htmlPart = new TDEHTMLSideBar(universalMode());
-	connect(_htmlPart, TQT_SIGNAL(reload()), this, TQT_SLOT(reload()));
-	connect(_htmlPart, TQT_SIGNAL(completed()), this, TQT_SLOT(pageLoaded()));
+	connect(_htmlPart, TQ_SIGNAL(reload()), this, TQ_SLOT(reload()));
+	connect(_htmlPart, TQ_SIGNAL(completed()), this, TQ_SLOT(pageLoaded()));
 	connect(_htmlPart,
-		TQT_SIGNAL(setWindowCaption(const TQString&)),
+		TQ_SIGNAL(setWindowCaption(const TQString&)),
 		this,
-		TQT_SLOT(setTitle(const TQString&)));
+		TQ_SLOT(setTitle(const TQString&)));
 	connect(_htmlPart,
-		TQT_SIGNAL(openURLRequest(const TQString&, KParts::URLArgs)),
+		TQ_SIGNAL(openURLRequest(const TQString&, KParts::URLArgs)),
 		this,
-		TQT_SLOT(urlClicked(const TQString&, KParts::URLArgs)));
+		TQ_SLOT(urlClicked(const TQString&, KParts::URLArgs)));
 	connect(_htmlPart->browserExtension(),
-		TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
+		TQ_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
 		this,
-		TQT_SLOT(formClicked(const KURL&, const KParts::URLArgs&)));
+		TQ_SLOT(formClicked(const KURL&, const KParts::URLArgs&)));
 	connect(_htmlPart,
-		TQT_SIGNAL(setAutoReload()), this, TQT_SLOT( setAutoReload() ));
+		TQ_SIGNAL(setAutoReload()), this, TQ_SLOT( setAutoReload() ));
 	connect(_htmlPart,
-		TQT_SIGNAL(openURLNewWindow(const TQString&, KParts::URLArgs)),
+		TQ_SIGNAL(openURLNewWindow(const TQString&, KParts::URLArgs)),
 		this,
-		TQT_SLOT(urlNewWindow(const TQString&, KParts::URLArgs)));
+		TQ_SLOT(urlNewWindow(const TQString&, KParts::URLArgs)));
 	connect(_htmlPart,
-		TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
+		TQ_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
 		this,
-		TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)));
+		TQ_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)));
 
 	_desktopName = desktopName;
 
@@ -69,7 +69,7 @@ KonqSideBarWebModule::KonqSideBarWebModule(TDEInstance *instance, TQObject *pare
 	_url = ksc.readPathEntry("URL");
 	_htmlPart->openURL(_url );
 	// Must load this delayed
-	TQTimer::singleShot(0, this, TQT_SLOT(loadFavicon()));
+	TQTimer::singleShot(0, this, TQ_SLOT(loadFavicon()));
 }
 
 
@@ -176,7 +176,7 @@ void KonqSideBarWebModule::setTitle(const TQString& title) {
 
 void KonqSideBarWebModule::pageLoaded() {
 	if( reloadTimeout > 0 ) {
-		TQTimer::singleShot( reloadTimeout, this, TQT_SLOT( reload() ) );
+		TQTimer::singleShot( reloadTimeout, this, TQ_SLOT( reload() ) );
 	}
 }
 
diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h
index e4669da89..072c3d822 100644
--- a/konqueror/sidebar/web_module/web_module.h
+++ b/konqueror/sidebar/web_module/web_module.h
@@ -41,9 +41,9 @@ class TDEHTMLSideBar : public TDEHTMLPart
 
 			setFormNotification(TDEHTMLPart::Only);
 			connect(this,
-				TQT_SIGNAL(formSubmitNotification(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
+				TQ_SIGNAL(formSubmitNotification(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
 				this,
-				TQT_SLOT(formProxy(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))
+				TQ_SLOT(formProxy(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))
 				);
 
 
@@ -51,22 +51,22 @@ class TDEHTMLSideBar : public TDEHTMLPart
 					"link context menu");
 			if (!universal) {
 				_linkMenu->insertItem(i18n("&Open Link"),
-						this, TQT_SLOT(loadPage()));
+						this, TQ_SLOT(loadPage()));
 				_linkMenu->insertItem(i18n("Open in New &Window"),
-						this, TQT_SLOT(loadNewWindow()));
+						this, TQ_SLOT(loadNewWindow()));
 			} else {
 				_linkMenu->insertItem(i18n("Open in New &Window"),
-						this, TQT_SLOT(loadPage()));
+						this, TQ_SLOT(loadPage()));
 			}
 			_menu = new TDEPopupMenu(widget(), "context menu");
 			_menu->insertItem(SmallIcon("reload"), i18n("&Reload"),
-					this, TQT_SIGNAL(reload()));
-			_menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"),                                                  this, TQT_SIGNAL(setAutoReload()));
+					this, TQ_SIGNAL(reload()));
+			_menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"),                                                  this, TQ_SIGNAL(setAutoReload()));
 
 			connect(this,
-				TQT_SIGNAL(popupMenu(const TQString&,const TQPoint&)),
+				TQ_SIGNAL(popupMenu(const TQString&,const TQPoint&)),
 				this,
-				TQT_SLOT(showMenu(const TQString&, const TQPoint&)));
+				TQ_SLOT(showMenu(const TQString&, const TQPoint&)));
 
 		}
 		virtual ~TDEHTMLSideBar() {}