Remove spurious TQ_OBJECT instances

akregator/src/actionmanagerimpl.h

@@ -50,7 +50,7 @@ class TabWidget;
 class ActionManagerImpl : public ActionManager
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         ActionManagerImpl(Part* part, TQObject* parent=0, const char* name=0);

akregator/src/addfeeddialog.h

@@ -41,7 +41,7 @@ namespace Akregator
    class AddFeedWidget : public AddFeedWidgetBase
    {
       Q_OBJECT
-  TQ_OBJECT
+  
       public:
          AddFeedWidget(TQWidget *parent = 0, const char *name = 0);
          ~AddFeedWidget();
@@ -50,7 +50,7 @@ namespace Akregator
    class AddFeedDialog : public KDialogBase
    {
       Q_OBJECT
-  TQ_OBJECT
+  
       public:
          AddFeedDialog(TQWidget *parent = 0, const char *name = 0);
          ~AddFeedDialog();

akregator/src/akregator_part.h

@@ -60,7 +60,7 @@ namespace Akregator
     class BrowserExtension : public KParts::BrowserExtension
     {
         Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
             BrowserExtension(Part *p, const char *name );
@@ -77,7 +77,7 @@ namespace Akregator
     class Part : public MyBasePart, virtual public AkregatorPartIface
     {
         Q_OBJECT
-  TQ_OBJECT
+  
         public:
            typedef MyBasePart inherited;
 

akregator/src/akregator_run.h

@@ -35,7 +35,7 @@ class Viewer;
 class BrowserRun : public KParts::BrowserRun
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
         /** indicates how HTML pages should be opened. It is passed in the constructor and sent back via the openInViewer signal. This is a workaround to fix opening of non-HTML mimetypes in 3.5, which will be refactored for KDE4 anyway. For 3.5.x it's the easiest way to fix the problem without changing too much code TODO KDE4: refactor, remove this enum  */
         enum OpeningMode 

akregator/src/akregator_view.h

@@ -80,7 +80,7 @@ namespace Akregator {
     class View : public TQWidget
     {
         Q_OBJECT
-  TQ_OBJECT
+  
         public:
 
             /** constructor

akregator/src/articlelistview.h

@@ -43,7 +43,7 @@ namespace Akregator
     class ArticleListView : public KListView
     {
         Q_OBJECT
-  TQ_OBJECT
+  
         public:
             ArticleListView(TQWidget *parent = 0, const char *name = 0);
             virtual ~ArticleListView();

akregator/src/articleviewer.h

@@ -48,7 +48,7 @@ namespace Akregator
      class ArticleViewer : public Viewer
     {
         Q_OBJECT
-  TQ_OBJECT
+  
         public:
             /** Constructor */
             ArticleViewer(TQWidget* parent, const char* name);

akregator/src/configdialog.h

@@ -35,7 +35,7 @@ class SettingsAppearance;
 class ConfigDialog : public KConfigDialog
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
     
         ConfigDialog(TQWidget *parent, const char *name, KConfigSkeleton *config, DialogType dialogType=IconList, int dialogButtons=Default|Ok|Apply|Cancel|Help, ButtonCode defaultButton=Ok, bool modal=false);

akregator/src/feed.h

@@ -64,7 +64,7 @@ namespace Akregator
         friend class Article;
         
         Q_OBJECT
-  TQ_OBJECT
+  
         public:
             /** the archiving modes:
                 - globalDefault: use default from Settings (default)

akregator/src/feediconmanager.h

@@ -45,7 +45,7 @@ namespace Akregator
     class FeedIconManager:public TQObject, public DCOPObject
     {
         Q_OBJECT
-//        TQ_OBJECT
+//        
         K_DCOP
         
         public:

akregator/src/feedlist.h

@@ -44,7 +44,7 @@ class TreeNode;
 class FeedList : public NodeList
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     FeedList(TQObject *parent = 0, const char *name = 0);

akregator/src/feedlistview.h

@@ -39,7 +39,7 @@ class TagNodeList;
 class NodeListView : public KListView
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     NodeListView( TQWidget *parent = 0, const char *name = 0 );
     virtual ~NodeListView();
@@ -193,7 +193,7 @@ public:         // compat with KDE-3.x assertions, remove for KDE 4
 class TagNodeListView : public NodeListView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
         TagNodeListView(TQWidget *parent = 0, const char *name = 0) {} 
         virtual ~TagNodeListView() {}

akregator/src/fetchqueue.h

@@ -36,7 +36,7 @@ class TreeNode;
 class FetchQueue : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
 

akregator/src/folder.h

@@ -44,7 +44,7 @@ namespace Akregator
     class Folder : public TreeNode
     {
         Q_OBJECT
-  TQ_OBJECT
+  
         public:
             /** creates a feed group parsed from a XML dom element.
             Child nodes are not inserted or parsed. 

akregator/src/frame.h

@@ -43,7 +43,7 @@ namespace Akregator
     class Frame : public TQObject
     {
         Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
             Frame(TQObject *parent, KParts::ReadOnlyPart *part, TQWidget *w, const TQString& tit, bool watchSignals=true);

akregator/src/librss/image.h

@@ -34,7 +34,7 @@ namespace RSS
    class KDE_EXPORT Image : public TQObject
    {
       Q_OBJECT
-  TQ_OBJECT
+  
       public:
          /**
           * Default constructor.

akregator/src/librss/loader.h

@@ -35,7 +35,7 @@ namespace RSS
 	class KDE_EXPORT DataRetriever : public TQObject
 	{
 		Q_OBJECT
-  TQ_OBJECT
+  
 		public:
 			/**
 			 * Default constructor.
@@ -90,7 +90,7 @@ namespace RSS
 	class KDE_EXPORT FileRetriever : public DataRetriever
 	{
 		Q_OBJECT
-  TQ_OBJECT
+  
 		public:
 			/**
 			 * Default constructor.
@@ -162,7 +162,7 @@ namespace RSS
 	class OutputRetriever : public DataRetriever
 	{
 		Q_OBJECT
-  TQ_OBJECT
+  
 		public:
 			/**
 			 * Default constructor.
@@ -257,7 +257,7 @@ namespace RSS
 	class KDE_EXPORT Loader : public TQObject
 	{
 		Q_OBJECT
-  TQ_OBJECT
+  
 		friend class someClassWhichDoesNotExist;
 		public:
 			/**

akregator/src/librss/testlibrss.h

@@ -15,7 +15,7 @@ using RSS::Status;
 class Tester : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		void test( const TQString &url );
 

akregator/src/listtabwidget.h

@@ -46,7 +46,7 @@ class ListTabWidget : public TQWidget
 {
 
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 

akregator/src/mainwindow.h

@@ -54,7 +54,7 @@ class MainWindow;
 class BrowserInterface : public KParts::BrowserInterface
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     
 public:
     BrowserInterface(Akregator::MainWindow *shell, const char *name );
@@ -73,7 +73,7 @@ private:
 class MainWindow : public KParts::MainWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
     MainWindow();

akregator/src/mk4storage/mk4confwidget.h

@@ -33,7 +33,7 @@ namespace Backend {
 class MK4ConfWidget : public MK4ConfWidgetBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
         
         MK4ConfWidget();

akregator/src/mk4storage/storagemk4impl.h

@@ -37,7 +37,7 @@ namespace Backend {
 class StorageMK4Impl : public Storage
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
 
         StorageMK4Impl();     

akregator/src/nodelist.h

@@ -49,7 +49,7 @@ class NodeList : public TQObject
 {
 
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     NodeList(TQObject *parent=0, const char *name=0);

akregator/src/notificationmanager.h

@@ -36,7 +36,7 @@ namespace Akregator
 class NotificationManager : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
         /** singleton instance of notification manager */
         static NotificationManager* self();

akregator/src/pageviewer.h

@@ -40,7 +40,7 @@ namespace Akregator
     class PageViewer : public Viewer
     {
         Q_OBJECT
-  TQ_OBJECT
+  
         public:
             PageViewer(TQWidget* parent, const char* name);
             virtual ~PageViewer();

akregator/src/progressmanager.h

@@ -36,7 +36,7 @@ class ProgressItemHandler;
 class ProgressManager : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
         
         static ProgressManager* self();
@@ -67,7 +67,7 @@ class ProgressManager : public TQObject
 class ProgressItemHandler : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
         ProgressItemHandler(Feed* feed);
         virtual ~ProgressItemHandler();

akregator/src/propertiesdialog.h

@@ -33,7 +33,7 @@ namespace Akregator
    class FeedPropertiesWidget : public FeedPropertiesWidgetBase
    {
       Q_OBJECT
-  TQ_OBJECT
+  
       public:
          FeedPropertiesWidget(TQWidget *parent = 0, const char *name = 0);
          ~FeedPropertiesWidget();
@@ -45,7 +45,7 @@ namespace Akregator
    class FeedPropertiesDialog : public KDialogBase
    {
       Q_OBJECT
-  TQ_OBJECT
+  
       public:
          FeedPropertiesDialog(TQWidget *parent = 0, const char *name = 0);
          ~FeedPropertiesDialog();

akregator/src/searchbar.h

@@ -40,7 +40,7 @@ namespace Filters
 class SearchBar : public TQHBox
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
 

akregator/src/settings_advanced.h

@@ -18,7 +18,7 @@ namespace Backend
 class SettingsAdvanced : public SettingsAdvancedBase
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 
     public:
         SettingsAdvanced(TQWidget* parent=0, const char* name=0);

akregator/src/simplenodeselector.h

@@ -44,7 +44,7 @@ class SimpleNodeSelector;
 class SelectNodeDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
         SelectNodeDialog(FeedList* feedList, TQWidget* parent=0, char* name=0);
         virtual ~SelectNodeDialog();
@@ -67,7 +67,7 @@ class SelectNodeDialog : public KDialogBase
 class SimpleNodeSelector : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         SimpleNodeSelector(FeedList* feedList, TQWidget* parent=0, const char* name=0);

akregator/src/speechclient.h

@@ -42,7 +42,7 @@ class SpeechClient : public TQObject, public KSpeech_stub, virtual public KSpeec
 {
 
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
 

akregator/src/storagedummyimpl.h

@@ -37,7 +37,7 @@ namespace Backend {
 class StorageDummyImpl : public Storage
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
 
         StorageDummyImpl();     

akregator/src/tabwidget.h

@@ -38,7 +38,7 @@ class Frame;
 class TabWidget : public KTabWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
         TabWidget(TQWidget * parent = 0, const char *name = 0);

akregator/src/tagaction.h

@@ -38,7 +38,7 @@ class Tag;
 class TagAction : public KToggleAction
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
 

akregator/src/tagnode.h

@@ -45,7 +45,7 @@ class TreeNodeVisitor;
 class TagNode : public TreeNode
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 

akregator/src/tagnodelist.h

@@ -44,7 +44,7 @@ namespace Akregator {
    class TagNodeList : public NodeList
    {
        Q_OBJECT
-  TQ_OBJECT
+  
        public:
 
 

akregator/src/tagpropertiesdialog.h

@@ -34,7 +34,7 @@ class Tag;
 class TagPropertiesDialog : public KDialogBase 
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
 

akregator/src/tagset.h

@@ -48,7 +48,7 @@ class TagSet : public TQObject
 {
     friend class Tag;
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
 
         TagSet(TQObject* parent=0);

akregator/src/trayicon.h

@@ -35,7 +35,7 @@ namespace Akregator
     class TrayIcon : public KSystemTray
     {
         Q_OBJECT
-  TQ_OBJECT
+  
         public:
             static TrayIcon* getInstance();
             static void setInstance(TrayIcon* trayIcon);

akregator/src/treenode.h

@@ -51,7 +51,7 @@ class FetchQueue;
 class TreeNode : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
         

akregator/src/viewer.h

@@ -39,7 +39,7 @@ namespace Akregator
     class Viewer : public KHTMLPart
     {
         Q_OBJECT
-  TQ_OBJECT
+  
         public:
 
            /**

certmanager/certificateinfowidgetimpl.h

@@ -48,7 +48,7 @@ namespace GpgME {
 
 class CertificateInfoWidgetImpl : public CertificateInfoWidget {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   CertificateInfoWidgetImpl( const GpgME::Key & key, bool external,
 			     TQWidget * parent=0, const char * name=0);

certmanager/certificatewizardimpl.h

@@ -49,7 +49,7 @@ namespace KIO {
 class CertificateWizardImpl : public CertificateWizard
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     CertificateWizardImpl( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );

certmanager/certlistview.h

@@ -7,7 +7,7 @@
 /// We need to derive from Kleo::KeyListView simply to add support for drop events
 class CertKeyListView : public Kleo::KeyListView {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   CertKeyListView( const ColumnStrategy * strategy,

certmanager/certmanager.h

@@ -78,7 +78,7 @@ namespace GpgME {
 
 class KDE_EXPORT CertManager : public KMainWindow {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
     CertManager( bool remote = false, const TQString& query = TQString(),
 		 const TQString& import=TQString(),

certmanager/conf/appearanceconfigpage.h

@@ -43,7 +43,7 @@ namespace Kleo {
  */
 class AppearanceConfigurationPage : public KCModule {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AppearanceConfigurationPage( TQWidget * parent=0, const char * name=0 );
 

certmanager/conf/appearanceconfigwidget.h

@@ -42,7 +42,7 @@ namespace Kleo {
 
   class AppearanceConfigWidget : public AppearanceConfigWidgetBase {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AppearanceConfigWidget(

certmanager/conf/configuredialog.h

@@ -39,7 +39,7 @@
 class ConfigureDialog : public KCMultiDialog
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   ConfigureDialog( TQWidget *parent=0, const char *name=0, bool modal=true );

certmanager/conf/dirservconfigpage.h

@@ -52,7 +52,7 @@ namespace Kleo {
  */
 class KDE_EXPORT DirectoryServicesConfigurationPage : public KCModule {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   DirectoryServicesConfigurationPage( TQWidget * parent=0, const char * name=0 );
 

certmanager/conf/dnorderconfigpage.h

@@ -43,7 +43,7 @@ namespace Kleo {
  */
 class DNOrderConfigPage : public KCModule {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   DNOrderConfigPage( TQWidget * parent=0, const char * name=0 );
 

certmanager/crlview.h

@@ -43,7 +43,7 @@ class TQTimer;
 
 class CRLView : public TQDialog {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   CRLView( TQWidget* parent = 0, const char* name = 0, bool modal = false );
   ~CRLView();

certmanager/customactions.h

@@ -41,7 +41,7 @@ class TQLineEdit;
 
 class LabelAction : public KAction {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   LabelAction( const TQString & text, KActionCollection * parent,
 	       const char* name );
@@ -51,7 +51,7 @@ public:
 
 class LineEditAction : public KAction {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   LineEditAction( const TQString & text, KActionCollection * parent,
 		  TQObject * receiver, const char * member, const char * name );
@@ -69,7 +69,7 @@ private:
 
 class ComboAction : public KAction {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ComboAction( const TQStringList & lst,  KActionCollection * parent,
 	       TQObject * receiver, const char * member, const char * name,

certmanager/hierarchyanalyser.h

@@ -43,7 +43,7 @@
 
 class HierarchyAnalyser : public TQObject {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   HierarchyAnalyser( TQObject * parent=0, const char * name=0 );
   ~HierarchyAnalyser();

certmanager/kwatchgnupg/kwatchgnupgconfig.h

@@ -42,7 +42,7 @@ class KURLRequester;
 
 class KWatchGnuPGConfig : public KDialogBase {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KWatchGnuPGConfig( TQWidget* parent, const char* name = 0 );
 

certmanager/kwatchgnupg/kwatchgnupgmainwin.h

@@ -42,7 +42,7 @@ class TQTextEdit;
 
 class KWatchGnuPGMainWindow : public KMainWindow {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KWatchGnuPGMainWindow( TQWidget* parent = 0, const char* name = 0 );
   virtual ~KWatchGnuPGMainWindow();

certmanager/kwatchgnupg/tray.h

@@ -40,7 +40,7 @@ class KWatchGnuPGMainWindow;
 
 class KWatchGnuPGTray : public KSystemTray {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KWatchGnuPGTray( KWatchGnuPGMainWindow* mainwin );
   virtual ~KWatchGnuPGTray();

certmanager/lib/backends/chiasmus/chiasmusjob.h

@@ -51,7 +51,7 @@ namespace Kleo {
   */
   class ChiasmusJob : public Kleo::SpecialJob {
     Q_OBJECT
-  TQ_OBJECT
+  
     Q_ENUMS( Mode )
     TQ_PROPERTY( Mode mode READ mode )
     TQ_PROPERTY( TQString key READ key WRITE setKey )

certmanager/lib/backends/chiasmus/obtainkeysjob.h

@@ -64,7 +64,7 @@ namespace Kleo {
   */
   class ObtainKeysJob : public Kleo::SpecialJob {
     Q_OBJECT
-  TQ_OBJECT
+  
     TQ_PROPERTY( TQStringList result READ result )
   public:
     ObtainKeysJob();

certmanager/lib/backends/chiasmus/symcryptrunprocessbase.h

@@ -43,7 +43,7 @@ namespace Kleo {
 
 class SymCryptRunProcessBase : public KProcess {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   enum Operation {
     Encrypt, Decrypt

certmanager/lib/backends/kpgp/kpgpkeylistjob.h

@@ -51,7 +51,7 @@ namespace Kleo {
 
   class KpgpKeyListJob : public KeyListJob {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KpgpKeyListJob( Kpgp::Base * pgpBase );
     ~KpgpKeyListJob();

certmanager/lib/backends/qgpgme/gnupgprocessbase.h

@@ -47,7 +47,7 @@ namespace Kleo {
    */
   class GnuPGProcessBase : public KProcess {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     GnuPGProcessBase( TQObject * parent=0, const char * name=0 );
     ~GnuPGProcessBase();

certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.h

@@ -49,7 +49,7 @@ class QGpgMECryptoConfigEntry;
 class QGpgMECryptoConfig : public TQObject, public Kleo::CryptoConfig {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /**
    * Constructor
@@ -81,7 +81,7 @@ class QGpgMECryptoConfigGroup;
 class QGpgMECryptoConfigComponent : public TQObject, public Kleo::CryptoConfigComponent {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   QGpgMECryptoConfigComponent( QGpgMECryptoConfig*, const TQString& name, const TQString& description );
   ~QGpgMECryptoConfigComponent();

certmanager/lib/backends/qgpgme/qgpgmedecryptjob.h

@@ -48,7 +48,7 @@ namespace Kleo {
 
   class QGpgMEDecryptJob : public DecryptJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEDecryptJob( GpgME::Context * context );
     ~QGpgMEDecryptJob();

certmanager/lib/backends/qgpgme/qgpgmedecryptverifyjob.h

@@ -49,7 +49,7 @@ namespace Kleo {
 
   class KDE_EXPORT QGpgMEDecryptVerifyJob : public DecryptVerifyJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEDecryptVerifyJob( GpgME::Context * context );
     ~QGpgMEDecryptVerifyJob();

certmanager/lib/backends/qgpgme/qgpgmedeletejob.h

@@ -47,7 +47,7 @@ namespace Kleo {
 
   class QGpgMEDeleteJob : public DeleteJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEDeleteJob( GpgME::Context * context );
     ~QGpgMEDeleteJob();

certmanager/lib/backends/qgpgme/qgpgmedownloadjob.h

@@ -46,7 +46,7 @@ namespace Kleo {
 
   class QGpgMEDownloadJob : public DownloadJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEDownloadJob( GpgME::Context * context );
     ~QGpgMEDownloadJob();

certmanager/lib/backends/qgpgme/qgpgmeencryptjob.h

@@ -51,7 +51,7 @@ namespace Kleo {
 
   class QGpgMEEncryptJob : public EncryptJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEEncryptJob( GpgME::Context * context );
     ~QGpgMEEncryptJob();

certmanager/lib/backends/qgpgme/qgpgmeexportjob.h

@@ -48,7 +48,7 @@ namespace Kleo {
 
   class QGpgMEExportJob : public ExportJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEExportJob( GpgME::Context * context );
     ~QGpgMEExportJob();

certmanager/lib/backends/qgpgme/qgpgmeimportjob.h

@@ -48,7 +48,7 @@ namespace Kleo {
 
   class QGpgMEImportJob : public ImportJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEImportJob( GpgME::Context * context );
     ~QGpgMEImportJob();

certmanager/lib/backends/qgpgme/qgpgmekeygenerationjob.h

@@ -53,7 +53,7 @@ namespace Kleo {
 
   class KDE_EXPORT QGpgMEKeyGenerationJob : public KeyGenerationJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEKeyGenerationJob( GpgME::Context * context );
     ~QGpgMEKeyGenerationJob();

certmanager/lib/backends/qgpgme/qgpgmekeylistjob.h

@@ -49,7 +49,7 @@ namespace Kleo {
 
   class QGpgMEKeyListJob : public KeyListJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEKeyListJob( GpgME::Context * context );
     ~QGpgMEKeyListJob();

certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h

@@ -51,7 +51,7 @@ namespace Kleo {
 
   class QGpgMERefreshKeysJob : public RefreshKeysJob {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     QGpgMERefreshKeysJob();
     ~QGpgMERefreshKeysJob();

certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h

@@ -56,7 +56,7 @@ namespace Kleo {
 
   class QGpgMESecretKeyExportJob : public ExportJob {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     QGpgMESecretKeyExportJob( bool armour, const TQString& charset );
     ~QGpgMESecretKeyExportJob();

certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.h

@@ -55,7 +55,7 @@ namespace Kleo {
 
   class KDE_EXPORT QGpgMESignEncryptJob : public SignEncryptJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMESignEncryptJob( GpgME::Context * context );
     ~QGpgMESignEncryptJob();

certmanager/lib/backends/qgpgme/qgpgmesignjob.h

@@ -51,7 +51,7 @@ namespace Kleo {
 
   class QGpgMESignJob : public SignJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMESignJob( GpgME::Context * context );
     ~QGpgMESignJob();

certmanager/lib/backends/qgpgme/qgpgmeverifydetachedjob.h

@@ -48,7 +48,7 @@ namespace Kleo {
 
   class QGpgMEVerifyDetachedJob : public VerifyDetachedJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEVerifyDetachedJob( GpgME::Context * context );
     ~QGpgMEVerifyDetachedJob();

certmanager/lib/backends/qgpgme/qgpgmeverifyopaquejob.h

@@ -48,7 +48,7 @@ namespace Kleo {
 
   class QGpgMEVerifyOpaqueJob : public VerifyOpaqueJob, private QGpgMEJob {
     Q_OBJECT
-    TQ_OBJECT TQGPGME_JOB
+     TQGPGME_JOB
   public:
     QGpgMEVerifyOpaqueJob( GpgME::Context * context );
     ~QGpgMEVerifyOpaqueJob();

certmanager/lib/cryptplugfactory.h

@@ -49,7 +49,7 @@ namespace KMail {
 
   class KDE_EXPORT CryptPlugFactory : public Kleo::CryptoBackendFactory {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     CryptPlugFactory();
     ~CryptPlugFactory();

certmanager/lib/kleo/cryptobackendfactory.h

@@ -58,7 +58,7 @@ namespace Kleo {
 
   class KDE_EXPORT CryptoBackendFactory : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     CryptoBackendFactory();
     ~CryptoBackendFactory();

certmanager/lib/kleo/decryptjob.h

@@ -61,7 +61,7 @@ namespace Kleo {
   */
   class DecryptJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     DecryptJob( TQObject * parent, const char * name );
   public:

certmanager/lib/kleo/decryptverifyjob.h

@@ -64,7 +64,7 @@ namespace Kleo {
   */
   class DecryptVerifyJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     DecryptVerifyJob( TQObject * parent, const char * name );
   public:

certmanager/lib/kleo/deletejob.h

@@ -57,7 +57,7 @@ namespace Kleo {
   */
   class DeleteJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     DeleteJob( TQObject * parent, const char * name );
   public:

certmanager/lib/kleo/downloadjob.h

@@ -60,7 +60,7 @@ namespace Kleo {
   */
   class DownloadJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     DownloadJob( TQObject * parent, const char * name );
   public:

certmanager/lib/kleo/encryptjob.h

@@ -63,7 +63,7 @@ namespace Kleo {
   */
   class EncryptJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     EncryptJob( TQObject * parent, const char * name );
   public:

certmanager/lib/kleo/exportjob.h

@@ -60,7 +60,7 @@ namespace Kleo {
   */
   class ExportJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     ExportJob( TQObject * parent, const char * name );
   public:

certmanager/lib/kleo/hierarchicalkeylistjob.h

@@ -70,7 +70,7 @@ namespace Kleo {
   */
   class KDE_EXPORT HierarchicalKeyListJob : public KeyListJob {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     HierarchicalKeyListJob( const CryptoBackend::Protocol * protocol,
 			    bool remote=false, bool includeSigs=false, bool validating=false );

certmanager/lib/kleo/importjob.h

@@ -61,7 +61,7 @@ namespace Kleo {
   */
   class ImportJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     ImportJob( TQObject * parent, const char * name );
   public:

certmanager/lib/kleo/job.h

@@ -63,7 +63,7 @@ namespace Kleo {
   */
   class Job : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     Job( TQObject * parent, const char * name );
   public:

certmanager/lib/kleo/keyfiltermanager.h

@@ -47,7 +47,7 @@ namespace Kleo {
 
   class KDE_EXPORT KeyFilterManager : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     KeyFilterManager( TQObject * parent=0, const char * name=0 );
     ~KeyFilterManager();

certmanager/lib/kleo/keygenerationjob.h

@@ -60,7 +60,7 @@ namespace Kleo {
   */
   class KeyGenerationJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     KeyGenerationJob( TQObject * parent, const char * name );
   public:

certmanager/lib/kleo/keylistjob.h

@@ -64,7 +64,7 @@ namespace Kleo {
   */
   class KeyListJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     KeyListJob( TQObject * parent, const char * name );
 

certmanager/lib/kleo/multideletejob.h

@@ -66,7 +66,7 @@ namespace Kleo {
   */
   class KDE_EXPORT MultiDeleteJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     MultiDeleteJob( const CryptoBackend::Protocol * protocol );
     ~MultiDeleteJob();

certmanager/lib/kleo/refreshkeysjob.h

@@ -61,7 +61,7 @@ namespace Kleo {
   */
   class RefreshKeysJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     RefreshKeysJob( TQObject * parent, const char * name );
 

certmanager/lib/kleo/signencryptjob.h

@@ -66,7 +66,7 @@ namespace Kleo {
   */
   class SignEncryptJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     SignEncryptJob( TQObject * parent, const char * name );
   public:

certmanager/lib/kleo/signjob.h

@@ -64,7 +64,7 @@ namespace Kleo {
   */
   class SignJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     SignJob( TQObject * parent, const char * name );
   public:

certmanager/lib/kleo/specialjob.h

@@ -64,7 +64,7 @@ namespace Kleo {
   */
   class SpecialJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     SpecialJob( TQObject * parent, const char * name );
 

certmanager/lib/kleo/verifydetachedjob.h

@@ -61,7 +61,7 @@ namespace Kleo {
   */
   class VerifyDetachedJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     VerifyDetachedJob( TQObject * parent, const char * name );
   public:

certmanager/lib/kleo/verifyopaquejob.h

@@ -61,7 +61,7 @@ namespace Kleo {
   */
   class VerifyOpaqueJob : public Job {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     VerifyOpaqueJob( TQObject * parent, const char * name );
   public:

certmanager/lib/tests/gnupgviewer.h

@@ -44,7 +44,7 @@ class TQStringList;
 
 class GnuPGViewer : public TQTextEdit {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   GnuPGViewer( TQWidget * parent=0, const char * name=0 );
   ~GnuPGViewer();

certmanager/lib/tests/test_keygen.h

@@ -45,7 +45,7 @@ class TQLineEdit;
 
 class KeyGenerator : public KDialogBase {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KeyGenerator( TQWidget * parent=0, const char * name=0, WFlags f=0 );
   ~KeyGenerator();

certmanager/lib/tests/test_keylister.h

@@ -41,7 +41,7 @@ namespace GpgME {
 
 class CertListView : public Kleo::KeyListView {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   CertListView( TQWidget * parent=0, const char * name=0, WFlags f=0 );
 

certmanager/lib/ui/adddirectoryservicedialogimpl.h

@@ -37,7 +37,7 @@
 class AddDirectoryServiceDialogImpl : public AddDirectoryServiceDialog
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     AddDirectoryServiceDialogImpl( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );

certmanager/lib/ui/backendconfigwidget.h

@@ -47,7 +47,7 @@ namespace Kleo {
 
   class KDE_EXPORT BackendConfigWidget : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     BackendConfigWidget( CryptoBackendFactory * factory, TQWidget * parent=0, const char * name=0, WFlags f=0 );
     ~BackendConfigWidget();

certmanager/lib/ui/cryptoconfigdialog.h

@@ -46,7 +46,7 @@ namespace Kleo {
   class KDE_EXPORT CryptoConfigDialog : public KDialogBase
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent = 0, const char* name = 0 );
 

certmanager/lib/ui/cryptoconfigmodule.h

@@ -47,7 +47,7 @@ namespace Kleo {
    */
   class CryptoConfigModule : public KJanusWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CryptoConfigModule( Kleo::CryptoConfig* config, TQWidget * parent=0, const char * name=0 );
 

certmanager/lib/ui/cryptoconfigmodule_p.h

@@ -58,7 +58,7 @@ namespace Kleo {
    */
   class CryptoConfigComponentGUI : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigComponentGUI( CryptoConfigModule* module, Kleo::CryptoConfigComponent* component,
@@ -78,7 +78,7 @@ namespace Kleo {
    */
   class CryptoConfigGroupGUI : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigGroupGUI( CryptoConfigModule* module, Kleo::CryptoConfigGroup* group,
@@ -110,7 +110,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryGUI : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CryptoConfigEntryGUI( CryptoConfigModule* module,
                           Kleo::CryptoConfigEntry* entry,
@@ -148,7 +148,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryLineEdit : public CryptoConfigEntryGUI {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigEntryLineEdit( CryptoConfigModule* module,
@@ -168,7 +168,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryPath : public CryptoConfigEntryGUI {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigEntryPath( CryptoConfigModule* module,
@@ -188,7 +188,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryDirPath : public CryptoConfigEntryGUI {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigEntryDirPath( CryptoConfigModule* module,
@@ -208,7 +208,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryURL : public CryptoConfigEntryGUI {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigEntryURL( CryptoConfigModule* module,
@@ -228,7 +228,7 @@ namespace Kleo {
    */
   class CryptoConfigEntrySpinBox : public CryptoConfigEntryGUI {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigEntrySpinBox( CryptoConfigModule* module,
@@ -248,7 +248,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryCheckBox : public CryptoConfigEntryGUI {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigEntryCheckBox( CryptoConfigModule* module,
@@ -267,7 +267,7 @@ namespace Kleo {
    */
   class CryptoConfigEntryLDAPURL : public CryptoConfigEntryGUI {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoConfigEntryLDAPURL( CryptoConfigModule* module,

certmanager/lib/ui/directoryserviceswidget.h

@@ -44,7 +44,7 @@ class CryptoConfigEntry;
 class KDE_EXPORT DirectoryServicesWidget : public DirectoryServicesWidgetBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   DirectoryServicesWidget(

certmanager/lib/ui/dnattributeorderconfigwidget.h

@@ -45,7 +45,7 @@ namespace Kleo {
 
   class KDE_EXPORT DNAttributeOrderConfigWidget : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /*! Use Kleo::DNAttributeMapper::instance()->configWidget( parent, name ) instead. */
     DNAttributeOrderConfigWidget( DNAttributeMapper * mapper, TQWidget * parent=0, const char * name=0, WFlags f=0 );

certmanager/lib/ui/kdhorizontalline.h

@@ -46,7 +46,7 @@
 
 class KDHorizontalLine : public TQFrame {
   Q_OBJECT
-  TQ_OBJECT
+  
   TQ_PROPERTY( TQString title READ title WRITE setTitle )
 public:
   KDHorizontalLine( TQWidget * parent=0, const char * name=0,  WFlags f=0 );

certmanager/lib/ui/keyapprovaldialog.h

@@ -57,7 +57,7 @@ namespace Kleo {
 
   class KDE_EXPORT KeyApprovalDialog : public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     struct Item {
       Item() : pref( UnknownPreference ) {}

certmanager/lib/ui/keylistview.h

@@ -200,7 +200,7 @@ namespace Kleo {
 
   class KDE_EXPORT KeyListView : public KListView {
     Q_OBJECT
-  TQ_OBJECT
+  
     friend class KeyListViewItem;
   public:
 

certmanager/lib/ui/keyrequester.h

@@ -75,7 +75,7 @@ namespace Kleo {
   /// Base class for SigningKeyRequester and EncryptionKeyRequester
   class KDE_EXPORT KeyRequester : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KeyRequester( unsigned int allowedKeys, bool multipleKeys=false,
 		  TQWidget * parent=0, const char * name=0 );
@@ -161,7 +161,7 @@ namespace Kleo {
 
   class KDE_EXPORT EncryptionKeyRequester : public KeyRequester {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     enum { OpenPGP = 1, SMIME = 2, AllProtocols = OpenPGP|SMIME };
 
@@ -189,7 +189,7 @@ namespace Kleo {
 
   class KDE_EXPORT SigningKeyRequester : public KeyRequester {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     enum { OpenPGP = 1, SMIME = 2, AllProtocols = OpenPGP|SMIME };
 

certmanager/lib/ui/keyselectiondialog.h

@@ -65,7 +65,7 @@ namespace Kleo {
 
   class KDE_EXPORT KeySelectionDialog : public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
 
     enum KeyUsage {

certmanager/lib/ui/messagebox.cpp

@@ -75,7 +75,7 @@ static KGuiItem KGuiItem_showAuditLog() {
 
 class AuditLogViewer : public KDialogBase {
     // Q_OBJECT
-  TQ_OBJECT
+  
 public:
     explicit AuditLogViewer( const TQString & log, TQWidget * parent=0, const char * name=0, WFlags f=0 )
         : KDialogBase( parent, name, false, i18n("View GnuPG Audit Log"),

certmanager/lib/ui/passphrasedialog.h

@@ -55,7 +55,7 @@ namespace Kleo {
 
   class PassphraseDialog : public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     PassphraseDialog( const TQString & description,
 		      const TQString & caption=TQString(),

certmanager/lib/ui/progressbar.h

@@ -44,7 +44,7 @@ namespace Kleo {
   */
   class KDE_EXPORT ProgressBar : public TQProgressBar {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ProgressBar( TQWidget * parent=0, const char * name=0, WFlags f=0 );
 

certmanager/lib/ui/progressdialog.h

@@ -45,7 +45,7 @@ namespace Kleo {
   */
   class KDE_EXPORT ProgressDialog : public TQProgressDialog {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     ProgressDialog( Job * job, const TQString & baseText,
 		    TQWidget * creator=0, const char * name=0, WFlags f=0  );

certmanager/storedtransferjob.h

@@ -46,7 +46,7 @@ namespace KIOext {
  */
 class StoredTransferJob : public KIO::TransferJob {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
        /**

kabc/kabc2mutt/kabc2mutt.h

@@ -25,7 +25,7 @@
 class KABC2Mutt : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
 

kaddressbook/addresseditwidget.h

@@ -52,7 +52,7 @@ typedef TypeCombo<KABC::Address> AddressTypeCombo;
 class AddressEditWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddressEditWidget( TQWidget *parent, const char *name = 0 );
@@ -93,7 +93,7 @@ class AddressEditWidget : public TQWidget
 class AddressEditDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddressEditDialog( const KABC::Address::List &list, int selected,

kaddressbook/addresseeeditorbase.h

@@ -31,7 +31,7 @@
 class AddresseeEditorBase : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddresseeEditorBase( TQWidget *parent, const char *name = 0 )

kaddressbook/addresseeeditordialog.h

@@ -35,7 +35,7 @@ namespace KAB { class Core; }
 class AddresseeEditorDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddresseeEditorDialog( KAB::Core *core,

kaddressbook/addresseeeditorextension.h

@@ -30,7 +30,7 @@
 class AddresseeEditorExtension : public KAB::ExtensionWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddresseeEditorExtension( KAB::Core *core, TQWidget *parent, const char *name = 0 );

kaddressbook/addresseeeditorwidget.h

@@ -66,7 +66,7 @@ namespace KABC { class AddressBook; }
 class AddresseeEditorWidget : public AddresseeEditorBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddresseeEditorWidget( TQWidget *parent, const char *name = 0 );

kaddressbook/addviewdialog.h

@@ -41,7 +41,7 @@ class ViewFactory;
 class AddViewDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddViewDialog( TQDict<ViewFactory> *viewFactoryDict, TQWidget *parent,

kaddressbook/advancedcustomfields.h

@@ -39,7 +39,7 @@
 class AdvancedCustomFields : public KAB::ContactEditorWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AdvancedCustomFields( const TQString &uiFile, KABC::AddressBook *ab,

kaddressbook/common/locationmap.h

@@ -31,7 +31,7 @@
 class LocationMap : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     static LocationMap *instance();

kaddressbook/contacteditorwidgetmanager.h

@@ -37,7 +37,7 @@ class TQGridLayout;
 class ContactEditorWidgetManager : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     static ContactEditorWidgetManager *self();
@@ -67,7 +67,7 @@ class ContactEditorWidgetManager : public TQObject
 class ContactEditorTabPage : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ContactEditorTabPage( TQWidget *parent, const char *name = 0 );

kaddressbook/customfieldswidget.h

@@ -61,7 +61,7 @@ typedef TQValueList<FieldRecord> FieldRecordList;
 class AddFieldDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddFieldDialog( TQWidget *parent, const char *name = 0 );
@@ -86,7 +86,7 @@ class AddFieldDialog : public KDialogBase
 class FieldWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     FieldWidget( TQWidget *parent, const char *name = 0 );
@@ -121,7 +121,7 @@ class FieldWidget : public TQWidget
 class CustomFieldsWidget : public KAB::ContactEditorWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CustomFieldsWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );

kaddressbook/distributionlisteditor.h

@@ -39,7 +39,7 @@ class EditorWidgetPrivate;
 class EditorWidget : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     explicit EditorWidget( KABC::AddressBook* book, TQWidget* parent = 0 );
     ~EditorWidget();

kaddressbook/distributionlisteditor_p.h

@@ -42,7 +42,7 @@ namespace DistributionListEditor {
 class LineEdit : public KPIM::AddresseeLineEdit
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     explicit LineEdit( TQWidget* parent = 0 );
 };
@@ -51,7 +51,7 @@ public:
 class Line : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     explicit Line( KABC::AddressBook* book, TQWidget* parent = 0 );
 

kaddressbook/distributionlistentryview.h

@@ -24,7 +24,7 @@ class Core;
 class DistributionListEntryView : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     explicit DistributionListEntryView( KAB::Core* core, TQWidget* parent = 0 );

kaddressbook/distributionlistpicker.h

@@ -38,7 +38,7 @@ namespace KPIM {
 class DistributionListPickerDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     explicit DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* parent = 0 );
     TQString selectedDistributionList() const;

kaddressbook/editors/cryptowidget.h

@@ -36,7 +36,7 @@ class TQCheckBox;
 class CryptoWidget : public KAB::ContactEditorWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CryptoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );

kaddressbook/editors/imaddresswidget.h

@@ -42,7 +42,7 @@ class KPluginInfo;
 class IMAddressWidget : public IMAddressBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> protocols);

kaddressbook/editors/imeditorwidget.h

@@ -49,7 +49,7 @@ enum IMContext { Any, Home, Work };
 class IMEditorWidget : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     IMEditorWidget( TQWidget *parent, const TQString &preferredIM, const char *name = 0 );

kaddressbook/emaileditwidget.h

@@ -44,7 +44,7 @@ class KListView;
 class EmailEditWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     EmailEditWidget( TQWidget *parent, const char *name = 0 );
@@ -71,7 +71,7 @@ class EmailEditWidget : public TQWidget
 class EmailEditDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     EmailEditDialog( const TQStringList &list, TQWidget *parent,

kaddressbook/extensionmanager.h

@@ -56,7 +56,7 @@ class ExtensionData
 class ExtensionManager : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ExtensionManager( TQWidget *extensionBar, TQWidgetStack *detailsStack, KAB::Core *core, TQObject *parent, const char *name = 0 );

kaddressbook/features/distributionlistngwidget.h

@@ -47,7 +47,7 @@ namespace DistributionListNg {
 class ListBox : public KListBox
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     ListBox( TQWidget* parent = 0 );
 
@@ -67,7 +67,7 @@ protected:
 class MainWidget : public KAB::ExtensionWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     explicit MainWidget( KAB::Core *core, TQWidget *parent = 0, const char *name = 0 );

kaddressbook/features/distributionlistwidget.h

@@ -48,7 +48,7 @@ class DistributionListManager;
 class DistributionListWidget : public KAB::ExtensionWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     DistributionListWidget( KAB::Core*, TQWidget *parent, const char *name = 0 );
@@ -108,7 +108,7 @@ class DistributionListWidget : public KAB::ExtensionWidget
 class DistributionListView : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     DistributionListView( TQWidget *parent, const char* name = 0 );

kaddressbook/features/resourceselection.h

@@ -38,7 +38,7 @@ class ResourceItem;
 class ResourceSelection : public KAB::ExtensionWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ResourceSelection( KAB::Core*, TQWidget *parent, const char *name );

kaddressbook/filtereditdialog.h

@@ -40,7 +40,7 @@ class KListView;
 class FilterDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     FilterDialog( TQWidget *parent, const char *name = 0 );
@@ -71,7 +71,7 @@ class FilterDialog : public KDialogBase
 class FilterEditDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     FilterEditDialog( TQWidget *parent, const char *name = 0 );
     ~FilterEditDialog();

kaddressbook/filterselectionwidget.h

@@ -36,7 +36,7 @@ class KComboBox;
 class FilterSelectionWidget : public TQHBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     FilterSelectionWidget( TQWidget *parent, const char *name = 0 );

kaddressbook/freebusywidget.h

@@ -31,7 +31,7 @@
 class FreeBusyWidget : public KAB::ContactEditorWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );

kaddressbook/geowidget.h

@@ -51,7 +51,7 @@ typedef struct {
 class GeoWidget : public KAB::ContactEditorWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
@@ -78,7 +78,7 @@ class GeoWidget : public KAB::ContactEditorWidget
 class GeoDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     GeoDialog( TQWidget *parent, const char *name = 0 );
@@ -124,7 +124,7 @@ class GeoDialog : public KDialogBase
 class GeoMapWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     GeoMapWidget( TQWidget *parent, const char *name = 0 );

kaddressbook/imagewidget.h

@@ -38,7 +38,7 @@
 class ImageLoader : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ImageLoader( TQWidget *parent );
@@ -56,7 +56,7 @@ class ImageLoader : public TQObject
 class ImageButton : public TQPushButton
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ImageButton( const TQString &title, TQWidget *parent );
@@ -98,7 +98,7 @@ class ImageButton : public TQPushButton
 class ImageBaseWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ImageBaseWidget( const TQString &title, TQWidget *parent, const char *name = 0 );

kaddressbook/imeditwidget.h

@@ -44,7 +44,7 @@ class KListView;
 class IMEditWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     IMEditWidget(TQWidget *parent, KABC::Addressee &addr, const char *name = 0 );

kaddressbook/incsearchwidget.h

@@ -35,7 +35,7 @@ class KLineEdit;
 class IncSearchWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     IncSearchWidget( TQWidget *parent, const char *name = 0 );

kaddressbook/interfaces/contacteditorwidget.h

@@ -37,7 +37,7 @@ namespace KAB {
 class KDE_EXPORT ContactEditorWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     typedef TQValueList<ContactEditorWidget*> List;

kaddressbook/interfaces/core.h

@@ -55,7 +55,7 @@ class SearchManager;
 class KDE_EXPORT Core : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     Core( KXMLGUIClient *client, TQObject *parent, const char *name = 0 );

kaddressbook/interfaces/extensionwidget.h

@@ -39,7 +39,7 @@ class ConfigureWidget;
 class KDE_EXPORT ExtensionWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ExtensionWidget( Core *core, TQWidget *parent, const char *name = 0 );

kaddressbook/interfaces/xxport.h

@@ -68,7 +68,7 @@ namespace KAB {
 class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );

kaddressbook/jumpbuttonbar.h

@@ -47,7 +47,7 @@ class Field;
 class JumpButtonBar : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     JumpButtonBar( KAB::Core *core, TQWidget *parent, const char *name = 0 );

kaddressbook/kabcore.h

@@ -83,7 +83,7 @@ typedef struct {
 class KDE_EXPORT KABCore : public KAB::Core
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,

kaddressbook/kaddressbook_part.h

@@ -37,7 +37,7 @@ class KABCore;
 class KAddressbookPart: public KParts::ReadOnlyPart, virtual public KAddressBookIface
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KAddressbookPart( TQWidget *parentWidget, const char *widgetName,

kaddressbook/kaddressbookmain.h

@@ -45,7 +45,7 @@ class KABCore;
 class KAddressBookMain : public KMainWindow, virtual public KAddressBookIface
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KAddressBookMain( const TQString &file = TQString() );

kaddressbook/kaddressbookview.h

@@ -56,7 +56,7 @@ namespace KABC { class AddressBook; }
 class KDE_EXPORT KAddressBookView : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum DefaultFilterType { None = 0, Active = 1, Specific = 2 };

kaddressbook/kcmconfigs/addhostdialog.h

@@ -35,7 +35,7 @@ class TQSpinBox;
 class AddHostDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddHostDialog( KPIM::LdapServer* server, TQWidget* parent = 0, const char* name = 0 );

kaddressbook/kcmconfigs/addresseewidget.h

@@ -36,7 +36,7 @@ class TQPushButton;
 class NamePartWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     NamePartWidget( const TQString &title, const TQString &label, TQWidget *parent,
@@ -69,7 +69,7 @@ class NamePartWidget : public TQWidget
 class AddresseeWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddresseeWidget( TQWidget *parent, const char *name = 0 );

kaddressbook/kcmconfigs/extensionconfigdialog.h

@@ -35,7 +35,7 @@ class ConfigureWidget;
 class ExtensionConfigDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config,

kaddressbook/kcmconfigs/kabconfigwidget.h

@@ -39,7 +39,7 @@ class AddresseeWidget;
 class KABConfigWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KABConfigWidget( TQWidget *parent, const char *name = 0 );

kaddressbook/kcmconfigs/kcmkabconfig.h

@@ -31,7 +31,7 @@ class KABConfigWidget;
 class KCMKabConfig : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KCMKabConfig( TQWidget *parent = 0, const char *name = 0 );

kaddressbook/kcmconfigs/kcmkabldapconfig.h

@@ -33,7 +33,7 @@ class LDAPOptionsWidget;
 class KCMKabLdapConfig : public KCModule
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KCMKabLdapConfig( TQWidget *parent = 0, const char *name = 0 );

kaddressbook/kcmconfigs/ldapoptionswidget.h

@@ -34,7 +34,7 @@ class TQPushButton;
 class LDAPOptionsWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     LDAPOptionsWidget( TQWidget* parent = 0, const char* name = 0 );

kaddressbook/keywidget.h

@@ -34,7 +34,7 @@ class TQPushButton;
 class KeyWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KeyWidget( TQWidget *parent, const char *name = 0 );

kaddressbook/ldapsearchdialog.h

@@ -50,7 +50,7 @@ namespace KABC {
 class LDAPSearchDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, TQWidget* parent, const char* name = 0 );

kaddressbook/nameeditdialog.h

@@ -40,7 +40,7 @@ class KComboBox;
 class NameEditDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum FormattedNameType

kaddressbook/phoneeditwidget.h

@@ -39,7 +39,7 @@ class KComboBox;
 class PhoneTypeCombo : public KComboBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PhoneTypeCombo( TQWidget *parent );
@@ -66,7 +66,7 @@ class PhoneTypeCombo : public KComboBox
 class PhoneNumberWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PhoneNumberWidget( TQWidget *parent );
@@ -91,7 +91,7 @@ class PhoneNumberWidget : public TQWidget
 class PhoneEditWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PhoneEditWidget( TQWidget *parent, const char *name = 0 );
@@ -131,7 +131,7 @@ class PhoneEditWidget : public TQWidget
 class PhoneTypeDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     PhoneTypeDialog( int type, TQWidget *parent );
 

kaddressbook/printing/detailledstyle.h

@@ -36,7 +36,7 @@ namespace KABPrinting {
 class DetailledPrintStyle : public PrintStyle
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     DetailledPrintStyle( PrintingWizard *parent, const char *name = 0 );

kaddressbook/printing/mikesstyle.h

@@ -36,7 +36,7 @@ class PrintProgress;
 class MikesStyle : public PrintStyle
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     MikesStyle( PrintingWizard *parent, const char *name );

kaddressbook/printing/printingwizard.h

@@ -50,7 +50,7 @@ namespace KABPrinting {
 class PrintingWizard : public KWizard
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     /**

kaddressbook/printing/printprogress.h

@@ -40,7 +40,7 @@ namespace KABPrinting {
 class PrintProgress : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PrintProgress( TQWidget *parent, const char *name = 0 );

kaddressbook/printing/printstyle.h

@@ -60,7 +60,7 @@ class PrintProgress;
 class PrintStyle : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PrintStyle( PrintingWizard* parent, const char* name = 0 );

kaddressbook/printing/selectionpage.h

@@ -35,7 +35,7 @@ class TQRadioButton;
 class SelectionPage : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SelectionPage( TQWidget* parent = 0, const char* name = 0 );

kaddressbook/printing/stylepage.h

@@ -38,7 +38,7 @@ class KComboBox;
 class StylePage : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     StylePage( KABC::AddressBook *ab, TQWidget* parent = 0, const char* name = 0 );

kaddressbook/searchmanager.h

@@ -37,7 +37,7 @@ namespace KAB {
 class SearchManager : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum Type {

kaddressbook/secrecywidget.h

@@ -32,7 +32,7 @@ class KComboBox;
 class SecrecyWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SecrecyWidget( TQWidget *parent, const char *name = 0 );

kaddressbook/simpleaddresseeeditor.h

@@ -32,7 +32,7 @@ class KLineEdit;
 class SimpleAddresseeEditor : public AddresseeEditorBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     SimpleAddresseeEditor( TQWidget *parent, const char *name = 0 );
     ~SimpleAddresseeEditor();

kaddressbook/soundwidget.h

@@ -36,7 +36,7 @@ class TQPushButton;
 class SoundWidget : public KAB::ContactEditorWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );

kaddressbook/viewconfigurefieldspage.h

@@ -38,7 +38,7 @@ class TQToolButton;
 class ViewConfigureFieldsPage : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ViewConfigureFieldsPage( KABC::AddressBook *ab, TQWidget *parent = 0,

kaddressbook/viewconfigurefilterpage.h

@@ -34,7 +34,7 @@ class KConfig;
 class ViewConfigureFilterPage : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ViewConfigureFilterPage( TQWidget *parent, const char *name = 0 );

kaddressbook/viewconfigurewidget.h

@@ -48,7 +48,7 @@ class ViewConfigureFilterPage;
 class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );
@@ -88,7 +88,7 @@ class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget
 class ViewConfigureDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ViewConfigureDialog( ViewConfigureWidget *wdg, const TQString &viewName,

kaddressbook/viewmanager.h

@@ -50,7 +50,7 @@ namespace KABC { class AddressBook; }
 class ViewManager : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ViewManager( KAB::Core *core, TQWidget *parent, const char *name = 0 );

kaddressbook/views/cardview.h

@@ -196,7 +196,7 @@ class CardView : public TQScrollView
   friend class CardViewItem;
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     /**

kaddressbook/views/colorlistbox.h

@@ -26,7 +26,7 @@
 class ColorListBox : public KListBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ColorListBox( TQWidget *parent=0, const char * name=0, WFlags f=0 );

kaddressbook/views/configurecardviewdialog.h

@@ -80,7 +80,7 @@ class ConfigureCardViewWidget : public ViewConfigureWidget
 class CardViewLookNFeelPage : public TQVBox {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CardViewLookNFeelPage( TQWidget *parent=0, const char *name=0 );

kaddressbook/views/configuretableviewdialog.h

@@ -63,7 +63,7 @@ class ConfigureTableViewWidget : public ViewConfigureWidget
 class LookAndFeelPage : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     LookAndFeelPage( TQWidget *parent, const char *name = 0 );

kaddressbook/views/contactlistview.h

@@ -85,7 +85,7 @@ private:
 class ContactListView : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   ContactListView(KAddressBookTableView *view,

kaddressbook/views/kaddressbookcardview.h

@@ -43,7 +43,7 @@ class AddresseeCardView;
 class KAddressBookCardView : public KAddressBookView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KAddressBookCardView( KAB::Core *core, TQWidget *parent,
@@ -78,7 +78,7 @@ class KAddressBookCardView : public KAddressBookView
 class AddresseeCardView : public CardView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     AddresseeCardView( TQWidget *parent, const char *name = 0 );
     ~AddresseeCardView();

kaddressbook/views/kaddressbookiconview.h

@@ -42,7 +42,7 @@ namespace KABC { class AddressBook; }
 class KAddressBookIconView : public KAddressBookView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KAddressBookIconView( KAB::Core *core, TQWidget *parent,
@@ -76,7 +76,7 @@ class KAddressBookIconView : public KAddressBookView
 class AddresseeIconView : public KIconView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AddresseeIconView( TQWidget *parent, const char *name = 0 );

kaddressbook/views/kaddressbooktableview.h

@@ -62,7 +62,7 @@ class KAddressBookTableView : public KAddressBookView
 friend class ContactListView;
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KAddressBookTableView( KAB::Core *core, TQWidget *parent,

kaddressbook/xxport/bookmark_xxport.h

@@ -30,7 +30,7 @@
 class BookmarkXXPort : public KAB::XXPort
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     BookmarkXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );

kaddressbook/xxport/csv_xxport.h

@@ -29,7 +29,7 @@
 class CSVXXPort : public KAB::XXPort
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CSVXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );

kaddressbook/xxport/csvimportdialog.h

@@ -41,7 +41,7 @@ class TQTable;
 class CSVImportDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CSVImportDialog( KABC::AddressBook *ab, TQWidget *parent,

kaddressbook/xxport/eudora_xxport.h

@@ -29,7 +29,7 @@
 class EudoraXXPort : public KAB::XXPort
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     EudoraXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );

kaddressbook/xxport/gnokii_xxport.h

@@ -29,7 +29,7 @@
 class GNOKIIXXPort : public KAB::XXPort
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );

kaddressbook/xxport/kde2_xxport.h

@@ -29,7 +29,7 @@
 class KDE2XXPort : public KAB::XXPort
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KDE2XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );

kaddressbook/xxport/ldif_xxport.h

@@ -30,7 +30,7 @@
 class LDIFXXPort : public KAB::XXPort
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     LDIFXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );

kaddressbook/xxport/opera_xxport.h

@@ -30,7 +30,7 @@
 class OperaXXPort : public KAB::XXPort
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     OperaXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );

kaddressbook/xxport/pab_xxport.h

@@ -30,7 +30,7 @@
 class PABXXPort : public KAB::XXPort
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PABXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );

kaddressbook/xxport/vcard_xxport.h

@@ -30,7 +30,7 @@
 class VCardXXPort : public KAB::XXPort
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     VCardXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 );

kaddressbook/xxportmanager.h

@@ -40,7 +40,7 @@ class Core;
 class KDE_EXPORT XXPortManager : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     XXPortManager( KAB::Core *core, TQObject *parent, const char *name = 0 );

kaddressbook/xxportselectdialog.h

@@ -45,7 +45,7 @@ class KComboBox;
 class XXPortSelectDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     XXPortSelectDialog( KAB::Core *core, bool sort, TQWidget* parent,

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(); }

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,

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 ..."

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:

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:

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);

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 };

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:

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; }

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;

kalarm/find.h

@@ -36,7 +36,7 @@ class EventListViewItemBase;
 class Find : public TQObject
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		explicit Find(EventListViewBase* parent);
 		~Find();

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,

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);

kalarm/kalarmapp.h

@@ -48,7 +48,7 @@ class ShellProcess;
 class KAlarmApp : public KUniqueApplication
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		~KAlarmApp();
 		virtual int        newInstance();

kalarm/kalarmd/adapp.h

@@ -31,7 +31,7 @@ class AlarmDaemon;
 class AlarmDaemonApp : public KUniqueApplication
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		AlarmDaemonApp();
 		virtual int  newInstance();

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;
 

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);
 

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;

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.

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.

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.

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.

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.

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:

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

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.

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.

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.

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.

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.

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.

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; }

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.

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.

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.

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).

kalarm/mainwindow.h

@@ -42,7 +42,7 @@ class TemplateMenuAction;
 class MainWindow : public MainWindowBase
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 
 	public:
 		static MainWindow* create(bool restored = false);

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)

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);

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.

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*);
 

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 };

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 };

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;

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);

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);

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);

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.

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);

kalarm/startdaytimer.h

@@ -35,7 +35,7 @@
 class StartOfDayTimer : public DailyTimer
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		virtual ~StartOfDayTimer()  { }
 		/** Connect to the timer signal.

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();

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();

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);

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;

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);

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();

kalarm/undo.h

@@ -33,7 +33,7 @@ class UndoItem;
 class Undo : public TQObject
 {
 		Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		enum Type { NONE, UNDO, REDO };
 

kandy/src/cmdpropertiesdialog.h

@@ -31,7 +31,7 @@ class ATCommand;
 class CmdPropertiesDialog : public CmdPropertiesDialog_base
 { 
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CmdPropertiesDialog(ATCommand *cmd,TQWidget* parent=0,const char* name=0,
                         bool modal=false,WFlags fl=0);

kandy/src/commandscheduler.h

@@ -34,7 +34,7 @@ class Modem;
 
 class CommandScheduler : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CommandScheduler (Modem *modem,TQObject *parent = 0, const char *name = 0);
 

kandy/src/kandy.h

@@ -48,7 +48,7 @@ class KandyPrefsDialog;
 class Kandy : public KMainWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
      * Default Constructor

kandy/src/kandyprefsdialog.h

@@ -42,7 +42,7 @@
 class KandyPrefsDialog : public KPrefsDialog
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /** Initialize dialog and pages */
     KandyPrefsDialog(TQWidget *parent=0,char *name=0,bool modal=false);

kandy/src/kandyview.h

@@ -51,7 +51,7 @@ class CmdPropertiesDialog;
 class KandyView : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
 	/**
 	 * Default constructor

kandy/src/mobilegui.h

@@ -39,7 +39,7 @@ class AddressSyncer;
 class MobileGui : public MobileGui_base, virtual public KandyIface
 { 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     MobileGui( CommandScheduler *, KandyPrefs *kprefs, TQWidget* parent=0,

kandy/src/mobilemain.h

@@ -46,7 +46,7 @@ class CommandScheduler;
 class MobileMain : public KMainWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
      * Default Constructor

kandy/src/modem.h

@@ -46,7 +46,7 @@
 class Modem : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	Modem(KandyPrefs *kprefs, TQObject *parent = 0, const char *name = 0);
 	virtual ~Modem();

karm/csvexportdialog.h

@@ -27,7 +27,7 @@
 class CSVExportDialog : public CSVExportDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CSVExportDialog( ReportCriteria::REPORTTYPE rt,

karm/desktoptracker.h

@@ -21,7 +21,7 @@ const int maxDesktops = 20;
 class DesktopTracker: public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     DesktopTracker();

karm/edittaskdialog.h

@@ -43,7 +43,7 @@ class KArmTimeWidget;
 class EditTaskDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     EditTaskDialog(TQString caption, bool editDlg, DesktopList* desktopList=0);

karm/idletimedetector.h

@@ -28,7 +28,7 @@ const int testInterval= secsPerMinute * 1000;
 class IdleTimeDetector :public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   /**

karm/kaccelmenuwatch.h

@@ -35,7 +35,7 @@ class TQPopupMenu;
 class KAccelMenuWatch : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   private:
     enum AccelType { StdAccel, StringAccel };

karm/karm_part.h

@@ -30,7 +30,7 @@ class TaskView;
 class karmPart : public KParts::ReadWritePart, virtual public KarmDCOPIface
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   private:
     void             makeMenus();
@@ -122,7 +122,7 @@ class KAboutData;
 class karmPartFactory : public KParts::Factory
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     karmPartFactory();
     virtual ~karmPartFactory();

karm/mainwindow.h

@@ -26,7 +26,7 @@ class TaskView;
 class MainWindow : public KParts::MainWindow, virtual public KarmDCOPIface
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   private:
     void             makeMenus();

karm/preferences.h

@@ -16,7 +16,7 @@ class KURLRequester;
 class Preferences :public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     static Preferences *instance( const TQString& icsfile = "" );

karm/printdialog.h

@@ -31,7 +31,7 @@ class KDateEdit;
 class PrintDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PrintDialog();

karm/task.h

@@ -41,7 +41,7 @@ class TQPixmap;
 class Task : public TQObject, public TQListViewItem
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     //@{ constructors

karm/taskview.h

@@ -42,7 +42,7 @@ using namespace KCal;
 class TaskView : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     TaskView( TQWidget *parent = 0, const char *name = 0, const TQString &icsfile = "" );

karm/test/script.h

@@ -31,7 +31,7 @@ class TQStringList;
 class Script : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   Script( const TQDir& workingDirectory );
   virtual ~Script();

karm/tray.h

@@ -24,7 +24,7 @@ class MainWindow;
 class KarmTray : public KSystemTray
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KarmTray(MainWindow * parent);

kdgantt/KDGanttMinimizeSplitter.h

@@ -43,7 +43,7 @@ class TQSplitterLayoutStruct;
 class KDGanttMinimizeSplitter : public TQFrame
 {
     Q_OBJECT
-    TQ_OBJECT
+    
     Q_ENUMS( Direction )
     TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
     TQ_PROPERTY( Direction minimizeDirection READ minimizeDirection WRITE setMinimizeDirection )
@@ -138,7 +138,7 @@ private:	// Disabled copy constructor and operator=
 class KDGanttSplitterHandle : public TQWidget
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     KDGanttSplitterHandle( Qt::Orientation o,
 		       KDGanttMinimizeSplitter *parent, const char* name=0 );

kdgantt/KDGanttSemiSizingControl.h

@@ -45,7 +45,7 @@ class KDGanttSemiSizingControl : public KDGanttSizingControl
     TQ_PROPERTY( ArrowPosition arrowPosition READ arrowPosition WRITE setArrowPosition )
     Q_ENUMS( ArrowPosition )
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     enum ArrowPosition { Before, After };

kdgantt/KDGanttSizingControl.h

@@ -38,7 +38,7 @@
 class KDGanttSizingControl : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     bool isMinimized() const;

kdgantt/KDGanttView.h

@@ -70,7 +70,7 @@ class KDGanttMinimizeSplitter;
 class KDGanttView : public KDGanttMinimizeSplitter
 {
     Q_OBJECT
-    TQ_OBJECT
+    
 
     TQ_PROPERTY( bool showLegend READ showLegend WRITE setShowLegend )
     TQ_PROPERTY( bool showListView READ showListView WRITE setShowListView )

kdgantt/KDGanttViewSubwidgets.h

@@ -76,7 +76,7 @@ class KDTimeHeaderToolTip;
 class KDTimeHeaderWidget : public TQWidget
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
    typedef KDGanttView::Scale Scale;
@@ -254,7 +254,7 @@ class KDListView ;
 class KDTimeTableWidget : public TQCanvas
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
    KDTimeTableWidget (TQWidget* parent,KDGanttView* my);
@@ -331,7 +331,7 @@ private:
 class KDLegendWidget : public KDGanttSemiSizingControl
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KDLegendWidget ( TQWidget* parent, KDGanttMinimizeSplitter* legendParent );
@@ -358,7 +358,7 @@ class KDGanttView;
 class KDListView : public TQListView
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
    KDListView (TQWidget* parent,KDGanttView* gv );
@@ -487,7 +487,7 @@ class KDCanvasToolTip;
 class KDGanttCanvasView : public TQCanvasView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     KDGanttCanvasView(KDGanttView* sender, TQCanvas* canvas = 0, TQWidget* parent = 0, const char* name = 0 );

kfile-plugins/ics/kfile_ics.h

@@ -27,7 +27,7 @@ class TQStringList;
 class ICSPlugin : public KFilePlugin
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ICSPlugin( TQObject *parent, const char *name, const TQStringList& args );
 

kfile-plugins/palm-databases/kfile_palm.h

@@ -29,7 +29,7 @@ class TQStringList;
 class KPalmPlugin: public KFilePlugin
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     
 public:
     KPalmPlugin( TQObject *parent, const char *name, const TQStringList& args );

kfile-plugins/rfc822/kfile_rfc822.h

@@ -27,7 +27,7 @@ class TQStringList;
 class KRfc822Plugin: public KFilePlugin
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     
 public:
     KRfc822Plugin( TQObject *parent, const char *name, const TQStringList& args );

kfile-plugins/vcf/kfile_vcf.h

@@ -27,7 +27,7 @@ class TQStringList;
 class KVcfPlugin: public KFilePlugin
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     
 public:
     KVcfPlugin( TQObject *parent, const char *name, const TQStringList& args );

kgantt/kgantt/KGantt.h

@@ -92,7 +92,7 @@ class KDE_EXPORT KGantt : public TQWidget
 {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
 
 public:  

kgantt/kgantt/KGanttBarConfig.h

@@ -38,7 +38,7 @@ class KGanttBarConfig : public TQWidget
 {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 

kgantt/kgantt/KGanttItem.h

@@ -56,7 +56,7 @@ class KDE_EXPORT KGanttItem : public TQObject
 {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
 
 public:

kgantt/kgantt/KGanttRelation.h

@@ -50,7 +50,7 @@ class KGanttRelation : public TQObject
 {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   friend class KGanttItem;
 

kgantt/kgantt/xQGanttBarView.h

@@ -52,7 +52,7 @@ class xQGanttBarView : public TQScrollView
 {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
 
 public:

kgantt/kgantt/xQGanttBarViewPort.h

@@ -90,7 +90,7 @@ class KDE_EXPORT xQGanttBarViewPort : public TQFrame
 {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   friend class xQGanttBarView;
   friend class KGantt;

kgantt/kgantt/xQGanttListView.h

@@ -49,7 +49,7 @@ class xQGanttListView : public TQScrollView
 {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
 
 public:

kgantt/kgantt/xQGanttListViewPort.h

@@ -49,7 +49,7 @@ class xQGanttListViewPort : public TQFrame
 {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   friend class xQGanttListView;
  

kioslaves/opengroupware/opengroupware.h

@@ -33,7 +33,7 @@ namespace KIO {
 class OpenGroupware : public TQObject, public KIO::SlaveBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     OpenGroupware( const TQCString &protocol, const TQCString &pool,
                    const TQCString &app );

kitchensync/libqopensync/callbackhandler.h

@@ -43,7 +43,7 @@ class Engine;
 class CallbackHandler : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CallbackHandler();

kitchensync/src/aboutpage.h

@@ -28,7 +28,7 @@
 class AboutPage : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AboutPage( TQWidget *parent );

kitchensync/src/configguignokii.h

@@ -34,7 +34,7 @@ class TQComboBox;
 class ConfigGuiGnokii : public ConfigGui
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ConfigGuiGnokii( const QSync::Member &, TQWidget *parent );

kitchensync/src/configguiirmc.h

@@ -37,7 +37,7 @@ class TQSpinBox;
 class ConfigGuiIRMC : public ConfigGui
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ConfigGuiIRMC( const QSync::Member &, TQWidget *parent );

kitchensync/src/configguildap.h

@@ -36,7 +36,7 @@ class KLineEdit;
 class ConfigGuiLdap : public ConfigGui
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ConfigGuiLdap( const QSync::Member &, TQWidget *parent );

kitchensync/src/configguisunbird.h

@@ -39,7 +39,7 @@ class KLineEdit;
 class LocalCalendar : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     LocalCalendar( TQWidget *parent = 0 );
@@ -66,7 +66,7 @@ class LocalCalendar : public TQWidget
 class WebdavCalendar : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     WebdavCalendar( TQWidget *parent = 0 );
@@ -97,7 +97,7 @@ class WebdavCalendar : public TQWidget
 class ConfigGuiSunbird : public ConfigGui
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ConfigGuiSunbird( const QSync::Member &, TQWidget *parent );

kitchensync/src/configguisyncmlhttp.h

@@ -36,7 +36,7 @@ class ConfigGuiSyncmlHttp : public ConfigGui
 {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ConfigGuiSyncmlHttp( const QSync::Member &, TQWidget *parent );

kitchensync/src/configguisyncmlobex.h

@@ -38,7 +38,7 @@ class KURLRequester;
 class ConfigGuiSyncmlObex : public ConfigGui
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ConfigGuiSyncmlObex( const QSync::Member &, TQWidget *parent = 0 );

kitchensync/src/connectionwidgets.h

@@ -38,7 +38,7 @@ class KLineEdit;
 class BluetoothWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     BluetoothWidget( TQWidget *parent );
@@ -60,7 +60,7 @@ class BluetoothWidget : public TQWidget
 class IRWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     IRWidget( TQWidget *parent );

kitchensync/src/groupconfig.h

@@ -34,7 +34,7 @@ class SyncProcess;
 class GroupConfig : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     GroupConfig( TQWidget *parent );

kitchensync/src/groupconfigdialog.h

@@ -28,7 +28,7 @@ class SyncProcess;
 class GroupConfigDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     GroupConfigDialog( TQWidget *parent, SyncProcess * );

kitchensync/src/groupitem.h

@@ -40,7 +40,7 @@ class TQVBox;
 class GroupItem : public KWidgetListItem
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     GroupItem( KWidgetList*, SyncProcess *syncProcess );

kitchensync/src/groupview.h

@@ -29,7 +29,7 @@ class TQVBoxLayout;
 class GroupView : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     GroupView( TQWidget *parent );

kitchensync/src/kwidgetlist.h

@@ -29,7 +29,7 @@ class KWidgetListItem;
 class KWidgetList : public TQScrollView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KWidgetList( TQWidget *parent = 0, const char *name = 0 );

kitchensync/src/mainwidget.h

@@ -39,7 +39,7 @@ class Environment;
 class KDE_EXPORT MainWidget : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     MainWidget( KXMLGUIClient *guiClient, TQWidget *widget = 0, const char *name = 0 );
     ~MainWidget();

kitchensync/src/mainwindow.h

@@ -32,7 +32,7 @@ class MainWidget;
 class MainWindow : public KMainWindow
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     MainWindow();

kitchensync/src/memberconfig.h

@@ -30,7 +30,7 @@ class ConfigGui;
 class MemberConfig : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     MemberConfig( TQWidget *parent, const QSync::Member & );

kitchensync/src/multiconflictdialog.h

@@ -28,7 +28,7 @@ class KWidgetList;
 class MultiConflictDialog : public ConflictDialog
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     MultiConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );

kitchensync/src/part.h

@@ -30,7 +30,7 @@ class KAboutData;
 class KitchenSyncPart: public KParts::ReadOnlyPart
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KitchenSyncPart( TQWidget *parentWidget, const char *widgetName,

kitchensync/src/pluginpicker.h

@@ -42,7 +42,7 @@ class PluginItem : public KWidgetListItem
 class PluginPicker : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PluginPicker( TQWidget *parent );
@@ -62,7 +62,7 @@ class PluginPicker : public TQWidget
 class PluginPickerDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PluginPickerDialog( TQWidget *parent );

kitchensync/src/singleconflictdialog.h

@@ -33,7 +33,7 @@ class HTMLDiffAlgoDisplay;
 class SingleConflictDialog : public ConflictDialog
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SingleConflictDialog( QSync::SyncMapping &mapping, TQWidget *parent );

kitchensync/src/syncprocess.h

@@ -32,7 +32,7 @@ class Engine;
 class SyncProcess : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SyncProcess( const QSync::Group &group );

kitchensync/src/syncprocessmanager.h

@@ -34,7 +34,7 @@ class SyncProcess;
 class SyncProcessManager : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     static SyncProcessManager *self();
 

kmail/accountcombobox.h

@@ -42,7 +42,7 @@ namespace KMail {
 class AccountComboBox : public TQComboBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   AccountComboBox( TQWidget* parent, const char* name = 0 );

kmail/accountdialog.h

@@ -55,7 +55,7 @@ class FolderRequester;
 class AccountDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AccountDialog( const TQString & caption, KMAccount *account,
@@ -303,7 +303,7 @@ class AccountDialog : public KDialogBase
 class NamespaceLineEdit: public KLineEdit
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     NamespaceLineEdit( TQWidget* parent );
@@ -320,7 +320,7 @@ class NamespaceLineEdit: public KLineEdit
 class NamespaceEditDialog: public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     NamespaceEditDialog( TQWidget* parent, ImapAccountBase::imapNamespace type,

kmail/accountmanager.h

@@ -35,7 +35,7 @@ namespace KMail {
 class KDE_EXPORT AccountManager: public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMAccount;
 
 public:

kmail/accountwizard.h

@@ -45,7 +45,7 @@ class KMTransportInfo;
 class AccountWizard : public KWizard
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     /**

kmail/acljobs.h

@@ -108,7 +108,7 @@ namespace ACLJobs {
   class GetACLJob : public KIO::SimpleJob
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     GetACLJob( const KURL& url, const TQByteArray &packedArgs,
                bool showProgressInfo );
@@ -125,7 +125,7 @@ namespace ACLJobs {
   class GetUserRightsJob : public KIO::SimpleJob
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     GetUserRightsJob( const KURL& url, const TQByteArray &packedArgs,
                       bool showProgressInfo );
@@ -142,7 +142,7 @@ namespace ACLJobs {
   class DeleteACLJob : public KIO::SimpleJob
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     DeleteACLJob( const KURL& url, const TQString& userId,
                   const TQByteArray &packedArgs,
@@ -157,7 +157,7 @@ namespace ACLJobs {
   /// Set and delete a list of permissions for different users on a given url
   class MultiSetACLJob : public KIO::Job {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     MultiSetACLJob( KIO::Slave* slave, const KURL& url, const ACLList& acl, bool showProgressInfo );

kmail/actionscheduler.h

@@ -49,7 +49,7 @@ namespace KMail {
 class ActionScheduler : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   enum ReturnCode { ResultOk, ResultError, ResultCriticalError };

kmail/annotationjobs.h

@@ -108,7 +108,7 @@ MultiUrlGetAnnotationJob* multiUrlGetAnnotation( KIO::Slave* slave,
 class GetAnnotationJob : public KIO::SimpleJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   GetAnnotationJob( const KURL& url, const TQString& entry, const TQByteArray &packedArgs,
                     bool showProgressInfo );
@@ -126,7 +126,7 @@ private:
 class MultiGetAnnotationJob : public KIO::Job
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   MultiGetAnnotationJob( KIO::Slave* slave, const KURL& url, const TQStringList& entries, bool showProgressInfo );
@@ -150,7 +150,7 @@ private:
 class MultiUrlGetAnnotationJob : public KIO::Job
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   MultiUrlGetAnnotationJob( KIO::Slave* slave, const KURL& baseUrl,
@@ -175,7 +175,7 @@ private:
 class MultiSetAnnotationJob : public KIO::Job
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   MultiSetAnnotationJob( KIO::Slave* slave, const KURL& url, const AnnotationList& annotations, bool showProgressInfo );

kmail/antispamwizard.h

@@ -104,7 +104,7 @@ namespace KMail {
   class AntiSpamWizard : public KWizard
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       /** The wizard can be used for setting up anti-spam tools and for
@@ -299,7 +299,7 @@ namespace KMail {
   class ASWizInfoPage : public ASWizPage
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       ASWizInfoPage( AntiSpamWizard::WizardMode mode,
@@ -326,7 +326,7 @@ namespace KMail {
   class ASWizSpamRulesPage : public ASWizPage
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       ASWizSpamRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree );
@@ -359,7 +359,7 @@ namespace KMail {
   class ASWizVirusRulesPage : public ASWizPage
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       ASWizVirusRulesPage( TQWidget * parent, const char * name, KMFolderTree * mainFolderTree );
@@ -386,7 +386,7 @@ namespace KMail {
   class ASWizSummaryPage : public ASWizPage
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       ASWizSummaryPage( TQWidget * parent, const char * name );

kmail/archivefolderdialog.h

@@ -33,7 +33,7 @@ class FolderRequester;
 class ArchiveFolderDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
 

kmail/attachmentlistview.h

@@ -30,7 +30,7 @@ class Composer;
 class AttachmentListView : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AttachmentListView( KMail::Composer * composer = 0, TQWidget* parent = 0,
                       const char* name = 0 );

kmail/backupjob.h

@@ -48,7 +48,7 @@ namespace KMail
 class BackupJob : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
 

kmail/cachedimapjob.h

@@ -60,7 +60,7 @@ namespace KMail {
 
 class CachedImapJob : public FolderJob {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /** Information about a message to be downloaded (from the 'IMAP envelope') */
   struct MsgForDownload {

kmail/chiasmuskeyselector.h

@@ -9,7 +9,7 @@ class TQLabel;
 class ChiasmusKeySelector : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   ChiasmusKeySelector( TQWidget* parent, const TQString& caption,

kmail/colorlistbox.h

@@ -26,7 +26,7 @@
 class ColorListBox : public KListBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ColorListBox( TQWidget *parent=0, const char * name=0, WFlags f=0 );

kmail/compactionjob.h

@@ -39,7 +39,7 @@ namespace KMail {
 class MboxCompactionJob : public ScheduledJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /// @p folder should be a folder with a KMFolderMbox storage.
   MboxCompactionJob( KMFolder* folder, bool immediate );
@@ -73,7 +73,7 @@ private:
 class MaildirCompactionJob : public ScheduledJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /// @p folder should be a folder with a KMFolderMaildir storage.
   MaildirCompactionJob( KMFolder* folder, bool immediate );

kmail/composer.h

@@ -35,7 +35,7 @@ namespace KMail {
 
   class Composer : public KMail::SecondaryWindow {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     Composer( const char * name=0 ) : KMail::SecondaryWindow( name ) {}
   public: // mailserviceimpl

kmail/configuredialog.h

@@ -34,7 +34,7 @@ namespace KMail {
 class ConfigureDialog : public KCMultiDialog
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   ConfigureDialog( TQWidget *parent=0, const char *name=0, bool modal=true );
@@ -79,7 +79,7 @@ private:
  */
 class AccountUpdater : public TQObject {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     AccountUpdater(KMail::ImapAccountBase *account);
     void update();

kmail/configuredialog_p.h

@@ -78,7 +78,7 @@ namespace Kleo {
 class NewIdentityDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   enum DuplicateMode { Empty, ControlCenter, ExistingEntry };
@@ -124,7 +124,7 @@ typedef TQValueList<LanguageItem> LanguageItemList;
 class NewLanguageDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     NewLanguageDialog( LanguageItemList & suppressedLangs, TQWidget *parent=0,
@@ -139,7 +139,7 @@ class NewLanguageDialog : public KDialogBase
 class LanguageComboBox : public TQComboBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     LanguageComboBox( bool rw, TQWidget *parent=0, const char *name=0 );
@@ -156,7 +156,7 @@ class LanguageComboBox : public TQComboBox
 
 class ProfileDialog : public KDialogBase {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ProfileDialog( TQWidget * parent=0, const char * name=0, bool modal=false );
 
@@ -178,7 +178,7 @@ private:
 #include <kdialog.h>
 class ConfigModule : public KCModule {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ConfigModule( TQWidget * parent=0, const char * name=0 )
      : KCModule ( parent, name )
@@ -206,7 +206,7 @@ signals:
 // Individual tab of a ConfigModuleWithTabs
 class ConfigModuleTab : public TQWidget {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
    ConfigModuleTab( TQWidget *parent=0, const char* name=0 )
       :TQWidget( parent, name )
@@ -241,7 +241,7 @@ private:
  */
 class ConfigModuleWithTabs : public ConfigModule {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ConfigModuleWithTabs( TQWidget * parent=0, const char * name=0 );
    ~ConfigModuleWithTabs() {}
@@ -269,7 +269,7 @@ private:
 
 class KDE_EXPORT IdentityPage : public ConfigModule {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   IdentityPage( TQWidget * parent=0, const char * name=0 );
   ~IdentityPage() {}
@@ -320,7 +320,7 @@ private: // data members
 // subclasses: one class per tab:
 class AccountsPageSendingTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AccountsPageSendingTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -358,7 +358,7 @@ private:
 
 class AccountsPageReceivingTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AccountsPageReceivingTab( TQWidget * parent=0, const char * name=0 );
   ~AccountsPageReceivingTab();
@@ -403,7 +403,7 @@ private:
 
 class KDE_EXPORT AccountsPage : public ConfigModuleWithTabs {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AccountsPage( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -431,7 +431,7 @@ private:
 
 class AppearancePageFontsTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AppearancePageFontsTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -459,7 +459,7 @@ private:
 
 class AppearancePageColorsTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AppearancePageColorsTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -481,7 +481,7 @@ private:
 
 class AppearancePageLayoutTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AppearancePageLayoutTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -504,7 +504,7 @@ private: // data
 
 class AppearancePageHeadersTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AppearancePageHeadersTab( TQWidget * parent=0, const char * name=0 );
 
@@ -531,7 +531,7 @@ private: // data
 
 class AppearancePageReaderTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AppearancePageReaderTab( TQWidget * parent=0, const char * name=0 );
 
@@ -563,7 +563,7 @@ private: // data
 
 class AppearancePageSystemTrayTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AppearancePageSystemTrayTab( TQWidget * parent=0, const char * name=0 );
 
@@ -582,7 +582,7 @@ private: // data
 
 class KDE_EXPORT AppearancePage : public ConfigModuleWithTabs {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   AppearancePage( TQWidget * parent=0, const char * name=0 );
 
@@ -613,7 +613,7 @@ private:
 
 class ComposerPageGeneralTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ComposerPageGeneralTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -647,7 +647,7 @@ private:
 
 class ComposerPagePhrasesTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ComposerPagePhrasesTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -679,7 +679,7 @@ private:
 
 class ComposerPageTemplatesTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ComposerPageTemplatesTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -697,7 +697,7 @@ private:
 
 class ComposerPageCustomTemplatesTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ComposerPageCustomTemplatesTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -715,7 +715,7 @@ private:
 
 class ComposerPageSubjectTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ComposerPageSubjectTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -734,7 +734,7 @@ private:
 
 class ComposerPageCharsetTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ComposerPageCharsetTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -756,7 +756,7 @@ private:
 
 class ComposerPageHeadersTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ComposerPageHeadersTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -789,7 +789,7 @@ private:
 
 class ComposerPageAttachmentsTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ComposerPageAttachmentsTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -811,7 +811,7 @@ private:
 
 class KDE_EXPORT ComposerPage : public ConfigModuleWithTabs {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ComposerPage( TQWidget * parent=0, const char * name=0 );
 
@@ -846,7 +846,7 @@ private:
 
 class SecurityPageGeneralTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   SecurityPageGeneralTab( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -872,7 +872,7 @@ private:
 
 class SecurityPageComposerCryptoTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   SecurityPageComposerCryptoTab( TQWidget * parent=0, const char * name=0 );
 
@@ -892,7 +892,7 @@ private:
 
 class SecurityPageWarningTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   SecurityPageWarningTab( TQWidget * parent=0, const char * name=0 );
 
@@ -915,7 +915,7 @@ private:
 
 class SecurityPageSMimeTab : public ConfigModuleTab, public DCOPObject {
   Q_OBJECT
-  TQ_OBJECT
+  
   K_DCOP
 public:
   SecurityPageSMimeTab( TQWidget * parent=0, const char * name=0 );
@@ -943,7 +943,7 @@ private:
 class SecurityPageCryptPlugTab : public ConfigModuleTab
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   SecurityPageCryptPlugTab( TQWidget * parent = 0, const char* name = 0 );
   ~SecurityPageCryptPlugTab();
@@ -962,7 +962,7 @@ private:
 
 class KDE_EXPORT SecurityPage : public ConfigModuleWithTabs {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   SecurityPage( TQWidget * parent=0, const char * name=0 );
 
@@ -994,7 +994,7 @@ private:
 
 class MiscPageFolderTab : public ConfigModuleTab {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   MiscPageFolderTab( TQWidget * parent=0, const char * name=0 );
 
@@ -1025,7 +1025,7 @@ private:
 
 class MiscPageGroupwareTab : public ConfigModuleTab  {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   MiscPageGroupwareTab( TQWidget * parent=0, const char * name=0 );
   void save();
@@ -1067,7 +1067,7 @@ private:
 
 class KDE_EXPORT MiscPage : public ConfigModuleWithTabs {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   MiscPage( TQWidget * parent=0, const char * name=0 );
   TQString helpAnchor() const;
@@ -1088,7 +1088,7 @@ private:
 
 class ListView : public KListView {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 );
   void resizeColums();

kmail/copyfolderjob.h

@@ -50,7 +50,7 @@ namespace KMail {
 class CopyFolderJob : public FolderJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /**
    * Create a new job

kmail/customtemplates.h

@@ -35,7 +35,7 @@ class KShortcut;
 class CustomTemplates : public CustomTemplatesBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
 

kmail/dictionarycombobox.h

@@ -47,7 +47,7 @@ namespace KMail {
 
   class DictionaryComboBox : public TQComboBox {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     DictionaryComboBox( TQWidget * parent=0, const char * name=0 );
     ~DictionaryComboBox();

kmail/editorwatcher.h

@@ -38,7 +38,7 @@ namespace KMail {
 class EditorWatcher : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     /**
      * Constructs an EditorWatcher.

kmail/expirejob.h

@@ -36,7 +36,7 @@ namespace KMail {
 class ExpireJob : public ScheduledJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ExpireJob( KMFolder* folder, bool immediate );
   virtual ~ExpireJob();

kmail/expirypropertiesdialog.h

@@ -33,7 +33,7 @@ namespace KMail {
 class ExpiryPropertiesDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* folder );

kmail/favoritefolderview.h

@@ -28,7 +28,7 @@ class FavoriteFolderView;
 class FavoriteFolderViewItem : public KMFolderTreeItem
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     FavoriteFolderViewItem( FavoriteFolderView *parent, const TQString & name, KMFolder* folder );
 
@@ -46,7 +46,7 @@ class FavoriteFolderViewItem : public KMFolderTreeItem
 class FavoriteFolderView : public FolderTreeBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     FavoriteFolderView( KMMainWidget *mainWidget, TQWidget *parent = 0 );

kmail/filterimporterexporter.h

@@ -68,7 +68,7 @@ private:
 class FilterSelectionDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   FilterSelectionDialog( TQWidget * parent = 0 );
 

kmail/filterlog.h

@@ -53,7 +53,7 @@ namespace KMail {
   class FilterLog : public TQObject
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       /** access to the singleton instance */

kmail/filterlogdlg.h

@@ -48,7 +48,7 @@ namespace KMail {
   class FilterLogDialog : public KDialogBase
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     
     public:
       /** constructor */

kmail/folderIface.h

@@ -43,7 +43,7 @@ namespace KMail {
                       public DCOPObject
   {
     Q_OBJECT
-//  TQ_OBJECT
+//  
     K_DCOP
 
   public:

kmail/folderdiaacltab.h

@@ -59,7 +59,7 @@ class ImapAccountBase;
  */
 class ACLEntryDialog :public KDialogBase {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQString& caption, TQWidget* parent, const char* name = 0 );
@@ -87,7 +87,7 @@ private:
 class FolderDiaACLTab : public FolderDiaTab
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, const char* name = 0 );

kmail/folderdiaquotatab.h

@@ -53,7 +53,7 @@ class ImapAccountBase;
 class FolderDiaQuotaTab : public FolderDiaTab
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   FolderDiaQuotaTab( KMFolderDialog* dlg, TQWidget* parent, const char* name = 0 );

kmail/folderdiaquotatab_p.h

@@ -45,7 +45,7 @@ namespace KMail {
 class QuotaWidget : public TQWidget {
 
  Q_OBJECT
-  TQ_OBJECT
+  
 public:
     QuotaWidget( TQWidget* parent, const char* name = 0 );
     virtual ~QuotaWidget() { }

kmail/folderjob.h

@@ -44,7 +44,7 @@ namespace KMail {
 class FolderJob : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   enum JobType { tListMessages, tGetFolder, tCreateFolder, tExpungeFolder,

kmail/folderrequester.h

@@ -46,7 +46,7 @@ namespace KMail {
   class FolderRequester: public TQWidget
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       /** 

kmail/foldersetselector.h

@@ -29,7 +29,7 @@ namespace KMail {
 class FolderSetSelector : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     FolderSetSelector( KMFolderTree *ft, TQWidget *parent = 0 );

kmail/foldershortcutdialog.h

@@ -51,7 +51,7 @@ namespace KMail
 class FolderShortcutDialog : public KDialogBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	FolderShortcutDialog( KMFolder *folder, KMMainWidget *mw, 
                         TQWidget *parent=0, const char *name=0 );

kmail/folderstorage.h

@@ -79,7 +79,7 @@ typedef TQValueList<TQ_UINT32> SerNumList;
 class FolderStorage : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 

kmail/foldertreebase.h

@@ -29,7 +29,7 @@ namespace KMail {
 class FolderTreeBase : public KFolderTree
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     FolderTreeBase( KMMainWidget *mainWidget, TQWidget *parent = 0, const char *name = 0 );
 

kmail/globalsettings.h

@@ -31,7 +31,7 @@ class TQTimer;
 class GlobalSettings : public TQObject, public GlobalSettingsBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   virtual ~GlobalSettings();
 

kmail/headerlistquicksearch.h

@@ -45,7 +45,7 @@ namespace KMail {
 class HeaderListQuickSearch : public KListViewSearchLine
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     HeaderListQuickSearch( TQWidget *parent,
                                              KListView *listView,

kmail/htmlstatusbar.h

@@ -60,7 +60,7 @@ namespace KMail {
    **/
   class HtmlStatusBar : public TQLabel {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     HtmlStatusBar( TQWidget * parent=0, const char * name=0, WFlags f=0 );
     virtual ~HtmlStatusBar();

kmail/identitydialog.h

@@ -61,7 +61,7 @@ namespace KMail {
 
   class IdentityDialog : public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     IdentityDialog( TQWidget * parent=0, const char * name = 0 );
     virtual ~IdentityDialog();

kmail/identitydrag.h

@@ -43,7 +43,7 @@ namespace KMail {
   **/
   class IdentityDrag : public TQDragObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     IdentityDrag( const KPIM::Identity & ident,
 		  TQWidget * dragSource=0, const char * name=0 );

kmail/identitylistview.h

@@ -68,7 +68,7 @@ namespace KMail {
   **/
   class IdentityListView : public KListView {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     IdentityListView( TQWidget * parent=0, const char * name=0 );
     virtual ~IdentityListView() {}

kmail/imapaccountbase.h

@@ -58,7 +58,7 @@ namespace KMail {
 
   class ImapAccountBase : public KMail::NetworkAccount {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     ImapAccountBase( AccountManager * parent, const TQString & name, uint id );
   public:

kmail/imapjob.h

@@ -54,7 +54,7 @@ class AttachmentStrategy;
 class ImapJob : public FolderJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMAcctImap;
 
 public:

kmail/importarchivedialog.h

@@ -32,7 +32,7 @@ class FolderRequester;
 class ImportArchiveDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
 

kmail/importjob.h

@@ -52,7 +52,7 @@ namespace KMail
 class ImportJob : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
 

kmail/index.h

@@ -51,7 +51,7 @@ class KMSearchPattern;
 
 class KMMsgIndex : public TQObject {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		explicit KMMsgIndex( TQObject* parent );
 		~KMMsgIndex();
@@ -195,7 +195,7 @@ class KMMsgIndex : public TQObject {
 
 class KMMsgIndex::Search : public TQObject {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		explicit Search( KMSearch* s );
 		~Search();

kmail/jobscheduler.h

@@ -96,7 +96,7 @@ private:
 class JobScheduler : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   JobScheduler( TQObject* parent, const char* name = 0 );
   ~JobScheduler();

kmail/khtmlparthtmlwriter.h

@@ -45,7 +45,7 @@ namespace KMail {
 
   class KHtmlPartHtmlWriter : public TQObject, public HtmlWriter {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     // Key is Content-Id, value is URL
     typedef TQMap<TQString, TQString> EmbeddedPartMap;

kmail/klistboxdialog.h

@@ -9,7 +9,7 @@ class TQListBox;
 class KListBoxDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     KListBoxDialog( TQString& _selectedString,

kmail/klistviewindexedsearchline.h

@@ -49,7 +49,7 @@ class KListViewSearchLine;
 class TDEUI_EXPORT KListViewIndexedSearchLine: public KMail::HeaderListQuickSearch
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 

kmail/kmaccount.h

@@ -52,7 +52,7 @@ typedef TQValueList< ::KMAccount* > AccountList;
 class KMPrecommand : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMPrecommand(const TQString &precommand, TQObject *parent = 0);
@@ -74,7 +74,7 @@ protected:
 class KMAccount: public TQObject, public KAccount
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class KMail::AccountManager;
   friend class ::KMail::FolderJob;
   friend class ::AccountsPageReceivingTab; // part of the config dialog

kmail/kmacctcachedimap.h

@@ -54,7 +54,7 @@ namespace KIO {
 class KMAcctCachedImap: public KMail::ImapAccountBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMail::ImapJob;
   friend class ::KMail::CachedImapJob;
 

kmail/kmacctimap.h

@@ -40,7 +40,7 @@ class FolderStorage;
 class KMAcctImap: public KMail::ImapAccountBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class KMail::ImapJob;
 
 public:

kmail/kmacctseldlg.h

@@ -30,7 +30,7 @@
 class KMAcctSelDlg: public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KMAcctSelDlg( TQWidget *parent=0, const char *name=0, bool modal=true );

kmail/kmail_part.h

@@ -52,7 +52,7 @@ class ActionManager;
 class KDE_EXPORT KMailPart: public KParts::ReadOnlyPart, virtual public KMailPartIface
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KMailPart(TQWidget *parentWidget, const char *widgetName,
               TQObject *parent, const char *name, const TQStringList &);

kmail/kmailicalifaceimpl.h

@@ -83,7 +83,7 @@ public:
 /** The implementation of the interface. */
 class KMailICalIfaceImpl : public TQObject, virtual public KMailICalIface {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMailICalIfaceImpl();
 

kmail/kmatmlistview.h

@@ -15,7 +15,7 @@ class TQCheckBox;
 class KMAtmListViewItem : public TQObject, public TQListViewItem
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMAtmListViewItem( TQListView *parent );

kmail/kmcommands.h

@@ -51,7 +51,7 @@ typedef TQMap<partNode*, KMMessage*> PartNodeMessageMap;
 class KDE_EXPORT KMCommand : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
     friend class LaterDeleterWithCommandCompletion;
 
 public:
@@ -165,7 +165,7 @@ private:
 class KDE_EXPORT KMMailtoComposeCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMMailtoComposeCommand( const KURL &url, KMMessage *msg=0 );
@@ -180,7 +180,7 @@ private:
 class KDE_EXPORT KMMailtoReplyCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMMailtoReplyCommand( TQWidget *parent, const KURL &url,
@@ -196,7 +196,7 @@ private:
 class KDE_EXPORT KMMailtoForwardCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMMailtoForwardCommand( TQWidget *parent, const KURL &url,
@@ -211,7 +211,7 @@ private:
 class KDE_EXPORT KMMailtoAddAddrBookCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMMailtoAddAddrBookCommand( const KURL &url, TQWidget *parent );
@@ -225,7 +225,7 @@ private:
 class KDE_EXPORT KMAddBookmarksCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMAddBookmarksCommand( const KURL &url, TQWidget *parent );
@@ -240,7 +240,7 @@ private:
 class KDE_EXPORT KMMailtoOpenAddrBookCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMMailtoOpenAddrBookCommand( const KURL &url, TQWidget *parent );
@@ -254,7 +254,7 @@ private:
 class KDE_EXPORT KMUrlCopyCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMUrlCopyCommand( const KURL &url, KMMainWidget *mainWidget = 0 );
@@ -269,7 +269,7 @@ private:
 class KDE_EXPORT KMUrlOpenCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMUrlOpenCommand( const KURL &url, KMReaderWin *readerWin );
@@ -284,7 +284,7 @@ private:
 class KDE_EXPORT KMUrlSaveCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMUrlSaveCommand( const KURL &url, TQWidget *parent );
@@ -301,7 +301,7 @@ private:
 class KDE_EXPORT KMEditMsgCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMEditMsgCommand( TQWidget *parent, KMMessage *msg );
@@ -313,7 +313,7 @@ private:
 class KDE_EXPORT KMUseTemplateCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMUseTemplateCommand( TQWidget *parent, KMMessage *msg );
@@ -325,7 +325,7 @@ private:
 class KDE_EXPORT KMShowMsgSrcCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMShowMsgSrcCommand( TQWidget *parent, KMMessage *msg,
@@ -340,7 +340,7 @@ private:
 class KDE_EXPORT KMSaveMsgCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMSaveMsgCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList );
@@ -372,7 +372,7 @@ private:
 class KDE_EXPORT KMOpenMsgCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMOpenMsgCommand( TQWidget *parent, const KURL & url = KURL(),
@@ -396,7 +396,7 @@ private:
 class KDE_EXPORT KMSaveAttachmentsCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /** Use this to save all attachments of the given message.
       @param parent  The parent widget of the command used for message boxes.
@@ -435,7 +435,7 @@ private:
 class KDE_EXPORT KMReplyToCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMReplyToCommand( TQWidget *parent, KMMessage *msg,
@@ -451,7 +451,7 @@ private:
 class KDE_EXPORT KMNoQuoteReplyToCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMNoQuoteReplyToCommand( TQWidget *parent, KMMessage *msg );
@@ -463,7 +463,7 @@ private:
 class KMReplyListCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMReplyListCommand( TQWidget *parent, KMMessage *msg,
@@ -479,7 +479,7 @@ private:
 class KDE_EXPORT KMReplyToAllCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMReplyToAllCommand( TQWidget *parent, KMMessage *msg,
@@ -495,7 +495,7 @@ private:
 class KDE_EXPORT KMReplyAuthorCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMReplyAuthorCommand( TQWidget *parent, KMMessage *msg,
@@ -511,7 +511,7 @@ private:
 class KDE_EXPORT KMForwardInlineCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMForwardInlineCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList,
@@ -529,7 +529,7 @@ private:
 class KDE_EXPORT KMForwardAttachedCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMForwardAttachedCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList,
@@ -547,7 +547,7 @@ private:
 class KDE_EXPORT KMForwardDigestCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMForwardDigestCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList,
@@ -565,7 +565,7 @@ private:
 class KDE_EXPORT KMRedirectCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMRedirectCommand( TQWidget *parent, KMMessage *msg );
@@ -577,7 +577,7 @@ private:
 class KDE_EXPORT KMCustomReplyToCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMCustomReplyToCommand( TQWidget *parent, KMMessage *msg,
@@ -595,7 +595,7 @@ private:
 class KDE_EXPORT KMCustomReplyAllToCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMCustomReplyAllToCommand( TQWidget *parent, KMMessage *msg,
@@ -613,7 +613,7 @@ private:
 class KDE_EXPORT KMCustomForwardCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMCustomForwardCommand( TQWidget *parent, const TQPtrList<KMMsgBase> &msgList,
@@ -631,7 +631,7 @@ private:
 class KDE_EXPORT KMPrintCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMPrintCommand( TQWidget *parent, KMMessage *msg,
@@ -659,7 +659,7 @@ private:
 class KDE_EXPORT KMSeStatusCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   // Serial numbers
@@ -678,7 +678,7 @@ private:
 class KDE_EXPORT KMFilterCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMFilterCommand( const TQCString &field, const TQString &value );
@@ -694,7 +694,7 @@ private:
 class KDE_EXPORT KMFilterActionCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMFilterActionCommand( TQWidget *parent,
@@ -711,7 +711,7 @@ private:
 class KDE_EXPORT KMMetaFilterActionCommand : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMMetaFilterActionCommand( KMFilter *filter, KMHeaders *headers,
@@ -729,7 +729,7 @@ private:
 class KDE_EXPORT FolderShortcutCommand : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   FolderShortcutCommand( KMMainWidget* mainwidget, KMFolder *folder );
@@ -752,7 +752,7 @@ private:
 class KDE_EXPORT KMMailingListFilterCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMMailingListFilterCommand( TQWidget *parent, KMMessage *msg );
@@ -772,7 +772,7 @@ private:
 class KDE_EXPORT KMMenuCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   static void folderToPopupMenu(bool move, TQObject *receiver,
@@ -785,7 +785,7 @@ public:
 class KDE_EXPORT KMCopyCommand : public KMMenuCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMCopyCommand( KMFolder* destFolder,
@@ -811,7 +811,7 @@ namespace KPIM {
 class KDE_EXPORT KMMoveCommand : public KMMenuCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMMoveCommand( KMFolder* destFolder, const TQPtrList<KMMsgBase> &msgList );
@@ -847,7 +847,7 @@ private:
 class KDE_EXPORT KMDeleteMsgCommand : public KMMoveCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMDeleteMsgCommand( KMFolder* srcFolder, const TQPtrList<KMMsgBase> &msgList );
@@ -862,7 +862,7 @@ private:
 class KDE_EXPORT KMUrlClickedCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMUrlClickedCommand( const KURL &url, uint identity,
@@ -881,7 +881,7 @@ private:
 class KDE_EXPORT KMLoadPartsCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMLoadPartsCommand( TQPtrList<partNode>& parts, KMMessage* msg );
@@ -907,7 +907,7 @@ private:
 class KDE_EXPORT KMResendMessageCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMResendMessageCommand( TQWidget *parent, KMMessage *msg=0 );
@@ -919,7 +919,7 @@ private:
 class KDE_EXPORT KMMailingListCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMMailingListCommand( TQWidget *parent, KMFolder *folder );
 private:
@@ -935,7 +935,7 @@ protected:
 class KDE_EXPORT KMMailingListPostCommand : public KMMailingListCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMMailingListPostCommand( TQWidget *parent, KMFolder *folder );
 protected:
@@ -945,7 +945,7 @@ protected:
 class KDE_EXPORT KMMailingListSubscribeCommand : public KMMailingListCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMMailingListSubscribeCommand( TQWidget *parent, KMFolder *folder );
 protected:
@@ -955,7 +955,7 @@ protected:
 class KDE_EXPORT KMMailingListUnsubscribeCommand : public KMMailingListCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMMailingListUnsubscribeCommand( TQWidget *parent, KMFolder *folder );
 protected:
@@ -965,7 +965,7 @@ protected:
 class KDE_EXPORT KMMailingListArchivesCommand : public KMMailingListCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMMailingListArchivesCommand( TQWidget *parent, KMFolder *folder );
 protected:
@@ -975,7 +975,7 @@ protected:
 class KDE_EXPORT KMMailingListHelpCommand : public KMMailingListCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMMailingListHelpCommand( TQWidget *parent, KMFolder *folder );
 protected:
@@ -985,7 +985,7 @@ protected:
 class KDE_EXPORT KMIMChatCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMIMChatCommand( const KURL &url, KMMessage *msg=0 );
@@ -1006,7 +1006,7 @@ private:
 class KDE_EXPORT KMHandleAttachmentCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   /** Supported types of attachment handling */
@@ -1093,7 +1093,7 @@ private:
 class KDE_EXPORT AttachmentModifyCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     AttachmentModifyCommand( partNode *node, KMMessage *msg, TQWidget *parent );
     AttachmentModifyCommand( int nodeId, KMMessage *msg, TQWidget *parent );
@@ -1121,7 +1121,7 @@ class KDE_EXPORT AttachmentModifyCommand : public KMCommand
 class KDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KMDeleteAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *parent );
     KMDeleteAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent );
@@ -1135,7 +1135,7 @@ class KDE_EXPORT KMDeleteAttachmentCommand : public AttachmentModifyCommand
 class KDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KMEditAttachmentCommand( partNode *node, KMMessage *msg, TQWidget *parent );
     KMEditAttachmentCommand( int nodeId, KMMessage *msg, TQWidget *parent );
@@ -1154,7 +1154,7 @@ class KDE_EXPORT KMEditAttachmentCommand : public AttachmentModifyCommand
 class KDE_EXPORT CreateTodoCommand : public KMCommand
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CreateTodoCommand( TQWidget *parent, KMMessage *msg );
 

kmail/kmcomposewin.h

@@ -99,7 +99,7 @@ namespace GpgME {
 class KMComposeWin : public KMail::Composer, public MailComposerIface
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMEdit;
   friend class ::MessageComposer;
 

kmail/kmedit.h

@@ -65,7 +65,7 @@ class KMSyntaxHighter : public KDictSpellingHighlighter
 
 class KMEdit : public KEdit {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMEdit(TQWidget *parent=0,KMComposeWin* composer=0,
          KSpellConfig* spellConfig = 0,

kmail/kmfawidgets.h

@@ -18,7 +18,7 @@ class KURLRequester;
 class KMFilterActionWithAddressWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMFilterActionWithAddressWidget( TQWidget* parent=0, const char* name=0 );
 
@@ -41,7 +41,7 @@ private:
 class KMSoundTestWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMSoundTestWidget( TQWidget * parent, const char * name=0 );
   ~KMSoundTestWidget();

kmail/kmfilterdlg.h

@@ -60,7 +60,7 @@ class KListView;
 class KMFilterListBox : public TQGroupBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /** Constuctor. */
   KMFilterListBox( const TQString & title, TQWidget* parent=0, const char* name=0, bool popFilter = false);
@@ -196,7 +196,7 @@ private:
 class KMFilterActionWidget : public TQHBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /** Constructor. Creates a filter action widget with no type
       selected. */
@@ -230,7 +230,7 @@ private:
 class KMPopFilterActionWidget : public TQVButtonGroup
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMPopFilterActionWidget( const TQString &title, TQWidget* parent=0, const char* name=0 );
   void setAction( KMPopFilterAction aAction );
@@ -255,7 +255,7 @@ signals: // Signals
 class KMFilterActionWidgetLister : public KWidgetLister
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMFilterActionWidgetLister( TQWidget *parent=0, const char* name=0 );
 
@@ -339,7 +339,7 @@ private:
 class KMFilterDlg: public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /** Create the filter dialog. The only class which should be able to
       do this is KMFilterMgr. This ensures that there is only a

kmail/kmfiltermgr.h

@@ -34,7 +34,7 @@ template <typename T> class TQValueList;
 class KMFilterMgr: public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMFilterMgr(bool popFilter = false);

kmail/kmfolder.h

@@ -68,7 +68,7 @@ typedef TQValueList<TQ_UINT32> SerNumList;
 class KMFolder: public KMFolderNode
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMFolderJob;
 public:
 

kmail/kmfoldercachedimap.h

@@ -66,7 +66,7 @@ using KMail::AttachmentStrategy;
 class DImapTroubleShootDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   enum SelectedOperation {
     None = -1,
@@ -93,7 +93,7 @@ private:
 class KMFolderCachedImap : public KMFolderMaildir
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   static TQString cacheLocation() {

kmail/kmfoldercombobox.h

@@ -14,7 +14,7 @@
 class KMFolderComboBox : public TQComboBox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMFolderComboBox( TQWidget *parent = 0, char *name = 0 );

kmail/kmfolderdia.h

@@ -70,7 +70,7 @@ namespace KMail {
 class FolderDiaTab : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
    FolderDiaTab( TQWidget *parent=0, const char* name=0 )
      : TQWidget( parent, name ) {}
@@ -112,7 +112,7 @@ signals:
 class FolderDiaGeneralTab : public FolderDiaTab
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   FolderDiaGeneralTab( KMFolderDialog* dlg,
@@ -164,7 +164,7 @@ private:
 class FolderDiaTemplatesTab : public FolderDiaTab
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   FolderDiaTemplatesTab( KMFolderDialog *dlg, TQWidget *parent );
@@ -199,7 +199,7 @@ private:
 class KMFolderDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMFolderDialog( KMFolder *folder, KMFolderDir *aFolderDir,

kmail/kmfolderdir.h

@@ -15,7 +15,7 @@ class KMFolderMgr;
 class KMFolderDir: public KMFolderNode, public KMFolderNodeList
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMFolderDir( KMFolder * owner, KMFolderDir * parent = 0,
@@ -71,7 +71,7 @@ protected:
 class KMFolderRootDir: public KMFolderDir
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMFolderRootDir( KMFolderMgr* manager,

kmail/kmfolderimap.h

@@ -78,7 +78,7 @@ private:
 class KMFolderImap : public KMFolderMbox
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMail::ImapJob;
 public:
 

kmail/kmfolderindex.h

@@ -37,7 +37,7 @@
 class KMFolderIndex: public FolderStorage
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   //TODO:Have to get rid of this friend declaration and add necessary pure
   //virtuals to kmfolder.h so that KMMsgBase::parent() can be a plain KMFolder
   //rather than a KMFolderIndex. Need this for database indices.

kmail/kmfoldermaildir.h

@@ -24,7 +24,7 @@ using KMail::AttachmentStrategy;
 class KMFolderMaildir : public KMFolderIndex
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMail::MaildirJob;
 public:
   /** Usually a parent is given. But in some cases there is no

kmail/kmfoldermbox.h

@@ -47,7 +47,7 @@ using KMail::AttachmentStrategy;
 class KMFolderMbox : public KMFolderIndex
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMail::MboxJob;
 public:
 

kmail/kmfoldermgr.h

@@ -16,7 +16,7 @@ class KMFolder;
 class KMFolderMgr: public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMFolderMgr(const TQString& basePath, KMFolderDirType dirType = KMStandardDir);

kmail/kmfoldernode.h

@@ -29,7 +29,7 @@ class KMFolderDir;
 class KMFolderNode: public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMFolderNode( KMFolderDir * parent, const TQString & name );

kmail/kmfoldersearch.h

@@ -52,7 +52,7 @@ using KMail::AttachmentStrategy;
 class KMSearch: public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMSearch(TQObject * parent = 0, const char * name = 0);
@@ -110,7 +110,7 @@ private:
 class KMFolderSearch: public FolderStorage
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMFolderSearchJob;
 public:
   KMFolderSearch(KMFolder* folder, const char* name=0);

kmail/kmfolderseldlg.h

@@ -21,7 +21,7 @@ namespace KMail {
   class KMFolderSelDlg: public KDialogBase
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       /** 

kmail/kmfoldertree.h

@@ -45,7 +45,7 @@ template <typename T> class TQGuardedPtr;
 class KDE_EXPORT KMFolderTreeItem : public TQObject, public KFolderTreeItem
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /** Construct a root item _without_ folder */
   KMFolderTreeItem( KFolderTree *parent, const TQString & name,
@@ -109,7 +109,7 @@ private:
 class KMFolderTree : public KMail::FolderTreeBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent=0,

kmail/kmheaders.h

@@ -48,7 +48,7 @@ enum NestingPolicy { AlwaysOpen = 0, DefaultOpen, DefaultClosed, OpenUnread };
 class KMHeaders : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   friend class ::KMail::HeaderItem; // For easy access to the pixmaps
 

kmail/kmkernel.h

@@ -83,7 +83,7 @@ class ConfigureDialog;
 class KDE_EXPORT KMKernel : public TQObject, virtual public KMailIface
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMKernel (TQObject *parent=0, const char *name=0);

kmail/kmlineeditspell.h

@@ -12,7 +12,7 @@ class TQPopupMenu;
 class KMLineEdit : public KPIM::AddresseeLineEdit
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KMLineEdit(bool useCompletion, TQWidget *parent = 0,
                const char *name = 0);
@@ -41,7 +41,7 @@ private:
 class KMLineEditSpell : public KMLineEdit
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KMLineEditSpell(bool useCompletion, TQWidget *parent = 0,
                const char *name = 0);

kmail/kmmainwidget.h

@@ -82,7 +82,7 @@ typedef TQMap<int,KMFolder*> KMMenuToFolder;
 class KDE_EXPORT KMMainWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMMainWidget(TQWidget *parent, const char *name,

kmail/kmmainwin.h

@@ -35,7 +35,7 @@ using KPIM::ProgressDialog;
 class KMMainWin : public KMainWindow
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   // the main window needs to have a name since else restoring the window

kmail/kmmimeparttree.h

@@ -47,7 +47,7 @@ class KMMimePartTreeItem;
 class KMMimePartTree : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMReaderWin;
 
 public:

kmail/kmmsgpartdlg.h

@@ -39,7 +39,7 @@ class TQLineEdit;
 class KMMsgPartDialog: public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMMsgPartDialog( const TQString & caption=TQString(),
@@ -140,7 +140,7 @@ protected:
 */
 class KMMsgPartDialogCompat : public KMMsgPartDialog {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMMsgPartDialogCompat( TQWidget * parent=0, const char * caption=0, bool=FALSE );
   virtual ~KMMsgPartDialogCompat();

kmail/kmpopfiltercnfrmdlg.h

@@ -36,7 +36,7 @@ class KMPopFilterCnfrmDlg;
 class KMPopHeadersView : public KListView
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMPopHeadersView(TQWidget *aParent=0, KMPopFilterCnfrmDlg *aDialog=0);
@@ -79,7 +79,7 @@ class KMPopFilterCnfrmDlg : public KDialogBase
 {
 	friend class ::KMPopHeadersView;
   Q_OBJECT
-  TQ_OBJECT
+  
 protected:
   KMPopFilterCnfrmDlg() { };
   TQMap<TQListViewItem*, KMPopHeaders*> mItemMap;

kmail/kmreadermainwin.h

@@ -25,7 +25,7 @@ class MessageActions;
 class KMReaderMainWin : public KMail::SecondaryWindow
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMReaderMainWin( bool htmlOverride, bool htmlLoadExtOverride, char *name = 0 );

kmail/kmreaderwin.h

@@ -75,7 +75,7 @@ namespace KParts {
 
 class KMReaderWin: public TQWidget, public KMail::Interface::Observer {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   friend void KMMimePartTree::itemClicked( TQListViewItem* item );
   friend void KMMimePartTree::itemRightClicked( TQListViewItem* item, const TQPoint & );

kmail/kmsearchpatternedit.h

@@ -40,7 +40,7 @@ class KMSearchPatternEdit;
 class KMSearchRuleWidget : public TQWidget
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /** Constructor. You can give a KMSearchRule as parameter, which will
       be used to initialize the widget. */
@@ -106,7 +106,7 @@ private:
 class KMSearchRuleWidgetLister : public KWidgetLister
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   friend class ::KMSearchPatternEdit;
 
@@ -167,7 +167,7 @@ private:
 
 class KMSearchPatternEdit : public TQGroupBox  {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /** Constructor. The parent and name parameters are passed to the underlying
       TQGroupBox, as usual. */

kmail/kmsender.h

@@ -53,7 +53,7 @@ namespace KPIM {
 class KMSender: public TQObject, public KMail::MessageSender
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMSendProc;
   friend class ::KMSendSendmail;
   friend class ::KMSendSMTP;

kmail/kmsender_p.h

@@ -23,7 +23,7 @@ namespace KIO {
 class KMSendProc: public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMSendProc(KMSender*);
@@ -87,7 +87,7 @@ protected:
 class KMSendSendmail: public KMSendProc
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMSendSendmail(KMSender*);
   ~KMSendSendmail();
@@ -118,7 +118,7 @@ private:
 class KMSendSMTP : public KMSendProc
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
   KMSendSMTP(KMSender *sender);
   ~KMSendSMTP();

kmail/kmservertest.h

@@ -47,7 +47,7 @@ namespace KIO {
 class KMServerTest : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMServerTest( const TQString & protocol, const TQString & host, int port );

kmail/kmsystemtray.h

@@ -41,7 +41,7 @@ class TQPoint;
 class KMSystemTray : public KSystemTray
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /** construtor */
   KMSystemTray(TQWidget* parent=0, const char *name=0);

kmail/kmtransport.h

@@ -64,7 +64,7 @@ public:
 class KMTransportSelDlg : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMTransportSelDlg( TQWidget *parent=0, const char *name=0, bool modal=TRUE );
@@ -80,7 +80,7 @@ private:
 class KMTransportDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KMTransportDialog( const TQString & caption, KMTransportInfo *transportInfo,

kmail/listjob.h

@@ -54,7 +54,7 @@ namespace KMail {
 class ListJob : public FolderJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /**
    * Create a new job

kmail/localsubscriptiondialog.h

@@ -40,7 +40,7 @@ namespace KMail {
   class LocalSubscriptionDialog: public SubscriptionDialog
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       LocalSubscriptionDialog( TQWidget *parent, const TQString &caption,

kmail/maildirjob.h

@@ -41,7 +41,7 @@ namespace KMail {
 class MaildirJob : public FolderJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   MaildirJob( KMMessage *msg, JobType jt = tGetMessage, KMFolder *folder = 0 );
   MaildirJob( TQPtrList<KMMessage>& msgList, const TQString& sets,

kmail/mailinglistpropertiesdialog.h

@@ -45,7 +45,7 @@ namespace KMail
 class MailingListFolderPropertiesDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   MailingListFolderPropertiesDialog( TQWidget *parent, KMFolder *folder );
   ~MailingListFolderPropertiesDialog() {};

kmail/managesievescriptsdialog.h

@@ -15,7 +15,7 @@ class SieveEditor;
 
 class ManageSieveScriptsDialog : public KDialogBase {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   ManageSieveScriptsDialog( TQWidget * parent=0, const char * name=0 );
   ~ManageSieveScriptsDialog();

kmail/managesievescriptsdialog_p.h

@@ -9,7 +9,7 @@ namespace KMail {
 
 class SieveEditor : public KDialogBase {
   Q_OBJECT
-  TQ_OBJECT
+  
   TQ_PROPERTY( TQString script READ script WRITE setScript )
 public:
   SieveEditor( TQWidget * parent=0, const char * name=0 );

kmail/mboxjob.h

@@ -41,7 +41,7 @@ namespace KMail {
 class MboxJob : public FolderJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::KMFolderMbox;
 public:
   MboxJob( KMMessage *msg, JobType jt = tGetMessage, KMFolder *folder = 0 );

kmail/messageactions.h

@@ -39,7 +39,7 @@ namespace KMail {
 class MessageActions : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     MessageActions( KActionCollection* ac, TQWidget *parent );
     void setMessageView( KMReaderWin *msgView );

kmail/messagecomposer.h

@@ -64,7 +64,7 @@ namespace KPIM {
 
 class MessageComposer : public TQObject {
   Q_OBJECT
-  TQ_OBJECT
+  
   friend class ::MessageComposerJob;
   friend class ::EncryptMessageJob;
   friend class ::SetLastMessageAsUnencryptedVersionOfLastButOne;

kmail/messagecopyhelper.h

@@ -39,7 +39,7 @@ namespace KMail {
 class MessageCopyHelper : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     /**

kmail/messageproperty.h

@@ -57,7 +57,7 @@ class ActionScheduler;
 class MessageProperty : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   /** If the message is being filtered  */

kmail/networkaccount.h

@@ -45,7 +45,7 @@ namespace KMail {
 
   class NetworkAccount : public KMAccount {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     NetworkAccount( AccountManager * parent, const TQString & name, uint id );
   public:

kmail/newfolderdialog.h

@@ -47,7 +47,7 @@ namespace KMail {
 class NewFolderDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     NewFolderDialog( TQWidget* parent = 0, KMFolder *folder = 0 );

kmail/objecttreeparser_p.h

@@ -61,7 +61,7 @@ namespace KMail {
       public KMail::ISubject
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     CryptoBodyPartMemento();
     ~CryptoBodyPartMemento();
@@ -88,7 +88,7 @@ namespace KMail {
     : public CryptoBodyPartMemento
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     DecryptVerifyBodyPartMemento( Kleo::DecryptVerifyJob * job, const TQByteArray & cipherText );
     ~DecryptVerifyBodyPartMemento();
@@ -124,7 +124,7 @@ namespace KMail {
     : public CryptoBodyPartMemento
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     VerifyDetachedBodyPartMemento( Kleo::VerifyDetachedJob * job,
                                    Kleo::KeyListJob * klj,
@@ -164,7 +164,7 @@ namespace KMail {
     : public CryptoBodyPartMemento
   {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     VerifyOpaqueBodyPartMemento( Kleo::VerifyOpaqueJob * job,
                                  Kleo::KeyListJob * klj,

kmail/popaccount.h

@@ -27,7 +27,7 @@ namespace KMail {
  */
 class PopAccount: public NetworkAccount {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   virtual ~PopAccount();

kmail/quotajobs.h

@@ -137,7 +137,7 @@ GetStorageQuotaJob* getStorageQuota( KIO::Slave* slave, const KURL& url );
 class GetQuotarootJob : public KIO::SimpleJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   GetQuotarootJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo );
 
@@ -164,7 +164,7 @@ protected slots:
 class GetStorageQuotaJob : public KIO::Job
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   GetStorageQuotaJob( KIO::Slave* slave, const KURL& url );
 

kmail/recipientseditor.h

@@ -72,7 +72,7 @@ class Recipient
 class RecipientComboBox : public TQComboBox
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     RecipientComboBox( TQWidget *parent );
 
@@ -86,7 +86,7 @@ class RecipientComboBox : public TQComboBox
 class RecipientLineEdit : public KMLineEdit
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     RecipientLineEdit( TQWidget * parent ) :
       KMLineEdit( true, parent ) {}
@@ -103,7 +103,7 @@ class RecipientLineEdit : public KMLineEdit
 class RecipientLine : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     RecipientLine( TQWidget *parent );
 
@@ -173,7 +173,7 @@ class RecipientLine : public TQWidget
 class RecipientsView : public TQScrollView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     RecipientsView( TQWidget *parent );
 
@@ -267,7 +267,7 @@ class RecipientsToolTip : public TQToolTip
 class SideWidget : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     SideWidget( RecipientsView *view, TQWidget *parent );
     ~SideWidget();
@@ -299,7 +299,7 @@ class SideWidget : public TQWidget
 class RecipientsEditor : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     RecipientsEditor( TQWidget *parent );
     ~RecipientsEditor();

kmail/recipientseditortest.h

@@ -31,7 +31,7 @@ class RecipientsEditor;
 class Composer : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     Composer( TQWidget *parent );
 

kmail/recipientspicker.h

@@ -163,7 +163,7 @@ class RecipientsCollection
 class SearchLine : public KListViewSearchLine
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     SearchLine( TQWidget *parent, KListView *listView );
 
@@ -179,7 +179,7 @@ using namespace KABC;
 class RecipientsPicker : public TQDialog
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     RecipientsPicker( TQWidget *parent );
     ~RecipientsPicker();

kmail/redirectdialog.h

@@ -50,7 +50,7 @@ namespace KMail {
   class RedirectDialog : public KDialogBase
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       /** Constructor

kmail/regexplineedit.h

@@ -47,7 +47,7 @@ namespace KMail {
   class RegExpLineEdit : public TQWidget
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     RegExpLineEdit( const TQString &str, TQWidget *parent = 0,

kmail/renamejob.h

@@ -51,7 +51,7 @@ class CopyFolderJob;
 class RenameJob : public FolderJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /**
    * Create a new job

kmail/searchjob.h

@@ -53,7 +53,7 @@ class ImapAccountBase;
 class SearchJob : public FolderJob
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   /**
    * Creates a new job

kmail/searchwindow.h

@@ -68,7 +68,7 @@ namespace KMail {
 class SearchWindow: public KDialogBase, virtual public KXMLGUIClient
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   /**

kmail/secondarywindow.h

@@ -44,7 +44,7 @@ namespace KMail {
   class SecondaryWindow : public KMainWindow
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SecondaryWindow( const char * name = 0 );

kmail/sieveconfig.h

@@ -87,7 +87,7 @@ namespace KMail {
 
   class SieveConfigEditor : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     SieveConfigEditor( TQWidget * parent=0, const char * name=0 );
 

kmail/sievedebugdialog.h

@@ -50,7 +50,7 @@ class SieveJob;
 class SieveDebugDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     SieveDebugDialog( TQWidget *parent = 0, const char *name = 0 );

kmail/sievejob.h

@@ -33,7 +33,7 @@ namespace KMail {
 
   class SieveJob : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   protected:
     enum Command { Get, Put, Activate, Deactivate, SearchActive, List, Delete };
     SieveJob( const KURL & url, const TQString & script,

kmail/signatureconfigurator.h

@@ -33,7 +33,7 @@ namespace KMail {
 
   class SignatureConfigurator : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     SignatureConfigurator( TQWidget * parent=0, const char * name=0 );
     virtual ~SignatureConfigurator();

kmail/simplestringlisteditor.h

@@ -47,7 +47,7 @@ class TQPushButton;
 
 class SimpleStringListEditor : public TQWidget {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   enum ButtonCode {
     None = 0x00, Add = 0x01,

kmail/snippetdlg.h

@@ -19,7 +19,7 @@ class KShortcut;
 class SnippetDlg : public SnippetDlgBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SnippetDlg( KActionCollection* ac, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );

kmail/snippetitem.h

@@ -33,7 +33,7 @@ class SnippetItem : public TQObject, public TQListViewItem {
 friend class SnippetGroup;
 
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     SnippetItem(TQListViewItem * parent, TQString name, TQString text);
 

kmail/snippetsettings.h

@@ -29,7 +29,7 @@ same named .ui file
 class SnippetSettings : public SnippetSettingsBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     SnippetSettings(TQWidget *parent = 0, const char *name = 0);
     SnippetSettings(SnippetWidget * w, TQWidget *parent = 0, const char *name = 0);

kmail/snippetwidget.h

@@ -45,7 +45,7 @@ tooltips which contains the text of the snippet
 class SnippetWidget : public KListView, public TQToolTip
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* parent = 0);

kmail/subscriptiondialog.h

@@ -47,7 +47,7 @@ namespace KMail {
   class SubscriptionDialogBase : public KSubscription
   {
     Q_OBJECT
-  TQ_OBJECT
+  
 
     public:
       SubscriptionDialogBase( TQWidget *parent,
@@ -128,7 +128,7 @@ namespace KMail {
   class SubscriptionDialog : public SubscriptionDialogBase
   {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
 
       SubscriptionDialog( TQWidget *parent,

kmail/templateparser.h

@@ -54,7 +54,7 @@ class KProcess;
 class TemplateParser : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum Mode {

kmail/templatesconfiguration.h

@@ -29,7 +29,7 @@
 class TemplatesConfiguration : public TemplatesConfigurationBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
 

kmail/templatesinsertcommand.h

@@ -30,7 +30,7 @@ class KActionMenu;
 class TemplatesInsertCommand : public TQPushButton
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     TemplatesInsertCommand( TQWidget *parent, const char *name = 0 );

kmail/tests/messagedicttests.h

@@ -14,7 +14,7 @@ class KMDict;
 class MessageDictTester : public KUnitTest::SlotTester
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public slots:
     void setUp();

kmail/tests/mimelibtests.h

@@ -26,7 +26,7 @@ class DwString;
 class MimeLibTester : public KUnitTest::SlotTester
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public slots:
   void setUp();

kmail/tests/utiltests.h

@@ -12,7 +12,7 @@
 class UtilTester : public KUnitTest::SlotTester
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public slots:
   void setUp();

kmail/treebase.h

@@ -33,7 +33,7 @@ class TreeItemBase;
 class TreeBase : public KListView
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
     TreeBase( TQWidget * parent, KMFolderTree *folderTree,
         const TQString &preSelection, bool mustBeReadWrite );

kmail/twindowpositioner.h

@@ -28,7 +28,7 @@ class TQWindow;
 class KWindowPositioner : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     enum Mode { Right, Bottom };
 

kmail/undostack.h

@@ -44,7 +44,7 @@ public:
 class UndoStack : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   UndoStack(int size);

kmail/vacation.h

@@ -37,7 +37,7 @@ namespace KMail {
 
   class Vacation : public TQObject {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     Vacation( TQObject * parent=0, bool checkOnly = false, const char * name=0 );
     virtual ~Vacation();

kmail/vacationdialog.h

@@ -36,7 +36,7 @@ namespace KMail {
 
   class VacationDialog : public KDialogBase {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     VacationDialog( const TQString & caption, TQWidget * parent=0,
 		    const char * name=0, bool modal=true );

kmail/vcardviewer.h

@@ -37,7 +37,7 @@ namespace KMail {
 class VCardViewer : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
 #if defined(KABC_VCARD_ENCODING_FIX)
     VCardViewer( TQWidget *parent, const TQByteArray &vCard, const char *name );

kmail/xfaceconfigurator.h

@@ -31,7 +31,7 @@ namespace KMail {
 
   class XFaceConfigurator : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     XFaceConfigurator( TQWidget * parent=0, const char * name=0 );
     virtual ~XFaceConfigurator();

kmailcvt/kimportpage.h

@@ -22,7 +22,7 @@
 
 class KImportPage : public KImportPageDlg  {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KImportPage(TQWidget *parent=0, const char *name=0);
 	~KImportPage();

kmailcvt/kmailcvt.h

@@ -27,7 +27,7 @@
 /** KMailCVT is the base class of the project */
 class KMailCVT : public KWizard {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KMailCVT(TQWidget* parent=0, const char *name=0);
 	~KMailCVT();

kmailcvt/kselfilterpage.h

@@ -25,7 +25,7 @@ template <class T> class TQPtrList;
 
 class KSelFilterPage : public KSelFilterPageDlg  {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KSelFilterPage(TQWidget *parent=0, const char *name=0);
 	~KSelFilterPage();

kmobile/devices/gnokii/gnokii_mobile.h

@@ -30,7 +30,7 @@
 class KMobileGnokii : public KMobileDevice
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KMobileGnokii( TQObject *obj=0, const char *name=0, const TQStringList &args=TQStringList() );
     ~KMobileGnokii();

kmobile/devices/gnokii/gnokiiconfig.h

@@ -26,7 +26,7 @@
 class GnokiiConfig : public GnokiiConfigUI
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     GnokiiConfig( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~GnokiiConfig();

kmobile/devices/skeleton/skeleton.h

@@ -29,7 +29,7 @@
 class KMobileSkeleton : public KMobileDevice
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KMobileSkeleton( TQObject *obj=0, const char *name=0, const TQStringList &args=TQStringList() );
     ~KMobileSkeleton();

kmobile/kmobile.h

@@ -23,7 +23,7 @@ class SystemTray;
 class KMobile : public KMainWindow
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     /**
      * Default Constructor

kmobile/kmobileclient.h

@@ -11,7 +11,7 @@
 class KDE_EXPORT KMobileClient : public DCOPClient
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KMobileClient();
     virtual ~KMobileClient();

kmobile/kmobiledevice.h

@@ -65,7 +65,7 @@ class KConfig;
 class KDE_EXPORT KMobileDevice : public KLibFactory
 {
     Q_OBJECT
-    TQ_OBJECT
+    
     friend class KMobileView;
 
 public:

kmobile/kmobileitem.h

@@ -13,7 +13,7 @@
 class KMobileItem : public TQObject, public TQIconViewItem 
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     friend class KMobileView;
 public:
     KMobileItem(TQIconView *parent, KConfig *config, KService::Ptr service);

kmobile/kmobileview.h

@@ -23,7 +23,7 @@ class KMobileItem;
 class KDE_EXPORT KMobileView : public TQIconView, public kmobileIface
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KMobileView(TQWidget *parent, KConfig *_config);
     virtual ~KMobileView();

kmobile/pref.h

@@ -14,7 +14,7 @@ class KMobilePrefPageTwo;
 class KMobilePreferences : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KMobilePreferences();
 
@@ -26,7 +26,7 @@ private:
 class KMobilePrefPageOne : public TQFrame
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KMobilePrefPageOne(TQWidget *parent = 0);
 };
@@ -34,7 +34,7 @@ public:
 class KMobilePrefPageTwo : public TQFrame
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KMobilePrefPageTwo(TQWidget *parent = 0);
 };

kmobile/systemtray.h

@@ -28,7 +28,7 @@ class KAction;
 class SystemTray : public KSystemTray
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     SystemTray(KMainWindow *parent = 0, const char *name = 0);

knode/articlewidget.h

@@ -53,7 +53,7 @@ class CSSHelper;
 class ArticleWidget : public TQWidget, public KNJobConsumer {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     /// Construct a new article widget

knode/headerview.h

@@ -27,7 +27,7 @@ class KNHdrViewItem;
 class KNHeaderView : public KListView  {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   friend class KNHdrViewItem;
 

knode/knaccountmanager.h

@@ -30,7 +30,7 @@ class KNServerInfo;
 class KNAccountManager : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNAccountManager(KNGroupManager *gm, TQObject * parent=0, const char * name=0);

knode/knapplication.h

@@ -22,7 +22,7 @@
 class KNApplication : public KUniqueApplication
 {
     Q_OBJECT
-  TQ_OBJECT
+  
   public:
     KNApplication(): KUniqueApplication() { };
 

knode/knarticlefactory.h

@@ -39,7 +39,7 @@ namespace KNConfig {
 class KNArticleFactory : public TQObject , public KNJobConsumer {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum replyType { RTgroup, RTmail, RTboth };
@@ -97,7 +97,7 @@ class KNArticleFactory : public TQObject , public KNJobConsumer {
 class KNSendErrorDialog : public KDialogBase  {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNSendErrorDialog();

knode/knarticlemanager.h

@@ -39,7 +39,7 @@ class KNJobData;
 class KNArticleManager : public TQObject, public KNJobConsumer {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNArticleManager();

knode/knarticlewindow.h

@@ -27,7 +27,7 @@ namespace KNode {
 class KNArticleWindow : public KMainWindow  {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNArticleWindow(KNArticle *art);

knode/kncollectionview.h

@@ -27,7 +27,7 @@ class KNCollectionViewItem;
 class KNCollectionView : public KFolderTree {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNCollectionView(TQWidget *parent, const char *name = 0);

knode/kncomposer.h

@@ -44,7 +44,7 @@ class SpellingFilter;
 class KNComposer : public KMainWindow , virtual public KNodeComposerIface {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     enum composerResult { CRsendNow, CRsendLater, CRdelAsk,
@@ -252,7 +252,7 @@ class KNComposer::ComposerView  : public TQSplitter {
 class KNComposer::Editor : public KEdit {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     Editor(KNComposer::ComposerView *_composerView, KNComposer *_composer, TQWidget *parent=0, char *name=0);
@@ -305,7 +305,7 @@ private:
 class KNComposer::AttachmentView : public KListView {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AttachmentView(TQWidget *parent, char *name=0);
@@ -333,7 +333,7 @@ class KNComposer::AttachmentViewItem : public KListViewItem {
 class KNComposer::AttachmentPropertiesDlg : public KDialogBase {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AttachmentPropertiesDlg( KNAttachment *a, TQWidget *p=0, const char *n=0);
@@ -358,7 +358,7 @@ class KNComposer::AttachmentPropertiesDlg : public KDialogBase {
 class KNLineEdit : public KABC::AddressLineEdit
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     typedef KABC::AddressLineEdit KNLineEditInherited;
 public:
 
@@ -378,7 +378,7 @@ private:
 class KNLineEditSpell : public KNLineEdit
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KNLineEditSpell(KNComposer::ComposerView *_composerView, bool useCompletion,TQWidget * parent, const char * name = 0);
     void highLightWord( unsigned int length, unsigned int pos );

knode/knconfig.h

@@ -66,7 +66,7 @@ class Base {
 class KDE_EXPORT Identity : public TQObject, public Base {
 
 Q_OBJECT
-  TQ_OBJECT
+  
 
   friend class IdentityWidget;
 

knode/knconfigmanager.h

@@ -27,7 +27,7 @@ class KNConfigDialog;
 class KNConfigManager : TQObject {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNConfigManager(TQObject *p=0, const char *n=0);
@@ -72,7 +72,7 @@ class KNConfigManager : TQObject {
 class KNConfigDialog : public KCMultiDialog {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNConfigDialog(TQWidget *p=0, const char *n=0);

knode/knconfigpages.h

@@ -31,7 +31,7 @@ namespace KNConfig {
  */
 class KDE_EXPORT BasePageWithTabs : public KCModule {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     BasePageWithTabs( TQWidget * parent=0, const char * name=0 );
     ~BasePageWithTabs() {};
@@ -52,7 +52,7 @@ class KDE_EXPORT BasePageWithTabs : public KCModule {
 // accounts page
 class AccountsPage : public BasePageWithTabs {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AccountsPage(TQWidget *parent = 0, const char *name = 0);
@@ -62,7 +62,7 @@ class AccountsPage : public BasePageWithTabs {
 // read news page
 class KDE_EXPORT ReadNewsPage : public BasePageWithTabs {
   Q_OBJECT
-  TQ_OBJECT
+  
  
   public:
     ReadNewsPage(TQWidget *parent = 0, const char *name = 0);
@@ -71,7 +71,7 @@ class KDE_EXPORT ReadNewsPage : public BasePageWithTabs {
 // post news page
 class KDE_EXPORT PostNewsPage : public BasePageWithTabs {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PostNewsPage(TQWidget *parent = 0, const char *name = 0);

knode/knconfigwidgets.h

@@ -66,7 +66,7 @@ namespace KNConfig {
 class KDE_EXPORT IdentityWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     IdentityWidget(Identity *d, TQWidget *p=0, const char *n=0);
@@ -108,7 +108,7 @@ class KDE_EXPORT IdentityWidget : public KCModule {
 class KDE_EXPORT NntpAccountListWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     NntpAccountListWidget(TQWidget *p=0, const char *n=0);
@@ -156,7 +156,7 @@ class KDE_EXPORT NntpAccountListWidget : public KCModule {
 class KDE_EXPORT NntpAccountConfDialog : public KDialogBase  {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     NntpAccountConfDialog(KNNntpAccount* acc, TQWidget *p=0, const char *n=0);
@@ -198,7 +198,7 @@ class KDE_EXPORT NntpAccountConfDialog : public KDialogBase  {
 class KDE_EXPORT SmtpAccountWidget : public SmtpAccountWidgetBase {
 
 Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     SmtpAccountWidget(TQWidget *p=0, const char *n=0);
@@ -220,7 +220,7 @@ Q_OBJECT
 class KDE_EXPORT AppearanceWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     AppearanceWidget(TQWidget *p=0, const char *n=0);
@@ -349,7 +349,7 @@ class KDE_EXPORT ReadNewsNavigationWidget : public KCModule {
 class KDE_EXPORT ReadNewsViewerWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ReadNewsViewerWidget(ReadNewsViewer *d, TQWidget *p=0, const char *n=0);
@@ -376,7 +376,7 @@ class KDE_EXPORT ReadNewsViewerWidget : public KCModule {
 class KDE_EXPORT DisplayedHeadersWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     DisplayedHeadersWidget(DisplayedHeaders *d, TQWidget *p=0, const char *n=0);
@@ -423,7 +423,7 @@ class KDE_EXPORT DisplayedHeadersWidget : public KCModule {
 class KDE_EXPORT DisplayedHeaderConfDialog : public KDialogBase {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     DisplayedHeaderConfDialog(KNDisplayedHeader *h, TQWidget *p=0, char *n=0);
@@ -448,7 +448,7 @@ class KDE_EXPORT DisplayedHeaderConfDialog : public KDialogBase {
 class KDE_EXPORT ScoringWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     ScoringWidget(Scoring *d, TQWidget *p=0, const char *n=0);
@@ -469,7 +469,7 @@ class KDE_EXPORT ScoringWidget : public KCModule {
 class KDE_EXPORT FilterListWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     FilterListWidget(TQWidget *p=0, const char *n=0);
@@ -535,7 +535,7 @@ class KDE_EXPORT FilterListWidget : public KCModule {
 class KDE_EXPORT PostNewsTechnicalWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PostNewsTechnicalWidget(PostNewsTechnical *d, TQWidget *p=0, const char *n=0);
@@ -589,7 +589,7 @@ class KDE_EXPORT XHeaderConfDialog : public KDialogBase {
 class KDE_EXPORT PostNewsComposerWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PostNewsComposerWidget(PostNewsComposer *d, TQWidget *p=0, const char *n=0);
@@ -635,7 +635,7 @@ class KDE_EXPORT PostNewsSpellingWidget : public KCModule {
 class KDE_EXPORT PrivacyWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     PrivacyWidget(TQWidget *p=0, const char *n=0);
@@ -655,7 +655,7 @@ class KDE_EXPORT PrivacyWidget : public KCModule {
 class KDE_EXPORT GroupCleanupWidget : public TQWidget {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     GroupCleanupWidget( Cleanup *data, TQWidget *parent = 0, const char *name = 0 );
@@ -684,7 +684,7 @@ class KDE_EXPORT GroupCleanupWidget : public TQWidget {
 class KDE_EXPORT CleanupWidget : public KCModule {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CleanupWidget(TQWidget *p=0, const char *n=0);
@@ -717,7 +717,7 @@ class KDE_EXPORT CleanupWidget : public KCModule {
 
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     CacheWidget(Cache *d, TQWidget *p=0, const char *n=0);

knode/knconvert.h

@@ -35,7 +35,7 @@ class KProcess;
 class KDE_EXPORT KNConvert : public TQDialog {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     static bool needToConvert(const TQString &oldVersion);

knode/knfilterconfigwidget.h

@@ -27,7 +27,7 @@ class KNRangeFilterWidget;
 class KNFilterConfigWidget : public TQTabWidget  {
 
   Q_OBJECT
-  TQ_OBJECT
+  
   
   friend class KNFilterDialog;
   friend class KNSearchDialog;

knode/knfilterdialog.h

@@ -29,7 +29,7 @@ class TQCheckBox;
 class KNFilterDialog : public KDialogBase {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   friend class KNFilterManager;
 

knode/knfiltermanager.h

@@ -31,7 +31,7 @@ class KNFilterDialog;
 class KNFilterSelectAction : public KActionMenu
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNFilterSelectAction( const TQString& text, const TQString& pix,
@@ -54,7 +54,7 @@ class KNFilterSelectAction : public KActionMenu
 class KNFilterManager : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNFilterManager(TQObject * parent = 0, const char * name = 0);

knode/knfoldermanager.h

@@ -26,7 +26,7 @@ class KNCleanUp;
 class KNFolderManager : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNFolderManager(KNArticleManager *a);

knode/kngroupbrowser.h

@@ -35,7 +35,7 @@ class KNNntpAccount;
 class KNGroupBrowser : public KDialogBase {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     class CheckItem : public TQCheckListItem {

knode/kngroupdialog.h

@@ -23,7 +23,7 @@
 class KNGroupDialog : public KNGroupBrowser {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     KNGroupDialog(TQWidget *parent, KNNntpAccount *a);

knode/kngroupmanager.h

@@ -78,7 +78,7 @@ class KNGroupListData : public KNJobItem {
 class KNGroupManager : public TQObject , public KNJobConsumer {
 
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public: