Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 21 insertions, 21 deletions

diff --git a/src/kchmsearchtoolbar.cpp b/src/kchmsearchtoolbar.cpp
index a51bb5f..2c7e272 100644
--- a/src/kchmsearchtoolbar.cpp
+++ b/src/kchmsearchtoolbar.cpp
@@ -63,18 +63,18 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
 	// Create the combobox to enter the find text
 	m_findBox = new TQComboBox (TRUE, this);
 	m_findBox->setMinimumWidth (200);
-	connect( m_findBox->lineEdit(), TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( onReturnPressed() ) );
+	connect( m_findBox->lineEdit(), TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( onReturnPressed() ) );
 	TQWhatsThis::add( m_findBox, i18n( "Enter here the text to search in the current page.") );	
 	
 	TQAccel *acc = new TQAccel( this );
-	acc->connectItem( acc->insertItem(Key_F+CTRL), this, TQT_SLOT( onAccelFocusSearchField() ) );
+	acc->connectItem( acc->insertItem(Key_F+CTRL), this, TQ_SLOT( onAccelFocusSearchField() ) );
 	
 	// Button 'prevous search result'
 	m_buttonPrev = new TQToolButton (iconPrev,
 				i18n( "Previous search result"),
 				TQString(),
 				this,
-				TQT_SLOT(onBtnPrevSearchResult()),
+				TQ_SLOT(onBtnPrevSearchResult()),
 				this);
 	TQWhatsThis::add( m_buttonPrev, i18n( "Click this button to find previous search result.") );
 
@@ -83,7 +83,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
 				i18n( "Next search result"),
 				TQString(),
 				this,
-				TQT_SLOT(onBtnNextSearchResult()),
+				TQ_SLOT(onBtnNextSearchResult()),
 				this);
 	TQWhatsThis::add( m_buttonNext, i18n( "Click this button to find next search result.") );
 
@@ -92,7 +92,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
 				i18n( "Locate this topic in content window"),
 				TQString(),
 				this,
-				TQT_SLOT( onBtnLocateInContentWindow() ),
+				TQ_SLOT( onBtnLocateInContentWindow() ),
 				this );
 	TQWhatsThis::add( m_buttonLocateInContent, i18n( "Click this button to find current topic in the content window, and open it.") );
 	
@@ -101,7 +101,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
 				i18n( "Increase font size"),
 				TQString(),
 				this,
-				TQT_SLOT(onBtnFontInc()),
+				TQ_SLOT(onBtnFontInc()),
 				this);
 	TQWhatsThis::add( m_buttonFontInc, i18n( "Click this button to increase the font size.") );
 
@@ -110,7 +110,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
 				i18n( "Decrease font size"),
 				TQString(),
 				this,
-				TQT_SLOT(onBtnFontDec()),
+				TQ_SLOT(onBtnFontDec()),
 				this);
 	TQWhatsThis::add( m_buttonFontDec, i18n( "Click this button to decrease the font size.") );
 	
@@ -119,7 +119,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
 				i18n( "View HTML source"),
 				TQString(),
 				this,
-				TQT_SLOT(onBtnViewSource()),
+				TQ_SLOT(onBtnViewSource()),
 				this);
 	TQWhatsThis::add( m_buttonViewSource, i18n( "Click this button to open a separate window with the page HTML source.") );
 	
@@ -128,7 +128,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
 				i18n( "Add to bookmarks"),
 				TQString(),
 				this,
-				TQT_SLOT(onBtnAddBookmark()),
+				TQ_SLOT(onBtnAddBookmark()),
 				this);
 	TQWhatsThis::add( m_buttonAddBookmark, i18n( "Click this button to add the current page to the bookmarks list.") );
 	
@@ -136,7 +136,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
 				i18n( "Prev page in TOC"),
 				TQString(),
 				this,
-				TQT_SLOT(onBtnPrevPageInToc()),
+				TQ_SLOT(onBtnPrevPageInToc()),
 				this);
 	TQWhatsThis::add( m_buttonAddBookmark, i18n( "Click this button to go to previous page in Table Of Content.") );
 	
@@ -144,7 +144,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
 				i18n( "Next page in TOC"),
 				TQString(),
 				this,
-				TQT_SLOT(onBtnNextPageInToc()),
+				TQ_SLOT(onBtnNextPageInToc()),
 				this);
 	TQWhatsThis::add( m_buttonAddBookmark, i18n( "Click this button to go to next page in Table of Content.") );
 	
@@ -152,20 +152,20 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
 	m_MenuView = new KTQPopupMenu( parent );
 	parent->menuBar()->insertItem( i18n( "&View"), m_MenuView );
 
-	m_MenuView->insertItem( i18n( "&Increase font"), this, TQT_SLOT(onBtnFontInc()), CTRL+Key_Plus );
-	m_MenuView->insertItem( i18n( "&Decrease font"), this, TQT_SLOT(onBtnFontDec()), CTRL+Key_Minus );
-	m_MenuView->insertItem( i18n( "&View HTML source"), this, TQT_SLOT(onBtnViewSource()), CTRL+Key_U );
+	m_MenuView->insertItem( i18n( "&Increase font"), this, TQ_SLOT(onBtnFontInc()), CTRL+Key_Plus );
+	m_MenuView->insertItem( i18n( "&Decrease font"), this, TQ_SLOT(onBtnFontDec()), CTRL+Key_Minus );
+	m_MenuView->insertItem( i18n( "&View HTML source"), this, TQ_SLOT(onBtnViewSource()), CTRL+Key_U );
 	
     m_MenuView->insertSeparator();
-	m_MenuView->insertItem( i18n( "&Bookmark this page"), this, TQT_SLOT(onBtnAddBookmark()), CTRL+Key_T  );
+	m_MenuView->insertItem( i18n( "&Bookmark this page"), this, TQ_SLOT(onBtnAddBookmark()), CTRL+Key_T  );
     m_MenuView->insertSeparator();
 	
 	m_menuShowFullscreenMenuID = m_MenuView->insertItem( i18n( "&Full screen"), this,
-			 TQT_SLOT(onBtnFullScreen()), Key_F11  );
+			 TQ_SLOT(onBtnFullScreen()), Key_F11  );
 	m_menuShowContentWindowMenuID = m_MenuView->insertItem( i18n( "&Show contents window"), this,
-			 TQT_SLOT(onBtnToggleContentWindow()), Key_F9 );
+			 TQ_SLOT(onBtnToggleContentWindow()), Key_F9 );
 	m_MenuView->insertItem( i18n( "&Locate in contents window"), this,
-			 TQT_SLOT(onBtnLocateInContentWindow()), CTRL+Key_L  );
+			 TQ_SLOT(onBtnLocateInContentWindow()), CTRL+Key_L  );
 	
 	m_MenuView->setItemChecked( m_menuShowFullscreenMenuID, false ); 
 	m_MenuView->setItemChecked( m_menuShowContentWindowMenuID, true ); 
@@ -177,7 +177,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
 
 	// Because the encoding menu is very large, it is not reasonable to have a slot for every item.
 	// It is simplier just to use a single slot for any menu item of this submenu.
-	connect (menu_langlist, TQT_SIGNAL( activated(int) ), this, TQT_SLOT ( onMenuActivated(int) ));
+	connect (menu_langlist, TQ_SIGNAL( activated(int) ), this, TQ_SLOT ( onMenuActivated(int) ));
 	
 	// Add the language entries
 	const LCHMTextEncoding * enctable = LCHMFileImpl::getTextEncodingTable();
@@ -197,7 +197,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
 			if ( !menu_sublang )
 			{
 				menu_sublang = new KTQPopupMenu( menu_langlist );
-				connect (menu_sublang, TQT_SIGNAL( activated(int) ), this, TQT_SLOT ( onMenuActivated(int) ));
+				connect (menu_sublang, TQ_SIGNAL( activated(int) ), this, TQ_SLOT ( onMenuActivated(int) ));
 			}
 				
 			menu_sublang->insertItem( item->sublanguage, idx );
@@ -225,7 +225,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
 	TQMap<TQString,bool> addedCharsets;
 	menu_enclist = new KTQPopupMenu( parent );
 
-	connect (menu_enclist, TQT_SIGNAL( activated(int) ), this, TQT_SLOT ( onMenuActivated(int) ));
+	connect (menu_enclist, TQ_SIGNAL( activated(int) ), this, TQ_SLOT ( onMenuActivated(int) ));
 	
 	// Add the codepage entries
 	for ( idx = 0; (enctable + idx)->language; idx++ )