Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 15 insertions, 15 deletions

diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index b082cf1fa..ab70526a3 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -220,21 +220,21 @@ FontAASettings::FontAASettings(TQWidget *parent)
                 changesMade(false)
 {
   TQWidget     *mw=new TQWidget(this);
-  TQGridLayout *layout=new TQGridLayout(mw, 1, 1, 0, KDialog::spacingHint());
+  TQGridLayout *tqlayout=new TQGridLayout(mw, 1, 1, 0, KDialog::spacingHint());
 
   excludeRange=new TQCheckBox(i18n("E&xclude range:"), mw),
-  layout->addWidget(excludeRange, 0, 0);
+  tqlayout->addWidget(excludeRange, 0, 0);
   excludeFrom=new KDoubleNumInput(0, 72, 8.0, 1, 1, mw),
   excludeFrom->setSuffix(i18n(" pt"));
-  layout->addWidget(excludeFrom, 0, 1);
+  tqlayout->addWidget(excludeFrom, 0, 1);
   excludeToLabel=new TQLabel(i18n(" to "), mw);
-  layout->addWidget(excludeToLabel, 0, 2);
+  tqlayout->addWidget(excludeToLabel, 0, 2);
   excludeTo=new KDoubleNumInput(0, 72, 15.0, 1, 1, mw);
   excludeTo->setSuffix(i18n(" pt"));
-  layout->addWidget(excludeTo, 0, 3);
+  tqlayout->addWidget(excludeTo, 0, 3);
 
   useSubPixel=new TQCheckBox(i18n("&Use sub-pixel hinting:"), mw);
-  layout->addWidget(useSubPixel, 1, 0);
+  tqlayout->addWidget(useSubPixel, 1, 0);
 
   TQWhatsThis::add(useSubPixel, i18n("If you have a TFT or LCD screen you"
        " can further improve the quality of displayed fonts by selecting"
@@ -242,7 +242,7 @@ FontAASettings::FontAASettings(TQWidget *parent)
        "<br><b>This will not work with CRT monitors.</b>"));
 
   subPixelType=new TQComboBox(false, mw);
-  layout->addMultiCellWidget(subPixelType, 1, 1, 1, 3);
+  tqlayout->addMultiCellWidget(subPixelType, 1, 1, 1, 3);
 
   TQWhatsThis::add(subPixelType, i18n("In order for sub-pixel hinting to"
        " work correctly you need to know how the sub-pixels of your display"
@@ -256,9 +256,9 @@ FontAASettings::FontAASettings(TQWidget *parent)
 
 #ifdef HAVE_FONTCONFIG
   TQLabel *hintingLabel=new TQLabel(i18n("Hinting style: "), mw);
-  layout->addWidget(hintingLabel, 2, 0);
+  tqlayout->addWidget(hintingLabel, 2, 0);
   hintingStyle=new TQComboBox(false, mw);
-  layout->addMultiCellWidget(hintingStyle, 2, 2, 1, 3);
+  tqlayout->addMultiCellWidget(hintingStyle, 2, 2, 1, 3);
   for(int s=KXftConfig::Hint::NotSet+1; s<=KXftConfig::Hint::Full; ++s)
     hintingStyle->insertItem(KXftConfig::description((KXftConfig::Hint::Style)s));
 
@@ -560,11 +560,11 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &)
     << i18n("Used by the taskbar.")
     << i18n("Used for desktop icons.");
 
-  TQVBoxLayout * layout =
+  TQVBoxLayout * tqlayout =
     new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
   TQGridLayout * fontUseLayout =
-    new TQGridLayout(layout, nameGroupKeyRc.count() / 4, 3);
+    new TQGridLayout(tqlayout, nameGroupKeyRc.count() / 4, 3);
 
   fontUseLayout->setColStretch(0, 0);
   fontUseLayout->setColStretch(1, 1);
@@ -607,16 +607,16 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &)
     ++count;
   }
 
-   TQHBoxLayout *hblay = new TQHBoxLayout(layout, KDialog::spacingHint());
+   TQHBoxLayout *hblay = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
    hblay->addStretch();
    TQPushButton * fontAdjustButton = new TQPushButton(i18n("Ad&just All Fonts..."), this);
    TQWhatsThis::add(fontAdjustButton, i18n("Click to change all fonts"));
    hblay->addWidget( fontAdjustButton );
    connect(fontAdjustButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyFontDiff()));
 
-   layout->addSpacing(KDialog::spacingHint());
+   tqlayout->addSpacing(KDialog::spacingHint());
 
-   TQGridLayout* lay = new TQGridLayout(layout, 2, 4, KDialog::spacingHint());
+   TQGridLayout* lay = new TQGridLayout(tqlayout, 2, 4, KDialog::spacingHint());
    lay->setColStretch( 3, 10 );
    TQLabel* label = new TQLabel( i18n( "Use a&nti-aliasing:" ), this );
    lay->addWidget( label, 0, 0 );
@@ -655,7 +655,7 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &)
    connect( comboForceDpi, TQT_SIGNAL( activated( int )), TQT_SLOT( changed()));
    lay->addWidget( comboForceDpi, 1, 1 );
 
-   layout->addStretch(1);
+   tqlayout->addStretch(1);
 
    aaSettings=new FontAASettings(this);