TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

1 files changed, 12 insertions, 12 deletions

diff --git a/kdict/options.cpp b/kdict/options.cpp
index 3220b07c..f3bf58bb 100644
--- a/kdict/options.cpp
+++ b/kdict/options.cpp
@@ -104,7 +104,7 @@ void GlobalData::read()
   f_onts[Fheadings]=config->readFontEntry("headingsFont",&defFont);
   f_ontNames[Fheadings]=i18n("Headings");
 
-  // geometry...
+  // tqgeometry...
   config->setGroup("Geometry");
   TQSize invalid(-1,-1);
   optSize = config->readSizeEntry("Opt_Size",&invalid);
@@ -384,8 +384,8 @@ TQString GlobalData::encryptStr(const TQString& aStr)
 //*********  OptionsDialog::DialogListBox  *****************************
 
 
-OptionsDialog::DialogListBox::DialogListBox(bool alwaysIgnore, TQWidget * parent, const char * name)
- : TQListBox(parent, name), a_lwaysIgnore(alwaysIgnore)
+OptionsDialog::DialogListBox::DialogListBox(bool alwaysIgnore, TQWidget * tqparent, const char * name)
+ : TQListBox(tqparent, name), a_lwaysIgnore(alwaysIgnore)
 {
 }
 
@@ -425,7 +425,7 @@ void OptionsDialog::ColorListItem::paint( TQPainter *p )
 
   p->drawText( 30+3*2, fm.ascent() + fm.leading()/2, text() );
 
-  p->setPen( Qt::black );
+  p->setPen( TQt::black );
   p->drawRect( 3, 1, 30, h-1 );
   p->fillRect( 4, 2, 28, h-3, mColor );
 }
@@ -449,7 +449,7 @@ int OptionsDialog::ColorListItem::width(const TQListBox *lb ) const
 OptionsDialog::FontListItem::FontListItem( const TQString &name, const TQFont &font )
   : TQListBoxText(name), f_ont(font)
 {
-  fontInfo = TQString("[%1 %2]").arg(f_ont.family()).arg(f_ont.pointSize());
+  fontInfo = TQString("[%1 %2]").tqarg(f_ont.family()).tqarg(f_ont.pointSize());
 }
 
 
@@ -461,7 +461,7 @@ OptionsDialog::FontListItem::~FontListItem()
 void OptionsDialog::FontListItem::setFont(const TQFont &font)
 {
   f_ont = font;
-  fontInfo = TQString("[%1 %2]").arg(f_ont.family()).arg(f_ont.pointSize());
+  fontInfo = TQString("[%1 %2]").tqarg(f_ont.family()).tqarg(f_ont.pointSize());
 }
 
 
@@ -488,8 +488,8 @@ int OptionsDialog::FontListItem::width(const TQListBox *lb ) const
 //*********  OptionsDialog  ******************************************
 
 
-OptionsDialog::OptionsDialog(TQWidget *parent, const char *name)
-  : KDialogBase(IconList, i18n("Configure"), Help|Default|Ok|Apply|Cancel, Ok, parent, name, false, true)
+OptionsDialog::OptionsDialog(TQWidget *tqparent, const char *name)
+  : KDialogBase(IconList, i18n("Configure"), Help|Default|Ok|Apply|Cancel, Ok, tqparent, name, false, true)
 {
 
   //******** Server ************************************
@@ -641,11 +641,11 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name)
     f_List->insertItem(new FontListItem(global->fontName(i), global->font(i)));
 
   //************ Layout ***************************
-  layoutTab = addPage(i18n("Layout"),i18n("Customize Output Format"), BarIcon("text_left", KIcon::SizeMedium ));
+  tqlayoutTab = addPage(i18n("Layout"),i18n("Customize Output Format"), BarIcon("text_left", KIcon::SizeMedium ));
 
-  TQVBoxLayout *vbox = new TQVBoxLayout(layoutTab, 0, spacingHint());
+  TQVBoxLayout *vbox = new TQVBoxLayout(tqlayoutTab, 0, spacingHint());
 
-  TQButtonGroup *bGroup = new TQButtonGroup(i18n("Headings"),layoutTab);
+  TQButtonGroup *bGroup = new TQButtonGroup(i18n("Headings"),tqlayoutTab);
   TQVBoxLayout *bvbox = new TQVBoxLayout(bGroup,8,5);
 
   bvbox->addSpacing(fontMetrics().lineSpacing()-4);
@@ -869,7 +869,7 @@ void OptionsDialog::slotColDefaultBtnClicked()
     colorItem->setColor(global->defaultColor(i));
   }
   c_List->triggerUpdate(true);
-  c_List->repaint(true);
+  c_List->tqrepaint(true);
 }