7 files changed, 18 insertions, 18 deletions
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 44632e906..9675cdc8b 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -316,7 +316,7 @@ void CardViewItem::paintCard( TQPainter *p, TQColorGroup &cg )
 
   // if we are the current item and the view has focus, draw focus rect
   if ( mView->currentItem() == this && mView->hasFocus() ) {
-    mView->tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, p,
+    mView->style().tqdrawPrimitive( TQStyle::PE_FocusRect, p,
         TQRect( 0, 0, mView->itemWidth(), h + (2 * mg) ), cg,
         TQStyle::Style_FocusAtBorder,
         TQStyleOption( isSelected() ? cg.highlight() : cg.base() ) );
@@ -843,7 +843,7 @@ void CardView::drawContents( TQPainter *p, int clipx, int clipy,
    calcLayout();
 
   // allow setting costum colors in the viewport pale
-  TQColorGroup cg = viewport()->tqpalette().active();
+  TQColorGroup cg = viewport()->palette().active();
 
   TQRect clipRect( clipx, clipy, clipw, cliph );
   TQRect cardRect;
@@ -893,7 +893,7 @@ void CardView::resizeEvent( TQResizeEvent *event )
 
 void CardView::calcLayout()
 {
-  // Start in the upper left corner and tqlayout all the
+  // Start in the upper left corner and layout all the
   // cars using their height and width
   int maxWidth = 0;
   int maxHeight = 0;
diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h
index 7a007d956..0bd70e1de 100644
--- a/kaddressbook/views/cardview.h
+++ b/kaddressbook/views/cardview.h
@@ -516,7 +516,7 @@ class CardView : public TQScrollView
     void drawContents( TQPainter *p, int clipx, int clipy, int clipw, int cliph );
 
     /**
-      Sets the tqlayout to dirty and repaints.
+      Sets the layout to dirty and repaints.
      */
     void resizeEvent( TQResizeEvent* );
 
@@ -526,13 +526,13 @@ class CardView : public TQScrollView
     void contentsWheelEvent( TQWheelEvent* );
 
     /**
-      Sets the tqlayout to dirty and calls for a repaint.
+      Sets the layout to dirty and calls for a repaint.
      */
     void setLayoutDirty( bool dirty );
 
     /**
       Does the math based on the bounding rect of the cards to properly
-      lay the cards out on the screen. This is only done if the tqlayout is
+      lay the cards out on the screen. This is only done if the layout is
       marked as dirty.
      */
     void calcLayout();
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index a8d4537fd..e4c00e7d5 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -120,7 +120,7 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config )
   cbEnableCustomFonts->setChecked( config->readBoolEntry( "EnableCustomFonts", false ) );
   enableFonts();
 
-  // tqlayout
+  // layout
   sbMargin->setValue( config->readNumEntry( "ItemMargin", 0 ) );
   sbSpacing->setValue( config->readNumEntry( "ItemSpacing", 10 ) );
   sbSepWidth->setValue( config->readNumEntry( "SeparatorWidth", 2 ) );
@@ -152,7 +152,7 @@ void CardViewLookNFeelPage::saveSettings( KConfig *config )
     config->writeEntry( "TextFont", lTextFont->font() );
     config->writeEntry( "HeaderFont", lHeaderFont->font() );
   }
-  // tqlayout
+  // layout
   config->writeEntry( "ItemMargin", sbMargin->value() );
   config->writeEntry( "ItemSpacing", sbSpacing->value() );
   config->writeEntry( "SeparatorWidth", sbSepWidth->value() );
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index 404746dc1..ae9d61551 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -111,11 +111,11 @@ void LookAndFeelPage::saveSettings( KConfig *config )
 
 void LookAndFeelPage::initGUI()
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint());
+  TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint());
 
   TQButtonGroup *group = new TQButtonGroup(1, Qt::Horizontal,
                                          i18n("Row Separator"), this);
-  tqlayout->addWidget(group);
+  layout->addWidget(group);
 
   mAlternateButton = new TQRadioButton(i18n("Alternating backgrounds"),
                                       group, "mAlternateButton");
@@ -124,7 +124,7 @@ void LookAndFeelPage::initGUI()
 
   // Background Checkbox/Selector
   TQHBoxLayout *backgroundLayout = new TQHBoxLayout();
-  tqlayout->addLayout(backgroundLayout);
+  layout->addLayout(backgroundLayout);
 
   mBackgroundBox = new TQCheckBox(i18n("Enable background image:"), this,
                                  "mBackgroundBox");
@@ -141,10 +141,10 @@ void LookAndFeelPage::initGUI()
   // ToolTip Checkbox
   mToolTipBox = new TQCheckBox(i18n("Enable contact tooltips"), this,
                               "mToolTipBox");
-  tqlayout->addWidget(mToolTipBox);
+  layout->addWidget(mToolTipBox);
 #if KDE_IS_VERSION(3,2,90)
   mIMPresenceBox = new TQCheckBox( i18n( "Show instant messaging presence" ), this, "mIMPresenceBox" );
-  tqlayout->addWidget( mIMPresenceBox );
+  layout->addWidget( mIMPresenceBox );
 #endif
 }
 
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index 7d95c043e..4656f62b1 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -149,11 +149,11 @@ KAddressBookCardView::KAddressBookCardView( KAB::Core *core,
 {
   mShowEmptyFields = false;
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() );
+  TQVBoxLayout *layout = new TQVBoxLayout( viewWidget() );
 
   mCardView = new AddresseeCardView( viewWidget(), "mCardView" );
   mCardView->setSelectionMode( CardView::Extended );
-  tqlayout->addWidget( mCardView );
+  layout->addWidget( mCardView );
 
   // Connect up the signals
   connect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ),
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index b99bca85c..d9c3aa2f6 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -139,10 +139,10 @@ KAddressBookIconView::KAddressBookIconView( KAB::Core *core,
                                             TQWidget *parent, const char *name)
   : KAddressBookView( core, parent, name )
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() );
+  TQVBoxLayout *layout = new TQVBoxLayout( viewWidget() );
 
   mIconView = new AddresseeIconView( viewWidget(), "mIconView" );
-  tqlayout->addWidget( mIconView );
+  layout->addWidget( mIconView );
 
   // Connect up the signals
   connect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ),
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 6fa731308..de1ae2ec3 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -210,7 +210,7 @@ void KAddressBookTableView::readConfig( KConfig *config )
   if ( config->readBoolEntry( "Background", false ) )
     mListView->setBackgroundPixmap( config->readPathEntry( "BackgroundName" ) );
 
-  // Restore the tqlayout of the listview
+  // Restore the layout of the listview
   mListView->restoreLayout( config, config->group() );
 }