diff --git a/kontact_plugin/basket_plugin.h b/kontact_plugin/basket_plugin.h
index a11026a..29f7a7b 100644
--- a/kontact_plugin/basket_plugin.h
+++ b/kontact_plugin/basket_plugin.h
@@ -40,7 +40,7 @@ class BasketUniqueAppHandler : public Kontact::UniqueAppHandler
 class BasketPlugin : public Kontact::Plugin
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     BasketPlugin( Kontact::Core *core, const char *name,
diff --git a/kontact_plugin/uniqueapphandler.h b/kontact_plugin/uniqueapphandler.h
index c0c2ee8..3882cd7 100644
--- a/kontact_plugin/uniqueapphandler.h
+++ b/kontact_plugin/uniqueapphandler.h
@@ -89,7 +89,7 @@ template <class T> class UniqueAppHandlerFactory : public UniqueAppHandlerFactor
 class KDE_EXPORT UniqueAppWatcher : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     /**
diff --git a/src/backgroundmanager.h b/src/backgroundmanager.h
index 2d1a442..73f2915 100644
--- a/src/backgroundmanager.h
+++ b/src/backgroundmanager.h
@@ -88,7 +88,7 @@ class OpaqueBackgroundEntry
 class BackgroundManager : private TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   private:
 	/// LIST OF IMAGES:
 	typedef TQValueList<BackgroundEntry*>       BackgroundsList;
diff --git a/src/backup.h b/src/backup.h
index 47a1300..2fe4b56 100644
--- a/src/backup.h
+++ b/src/backup.h
@@ -31,7 +31,7 @@
 class BackupDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	BackupDialog(TQWidget *parent = 0, const char *name = 0);
 	~BackupDialog();
diff --git a/src/basket.h b/src/basket.h
index ec7bc8a..013351b 100644
--- a/src/basket.h
+++ b/src/basket.h
@@ -57,7 +57,7 @@ class KGpgMe;
 class DiskErrorDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	DiskErrorDialog(const TQString &titleMessage, const TQString &message, TQWidget *parent = 0);
 	~DiskErrorDialog();
@@ -126,7 +126,7 @@ class HtmlExportData
 class DecoratedBasket : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	DecoratedBasket(TQWidget *parent, const TQString &folderName, const char *name = 0, WFlags fl = 0);
 	~DecoratedBasket();
@@ -146,7 +146,7 @@ class DecoratedBasket : public TQWidget
 class TransparentWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	TransparentWidget(Basket *basket);
 	void setPosition(int x, int y);
@@ -168,7 +168,7 @@ class Basket : public TQScrollView, public TQToolTip
 {
 /// CONSTRUCTOR AND DESTRUCTOR:
   Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		enum EncryptionTypes {
 			NoEncryption         = 0,
@@ -740,7 +740,7 @@ class FileEvent
 clas   s Bas    ket : public TQScrollView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	/** Construtor and destructor */
 	Bask      et(TQWidget *parent, const TQString &folderName, const char *name = "", WFlags fl = 0);
diff --git a/src/basket_part.h b/src/basket_part.h
index 041b456..068e659 100644
--- a/src/basket_part.h
+++ b/src/basket_part.h
@@ -41,7 +41,7 @@ class BNPView;
 class BasketPart : public KParts::ReadWritePart
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Default constructor
diff --git a/src/basketlistview.h b/src/basketlistview.h
index 62a7a47..4952cae 100644
--- a/src/basketlistview.h
+++ b/src/basketlistview.h
@@ -77,7 +77,7 @@ class BasketListViewItem : public TQListViewItem
 class BasketTreeListView : public KListView
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		BasketTreeListView(TQWidget *parent = 0, const char *name = 0);
 		void contentsDragEnterEvent(TQDragEnterEvent *event);
diff --git a/src/basketproperties.h b/src/basketproperties.h
index 8fa5259..4c863d4 100644
--- a/src/basketproperties.h
+++ b/src/basketproperties.h
@@ -42,7 +42,7 @@ class KColorCombo2;
 class BasketPropertiesDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	BasketPropertiesDialog(Basket *basket, TQWidget *parent = 0);
 	~BasketPropertiesDialog();
diff --git a/src/basketstatusbar.h b/src/basketstatusbar.h
index 15baf32..48f58b4 100644
--- a/src/basketstatusbar.h
+++ b/src/basketstatusbar.h
@@ -35,7 +35,7 @@ class ClickableLabel;
 class BasketStatusBar : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     BasketStatusBar(KStatusBar *bar);
 	BasketStatusBar(KParts::StatusBarExtension *extension);
diff --git a/src/bnpview.h b/src/bnpview.h
index 32ffc11..34e3042 100644
--- a/src/bnpview.h
+++ b/src/bnpview.h
@@ -57,7 +57,7 @@ class Note;
 class BNPView : public TQSplitter, virtual public BasketDcopInterface
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 	/// CONSTRUCTOR AND DESTRUCTOR:
 		BNPView(TQWidget *parent, const char *name, KXMLGUIClient *aGUIClient,
diff --git a/src/clickablelabel.h b/src/clickablelabel.h
index fbb8fdf..26e1923 100644
--- a/src/clickablelabel.h
+++ b/src/clickablelabel.h
@@ -29,7 +29,7 @@
 class ClickableLabel : public TQLabel
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	/** Construtor, initializer and destructor */
 	ClickableLabel(TQWidget *parent = 0, const char *name = 0)
diff --git a/src/colorpicker.h b/src/colorpicker.h
index 45463ca..b8e9b5d 100644
--- a/src/colorpicker.h
+++ b/src/colorpicker.h
@@ -29,7 +29,7 @@
 class DesktopColorPicker : public TQDesktopWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	/** Construtor, initializer and destructor */
 	DesktopColorPicker();
diff --git a/src/debugwindow.h b/src/debugwindow.h
index 31b9911..b167d50 100644
--- a/src/debugwindow.h
+++ b/src/debugwindow.h
@@ -34,7 +34,7 @@ class TQCloseEvent;
 
 class DebugWindow : public TQWidget  {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	/** Construtor and destructor */
 	DebugWindow(TQWidget *parent = 0, const char *name = 0);
diff --git a/src/exporterdialog.h b/src/exporterdialog.h
index e724516..44bb2cf 100644
--- a/src/exporterdialog.h
+++ b/src/exporterdialog.h
@@ -35,7 +35,7 @@ class Basket;
 class ExporterDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	ExporterDialog(Basket *basket, TQWidget *parent = 0, const char *name = 0);
 	~ExporterDialog();
diff --git a/src/filter.h b/src/filter.h
index 0141813..a9c7e38 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -56,7 +56,7 @@ class FilterData
 class FilterBar : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	FilterBar(TQWidget *parent = 0, const char *name = 0);
 	~FilterBar();
diff --git a/src/focusedwidgets.h b/src/focusedwidgets.h
index 8478c4c..f757fce 100644
--- a/src/focusedwidgets.h
+++ b/src/focusedwidgets.h
@@ -32,7 +32,7 @@
 class FocusedTextEdit : public KTextEdit
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	FocusedTextEdit(bool disableUpdatesOnKeyPress, TQWidget *parent = 0, const char *name = 0);
 	~FocusedTextEdit();
@@ -55,7 +55,7 @@ class FocusedTextEdit : public KTextEdit
 class FocusedColorCombo : public KColorCombo
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	FocusedColorCombo(TQWidget *parent = 0, const char *name = 0);
 	~FocusedColorCombo();
@@ -70,7 +70,7 @@ class FocusedColorCombo : public KColorCombo
 class FocusedFontCombo : public KFontCombo
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	FocusedFontCombo(TQWidget *parent = 0, const char *name = 0);
 	~FocusedFontCombo();
@@ -85,7 +85,7 @@ class FocusedFontCombo : public KFontCombo
 class FocusedComboBox : public KComboBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	FocusedComboBox(TQWidget *parent = 0, const char *name = 0);
 	~FocusedComboBox();
@@ -100,7 +100,7 @@ class FocusedComboBox : public KComboBox
 class FocusedLineEdit : public KLineEdit
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	FocusedLineEdit(TQWidget *parent = 0, const char *name = 0);
 	~FocusedLineEdit();
diff --git a/src/formatimporter.h b/src/formatimporter.h
index fffda7a..2568288 100644
--- a/src/formatimporter.h
+++ b/src/formatimporter.h
@@ -35,7 +35,7 @@ namespace KIO {
 class FormatImporter : TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	static bool shouldImportBaskets();
 	static void importBaskets();
diff --git a/src/kcolorcombo2.h b/src/kcolorcombo2.h
index 1862051..ceea8a1 100644
--- a/src/kcolorcombo2.h
+++ b/src/kcolorcombo2.h
@@ -76,7 +76,7 @@ class KColorPopup;
 class KColorCombo2 : public TQComboBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   TQ_PROPERTY(TQColor color        READ color        WRITE setColor)
   TQ_PROPERTY(TQColor defaultColor READ defaultColor WRITE setDefaultColor)
 
@@ -312,7 +312,7 @@ class KColorCombo2 : public TQComboBox
 class KColorPopup : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	KColorPopup(KColorCombo2 *parent);
 	~KColorPopup();
diff --git a/src/kiconcanvas.h b/src/kiconcanvas.h
index 10290ec..563ad0c 100644
--- a/src/kiconcanvas.h
+++ b/src/kiconcanvas.h
@@ -32,7 +32,7 @@ class KIO_EXPORT KIconCanvas: public KIconView
 /* NOTE: Why export this? */
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     KIconCanvas(TQWidget *parent=0L, const char *name=0L);
diff --git a/src/kicondialog.h b/src/kicondialog.h
index da43b74..7626090 100644
--- a/src/kicondialog.h
+++ b/src/kicondialog.h
@@ -44,7 +44,7 @@ class KIconLoader;
 class KIO_EXPORT KIconDialog: public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     /**
@@ -219,7 +219,7 @@ private:
 class KIO_EXPORT KIconButton: public TQPushButton
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     TQ_PROPERTY( TQString icon READ icon WRITE setIcon RESET resetIcon )
     TQ_PROPERTY( int iconSize READ iconSize WRITE setIconSize)
     TQ_PROPERTY( bool strictIconSize READ strictIconSize WRITE setStrictIconSize )
diff --git a/src/likeback.h b/src/likeback.h
index ba44001..f386d41 100644
--- a/src/likeback.h
+++ b/src/likeback.h
@@ -75,7 +75,7 @@ class LikeBackDialog;
 class LikeBack : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	/**
 	 * Ids of every LikeBack buttons the button-bar can have.
diff --git a/src/likeback_private.h b/src/likeback_private.h
index e4258a5..f4fe03a 100644
--- a/src/likeback_private.h
+++ b/src/likeback_private.h
@@ -57,7 +57,7 @@ class LikeBackPrivate
 class LikeBackBar : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	LikeBackBar(LikeBack *likeBack);
 	~LikeBackBar();
@@ -82,7 +82,7 @@ class LikeBackBar : public TQWidget
 class LikeBackDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	LikeBackDialog(LikeBack::Button reason, const TQString &initialComment, const TQString &windowPath, const TQString &context, LikeBack *likeBack);
 	~LikeBackDialog();
diff --git a/src/linklabel.h b/src/linklabel.h
index 7266ad4..48b67c6 100644
--- a/src/linklabel.h
+++ b/src/linklabel.h
@@ -100,7 +100,7 @@ class LinkLook
 class LinkLabel : public TQFrame
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	LinkLabel(int hAlign, int vAlign, TQWidget *parent = 0, const char *name = 0, WFlags f = 0);
 	LinkLabel(const TQString &title, const TQString &icon, LinkLook *look, int hAlign, int vAlign,
@@ -180,7 +180,7 @@ class LinkDisplay
 class LinkLookEditWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	LinkLookEditWidget(KCModule* module, const TQString exTitle, const TQString exIcon,
 					   TQWidget *parent = 0, const char *name = 0, WFlags fl = 0);
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 7bd8e1b..89fedd5 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -60,7 +60,7 @@ namespace KSettings { class Dialog; };
 class MainWindow : public KMainWindow
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	/** Construtor, initializer and destructor */
 	MainWindow(TQWidget *parent = 0, const char *name = 0);
diff --git a/src/newbasketdialog.h b/src/newbasketdialog.h
index c9cc0b2..a5c9886 100644
--- a/src/newbasketdialog.h
+++ b/src/newbasketdialog.h
@@ -41,7 +41,7 @@ class KColorCombo2;
 class SingleSelectionKIconView : public KIconView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	SingleSelectionKIconView(TQWidget *parent = 0, const char *name = 0, WFlags f = 0);
 	TQDragObject* dragObject();
@@ -78,7 +78,7 @@ struct NewBasketDefaultProperties
 class NewBasketDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	NewBasketDialog(Basket *parentBasket, const NewBasketDefaultProperties &defaultProperties, TQWidget *parent = 0);
 	~NewBasketDialog();
diff --git a/src/notecontent.h b/src/notecontent.h
index 52bd636..f05c7bc 100644
--- a/src/notecontent.h
+++ b/src/notecontent.h
@@ -276,7 +276,7 @@ class ImageContent : public NoteContent
 class AnimationContent : public TQObject, public NoteContent // TQObject to be able to receive TQMovie signals
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	// Constructor and destructor:
 	AnimationContent(Note *parent, const TQString &fileName, bool lazyLoad = false);
@@ -325,7 +325,7 @@ class AnimationContent : public TQObject, public NoteContent // TQObject to be a
 class FileContent : public TQObject, public NoteContent
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	// Constructor and destructor:
 	FileContent(Note *parent, const TQString &fileName);
@@ -379,7 +379,7 @@ class FileContent : public TQObject, public NoteContent
 class SoundContent : public FileContent // A sound is a file with just a bit different user interaction
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	// Constructor and destructor:
 	SoundContent(Note *parent, const TQString &fileName);
@@ -411,7 +411,7 @@ class SoundContent : public FileContent // A sound is a file with just a bit dif
 class LinkContent : public TQObject, public NoteContent
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	// Constructor and destructor:
 	LinkContent(Note *parent, const KURL &url, const TQString &title, const TQString &icon, bool autoTitle, bool autoIcon);
diff --git a/src/notedrag.h b/src/notedrag.h
index 804d05d..86e4947 100644
--- a/src/notedrag.h
+++ b/src/notedrag.h
@@ -81,7 +81,7 @@ class NoteDrag
 class ExtendedTextDrag : public TQTextDrag
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	static bool decode(const TQMimeSource *e, TQString &str);
 	static bool decode(const TQMimeSource *e, TQString &str, TQCString &subtype);
@@ -93,7 +93,7 @@ class ExtendedTextDrag : public TQTextDrag
 class KURLDrag2 : public KURLDrag
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	KURLDrag2(const KURL::List &urls) : KURLDrag(urls) {}
 	TQByteArray encodedData2(const char *mime) const
diff --git a/src/noteedit.h b/src/noteedit.h
index d6fccda..449a620 100644
--- a/src/noteedit.h
+++ b/src/noteedit.h
@@ -61,7 +61,7 @@ class FocusedColorCombo;
 class NoteEditor : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	NoteEditor(NoteContent *noteContent);
 	bool        isEmpty()  { return m_isEmpty;      }
@@ -101,7 +101,7 @@ class NoteEditor : public TQObject
 class TextEditor : public NoteEditor
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	TextEditor(TextContent *textContent, TQWidget *parent);
 	~TextEditor();
@@ -114,7 +114,7 @@ class TextEditor : public NoteEditor
 class HtmlEditor : public NoteEditor
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	HtmlEditor(HtmlContent *htmlContent, TQWidget *parent);
 	~HtmlEditor();
@@ -140,7 +140,7 @@ class HtmlEditor : public NoteEditor
 class ImageEditor : public NoteEditor
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	ImageEditor(ImageContent *imageContent, TQWidget *parent);
 };
@@ -148,7 +148,7 @@ class ImageEditor : public NoteEditor
 class AnimationEditor : public NoteEditor
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	AnimationEditor(AnimationContent *animationContent, TQWidget *parent);
 };
@@ -156,7 +156,7 @@ class AnimationEditor : public NoteEditor
 class FileEditor : public NoteEditor
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	FileEditor(FileContent *fileContent, TQWidget *parent);
 	~FileEditor();
@@ -169,7 +169,7 @@ class FileEditor : public NoteEditor
 class LinkEditor : public NoteEditor
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	LinkEditor(LinkContent *linkContent, TQWidget *parent);
 };
@@ -177,7 +177,7 @@ class LinkEditor : public NoteEditor
 class LauncherEditor : public NoteEditor
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	LauncherEditor(LauncherContent *launcherContent, TQWidget *parent);
 };
@@ -185,7 +185,7 @@ class LauncherEditor : public NoteEditor
 class ColorEditor : public NoteEditor
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	ColorEditor(ColorContent *colorContent, TQWidget *parent);
 };
@@ -193,7 +193,7 @@ class ColorEditor : public NoteEditor
 class UnknownEditor : public NoteEditor
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	  UnknownEditor(UnknownContent *unknownContent, TQWidget *parent);
 };
@@ -206,7 +206,7 @@ class UnknownEditor : public NoteEditor
 class DebuggedLineEdit : public TQLineEdit
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	DebuggedLineEdit(const TQString &text, TQWidget *parent = 0);
 	~DebuggedLineEdit();
@@ -220,7 +220,7 @@ class DebuggedLineEdit : public TQLineEdit
 class LinkEditDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	LinkEditDialog(LinkContent *contentNote, TQWidget *parent = 0);
 	~LinkEditDialog();
@@ -249,7 +249,7 @@ class LinkEditDialog : public KDialogBase
 class LauncherEditDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	LauncherEditDialog(LauncherContent *contentNote, TQWidget *parent = 0);
 	~LauncherEditDialog();
@@ -272,7 +272,7 @@ class LauncherEditDialog : public KDialogBase
 class InlineEditors : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	InlineEditors();
 	~InlineEditors();
diff --git a/src/password.h b/src/password.h
index 595f778..726048a 100644
--- a/src/password.h
+++ b/src/password.h
@@ -39,7 +39,7 @@
 class Password : public PasswordLayout
 {
 	Q_OBJECT
-	TQ_OBJECT
+	
 	public:
 		Password(TQWidget *parent, const char *name = 0);
 		~Password();
@@ -48,7 +48,7 @@ class Password : public PasswordLayout
 class PasswordDlg : public KDialogBase
 {
 	Q_OBJECT
-	TQ_OBJECT
+	
 	public:
 		PasswordDlg(TQWidget *parent, const char *name = 0);
 		~PasswordDlg();
diff --git a/src/qeffects.h b/src/qeffects.h
index efe943f..ac8e4d5 100644
--- a/src/qeffects.h
+++ b/src/qeffects.h
@@ -115,7 +115,7 @@ class TQAccessWidget : public TQWidget
 class TQAlphaWidget: public TQWidget, private TQEffects
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		TQAlphaWidget( TQWidget* w, WFlags f = 0 );
 
@@ -154,7 +154,7 @@ class TQAlphaWidget: public TQWidget, private TQEffects
 class TQRollEffect : public TQWidget, private TQEffects
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		TQRollEffect( TQWidget* w, WFlags f, DirFlags orient );
 
diff --git a/src/regiongrabber.h b/src/regiongrabber.h
index 2b6251a..1da559f 100644
--- a/src/regiongrabber.h
+++ b/src/regiongrabber.h
@@ -40,7 +40,7 @@ class SizeTip : public TQLabel
 class RegionGrabber : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     RegionGrabber(int delay);
diff --git a/src/settings.h b/src/settings.h
index 649fb27..b593b96 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -56,7 +56,7 @@ class IconSizeCombo;
 class GeneralPage : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	GeneralPage(TQWidget * parent=0, const char * name=0);
 	GeneralPage() {};
@@ -85,7 +85,7 @@ class GeneralPage : public KCModule
 class BasketsPage : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	BasketsPage(TQWidget * parent=0, const char * name=0);
 	BasketsPage() {};
@@ -117,7 +117,7 @@ class BasketsPage : public KCModule
 class NewNotesPage : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	NewNotesPage(TQWidget * parent=0, const char * name=0);
 	NewNotesPage() {};
@@ -146,7 +146,7 @@ class NewNotesPage : public KCModule
 class NotesAppearancePage : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	NotesAppearancePage(TQWidget * parent=0, const char * name=0);
 	NotesAppearancePage() {};
@@ -167,7 +167,7 @@ class NotesAppearancePage : public KCModule
 class ApplicationsPage : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	ApplicationsPage(TQWidget * parent=0, const char * name=0);
 	ApplicationsPage() {};
diff --git a/src/softwareimporters.h b/src/softwareimporters.h
index 4ceeca5..342bdc2 100644
--- a/src/softwareimporters.h
+++ b/src/softwareimporters.h
@@ -38,7 +38,7 @@ class Note;
 class TreeImportDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	TreeImportDialog(TQWidget *parent = 0);
 	~TreeImportDialog();
@@ -53,7 +53,7 @@ class TreeImportDialog : public KDialogBase
 class TextFileImportDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	TextFileImportDialog(TQWidget *parent = 0);
 	~TextFileImportDialog();
diff --git a/src/systemtray.h b/src/systemtray.h
index d413d95..8d18bae 100644
--- a/src/systemtray.h
+++ b/src/systemtray.h
@@ -32,7 +32,7 @@ class MainWindow;
 class KSystemTray2 : public KSystemTray
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	KSystemTray2(TQWidget *parent = 0, const char *name = 0);
 	~KSystemTray2();
@@ -54,7 +54,7 @@ class KSystemTray2 : public KSystemTray
 class SystemTray : public KSystemTray2
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	SystemTray(TQWidget *parent = 0, const char *name = 0);
 	~SystemTray();
diff --git a/src/tagsedit.h b/src/tagsedit.h
index a97582c..f371c73 100644
--- a/src/tagsedit.h
+++ b/src/tagsedit.h
@@ -97,7 +97,7 @@ class TagListViewItem : public TQListViewItem
 class TagListView : public TQListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	TagListView(TQWidget *parent = 0, const char *name = 0, WFlags flags = 0);
 	~TagListView();
@@ -119,7 +119,7 @@ class TagListView : public TQListView
 class TagsEditDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	TagsEditDialog(TQWidget *parent = 0, State *stateToEdit = 0, bool addNewTag = false);
 	~TagsEditDialog();
diff --git a/src/variouswidgets.h b/src/variouswidgets.h
index ea1b81b..a98d9b6 100644
--- a/src/variouswidgets.h
+++ b/src/variouswidgets.h
@@ -41,7 +41,7 @@ class Basket;
 class RunCommandRequester : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	RunCommandRequester(const TQString &runCommand, const TQString &message, TQWidget *parent = 0, const char *name = 0);
 	~RunCommandRequester();
@@ -61,7 +61,7 @@ class RunCommandRequester : public TQWidget
 class IconSizeCombo : public TQComboBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	IconSizeCombo(bool rw, TQWidget *parent = 0, const char *name = 0);
 	~IconSizeCombo();
@@ -76,7 +76,7 @@ class IconSizeCombo : public TQComboBox
 class ViewSizeDialog : public TQDialog
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	ViewSizeDialog(TQWidget *parent, int w, int h);
 	~ViewSizeDialog();
@@ -91,7 +91,7 @@ class ViewSizeDialog : public TQDialog
 class HelpLabel : public KURLLabel
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	HelpLabel(const TQString &text, const TQString &message, TQWidget *parent);
 	~HelpLabel();
@@ -111,7 +111,7 @@ class HelpLabel : public KURLLabel
 class IconSizeDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	IconSizeDialog(const TQString &caption, const TQString &message, const TQString &icon, int iconSize, TQWidget *parent);
 	~IconSizeDialog();
@@ -136,7 +136,7 @@ class IconSizeDialog : public KDialogBase
 class FontSizeCombo : public KComboBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	FontSizeCombo(bool rw, bool withDefault, TQWidget *parent = 0, const char *name = 0);
 	~FontSizeCombo();