Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

16 files changed, 96 insertions, 96 deletions

diff --git a/configdialog/kbfxconfigapp.cpp b/configdialog/kbfxconfigapp.cpp
index d9f3ac8..5f8e49b 100644
--- a/configdialog/kbfxconfigapp.cpp
+++ b/configdialog/kbfxconfigapp.cpp
@@ -79,62 +79,62 @@ void KbfxConfigApp::InitForm()
 	lb_Main->insertItem ( img_themes, tr2i18n ( "Themes" ), THEMES );
 	KbfxConfigDlgThemes *pageThemes = new KbfxConfigDlgThemes();
 	ws_Main->addWidget ( pageThemes, THEMES );
-	connect ( this, TQT_SIGNAL ( KbfxConfigDlgThemesChanged() ),
-	          pageThemes, TQT_SLOT ( ChangeForm() ) );
+	connect ( this, TQ_SIGNAL ( KbfxConfigDlgThemesChanged() ),
+	          pageThemes, TQ_SLOT ( ChangeForm() ) );
 	emit KbfxConfigDlgThemesChanged();
-	connect ( pageThemes->KbfxGetMoreThemes, TQT_SIGNAL ( clicked() ),
-	          this, TQT_SLOT ( KbfxGetMoreThemesClicked() ) );
-	connect ( this, TQT_SIGNAL ( KbfxThemeDoInstall ( TQString & ) ),
-	          pageThemes, TQT_SLOT ( KbfxThemeInstall ( TQString & ) ) );
+	connect ( pageThemes->KbfxGetMoreThemes, TQ_SIGNAL ( clicked() ),
+	          this, TQ_SLOT ( KbfxGetMoreThemesClicked() ) );
+	connect ( this, TQ_SIGNAL ( KbfxThemeDoInstall ( TQString & ) ),
+	          pageThemes, TQ_SLOT ( KbfxThemeInstall ( TQString & ) ) );
 
 	/* initialize Button page */
 	lb_Main->insertItem ( img_button, tr2i18n ( "Start Button" ), BUTTON );
 	KbfxConfigDlgButton *pageButton = new KbfxConfigDlgButton();
 	ws_Main->addWidget ( pageButton, BUTTON );
-	connect ( this, TQT_SIGNAL ( KbfxConfigDlgButtonChanged() ),
-	          pageButton, TQT_SLOT ( ChangeForm() ) );
+	connect ( this, TQ_SIGNAL ( KbfxConfigDlgButtonChanged() ),
+	          pageButton, TQ_SLOT ( ChangeForm() ) );
 	emit KbfxConfigDlgButtonChanged();
 
 	/* initialize Fonts page */
 	lb_Main->insertItem ( img_fonts, tr2i18n ( "Fonts" ), FONTS );
 	KbfxConfigDlgFonts *pageFonts = new KbfxConfigDlgFonts();
 	ws_Main->addWidget ( pageFonts, FONTS );
-	connect ( this, TQT_SIGNAL ( KbfxConfigDlgFontsChanged() ),
-	          pageFonts, TQT_SLOT ( ChangeForm() ) );
+	connect ( this, TQ_SIGNAL ( KbfxConfigDlgFontsChanged() ),
+	          pageFonts, TQ_SLOT ( ChangeForm() ) );
 	emit KbfxConfigDlgFontsChanged();
 
 	/* initialize Layout Page */
 	lb_Main->insertItem ( img_search, tr2i18n ( "Layout" ),  LAYOUT );
 	KbfxConfigDlgLayout *pageLayout = new KbfxConfigDlgLayout();
 	ws_Main->addWidget ( pageLayout, LAYOUT );
-	connect ( this, TQT_SIGNAL ( KbfxConfigDlgLayoutChanged() ),
-	          pageLayout, TQT_SLOT ( ChangeForm() ) );
-	connect ( this, TQT_SIGNAL ( KbfxConfigDlgLayoutLeft() ),
-	          pageLayout, TQT_SLOT ( LayoutFormLeft() ) );
+	connect ( this, TQ_SIGNAL ( KbfxConfigDlgLayoutChanged() ),
+	          pageLayout, TQ_SLOT ( ChangeForm() ) );
+	connect ( this, TQ_SIGNAL ( KbfxConfigDlgLayoutLeft() ),
+	          pageLayout, TQ_SLOT ( LayoutFormLeft() ) );
 	emit KbfxConfigDlgLayoutChanged();
 
 	/* initialize Plugins Page */
 	lb_Main->insertItem ( img_plugins, tr2i18n ( "Plugins" ),  PLUGINS );
 	KbfxConfigDlgPlugins *pagePlugins = new KbfxConfigDlgPlugins();
 	ws_Main->addWidget ( pagePlugins, PLUGINS );
-	connect ( this, TQT_SIGNAL ( KbfxConfigDlgPluginsChanged() ),
-	          pagePlugins, TQT_SLOT ( ChangeForm() ) );
+	connect ( this, TQ_SIGNAL ( KbfxConfigDlgPluginsChanged() ),
+	          pagePlugins, TQ_SLOT ( ChangeForm() ) );
 	emit KbfxConfigDlgPluginsChanged();
 
 	/* initialize Tooltip page */
 	lb_Main->insertItem ( img_tooltip, tr2i18n ( "Tooltip" ), TOOLTIP );
 	KbfxConfigDlgTooltip *pageTooltip = new KbfxConfigDlgTooltip();
 	ws_Main->addWidget ( pageTooltip, TOOLTIP );
-	connect ( this, TQT_SIGNAL ( KbfxConfigDlgTooltipChanged() ),
-	          pageTooltip, TQT_SLOT ( ChangeForm() ) );
+	connect ( this, TQ_SIGNAL ( KbfxConfigDlgTooltipChanged() ),
+	          pageTooltip, TQ_SLOT ( ChangeForm() ) );
 	emit KbfxConfigDlgTooltipChanged();
 
 	/* initialize Menu Style page */
 	lb_Main->insertItem ( img_style, tr2i18n ( "Menu Style" ), STYLE );
 	KbfxConfigDlgStyle *pageStyle = new KbfxConfigDlgStyle();
 	ws_Main->addWidget ( pageStyle, STYLE );
-	connect ( this, TQT_SIGNAL ( KbfxConfigDlgStyleChanged() ),
-	          pageStyle, TQT_SLOT ( ChangeForm() ) );
+	connect ( this, TQ_SIGNAL ( KbfxConfigDlgStyleChanged() ),
+	          pageStyle, TQ_SLOT ( ChangeForm() ) );
 	emit KbfxConfigDlgStyleChanged();
 
 	/* initialize About page */
@@ -143,14 +143,14 @@ void KbfxConfigApp::InitForm()
 	ws_Main->addWidget ( pageAbout,ABOUT );
 	pageAbout->KbfxLabelVersion->setText ( m_KbfxVersion2 );
 
-	connect ( btn_Default, TQT_SIGNAL ( clicked() ),
-	          this, TQT_SLOT ( btn_DefaultClicked() ) );
-	connect ( btn_Help, TQT_SIGNAL ( clicked() ),
-	          this, TQT_SLOT ( btn_HelpClicked() ) );
-	connect ( lb_Main, TQT_SIGNAL ( highlighted ( int ) ),
-	          this, TQT_SLOT ( KbfxMenuItemChanged ( int ) ) );
-	connect ( btn_SaveApply, TQT_SIGNAL ( clicked() ),
-	          this, TQT_SLOT ( btn_SaveApplyClicked() ) );
+	connect ( btn_Default, TQ_SIGNAL ( clicked() ),
+	          this, TQ_SLOT ( btn_DefaultClicked() ) );
+	connect ( btn_Help, TQ_SIGNAL ( clicked() ),
+	          this, TQ_SLOT ( btn_HelpClicked() ) );
+	connect ( lb_Main, TQ_SIGNAL ( highlighted ( int ) ),
+	          this, TQ_SLOT ( KbfxMenuItemChanged ( int ) ) );
+	connect ( btn_SaveApply, TQ_SIGNAL ( clicked() ),
+	          this, TQ_SLOT ( btn_SaveApplyClicked() ) );
 
 	m_KbfxPage = THEMES;
 	lb_Main->setCurrentItem ( THEMES );
@@ -350,8 +350,8 @@ void KbfxConfigApp::browserInit()
 {
 	/* initialize NewsBrowser widget */
 	tdeio = new KbfxKioDownload();
-	connect ( tdeio, TQT_SIGNAL ( KbfxKioDownloadReady() ),
-	          this, TQT_SLOT ( KbfxNewsBrowserLoad() ) );
+	connect ( tdeio, TQ_SIGNAL ( KbfxKioDownloadReady() ),
+	          this, TQ_SLOT ( KbfxNewsBrowserLoad() ) );
 	tdeio->KbfxKioDownloadStart ( m_KbfxNewsBrowserAddress );
 }
 
@@ -369,11 +369,11 @@ void KbfxConfigApp::KbfxNewsBrowserLoad()
 		browser->view()->show();
 
 		connect ( browser->browserExtension(),
-		          TQT_SIGNAL ( openURLRequest ( const KURL &, const KParts::URLArgs & ) ),
+		          TQ_SIGNAL ( openURLRequest ( const KURL &, const KParts::URLArgs & ) ),
 		          this,
-		          TQT_SLOT ( KbfxNewsBrowserOpenURLRequest ( const KURL &, const KParts::URLArgs & ) ) );
-		connect ( browser, TQT_SIGNAL ( completed() ),
-		          this, TQT_SLOT ( KbfxNewsBrowserCompleted() ) );
+		          TQ_SLOT ( KbfxNewsBrowserOpenURLRequest ( const KURL &, const KParts::URLArgs & ) ) );
+		connect ( browser, TQ_SIGNAL ( completed() ),
+		          this, TQ_SLOT ( KbfxNewsBrowserCompleted() ) );
 	}
 }
 
diff --git a/configdialog/kbfxconfigdlgbutton.ui.h b/configdialog/kbfxconfigdlgbutton.ui.h
index 0901dd2..563456c 100644
--- a/configdialog/kbfxconfigdlgbutton.ui.h
+++ b/configdialog/kbfxconfigdlgbutton.ui.h
@@ -12,8 +12,8 @@
 
 void KbfxConfigDlgButton::init()
 {
-	connect ( this, TQT_SIGNAL ( KbfxConfigDlgButtonChanged ( const char *, const TQString & ) ),
-	          this, TQT_SLOT ( ChangeForm ( const char *, const TQString & ) ) );
+	connect ( this, TQ_SIGNAL ( KbfxConfigDlgButtonChanged ( const char *, const TQString & ) ),
+	          this, TQ_SLOT ( ChangeForm ( const char *, const TQString & ) ) );
 }
 
 /* actions performed when url is selected */
diff --git a/configdialog/kbfxconfigdlgthemes.ui.h b/configdialog/kbfxconfigdlgthemes.ui.h
index af17719..74d600b 100644
--- a/configdialog/kbfxconfigdlgthemes.ui.h
+++ b/configdialog/kbfxconfigdlgthemes.ui.h
@@ -17,8 +17,8 @@ void KbfxConfigDlgThemes::init()
 	KbfxFormReady = FALSE;
 	img_nopreview = image0;
 
-	connect ( this, TQT_SIGNAL ( KbfxThemeDoInstall ( TQString & ) ),
-	          this, TQT_SLOT ( KbfxThemeInstall ( TQString & ) ) );
+	connect ( this, TQ_SIGNAL ( KbfxThemeDoInstall ( TQString & ) ),
+	          this, TQ_SLOT ( KbfxThemeInstall ( TQString & ) ) );
 }
 
 /*
diff --git a/configdialog/main.cpp b/configdialog/main.cpp
index 4995ccb..1888c59 100644
--- a/configdialog/main.cpp
+++ b/configdialog/main.cpp
@@ -95,7 +95,7 @@ class KbfxConfigApplication : public KUniqueApplication
 				}
 
 				kdDebug() << "KBFX theme prepared. Quitting..." << endl;
-				TQTimer::singleShot ( 100, mainWin, TQT_SLOT ( deleteLater() ) );
+				TQTimer::singleShot ( 100, mainWin, TQ_SLOT ( deleteLater() ) );
 			}
 			else
 			{
diff --git a/kbfxlib/common/kbfxfontchooser.cpp b/kbfxlib/common/kbfxfontchooser.cpp
index 932e865..a95d120 100644
--- a/kbfxlib/common/kbfxfontchooser.cpp
+++ b/kbfxlib/common/kbfxfontchooser.cpp
@@ -45,7 +45,7 @@ KBFXFontChooser::KBFXFontChooser ( TQWidget *parent, const char *name )
 	                          3 * KDialog::spacingHint() + pixmap.width() );
 	layout->addWidget ( m_button );
 
-	connect ( m_button, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( buttonClicked() ) );
+	connect ( m_button, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( buttonClicked() ) );
 
 	updateFontLabel();
 
diff --git a/kbfxlib/common/kbfxkiodownload.cpp b/kbfxlib/common/kbfxkiodownload.cpp
index 6b3a9f7..7101a7f 100644
--- a/kbfxlib/common/kbfxkiodownload.cpp
+++ b/kbfxlib/common/kbfxkiodownload.cpp
@@ -42,8 +42,8 @@ void KbfxKioDownload::KbfxKioDownloadStart ( TQString &url )
 	                         KURL ( m_KbfxBrowserTmpFile ),
 	                         -1,
 	                         TRUE );
-	connect ( download_job, TQT_SIGNAL ( result ( TDEIO::Job* ) ),
-	          this, TQT_SLOT ( KbfxBrowserResult ( TDEIO::Job * ) ) );
+	connect ( download_job, TQ_SIGNAL ( result ( TDEIO::Job* ) ),
+	          this, TQ_SLOT ( KbfxBrowserResult ( TDEIO::Job * ) ) );
 }
 
 void KbfxKioDownload::KbfxBrowserResult ( TDEIO::Job *download_job )
diff --git a/src/kbfxbutton.cpp b/src/kbfxbutton.cpp
index 585b36e..9ae3410 100644
--- a/src/kbfxbutton.cpp
+++ b/src/kbfxbutton.cpp
@@ -44,11 +44,11 @@ KbfxButton::KbfxButton ( TQWidget * parent, const char *name) :
 
 	m_toggle = false;
 	TQTimer * timer = new TQTimer ( this,"Update Timer" );
-	connect ( timer,TQT_SIGNAL ( timeout() ),this,TQT_SLOT ( update() ) );
+	connect ( timer,TQ_SIGNAL ( timeout() ),this,TQ_SLOT ( update() ) );
 	timer->start ( 25,false );
 
 	fade_timer = new TQTimer ( this,"Fade Timer" );
-	connect ( fade_timer,TQT_SIGNAL ( timeout() ),this,TQT_SLOT ( fade() ) );
+	connect ( fade_timer,TQ_SIGNAL ( timeout() ),this,TQ_SLOT ( fade() ) );
 }
 
 KbfxButton::~KbfxButton()
@@ -273,14 +273,14 @@ void KbfxButton::mousePressEvent ( TQMouseEvent * e )
 		TQPopupMenu *popup = new TQPopupMenu();
 
 		popup->insertItem ( SmallIcon ( "remove" ), i18n ( "Remove KBFX from Pannel" ),
-							this, TQT_SLOT ( selfDeleter() ) );
+							this, TQ_SLOT ( selfDeleter() ) );
 		popup->insertItem ( SmallIcon ( "reload" ),i18n ( "Reload KBFX" ),
-							this, TQT_SLOT ( reloadConfig() ) );
+							this, TQ_SLOT ( reloadConfig() ) );
 		popup->insertSeparator();
 		popup->insertItem ( SmallIcon ( "kbfxconfigapp" ), i18n ( "Configure KBFX" ),
-							this, TQT_SLOT ( openConfigDialog() ) );
+							this, TQ_SLOT ( openConfigDialog() ) );
 		popup->insertItem ( SmallIcon ( "kmenuedit" ),i18n ( "Edit Applications Menu" ),
-							this, TQT_SLOT ( openKmenuEdit() ) );
+							this, TQ_SLOT ( openKmenuEdit() ) );
 		popup->exec ( e->globalPos() );
 		delete popup;
 	}
diff --git a/src/kbfxplasmacanvasgroupview.cpp b/src/kbfxplasmacanvasgroupview.cpp
index 63a7347..5a3604b 100644
--- a/src/kbfxplasmacanvasgroupview.cpp
+++ b/src/kbfxplasmacanvasgroupview.cpp
@@ -62,10 +62,10 @@ KbfxPlasmaCanvasGroupView::addGroup ( KbfxPlasmaCanvasGroup * gPtr )
 //	gPtr->show();
 //	tqDebug("adding Groupy");
 		m_count++;
-		connect ( gPtr, TQT_SIGNAL ( groupShade ( uint ) ), this,
-		          TQT_SLOT ( foldGroup ( uint ) ) );
-		connect ( gPtr, TQT_SIGNAL ( groupUnShade ( uint ) ), this,
-		          TQT_SLOT ( unFoldGroup ( uint ) ) );
+		connect ( gPtr, TQ_SIGNAL ( groupShade ( uint ) ), this,
+		          TQ_SLOT ( foldGroup ( uint ) ) );
+		connect ( gPtr, TQ_SIGNAL ( groupUnShade ( uint ) ), this,
+		          TQ_SLOT ( unFoldGroup ( uint ) ) );
 
 
 	}
diff --git a/src/kbfxplasmacanvasitem.cpp b/src/kbfxplasmacanvasitem.cpp
index c78a940..0c18256 100644
--- a/src/kbfxplasmacanvasitem.cpp
+++ b/src/kbfxplasmacanvasitem.cpp
@@ -32,7 +32,7 @@ KbfxPlasmaCanvasItem::KbfxPlasmaCanvasItem ( TQCanvasPixmapArray * a , TQCanvas
 	m_commentText ="No Comment Set By Plugin";
 	m_height =_img->height();
 	m_width  =_img->width();
-	connect ( this,TQT_SIGNAL ( clicked() ),this,TQT_SLOT ( exec() ) );
+	connect ( this,TQ_SIGNAL ( clicked() ),this,TQ_SLOT ( exec() ) );
 	m_type = OTHER;
 // ConfigInit().read();
 	m_noComments = ConfigInit().m_noComments;
diff --git a/src/kbfxplasmacanvasview.cpp b/src/kbfxplasmacanvasview.cpp
index 5fec81e..6814372 100644
--- a/src/kbfxplasmacanvasview.cpp
+++ b/src/kbfxplasmacanvasview.cpp
@@ -46,10 +46,10 @@ KbfxPlasmaCanvasView::KbfxPlasmaCanvasView ( TQWidget * parent,
 	m_scrollbar_top->setType ( KbfxSpinxScrollBar::UP );
 	m_scrollbar_bot->setType ( KbfxSpinxScrollBar::DOWN );
 
-	connect ( m_scrollbar_top, TQT_SIGNAL ( scroll ( int, int ) ), this,
-	          TQT_SLOT ( scrollBy ( int, int ) ) );
-	connect ( m_scrollbar_bot, TQT_SIGNAL ( scroll ( int, int ) ), this,
-	          TQT_SLOT ( scrollBy ( int, int ) ) );
+	connect ( m_scrollbar_top, TQ_SIGNAL ( scroll ( int, int ) ), this,
+	          TQ_SLOT ( scrollBy ( int, int ) ) );
+	connect ( m_scrollbar_bot, TQ_SIGNAL ( scroll ( int, int ) ), this,
+	          TQ_SLOT ( scrollBy ( int, int ) ) );
 
 	placeScrollBars ();
 }
diff --git a/src/kbfxplasmaindexview.cpp b/src/kbfxplasmaindexview.cpp
index a1e575d..cba3b69 100644
--- a/src/kbfxplasmaindexview.cpp
+++ b/src/kbfxplasmaindexview.cpp
@@ -43,8 +43,8 @@ KbfxPlasmaIndexView::KbfxPlasmaIndexView ( TQWidget * parent, const char *name,
 	m_currentItem = 0L;
 	m_selectedItem = 0L;
 //	m_pluginList = "";
-	connect ( this, TQT_SIGNAL ( clicked ( KbfxPlasmaIndexItem * ) ), this,
-	          TQT_SLOT ( slotClicked ( KbfxPlasmaIndexItem * ) ) );
+	connect ( this, TQ_SIGNAL ( clicked ( KbfxPlasmaIndexItem * ) ), this,
+	          TQ_SLOT ( slotClicked ( KbfxPlasmaIndexItem * ) ) );
 	m_currentView = 0;
 	setDragAutoScroll ( true );
 }
@@ -167,8 +167,8 @@ KbfxPlasmaIndexView::contentsContextMenuEvent ( TQContextMenuEvent * event )
 	event = event;
 /*
 	m_pluginMenu = new TDEPopupMenu ( this );;
-	connect ( m_pluginMenu, TQT_SIGNAL ( activated ( int ) ), this,
-	          TQT_SLOT ( contextMenuSlot ( int ) ) );
+	connect ( m_pluginMenu, TQ_SIGNAL ( activated ( int ) ), this,
+	          TQ_SLOT ( contextMenuSlot ( int ) ) );
 
 	m_pluginMenu->insertTitle ( "Insert Plugin", 0, 0 );
 	int _index = 1;
@@ -317,7 +317,7 @@ KbfxPlasmaIndexView::contentsMouseMoveEvent ( TQMouseEvent * me )
 
 	this->setCursor ( TQCursor ( TQt::PointingHandCursor ) );
 
-	TQTimer::singleShot ( 800, this, TQT_SLOT ( checkMousePos () ) );
+	TQTimer::singleShot ( 800, this, TQ_SLOT ( checkMousePos () ) );
 
 	if ( contentsToViewport ( me->pos () ).y () < this->height () / 5 )
 	{
diff --git a/src/kbfxspinx.cpp b/src/kbfxspinx.cpp
index 0c6001b..7c02679 100644
--- a/src/kbfxspinx.cpp
+++ b/src/kbfxspinx.cpp
@@ -60,14 +60,14 @@ void KbfxSpinx::createKbfx()
 	else
 	{
 		createRMenu();
-		connect ( m_menu,TQT_SIGNAL ( aboutToHide () ),kbfxBtn,TQT_SLOT ( toggle() ) );
+		connect ( m_menu,TQ_SIGNAL ( aboutToHide () ),kbfxBtn,TQ_SLOT ( toggle() ) );
 	}
 
 	kmenu_timer = new TQTimer ( this,"Fade Timer" );
-	connect ( kmenu_timer, TQT_SIGNAL ( timeout() ), kbfxBtn, TQT_SLOT ( toggleKMenu () ) );
+	connect ( kmenu_timer, TQ_SIGNAL ( timeout() ), kbfxBtn, TQ_SLOT ( toggleKMenu () ) );
 
-	connect ( kbfxBtn  , TQT_SIGNAL ( pressed() ),this,TQT_SLOT ( showKbfxMenu() ) );
-	connect ( kbfxBtn  , TQT_SIGNAL ( showToolTip() ),this,TQT_SLOT ( ToolTip() ) );
+	connect ( kbfxBtn  , TQ_SIGNAL ( pressed() ),this,TQ_SLOT ( showKbfxMenu() ) );
+	connect ( kbfxBtn  , TQ_SIGNAL ( showToolTip() ),this,TQ_SLOT ( ToolTip() ) );
 
 	if ( m_kicker_auto_adjust )
 		m_parent->resize ( m_parent->width(),kbfxBtn->height() );
@@ -82,8 +82,8 @@ void KbfxSpinx::createKbfx()
 		l_path.append("/");
 		l_watch->addDir(l_path);
 		l_watch->startScan( TRUE, FALSE);
-		connect ( l_watch, TQT_SIGNAL ( dirty(const TQString&) ),
-				  this, TQT_SLOT ( dirtyReaload(const TQString&) ) );
+		connect ( l_watch, TQ_SIGNAL ( dirty(const TQString&) ),
+				  this, TQ_SLOT ( dirtyReaload(const TQString&) ) );
 		delete l_user;
 	}
 }
@@ -172,8 +172,8 @@ void KbfxSpinx::ToolTip ()
 		popx -= tooltip->width();
 	}
 
-	connect ( kbfxBtn, TQT_SIGNAL ( leave () ), tooltip, TQT_SLOT ( hideToolTip () ) );
-	connect ( kbfxBtn, TQT_SIGNAL ( clicked () ), tooltip, TQT_SLOT ( hideToolTip () ) );
+	connect ( kbfxBtn, TQ_SIGNAL ( leave () ), tooltip, TQ_SLOT ( hideToolTip () ) );
+	connect ( kbfxBtn, TQ_SIGNAL ( clicked () ), tooltip, TQ_SLOT ( hideToolTip () ) );
 	tooltip->setStartPos ( popx, popy );
 	tooltip->show ();
 }
diff --git a/src/kbfxspinxmenu.cpp b/src/kbfxspinxmenu.cpp
index f881de4..c2a7f8c 100644
--- a/src/kbfxspinxmenu.cpp
+++ b/src/kbfxspinxmenu.cpp
@@ -86,8 +86,8 @@ KbfxSpinxMenuWidget::init()
 	m_search->resize ( ConfigInit ().m_searchBox_w - m_searchTag->width (),
 	                   ConfigInit ().m_searchBox_h );
 
-	connect (m_searchTag, TQT_SIGNAL (mouseDoubleClicked ( const ButtonState & )), this,
-			 TQT_SLOT (search_clear ( const ButtonState & )));
+	connect (m_searchTag, TQ_SIGNAL (mouseDoubleClicked ( const ButtonState & )), this,
+			 TQ_SLOT (search_clear ( const ButtonState & )));
 
 	int frameHeight = ConfigInit().m_listBox_h;
 
@@ -143,37 +143,37 @@ KbfxSpinxMenuWidget::init()
 
 	loadHistory ();
 
-	connect ( m_indexView, TQT_SIGNAL ( loadRequest ( KbfxSignal ) ), m_canvasView,
-	          TQT_SLOT ( handleLoadRequest ( KbfxSignal ) ) );
+	connect ( m_indexView, TQ_SIGNAL ( loadRequest ( KbfxSignal ) ), m_canvasView,
+	          TQ_SLOT ( handleLoadRequest ( KbfxSignal ) ) );
 
-	connect ( m_indexLeftView, TQT_SIGNAL ( loadRequest ( KbfxSignal ) ), m_canvasView,
-	          TQT_SLOT ( handleLoadRequest ( KbfxSignal ) ) );
+	connect ( m_indexLeftView, TQ_SIGNAL ( loadRequest ( KbfxSignal ) ), m_canvasView,
+	          TQ_SLOT ( handleLoadRequest ( KbfxSignal ) ) );
 
-	connect ( m_canvasView, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( hideMenu () ) );
+	connect ( m_canvasView, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( hideMenu () ) );
 
-	connect ( m_search, TQT_SIGNAL ( textChanged ( const TQString & ) ), m_canvasView,
-	          TQT_SLOT ( search ( const TQString & ) ) );
+	connect ( m_search, TQ_SIGNAL ( textChanged ( const TQString & ) ), m_canvasView,
+	          TQ_SLOT ( search ( const TQString & ) ) );
 
 	connect ( m_indexView,
-	          TQT_SIGNAL ( pluginRequest ( TQString, KbfxPlasmaCanvasView * ) ),
-	          m_indexView, TQT_SLOT ( loadPlugin ( TQString, KbfxPlasmaCanvasView * ) ) );
+	          TQ_SIGNAL ( pluginRequest ( TQString, KbfxPlasmaCanvasView * ) ),
+	          m_indexView, TQ_SLOT ( loadPlugin ( TQString, KbfxPlasmaCanvasView * ) ) );
 
 	connect ( m_indexLeftView,
-	          TQT_SIGNAL ( pluginRequest ( TQString, KbfxPlasmaCanvasView * ) ),
+	          TQ_SIGNAL ( pluginRequest ( TQString, KbfxPlasmaCanvasView * ) ),
 	          m_indexLeftView,
-	          TQT_SLOT ( loadPlugin ( TQString, KbfxPlasmaCanvasView * ) ) );
+	          TQ_SLOT ( loadPlugin ( TQString, KbfxPlasmaCanvasView * ) ) );
 
 	connect ( m_indexView,
-	          TQT_SIGNAL ( clearSelected() ),
-	          m_indexLeftView, TQT_SLOT ( clearSelection() ) );
+	          TQ_SIGNAL ( clearSelected() ),
+	          m_indexLeftView, TQ_SLOT ( clearSelection() ) );
 
 	connect ( m_indexLeftView,
-	          TQT_SIGNAL ( clearSelected() ),
+	          TQ_SIGNAL ( clearSelected() ),
 	          m_indexView,
-	          TQT_SLOT ( clearSelection() ) );
+	          TQ_SLOT ( clearSelection() ) );
 
-	connect (this,TQT_SIGNAL(refresh()),m_canvasView,TQT_SLOT(reload()));
-	connect (this,TQT_SIGNAL(runItem()),m_canvasView,TQT_SLOT(execFirst()));
+	connect (this,TQ_SIGNAL(refresh()),m_canvasView,TQ_SLOT(reload()));
+	connect (this,TQ_SIGNAL(runItem()),m_canvasView,TQ_SLOT(execFirst()));
 
 	KbfxSpinxToolButton *logout = new KbfxSpinxToolButton ( m_toolBarBot );
 	KbfxSpinxToolButton *lock = new KbfxSpinxToolButton ( m_toolBarBot );
@@ -200,8 +200,8 @@ KbfxSpinxMenuWidget::init()
 	m_toolBarBot->addButton ( logout );
 	m_toolBarBot->addButton ( lock );
 
-	connect ( logout,TQT_SIGNAL ( clicked() ),this , TQT_SLOT ( hideMenu() ) );
-	connect ( lock ,TQT_SIGNAL ( clicked() ),this , TQT_SLOT ( hideMenu() ) );
+	connect ( logout,TQ_SIGNAL ( clicked() ),this , TQ_SLOT ( hideMenu() ) );
+	connect ( lock ,TQ_SIGNAL ( clicked() ),this , TQ_SLOT ( hideMenu() ) );
 }
 
 
diff --git a/src/kbfxspinxscrollbar.cpp b/src/kbfxspinxscrollbar.cpp
index f4cd784..eb6a174 100644
--- a/src/kbfxspinxscrollbar.cpp
+++ b/src/kbfxspinxscrollbar.cpp
@@ -44,7 +44,7 @@ KbfxSpinxScrollBar::KbfxSpinxScrollBar ( TQWidget * parent, const char *name, in
 	m_triAngle = TQPointArray ( 3 );
 	m_dir = DOWN;
 	m_timer = new TQTimer ( this,"ScrollTimer" );
-	connect ( m_timer,TQT_SIGNAL ( timeout() ),this,TQT_SLOT ( timeoutslot() ) );
+	connect ( m_timer,TQ_SIGNAL ( timeout() ),this,TQ_SLOT ( timeoutslot() ) );
 	m_pressed = false;
 
 }
diff --git a/src/kbfxspinxtoolbutton.cpp b/src/kbfxspinxtoolbutton.cpp
index c82e147..afe3c52 100644
--- a/src/kbfxspinxtoolbutton.cpp
+++ b/src/kbfxspinxtoolbutton.cpp
@@ -28,7 +28,7 @@ KbfxSpinxToolButton::KbfxSpinxToolButton ( TQWidget * parent , const char * name
 	m_fadeTime = ConfigInit().m_fadeTime;
 
 	fade_timer = new TQTimer ( this,"Fade Timer" );
-	connect ( fade_timer,TQT_SIGNAL ( timeout() ),this,TQT_SLOT ( fade() ) );
+	connect ( fade_timer,TQ_SIGNAL ( timeout() ),this,TQ_SLOT ( fade() ) );
 }
 
 
diff --git a/src/kbfxtooltip.cpp b/src/kbfxtooltip.cpp
index b929380..7c0b1aa 100644
--- a/src/kbfxtooltip.cpp
+++ b/src/kbfxtooltip.cpp
@@ -61,9 +61,9 @@ KbfxToolTip::KbfxToolTip ( TQWidget * parent, const char *name, WFlags fl ) :
 	_update_timer = new TQTimer ( this );
 	_move_timer = new TQTimer ( this );
 
-	connect ( _hide_timer, TQT_SIGNAL ( timeout () ), this, TQT_SLOT ( hide () ) );
-	connect ( _hide_timer, TQT_SIGNAL ( timeout () ), _agent, TQT_SLOT ( hide () ) );
-	connect ( _update_timer, TQT_SIGNAL ( timeout () ), this, TQT_SLOT ( logoMove () ) );
+	connect ( _hide_timer, TQ_SIGNAL ( timeout () ), this, TQ_SLOT ( hide () ) );
+	connect ( _hide_timer, TQ_SIGNAL ( timeout () ), _agent, TQ_SLOT ( hide () ) );
+	connect ( _update_timer, TQ_SIGNAL ( timeout () ), this, TQ_SLOT ( logoMove () ) );
 
 	TQCursor kbfxCursor;
 	kbfxCursor.setShape ( TQt::PointingHandCursor );