1 files changed, 9 insertions, 9 deletions
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index a2861c712..8cacbfec6 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -22,7 +22,7 @@
 */
 
 #include <tqstring.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqvbox.h>
@@ -94,19 +94,19 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config )
   c = KGlobalSettings::baseColor();
   lbColors->insertItem( new ColorListItem( i18n("Background Color"),
         config->readColorEntry( "BackgroundColor", &c ) ) );
-  c = colorGroup().foreground();
+  c = tqcolorGroup().foreground();
   lbColors->insertItem( new ColorListItem( i18n("Text Color"),
         config->readColorEntry( "TextColor", &c ) ) );
-  c = colorGroup().button();
+  c = tqcolorGroup().button();
   lbColors->insertItem( new ColorListItem( i18n("Header, Border & Separator Color"),
         config->readColorEntry( "HeaderColor", &c ) ) );
-  c = colorGroup().buttonText();
+  c = tqcolorGroup().buttonText();
   lbColors->insertItem( new ColorListItem( i18n("Header Text Color"),
         config->readColorEntry( "HeaderTextColor", &c ) ) );
-  c = colorGroup().highlight();
+  c = tqcolorGroup().highlight();
   lbColors->insertItem( new ColorListItem( i18n("Highlight Color"),
         config->readColorEntry( "HighlightColor", &c ) ) );
-  c = colorGroup().highlightedText();
+  c = tqcolorGroup().highlightedText();
   lbColors->insertItem( new ColorListItem( i18n("Highlighted Text Color"),
         config->readColorEntry( "HighlightedTextColor", &c ) ) );
 
@@ -120,7 +120,7 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config )
   cbEnableCustomFonts->setChecked( config->readBoolEntry( "EnableCustomFonts", false ) );
   enableFonts();
 
-  // layout
+  // tqlayout
   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() );
   }
-  // layout
+  // tqlayout
   config->writeEntry( "ItemMargin", sbMargin->value() );
   config->writeEntry( "ItemSpacing", sbSpacing->value() );
   config->writeEntry( "SeparatorWidth", sbSepWidth->value() );
@@ -313,7 +313,7 @@ void CardViewLookNFeelPage::initGUI()
 void CardViewLookNFeelPage::updateFontLabel( TQFont fnt, TQLabel *l )
 {
   l->setFont( fnt );
-  l->setText(  TQString( fnt.family() + " %1" ).arg( fnt.pointSize() ) );
+  l->setText(  TQString( fnt.family() + " %1" ).tqarg( fnt.pointSize() ) );
 }
 
 #include "configurecardviewdialog.moc"