Remove spurious TQ_OBJECT instances

11 years ago · 2375f73a4e
parent c9d18751d0
commit 2375f73a4e
112 changed files with 184 additions and 184 deletions
--- a/amarok/src/actionclasses.h
+++ b/amarok/src/actionclasses.h
@ -24,7 +24,7 @@ namespace Amarok
    class Menu : public PrettyPopupMenu
    {
        Q_OBJECT
-  TQ_OBJECT
+  
        public:
            static Menu *instance();
            static KPopupMenu *helpMenu( TQWidget *parent = 0 );
@ -155,7 +155,7 @@ namespace Amarok
    class BurnMenu : public KPopupMenu
    {
            Q_OBJECT
-  TQ_OBJECT
+  

        public:
            enum MenuIds {
@ -184,7 +184,7 @@ namespace Amarok
    class StopMenu : public KPopupMenu
    {
            Q_OBJECT
-  TQ_OBJECT
+  

        public:
            enum MenuIds {
--- a/amarok/src/amarokcore/amarokdcophandler.h
+++ b/amarok/src/amarokcore/amarokdcophandler.h
@ -30,7 +30,7 @@ namespace Amarok
 class DcopPlayerHandler : public TQObject, virtual public AmarokPlayerInterface
 {
      Q_OBJECT
-  TQ_OBJECT
+  

   public:
      DcopPlayerHandler();
@ -117,7 +117,7 @@ class DcopPlayerHandler : public TQObject, virtual public AmarokPlayerInterface
 class DcopPlaylistHandler : public TQObject, virtual public AmarokPlaylistInterface
 {
        Q_OBJECT
-  TQ_OBJECT
+  

   public:
      DcopPlaylistHandler();
@ -148,7 +148,7 @@ class DcopPlaylistHandler : public TQObject, virtual public AmarokPlaylistInterf
 class DcopPlaylistBrowserHandler : public TQObject, virtual public AmarokPlaylistBrowserInterface
 {
        Q_OBJECT
-  TQ_OBJECT
+  

   public:
      DcopPlaylistBrowserHandler();
@ -163,7 +163,7 @@ class DcopPlaylistBrowserHandler : public TQObject, virtual public AmarokPlaylis
 class DcopContextBrowserHandler : public TQObject, virtual public AmarokContextBrowserInterface
 {
        Q_OBJECT
-  TQ_OBJECT
+  

   public:
      DcopContextBrowserHandler();
@ -179,7 +179,7 @@ class DcopContextBrowserHandler : public TQObject, virtual public AmarokContextB
 class DcopCollectionHandler : public TQObject, virtual public AmarokCollectionInterface
 {
   Q_OBJECT
-  TQ_OBJECT
+  

   public:
       DcopCollectionHandler();
@ -213,7 +213,7 @@ class DcopCollectionHandler : public TQObject, virtual public AmarokCollectionIn
 class DcopScriptHandler : public TQObject, virtual public AmarokScriptInterface
 {
   Q_OBJECT
-  TQ_OBJECT
+  

   public:
       DcopScriptHandler();
@ -233,7 +233,7 @@ class DcopScriptHandler : public TQObject, virtual public AmarokScriptInterface
 class DcopDevicesHandler : public TQObject, virtual public AmarokDevicesInterface
 {
   Q_OBJECT
-  TQ_OBJECT
+  

   public:
       DcopDevicesHandler();
@ -248,7 +248,7 @@ class DcopDevicesHandler : public TQObject, virtual public AmarokDevicesInterfac
 class DcopMediaBrowserHandler : public TQObject, virtual public AmarokMediaBrowserInterface
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        DcopMediaBrowserHandler();
--- a/amarok/src/analyzers/analyzerbase.h
+++ b/amarok/src/analyzers/analyzerbase.h
@ -76,7 +76,7 @@ protected:
 class Base2D : public Base<TQWidget>
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
    const TQPixmap *background() const { return &m_background; }
    const TQPixmap *canvas()     const { return &m_canvas; }
@ -115,7 +115,7 @@ private:
 class Base3D : public Base<TQGLWidget>
 {
  Q_OBJECT
-  TQ_OBJECT
+  
 #ifdef HAVE_TQGLWIDGET
 protected:
    Base3D( TQWidget*, uint, uint = 7 );
--- a/amarok/src/analyzers/boomanalyzer.h
+++ b/amarok/src/analyzers/boomanalyzer.h
@ -14,7 +14,7 @@
 class BoomAnalyzer : public Analyzer::Base2D
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
    BoomAnalyzer( TQWidget* );

--- a/amarok/src/app.h
+++ b/amarok/src/app.h
@ -42,7 +42,7 @@ class MediaDeviceManager;
 class LIBAMAROK_EXPORT App : public KApplication, public EngineObserver
 {
    Q_OBJECT
-  TQ_OBJECT
+  
    public:
        App();
       ~App();
--- a/amarok/src/browserbar.h
+++ b/amarok/src/browserbar.h
@ -33,7 +33,7 @@ class TQVBox;
 class BrowserBar : public TQWidget, public EngineObserver
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    BrowserBar( TQWidget *parent );
--- a/amarok/src/clicklineedit.h
+++ b/amarok/src/clicklineedit.h
@ -33,7 +33,7 @@
 class ClickLineEdit : public KLineEdit
 {
    Q_OBJECT
-  TQ_OBJECT
+  
    TQ_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage )
    public:
        ClickLineEdit( const TQString &msg, TQWidget *parent, const char* name = 0 );
--- a/amarok/src/collectionbrowser.h
+++ b/amarok/src/collectionbrowser.h
@ -59,7 +59,7 @@ namespace CollectionBrowserIds
 class CollectionBrowser: public TQVBox
 {
    Q_OBJECT
-  TQ_OBJECT
+  
    friend class CollectionView;

    public:
@ -192,7 +192,7 @@ class CollectionItem : public KListViewItem {
 class CollectionView : public KListView, public DropProxyTarget
 {
    Q_OBJECT
-  TQ_OBJECT
+  
    friend class CollectionBrowser;

    public:
@ -381,7 +381,7 @@ class CollectionView : public KListView, public DropProxyTarget
 class OrganizeCollectionDialogBase : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
    public:
    OrganizeCollectionDialogBase( TQWidget *parent=0, const char *name=0, bool modal=true,
            const TQString &caption=TQString(),
--- a/amarok/src/collectiondb.h
+++ b/amarok/src/collectiondb.h
@ -195,7 +195,7 @@ class PostgresqlConnection : public DbConnection
 class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver
 {
    Q_OBJECT
-    TQ_OBJECT
+    

    friend class SimilarArtistsInsertionJob;

@ -655,7 +655,7 @@ class INotify : public ThreadManager::DependentJob
 #endif // Q_MOC_RUN
 {
    Q_OBJECT
-    TQ_OBJECT
+    

    public:
        INotify( CollectionDB *parent, int fd );
--- a/amarok/src/collectionscanner/collectionscanner.h
+++ b/amarok/src/collectionscanner/collectionscanner.h
@ -42,7 +42,7 @@ typedef TQMap<TQString, TQString> AttributeMap;
 class CollectionScanner : public KApplication
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    CollectionScanner( const TQStringList& folders,
--- a/amarok/src/collectionscanner/collectionscannerdcophandler.h
+++ b/amarok/src/collectionscanner/collectionscannerdcophandler.h
@ -27,7 +27,7 @@
 class DcopCollectionScannerHandler : public TQObject, virtual public CollectionScannerInterface
 {
      Q_OBJECT
-  TQ_OBJECT
+  

   public:
      DcopCollectionScannerHandler();
--- a/amarok/src/columnlist.h
+++ b/amarok/src/columnlist.h
@ -30,7 +30,7 @@ template<class T> class TQValueList;
 class ColumnList: public TQHBox
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    ColumnList( TQWidget *parent = 0, const char *name = 0 );
    TQValueList<int> visibleColumns() const;
@ -57,7 +57,7 @@ private:
 class ColumnsDialog: public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    static void display();

--- a/amarok/src/configdialog.h
+++ b/amarok/src/configdialog.h
@ -34,7 +34,7 @@ class MediumPluginManager;
 class AmarokConfigDialog : public KConfigDialog
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        AmarokConfigDialog( TQWidget *parent, const char* name, KConfigSkeleton *config );
--- a/amarok/src/contextbrowser.h
+++ b/amarok/src/contextbrowser.h
@ -39,7 +39,7 @@ namespace KIO { class Job; class TransferJob; }
 class ContextBrowser : public KTabWidget, public EngineObserver
 {
    Q_OBJECT
-  TQ_OBJECT
+  

        friend class CurrentTrackJob;
        friend class Amarok::DcopContextBrowserHandler;
--- a/amarok/src/coverfetcher.h
+++ b/amarok/src/coverfetcher.h
@ -41,7 +41,7 @@ class CoverFetcher : public TQObject
 {
    friend class EditSearchDialog;
    Q_OBJECT
-  TQ_OBJECT
+  

    static const uint MAX_COVERS_CHOICE = 10;

--- a/amarok/src/covermanager.h
+++ b/amarok/src/covermanager.h
@ -28,7 +28,7 @@ class PixmapViewer;
 class CoverManager : public TQSplitter
 {
        Q_OBJECT
-  TQ_OBJECT
+  

        static CoverManager *s_instance;

@ -111,7 +111,7 @@ class CoverManager : public TQSplitter
 class CoverView : public KIconView
 {
        Q_OBJECT
-  TQ_OBJECT
+  

    public:
        CoverView( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
@ -154,7 +154,7 @@ class CoverViewItem : public KIconViewItem

 class CoverViewDialog : public TQDialog {
        Q_OBJECT
-  TQ_OBJECT
+  

    public:
        CoverViewDialog(const TQString& artist, const TQString& album, TQWidget *parent);
--- a/amarok/src/cuefile.h
+++ b/amarok/src/cuefile.h
@ -52,7 +52,7 @@ class CueFileItem {
 class CueFile : public TQObject, public TQMap<long, CueFileItem>, public EngineObserver
 {
        Q_OBJECT
-  TQ_OBJECT
+  

    public:
        static CueFile *instance();
--- a/amarok/src/database_refactor/collectiondb.h
+++ b/amarok/src/database_refactor/collectiondb.h
@ -44,7 +44,7 @@ class DbConnectionPool : TQPtrQueue<DbConnection>
 class CollectionDB : public TQObject, public EngineObserver
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    friend class SimilarArtistsInsertionJob;

--- a/amarok/src/deletedialog.h
+++ b/amarok/src/deletedialog.h
@ -31,7 +31,7 @@ class TQWidgetStack;
 class DeleteWidget : public DeleteDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    DeleteWidget(TQWidget *parent = 0, const char *name = 0);
@ -45,7 +45,7 @@ protected slots:
 class DeleteDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    DeleteDialog(TQWidget *parent, const char *name = "delete_dialog");
--- a/amarok/src/devicemanager.h
+++ b/amarok/src/devicemanager.h
@ -33,7 +33,7 @@ class DeviceManager : public TQObject
 {

    Q_OBJECT
-  TQ_OBJECT
+  
    public:
        DeviceManager();
        ~DeviceManager();
--- a/amarok/src/directorylist.h
+++ b/amarok/src/directorylist.h
@ -71,7 +71,7 @@ namespace Collection { //just to keep it out of the global namespace
 class Item : public TQObject, public TQCheckListItem
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
    Item( TQListView *parent );
    Item( TQListViewItem *parent, const KURL &url , bool full_disable=false );
--- a/amarok/src/editfilterdialog.h
+++ b/amarok/src/editfilterdialog.h
@ -23,7 +23,7 @@ class KComboBox;
 class EditFilterDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
    public:
        EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, const TQString &text = "" );
        ~EditFilterDialog();
--- a/amarok/src/engine/helix/helix-configdialog.h
+++ b/amarok/src/engine/helix/helix-configdialog.h
@ -28,7 +28,7 @@ class HelixEngine;
 class HelixConfigEntry : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
   HelixConfigEntry( TQWidget *parent, Amarok::PluginConfig*,
                     int row, const TQString & description, const char *defaultvalue, const TQString & tooltip );
@ -55,7 +55,7 @@ private:
 class HelixSoundDevice : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
   HelixSoundDevice( TQWidget *parent, Amarok::PluginConfig *config, int &row, HelixEngine *engine );
   bool save();
--- a/amarok/src/engine/helix/helix-engine.h
+++ b/amarok/src/engine/helix/helix-engine.h
@ -22,7 +22,7 @@ struct timeval;
 class HelixEngine : public Engine::Base, public PlayerControl
 {
   Q_OBJECT
-  TQ_OBJECT
+  

 public:
   HelixEngine();
--- a/amarok/src/engine/kdemm/kdemmengine.h
+++ b/amarok/src/engine/kdemm/kdemmengine.h
@ -37,7 +37,7 @@ namespace KDE { namespace Multimedia { class SimplePlayer; } }
 class KDEMMEngine : public Engine::Base
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        KDEMMEngine();
--- a/amarok/src/engine/mas/masengine.h
+++ b/amarok/src/engine/mas/masengine.h
@ -39,7 +39,7 @@ class KURL;
 class MasEngine : public Engine::Base
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        MasEngine();
--- a/amarok/src/engine/nmm/HostList.h
+++ b/amarok/src/engine/nmm/HostList.h
@ -32,7 +32,7 @@ class HostListItem;
 class HostList : public KListView
 {
  Q_OBJECT
-  TQ_OBJECT
+  

  public:
    HostList( TQWidget*, const char* );
--- a/amarok/src/engine/nmm/ServerregistryPing.h
+++ b/amarok/src/engine/nmm/ServerregistryPing.h
@ -36,7 +36,7 @@ class ServerregistryPing
    : public TQSocket
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        ServerregistryPing(const TQString & host, TQ_UINT16 port = 22801);
--- a/amarok/src/engine/nmm/nmm_configdialog.h
+++ b/amarok/src/engine/nmm/nmm_configdialog.h
@ -38,7 +38,7 @@ class NmmLocation;
 class NmmConfigDialog : public Amarok::PluginConfig
 {
  Q_OBJECT
-  TQ_OBJECT
+  

  public:
    NmmConfigDialog();
--- a/amarok/src/engine/nmm/nmm_engine.h
+++ b/amarok/src/engine/nmm/nmm_engine.h
@ -45,7 +45,7 @@ using namespace NMM;
 class NmmEngine : public Engine::Base
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
    NmmEngine();
    ~NmmEngine();
--- a/amarok/src/engine/xine/xine-config.h
+++ b/amarok/src/engine/xine/xine-config.h
@ -24,7 +24,7 @@ class KLineEdit;
 class XineGeneralEntry : public TQObject
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        virtual void save() = 0;
@ -64,7 +64,7 @@ void saveXineEntry(Functor& storeEntry, T val, const TQString& key, xine_t *xine
 class XineStrEntry : public XineGeneralEntry
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        XineStrEntry(TQLineEdit* input, const TQCString & key, xine_t *m_xine, XineConfigDialog* xcf);
@ -81,7 +81,7 @@ class XineStrEntry : public XineGeneralEntry
 class XineIntEntry : public XineGeneralEntry
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        XineIntEntry(KIntSpinBox* input, const TQCString & key, xine_t *xine, XineConfigDialog* xcf);
@ -99,7 +99,7 @@ class XineIntEntry : public XineGeneralEntry
 class XineEnumEntry : public XineIntEntry
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    XineEnumEntry(TQComboBox* input, const TQCString & key, xine_t *xine, XineConfigDialog* xcf);
 };
@ -108,7 +108,7 @@ public:
 class XineConfigDialog : public Amarok::PluginConfig
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        XineConfigDialog( const xine_t* const xine);
--- a/amarok/src/engine/xine/xine-engine.h
+++ b/amarok/src/engine/xine/xine-engine.h
@ -25,7 +25,7 @@ class XineConfigDialog;
 class XineEngine : public Engine::Base
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    friend class Fader;
    friend class OutFader;
--- a/amarok/src/engine/yauap/yauap-engine.h
+++ b/amarok/src/engine/yauap/yauap-engine.h
@ -60,7 +60,7 @@ static DBusHandlerResult signal_handler( DBusConnection *, DBusMessage *, void *
 class yauapEngine : public Engine::Base
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    friend class DBusConnection;

--- a/amarok/src/enginebase.h
+++ b/amarok/src/enginebase.h
@ -61,7 +61,7 @@ namespace Engine
    class LIBAMAROK_EXPORT Base : public TQObject, public Amarok::Plugin
    {
    Q_OBJECT
-  TQ_OBJECT
+  

    signals:
        /** Emitted when end of current track is reached. */
--- a/amarok/src/enginecontroller.h
+++ b/amarok/src/enginecontroller.h
@ -35,7 +35,7 @@ namespace KIO { class Job; }
 class EngineController : public TQObject, public EngineSubject
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    typedef TQMap<TQString, bool>  ExtensionCache;
--- a/amarok/src/equalizerpresetmanager.h
+++ b/amarok/src/equalizerpresetmanager.h
@ -31,7 +31,7 @@ class KListView;
 class EqualizerPresetManager : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        EqualizerPresetManager( TQWidget *parent = 0, const char *name = 0 );
--- a/amarok/src/equalizersetup.h
+++ b/amarok/src/equalizersetup.h
@ -33,7 +33,7 @@ namespace Amarok { class Slider; }
 class EqualizerSetup : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        static EqualizerSetup* instance() { return s_instance ? s_instance : new EqualizerSetup(); }
--- a/amarok/src/filebrowser.h
+++ b/amarok/src/filebrowser.h
@ -51,7 +51,7 @@ class Medium;
 class FileBrowser : public TQVBox
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    enum MenuId { MakePlaylist, SavePlaylist, MediaDevice, AppendToPlaylist, QueueTrack, QueueTracks, SelectAllFiles, BurnCd, MoveToCollection, CopyToCollection, OrganizeFiles, EditTags };

@ -102,7 +102,7 @@ class TQListViewItem;
 class SearchPane : public TQVBox
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    SearchPane( FileBrowser *parent );
--- a/amarok/src/hintlineedit.h
+++ b/amarok/src/hintlineedit.h
@ -10,7 +10,7 @@ class TQWidget;
 class HintLineEdit : public KLineEdit
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    HintLineEdit( const TQString &hint, const TQString &text, TQWidget *parent = 0, const char *name = 0 );
--- a/amarok/src/htmlview.h
+++ b/amarok/src/htmlview.h
@ -16,7 +16,7 @@ class KTempFile;
 class HTMLView : public KHTMLPart
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        HTMLView( TQWidget *parentWidget = 0, const char *widgetname = 0, const bool DNDEnabled = false, const bool JScriptEnabled = true );
--- a/amarok/src/konquisidebar/universalamarok.h
+++ b/amarok/src/konquisidebar/universalamarok.h
@ -41,7 +41,7 @@ class TQDateTime;
 class amarokWidget : public TQVBox
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
    amarokWidget( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );

@ -58,7 +58,7 @@ signals:
 class UniversalAmarok : public KonqSidebarPlugin
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
    UniversalAmarok(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0);

--- a/amarok/src/ktrm.h
+++ b/amarok/src/ktrm.h
@ -122,7 +122,7 @@ typedef TQValueList<KTRMResult> KTRMResultList;
 class KTRMLookup : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  

 signals:
    void sigResult( KTRMResultList, TQString );
--- a/amarok/src/lastfm.h
+++ b/amarok/src/lastfm.h
@ -41,7 +41,7 @@ namespace KIO { class Job; }
 class AmarokHttp : public TQObject
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
    AmarokHttp ( const TQString & hostname, TQ_UINT16 port = 80, TQObject* parent = 0 );
@ -75,7 +75,7 @@ namespace LastFm
    class Controller : public TQObject
    {
        Q_OBJECT
-  TQ_OBJECT
+  

        public:
            static Controller* instance();
@ -111,7 +111,7 @@ namespace LastFm
    class WebService : public TQObject
    {
        Q_OBJECT
-  TQ_OBJECT
+  

        public:
            enum DataType { Artist, Album, Track };
@ -273,7 +273,7 @@ namespace LastFm
    class LoginDialog : public KDialogBase
    {
        Q_OBJECT
-  TQ_OBJECT
+  

        public:
            LoginDialog( TQWidget *parent );
@ -290,7 +290,7 @@ namespace LastFm
    class CustomStationDialog : public KDialogBase
    {
        Q_OBJECT
-  TQ_OBJECT
+  

        public:
            CustomStationDialog( TQWidget *parent );
--- a/amarok/src/magnatunebrowser/magnatunealbumdownloader.h
+++ b/amarok/src/magnatunebrowser/magnatunealbumdownloader.h
@ -36,7 +36,7 @@ This class encapsulates the downloading of an album once all required informatio
 class MagnatuneAlbumDownloader: public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
    MagnatuneAlbumDownloader();

--- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
+++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
@ -36,7 +36,7 @@ A specialized KHTMLPart for displaying html info about a Magnatune artist or alb
 class MagnatuneArtistInfoBox : public KHTMLPart
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    /**
--- a/amarok/src/magnatunebrowser/magnatunebrowser.h
+++ b/amarok/src/magnatunebrowser/magnatunebrowser.h
@ -51,7 +51,7 @@ Implemented as a singleton
 class MagnatuneBrowser : public TQVBox
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    /**
--- a/amarok/src/magnatunebrowser/magnatunedownloaddialog.h
+++ b/amarok/src/magnatunebrowser/magnatunedownloaddialog.h
@ -34,7 +34,7 @@
 class MagnatuneDownloadDialog : public MagnatuneDownloadDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    /**
--- a/amarok/src/magnatunebrowser/magnatunepurchasedialog.h
+++ b/amarok/src/magnatunebrowser/magnatunepurchasedialog.h
@ -26,7 +26,7 @@
 class MagnatunePurchaseDialog : public magnatunePurchaseDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:

--- a/amarok/src/magnatunebrowser/magnatunepurchasehandler.h
+++ b/amarok/src/magnatunebrowser/magnatunepurchasehandler.h
@ -38,7 +38,7 @@ The main class responcible for handelig of purchases from Magnatune.com
 class MagnatunePurchaseHandler : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
    MagnatunePurchaseHandler();
    ~MagnatunePurchaseHandler();
--- a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h
+++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h
@ -28,7 +28,7 @@
 class MagnatuneRedownloadDialog : public magnatuneReDownloadDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    MagnatuneRedownloadDialog( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
--- a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h
+++ b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h
@ -35,7 +35,7 @@ This class handles the redownloading of previously purchased albums

 class MagnatuneRedownloadHandler : public TQObject {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
    MagnatuneRedownloadHandler(TQWidget * parent);

--- a/amarok/src/magnatunebrowser/magnatunexmlparser.h
+++ b/amarok/src/magnatunebrowser/magnatunexmlparser.h
@ -43,7 +43,7 @@ class MagnatuneXmlParser : public ThreadManager::Job
 #endif
 {
    Q_OBJECT
-    TQ_OBJECT
+    

 public:

--- a/amarok/src/mediabrowser.h
+++ b/amarok/src/mediabrowser.h
@ -125,7 +125,7 @@ class LIBAMAROK_EXPORT MediaItem : public KListViewItem
 class MediaQueue : public KListView, public DropProxyTarget
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        MediaQueue(MediaBrowser *parent);
@ -172,7 +172,7 @@ class MediaQueue : public KListView, public DropProxyTarget
 class MediaBrowser : public TQVBox
 {
    Q_OBJECT
-  TQ_OBJECT
+  
    friend class DeviceConfigureDialog;
    friend class MediaDevice;
    friend class MediaView;
@ -280,7 +280,7 @@ class MediaBrowser : public TQVBox
 class MediaView : public KListView
 {
    Q_OBJECT
-  TQ_OBJECT
+  
    friend class MediaBrowser;
    friend class MediaDevice;

@ -328,7 +328,7 @@ class MediaView : public KListView
 class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin
 {
    Q_OBJECT
-  TQ_OBJECT
+  
    friend class DeviceConfigureDialog;
    friend class TransferDialog;
    friend class MediaBrowser;
--- a/amarok/src/mediadevice/daap/daapclient.h
+++ b/amarok/src/mediadevice/daap/daapclient.h
@ -52,7 +52,7 @@ class TQTimer;
 class DaapClient : public MediaDevice
 {
    Q_OBJECT
-  TQ_OBJECT
+  
   public:
        struct ServerInfo
        {
@ -129,7 +129,7 @@ class DaapClient : public MediaDevice
 class ServerItem : public TQObject, public MediaItem
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        ServerItem( TQListView* parent, DaapClient* client, const TQString& ip, TQ_UINT16 port, const TQString& title, const TQString& host );
@ -176,7 +176,7 @@ class DaapDownloader : public ThreadManager::Job
 #endif
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
    DaapDownloader( KURL::List urls );

--- a/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h
+++ b/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h
@ -28,7 +28,7 @@ namespace Daap {
 class ContentFetcher : public TQHttp
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        ContentFetcher( const TQString & hostname, TQ_UINT16 port, const TQString& password, TQObject * parent = 0, const char * name = 0 );
--- a/amarok/src/mediadevice/daap/daapreader/reader.h
+++ b/amarok/src/mediadevice/daap/daapreader/reader.h
@ -55,7 +55,7 @@ namespace Daap
    class Reader : public TQObject
    {
        Q_OBJECT
-  TQ_OBJECT
+  

        public:
            Reader( const TQString& host, TQ_UINT16 port, ServerItem* root,
--- a/amarok/src/mediadevice/daap/daapserver.h
+++ b/amarok/src/mediadevice/daap/daapserver.h
@ -22,7 +22,7 @@ namespace DNSSD {
 class DaapServer : public TQObject
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        DaapServer(TQObject* parent, char* name);
--- a/amarok/src/mediadevice/daap/proxy.h
+++ b/amarok/src/mediadevice/daap/proxy.h
@ -22,7 +22,7 @@ namespace Daap {
    class Proxy : public TQObject
    {
        Q_OBJECT
-  TQ_OBJECT
+  

        public:
            Proxy(KURL stream, DaapClient* client, const char* name);
--- a/amarok/src/mediadevice/generic/genericmediadevice.h
+++ b/amarok/src/mediadevice/generic/genericmediadevice.h
@ -41,7 +41,7 @@ typedef TQMap<GenericMediaItem*, GenericMediaFile*> MediaItemMap;
 class GenericMediaDevice : public MediaDevice
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    friend  class GenericMediaDeviceConfigDialog;

--- a/amarok/src/mediadevice/ifp/ifpmediadevice.h
+++ b/amarok/src/mediadevice/ifp/ifpmediadevice.h
@ -34,7 +34,7 @@ class TransferDialog;
 class IfpMediaDevice : public MediaDevice
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
                          IfpMediaDevice();
--- a/amarok/src/mediadevice/ipod/ipodmediadevice.h
+++ b/amarok/src/mediadevice/ipod/ipodmediadevice.h
@ -52,7 +52,7 @@ class IpodMediaDevice : public MediaDevice
 {
    friend class IpodMediaItem;
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        IpodMediaDevice();
--- a/amarok/src/mediadevice/mtp/mtpmediadevice.h
+++ b/amarok/src/mediadevice/mtp/mtpmediadevice.h
@ -125,7 +125,7 @@ class MtpMediaItem : public MediaItem
 class MtpMediaDevice : public MediaDevice
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        MtpMediaDevice();
--- a/amarok/src/mediadevice/njb/njbmediadevice.h
+++ b/amarok/src/mediadevice/njb/njbmediadevice.h
@ -85,7 +85,7 @@ class NjbMediaItem : public MediaItem
 class NjbMediaDevice : public MediaDevice
 {
    Q_OBJECT
-    TQ_OBJECT
+    

    public:
        NjbMediaDevice();
--- a/amarok/src/mediadevice/riokarma/riokarmamediadevice.h
+++ b/amarok/src/mediadevice/riokarma/riokarmamediadevice.h
@ -73,7 +73,7 @@ class RioKarmaMediaItem : public MediaItem
 class RioKarmaMediaDevice : public MediaDevice
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        RioKarmaMediaDevice();
--- a/amarok/src/mediadevicemanager.h
+++ b/amarok/src/mediadevicemanager.h
@ -31,7 +31,7 @@ class MediaDeviceManager : public TQObject
    //static const uint IFP = 2;

    Q_OBJECT
-  TQ_OBJECT
+  
    public:
        MediaDeviceManager();
        ~MediaDeviceManager();
--- a/amarok/src/mediumpluginmanager.h
+++ b/amarok/src/mediumpluginmanager.h
@ -44,7 +44,7 @@ typedef TQMap<TQString, Medium*> DeletedMap;
 class MediaDeviceConfig : public TQHBox
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        MediaDeviceConfig( Medium *medium, MediumPluginManager *mgr, const bool nographics=false, TQWidget *parent=0, const char *name=0 );
@ -81,7 +81,7 @@ typedef TQValueList<MediaDeviceConfig *> DeviceList;
 class MediumPluginManager : public TQObject
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    friend class DeviceManager;

@ -115,7 +115,7 @@ class MediumPluginManager : public TQObject
 class MediumPluginManagerDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        MediumPluginManagerDialog();
@ -134,7 +134,7 @@ class MediumPluginManagerDialog : public KDialogBase
 class ManualDeviceAdder : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    public:
        ManualDeviceAdder( MediumPluginManager* mdm );
--- a/amarok/src/metabundlesaver.h
+++ b/amarok/src/metabundlesaver.h
@ -27,7 +27,7 @@ namespace TagLib {
 class LIBAMAROK_EXPORT MetaBundleSaver : public TQObject
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
     MetaBundleSaver( MetaBundle *bundle );
    ~MetaBundleSaver();
--- a/amarok/src/moodbar.h
+++ b/amarok/src/moodbar.h
@ -39,7 +39,7 @@ class MetaBundle;
 class Moodbar : public TQObject
 {
  Q_OBJECT
-  TQ_OBJECT
+  
  
 public:
  typedef TQValueVector<TQColor> ColorList;
@ -117,7 +117,7 @@ class KProcess;
 class MoodServer : public TQObject
 {
  Q_OBJECT
-  TQ_OBJECT
+  

 public:
  static MoodServer *instance( void );
--- a/amarok/src/mountpointmanager.h
+++ b/amarok/src/mountpointmanager.h
@ -146,7 +146,7 @@ public:
 */
 class MountPointManager : public TQObject {
 Q_OBJECT
-  TQ_OBJECT
+  

 signals:
    void mediumConnected( int deviceid );
--- a/amarok/src/multitabbar.h
+++ b/amarok/src/multitabbar.h
@ -60,7 +60,7 @@ class DropProxyTarget
 class MultiTabBar: public TQWidget
 {
        Q_OBJECT
-  TQ_OBJECT
+  
    public:
        enum MultiTabBarMode{Horizontal, Vertical};
        enum MultiTabBarPosition{Left, Right, Top, Bottom};
@ -174,7 +174,7 @@ class MultiTabBar: public TQWidget
 class MultiTabBarButton: public TQPushButton
 {
        Q_OBJECT
-  TQ_OBJECT
+  
    public:
        MultiTabBarButton( const TQPixmap& pic, const TQString&, TQPopupMenu *popup,
                           int id, TQWidget *parent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style );
@ -251,7 +251,7 @@ class MultiTabBarButton: public TQPushButton
 class MultiTabBarTab: public MultiTabBarButton
 {
        Q_OBJECT
-  TQ_OBJECT
+  
    public:
        MultiTabBarTab( const TQPixmap& pic, const TQString&, int id, TQWidget *parent,
                        MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style );
--- a/amarok/src/multitabbar_p.h
+++ b/amarok/src/multitabbar_p.h
@ -30,7 +30,7 @@
 class MultiTabBarInternal: public TQScrollView
 {
        Q_OBJECT
-  TQ_OBJECT
+  
 public:
        MultiTabBarInternal(TQWidget *parent,MultiTabBar::MultiTabBarMode bm);
        int appendTab(const TQPixmap &,int=-1,const TQString& =TQString(), const TQString&identifier=TQString());
--- a/amarok/src/mydiroperator.h
+++ b/amarok/src/mydiroperator.h
@ -12,7 +12,7 @@ class Medium;
 class MyDirOperator : public KDirOperator {

    Q_OBJECT
-  TQ_OBJECT
+