Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

4 files changed, 39 insertions, 39 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
 			{