TQt4 port kdeaddons

This enables compilation under both Qt3 and Qt4


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

1 files changed, 35 insertions, 35 deletions

diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp
index 58c478c..1109b6f 100644
--- a/noatun-plugins/alarm/wakeup.cpp
+++ b/noatun-plugins/alarm/wakeup.cpp
@@ -104,7 +104,7 @@ void Wakeup::slotCheckTime()
 	TQDate d;
 
 	t=TQTime::currentTime();
-	d=TQDate::currentDate();
+	d=TQDate::tqcurrentDate();
 
 	if (t.minute()!=minute[d.dayOfWeek()-1] || t.hour()!=hour[d.dayOfWeek()-1]) return;
 
@@ -165,11 +165,11 @@ void Wakeup::slotVolumeChange()
 ///////////////////////////////////////////////////////////////////
 // Prefs CModule 
 ///////////////////////////////////////////////////////////////////
-WakeupPrefs::WakeupPrefs( TQObject *parent ) :
-	CModule( i18n("Wakeup"), i18n("Alarm Configuration"), "date", parent )
+WakeupPrefs::WakeupPrefs( TQObject *tqparent ) :
+	CModule( i18n("Wakeup"), i18n("Alarm Configuration"), "date", tqparent )
 {
-	TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-	TQGridLayout *grid = new TQGridLayout (layout,8,4);
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+	TQGridLayout *grid = new TQGridLayout (tqlayout,8,4);
 	
 	monday=new TQCheckBox(i18n("Monday"),this);
 	tuesday=new TQCheckBox(i18n("Tuesday"),this);
@@ -203,38 +203,38 @@ WakeupPrefs::WakeupPrefs( TQObject *parent ) :
 	TQLabel *selectday = new TQLabel (i18n("Select days:"),this);
 	TQLabel *choosehour = new TQLabel (i18n("Hour"),this);
 	TQLabel *choosemin = new TQLabel (i18n("Minute"),this);
-	grid->addWidget (selectday,0,0,Qt::AlignLeft); 
-	grid->addWidget (choosehour,0,1,Qt::AlignLeft); 
-	grid->addWidget (choosemin,0,2,Qt::AlignLeft); 
+	grid->addWidget (selectday,0,0,TQt::AlignLeft); 
+	grid->addWidget (choosehour,0,1,TQt::AlignLeft); 
+	grid->addWidget (choosemin,0,2,TQt::AlignLeft); 
 
 	applyall = new TQPushButton (this,"applyall");
 	applyall->setPixmap( BarIcon("down", KIcon::SizeSmall) ); 
-	applyall->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, 
+	applyall->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, 
 						TQSizePolicy::Fixed, 
 						applyall->sizePolicy().hasHeightForWidth()) );
-	grid->addWidget (applyall,1,3,Qt::AlignLeft);						
-
-	grid->addWidget (monday,1,0,Qt::AlignLeft);
-	grid->addWidget (tuesday,2,0,Qt::AlignLeft);
-	grid->addWidget (wednesday,3,0,Qt::AlignLeft);
-	grid->addWidget (thursday,4,0,Qt::AlignLeft);
-	grid->addWidget (friday,5,0,Qt::AlignLeft);
-	grid->addWidget (saturday,6,0,Qt::AlignLeft);
-	grid->addWidget (sunday,7,0,Qt::AlignLeft);
-	grid->addWidget (hour1,1,1,Qt::AlignLeft);
-	grid->addWidget (hour2,2,1,Qt::AlignLeft);
-	grid->addWidget (hour3,3,1,Qt::AlignLeft);
-	grid->addWidget (hour4,4,1,Qt::AlignLeft);
-	grid->addWidget (hour5,5,1,Qt::AlignLeft);
-	grid->addWidget (hour6,6,1,Qt::AlignLeft);
-	grid->addWidget (hour7,7,1,Qt::AlignLeft);
-	grid->addWidget (minute1,1,2,Qt::AlignLeft);
-	grid->addWidget (minute2,2,2,Qt::AlignLeft);
-	grid->addWidget (minute3,3,2,Qt::AlignLeft);
-	grid->addWidget (minute4,4,2,Qt::AlignLeft);
-	grid->addWidget (minute5,5,2,Qt::AlignLeft);
-	grid->addWidget (minute6,6,2,Qt::AlignLeft);
-	grid->addWidget (minute7,7,2,Qt::AlignLeft);
+	grid->addWidget (applyall,1,3,TQt::AlignLeft);						
+
+	grid->addWidget (monday,1,0,TQt::AlignLeft);
+	grid->addWidget (tuesday,2,0,TQt::AlignLeft);
+	grid->addWidget (wednesday,3,0,TQt::AlignLeft);
+	grid->addWidget (thursday,4,0,TQt::AlignLeft);
+	grid->addWidget (friday,5,0,TQt::AlignLeft);
+	grid->addWidget (saturday,6,0,TQt::AlignLeft);
+	grid->addWidget (sunday,7,0,TQt::AlignLeft);
+	grid->addWidget (hour1,1,1,TQt::AlignLeft);
+	grid->addWidget (hour2,2,1,TQt::AlignLeft);
+	grid->addWidget (hour3,3,1,TQt::AlignLeft);
+	grid->addWidget (hour4,4,1,TQt::AlignLeft);
+	grid->addWidget (hour5,5,1,TQt::AlignLeft);
+	grid->addWidget (hour6,6,1,TQt::AlignLeft);
+	grid->addWidget (hour7,7,1,TQt::AlignLeft);
+	grid->addWidget (minute1,1,2,TQt::AlignLeft);
+	grid->addWidget (minute2,2,2,TQt::AlignLeft);
+	grid->addWidget (minute3,3,2,TQt::AlignLeft);
+	grid->addWidget (minute4,4,2,TQt::AlignLeft);
+	grid->addWidget (minute5,5,2,TQt::AlignLeft);
+	grid->addWidget (minute6,6,2,TQt::AlignLeft);
+	grid->addWidget (minute7,7,2,TQt::AlignLeft);
 	grid->setColStretch (0,3);
 	
 	TQButtonGroup *modeGroup = new TQButtonGroup (3, Qt::Vertical, i18n ("Volume Control"),this);
@@ -248,9 +248,9 @@ WakeupPrefs::WakeupPrefs( TQObject *parent ) :
 	TQLabel *volEndLabel = new TQLabel (i18n("Volume increases to:"), volFrame);
 	volEndValue = new KPercentSpinBox (1 ,volFrame,"volendvalue");
 
-	layout->addWidget(modeGroup);
-	layout->addWidget(volFrame);
-	layout->addStretch();
+	tqlayout->addWidget(modeGroup);
+	tqlayout->addWidget(volFrame);
+	tqlayout->addStretch();
 
 	TQHBoxLayout *volLayout = new TQHBoxLayout(volFrame, KDialog::marginHint(), KDialog::spacingHint()); 
 	volLayout->addWidget(volEndLabel);