Rename old tq methods that no longer need a unique name

(cherry picked from commit c9d6a7478114a66f06bfdde4ad9164cce03e4149)

12 files changed, 41 insertions, 41 deletions

diff --git a/src/kchmlistitemtooltip.h b/src/kchmlistitemtooltip.h
index 46bd2f6..8bf43bf 100644
--- a/src/kchmlistitemtooltip.h
+++ b/src/kchmlistitemtooltip.h
@@ -47,13 +47,13 @@ class KCHMListItemTooltip : public TQToolTip
 			int section = m_pParent->header()->sectionAt (pos.x ());
 			
 			// Get the rect of the whole item (the row for the tip)
-			TQRect tqitemRect = m_pParent->tqitemRect( it );
+			TQRect itemRect = m_pParent->itemRect( it );
 
 			// Get the rect of the whole section (the column for the tip)
 			TQRect headerRect = m_pParent->header ()->sectionRect (section);
 				
       		// "Intersect" row and column to get exact rect for the tip
-			TQRect destRect( headerRect.left (), tqitemRect.top(), headerRect.width(), tqitemRect.height() );
+			TQRect destRect( headerRect.left (), itemRect.top(), headerRect.width(), itemRect.height() );
 
 			int item_width = it->width( m_pParent->fontMetrics(), m_pParent, 0 )
 					+ it->depth() * m_pParent->treeStepSize();
diff --git a/src/kchmmainwindow.cpp b/src/kchmmainwindow.cpp
index 7494cf9..8c3dbb2 100644
--- a/src/kchmmainwindow.cpp
+++ b/src/kchmmainwindow.cpp
@@ -203,7 +203,7 @@ bool KCHMMainWindow::loadChmFile ( const TQString &fileName, bool call_open_page
 		showOrHideSearchWindow( m_tabSearchPage );
 		
 		m_bookmarkWindow->tqinvalidate();
-		m_navToolbar->updateIcontqStatus( false, false );
+		m_navToolbar->updateIconStatus( false, false );
 		m_viewWindowMgr->tqinvalidate();
 		refreshCurrentBrowser();
 
diff --git a/src/kchmnavtoolbar.cpp b/src/kchmnavtoolbar.cpp
index e0e8790..de42ece 100644
--- a/src/kchmnavtoolbar.cpp
+++ b/src/kchmnavtoolbar.cpp
@@ -65,7 +65,7 @@ KCHMNavToolbar::~KCHMNavToolbar()
 {
 }
 
-void KCHMNavToolbar::updateIcontqStatus( bool enable_backward, bool enable_forward )
+void KCHMNavToolbar::updateIconStatus( bool enable_backward, bool enable_forward )
 {
 	m_toolbarIconBackward->setEnabled( enable_backward );
 	m_toolbarIconForward->setEnabled ( enable_forward );
diff --git a/src/kchmnavtoolbar.h b/src/kchmnavtoolbar.h
index 734436f..d072f2a 100644
--- a/src/kchmnavtoolbar.h
+++ b/src/kchmnavtoolbar.h
@@ -33,7 +33,7 @@ public:
 	~KCHMNavToolbar();
 
 public slots:
-	void	updateIcontqStatus( bool enable_backward, bool enable_forward );	
+	void	updateIconStatus( bool enable_backward, bool enable_forward );	
 
 private:
 	TQToolButton	*	m_toolbarIconBackward;
diff --git a/src/kchmsearchengine.cpp b/src/kchmsearchengine.cpp
index a5f0a11..e9e2a35 100644
--- a/src/kchmsearchengine.cpp
+++ b/src/kchmsearchengine.cpp
@@ -103,7 +103,7 @@ bool KCHMSearchEngine::loadOrGenerateIndex( )
 		
 		// Process the list keeping only HTML documents there
 		for ( unsigned int i = 0; i < alldocuments.size(); i++ )
-			if ( alldocuments[i].tqendsWith( ".html", false ) || alldocuments[i].tqendsWith( ".htm", false ) )
+			if ( alldocuments[i].endsWith( ".html", false ) || alldocuments[i].endsWith( ".htm", false ) )
 				documents.push_back( LCHMUrlFactory::makeURLabsoluteIfNeeded( alldocuments[i] ) );
 
 		m_Index->setDocList( documents );
diff --git a/src/kchmsearchengine_impl.cpp b/src/kchmsearchengine_impl.cpp
index 646f261..b4b2c3a 100644
--- a/src/kchmsearchengine_impl.cpp
+++ b/src/kchmsearchengine_impl.cpp
@@ -195,7 +195,7 @@ bool Index::parseDocumentToStringlist( const TQString & filename, TQStringList &
 		TQChar ch = text[j];
 		
 		if ( (j % 20000) == 0 )
-			tqApp->tqprocessEvents( TQEventLoop::ExcludeUserInput );
+			tqApp->processEvents( TQEventLoop::ExcludeUserInput );
 		
 		if ( state == STATE_IN_HTML_TAG )
 		{
diff --git a/src/kchmsearchwindow.cpp b/src/kchmsearchwindow.cpp
index 7e5af5b..e6710f6 100644
--- a/src/kchmsearchwindow.cpp
+++ b/src/kchmsearchwindow.cpp
@@ -53,10 +53,10 @@ KCHMSearchWindow::KCHMSearchWindow( TQWidget * parent, const char * name, WFlags
 	m_searchQuery = new TQComboBox (TRUE, this);
 	m_searchQuery->setFocus();
 	m_searchQuery->setMaxCount (10);
-	m_searchQuery->tqsetSizePolicy ( TQSizePolicy ( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+	m_searchQuery->setSizePolicy ( TQSizePolicy ( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
 	
 	TQPushButton * searchButton = new TQPushButton ( i18n("Go"), this);
-	searchButton->tqsetSizePolicy ( TQSizePolicy ( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
+	searchButton->setSizePolicy ( TQSizePolicy ( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
 	
 	TQHBoxLayout * htqlayout = new TQHBoxLayout ( tqlayout );
 	htqlayout->addWidget ( m_searchQuery );
diff --git a/src/kchmsetupdialog.cpp b/src/kchmsetupdialog.cpp
index 55b643e..a9b5668 100644
--- a/src/kchmsetupdialog.cpp
+++ b/src/kchmsetupdialog.cpp
@@ -36,7 +36,7 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
 {
     if ( !name )
 	setName( "MyDialog1" );
-    tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, sizePolicy().hasHeightForWidth() ) );
+    setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, sizePolicy().hasHeightForWidth() ) );
     setSizeGripEnabled( FALSE );
     setModal( TRUE );
     MyDialog1Layout = new TQVBoxLayout( this, 11, 6, "MyDialog1Layout"); 
@@ -54,7 +54,7 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
     buttonGroup1->tqlayout()->setSpacing( 6 );
     buttonGroup1->tqlayout()->setMargin( 11 );
     buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->tqlayout() );
-    buttonGroup1Layout->tqsetAlignment( TQt::AlignTop );
+    buttonGroup1Layout->setAlignment( TQt::AlignTop );
 
     m_radioOnBeginOpenDialog = new TQRadioButton( buttonGroup1, "m_radioOnBeginOpenDialog" );
     buttonGroup1Layout->addWidget( m_radioOnBeginOpenDialog );
@@ -68,7 +68,7 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
     buttonGroup2->tqlayout()->setSpacing( 6 );
     buttonGroup2->tqlayout()->setMargin( 11 );
     buttonGroup2Layout = new TQVBoxLayout( buttonGroup2->tqlayout() );
-    buttonGroup2Layout->tqsetAlignment( TQt::AlignTop );
+    buttonGroup2Layout->setAlignment( TQt::AlignTop );
 
     tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3"); 
 
@@ -93,14 +93,14 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
     groupBox1->tqlayout()->setSpacing( 6 );
     groupBox1->tqlayout()->setMargin( 11 );
     groupBox1Layout = new TQHBoxLayout( groupBox1->tqlayout() );
-    groupBox1Layout->tqsetAlignment( TQt::AlignTop );
+    groupBox1Layout->setAlignment( TQt::AlignTop );
 
     buttonGroup4 = new TQButtonGroup( groupBox1, "buttonGroup4" );
     buttonGroup4->setColumnLayout(0, Qt::Vertical );
     buttonGroup4->tqlayout()->setSpacing( 6 );
     buttonGroup4->tqlayout()->setMargin( 11 );
     buttonGroup4Layout = new TQVBoxLayout( buttonGroup4->tqlayout() );
-    buttonGroup4Layout->tqsetAlignment( TQt::AlignTop );
+    buttonGroup4Layout->setAlignment( TQt::AlignTop );
 
     m_radioExtLinkOpenAlways = new TQRadioButton( buttonGroup4, "m_radioExtLinkOpenAlways" );
     buttonGroup4Layout->addWidget( m_radioExtLinkOpenAlways );
@@ -117,7 +117,7 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
     buttonGroup5->tqlayout()->setSpacing( 6 );
     buttonGroup5->tqlayout()->setMargin( 11 );
     buttonGroup5Layout = new TQVBoxLayout( buttonGroup5->tqlayout() );
-    buttonGroup5Layout->tqsetAlignment( TQt::AlignTop );
+    buttonGroup5Layout->setAlignment( TQt::AlignTop );
 
     m_radioNewChmOpenAlways = new TQRadioButton( buttonGroup5, "m_radioNewChmOpenAlways" );
     buttonGroup5Layout->addWidget( m_radioNewChmOpenAlways );
@@ -129,7 +129,7 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
     buttonGroup5Layout->addWidget( m_radioNewChmOpenNever );
     groupBox1Layout->addWidget( buttonGroup5 );
     Widget8Layout->addWidget( groupBox1 );
-    tabWidget->insertTab( Widget8, TQString::tqfromLatin1("") );
+    tabWidget->insertTab( Widget8, TQString::fromLatin1("") );
 
     Widget9 = new TQWidget( tabWidget, "Widget9" );
     Widget9Layout = new TQVBoxLayout( Widget9, 11, 6, "Widget9Layout"); 
@@ -139,16 +139,16 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
     m_groupQtsettings->tqlayout()->setSpacing( 6 );
     m_groupQtsettings->tqlayout()->setMargin( 11 );
     m_groupQtsettingsLayout = new TQHBoxLayout( m_groupQtsettings->tqlayout() );
-    m_groupQtsettingsLayout->tqsetAlignment( TQt::AlignTop );
+    m_groupQtsettingsLayout->setAlignment( TQt::AlignTop );
 
     textLabel1_2 = new TQLabel( m_groupQtsettings, "textLabel1_2" );
-    textLabel1_2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, textLabel1_2->sizePolicy().hasHeightForWidth() ) );
+    textLabel1_2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, textLabel1_2->sizePolicy().hasHeightForWidth() ) );
     textLabel1_2->setLineWidth( 1 );
-    textLabel1_2->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+    textLabel1_2->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
     m_groupQtsettingsLayout->addWidget( textLabel1_2 );
 
     m_qtBrowserPath = new TQLineEdit( m_groupQtsettings, "m_qtBrowserPath" );
-    m_qtBrowserPath->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_qtBrowserPath->sizePolicy().hasHeightForWidth() ) );
+    m_qtBrowserPath->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_qtBrowserPath->sizePolicy().hasHeightForWidth() ) );
     m_groupQtsettingsLayout->addWidget( m_qtBrowserPath );
     Widget9Layout->addWidget( m_groupQtsettings );
 
@@ -157,14 +157,14 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
     m_groupKDEsettings->tqlayout()->setSpacing( 6 );
     m_groupKDEsettings->tqlayout()->setMargin( 11 );
     m_groupKDEsettingsLayout = new TQHBoxLayout( m_groupKDEsettings->tqlayout() );
-    m_groupKDEsettingsLayout->tqsetAlignment( TQt::AlignTop );
+    m_groupKDEsettingsLayout->setAlignment( TQt::AlignTop );
 
     buttonGroup5_2 = new TQButtonGroup( m_groupKDEsettings, "buttonGroup5_2" );
     buttonGroup5_2->setColumnLayout(0, Qt::Vertical );
     buttonGroup5_2->tqlayout()->setSpacing( 6 );
     buttonGroup5_2->tqlayout()->setMargin( 11 );
     buttonGroup5_2Layout = new TQVBoxLayout( buttonGroup5_2->tqlayout() );
-    buttonGroup5_2Layout->tqsetAlignment( TQt::AlignTop );
+    buttonGroup5_2Layout->setAlignment( TQt::AlignTop );
 
     m_radioUseQtextBrowser = new TQRadioButton( buttonGroup5_2, "m_radioUseQtextBrowser" );
     buttonGroup5_2Layout->addWidget( m_radioUseQtextBrowser );
@@ -178,7 +178,7 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
     groupKhtmlSecurity->tqlayout()->setSpacing( 6 );
     groupKhtmlSecurity->tqlayout()->setMargin( 11 );
     groupKhtmlSecurityLayout = new TQGridLayout( groupKhtmlSecurity->tqlayout() );
-    groupKhtmlSecurityLayout->tqsetAlignment( TQt::AlignTop );
+    groupKhtmlSecurityLayout->setAlignment( TQt::AlignTop );
 
     m_enableJS = new TQCheckBox( groupKhtmlSecurity, "m_enableJS" );
 
@@ -197,7 +197,7 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
     groupKhtmlSecurityLayout->addWidget( m_enableRefresh, 1, 1 );
     m_groupKDEsettingsLayout->addWidget( groupKhtmlSecurity );
     Widget9Layout->addWidget( m_groupKDEsettings );
-    tabWidget->insertTab( Widget9, TQString::tqfromLatin1("") );
+    tabWidget->insertTab( Widget9, TQString::fromLatin1("") );
 
     TabPage = new TQWidget( tabWidget, "TabPage" );
     TabPageLayout = new TQVBoxLayout( TabPage, 11, 6, "TabPageLayout"); 
@@ -207,7 +207,7 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
     buttonGroup7->tqlayout()->setSpacing( 6 );
     buttonGroup7->tqlayout()->setMargin( 11 );
     buttonGroup7Layout = new TQVBoxLayout( buttonGroup7->tqlayout() );
-    buttonGroup7Layout->tqsetAlignment( TQt::AlignTop );
+    buttonGroup7Layout->setAlignment( TQt::AlignTop );
 
     m_advViewSourceInternal = new TQRadioButton( buttonGroup7, "m_advViewSourceInternal" );
     buttonGroup7Layout->addWidget( m_advViewSourceInternal );
@@ -230,15 +230,15 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
     groupBox6->tqlayout()->setSpacing( 6 );
     groupBox6->tqlayout()->setMargin( 11 );
     groupBox6Layout = new TQGridLayout( groupBox6->tqlayout() );
-    groupBox6Layout->tqsetAlignment( TQt::AlignTop );
+    groupBox6Layout->setAlignment( TQt::AlignTop );
 
     m_useSearchEngineInternal = new TQRadioButton( groupBox6, "m_useSearchEngineInternal" );
 
     groupBox6Layout->addWidget( m_useSearchEngineInternal, 1, 0 );
 
     m_labelUseSearchEngineInternal = new TQLabel( groupBox6, "m_labelUseSearchEngineInternal" );
-    m_labelUseSearchEngineInternal->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 10, 0, m_labelUseSearchEngineInternal->sizePolicy().hasHeightForWidth() ) );
-    m_labelUseSearchEngineInternal->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+    m_labelUseSearchEngineInternal->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 10, 0, m_labelUseSearchEngineInternal->sizePolicy().hasHeightForWidth() ) );
+    m_labelUseSearchEngineInternal->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
 
     groupBox6Layout->addWidget( m_labelUseSearchEngineInternal, 1, 1 );
 
@@ -247,12 +247,12 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
     groupBox6Layout->addWidget( m_useSearchEngineNew, 0, 0 );
 
     m_labelUseSearchEngineNew = new TQLabel( groupBox6, "m_labelUseSearchEngineNew" );
-    m_labelUseSearchEngineNew->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 10, 0, m_labelUseSearchEngineNew->sizePolicy().hasHeightForWidth() ) );
-    m_labelUseSearchEngineNew->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+    m_labelUseSearchEngineNew->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 10, 0, m_labelUseSearchEngineNew->sizePolicy().hasHeightForWidth() ) );
+    m_labelUseSearchEngineNew->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
 
     groupBox6Layout->addWidget( m_labelUseSearchEngineNew, 0, 1 );
     TabPageLayout->addWidget( groupBox6 );
-    tabWidget->insertTab( TabPage, TQString::tqfromLatin1("") );
+    tabWidget->insertTab( TabPage, TQString::fromLatin1("") );
     MyDialog1Layout->addWidget( tabWidget );
 
     Layout1 = new TQHBoxLayout( 0, 0, 6, "Layout1"); 
@@ -273,7 +273,7 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
     Layout1->addWidget( buttonCancel );
     MyDialog1Layout->addLayout( Layout1 );
     languageChange();
-    resize( TQSize(654, 343).expandedTo(tqminimumSizeHint()) );
+    resize( TQSize(654, 343).expandedTo(minimumSizeHint()) );
     clearWState( WState_Polished );
 
     // signals and slots connections
diff --git a/src/kchmsetupdialog.ui b/src/kchmsetupdialog.ui
index a981ec4..ddd63c4 100644
--- a/src/kchmsetupdialog.ui
+++ b/src/kchmsetupdialog.ui
@@ -601,7 +601,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/src/kchmtreeviewitem.cpp b/src/kchmtreeviewitem.cpp
index 11e91e6..ccd4776 100644
--- a/src/kchmtreeviewitem.cpp
+++ b/src/kchmtreeviewitem.cpp
@@ -101,7 +101,7 @@ void KCHMIndTocItem::paintBranches( TQPainter * p, const TQColorGroup & cg, int
     	TQStyleOption opt( 0, 0 );
     	TQStyle::SFlags how = TQStyle::Style_Default | TQStyle::Style_Enabled;
 
-    	listView()->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView,
+    	listView()->tqstyle().drawComplexControl( TQStyle::CC_ListView,
 				p, listView(), TQRect( 0, 0, w, h ), cg,
 				how, TQStyle::SC_ListView, TQStyle::SC_None,
 				opt );
diff --git a/src/kchmviewwindow.cpp b/src/kchmviewwindow.cpp
index fc77d3e..118e4b6 100644
--- a/src/kchmviewwindow.cpp
+++ b/src/kchmviewwindow.cpp
@@ -132,11 +132,11 @@ bool KCHMViewWindow::openUrl ( const TQString& origurl )
 void KCHMViewWindow::handleStartPageAsImage( TQString & link )
 {
 	// Handle pics
-	if ( link.tqendsWith( ".jpg", false )
-	|| link.tqendsWith( ".jpeg", false )
-	|| link.tqendsWith( ".gif", false )
-	|| link.tqendsWith( ".png", false )
-	|| link.tqendsWith( ".bmp", false ) )
+	if ( link.endsWith( ".jpg", false )
+	|| link.endsWith( ".jpeg", false )
+	|| link.endsWith( ".gif", false )
+	|| link.endsWith( ".png", false )
+	|| link.endsWith( ".bmp", false ) )
 		link += LCHMUrlFactory::getInternalUriExtension();
 }
 
@@ -274,7 +274,7 @@ void KCHMViewWindow::updateNavigationToolbar( )
 	
 	if ( mainWindow )
 	{
-		mainWindow->navigationToolbar()->updateIcontqStatus( 
+		mainWindow->navigationToolbar()->updateIconStatus( 
 					m_historyCurrentPos > 0,
 					m_historyCurrentPos < (m_history.size() - 1) );
 	}
diff --git a/src/kchmviewwindow_qtextbrowser.cpp b/src/kchmviewwindow_qtextbrowser.cpp
index f66dc88..bd9aa33 100644
--- a/src/kchmviewwindow_qtextbrowser.cpp
+++ b/src/kchmviewwindow_qtextbrowser.cpp
@@ -159,7 +159,7 @@ bool KCHMViewWindow_QTextBrowser::printCurrentPage( )
 		
 		do
 		{
-			richText.draw( &p, body.left(), body.top(), view, tqcolorGroup() );
+			richText.draw( &p, body.left(), body.top(), view, colorGroup() );
 			view.moveBy( 0, body.height() );
 			p.translate( 0 , -body.height() );
 			p.drawText( view.right() - p.fontMetrics().width( TQString::number(page) ),