Remove spurious TQ_OBJECT instances

57 files changed, 79 insertions, 79 deletions

diff --git a/kalarm/alarmcalendar.h b/kalarm/alarmcalendar.h
index 1b7ffc029..cebd64605 100644
--- a/kalarm/alarmcalendar.h
+++ b/kalarm/alarmcalendar.h
@@ -36,7 +36,7 @@ class KConfig;
 class AlarmCalendar : public TQObject
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		virtual ~AlarmCalendar();
 		bool                  valid() const                       { return mUrl.isValid(); }
diff --git a/kalarm/alarmlistview.h b/kalarm/alarmlistview.h
index 7e78cbd5c..a48def331 100644
--- a/kalarm/alarmlistview.h
+++ b/kalarm/alarmlistview.h
@@ -64,7 +64,7 @@ class AlarmListViewItem : public EventListViewItemBase
 class AlarmListView : public EventListViewBase
 {
 		Q_OBJECT
-		TQ_OBJECT       // needed by TQObject::isA() calls
+		       // needed by TQObject::isA() calls
 	public:
 		enum ColumnIndex {    // default column order
 			TIME_COLUMN, TIME_TO_COLUMN, REPEAT_COLUMN, COLOUR_COLUMN, TYPE_COLUMN, MESSAGE_COLUMN,
diff --git a/kalarm/alarmtimewidget.h b/kalarm/alarmtimewidget.h
index 3525acf62..47659adb5 100644
--- a/kalarm/alarmtimewidget.h
+++ b/kalarm/alarmtimewidget.h
@@ -34,7 +34,7 @@ class TimeSpinBox;
 class AlarmTimeWidget : public ButtonGroup
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		enum {       // 'mode' values for constructor. May be OR'ed together.
 			AT_TIME      = 0x00,   // "At ..."
diff --git a/kalarm/birthdaydlg.h b/kalarm/birthdaydlg.h
index 1abd4c8a3..c8851f1bf 100644
--- a/kalarm/birthdaydlg.h
+++ b/kalarm/birthdaydlg.h
@@ -43,7 +43,7 @@ class BListView;
 class BirthdayDlg : public KDialogBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		BirthdayDlg(TQWidget* parent = 0);
 		TQValueList<KAEvent> events() const;
@@ -80,7 +80,7 @@ class BirthdayDlg : public KDialogBase
 class BLineEdit : public TQLineEdit
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		BLineEdit(TQWidget* parent = 0, const char* name = 0)
 			     : TQLineEdit(parent, name) {}
@@ -95,7 +95,7 @@ class BLineEdit : public TQLineEdit
 class BListView : public KListView
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		BListView(TQWidget* parent = 0, const char* name = 0);
 	public slots:
diff --git a/kalarm/daemon.h b/kalarm/daemon.h
index a43d7a42e..775833d33 100644
--- a/kalarm/daemon.h
+++ b/kalarm/daemon.h
@@ -37,7 +37,7 @@ class NotificationHandler;
 class Daemon : public TQObject
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		static void      initialise();
 		static void      createDcopHandler();
@@ -120,7 +120,7 @@ class Daemon : public TQObject
 class AlarmEnableAction : public KToggleAction
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		AlarmEnableAction(int accel, TQObject* parent, const char* name = 0);
 	public slots:
diff --git a/kalarm/deferdlg.h b/kalarm/deferdlg.h
index f7a09f47f..37f8b144f 100644
--- a/kalarm/deferdlg.h
+++ b/kalarm/deferdlg.h
@@ -30,7 +30,7 @@ class AlarmTimeWidget;
 class DeferAlarmDlg : public KDialogBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		DeferAlarmDlg(const TQString& caption, const DateTime& initialDT,
 		              bool cancelButton, TQWidget* parent = 0, const char* name = 0);
diff --git a/kalarm/editdlg.h b/kalarm/editdlg.h
index 626ea5d67..1b2b0a492 100644
--- a/kalarm/editdlg.h
+++ b/kalarm/editdlg.h
@@ -58,7 +58,7 @@ class PickAlarmFileRadio;
 class EditAlarmDlg : public KDialogBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		enum MessageType { MESSAGE, FILE };
 		enum CmdLogType { DISCARD_OUTPUT, LOG_TO_FILE, EXEC_IN_TERMINAL };
diff --git a/kalarm/editdlgprivate.h b/kalarm/editdlgprivate.h
index ec2bc73d1..8851b58b8 100644
--- a/kalarm/editdlgprivate.h
+++ b/kalarm/editdlgprivate.h
@@ -27,7 +27,7 @@
 class PageFrame : public TQFrame
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		PageFrame(TQWidget* parent = 0, const char* name = 0) : TQFrame(parent, name) { }
 	protected:
@@ -39,7 +39,7 @@ class PageFrame : public TQFrame
 class TextEdit : public KTextEdit
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		TextEdit(TQWidget* parent, const char* name = 0);
 	protected:
diff --git a/kalarm/emailidcombo.h b/kalarm/emailidcombo.h
index 1d2c2785f..a2cbabc22 100644
--- a/kalarm/emailidcombo.h
+++ b/kalarm/emailidcombo.h
@@ -28,7 +28,7 @@
 class EmailIdCombo : public KPIM::IdentityCombo
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		explicit EmailIdCombo(KPIM::IdentityManager*, TQWidget* parent = 0, const char* name = 0);
 		void  setReadOnly(bool ro)    { mReadOnly = ro; }
diff --git a/kalarm/eventlistviewbase.h b/kalarm/eventlistviewbase.h
index 86263a7a9..6024a4b5d 100644
--- a/kalarm/eventlistviewbase.h
+++ b/kalarm/eventlistviewbase.h
@@ -36,7 +36,7 @@ class Find;
 class EventListViewBase : public KListView
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		typedef TQValueList<EventListViewBase*>              InstanceList;
 		typedef TQValueListIterator<EventListViewBase*>      InstanceListIterator;
diff --git a/kalarm/find.h b/kalarm/find.h
index c1eff2ad8..493f10cc4 100644
--- a/kalarm/find.h
+++ b/kalarm/find.h
@@ -36,7 +36,7 @@ class EventListViewItemBase;
 class Find : public TQObject
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		explicit Find(EventListViewBase* parent);
 		~Find();
diff --git a/kalarm/fontcolour.h b/kalarm/fontcolour.h
index 15c051075..4c36113cd 100644
--- a/kalarm/fontcolour.h
+++ b/kalarm/fontcolour.h
@@ -35,7 +35,7 @@ class CheckBox;
 class FontColourChooser : public TQWidget
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	explicit FontColourChooser(TQWidget* parent = 0, const char* name = 0,
 	       bool onlyFixed = false,
diff --git a/kalarm/fontcolourbutton.h b/kalarm/fontcolourbutton.h
index be9fff6fe..6126ad645 100644
--- a/kalarm/fontcolourbutton.h
+++ b/kalarm/fontcolourbutton.h
@@ -34,7 +34,7 @@ class PushButton;
 class FontColourButton : public TQFrame
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		FontColourButton(TQWidget* parent = 0, const char* name = 0);
 		void          setDefaultFont();
@@ -68,7 +68,7 @@ class FontColourButton : public TQFrame
 class FontColourDlg : public KDialogBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		FontColourDlg(const TQColor& bg, const TQColor& fg, const TQFont&, bool defaultFont,
 		              const TQString& caption, TQWidget* parent = 0, const char* name = 0);
diff --git a/kalarm/kalarmapp.h b/kalarm/kalarmapp.h
index 6653e8101..22e51324b 100644
--- a/kalarm/kalarmapp.h
+++ b/kalarm/kalarmapp.h
@@ -48,7 +48,7 @@ class ShellProcess;
 class KAlarmApp : public KUniqueApplication
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		~KAlarmApp();
 		virtual int        newInstance();
diff --git a/kalarm/kalarmd/adapp.h b/kalarm/kalarmd/adapp.h
index 9e0cdc1d0..96b24d924 100644
--- a/kalarm/kalarmd/adapp.h
+++ b/kalarm/kalarmd/adapp.h
@@ -31,7 +31,7 @@ class AlarmDaemon;
 class AlarmDaemonApp : public KUniqueApplication
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		AlarmDaemonApp();
 		virtual int  newInstance();
diff --git a/kalarm/kalarmd/adcalendar.h b/kalarm/kalarmd/adcalendar.h
index 51506d46d..965be1051 100644
--- a/kalarm/kalarmd/adcalendar.h
+++ b/kalarm/kalarmd/adcalendar.h
@@ -30,7 +30,7 @@ class ADCalendar;
 class ADCalendar : public KCal::CalendarLocal
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		typedef TQValueList<ADCalendar*>::ConstIterator ConstIterator;
 
diff --git a/kalarm/kalarmd/alarmdaemon.h b/kalarm/kalarmd/alarmdaemon.h
index fbbb8f308..a3260a58e 100644
--- a/kalarm/kalarmd/alarmdaemon.h
+++ b/kalarm/kalarmd/alarmdaemon.h
@@ -32,7 +32,7 @@ class ADCalendar;
 class AlarmDaemon : public TQObject, virtual public AlarmDaemonIface
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		AlarmDaemon(bool autostart, TQObject* parent = 0, const char* name = 0);
 
diff --git a/kalarm/latecancel.h b/kalarm/latecancel.h
index 08fcf2c3e..73bf71300 100644
--- a/kalarm/latecancel.h
+++ b/kalarm/latecancel.h
@@ -33,7 +33,7 @@ class CheckBox;
 class LateCancelSelector : public TQFrame
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		LateCancelSelector(bool allowHourMinute, TQWidget* parent, const char* name = 0);
 		int            minutes() const;
diff --git a/kalarm/lib/buttongroup.h b/kalarm/lib/buttongroup.h
index f4d812653..d1038918d 100644
--- a/kalarm/lib/buttongroup.h
+++ b/kalarm/lib/buttongroup.h
@@ -38,7 +38,7 @@
 class ButtonGroup : public TQButtonGroup
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Constructor.
 		 *  @param parent The parent object of this widget.
diff --git a/kalarm/lib/checkbox.h b/kalarm/lib/checkbox.h
index 7759f6229..020f95949 100644
--- a/kalarm/lib/checkbox.h
+++ b/kalarm/lib/checkbox.h
@@ -42,7 +42,7 @@
 class CheckBox : public TQCheckBox
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Constructor.
 		 *  @param parent The parent object of this widget.
diff --git a/kalarm/lib/colourcombo.h b/kalarm/lib/colourcombo.h
index 2a075d235..10be36dab 100644
--- a/kalarm/lib/colourcombo.h
+++ b/kalarm/lib/colourcombo.h
@@ -43,7 +43,7 @@
 class ColourCombo : public TQComboBox
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 		TQ_PROPERTY(TQColor color READ color WRITE setColor)
 	public:
 		/** Constructor.
diff --git a/kalarm/lib/combobox.h b/kalarm/lib/combobox.h
index 3d5ff13e6..f0402c721 100644
--- a/kalarm/lib/combobox.h
+++ b/kalarm/lib/combobox.h
@@ -37,7 +37,7 @@
 class ComboBox : public TQComboBox
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Constructor.
 		 *  @param parent The parent object of this widget.
diff --git a/kalarm/lib/dateedit.h b/kalarm/lib/dateedit.h
index 525dc5c68..405566ec7 100644
--- a/kalarm/lib/dateedit.h
+++ b/kalarm/lib/dateedit.h
@@ -37,7 +37,7 @@
 class DateEdit : public KDateEdit
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Constructor.
 		 *  @param parent The parent object of this widget.
diff --git a/kalarm/lib/label.h b/kalarm/lib/label.h
index ba418aee8..5f26adc8f 100644
--- a/kalarm/lib/label.h
+++ b/kalarm/lib/label.h
@@ -41,7 +41,7 @@ class LabelFocusWidget;
 class Label : public TQLabel
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 		friend class LabelFocusWidget;
 	public:
 		/** Constructs an empty label.
@@ -88,7 +88,7 @@ class Label : public TQLabel
 class LabelFocusWidget : public TQWidget
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		LabelFocusWidget(TQWidget* parent, const char* name = 0);
 	protected:
diff --git a/kalarm/lib/lineedit.h b/kalarm/lib/lineedit.h
index 660d45377..ecfd52422 100644
--- a/kalarm/lib/lineedit.h
+++ b/kalarm/lib/lineedit.h
@@ -43,7 +43,7 @@
 class LineEdit : public KLineEdit
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Types of drag and drop content which will be accepted.
 		 *  @li Text   - the line edit contains general text. It accepts text, a URL
diff --git a/kalarm/lib/pushbutton.h b/kalarm/lib/pushbutton.h
index d3aee32cd..fd3574027 100644
--- a/kalarm/lib/pushbutton.h
+++ b/kalarm/lib/pushbutton.h
@@ -37,7 +37,7 @@
 class PushButton : public TQPushButton
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 		TQ_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
 	public:
 		/** Constructor.
diff --git a/kalarm/lib/radiobutton.h b/kalarm/lib/radiobutton.h
index 3af80343f..e983ebaca 100644
--- a/kalarm/lib/radiobutton.h
+++ b/kalarm/lib/radiobutton.h
@@ -42,7 +42,7 @@
 class RadioButton : public TQRadioButton
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Constructor.
 		 *  @param parent The parent object of this widget.
diff --git a/kalarm/lib/shellprocess.h b/kalarm/lib/shellprocess.h
index a4ff79889..8c577d85b 100644
--- a/kalarm/lib/shellprocess.h
+++ b/kalarm/lib/shellprocess.h
@@ -50,7 +50,7 @@
 class ShellProcess : public KShellProcess
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Current status of the shell process.
 		 *  @li INACTIVE - start() has not yet been called to run the command.
diff --git a/kalarm/lib/slider.h b/kalarm/lib/slider.h
index 6b72c5ba6..bd8e750ae 100644
--- a/kalarm/lib/slider.h
+++ b/kalarm/lib/slider.h
@@ -37,7 +37,7 @@
 class Slider : public TQSlider
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 		TQ_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
 	public:
 		/** Constructor.
diff --git a/kalarm/lib/spinbox.h b/kalarm/lib/spinbox.h
index 081087db0..7712cdec7 100644
--- a/kalarm/lib/spinbox.h
+++ b/kalarm/lib/spinbox.h
@@ -42,7 +42,7 @@
 class SpinBox : public TQSpinBox
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Constructor.
 		 *  @param parent The parent object of this widget.
diff --git a/kalarm/lib/spinbox2.h b/kalarm/lib/spinbox2.h
index 14c2f16e1..fe082524a 100644
--- a/kalarm/lib/spinbox2.h
+++ b/kalarm/lib/spinbox2.h
@@ -56,7 +56,7 @@ class ExtraSpinBox;
 class SpinBox2 : public TQFrame
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Constructor.
 		 *  @param parent The parent object of this widget.
diff --git a/kalarm/lib/spinbox2private.h b/kalarm/lib/spinbox2private.h
index c1c116b04..093d8c8a7 100644
--- a/kalarm/lib/spinbox2private.h
+++ b/kalarm/lib/spinbox2private.h
@@ -34,7 +34,7 @@
 class ExtraSpinBox : public SpinBox
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		explicit ExtraSpinBox(TQWidget* parent, const char* name = 0)
 		             : SpinBox(parent, name), mNewStylePending(false) { }
@@ -61,7 +61,7 @@ class ExtraSpinBox : public SpinBox
 class SpinMirror : public TQCanvasView
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		explicit SpinMirror(SpinBox*, TQFrame* spinFrame, TQWidget* parent = 0, const char* name = 0);
 		void         setReadOnly(bool ro)        { mReadOnly = ro; }
diff --git a/kalarm/lib/synchtimer.h b/kalarm/lib/synchtimer.h
index 144c8a830..8d640f0b8 100644
--- a/kalarm/lib/synchtimer.h
+++ b/kalarm/lib/synchtimer.h
@@ -37,7 +37,7 @@ class TQTimer;
 class SynchTimer : public TQObject
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		virtual ~SynchTimer();
 
@@ -77,7 +77,7 @@ class SynchTimer : public TQObject
 class MinuteTimer : public SynchTimer
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		virtual ~MinuteTimer()  { mInstance = 0; }
 		/** Connect to the timer signal.
@@ -117,7 +117,7 @@ class MinuteTimer : public SynchTimer
 class DailyTimer : public SynchTimer
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		virtual ~DailyTimer();
 		/** Connect to the timer signal which triggers at the given fixed time of day.
diff --git a/kalarm/lib/timeedit.h b/kalarm/lib/timeedit.h
index 658fe7805..4a74d5765 100644
--- a/kalarm/lib/timeedit.h
+++ b/kalarm/lib/timeedit.h
@@ -50,7 +50,7 @@ class TimeSpinBox;
 class TimeEdit : public TQHBox
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Constructor.
 		 *  @param parent The parent object of this widget.
diff --git a/kalarm/lib/timeperiod.h b/kalarm/lib/timeperiod.h
index 9c4152b76..e2e24819f 100644
--- a/kalarm/lib/timeperiod.h
+++ b/kalarm/lib/timeperiod.h
@@ -50,7 +50,7 @@ class TimeSpinBox;
 class TimePeriod : public TQHBox
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Units for the time period.
 		 *  @li MINUTES - the time period is entered as a number of minutes.
diff --git a/kalarm/lib/timespinbox.h b/kalarm/lib/timespinbox.h
index fe45efab4..6d9f5dbe5 100644
--- a/kalarm/lib/timespinbox.h
+++ b/kalarm/lib/timespinbox.h
@@ -45,7 +45,7 @@
 class TimeSpinBox : public SpinBox2
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Constructor for a wrapping time spin box which can be used to enter a time of day.
 		 *  @param use24hour True for entry of 24-hour clock times (range 00:00 to 23:59).
diff --git a/kalarm/mainwindow.h b/kalarm/mainwindow.h
index 08fcfacad..d8ca5181c 100644
--- a/kalarm/mainwindow.h
+++ b/kalarm/mainwindow.h
@@ -42,7 +42,7 @@ class TemplateMenuAction;
 class MainWindow : public MainWindowBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 
 	public:
 		static MainWindow* create(bool restored = false);
diff --git a/kalarm/mainwindowbase.h b/kalarm/mainwindowbase.h
index a6ba5ed33..80e4cad21 100644
--- a/kalarm/mainwindowbase.h
+++ b/kalarm/mainwindowbase.h
@@ -34,7 +34,7 @@
 class MainWindowBase : public KMainWindow
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 
 	public:
 		explicit MainWindowBase(TQWidget* parent = 0, const char* name = 0, WFlags f = WType_TopLevel | WDestructiveClose)
diff --git a/kalarm/messagewin.h b/kalarm/messagewin.h
index b941307d1..03deea6b7 100644
--- a/kalarm/messagewin.h
+++ b/kalarm/messagewin.h
@@ -44,7 +44,7 @@ namespace KDE { class PlayObject; }
 class MessageWin : public MainWindowBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		MessageWin();     // for session management restoration only
 		MessageWin(const KAEvent&, const KAAlarm&, bool reschedule_event = true, bool allowDefer = true);
diff --git a/kalarm/pickfileradio.h b/kalarm/pickfileradio.h
index 72b431102..f30ca7f63 100644
--- a/kalarm/pickfileradio.h
+++ b/kalarm/pickfileradio.h
@@ -50,7 +50,7 @@ class LineEdit;
 class PickFileRadio : public RadioButton
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Constructor.
 		 *  @param button Push button to invoke the file picker dialogue.
diff --git a/kalarm/prefdlg.h b/kalarm/prefdlg.h
index 5f8f55430..a58e22d7a 100644
--- a/kalarm/prefdlg.h
+++ b/kalarm/prefdlg.h
@@ -54,7 +54,7 @@ class MiscPrefTab;
 class KAlarmPrefDlg : public KDialogBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		static void display();
 		~KAlarmPrefDlg();
@@ -84,7 +84,7 @@ class KAlarmPrefDlg : public KDialogBase
 class PrefsTabBase : public TQWidget
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		PrefsTabBase(TQVBox*);
 
@@ -106,7 +106,7 @@ class PrefsTabBase : public TQWidget
 class MiscPrefTab : public PrefsTabBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		MiscPrefTab(TQVBox*);
 
@@ -152,7 +152,7 @@ class MiscPrefTab : public PrefsTabBase
 class EmailPrefTab : public PrefsTabBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		EmailPrefTab(TQVBox*);
 
@@ -188,7 +188,7 @@ class EmailPrefTab : public PrefsTabBase
 class EditPrefTab : public PrefsTabBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		EditPrefTab(TQVBox*);
 
@@ -227,7 +227,7 @@ class EditPrefTab : public PrefsTabBase
 class ViewPrefTab : public PrefsTabBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		ViewPrefTab(TQVBox*);
 
@@ -260,7 +260,7 @@ class ViewPrefTab : public PrefsTabBase
 class FontColourPrefTab : public PrefsTabBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		FontColourPrefTab(TQVBox*);
 
diff --git a/kalarm/preferences.h b/kalarm/preferences.h
index e7e3e90a1..77adeb58f 100644
--- a/kalarm/preferences.h
+++ b/kalarm/preferences.h
@@ -42,7 +42,7 @@ class TQWidget;
 class Preferences : public TQObject
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		enum MailClient { SENDMAIL, KMAIL };
 		enum MailFrom   { MAIL_FROM_KMAIL, MAIL_FROM_CONTROL_CENTRE, MAIL_FROM_ADDR };
diff --git a/kalarm/recurrenceedit.h b/kalarm/recurrenceedit.h
index 5b3aae479..82ab954c6 100644
--- a/kalarm/recurrenceedit.h
+++ b/kalarm/recurrenceedit.h
@@ -56,7 +56,7 @@ class YearlyRule;
 class RecurrenceEdit : public TQFrame
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		// Don't alter the order of these recurrence types
 		enum RepeatType { INVALID_RECUR = -1, NO_RECUR, AT_LOGIN, SUBDAILY, DAILY, WEEKLY, MONTHLY, ANNUAL };
diff --git a/kalarm/recurrenceeditprivate.h b/kalarm/recurrenceeditprivate.h
index 94472c379..6a239ae78 100644
--- a/kalarm/recurrenceeditprivate.h
+++ b/kalarm/recurrenceeditprivate.h
@@ -47,7 +47,7 @@ class NoRule : public TQFrame
 class Rule : public NoRule
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, bool readOnly,
 		     TQWidget* parent, const char* name = 0);
@@ -73,7 +73,7 @@ class Rule : public NoRule
 class SubDailyRule : public Rule
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		SubDailyRule(bool readOnly, TQWidget* parent, const char* name = 0);
 };
@@ -82,7 +82,7 @@ class SubDailyRule : public Rule
 class DayWeekRule : public Rule
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis, const TQString& daysWhatsThis,
 		            bool readOnly, TQWidget* parent, const char* name = 0);
@@ -117,7 +117,7 @@ class WeeklyRule : public DayWeekRule
 class MonthYearRule : public Rule
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		enum DayPosType { DATE, POS };
 
@@ -172,7 +172,7 @@ class MonthlyRule : public MonthYearRule
 class YearlyRule : public MonthYearRule
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		YearlyRule(bool readOnly, TQWidget* parent, const char* name = 0);
 		TQValueList<int>  months() const;
diff --git a/kalarm/reminder.h b/kalarm/reminder.h
index 7e58e8b71..14e2e9dfd 100644
--- a/kalarm/reminder.h
+++ b/kalarm/reminder.h
@@ -30,7 +30,7 @@ class CheckBox;
 class Reminder : public TQFrame
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		Reminder(const TQString& caption, const TQString& reminderWhatsThis, const TQString& valueWhatsThis,
 		         bool allowHourMinute, bool showOnceOnly, TQWidget* parent, const char* name = 0);
diff --git a/kalarm/repetition.h b/kalarm/repetition.h
index a98493c55..b28293c34 100644
--- a/kalarm/repetition.h
+++ b/kalarm/repetition.h
@@ -35,7 +35,7 @@ class RepetitionDlg;
 class RepetitionButton : public TQPushButton
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		RepetitionButton(const TQString& caption, bool waitForInitialisation, TQWidget* parent, const char* name = 0);
 		void           set(int interval, int count);
@@ -71,7 +71,7 @@ class RepetitionButton : public TQPushButton
 class RepetitionDlg : public KDialogBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* parent = 0, const char* name = 0);
 		void           setReadOnly(bool);
diff --git a/kalarm/sounddlg.h b/kalarm/sounddlg.h
index 53dd2f96b..70f01adde 100644
--- a/kalarm/sounddlg.h
+++ b/kalarm/sounddlg.h
@@ -39,7 +39,7 @@ class Slider;
 class SoundDlg : public KDialogBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		SoundDlg(const TQString& file, float volume, float fadeVolume, int fadeSeconds, bool repeat,
 		         const TQString& caption, TQWidget* parent, const char* name = 0);
diff --git a/kalarm/soundpicker.h b/kalarm/soundpicker.h
index 5f89d5354..3f150b190 100644
--- a/kalarm/soundpicker.h
+++ b/kalarm/soundpicker.h
@@ -33,7 +33,7 @@ class PushButton;
 class SoundPicker : public TQFrame
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/** Sound options which can be selected for when the alarm is displayed.
 		 *  @li NONE      - silence.
diff --git a/kalarm/specialactions.h b/kalarm/specialactions.h
index 43d8cdf9d..31df55459 100644
--- a/kalarm/specialactions.h
+++ b/kalarm/specialactions.h
@@ -31,7 +31,7 @@ class KLineEdit;
 class SpecialActionsButton : public TQPushButton
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		SpecialActionsButton(const TQString& caption, TQWidget* parent = 0, const char* name = 0);
 		void           setActions(const TQString& pre, const TQString& post);
@@ -57,7 +57,7 @@ class SpecialActionsButton : public TQPushButton
 class SpecialActions : public TQWidget
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		SpecialActions(TQWidget* parent = 0, const char* name = 0);
 		void         setActions(const TQString& pre, const TQString& post);
@@ -77,7 +77,7 @@ class SpecialActions : public TQWidget
 class SpecialActionsDlg : public KDialogBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		SpecialActionsDlg(const TQString& preAction, const TQString& postAction,
 		                  const TQString& caption, TQWidget* parent = 0, const char* name = 0);
diff --git a/kalarm/startdaytimer.h b/kalarm/startdaytimer.h
index ae0a5580f..e422f6176 100644
--- a/kalarm/startdaytimer.h
+++ b/kalarm/startdaytimer.h
@@ -35,7 +35,7 @@
 class StartOfDayTimer : public DailyTimer
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		virtual ~StartOfDayTimer()  { }
 		/** Connect to the timer signal.
diff --git a/kalarm/templatedlg.h b/kalarm/templatedlg.h
index 7ea6fbef9..f85c10588 100644
--- a/kalarm/templatedlg.h
+++ b/kalarm/templatedlg.h
@@ -30,7 +30,7 @@ class KAEvent;
 class TemplateDlg : public KDialogBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		static TemplateDlg*  create(TQWidget* parent = 0, const char* name = 0);
 		~TemplateDlg();
diff --git a/kalarm/templatelistview.h b/kalarm/templatelistview.h
index 0ac98dea8..2127bce3b 100644
--- a/kalarm/templatelistview.h
+++ b/kalarm/templatelistview.h
@@ -49,7 +49,7 @@ class TemplateListViewItem : public EventListViewItemBase
 class TemplateListView : public EventListViewBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		explicit TemplateListView(bool includeCmdAlarms, const TQString& whatsThisText, TQWidget* parent = 0, const char* name = 0);
 		~TemplateListView();
diff --git a/kalarm/templatemenuaction.h b/kalarm/templatemenuaction.h
index 3859a29a5..7f86a4d0d 100644
--- a/kalarm/templatemenuaction.h
+++ b/kalarm/templatemenuaction.h
@@ -28,7 +28,7 @@ class KAEvent;
 class TemplateMenuAction : public KActionMenu
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		TemplateMenuAction(const TQString& label, const TQString& icon, TQObject* receiver,
 		                   const char* slot, KActionCollection* parent, const char* name = 0);
diff --git a/kalarm/templatepickdlg.h b/kalarm/templatepickdlg.h
index 4cbfc3d1a..d0a685368 100644
--- a/kalarm/templatepickdlg.h
+++ b/kalarm/templatepickdlg.h
@@ -29,7 +29,7 @@ class KAEvent;
 class TemplatePickDlg : public KDialogBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		TemplatePickDlg(TQWidget* parent = 0, const char* name = 0);
 		const KAEvent*    selectedTemplate() const;
diff --git a/kalarm/timeselector.h b/kalarm/timeselector.h
index 1e8304f95..00cf15c53 100644
--- a/kalarm/timeselector.h
+++ b/kalarm/timeselector.h
@@ -31,7 +31,7 @@ class CheckBox;
 class TimeSelector : public TQFrame
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		TimeSelector(const TQString& selectText, const TQString& postfix, const TQString& selectWhatsThis,
 		             const TQString& valueWhatsThis, bool allowHourMinute, TQWidget* parent, const char* name = 0);
diff --git a/kalarm/traywindow.h b/kalarm/traywindow.h
index e69e1b565..b5deb09ca 100644
--- a/kalarm/traywindow.h
+++ b/kalarm/traywindow.h
@@ -32,7 +32,7 @@ class TrayTooltip;
 class TrayWindow : public KSystemTray
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		TrayWindow(MainWindow* parent, const char* name = 0);
 		~TrayWindow();
diff --git a/kalarm/undo.h b/kalarm/undo.h
index 6ad5dd513..0f76408ac 100644
--- a/kalarm/undo.h
+++ b/kalarm/undo.h
@@ -33,7 +33,7 @@ class UndoItem;
 class Undo : public TQObject
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		enum Type { NONE, UNDO, REDO };