Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

10 files changed, 193 insertions, 193 deletions

diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp
index 774ad8509..437c7bda9 100644
--- a/konqueror/sidebar/konqsidebar.cpp
+++ b/konqueror/sidebar/konqsidebar.cpp
@@ -32,11 +32,11 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName,
 	// this should be your custom internal widget
 	m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->topLevelWidget()->property("currentProfile").toString() );
 	m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" );
-	connect(m_widget,TQT_SIGNAL(started(TDEIO::Job *)),
-		this, TQT_SIGNAL(started(TDEIO::Job*)));
-	connect(m_widget,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed()));
-	connect(m_extension, TQT_SIGNAL(addWebSideBar(const KURL&, const TQString&)),
-		m_widget, TQT_SLOT(addWebSideBar(const KURL&, const TQString&)));
+	connect(m_widget,TQ_SIGNAL(started(TDEIO::Job *)),
+		this, TQ_SIGNAL(started(TDEIO::Job*)));
+	connect(m_widget,TQ_SIGNAL(completed()),this,TQ_SIGNAL(completed()));
+	connect(m_extension, TQ_SIGNAL(addWebSideBar(const KURL&, const TQString&)),
+		m_widget, TQ_SLOT(addWebSideBar(const KURL&, const TQString&)));
         TDEAcceleratorManager::setNoAccel(m_widget);
 	setWidget(m_widget);
 }
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 8fe85f512..5fd3f6d7e 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -60,8 +60,8 @@ addBackEnd::addBackEnd(TQWidget *parent, class TQPopupMenu *addmenu,
 	m_universal=universal;
 	m_currentProfile = currentProfile;
 	menu = addmenu;
-	connect(menu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(aboutToShowAddMenu()));
-	connect(menu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(activatedAddMenu(int)));
+	connect(menu,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(aboutToShowAddMenu()));
+	connect(menu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(activatedAddMenu(int)));
 }
 
 void addBackEnd::aboutToShowAddMenu()
@@ -268,7 +268,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
 	if (splitterWidget) {
 		splitterWidget->setResizeMode(parent, TQSplitter::FollowSizeHint);
 		splitterWidget->setOpaqueResize( false );
-		connect(splitterWidget,TQT_SIGNAL(setRubberbandCalled()),TQT_SLOT(userMovedSplitter()));
+		connect(splitterWidget,TQ_SIGNAL(setRubberbandCalled()),TQ_SLOT(userMovedSplitter()));
 	}
 		
 	m_area = new KDockArea(this);
@@ -292,22 +292,22 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
 	if (!m_universalMode) {
 		m_menu->insertItem(SmallIconSet("remove"),
                                    i18n("Close Navigation Panel"),
-				par, TQT_SLOT(deleteLater()));
+				par, TQ_SLOT(deleteLater()));
 	}
-        connect(m_menu, TQT_SIGNAL(aboutToShow()),
-		this, TQT_SLOT(aboutToShowConfigMenu()));
-	connect(m_menu, TQT_SIGNAL(activated(int)),
-		this, TQT_SLOT(activatedMenu(int)));
+        connect(m_menu, TQ_SIGNAL(aboutToShow()),
+		this, TQ_SLOT(aboutToShowConfigMenu()));
+	connect(m_menu, TQ_SIGNAL(activated(int)),
+		this, TQ_SLOT(activatedMenu(int)));
 
 	m_buttonPopup = 0;
 	addBackEnd *ab = new addBackEnd(this, addMenu, universalMode,
                                         currentProfile,
                                         "Sidebar_Widget-addBackEnd");
 
-	connect(ab, TQT_SIGNAL(updateNeeded()),
-		this, TQT_SLOT(updateButtons()));
-	connect(ab, TQT_SIGNAL(initialCopyNeeded()),
-		this, TQT_SLOT(finishRollBack()));
+	connect(ab, TQ_SIGNAL(updateNeeded()),
+		this, TQ_SLOT(updateButtons()));
+	connect(ab, TQ_SIGNAL(initialCopyNeeded()),
+		this, TQ_SLOT(finishRollBack()));
 
 	initialCopy();
 
@@ -327,13 +327,13 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
         m_menu->setItemVisible(2, !m_immutableShowTabsLeft);
         m_menu->setItemVisible(3, !m_immutableShowExtraButtons);
 
-	connect(&m_configTimer, TQT_SIGNAL(timeout()),
-		this, TQT_SLOT(saveConfig()));
+	connect(&m_configTimer, TQ_SIGNAL(timeout()),
+		this, TQ_SLOT(saveConfig()));
 	m_somethingVisible = !m_openViews.isEmpty();
 	doLayout();
-	TQTimer::singleShot(0,this,TQT_SLOT(createButtons()));
-	connect(m_area, TQT_SIGNAL(dockWidgetHasUndocked(KDockWidget*)),
-		this, TQT_SLOT(dockWidgetHasUndocked(KDockWidget*)));
+	TQTimer::singleShot(0,this,TQ_SLOT(createButtons()));
+	connect(m_area, TQ_SIGNAL(dockWidgetHasUndocked(KDockWidget*)),
+		this, TQ_SLOT(dockWidgetHasUndocked(KDockWidget*)));
 }
 
 void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) {
@@ -373,7 +373,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) {
 		scf.writeEntry("X-TDE-KonqSidebarModule", "konqsidebar_web");
 		scf.sync();
 
-		TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
+		TQTimer::singleShot(0,this,TQ_SLOT(updateButtons()));
 	}
 }
 
@@ -382,7 +382,7 @@ void Sidebar_Widget::finishRollBack()
 {
 	m_path = TDEGlobal::dirs()->saveLocation("data",m_relPath,true);
         initialCopy();
-        TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
+        TQTimer::singleShot(0,this,TQ_SLOT(updateButtons()));
 }
 
 
@@ -508,7 +508,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
 				ksc.setGroup("Desktop Entry");
 				ksc.writeEntry("Icon",iconname);
 				ksc.sync();
-			        TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
+			        TQTimer::singleShot(0,this,TQ_SLOT(updateButtons()));
 			}
 			break;
 		}
@@ -531,7 +531,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
                                     //ksc.writeEntry("Name",newurl);
                                     ksc.writePathEntry("URL",newurl);
                                     ksc.sync();
-                                    TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
+                                    TQTimer::singleShot(0,this,TQ_SLOT(updateButtons()));
                                 }
 			}
                         delete dlg;
@@ -545,7 +545,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
 				TQFile f(m_path+m_currentButton->file);
 				if (!f.remove())
 					tqDebug("Error, file not deleted");
-				TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
+				TQTimer::singleShot(0,this,TQ_SLOT(updateButtons()));
 			}
 			break;
 		}
@@ -566,7 +566,7 @@ void Sidebar_Widget::buttonPopupActivate(int id)
 				ksc.sync();
 				
 				// Update the buttons with a TQTimer (why?)
-				TQTimer::singleShot(0,this,TQT_SLOT(updateButtons()));
+				TQTimer::singleShot(0,this,TQ_SLOT(updateButtons()));
 			}
 			break;
 		}
@@ -838,7 +838,7 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos)
 		/*int id=*/m_buttons.insert(lastbtn, bi);
 		KMultiTabBarTab *tab = m_buttonBar->tab(lastbtn);
 		tab->installEventFilter(this);
-		connect(tab,TQT_SIGNAL(clicked(int)),this,TQT_SLOT(showHidePage(int)));
+		connect(tab,TQ_SIGNAL(clicked(int)),this,TQ_SLOT(showHidePage(int)));
 
 		// Set Whats This help
 		// This uses the comments in the .desktop files
@@ -882,8 +882,8 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
 						m_buttonPopup->insertItem(SmallIconSet("edit-delete"), i18n("Remove"),3);
 						m_buttonPopup->insertSeparator();
 						m_buttonPopup->insertItem(SmallIconSet("configure"), i18n("Configure Navigation Panel"), m_menu, 4);
-						connect(m_buttonPopup, TQT_SIGNAL(activated(int)),
-							this, TQT_SLOT(buttonPopupActivate(int)));
+						connect(m_buttonPopup, TQ_SIGNAL(activated(int)),
+							this, TQ_SLOT(buttonPopupActivate(int)));
 					}
 					m_buttonPopup->setItemEnabled(2,!m_currentButton->URL.isEmpty());
 						m_buttonPopup->changeTitle(50,SmallIcon(m_currentButton->iconName),
@@ -961,11 +961,11 @@ bool Sidebar_Widget::createView( ButtonInfo *data)
 		KDockWidget::DockBottom/*|KDockWidget::DockDesktop*/);
 		data->dock->setDockSite(KDockWidget::DockTop|KDockWidget::DockBottom);
 		connectModule(data->module);
-		connect(this, TQT_SIGNAL(fileSelection(const KFileItemList&)),
-			data->module, TQT_SLOT(openPreview(const KFileItemList&)));
+		connect(this, TQ_SIGNAL(fileSelection(const KFileItemList&)),
+			data->module, TQ_SLOT(openPreview(const KFileItemList&)));
 
-		connect(this, TQT_SIGNAL(fileMouseOver(const KFileItem&)),
-			data->module, TQT_SLOT(openPreviewOnMouseOver(const KFileItem&)));
+		connect(this, TQ_SIGNAL(fileMouseOver(const KFileItem&)),
+			data->module, TQ_SLOT(openPreviewOnMouseOver(const KFileItem&)));
 	}
 
 	delete confFile;
@@ -998,14 +998,14 @@ void Sidebar_Widget::showHidePage(int page)
 			m_buttonBar->setTab(page,true);
 
 			connect(info->module,
-				TQT_SIGNAL(setIcon(const TQString&)),
+				TQ_SIGNAL(setIcon(const TQString&)),
 				m_buttonBar->tab(page),
-				TQT_SLOT(setIcon(const TQString&)));
+				TQ_SLOT(setIcon(const TQString&)));
 
 			connect(info->module,
-				TQT_SIGNAL(setCaption(const TQString&)),
+				TQ_SIGNAL(setCaption(const TQString&)),
 				m_buttonBar->tab(page),
-				TQT_SLOT(setText(const TQString&)));
+				TQ_SLOT(setText(const TQString&)));
 
 			if (m_singleWidgetMode)
 			{
@@ -1217,51 +1217,51 @@ void Sidebar_Widget::popupMenu( KXMLGUIClient *client,
 void Sidebar_Widget::connectModule(TQObject *mod)
 {
 	if (mod->metaObject()->findSignal("started(TDEIO::Job*)") != -1) {
-		connect(mod,TQT_SIGNAL(started(TDEIO::Job *)),this, TQT_SIGNAL(started(TDEIO::Job*)));
+		connect(mod,TQ_SIGNAL(started(TDEIO::Job *)),this, TQ_SIGNAL(started(TDEIO::Job*)));
 	}
 
 	if (mod->metaObject()->findSignal("completed()") != -1) {
-		connect(mod,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed()));
+		connect(mod,TQ_SIGNAL(completed()),this,TQ_SIGNAL(completed()));
 	}
 
 	if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) {
-		connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &,
-			const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const
+		connect(mod,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &,
+			const TQString &, mode_t)),this,TQ_SLOT(popupMenu( const
 			TQPoint &, const KURL&, const TQString &, mode_t)));
 	}
 
 	if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const TQPoint &,const KURL&,const TQString&,mode_t)") != -1) {
-		connect(mod,TQT_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &,
+		connect(mod,TQ_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &,
 			const KURL &,const TQString &, mode_t)),this,
-			TQT_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &,
+			TQ_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &,
 			const KURL &,const TQString &, mode_t)));
 	}
 
 	if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KFileItemList&)") != -1) {
-		connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )),
-			this,TQT_SLOT(popupMenu( const TQPoint &, const KFileItemList & )));
+		connect(mod,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )),
+			this,TQ_SLOT(popupMenu( const TQPoint &, const KFileItemList & )));
 	}
 
 	if (mod->metaObject()->findSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) {
-		connect(mod,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)),
-			this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
+		connect(mod,TQ_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)),
+			this,TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &)));
 	}
 
 	if (mod->metaObject()->findSignal("submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)") != -1) {
 		connect(mod,
-			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_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)));
+			TQ_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)));
 	}
 
 	if (mod->metaObject()->findSignal("enableAction(const char*,bool)") != -1) {
-		connect(mod,TQT_SIGNAL(enableAction( const char *, bool)),
-			this,TQT_SLOT(enableAction(const char *, bool)));
+		connect(mod,TQ_SIGNAL(enableAction( const char *, bool)),
+			this,TQ_SLOT(enableAction(const char *, bool)));
 	}
 
 	if (mod->metaObject()->findSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) {
-		connect(mod,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
-			this,TQT_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &)));
+		connect(mod,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
+			this,TQ_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &)));
 	}
 }
 
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index 208fe2ee6..f1dd0b953 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -45,39 +45,39 @@ KonqSidebarBookmarkModule::KonqSidebarBookmarkModule( KonqSidebarTree * parentTr
     formats << "text/uri-list" << "application/x-xbel" << "text/plain";
     tree()->setDropFormats(formats);
 
-    connect(tree(), TQT_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)),
-            this,   TQT_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*)));
-    connect(tree(), TQT_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)),
-            this,   TQT_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)));
+    connect(tree(), TQ_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)),
+            this,   TQ_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*)));
+    connect(tree(), TQ_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)),
+            this,   TQ_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)));
 
-    connect(tree(), TQT_SIGNAL(expanded(TQListViewItem*)),
-            this,   TQT_SLOT(slotOpenChange(TQListViewItem*)));
-    connect(tree(), TQT_SIGNAL(collapsed(TQListViewItem*)),
-            this,   TQT_SLOT(slotOpenChange(TQListViewItem*)));
+    connect(tree(), TQ_SIGNAL(expanded(TQListViewItem*)),
+            this,   TQ_SLOT(slotOpenChange(TQListViewItem*)));
+    connect(tree(), TQ_SIGNAL(collapsed(TQListViewItem*)),
+            this,   TQ_SLOT(slotOpenChange(TQListViewItem*)));
 
     m_collection = new TDEActionCollection( this, "bookmark actions" );
     (void) new TDEAction( i18n("&Create New Folder"), "folder-new", 0, this,
-                        TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder");
+                        TQ_SLOT( slotCreateFolder() ), m_collection, "create_folder");
     (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, this,
-                        TQT_SLOT( slotDelete() ), m_collection, "delete_folder");
+                        TQ_SLOT( slotDelete() ), m_collection, "delete_folder");
     (void) new TDEAction( i18n("Delete Bookmark"), "edit-delete", 0, this,
-                        TQT_SLOT( slotDelete() ), m_collection, "delete_bookmark");
+                        TQ_SLOT( slotDelete() ), m_collection, "delete_bookmark");
     (void) new TDEAction( i18n("Properties"), "edit", 0, this,
-                        TQT_SLOT( slotProperties() ), m_collection, "item_properties");
+                        TQ_SLOT( slotProperties() ), m_collection, "item_properties");
     (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, this,
-                        TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
+                        TQ_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
     (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this,
-                        TQT_SLOT( slotOpenTab() ), m_collection, "open_tab");
+                        TQ_SLOT( slotOpenTab() ), m_collection, "open_tab");
     (void) new TDEAction( i18n("Open Folder in Tabs"), "tab_new", 0, this,
-                        TQT_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs");
+                        TQ_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs");
     (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, this,
-                        TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location");
+                        TQ_SLOT( slotCopyLocation() ), m_collection, "copy_location");
 
-    KStdAction::editBookmarks( KonqBookmarkManager::self(), TQT_SLOT( slotEditBookmarks() ),
+    KStdAction::editBookmarks( KonqBookmarkManager::self(), TQ_SLOT( slotEditBookmarks() ),
 			       m_collection, "edit_bookmarks" );
 
-    connect( KonqBookmarkManager::self(), TQT_SIGNAL(changed(const TQString &, const TQString &) ),
-             TQT_SLOT( slotBookmarksChanged(const TQString &) ) );
+    connect( KonqBookmarkManager::self(), TQ_SIGNAL(changed(const TQString &, const TQString &) ),
+             TQ_SLOT( slotBookmarksChanged(const TQString &) ) );
 }
 
 KonqSidebarBookmarkModule::~KonqSidebarBookmarkModule()
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
index b1b6d0563..e6e4a0af3 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
@@ -52,8 +52,8 @@ KonqSidebarDirTreeModule::~KonqSidebarDirTreeModule()
     // KDirLister may still emit canceled while being deleted.
     if (m_dirLister)
     {
-       disconnect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ),
-                   this, TQT_SLOT( slotListingStopped( const KURL & ) ) );
+       disconnect( m_dirLister, TQ_SIGNAL( canceled( const KURL & ) ),
+                   this, TQ_SLOT( slotListingStopped( const KURL & ) ) );
        delete m_dirLister;
     }
 }
@@ -303,18 +303,18 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item )
 //	mimetypes<<TQString("inode/directory");
 //	m_dirLister->setMimeFilter(mimetypes);
 
-        connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ),
-                 this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) );
-        connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ),
-                 this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) );
-        connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ),
-                 this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) );
-        connect( m_dirLister, TQT_SIGNAL( completed( const KURL & ) ),
-                 this, TQT_SLOT( slotListingStopped( const KURL & ) ) );
-        connect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ),
-                 this, TQT_SLOT( slotListingStopped( const KURL & ) ) );
-        connect( m_dirLister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ),
-                 this, TQT_SLOT( slotRedirection( const KURL &, const KURL & ) ) );
+        connect( m_dirLister, TQ_SIGNAL( newItems( const KFileItemList & ) ),
+                 this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) );
+        connect( m_dirLister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ),
+                 this, TQ_SLOT( slotRefreshItems( const KFileItemList & ) ) );
+        connect( m_dirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ),
+                 this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) );
+        connect( m_dirLister, TQ_SIGNAL( completed( const KURL & ) ),
+                 this, TQ_SLOT( slotListingStopped( const KURL & ) ) );
+        connect( m_dirLister, TQ_SIGNAL( canceled( const KURL & ) ),
+                 this, TQ_SLOT( slotListingStopped( const KURL & ) ) );
+        connect( m_dirLister, TQ_SIGNAL( redirection( const KURL &, const KURL & ) ),
+                 this, TQ_SLOT( slotRedirection( const KURL &, const KURL & ) ) );
     }
 
 
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index 6f051a553..416054cf1 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -51,7 +51,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
 	s_settings->readSettings( true );
     }
 
-    connect( s_settings, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( slotSettingsChanged() ));
+    connect( s_settings, TQ_SIGNAL( settingsChanged() ), TQ_SLOT( slotSettingsChanged() ));
 
     m_dict.setAutoDelete( true );
     m_currentTime = TQDateTime::currentDateTime();
@@ -63,35 +63,35 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
 
     KonqHistoryManager *manager = KonqHistoryManager::kself();
 
-    connect( manager, TQT_SIGNAL( loadingFinished() ), TQT_SLOT( slotCreateItems() ));
-    connect( manager, TQT_SIGNAL( cleared() ), TQT_SLOT( clear() ));
+    connect( manager, TQ_SIGNAL( loadingFinished() ), TQ_SLOT( slotCreateItems() ));
+    connect( manager, TQ_SIGNAL( cleared() ), TQ_SLOT( clear() ));
 
-    connect( manager, TQT_SIGNAL( entryAdded( const KonqHistoryEntry * ) ),
-	     TQT_SLOT( slotEntryAdded( const KonqHistoryEntry * ) ));
-    connect( manager, TQT_SIGNAL( entryRemoved( const KonqHistoryEntry *) ),
-	     TQT_SLOT( slotEntryRemoved( const KonqHistoryEntry *) ));
+    connect( manager, TQ_SIGNAL( entryAdded( const KonqHistoryEntry * ) ),
+	     TQ_SLOT( slotEntryAdded( const KonqHistoryEntry * ) ));
+    connect( manager, TQ_SIGNAL( entryRemoved( const KonqHistoryEntry *) ),
+	     TQ_SLOT( slotEntryRemoved( const KonqHistoryEntry *) ));
 
-    connect( parentTree, TQT_SIGNAL( expanded( TQListViewItem * )),
-	     TQT_SLOT( slotItemExpanded( TQListViewItem * )));
+    connect( parentTree, TQ_SIGNAL( expanded( TQListViewItem * )),
+	     TQ_SLOT( slotItemExpanded( TQListViewItem * )));
 
     m_collection = new TDEActionCollection( this, "history actions" );
     (void) new TDEAction( i18n("New &Window"), "window-new", 0, this,
- 			TQT_SLOT( slotNewWindow() ), m_collection, "open_new");
+ 			TQ_SLOT( slotNewWindow() ), m_collection, "open_new");
     (void) new TDEAction( i18n("&Remove Entry"), "edit-delete", 0, this,
-			TQT_SLOT( slotRemoveEntry() ), m_collection, "remove");
+			TQ_SLOT( slotRemoveEntry() ), m_collection, "remove");
     (void) new TDEAction( i18n("C&lear History"), "history_clear", 0, this,
-			TQT_SLOT( slotClearHistory() ), m_collection, "clear");
+			TQ_SLOT( slotClearHistory() ), m_collection, "clear");
     (void) new TDEAction( i18n("&Preferences..."), "configure", 0, this,
-			TQT_SLOT( slotPreferences()), m_collection, "preferences");
+			TQ_SLOT( slotPreferences()), m_collection, "preferences");
 
     TDERadioAction *sort;
     sort = new TDERadioAction( i18n("By &Name"), 0, this,
-			     TQT_SLOT( slotSortByName() ), m_collection, "byName");
+			     TQ_SLOT( slotSortByName() ), m_collection, "byName");
     sort->setExclusiveGroup("SortGroup");
     sort->setChecked( m_sortsByName );
 
     sort = new TDERadioAction( i18n("By &Date"), 0, this,
-			     TQT_SLOT( slotSortByDate() ), m_collection, "byDate");
+			     TQ_SLOT( slotSortByDate() ), m_collection, "byDate");
     sort->setExclusiveGroup("SortGroup");
     sort->setChecked( !m_sortsByName );
 
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index 70e42e113..188da9d93 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -75,33 +75,33 @@ HistorySidebarConfig::HistorySidebarConfig( TQWidget *parent, const char* name,
     dialog->comboOlder->insertItem( i18n("Days"),
                                     KonqSidebarHistorySettings::DAYS );
 
-    connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )),
-	     dialog->spinExpire, TQT_SLOT( setEnabled( bool )));
-    connect( dialog->spinExpire, TQT_SIGNAL( valueChanged( int )),
-	     this, TQT_SLOT( slotExpireChanged( int )));
-
-    connect( dialog->spinNewer, TQT_SIGNAL( valueChanged( int )),
-	     TQT_SLOT( slotNewerChanged( int )));
-    connect( dialog->spinOlder, TQT_SIGNAL( valueChanged( int )),
-	     TQT_SLOT( slotOlderChanged( int )));
-
-    connect( dialog->btnFontNewer, TQT_SIGNAL( clicked() ),
-             TQT_SLOT( slotGetFontNewer() ));
-    connect( dialog->btnFontOlder, TQT_SIGNAL( clicked() ),
-             TQT_SLOT( slotGetFontOlder() ));
-    connect( dialog->btnClearHistory, TQT_SIGNAL( clicked() ),
-             TQT_SLOT( slotClearHistory() ));
-
-    connect( dialog->cbDetailedTips, TQT_SIGNAL( toggled( bool )),
-             TQT_SLOT( configChanged() ));
-    connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )),
-             TQT_SLOT( configChanged() ));
-    connect( dialog->spinEntries, TQT_SIGNAL( valueChanged( int )),
-             TQT_SLOT( configChanged() ));
-    connect( dialog->comboNewer, TQT_SIGNAL( activated( int )),
-             TQT_SLOT( configChanged() ));
-    connect( dialog->comboOlder, TQT_SIGNAL( activated( int )),
-             TQT_SLOT( configChanged() ));
+    connect( dialog->cbExpire, TQ_SIGNAL( toggled( bool )),
+	     dialog->spinExpire, TQ_SLOT( setEnabled( bool )));
+    connect( dialog->spinExpire, TQ_SIGNAL( valueChanged( int )),
+	     this, TQ_SLOT( slotExpireChanged( int )));
+
+    connect( dialog->spinNewer, TQ_SIGNAL( valueChanged( int )),
+	     TQ_SLOT( slotNewerChanged( int )));
+    connect( dialog->spinOlder, TQ_SIGNAL( valueChanged( int )),
+	     TQ_SLOT( slotOlderChanged( int )));
+
+    connect( dialog->btnFontNewer, TQ_SIGNAL( clicked() ),
+             TQ_SLOT( slotGetFontNewer() ));
+    connect( dialog->btnFontOlder, TQ_SIGNAL( clicked() ),
+             TQ_SLOT( slotGetFontOlder() ));
+    connect( dialog->btnClearHistory, TQ_SIGNAL( clicked() ),
+             TQ_SLOT( slotClearHistory() ));
+
+    connect( dialog->cbDetailedTips, TQ_SIGNAL( toggled( bool )),
+             TQ_SLOT( configChanged() ));
+    connect( dialog->cbExpire, TQ_SIGNAL( toggled( bool )),
+             TQ_SLOT( configChanged() ));
+    connect( dialog->spinEntries, TQ_SIGNAL( valueChanged( int )),
+             TQ_SLOT( configChanged() ));
+    connect( dialog->comboNewer, TQ_SIGNAL( activated( int )),
+             TQ_SLOT( configChanged() ));
+    connect( dialog->comboOlder, TQ_SIGNAL( activated( int )),
+             TQ_SLOT( configChanged() ));
 
     dialog->show();
     topLayout->add(dialog);
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index 77e4f640b..6dee8c0dd 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -136,8 +136,8 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidg
     m_part = parent;
 
     m_animationTimer = new TQTimer( this );
-    connect( m_animationTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( slotAnimation() ) );
+    connect( m_animationTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( slotAnimation() ) );
 
     m_currentBeforeDropItem = 0;
     m_dropItem = 0;
@@ -148,22 +148,22 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidg
     setTreeStepSize(15);
 
     m_autoOpenTimer = new TQTimer( this );
-    connect( m_autoOpenTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( slotAutoOpenFolder() ) );
-
-    connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
-             this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) );
-    connect( this, TQT_SIGNAL( mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
-             this, TQT_SLOT( slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) );
-    connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ),
-	     this, TQT_SLOT( slotSidebarMouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ) );
-    connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ),
-             this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) );
-    connect( this, TQT_SIGNAL( selectionChanged() ),
-             this, TQT_SLOT( slotSelectionChanged() ) );
-
-    connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)),
-             this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int)));
+    connect( m_autoOpenTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( slotAutoOpenFolder() ) );
+
+    connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+             this, TQ_SLOT( slotDoubleClicked( TQListViewItem * ) ) );
+    connect( this, TQ_SIGNAL( mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
+             this, TQ_SLOT( slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) );
+    connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ),
+	     this, TQ_SLOT( slotSidebarMouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ) );
+    connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ),
+             this, TQ_SLOT( slotDoubleClicked( TQListViewItem * ) ) );
+    connect( this, TQ_SIGNAL( selectionChanged() ),
+             this, TQ_SLOT( slotSelectionChanged() ) );
+
+    connect( this, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)),
+             this, TQ_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int)));
 
 /*    assert( m_part->getInterfaces()->getInstance()->dirs );
     TQString dirtreeDir = m_part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" ); */
@@ -558,7 +558,7 @@ void KonqSidebarTree::FilesAdded( const KURL & dir )
     kdDebug(1201) << "KonqSidebarTree::FilesAdded " << dir.url() << endl;
     if ( m_dirtreeDir.dir.isParentOf( dir ) )
         // We use a timer in case of DCOP re-entrance..
-        TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) );
+        TQTimer::singleShot( 0, this, TQ_SLOT( rescanConfiguration() ) );
 }
 
 void KonqSidebarTree::FilesRemoved( const KURL::List & urls )
@@ -569,7 +569,7 @@ void KonqSidebarTree::FilesRemoved( const KURL::List & urls )
         //kdDebug(1201) <<  "KonqSidebarTree::FilesRemoved " << (*it).prettyURL() << endl;
         if ( m_dirtreeDir.dir.isParentOf( *it ) )
         {
-            TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) );
+            TQTimer::singleShot( 0, this, TQ_SLOT( rescanConfiguration() ) );
             kdDebug(1201) << "KonqSidebarTree::FilesRemoved done" << endl;
             return;
         }
@@ -909,21 +909,21 @@ void KonqSidebarTree::showToplevelContextMenu()
     {
         m_collection = new TDEActionCollection( this, "bookmark actions" );
         (void) new TDEAction( i18n("&Create New Folder..."), "folder-new", 0, this,
-                            TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder");
+                            TQ_SLOT( slotCreateFolder() ), m_collection, "create_folder");
         (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, this,
-                            TQT_SLOT( slotDelete() ), m_collection, "delete_folder");
+                            TQ_SLOT( slotDelete() ), m_collection, "delete_folder");
         (void) new TDEAction( i18n("Rename"), 0, this,
-                            TQT_SLOT( slotRename() ), m_collection, "rename");
+                            TQ_SLOT( slotRename() ), m_collection, "rename");
         (void) new TDEAction( i18n("Delete Link"), "edit-delete", 0, this,
-                            TQT_SLOT( slotDelete() ), m_collection, "delete_link");
+                            TQ_SLOT( slotDelete() ), m_collection, "delete_link");
         (void) new TDEAction( i18n("Properties"), "edit", 0, this,
-                            TQT_SLOT( slotProperties() ), m_collection, "item_properties");
+                            TQ_SLOT( slotProperties() ), m_collection, "item_properties");
         (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, this,
-                            TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
+                            TQ_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
         (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this,
-                            TQT_SLOT( slotOpenTab() ), m_collection, "open_tab");
+                            TQ_SLOT( slotOpenTab() ), m_collection, "open_tab");
         (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, this,
-                            TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location");
+                            TQ_SLOT( slotCopyLocation() ), m_collection, "copy_location");
     }
 
     TQPopupMenu *menu = new TQPopupMenu;
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp
index 1903c2328..4bd91f9f3 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.cpp
+++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp
@@ -34,25 +34,25 @@ KonqSidebar_Tree::KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidg
 			TQLabel* slbl = new TQLabel(i18n("Se&arch:"), searchline);
 			TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(searchline,tree);
 			slbl->setBuddy(listViewSearch);
-			connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear()));
+			connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear()));
 		}
 		else
 			tree=new KonqSidebarTree(this,widget,virt,desktopName_);
 
-    		connect(tree, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)),
-			this,TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)));
+    		connect(tree, TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)),
+			this,TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)));
 
-		connect(tree,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
-			this,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)));
+		connect(tree,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
+			this,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)));
 
-		connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )),
-			this,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )));
+		connect(tree,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )),
+			this,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )));
 
-		connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )),
-			this,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )));
+		connect(tree,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )),
+			this,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )));
 
-		connect(tree,TQT_SIGNAL(enableAction( const char *, bool )),
-			this,TQT_SIGNAL(enableAction( const char *, bool)));
+		connect(tree,TQ_SIGNAL(enableAction( const char *, bool )),
+			this,TQ_SIGNAL(enableAction( const char *, bool)));
 
         }
 
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() {}