$OpenBSD: patch-kountdown_setupdlg_setupdlg_cpp,v 1.1 2004/01/15 18:23:13 espie Exp $
--- kountdown/setupdlg/setupdlg.cpp.orig	2004-01-15 19:17:33.000000000 +0100
+++ kountdown/setupdlg/setupdlg.cpp	2004-01-15 19:18:30.000000000 +0100
@@ -82,45 +82,45 @@ SetupDlg::~SetupDlg()
 
 // ReadCommonSettings macro
 #define RCS(X) \
-	X##->displayText->setText( config->readEntry( "Text", i18n( "It's now %D days and %S seconds left to %F - %T" ) ) ); \
-	X##->backCol->setColor( config->readColorEntry( "BackCol", &Qt::black ) ); \
-	X##->fontCol->setColor( config->readColorEntry( "FontCol", &Qt::red ) ); \
-	X##->backPattern->setCurrentItem( config->readNumEntry( "BackPattern", 0) ); \
-	X##->rndBackCol->setChecked( config->readBoolEntry( "RandomBackCol", false ) ); \
-	X##->rndFontCol->setChecked( config->readBoolEntry( "RandomFontCol", false ) ); \
-	X##->rndFont->setChecked( config->readBoolEntry( "RandomFont", false ) ); \
-	X##->effects->setButton( config->readNumEntry( "Text effect", 0 ) ); \
-	X##->speed->setValue( config->readNumEntry( "Speed", 50 ) );
+	X->displayText->setText( config->readEntry( "Text", i18n( "It's now %D days and %S seconds left to %F - %T" ) ) ); \
+	X->backCol->setColor( config->readColorEntry( "BackCol", &Qt::black ) ); \
+	X->fontCol->setColor( config->readColorEntry( "FontCol", &Qt::red ) ); \
+	X->backPattern->setCurrentItem( config->readNumEntry( "BackPattern", 0) ); \
+	X->rndBackCol->setChecked( config->readBoolEntry( "RandomBackCol", false ) ); \
+	X->rndFontCol->setChecked( config->readBoolEntry( "RandomFontCol", false ) ); \
+	X->rndFont->setChecked( config->readBoolEntry( "RandomFont", false ) ); \
+	X->effects->setButton( config->readNumEntry( "Text effect", 0 ) ); \
+	X->speed->setValue( config->readNumEntry( "Speed", 50 ) );
 
 // WriteCommonSettings macro
 #define WCS(X) \
-	config->writeEntry( "Text", X##->displayText->text() ); \
-	config->writeEntry( "BackCol", X##->backCol->color() ); \
-	config->writeEntry( "FontCol", X##->fontCol->color() ); \
-	config->writeEntry( "BackPattern", X##->backPattern->currentItem() ); \
-	config->writeEntry( "RandomBackCol", X##->rndBackCol->isChecked() ); \
-	config->writeEntry( "RandomFontCol", X##->rndFontCol->isChecked() ); \
-	config->writeEntry( "RandomFont", X##->rndFont->isChecked() ); \
-	config->writeEntry( "Text effect", X##->effects->id( X##->effects->selected() ) ); \
-	config->writeEntry( "Speed", X##->speed->value() );
+	config->writeEntry( "Text", X->displayText->text() ); \
+	config->writeEntry( "BackCol", X->backCol->color() ); \
+	config->writeEntry( "FontCol", X->fontCol->color() ); \
+	config->writeEntry( "BackPattern", X->backPattern->currentItem() ); \
+	config->writeEntry( "RandomBackCol", X->rndBackCol->isChecked() ); \
+	config->writeEntry( "RandomFontCol", X->rndFontCol->isChecked() ); \
+	config->writeEntry( "RandomFont", X->rndFont->isChecked() ); \
+	config->writeEntry( "Text effect", X->effects->id( X->effects->selected() ) ); \
+	config->writeEntry( "Speed", X->speed->value() );
 
 // ReadFormat macro
 #define RFORMAT(X) \
 	format = config->readNumEntry( "Display", 9 ); \
-	X##->years->setChecked( calcFormat( format, YEARS ) ); \
-	X##->months->setChecked( calcFormat( format, MONTHS ) ); \
-	X##->weeks->setChecked( calcFormat( format, WEEKS ) ); \
-	X##->days->setChecked( calcFormat( format, DAYS ) ); \
-	X##->hours->setChecked( calcFormat( format, HOURS ) ); \
-	X##->min->setChecked( calcFormat( format, MINS ) ); \
-	X##->sec->setChecked( calcFormat( format, SECS ) ); \
+	X->years->setChecked( calcFormat( format, YEARS ) ); \
+	X->months->setChecked( calcFormat( format, MONTHS ) ); \
+	X->weeks->setChecked( calcFormat( format, WEEKS ) ); \
+	X->days->setChecked( calcFormat( format, DAYS ) ); \
+	X->hours->setChecked( calcFormat( format, HOURS ) ); \
+	X->min->setChecked( calcFormat( format, MINS ) ); \
+	X->sec->setChecked( calcFormat( format, SECS ) ); \
 
 // WriteFormat macro
 #define WFORMAT(X) \
 	config->writeEntry( "Display", calcFormat( \
-		X##->years->isChecked(), X##->months->isChecked(), X##->weeks->isChecked(), \
-		X##->days->isChecked(), X##->hours->isChecked(), X##->min->isChecked(), \
-		X##->sec->isChecked() ) );
+		X->years->isChecked(), X->months->isChecked(), X->weeks->isChecked(), \
+		X->days->isChecked(), X->hours->isChecked(), X->min->isChecked(), \
+		X->sec->isChecked() ) );
 
 void SetupDlg::readSettings()
 {