Remove spurious TQ_OBJECT instances

78 files changed, 117 insertions, 117 deletions

diff --git a/src/canvasitemparts.h b/src/canvasitemparts.h
index 513b508..4f97869 100644
--- a/src/canvasitemparts.h
+++ b/src/canvasitemparts.h
@@ -26,7 +26,7 @@ class TQString;
 class GuiPart : public TQObject, public TQCanvasRectangle
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/**
 		 * Create a GuiPart. Control the position using setGuiPartSize, instead
@@ -95,7 +95,7 @@ class GuiPart : public TQObject, public TQCanvasRectangle
 class Text : public GuiPart
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		Text( const TQString &text, CNItem *parent, const TQRect & r, TQCanvas * canvas, int flags = TQt::AlignHCenter | TQt::AlignVCenter );
 		~Text();
@@ -206,7 +206,7 @@ class ToolButton : public TQToolButton
 class Button : public Widget
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		Button( const TQString & id, CNItem *parent, bool isToggle, const TQRect & r, TQCanvas * canvas );
 		~Button();
@@ -262,7 +262,7 @@ class SliderWidget : public TQSlider
 class Slider : public Widget
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		Slider( const TQString & id, CNItem *parent, const TQRect & r, TQCanvas * canvas );
 		~Slider();
diff --git a/src/canvasmanipulator.h b/src/canvasmanipulator.h
index 8ddc253..7ba3b8a 100644
--- a/src/canvasmanipulator.h
+++ b/src/canvasmanipulator.h
@@ -69,7 +69,7 @@ Handles canvas manipulation, such as moving an item or resizing the canvas
 class CMManager : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	enum EventState
 	{
diff --git a/src/circuitdocument.h b/src/circuitdocument.h
index ed874bd..846c650 100644
--- a/src/circuitdocument.h
+++ b/src/circuitdocument.h
@@ -62,7 +62,7 @@ information from those simulations back on the ICNDocument
 class CircuitDocument : public ICNDocument
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		CircuitDocument( const TQString &caption, KTechlab *ktechlab, const char *name = 0L );
 		~CircuitDocument();
diff --git a/src/circuitview.h b/src/circuitview.h
index d380557..e6056ca 100644
--- a/src/circuitview.h
+++ b/src/circuitview.h
@@ -21,7 +21,7 @@ class CircuitDocument;
 class CircuitView : public ICNView
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	CircuitView( CircuitDocument *circuitDocument, ViewContainer *viewContainer, uint viewAreaId, const char *name = 0l );
 	~CircuitView();
diff --git a/src/cnitem.h b/src/cnitem.h
index 04fcc62..bdcc299 100644
--- a/src/cnitem.h
+++ b/src/cnitem.h
@@ -58,7 +58,7 @@ saving and editing of associated data, cutting / copying, etc)
 class CNItem : public Item, public CIWidgetMgr
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	CNItem( ICNDocument *_icnView, bool newItem, const TQString &id );
 	virtual ~CNItem();
diff --git a/src/cnitemgroup.h b/src/cnitemgroup.h
index 18c65e6..ba89638 100644
--- a/src/cnitemgroup.h
+++ b/src/cnitemgroup.h
@@ -37,7 +37,7 @@ typedef TQValueList<TQGuardedPtr<Connector> > ConnectorList;
 class CNItemGroup : public ItemGroup
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	CNItemGroup( ICNDocument *icnDocument, const char *name = 0 );
 	~CNItemGroup();
diff --git a/src/connector.h b/src/connector.h
index 002301d..1af54a3 100644
--- a/src/connector.h
+++ b/src/connector.h
@@ -37,7 +37,7 @@ typedef TQValueVector<TQGuardedPtr<Wire> > WireVector;
 class Connector : public TQObject, public TQCanvasPolygon
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	Connector( Node * startNode, Node * endNode, ICNDocument *_ICNDocument, TQString *id = 0L );
 	~Connector();
diff --git a/src/debugmanager.h b/src/debugmanager.h
index 208d9d3..b609290 100644
--- a/src/debugmanager.h
+++ b/src/debugmanager.h
@@ -29,7 +29,7 @@ typedef TQValueList< TQGuardedPtr<GpsimProcessor> > GpsimProcessorList;
 class DebugManager : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		static DebugManager * self();
 		~DebugManager();
diff --git a/src/docmanager.h b/src/docmanager.h
index 36f7196..0daa669 100644
--- a/src/docmanager.h
+++ b/src/docmanager.h
@@ -37,7 +37,7 @@ typedef TQValueList<KAction*> KActionList;
 class DocManager : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	static DocManager * self( KTechlab * ktechlab = 0l );
 	~DocManager();
diff --git a/src/document.h b/src/document.h
index b9bc65f..1dc7b59 100644
--- a/src/document.h
+++ b/src/document.h
@@ -29,7 +29,7 @@ typedef TQValueList<TQGuardedPtr<View> > ViewList;
 class Document : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	enum DocumentType
 	{
diff --git a/src/electronics/component.h b/src/electronics/component.h
index a2b215f..5217c7f 100644
--- a/src/electronics/component.h
+++ b/src/electronics/component.h
@@ -76,7 +76,7 @@ typedef TQValueList<ElementMap> ElementMapList;
 class Component : public CNItem
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		Component( ICNDocument *icnDocument, bool newItem, const TQString &id );
 		virtual ~Component();
diff --git a/src/electronics/components/ecsubcircuit.h b/src/electronics/components/ecsubcircuit.h
index 7bc9655..89f2a41 100644
--- a/src/electronics/components/ecsubcircuit.h
+++ b/src/electronics/components/ecsubcircuit.h
@@ -22,7 +22,7 @@
 class ECSubcircuit : public Component
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ECSubcircuit( ICNDocument *icnDocument, bool newItem, const char *id = 0L );
 	~ECSubcircuit();
diff --git a/src/electronics/components/piccomponent.h b/src/electronics/components/piccomponent.h
index d5e668d..330fbf9 100644
--- a/src/electronics/components/piccomponent.h
+++ b/src/electronics/components/piccomponent.h
@@ -41,7 +41,7 @@ typedef TQMap< int, PICComponentPin * > PICComponentPinMap;
 class PICComponent : public Component
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		PICComponent( ICNDocument * icnDocument, bool newItem, const char *id = 0L );
 		~PICComponent();
diff --git a/src/electronics/ecnode.h b/src/electronics/ecnode.h
index b75e945..0306749 100644
--- a/src/electronics/ecnode.h
+++ b/src/electronics/ecnode.h
@@ -32,7 +32,7 @@ typedef TQValueVector<Pin*> PinVector;
 class ECNode : public Node
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		ECNode( ICNDocument *icnDocument, Node::node_type type, node_dir dir, const TQPoint &pos, TQString *id = 0L );
 		~ECNode();
diff --git a/src/electronics/gpsimprocessor.h b/src/electronics/gpsimprocessor.h
index e2f0e4c..aae2605 100644
--- a/src/electronics/gpsimprocessor.h
+++ b/src/electronics/gpsimprocessor.h
@@ -72,7 +72,7 @@ class DebugLine : public SourceLine
 class RegisterInfo : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		RegisterInfo( Register * reg );
 	
@@ -142,7 +142,7 @@ class GpsimDebugger : public TQObject
 {
 	friend class GpsimProcessor;
 	Q_OBJECT
-  TQ_OBJECT
+  
 	
 	public:
 		enum Type
@@ -247,7 +247,7 @@ class GpsimProcessor : public TQObject
 {
 	friend class GpsimDebugger;
 	Q_OBJECT
-  TQ_OBJECT
+  
 	
 	public:
 		/**
diff --git a/src/electronics/subcircuits.h b/src/electronics/subcircuits.h
index af56b00..7fdc1e1 100644
--- a/src/electronics/subcircuits.h
+++ b/src/electronics/subcircuits.h
@@ -25,7 +25,7 @@ Interface for dealing with loading / saving / etc of subcircuits
 class Subcircuits : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	~Subcircuits();
 	/**
diff --git a/src/electronics/switch.h b/src/electronics/switch.h
index cd1cf4c..4f5b542 100644
--- a/src/electronics/switch.h
+++ b/src/electronics/switch.h
@@ -26,7 +26,7 @@ class TQTimer;
 class Switch : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	
 	public:
 		enum State
diff --git a/src/filemetainfo.h b/src/filemetainfo.h
index 45d85de..4bfad5b 100644
--- a/src/filemetainfo.h
+++ b/src/filemetainfo.h
@@ -82,7 +82,7 @@ Looks after per-file metainfo; e.g. bookmarks, breakpoints, compiling options, e
 class FileMetaInfo : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		~FileMetaInfo();
 	
diff --git a/src/flowcodedocument.h b/src/flowcodedocument.h
index 5b2596d..0f89623 100644
--- a/src/flowcodedocument.h
+++ b/src/flowcodedocument.h
@@ -34,7 +34,7 @@ typedef TQMap<TQString, int > StringIntMap;
 class FlowCodeDocument : public ICNDocument
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		FlowCodeDocument( const TQString &caption, KTechlab *ktechlab, const char *name = 0L);
 		~FlowCodeDocument();
diff --git a/src/flowcodeview.h b/src/flowcodeview.h
index ab87507..26dfff1 100644
--- a/src/flowcodeview.h
+++ b/src/flowcodeview.h
@@ -21,7 +21,7 @@ class FlowCodeDocument;
 class FlowCodeView : public ICNView
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		FlowCodeView( FlowCodeDocument *flowCodeDocument, ViewContainer *viewContainer, uint viewAreaId, const char *name = 0l );
 		~FlowCodeView();
diff --git a/src/flowcontainer.h b/src/flowcontainer.h
index df38cf6..6369ecf 100644
--- a/src/flowcontainer.h
+++ b/src/flowcontainer.h
@@ -21,7 +21,7 @@ class RectangularOverlay;
 class FlowContainer : public FlowPart
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	FlowContainer( ICNDocument *_icnView, bool newItem, const TQString &id );
 	virtual ~FlowContainer();
diff --git a/src/flowparts/flowpart.h b/src/flowparts/flowpart.h
index 9cd2553..3523b4e 100644
--- a/src/flowparts/flowpart.h
+++ b/src/flowparts/flowpart.h
@@ -34,7 +34,7 @@ that you should reinherit for generating the assembly code.
 class FlowPart : public CNItem
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	enum FlowSymbol
 	{
diff --git a/src/flowparts/pinmapping.h b/src/flowparts/pinmapping.h
index 2c53d31..c1f278c 100644
--- a/src/flowparts/pinmapping.h
+++ b/src/flowparts/pinmapping.h
@@ -71,7 +71,7 @@ Dialog for editing a Pin Mapping
 class PinMapEditor : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		PinMapEditor( PinMapping * PinMapping, MicroInfo * Info, TQWidget * parent, const char * name );
 		
@@ -94,7 +94,7 @@ For use with FlowParts that require a pin map (e.g. Keypad and Seven Segment).
 class PinMapDocument : public ICNDocument
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		PinMapDocument();
 		~PinMapDocument();
@@ -122,7 +122,7 @@ class PinMapDocument : public ICNDocument
 class PinMapView : public ICNView
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		PinMapView( PinMapDocument * pinMapDocument, ViewContainer * viewContainer, uint viewAreaId, const char * name = 0l );
 		~PinMapView();
diff --git a/src/fpnode.h b/src/fpnode.h
index 2082a40..43b670c 100644
--- a/src/fpnode.h
+++ b/src/fpnode.h
@@ -26,7 +26,7 @@ always valid (eg not more than two outputs from one node, which makes no sense)
 class FPNode : public Node
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     FPNode( ICNDocument *_icnView, Node::node_type type, node_dir dir, const TQPoint &pos, TQString *id = 0L );
     ~FPNode();
diff --git a/src/gui/colorcombo.h b/src/gui/colorcombo.h
index 65af079..40ce598 100644
--- a/src/gui/colorcombo.h
+++ b/src/gui/colorcombo.h
@@ -23,7 +23,7 @@ which colours are displayed to be changed.
 class ColorCombo : public TQComboBox
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	TQ_PROPERTY( TQColor color READ color WRITE setColor )
 
 	public:
diff --git a/src/gui/contexthelp.h b/src/gui/contexthelp.h
index 428ac1b..452e39f 100644
--- a/src/gui/contexthelp.h
+++ b/src/gui/contexthelp.h
@@ -30,7 +30,7 @@ in a ICNDocument.
 class ContextHelp : public TQWidget
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		static ContextHelp * self( KateMDI::ToolView * parent = 0l );
 		static TQString toolViewIdentifier() { return "ContextHelp"; }
diff --git a/src/gui/doublespinbox.h b/src/gui/doublespinbox.h
index 9a412fb..079f2b5 100644
--- a/src/gui/doublespinbox.h
+++ b/src/gui/doublespinbox.h
@@ -23,7 +23,7 @@ spin box plus the SI magnitude symbol it is showing
 class DoubleSpinBox : public TQSpinBox
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		DoubleSpinBox( double lower, double upper, double minAbs, double value, const TQString & unit, TQWidget * parent = 0 );
 		virtual ~DoubleSpinBox();
diff --git a/src/gui/itemeditor.h b/src/gui/itemeditor.h
index 506e7c0..998a120 100644
--- a/src/gui/itemeditor.h
+++ b/src/gui/itemeditor.h
@@ -36,7 +36,7 @@ namespace KateMDI { class ToolView; }
 class ItemEditor : public TQWidget
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		static ItemEditor * self( KateMDI::ToolView * parent = 0l );
 		~ItemEditor();
diff --git a/src/gui/itemselector.h b/src/gui/itemselector.h
index d0fd691..2b327bf 100644
--- a/src/gui/itemselector.h
+++ b/src/gui/itemselector.h
@@ -58,7 +58,7 @@ class ILVItem : public TQObject, public KListViewItem
 class ItemSelector : public KListView
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		ItemSelector( TQWidget *parent, const char *name );
 		~ItemSelector();
@@ -122,7 +122,7 @@ class ItemSelector : public KListView
 class ComponentSelector : public ItemSelector
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		static ComponentSelector * self( KateMDI::ToolView * parent = 0l );
 		static TQString toolViewIdentifier() { return "ComponentSelector"; }
@@ -140,7 +140,7 @@ class ComponentSelector : public ItemSelector
 class FlowPartSelector : public ItemSelector
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		static FlowPartSelector * self( KateMDI::ToolView * parent = 0l );
 		static TQString toolViewIdentifier() { return "FlowPartSelector"; }
@@ -157,7 +157,7 @@ class FlowPartSelector : public ItemSelector
 class MechanicsSelector : public ItemSelector
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		static MechanicsSelector * self( KateMDI::ToolView * parent = 0l );
 		static TQString toolViewIdentifier() { return "MechanicsSelector"; }
diff --git a/src/gui/logview.h b/src/gui/logview.h
index 74663d4..bdbef38 100644
--- a/src/gui/logview.h
+++ b/src/gui/logview.h
@@ -42,7 +42,7 @@ Base class for logviews (eg GpasmInterface) which output information, warnings,
 class LogView : public KTextEdit
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		LogView( KateMDI::ToolView * parent, const char *name = 0 );
 		~LogView();
diff --git a/src/gui/microselectwidget.h b/src/gui/microselectwidget.h
index 81de13e..b5d7801 100644
--- a/src/gui/microselectwidget.h
+++ b/src/gui/microselectwidget.h
@@ -27,7 +27,7 @@ class KComboBox;
 class MicroSelectWidget : public TQGroupBox
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 	public:
 		MicroSelectWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
diff --git a/src/gui/microsettingsdlg.h b/src/gui/microsettingsdlg.h
index e89b0f0..e12d9b5 100644
--- a/src/gui/microsettingsdlg.h
+++ b/src/gui/microsettingsdlg.h
@@ -31,7 +31,7 @@ typedef TQMap< TQString, PinMapping > PinMappingMap;
 class MicroSettingsDlg : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		MicroSettingsDlg( MicroSettings *_microSettings, TQWidget *parent = 0L, const char *name = 0L );
 		~MicroSettingsDlg();
diff --git a/src/gui/newfiledlg.h b/src/gui/newfiledlg.h
index 19a1b85..4f13fd6 100644
--- a/src/gui/newfiledlg.h
+++ b/src/gui/newfiledlg.h
@@ -25,7 +25,7 @@ A standard dialog for getting file details from the user for a new project
 class NewFileDlg : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		NewFileDlg( TQWidget *parent );
 
diff --git a/src/gui/orientationwidget.h b/src/gui/orientationwidget.h
index a48bf37..73a39e4 100644
--- a/src/gui/orientationwidget.h
+++ b/src/gui/orientationwidget.h
@@ -25,7 +25,7 @@ class TQPushButton;
 class OrientationWidget : public TQWidget
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	OrientationWidget( TQWidget *parent = 0l, const char *name = 0l );
 	~OrientationWidget();
diff --git a/src/gui/oscilloscope.h b/src/gui/oscilloscope.h
index 0ded495..b0f59ac 100644
--- a/src/gui/oscilloscope.h
+++ b/src/gui/oscilloscope.h
@@ -76,7 +76,7 @@ void addOscilloscopeAsToolView( KTechlab *ktechlab );
 class Oscilloscope : public OscilloscopeWidget
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		static Oscilloscope * self( KateMDI::ToolView * parent = 0l );
 		static TQString toolViewIdentifier() { return "Oscilloscope"; }
diff --git a/src/gui/oscilloscopeview.h b/src/gui/oscilloscopeview.h
index 533c92e..0332607 100644
--- a/src/gui/oscilloscopeview.h
+++ b/src/gui/oscilloscopeview.h
@@ -26,7 +26,7 @@ class TQTimer;
 class OscilloscopeView : public TQFrame
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		OscilloscopeView( TQWidget *parent, const char *name = 0 );
 		virtual ~OscilloscopeView();
diff --git a/src/gui/outputmethoddlg.h b/src/gui/outputmethoddlg.h
index b18f8d7..6e7a914 100644
--- a/src/gui/outputmethoddlg.h
+++ b/src/gui/outputmethoddlg.h
@@ -62,7 +62,7 @@ class OutputMethodInfo
 class OutputMethodDlg : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/**
 		 * @param Caption The caption of the dialog window
diff --git a/src/gui/pieditor.h b/src/gui/pieditor.h
index 712959a..03fe2c1 100644
--- a/src/gui/pieditor.h
+++ b/src/gui/pieditor.h
@@ -30,7 +30,7 @@ class Variant;
 class PIEditor : public TQWidget
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		PIEditor(TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0);
 		~PIEditor();
@@ -53,7 +53,7 @@ class PIEditor : public TQWidget
 class PIBool : public PIEditor
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		PIBool( TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0 );
 		~PIBool();
@@ -74,7 +74,7 @@ class PIBool : public PIEditor
 class PIColor : public PIEditor
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		PIColor(TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0);
 		~PIColor();
@@ -96,7 +96,7 @@ Allows the editing of double precision numerical values, using the DoubleNum wid
 class PIDouble : public PIEditor
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		PIDouble(TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0);
 		~PIDouble();
@@ -116,7 +116,7 @@ class PIDouble : public PIEditor
 class PIFilename : public PIEditor
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		PIFilename(TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0);
 		~PIFilename();
@@ -138,7 +138,7 @@ class PIFilename : public PIEditor
 class PIInt : public PIEditor
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		PIInt( const TQString &id, Variant *data, TQWidget *parent = 0, const char *name = 0);
 		~PIInt();
@@ -158,7 +158,7 @@ class PIInt : public PIEditor
 class PILineEdit : public PIEditor
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		PILineEdit(TQString id, Variant *data, TQWidget *parent = 0, const char *name = 0);
 		~PILineEdit();
@@ -178,7 +178,7 @@ class PILineEdit : public PIEditor
 class PIStringCombo : public PIEditor
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		PIStringCombo(TQString id, Variant *data, TQWidget *parent, const char *name = 0);
 		~PIStringCombo();
diff --git a/src/gui/plvitem.h b/src/gui/plvitem.h
index 9dc1763..3e7ea12 100644
--- a/src/gui/plvitem.h
+++ b/src/gui/plvitem.h
@@ -27,7 +27,7 @@ Basic item, which holds the Variant data and Id for an item
 class PLVItem : public TQObject, public KListViewItem
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		PLVItem( KListView *listview, const TQString &id, Variant * data );
 		~PLVItem();
diff --git a/src/gui/probepositioner.h b/src/gui/probepositioner.h
index a28c6c6..daa1110 100644
--- a/src/gui/probepositioner.h
+++ b/src/gui/probepositioner.h
@@ -26,7 +26,7 @@ Widget for positioning the output of Probes in the OscilloscopeView
 class ProbePositioner : public TQWidget
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		ProbePositioner(TQWidget *parent = 0, const char *name = 0);
 		~ProbePositioner();
diff --git a/src/gui/programmerdlg.h b/src/gui/programmerdlg.h
index 20431cd..0464b91 100644
--- a/src/gui/programmerdlg.h
+++ b/src/gui/programmerdlg.h
@@ -25,7 +25,7 @@ class ProgrammerWidget;
 class ProgrammerDlg : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		/**
 		 * Create a new ProgrammerDlg with the PIC type set to picID. Other
diff --git a/src/gui/projectdlgs.h b/src/gui/projectdlgs.h
index 78ca741..56fb58b 100644
--- a/src/gui/projectdlgs.h
+++ b/src/gui/projectdlgs.h
@@ -30,7 +30,7 @@ A standard dialog for getting project details from the user for a new project
 class NewProjectDlg : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		NewProjectDlg( TQWidget * parent );
 
@@ -73,7 +73,7 @@ class NewProjectDlg : public KDialogBase
 class CreateSubprojectDlg : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		CreateSubprojectDlg( TQWidget *parent = 0 );
 		~CreateSubprojectDlg();
@@ -113,7 +113,7 @@ class CreateSubprojectDlg : public KDialogBase
 class LinkerOptionsDlg : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		LinkerOptionsDlg( LinkerOptions * linkingOptions, TQWidget *parent = 0 );
 		virtual ~LinkerOptionsDlg();
diff --git a/src/gui/propertieslistview.h b/src/gui/propertieslistview.h
index 31a5df4..5073455 100644
--- a/src/gui/propertieslistview.h
+++ b/src/gui/propertieslistview.h
@@ -29,7 +29,7 @@ typedef TQMap< TQString, PLVItem * > PLVItemMap;
 class PropertiesListView : public KListView
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	PropertiesListView( TQWidget *parent = 0l, const char *name = 0l );
 	~PropertiesListView();
diff --git a/src/gui/settingsdlg.h b/src/gui/settingsdlg.h
index 9f2af44..f43f224 100644
--- a/src/gui/settingsdlg.h
+++ b/src/gui/settingsdlg.h
@@ -29,7 +29,7 @@ class SDCCOptionsWidget;
 class SettingsDlg : public KConfigDialog
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		SettingsDlg( TQWidget *parent, const char *name, KConfigSkeleton *config );
 		~SettingsDlg();
diff --git a/src/gui/symbolviewer.h b/src/gui/symbolviewer.h
index ac085eb..56d599d 100644
--- a/src/gui/symbolviewer.h
+++ b/src/gui/symbolviewer.h
@@ -30,7 +30,7 @@ namespace KateMDI { class ToolView; }
 class SymbolViewer : public TQWidget
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		static SymbolViewer * self( KateMDI::ToolView * parent = 0l );
 		static TQString toolViewIdentifier() { return "SymbolViewer"; }
@@ -87,7 +87,7 @@ class SymbolViewer : public TQWidget
 class SymbolViewerItem : public TQObject, public KListViewItem
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		SymbolViewerItem( SymbolViewer * symbolViewer, RegisterInfo * registerInfo );
 		
diff --git a/src/icndocument.h b/src/icndocument.h
index 96fcfb5..3ad3ac0 100644
--- a/src/icndocument.h
+++ b/src/icndocument.h
@@ -34,7 +34,7 @@ typedef TQValueList<TQGuardedPtr<NodeGroup> > GuardedNodeGroupList;
 class ICNDocument : public ItemDocument
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ICNDocument( const TQString &caption, KTechlab *ktechlab, const char *name );
 	virtual ~ICNDocument();
diff --git a/src/icnview.h b/src/icnview.h
index e9792a6..3584510 100644
--- a/src/icnview.h
+++ b/src/icnview.h
@@ -23,7 +23,7 @@ class KToolBarPopupAction;
 class ICNView : public ItemView
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		ICNView( ICNDocument * icnDocument, ViewContainer *viewContainer, uint viewAreaId, const char * name = 0l );
 		~ICNView();
diff --git a/src/item.h b/src/item.h
index 56cf426..22e7a91 100644
--- a/src/item.h
+++ b/src/item.h
@@ -41,7 +41,7 @@ typedef TQValueList<GuardedItem> ItemList;
 class Item : public TQObject, public TQCanvasPolygon
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	Item( ItemDocument *itemDocument, bool newItem, const TQString &id );
 	virtual ~Item();
diff --git a/src/itemdocument.h b/src/itemdocument.h
index 03d8d35..6c5b33b 100644
--- a/src/itemdocument.h
+++ b/src/itemdocument.h
@@ -42,7 +42,7 @@ typedef TQValueList<TQPoint> TQPointList;
 class ItemDocument : public Document
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		ItemDocument( const TQString &caption, KTechlab *ktechlab, const char *name = 0 );
 		~ItemDocument();
@@ -397,7 +397,7 @@ class ItemDocument : public Document
 class Canvas : public TQCanvas
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		Canvas( ItemDocument *itemDocument, const char * name = 0 );
 		
diff --git a/src/itemgroup.h b/src/itemgroup.h
index b212541..fe30b28 100644
--- a/src/itemgroup.h
+++ b/src/itemgroup.h
@@ -34,7 +34,7 @@ some functionality such as for dealing with item data
 class ItemGroup : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ItemGroup( ItemDocument *view, const char *name = 0 );
 	virtual ~ItemGroup();
diff --git a/src/iteminterface.h b/src/iteminterface.h
index 5cc8702..4447219 100644
--- a/src/iteminterface.h
+++ b/src/iteminterface.h
@@ -50,7 +50,7 @@ Items's, and the various objects that like to know about them
 class ItemInterface : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		~ItemInterface();
 		static ItemInterface * self( KTechlab * ktechlab = 0l );
diff --git a/src/itemview.h b/src/itemview.h
index 3be2a2d..55dc420 100644
--- a/src/itemview.h
+++ b/src/itemview.h
@@ -26,7 +26,7 @@ class TQTimer;
 class ItemView : public View
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		ItemView( ItemDocument *itemDocument, ViewContainer *viewContainer, uint viewAreaId, const char *name = 0 );
 		~ItemView();
@@ -87,7 +87,7 @@ class ItemView : public View
 class CVBEditor : public TQCanvasView
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     CVBEditor( TQCanvas *canvas, ItemView *itemView, const char *name );
 	
diff --git a/src/katemdi.h b/src/katemdi.h
index e886acd..ec42c8d 100644
--- a/src/katemdi.h
+++ b/src/katemdi.h
@@ -36,7 +36,7 @@ namespace KateMDI {
 class Splitter : public TQSplitter
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     Splitter(Qt::Orientation o, TQWidget* parent=0, const char* name=0);
@@ -56,7 +56,7 @@ class Splitter : public TQSplitter
 class ToggleToolViewAction : public KToggleAction
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ToggleToolViewAction ( const TQString& text, const KShortcut& cut,
@@ -75,7 +75,7 @@ class ToggleToolViewAction : public KToggleAction
 class GUIClient : public TQObject, public KXMLGUIClient
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     GUIClient ( class MainWindow *mw );
@@ -94,7 +94,7 @@ class GUIClient : public TQObject, public KXMLGUIClient
 class ToolView : public TQVBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   friend class Sidebar;
   friend class MainWindow;
@@ -169,7 +169,7 @@ class ToolView : public TQVBox
 class Sidebar : public KMultiTabBar
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     Sidebar (KMultiTabBar::KMultiTabBarPosition pos, class MainWindow *mainwin, TQWidget *parent);
@@ -245,7 +245,7 @@ class Sidebar : public KMultiTabBar
 class MainWindow : public KParts::MainWindow
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   friend class ToolView;
 
diff --git a/src/ktechlab.h b/src/ktechlab.h
index d2bf51a..0d9c469 100644
--- a/src/ktechlab.h
+++ b/src/ktechlab.h
@@ -46,7 +46,7 @@ class TQLabel;
 class KTechlab : public KateMDI::MainWindow
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		KTechlab();
 		~KTechlab();
diff --git a/src/languages/externallanguage.h b/src/languages/externallanguage.h
index 4bf06ce..186df27 100644
--- a/src/languages/externallanguage.h
+++ b/src/languages/externallanguage.h
@@ -25,7 +25,7 @@ class provides functionality for dealing with external processes.
 class ExternalLanguage : public Language
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ExternalLanguage( ProcessChain *processChain, KTechlab *parent, const TQString &name );
 	~ExternalLanguage();
diff --git a/src/languages/language.h b/src/languages/language.h
index 8980cac..5885779 100644
--- a/src/languages/language.h
+++ b/src/languages/language.h
@@ -54,7 +54,7 @@ class ProcessOptionsSpecial
 class ProcessOptionsHelper : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 #define protected public
 	signals:
 #undef protected
@@ -204,7 +204,7 @@ class ProcessOptions : public ProcessOptionsSpecial
 class Language : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		Language( ProcessChain *processChain, KTechlab *parent, const TQString &name );
 		~Language();
diff --git a/src/languages/languagemanager.h b/src/languages/languagemanager.h
index 9bfe41b..5d6d971 100644
--- a/src/languages/languagemanager.h
+++ b/src/languages/languagemanager.h
@@ -36,7 +36,7 @@ namespace KateMDI { class ToolView; }
 class LanguageManager : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		static LanguageManager * self( KateMDI::ToolView * parent = 0l, KTechlab * ktl = 0l );
 		static TQString toolViewIdentifier() { return "LanguageManager"; }
diff --git a/src/languages/processchain.h b/src/languages/processchain.h
index a15bb43..ab99a48 100644
--- a/src/languages/processchain.h
+++ b/src/languages/processchain.h
@@ -35,7 +35,7 @@ typedef TQValueList<ProcessOptions> ProcessOptionsList;
 class ProcessChain : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		ProcessChain( ProcessOptions options, KTechlab *parent, const char *name = 0l );
 		~ProcessChain();
@@ -102,7 +102,7 @@ class ProcessChain : public TQObject
 class ProcessListChain : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 			
 	public:
 		ProcessListChain( ProcessOptionsList pol, KTechlab *parent, const char *name = 0l );
diff --git a/src/mechanics/mechanicsdocument.h b/src/mechanics/mechanicsdocument.h
index 80b1206..b2275d1 100644
--- a/src/mechanics/mechanicsdocument.h
+++ b/src/mechanics/mechanicsdocument.h
@@ -27,7 +27,7 @@ typedef TQValueList<MechanicsItem*> MechanicsItemList;
 class MechanicsDocument : public ItemDocument
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	MechanicsDocument( const TQString &caption, KTechlab *ktechlab, const char *name = 0 );
 	~MechanicsDocument();
diff --git a/src/mechanics/mechanicsgroup.h b/src/mechanics/mechanicsgroup.h
index 1ea2dc5..368a234 100644
--- a/src/mechanics/mechanicsgroup.h
+++ b/src/mechanics/mechanicsgroup.h
@@ -24,7 +24,7 @@ typedef TQValueList<MechanicsItem*> MechanicsItemList;
 class MechanicsGroup : public ItemGroup
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	MechanicsGroup( MechanicsDocument *mechanicsDocument, const char *name = 0);
 	~MechanicsGroup();
diff --git a/src/mechanics/mechanicsitem.h b/src/mechanics/mechanicsitem.h
index 712ff3c..5ccb327 100644
--- a/src/mechanics/mechanicsitem.h
+++ b/src/mechanics/mechanicsitem.h
@@ -118,7 +118,7 @@ protected:
 class MechanicsItem : public Item
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	MechanicsItem( MechanicsDocument *mechanicsDocument, bool newItem, const TQString &id );
 	virtual ~MechanicsItem();
diff --git a/src/mechanics/mechanicssimulation.h b/src/mechanics/mechanicssimulation.h
index f91a159..920d911 100644
--- a/src/mechanics/mechanicssimulation.h
+++ b/src/mechanics/mechanicssimulation.h
@@ -58,7 +58,7 @@ public:
 class MechanicsSimulation : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     MechanicsSimulation( MechanicsDocument *mechanicsDocument );
     ~MechanicsSimulation();
diff --git a/src/mechanics/mechanicsview.h b/src/mechanics/mechanicsview.h
index cba03f6..59ed484 100644
--- a/src/mechanics/mechanicsview.h
+++ b/src/mechanics/mechanicsview.h
@@ -21,7 +21,7 @@ class MechanicsDocument;
 class MechanicsView : public ItemView
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		MechanicsView( MechanicsDocument *mechanicsDocument, ViewContainer *viewContainer, uint viewAreaId, const char *name = 0l );
 		~MechanicsView();
diff --git a/src/microsettings.h b/src/microsettings.h
index 5832e76..2b3f20a 100644
--- a/src/microsettings.h
+++ b/src/microsettings.h
@@ -56,7 +56,7 @@ typedef TQMap< TQString, VariableInfo > VariableMap; // Variable name, variable
 class PinSettings : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		enum pin_type
 		{
@@ -110,7 +110,7 @@ This is different from PIC info, which includes stuff such as PIC pin names
 class MicroSettings : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
     enum VariableType
 	{
diff --git a/src/node.h b/src/node.h
index 271fdf1..e5b29a9 100644
--- a/src/node.h
+++ b/src/node.h
@@ -34,7 +34,7 @@ typedef TQValueList<TQGuardedPtr<Node> > NodeList;
 class Node : public TQObject, public TQCanvasPolygon
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	/**
 	 * Used for run-time identification of the node:
diff --git a/src/nodegroup.h b/src/nodegroup.h
index 26521ab..54d0da4 100644
--- a/src/nodegroup.h
+++ b/src/nodegroup.h
@@ -36,7 +36,7 @@ along with their associated connectors.
 class NodeGroup : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	NodeGroup( ICNDocument *icnDocument, const char *name = 0);
 	~NodeGroup();
diff --git a/src/oscilloscopedata.h b/src/oscilloscopedata.h
index c4b3bca..b73eb4c 100644
--- a/src/oscilloscopedata.h
+++ b/src/oscilloscopedata.h
@@ -209,7 +209,7 @@ class StoredData
 class ProbeData : public TQObject
 {
 	Q_OBJECT
-	TQ_OBJECT
+	
 
 	public:
 		ProbeData( int id );
diff --git a/src/picitem.h b/src/picitem.h
index 7d936bf..959311f 100644
--- a/src/picitem.h
+++ b/src/picitem.h
@@ -26,7 +26,7 @@ class PinSettings;
 class PinItem : public TQObject, public TQCanvasRectangle
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	PinItem( FlowCodeDocument* _view, TQPoint position, bool _onLeft, PinSettings *_pinSettings );
 
@@ -67,7 +67,7 @@ Allows visual editing of inital PIC settings
 class PicItem : public CNItem
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		PicItem( ICNDocument *icnDocument, bool newItem, const char *id, MicroSettings *_microSettings );
 		~PicItem();
diff --git a/src/projectmanager.h b/src/projectmanager.h
index 54f873f..3adef41 100644
--- a/src/projectmanager.h
+++ b/src/projectmanager.h
@@ -238,7 +238,7 @@ class ProjectItem : public TQObject, public LinkerOptions, public ProcessingOpti
 class ProjectInfo : public ProjectItem
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 	public:
 		ProjectInfo( ProjectManager * projectManager, KTechlab * ktechlab );
@@ -267,7 +267,7 @@ class ProjectInfo : public ProjectItem
 class ProjectManager : public ItemSelector
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		~ProjectManager();
 		static ProjectManager * self( KTechlab * ktl = 0l, KateMDI::ToolView * parent = 0l );
diff --git a/src/recentfilesaction.h b/src/recentfilesaction.h
index 33598bf..d382a49 100644
--- a/src/recentfilesaction.h
+++ b/src/recentfilesaction.h
@@ -20,7 +20,7 @@ Adapted to work around strange bug occuring.
 class RecentFilesAction : public KSelectAction
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		RecentFilesAction( const TQString & configGroupName, const TQString & text, const TQObject * receiver, const char* slot, TQObject* parent, const char * name );
 		
diff --git a/src/resizeoverlay.h b/src/resizeoverlay.h
index 6fbb17f..a2a2f12 100644
--- a/src/resizeoverlay.h
+++ b/src/resizeoverlay.h
@@ -32,7 +32,7 @@ typedef TQMap< int, TQGuardedPtr<ResizeHandle> > ResizeHandleMap;
 class ResizeHandle : public TQObject, public TQCanvasRectangle
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	/**
 	 * Convenience enumeration for resize handle positioning. Note: this class
@@ -117,7 +117,7 @@ typedef TQValueList<ResizeHandle*> ResizeHandleList;
 class ResizeOverlay : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ResizeOverlay( Item *parent );
 	~ResizeOverlay();
@@ -191,7 +191,7 @@ protected:
 class MechanicsItemOverlay : public ResizeOverlay
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	MechanicsItemOverlay( MechanicsItem *parent );
 	~MechanicsItemOverlay();
@@ -222,7 +222,7 @@ protected:
 class RectangularOverlay : public ResizeOverlay
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	RectangularOverlay( Item *item, int xsnap = 1, int ysnap = 1 );
 	void removeTopMiddle();
@@ -261,7 +261,7 @@ protected:
 class LineOverlay : public ResizeOverlay
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		LineOverlay( Item * parent );
 		TQPoint startPoint() const;
diff --git a/src/simulator.h b/src/simulator.h
index fd03173..fedf605 100644
--- a/src/simulator.h
+++ b/src/simulator.h
@@ -83,7 +83,7 @@ logic, external simulators (such as gpsim), mechanical simulation, etc).
 class Simulator : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		static Simulator * self();
 		~Simulator();
diff --git a/src/textdocument.h b/src/textdocument.h
index edd8850..e5dd9d3 100644
--- a/src/textdocument.h
+++ b/src/textdocument.h
@@ -30,7 +30,7 @@ typedef TQValueList<int> IntList;
 class TextDocument : public Document
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	~TextDocument();
 
diff --git a/src/textview.h b/src/textview.h
index 0523750..fd35ea1 100644
--- a/src/textview.h
+++ b/src/textview.h
@@ -31,7 +31,7 @@ class VariableLabel;
 class TextView : public View
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		TextView( TextDocument *textDocument, ViewContainer *viewContainer, uint viewAreaId, const char *name = 0 );
 		~TextView();
@@ -104,7 +104,7 @@ over (used in the debugger).
 class TextViewEventFilter : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		TextViewEventFilter( TextView * textView );
 		
diff --git a/src/variablelabel.h b/src/variablelabel.h
index 1462d33..106b5ab 100644
--- a/src/variablelabel.h
+++ b/src/variablelabel.h
@@ -29,7 +29,7 @@ a variable while debugging.
 class VariableLabel : public TQLabel
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		VariableLabel( TextView * parent );
 		/**
diff --git a/src/variant.h b/src/variant.h
index b74c221..52a9ca7 100644
--- a/src/variant.h
+++ b/src/variant.h
@@ -27,7 +27,7 @@ contained. e.g. returns TQVariant::Color or TQVariant::Rect
 class Variant : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	class Type
 	{
diff --git a/src/view.h b/src/view.h
index cfa2047..0fff775 100644
--- a/src/view.h
+++ b/src/view.h
@@ -29,7 +29,7 @@ class TQVBoxLayout;
 class ViewStatusBar : public KStatusBar
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	ViewStatusBar( View *view );
 	
@@ -61,7 +61,7 @@ protected:
 class View : public TQWidget, public KXMLGUIClient
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	View( Document *document, ViewContainer *viewContainer, uint viewAreaId, const char *name = 0 );
 	virtual ~View();
diff --git a/src/viewcontainer.h b/src/viewcontainer.h
index 94a71e6..b74fd65 100644
--- a/src/viewcontainer.h
+++ b/src/viewcontainer.h
@@ -50,7 +50,7 @@ If it contains two ViewAreas, then the value returned by id() is -1.
 class ViewArea : public TQSplitter
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	enum Position
 	{
@@ -113,7 +113,7 @@ protected:
 class ViewContainer : public TQWidget
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	/**
 	 * Constructs a new ViewContainer, along with a default ViewArea ready for