diff --git a/configdialog/kbfxconfigdlgabout.ui b/configdialog/kbfxconfigdlgabout.ui index f05130a..48d40f5 100644 --- a/configdialog/kbfxconfigdlgabout.ui +++ b/configdialog/kbfxconfigdlgabout.ui @@ -82,7 +82,7 @@ - tqlayout4 + layout4 @@ -90,7 +90,7 @@ - tqlayout5 + layout5 @@ -220,7 +220,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! - tqlayout6 + layout6 @@ -256,7 +256,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! - tqlayout5 + layout5 @@ -264,7 +264,7 @@ THANKS A LOT ALL OF YOU OUT THERE!!! - tqlayout8 + layout8 diff --git a/configdialog/kbfxconfigdlgbutton.ui b/configdialog/kbfxconfigdlgbutton.ui index 7b4e419..30b5af6 100644 --- a/configdialog/kbfxconfigdlgbutton.ui +++ b/configdialog/kbfxconfigdlgbutton.ui @@ -50,7 +50,7 @@ - tqlayout6 + layout6 @@ -222,7 +222,7 @@ - tqlayout7 + layout7 @@ -391,7 +391,7 @@ - tqlayout8 + layout8 @@ -675,7 +675,7 @@ - tqlayout8 + layout8 diff --git a/configdialog/kbfxconfigdlgfonts-old.ui b/configdialog/kbfxconfigdlgfonts-old.ui index b35b9e3..9a33dba 100644 --- a/configdialog/kbfxconfigdlgfonts-old.ui +++ b/configdialog/kbfxconfigdlgfonts-old.ui @@ -85,7 +85,7 @@ - tqlayout14 + layout14 @@ -176,7 +176,7 @@ - tqlayout17 + layout17 @@ -184,7 +184,7 @@ - tqlayout15 + layout15 @@ -209,7 +209,7 @@ - tqlayout22 + layout22 @@ -263,7 +263,7 @@ - tqlayout21 + layout21 @@ -317,7 +317,7 @@ - tqlayout20 + layout20 @@ -371,7 +371,7 @@ - tqlayout19 + layout19 @@ -425,7 +425,7 @@ - tqlayout23 + layout23 @@ -473,7 +473,7 @@ - tqlayout17 + layout17 @@ -527,7 +527,7 @@ - tqlayout18 + layout18 @@ -581,7 +581,7 @@ - tqlayout18_2 + layout18_2 @@ -651,7 +651,7 @@ - tqlayout16 + layout16 @@ -844,7 +844,7 @@ - tqlayout15 + layout15 diff --git a/configdialog/kbfxconfigdlglayout.ui b/configdialog/kbfxconfigdlglayout.ui index 61a3ffe..fac280b 100644 --- a/configdialog/kbfxconfigdlglayout.ui +++ b/configdialog/kbfxconfigdlglayout.ui @@ -85,7 +85,7 @@ - tqlayout14_2 + layout14_2 @@ -176,7 +176,7 @@ - tqlayout30 + layout30 @@ -288,7 +288,7 @@ - tqlayout17 + layout17 @@ -397,7 +397,7 @@ - tqlayout33 + layout33 @@ -405,7 +405,7 @@ - tqlayout28 + layout28 @@ -419,7 +419,7 @@ - tqlayout21 + layout21 @@ -433,7 +433,7 @@ - tqlayout16 + layout16 @@ -487,7 +487,7 @@ - tqlayout16_2 + layout16_2 @@ -541,7 +541,7 @@ - tqlayout16_3 + layout16_3 @@ -595,7 +595,7 @@ - tqlayout16_4 + layout16_4 @@ -691,7 +691,7 @@ - tqlayout29 + layout29 @@ -705,7 +705,7 @@ - tqlayout21_2 + layout21_2 @@ -719,7 +719,7 @@ - tqlayout16_5 + layout16_5 @@ -773,7 +773,7 @@ - tqlayout16_2_2 + layout16_2_2 @@ -827,7 +827,7 @@ - tqlayout16_3_2 + layout16_3_2 @@ -881,7 +881,7 @@ - tqlayout16_4_2 + layout16_4_2 diff --git a/configdialog/kbfxconfigdlglayout.ui.h b/configdialog/kbfxconfigdlglayout.ui.h index d57e9e0..b8a4d55 100644 --- a/configdialog/kbfxconfigdlglayout.ui.h +++ b/configdialog/kbfxconfigdlglayout.ui.h @@ -187,7 +187,7 @@ void KbfxConfigDlgLayout::KbfxLayoutProperty_activated( int index ) break; } default: /* default action switch does nothing */ - kdDebug() << "Default action switch for saving tqlayout changed..." << endl; + kdDebug() << "Default action switch for saving layout changed..." << endl; } KbfxShowAll (); @@ -426,7 +426,7 @@ void KbfxConfigDlgLayout::KbfxLayoutProperty_activated( int index ) break; } default: /* default action switch should never be reached */ - kdDebug() << "Default action switch for tqlayout changed..." << endl; + kdDebug() << "Default action switch for layout changed..." << endl; } } @@ -465,7 +465,7 @@ void KbfxConfigDlgLayout::KbfxExportFileAction() << KbfxExportLayoutRcDialogURL << endl; - /* write tqlayout theme configuration file */ + /* write layout theme configuration file */ KConfig *layoutconfig = new KConfig ( KbfxExportLayoutRcDialogURL ); layoutconfig->setGroup ( "KbfxButton" ); diff --git a/configdialog/kbfxconfigdlgmain.ui b/configdialog/kbfxconfigdlgmain.ui index afbb6d4..6ef0358 100644 --- a/configdialog/kbfxconfigdlgmain.ui +++ b/configdialog/kbfxconfigdlgmain.ui @@ -44,7 +44,7 @@ - tqlayout4 + layout4 @@ -196,7 +196,7 @@ - tqlayout12 + layout12 @@ -350,7 +350,7 @@ - tqlayout5 + layout5 @@ -358,7 +358,7 @@ - tqlayout3 + layout3 diff --git a/configdialog/kbfxconfigdlgplugins.ui b/configdialog/kbfxconfigdlgplugins.ui index bada01d..ff5bfe5 100644 --- a/configdialog/kbfxconfigdlgplugins.ui +++ b/configdialog/kbfxconfigdlgplugins.ui @@ -181,7 +181,7 @@ - tqlayout3 + layout3 diff --git a/configdialog/kbfxconfigdlgthemes.ui b/configdialog/kbfxconfigdlgthemes.ui index 45a09ef..4826f0c 100644 --- a/configdialog/kbfxconfigdlgthemes.ui +++ b/configdialog/kbfxconfigdlgthemes.ui @@ -114,7 +114,7 @@ - tqlayout7 + layout7 @@ -155,7 +155,7 @@ - tqlayout6 + layout6 @@ -292,7 +292,7 @@ - tqlayout14 + layout14 @@ -300,7 +300,7 @@ - tqlayout12 + layout12 @@ -360,7 +360,7 @@ - tqlayout13 + layout13 @@ -424,7 +424,7 @@ - tqlayout10 + layout10 diff --git a/configdialog/kbfxconfigdlgtooltip.ui b/configdialog/kbfxconfigdlgtooltip.ui index b73e980..3b0b6e4 100644 --- a/configdialog/kbfxconfigdlgtooltip.ui +++ b/configdialog/kbfxconfigdlgtooltip.ui @@ -110,7 +110,7 @@ - tqlayout21 + layout21 @@ -118,7 +118,7 @@ - tqlayout6 + layout6 @@ -142,7 +142,7 @@ - tqlayout4 + layout4 @@ -279,7 +279,7 @@ - tqlayout19 + layout19 @@ -439,7 +439,7 @@ - tqlayout20 + layout20 @@ -447,7 +447,7 @@ - tqlayout9 + layout9 @@ -471,7 +471,7 @@ - tqlayout8 + layout8 diff --git a/configdialog/kbfxthemeinfo.ui b/configdialog/kbfxthemeinfo.ui index 66d43d6..190a4d4 100644 --- a/configdialog/kbfxthemeinfo.ui +++ b/configdialog/kbfxthemeinfo.ui @@ -44,7 +44,7 @@ - tqlayout10 + layout10 @@ -144,7 +144,7 @@ - tqlayout7 + layout7 @@ -158,7 +158,7 @@ - tqlayout11 + layout11 @@ -253,7 +253,7 @@ - tqlayout21 + layout21 @@ -264,7 +264,7 @@ - tqlayout19 + layout19 @@ -354,7 +354,7 @@ - tqlayout20 + layout20 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() ) );