Remove spurious TQ_OBJECT instances

56 files changed, 77 insertions, 77 deletions

diff --git a/adept/adept/acqprogress.h b/adept/adept/acqprogress.h
index e6990af..e5fc535 100644
--- a/adept/adept/acqprogress.h
+++ b/adept/adept/acqprogress.h
@@ -26,7 +26,7 @@ namespace adept {
 class AcqStatus : public KListView, public aptFront::ProgressCallback
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 protected:
     class ItemProgress: public KProgress {
     public:
@@ -116,7 +116,7 @@ signals:
 class AcqStatusDialog : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 protected:
 	aptFront::SharedPtr<AcqStatus> m_status;
 public:
diff --git a/adept/adept/acqprogresswidget.h b/adept/adept/acqprogresswidget.h
index 0db0b8c..f84b5a5 100644
--- a/adept/adept/acqprogresswidget.h
+++ b/adept/adept/acqprogresswidget.h
@@ -14,7 +14,7 @@ namespace adept {
 
 class AcqProgressWidget : public AcqProgressWidgetUi {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     AcqProgressWidget (TQWidget *parent = 0, const char *name = 0);
     aptFront::SharedPtr<aptFront::ProgressCallback> callback() { return m_statusRef.data(); };
diff --git a/adept/adept/actor.h b/adept/adept/actor.h
index a1fe192..fee9d04 100644
--- a/adept/adept/actor.h
+++ b/adept/adept/actor.h
@@ -17,7 +17,7 @@ using namespace aptFront;
 class EntityActor : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     EntityActor( actor::Bound< cache::entity::Entity > a )
         : m_actor( a ), m_dead( false )
diff --git a/adept/adept/application.h b/adept/adept/application.h
index 17f1c7d..0ab9ddc 100644
--- a/adept/adept/application.h
+++ b/adept/adept/application.h
@@ -29,7 +29,7 @@ class Lister;
 #ifdef KUBUNTU
 class DpkgFixer : public TQObject {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   DpkgFixer(struct Application* app);
   ~DpkgFixer();
diff --git a/adept/adept/changelog.h b/adept/adept/changelog.h
index 5ed8601..bed2961 100644
--- a/adept/adept/changelog.h
+++ b/adept/adept/changelog.h
@@ -22,7 +22,7 @@ namespace adept {
 
   class ItemChangelog : public TQObject {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ItemChangelog();
     ~ItemChangelog();
diff --git a/adept/adept/commitprogress.h b/adept/adept/commitprogress.h
index 123dc61..916e4da 100644
--- a/adept/adept/commitprogress.h
+++ b/adept/adept/commitprogress.h
@@ -14,7 +14,7 @@ namespace adept {
 class CommitProgress : public CommitProgressUi
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     CommitProgress( TQWidget *p = 0, const char *n = 0 );
 
diff --git a/adept/adept/desktoplist.h b/adept/adept/desktoplist.h
index 0469a25..3740879 100644
--- a/adept/adept/desktoplist.h
+++ b/adept/adept/desktoplist.h
@@ -24,7 +24,7 @@ class DesktopItem;
 class DesktopList : public ExtendableList, public cache::Observer
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     typedef utils::Range< entity::Desktop > Range;
     DesktopList( TQWidget *parent = 0, const char *name = 0 );
@@ -58,7 +58,7 @@ protected:
 class DesktopEntry : public DesktopEntryUi
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     DesktopEntry( TQWidget * = 0, const char * = 0 );
     DesktopItem *item() const;
diff --git a/adept/adept/dpkgpm-gui.h b/adept/adept/dpkgpm-gui.h
index a28b740..4a38e4c 100644
--- a/adept/adept/dpkgpm-gui.h
+++ b/adept/adept/dpkgpm-gui.h
@@ -22,7 +22,7 @@ namespace adept {
 class PkgSystem : public TQObject, public debSystem
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     PkgSystem ();
     virtual pkgPackageManager *CreatePM( pkgDepCache *Cache ) const;
@@ -39,7 +39,7 @@ signals:
 class DPkgPM : public TQObject, public aptFront::DPkgPM
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     DPkgPM (pkgDepCache *c, KParts::Part *t);
     virtual bool forkDpkg (char *const argv[]);
diff --git a/adept/adept/easytagfilter.h b/adept/adept/easytagfilter.h
index cc39c3d..8adb151 100644
--- a/adept/adept/easytagfilter.h
+++ b/adept/adept/easytagfilter.h
@@ -81,7 +81,7 @@ protected:
 class EasyTagFilterWidget : public EasyTagFilterUi
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     EasyTagFilterWidget( TQWidget *parent, const char *name = 0 );
     virtual Predicate predicate();
diff --git a/adept/adept/extendablelist.h b/adept/adept/extendablelist.h
index a1b52f7..161dad3 100644
--- a/adept/adept/extendablelist.h
+++ b/adept/adept/extendablelist.h
@@ -19,7 +19,7 @@ class ItemExtender;
 
 class ExtendableList : public KListView {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     typedef bool(*ItemCompare)( const ExtendableItem *,
                                 const ExtendableItem * );
@@ -124,7 +124,7 @@ protected:
 
 class ItemExtender : public TQWidget {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     // ItemExtender( ExtendableItem *item );
     ItemExtender( TQWidget *parent, const char *n )
diff --git a/adept/adept/filterlist.h b/adept/adept/filterlist.h
index 7aa52bd..57c5eaf 100644
--- a/adept/adept/filterlist.h
+++ b/adept/adept/filterlist.h
@@ -46,7 +46,7 @@ signals:
 class PredicateInterface: public ItemExtender
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     typedef predicate::Predicate< entity::Entity > Predicate;
     PredicateInterface( TQWidget *w = 0, const char *n = 0 );
@@ -70,7 +70,7 @@ class FilterItem;
 class FilterList : public ExtendableList
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     friend class FilterItem;
     typedef predicate::Predicate< entity::Entity > Predicate;
diff --git a/adept/adept/filtersidebar.h b/adept/adept/filtersidebar.h
index f9e9c66..0126e1c 100644
--- a/adept/adept/filtersidebar.h
+++ b/adept/adept/filtersidebar.h
@@ -13,7 +13,7 @@ namespace adept {
 
 class FilterSidebar : public FilterSidebarUi {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     FilterSidebar( TQWidget *p = 0, const char *n = 0 )
         : FilterSidebarUi( p, n ) 
diff --git a/adept/adept/filterwidget.h b/adept/adept/filterwidget.h
index 39d45b9..2a9e40f 100644
--- a/adept/adept/filterwidget.h
+++ b/adept/adept/filterwidget.h
@@ -18,7 +18,7 @@ namespace adept {
 class FilterWidget : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     FilterWidget( TQWidget *parent = 0, const char *n = 0 )
         : TQWidget( parent, n ) {}
diff --git a/adept/adept/groupeddesktopselector.h b/adept/adept/groupeddesktopselector.h
index 95a7dc6..7e3c8b0 100644
--- a/adept/adept/groupeddesktopselector.h
+++ b/adept/adept/groupeddesktopselector.h
@@ -14,7 +14,7 @@ using namespace aptFront::cache;
 class GroupedDesktopSelector : public KJanusWidget, cache::Observer
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     struct IconPolicy {
         virtual TQString iconForGroup( TQString group ) { return group; }
diff --git a/adept/adept/installerview.h b/adept/adept/installerview.h
index 5fcc5ff..92dbe6f 100644
--- a/adept/adept/installerview.h
+++ b/adept/adept/installerview.h
@@ -14,7 +14,7 @@ namespace adept {
 class InstallerView : public InstallerViewUi
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     typedef predicate::Predicate< entity::Desktop > Predicate;
     InstallerView( TQWidget *p = 0, const char *n = 0 );
diff --git a/adept/adept/lister.h b/adept/adept/lister.h
index 03506ab..d1a93cc 100644
--- a/adept/adept/lister.h
+++ b/adept/adept/lister.h
@@ -45,7 +45,7 @@ struct entityLess {
 class Lister: public ExtendableList, public Observer
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   static const int ColPackage     = 0;
 #ifdef KUBUNTU
@@ -174,7 +174,7 @@ protected:
 class ListerItemExtender : public ListerItemExtenderUi,
                            public cache::Observer {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     ListerItemExtender( TQWidget *parent = 0, const char * n = 0 );
     ~ListerItemExtender();
diff --git a/adept/adept/packagedetails.h b/adept/adept/packagedetails.h
index 6a64ae3..379ae06 100644
--- a/adept/adept/packagedetails.h
+++ b/adept/adept/packagedetails.h
@@ -24,7 +24,7 @@ class PackageDetails : public PackageDetailsUi, public Lister::RangeProvider,
                        public cache::Observer
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     enum ButtonID { BForward, BBack, BShow };
     PackageDetails( TQWidget *p = 0, const char *n = 0 );
diff --git a/adept/adept/packageinfo.h b/adept/adept/packageinfo.h
index fc43ed1..f44a66a 100644
--- a/adept/adept/packageinfo.h
+++ b/adept/adept/packageinfo.h
@@ -16,7 +16,7 @@ using namespace aptFront;
 class PackageInfo : public PackageInfoUi, public cache::Observer
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     PackageInfo( TQWidget *p, const char *n = 0 );
 public slots:
diff --git a/adept/adept/quickfilter.h b/adept/adept/quickfilter.h
index 4b72300..85dec24 100644
--- a/adept/adept/quickfilter.h
+++ b/adept/adept/quickfilter.h
@@ -102,7 +102,7 @@ protected:
 class QuickFilterWidget : public QuickFilterUi
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     QuickFilterWidget( TQWidget *parent, const char *name = 0 );
     virtual Predicate predicate();
diff --git a/adept/adept/sourceseditor.h b/adept/adept/sourceseditor.h
index 7faa1a9..be0b368 100644
--- a/adept/adept/sourceseditor.h
+++ b/adept/adept/sourceseditor.h
@@ -15,7 +15,7 @@ using namespace aptFront;
 class SourcesEditor : public SourcesEditorUi
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     SourcesEditor( std::string f, TQWidget *p = 0, const char *n = 0 );
 public slots:
diff --git a/adept/adept/statefilter.h b/adept/adept/statefilter.h
index 726470a..908b9b2 100644
--- a/adept/adept/statefilter.h
+++ b/adept/adept/statefilter.h
@@ -133,7 +133,7 @@ protected:
 class StateFilterWidget : public StateFilterUi
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     StateFilterWidget( TQWidget *parent, const char *name = 0 );
     virtual Predicate predicate();
diff --git a/adept/adept/tagchooser.h b/adept/adept/tagchooser.h
index 35cafad..55eadd0 100644
--- a/adept/adept/tagchooser.h
+++ b/adept/adept/tagchooser.h
@@ -50,7 +50,7 @@ protected:
 class TagChooser : public KListView, public cache::Observer // ExtendableList
 { 
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     typedef ept::debtags::Tag Tag;
     typedef ept::debtags::Facet Facet;
diff --git a/adept/adept/tagfilter.h b/adept/adept/tagfilter.h
index a75c42b..575ee95 100644
--- a/adept/adept/tagfilter.h
+++ b/adept/adept/tagfilter.h
@@ -93,7 +93,7 @@ protected:
 class TagFilterWidget : public TagFilterUi
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     TagFilterWidget( TQWidget *p, const char *n );
     virtual Predicate predicate();
diff --git a/adept/adept/taglist.h b/adept/adept/taglist.h
index c325c5e..f5fbda3 100644
--- a/adept/adept/taglist.h
+++ b/adept/adept/taglist.h
@@ -24,7 +24,7 @@ class TagList;
 class TagLabel : public TQHBox
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     typedef ept::debtags::Tag Tag;
     TagLabel( Tag t, TagList *l, TQWidget *p = 0, const char *n = 0 );
@@ -40,7 +40,7 @@ protected:
 class TagList : public TQVBox
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     typedef ept::debtags::Tag Tag;
     TagList( TQWidget *p = 0, const char *n = 0 );
diff --git a/adept/adept/view.h b/adept/adept/view.h
index fc284f9..227c29f 100644
--- a/adept/adept/view.h
+++ b/adept/adept/view.h
@@ -20,7 +20,7 @@ class PackageDetails;
 
 class View: public TQSplitter, public Lister::RangeProvider {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     View( TQWidget *p = 0, const char *n = 0 );
     FilterList *filterList() { return m_flist; }
@@ -44,7 +44,7 @@ protected:
 
 class Browser : public TQWidgetStack {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     Browser( TQWidget *p = 0, const char *n = 0 );
     View *searchView() const { return m_view; }
diff --git a/adept/batch/app.h b/adept/batch/app.h
index f6fb729..7556483 100644
--- a/adept/batch/app.h
+++ b/adept/batch/app.h
@@ -29,7 +29,7 @@ using namespace adept;
 
 class App : public KMainWindow, Application {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     void setupActions();
     ExtTerminalInterface *terminal();
diff --git a/adept/installer/app.h b/adept/installer/app.h
index 931658d..2a4af2a 100644
--- a/adept/installer/app.h
+++ b/adept/installer/app.h
@@ -37,7 +37,7 @@ struct IconPolicy : GroupedDesktopSelector::IconPolicy {
 
 class App : public KMainWindow, Application {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     enum State { Select, Preview, Inspect, Commit };
     void setupActions();
@@ -112,7 +112,7 @@ protected:
 
 class WaitForLister : public TQObject {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     WaitForLister( App *a, const char *s )
         : app( a ), slot( s )
diff --git a/adept/kubuntu_upgrader/errordialog.h b/adept/kubuntu_upgrader/errordialog.h
index fc03d33..c48e78a 100644
--- a/adept/kubuntu_upgrader/errordialog.h
+++ b/adept/kubuntu_upgrader/errordialog.h
@@ -28,7 +28,7 @@ class TQString;
 class ErrorDialog : public ErrorDialogDlg
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   ErrorDialog(TQWidget* parent = 0, TQString error_text = TQString(), const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
diff --git a/adept/kubuntu_upgrader/upgradewizard.h b/adept/kubuntu_upgrader/upgradewizard.h
index 8accc44..889c12f 100644
--- a/adept/kubuntu_upgrader/upgradewizard.h
+++ b/adept/kubuntu_upgrader/upgradewizard.h
@@ -50,7 +50,7 @@ class DistroEntry {
 class UpgradeWizard : public UpgradeWizardDlg
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   UpgradeWizard(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
diff --git a/adept/libadept/acqprogress.h b/adept/libadept/acqprogress.h
index e6990af..e5fc535 100644
--- a/adept/libadept/acqprogress.h
+++ b/adept/libadept/acqprogress.h
@@ -26,7 +26,7 @@ namespace adept {
 class AcqStatus : public KListView, public aptFront::ProgressCallback
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 protected:
     class ItemProgress: public KProgress {
     public:
@@ -116,7 +116,7 @@ signals:
 class AcqStatusDialog : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 protected:
 	aptFront::SharedPtr<AcqStatus> m_status;
 public:
diff --git a/adept/libadept/acqprogresswidget.h b/adept/libadept/acqprogresswidget.h
index 0db0b8c..f84b5a5 100644
--- a/adept/libadept/acqprogresswidget.h
+++ b/adept/libadept/acqprogresswidget.h
@@ -14,7 +14,7 @@ namespace adept {
 
 class AcqProgressWidget : public AcqProgressWidgetUi {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     AcqProgressWidget (TQWidget *parent = 0, const char *name = 0);
     aptFront::SharedPtr<aptFront::ProgressCallback> callback() { return m_statusRef.data(); };
diff --git a/adept/libadept/actor.h b/adept/libadept/actor.h
index a1fe192..fee9d04 100644
--- a/adept/libadept/actor.h
+++ b/adept/libadept/actor.h
@@ -17,7 +17,7 @@ using namespace aptFront;
 class EntityActor : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     EntityActor( actor::Bound< cache::entity::Entity > a )
         : m_actor( a ), m_dead( false )
diff --git a/adept/libadept/application.h b/adept/libadept/application.h
index 080a6d4..d97994f 100644
--- a/adept/libadept/application.h
+++ b/adept/libadept/application.h
@@ -54,7 +54,7 @@ protected:
 
 /* class WaitForLister : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     WaitForLister( TQObject *a, const char *s )
         : obj( a ), slot( s )
diff --git a/adept/libadept/commitprogress.h b/adept/libadept/commitprogress.h
index 123dc61..916e4da 100644
--- a/adept/libadept/commitprogress.h
+++ b/adept/libadept/commitprogress.h
@@ -14,7 +14,7 @@ namespace adept {
 class CommitProgress : public CommitProgressUi
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     CommitProgress( TQWidget *p = 0, const char *n = 0 );
 
diff --git a/adept/libadept/desktoplist.h b/adept/libadept/desktoplist.h
index 0469a25..3740879 100644
--- a/adept/libadept/desktoplist.h
+++ b/adept/libadept/desktoplist.h
@@ -24,7 +24,7 @@ class DesktopItem;
 class DesktopList : public ExtendableList, public cache::Observer
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     typedef utils::Range< entity::Desktop > Range;
     DesktopList( TQWidget *parent = 0, const char *name = 0 );
@@ -58,7 +58,7 @@ protected:
 class DesktopEntry : public DesktopEntryUi
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     DesktopEntry( TQWidget * = 0, const char * = 0 );
     DesktopItem *item() const;
diff --git a/adept/libadept/dpkgpm-gui.h b/adept/libadept/dpkgpm-gui.h
index a28b740..4a38e4c 100644
--- a/adept/libadept/dpkgpm-gui.h
+++ b/adept/libadept/dpkgpm-gui.h
@@ -22,7 +22,7 @@ namespace adept {
 class PkgSystem : public TQObject, public debSystem
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     PkgSystem ();
     virtual pkgPackageManager *CreatePM( pkgDepCache *Cache ) const;
@@ -39,7 +39,7 @@ signals:
 class DPkgPM : public TQObject, public aptFront::DPkgPM
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     DPkgPM (pkgDepCache *c, KParts::Part *t);
     virtual bool forkDpkg (char *const argv[]);
diff --git a/adept/libadept/easytagfilter.h b/adept/libadept/easytagfilter.h
index e2f6165..e4044f9 100644
--- a/adept/libadept/easytagfilter.h
+++ b/adept/libadept/easytagfilter.h
@@ -80,7 +80,7 @@ protected:
 class EasyTagFilterWidget : public EasyTagFilterUi
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     EasyTagFilterWidget( TQWidget *parent, const char *name = 0 );
     virtual Predicate predicate();
diff --git a/adept/libadept/extendablelist.h b/adept/libadept/extendablelist.h
index 6b5540b..22c00c1 100644
--- a/adept/libadept/extendablelist.h
+++ b/adept/libadept/extendablelist.h
@@ -19,7 +19,7 @@ class ItemExtender;
 
 class ExtendableList : public KListView {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     typedef bool(*ItemCompare)( const ExtendableItem *,
                                 const ExtendableItem * );
@@ -123,7 +123,7 @@ protected:
 
 class ItemExtender : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     // ItemExtender( ExtendableItem *item );
     ItemExtender( TQWidget *parent, const char *n )
diff --git a/adept/libadept/filterlist.h b/adept/libadept/filterlist.h
index 4101a81..951e188 100644
--- a/adept/libadept/filterlist.h
+++ b/adept/libadept/filterlist.h
@@ -39,7 +39,7 @@ signals:
 class PredicateInterface: public ItemExtender
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     typedef predicate::Predicate< entity::Entity > Predicate;
     PredicateInterface( TQWidget *w = 0, const char *n = 0 );
@@ -63,7 +63,7 @@ class FilterItem;
 class FilterList : public ExtendableList
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     friend class FilterItem;
     typedef predicate::Predicate< entity::Entity > Predicate;
diff --git a/adept/libadept/filtersidebar.h b/adept/libadept/filtersidebar.h
index f9e9c66..0126e1c 100644
--- a/adept/libadept/filtersidebar.h
+++ b/adept/libadept/filtersidebar.h
@@ -13,7 +13,7 @@ namespace adept {
 
 class FilterSidebar : public FilterSidebarUi {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     FilterSidebar( TQWidget *p = 0, const char *n = 0 )
         : FilterSidebarUi( p, n ) 
diff --git a/adept/libadept/filterwidget.h b/adept/libadept/filterwidget.h
index 353daba..add17a9 100644
--- a/adept/libadept/filterwidget.h
+++ b/adept/libadept/filterwidget.h
@@ -17,7 +17,7 @@ namespace adept {
 class FilterWidget : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     FilterWidget( TQWidget *parent = 0, const char *n = 0 )
         : TQWidget( parent, n ) {}
diff --git a/adept/libadept/groupeddesktopselector.h b/adept/libadept/groupeddesktopselector.h
index 95a7dc6..7e3c8b0 100644
--- a/adept/libadept/groupeddesktopselector.h
+++ b/adept/libadept/groupeddesktopselector.h
@@ -14,7 +14,7 @@ using namespace aptFront::cache;
 class GroupedDesktopSelector : public KJanusWidget, cache::Observer
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     struct IconPolicy {
         virtual TQString iconForGroup( TQString group ) { return group; }
diff --git a/adept/libadept/installerview.h b/adept/libadept/installerview.h
index 5fcc5ff..92dbe6f 100644
--- a/adept/libadept/installerview.h
+++ b/adept/libadept/installerview.h
@@ -14,7 +14,7 @@ namespace adept {
 class InstallerView : public InstallerViewUi
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     typedef predicate::Predicate< entity::Desktop > Predicate;
     InstallerView( TQWidget *p = 0, const char *n = 0 );
diff --git a/adept/libadept/lister.h b/adept/libadept/lister.h
index a85a8e1..409a0e2 100644
--- a/adept/libadept/lister.h
+++ b/adept/libadept/lister.h
@@ -41,7 +41,7 @@ struct entityLess {
 class Lister: public ExtendableList, public Observer
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     typedef entity::Entity Entity;
     typedef std::vector< Entity > Vector;
@@ -144,7 +144,7 @@ protected:
 class ListerItemExtender : public ListerItemExtenderUi,
                            public cache::Observer {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     ListerItemExtender( TQWidget *parent = 0, const char * n = 0 );
     ~ListerItemExtender();
diff --git a/adept/libadept/packagedetails.h b/adept/libadept/packagedetails.h
index 603a694..b8301af 100644
--- a/adept/libadept/packagedetails.h
+++ b/adept/libadept/packagedetails.h
@@ -22,7 +22,7 @@ class PackageDetails : public PackageDetailsUi, public Lister::RangeProvider,
                        public cache::Observer
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     enum ButtonID { BForward, BBack, BShow };
     PackageDetails( TQWidget *p = 0, const char *n = 0 );
diff --git a/adept/libadept/packageinfo.h b/adept/libadept/packageinfo.h
index e738ace..8c164e3 100644
--- a/adept/libadept/packageinfo.h
+++ b/adept/libadept/packageinfo.h
@@ -15,7 +15,7 @@ using namespace aptFront;
 class PackageInfo : public PackageInfoUi, public cache::Observer
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     PackageInfo( TQWidget *p, const char *n = 0 );
 public slots:
diff --git a/adept/libadept/quickfilter.h b/adept/libadept/quickfilter.h
index 4b72300..85dec24 100644
--- a/adept/libadept/quickfilter.h
+++ b/adept/libadept/quickfilter.h
@@ -102,7 +102,7 @@ protected:
 class QuickFilterWidget : public QuickFilterUi
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     QuickFilterWidget( TQWidget *parent, const char *name = 0 );
     virtual Predicate predicate();
diff --git a/adept/libadept/sourceseditor.h b/adept/libadept/sourceseditor.h
index 2eec7db..1e304c5 100644
--- a/adept/libadept/sourceseditor.h
+++ b/adept/libadept/sourceseditor.h
@@ -14,7 +14,7 @@ using namespace aptFront;
 class SourcesEditor : public SourcesEditorUi
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     SourcesEditor( std::string f, TQWidget *p = 0, const char *n = 0 );
 public slots:
diff --git a/adept/libadept/statefilter.h b/adept/libadept/statefilter.h
index cd78904..bd8cba2 100644
--- a/adept/libadept/statefilter.h
+++ b/adept/libadept/statefilter.h
@@ -132,7 +132,7 @@ protected:
 class StateFilterWidget : public StateFilterUi
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     StateFilterWidget( TQWidget *parent, const char *name = 0 );
     virtual Predicate predicate();
diff --git a/adept/libadept/tagchooser.h b/adept/libadept/tagchooser.h
index f57e2f1..1fcc688 100644
--- a/adept/libadept/tagchooser.h
+++ b/adept/libadept/tagchooser.h
@@ -49,7 +49,7 @@ protected:
 class TagChooser : public KListView, public cache::Observer // ExtendableList
 { 
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     typedef cache::entity::Tag Tag;
     typedef cache::entity::Facet Facet;
diff --git a/adept/libadept/tagfilter.h b/adept/libadept/tagfilter.h
index 9c74104..6c6eefd 100644
--- a/adept/libadept/tagfilter.h
+++ b/adept/libadept/tagfilter.h
@@ -96,7 +96,7 @@ protected:
 class TagFilterWidget : public TagFilterUi
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     TagFilterWidget( TQWidget *p, const char *n );
     virtual Predicate predicate();
diff --git a/adept/libadept/taglist.h b/adept/libadept/taglist.h
index 501e67a..39cb7cd 100644
--- a/adept/libadept/taglist.h
+++ b/adept/libadept/taglist.h
@@ -27,7 +27,7 @@ class TagList;
 class TagLabel : public TQHBox
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     typedef cache::entity::Tag Tag;
     TagLabel( Tag t, TagList *l, TQWidget *p = 0, const char *n = 0 );
@@ -43,7 +43,7 @@ protected:
 class TagList : public TQVBox
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     typedef cache::entity::Tag Tag;
     TagList( TQWidget *p = 0, const char *n = 0 );
diff --git a/adept/libadept/view.h b/adept/libadept/view.h
index fc284f9..227c29f 100644
--- a/adept/libadept/view.h
+++ b/adept/libadept/view.h
@@ -20,7 +20,7 @@ class PackageDetails;
 
 class View: public TQSplitter, public Lister::RangeProvider {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     View( TQWidget *p = 0, const char *n = 0 );
     FilterList *filterList() { return m_flist; }
@@ -44,7 +44,7 @@ protected:
 
 class Browser : public TQWidgetStack {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     Browser( TQWidget *p = 0, const char *n = 0 );
     View *searchView() const { return m_view; }
diff --git a/adept/manager/app.h b/adept/manager/app.h
index ba768b6..934007a 100644
--- a/adept/manager/app.h
+++ b/adept/manager/app.h
@@ -26,7 +26,7 @@ using namespace adept;
 
 class TestApp : public KMainWindow, Application {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     enum Mode { Default, Sources, Preview, Download, Commit };
     void setupActions();
diff --git a/adept/notifier/app.h b/adept/notifier/app.h
index 01e8f79..6e3f169 100644
--- a/adept/notifier/app.h
+++ b/adept/notifier/app.h
@@ -15,7 +15,7 @@ class KAction;
 class TrayWindow : public KSystemTray
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     TrayWindow(TQWidget *parent=0, const char *name=0);
 	void setAvailableUpdates( int n );
@@ -38,7 +38,7 @@ protected:
 class ApportTrayWindow : public KSystemTray
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 signals:
     void clicked();
 protected:
@@ -50,7 +50,7 @@ protected:
 class RebootTrayWindow : public KSystemTray
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 signals:
     void clicked();
 protected:
@@ -65,7 +65,7 @@ protected:
 class NotifierApp : public KUniqueApplication
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     NotifierApp(bool allowStyles=true, bool GUIenabled=true);
     ~NotifierApp();
diff --git a/adept/updater/app.h b/adept/updater/app.h
index 322c80a..28d0f26 100644
--- a/adept/updater/app.h
+++ b/adept/updater/app.h
@@ -26,7 +26,7 @@ using namespace adept;
 
 class TestApp : public KMainWindow, Application {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     void setupActions();
     ExtTerminalInterface *terminal();
@@ -76,7 +76,7 @@ protected:
 
 class WaitForLister : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     WaitForLister( TestApp *a, const char *s )
         : app( a ), slot( s )