Rename obsolete tq methods to standard names

3 files changed, 9 insertions, 9 deletions

diff --git a/kbfxlib/common/kbfxconfig.cpp b/kbfxlib/common/kbfxconfig.cpp
index da83d47..0e1c8ee 100644
--- a/kbfxlib/common/kbfxconfig.cpp
+++ b/kbfxlib/common/kbfxconfig.cpp
@@ -208,7 +208,7 @@ void KbfxConfig::setThemeInfoDefault()
 
 void KbfxConfig::setThemeDefault()
 {
-	/* set default theme tqlayout configuration */
+	/* set default theme layout configuration */
 	m_KbfxNormalButtonPath = m_KbfxNormalButtonPathDefault;
 	m_KbfxHoverButtonPath = m_KbfxHoverButtonPathDefault;
 	m_KbfxPressedButtonPath = m_KbfxPressedButtonPathDefault;
@@ -487,7 +487,7 @@ void KbfxConfig::readFontrc ( TQString & themePath, TQString & themeName, bool u
 
 void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool user_rc )
 {
-	/* if a new version use default theme tqlayout */
+	/* if a new version use default theme layout */
 	if ( m_KbfxGeneralVersion < m_KbfxGeneralVersionDefault )
 	{
 		themePath = m_SpinxThemeBasePathDefault;
@@ -525,7 +525,7 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us
 
 	setThemeDefault();
 
-	/* get some theme tqlayout settings from theme file or from theme section */
+	/* get some theme layout settings from theme file or from theme section */
 	TQString _abs_path = "";
 	TQFileInfo * info = new TQFileInfo ( themePath + themeName + "/kbfxlayoutrc" );
 	TQFileInfo * info_theme =  new TQFileInfo ( KbfxThemeRcDestination + "/" +  themeName + "_layoutrc" );
@@ -618,7 +618,7 @@ void KbfxConfig::readThemerc ( TQString &themePath, TQString &themeName, bool us
 		m_commentMargine = layoutconfig->readNumEntry ( "CommentMargin",m_commentMargineDefault );
 		m_iconSize = layoutconfig->readNumEntry ( "IconSize",m_iconSizeDefault );
 
-		kdDebug() << "Read default tqlayout settings for theme: "
+		kdDebug() << "Read default layout settings for theme: "
 		<< themeName
 		<< " from file: "
 		<< _abs_path
@@ -774,7 +774,7 @@ void KbfxConfig::writeThemerc ( TQString & themeName )
 {
 	checkValues();
 
-	/* write tqlayout theme configuration from theme name */
+	/* write layout theme configuration from theme name */
 	KConfig *layoutconfig = new KConfig ( KbfxThemeRcDestination + "/" +  themeName + "_layoutrc" );
 
 	layoutconfig->setGroup ( "KbfxButton" );
diff --git a/kbfxlib/common/kbfxconfig.h b/kbfxlib/common/kbfxconfig.h
index edfc66d..8de6886 100644
--- a/kbfxlib/common/kbfxconfig.h
+++ b/kbfxlib/common/kbfxconfig.h
@@ -178,7 +178,7 @@ class KbfxConfig
 		TQStringList m_pluginsRight;
 		TQStringList m_pluginsRightDefault;
 
-		/* tqlayout */
+		/* layout */
 		int m_facePos_x;
 		int m_facePos_xDefault;
 		int m_facePos_y;
diff --git a/kbfxlib/common/kbfxfontchooser.cpp b/kbfxlib/common/kbfxfontchooser.cpp
index ca0fd74..2ebf7d9 100644
--- a/kbfxlib/common/kbfxfontchooser.cpp
+++ b/kbfxlib/common/kbfxfontchooser.cpp
@@ -23,14 +23,14 @@
 KBFXFontChooser::KBFXFontChooser ( TQWidget *parent, const char *name )
 		: TQWidget ( parent, name )
 {
-	TQHBoxLayout* tqlayout = new TQHBoxLayout ( this, 0, KDialog::spacingHint() );
+	TQHBoxLayout* layout = new TQHBoxLayout ( this, 0, KDialog::spacingHint() );
 
 	m_label = new TQLabel ( this, "fontLabel" );
 	m_label->setSizePolicy ( TQSizePolicy::Expanding,  TQSizePolicy::Fixed, TRUE);
 //	m_label->setFrameShape ( TQFrame::StyledPanel );
 //	m_label->setFrameShadow ( TQFrame::Sunken );
 
-	tqlayout->addWidget ( m_label );
+	layout->addWidget ( m_label );
 
 	m_button = new TQPushButton ( this, "fontButton" );
 	m_label->setMaximumHeight ( m_button -> height() );
@@ -43,7 +43,7 @@ KBFXFontChooser::KBFXFontChooser ( TQWidget *parent, const char *name )
 	m_button->setIconSet ( iconSet );
 	m_button->setFixedWidth ( m_button->fontMetrics().width ( fontText ) +
 	                          3 * KDialog::spacingHint() + pixmap.width() );
-	tqlayout->addWidget ( m_button );
+	layout->addWidget ( m_button );
 
 	connect ( m_button, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( buttonClicked() ) );