From 2375f73a4e7661d1a52867745d7ce8050497d2ac Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 17 Feb 2012 15:58:43 -0600 Subject: Remove spurious TQ_OBJECT instances --- amarok/src/actionclasses.h | 6 +++--- amarok/src/amarokcore/amarokdcophandler.h | 16 +++++++-------- amarok/src/analyzers/analyzerbase.h | 4 ++-- amarok/src/analyzers/boomanalyzer.h | 2 +- amarok/src/app.h | 2 +- amarok/src/browserbar.h | 2 +- amarok/src/clicklineedit.h | 2 +- amarok/src/collectionbrowser.h | 6 +++--- amarok/src/collectiondb.h | 4 ++-- amarok/src/collectionscanner/collectionscanner.h | 2 +- .../collectionscannerdcophandler.h | 2 +- amarok/src/columnlist.h | 4 ++-- amarok/src/configdialog.h | 2 +- amarok/src/contextbrowser.h | 2 +- amarok/src/coverfetcher.h | 2 +- amarok/src/covermanager.h | 6 +++--- amarok/src/cuefile.h | 2 +- amarok/src/database_refactor/collectiondb.h | 2 +- amarok/src/deletedialog.h | 4 ++-- amarok/src/devicemanager.h | 2 +- amarok/src/directorylist.h | 2 +- amarok/src/editfilterdialog.h | 2 +- amarok/src/engine/helix/helix-configdialog.h | 4 ++-- amarok/src/engine/helix/helix-engine.h | 2 +- amarok/src/engine/kdemm/kdemmengine.h | 2 +- amarok/src/engine/mas/masengine.h | 2 +- amarok/src/engine/nmm/HostList.h | 2 +- amarok/src/engine/nmm/ServerregistryPing.h | 2 +- amarok/src/engine/nmm/nmm_configdialog.h | 2 +- amarok/src/engine/nmm/nmm_engine.h | 2 +- amarok/src/engine/xine/xine-config.h | 10 ++++----- amarok/src/engine/xine/xine-engine.h | 2 +- amarok/src/engine/yauap/yauap-engine.h | 2 +- amarok/src/enginebase.h | 2 +- amarok/src/enginecontroller.h | 2 +- amarok/src/equalizerpresetmanager.h | 2 +- amarok/src/equalizersetup.h | 2 +- amarok/src/filebrowser.h | 4 ++-- amarok/src/hintlineedit.h | 2 +- amarok/src/htmlview.h | 2 +- amarok/src/konquisidebar/universalamarok.h | 4 ++-- amarok/src/ktrm.h | 2 +- amarok/src/lastfm.h | 10 ++++----- .../magnatunebrowser/magnatunealbumdownloader.h | 2 +- .../src/magnatunebrowser/magnatuneartistinfobox.h | 2 +- amarok/src/magnatunebrowser/magnatunebrowser.h | 2 +- .../src/magnatunebrowser/magnatunedownloaddialog.h | 2 +- .../src/magnatunebrowser/magnatunepurchasedialog.h | 2 +- .../magnatunebrowser/magnatunepurchasehandler.h | 2 +- .../magnatunebrowser/magnatuneredownloaddialog.h | 2 +- .../magnatunebrowser/magnatuneredownloadhandler.h | 2 +- amarok/src/magnatunebrowser/magnatunexmlparser.h | 2 +- amarok/src/mediabrowser.h | 8 ++++---- amarok/src/mediadevice/daap/daapclient.h | 6 +++--- .../daapreader/authentication/contentfetcher.h | 2 +- amarok/src/mediadevice/daap/daapreader/reader.h | 2 +- amarok/src/mediadevice/daap/daapserver.h | 2 +- amarok/src/mediadevice/daap/proxy.h | 2 +- .../src/mediadevice/generic/genericmediadevice.h | 2 +- amarok/src/mediadevice/ifp/ifpmediadevice.h | 2 +- amarok/src/mediadevice/ipod/ipodmediadevice.h | 2 +- amarok/src/mediadevice/mtp/mtpmediadevice.h | 2 +- amarok/src/mediadevice/njb/njbmediadevice.h | 2 +- .../src/mediadevice/riokarma/riokarmamediadevice.h | 2 +- amarok/src/mediadevicemanager.h | 2 +- amarok/src/mediumpluginmanager.h | 8 ++++---- amarok/src/metabundlesaver.h | 2 +- amarok/src/moodbar.h | 4 ++-- amarok/src/mountpointmanager.h | 2 +- amarok/src/multitabbar.h | 6 +++--- amarok/src/multitabbar_p.h | 2 +- amarok/src/mydiroperator.h | 2 +- amarok/src/osd.h | 6 +++--- amarok/src/pixmapviewer.h | 2 +- amarok/src/playerwindow.h | 4 ++-- amarok/src/playlist.h | 2 +- amarok/src/playlistbrowser.h | 8 ++++---- amarok/src/playlistbrowseritem.h | 24 +++++++++++----------- amarok/src/playlistloader.h | 6 +++--- amarok/src/playlistselection.h | 2 +- amarok/src/playlistwindow.h | 6 +++--- amarok/src/plugin/pluginconfig.h | 2 +- amarok/src/podcastsettings.h | 2 +- amarok/src/prettypopupmenu.h | 2 +- amarok/src/queuemanager.h | 4 ++-- amarok/src/refreshimages.h | 2 +- amarok/src/scancontroller.h | 2 +- amarok/src/scriptmanager.h | 2 +- .../scripts/graphequalizer/equalizercanvasview.h | 4 ++-- .../src/scripts/graphequalizer/equalizerdialog.h | 2 +- amarok/src/scripts/graphequalizer/stdinreader.h | 2 +- amarok/src/scrobbler.h | 4 ++-- amarok/src/sliderwidget.h | 6 +++--- amarok/src/smartplaylisteditor.h | 4 ++-- amarok/src/socketserver.h | 4 ++-- amarok/src/starmanager.h | 2 +- amarok/src/statistics.h | 6 +++--- amarok/src/statusbar/popupMessage.h | 2 +- amarok/src/statusbar/queueLabel.h | 2 +- amarok/src/statusbar/selectLabel.h | 2 +- amarok/src/statusbar/squeezedtextlabel.h | 2 +- amarok/src/statusbar/statusBarBase.h | 2 +- amarok/src/statusbar/statusbar.h | 2 +- amarok/src/statusbar/toggleLabel.h | 2 +- amarok/src/tagdialog.h | 2 +- amarok/src/threadmanager.h | 6 +++--- amarok/src/tooltip.h | 2 +- amarok/src/trackpickerdialog.h | 2 +- amarok/src/tracktooltip.h | 2 +- amarok/src/transferdialog.h | 2 +- amarok/src/xmlloader.h | 2 +- amarok/src/xmlloader_p.h | 4 ++-- 112 files changed, 184 insertions(+), 184 deletions(-) diff --git a/amarok/src/actionclasses.h b/amarok/src/actionclasses.h index 233fb626..02ebdd97 100644 --- 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 { diff --git a/amarok/src/amarokcore/amarokdcophandler.h b/amarok/src/amarokcore/amarokdcophandler.h index c86edda0..a5f241ee 100644 --- 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(); diff --git a/amarok/src/analyzers/analyzerbase.h b/amarok/src/analyzers/analyzerbase.h index 04f2f30d..50b1b624 100644 --- a/amarok/src/analyzers/analyzerbase.h +++ b/amarok/src/analyzers/analyzerbase.h @@ -76,7 +76,7 @@ protected: class Base2D : public Base { 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 { Q_OBJECT - TQ_OBJECT + #ifdef HAVE_TQGLWIDGET protected: Base3D( TQWidget*, uint, uint = 7 ); diff --git a/amarok/src/analyzers/boomanalyzer.h b/amarok/src/analyzers/boomanalyzer.h index be347b97..2986e519 100644 --- 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* ); diff --git a/amarok/src/app.h b/amarok/src/app.h index 79eac9ea..60236bce 100644 --- 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(); diff --git a/amarok/src/browserbar.h b/amarok/src/browserbar.h index 25ff2a33..474b4f69 100644 --- 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 ); diff --git a/amarok/src/clicklineedit.h b/amarok/src/clicklineedit.h index e62e61f3..6aff52b6 100644 --- 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 ); diff --git a/amarok/src/collectionbrowser.h b/amarok/src/collectionbrowser.h index 2f1c28a4..932580b9 100644 --- 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(), diff --git a/amarok/src/collectiondb.h b/amarok/src/collectiondb.h index a581db88..f5a37cea 100644 --- 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 ); diff --git a/amarok/src/collectionscanner/collectionscanner.h b/amarok/src/collectionscanner/collectionscanner.h index 2e02136d..24e9fe87 100644 --- a/amarok/src/collectionscanner/collectionscanner.h +++ b/amarok/src/collectionscanner/collectionscanner.h @@ -42,7 +42,7 @@ typedef TQMap AttributeMap; class CollectionScanner : public KApplication { Q_OBJECT - TQ_OBJECT + public: CollectionScanner( const TQStringList& folders, diff --git a/amarok/src/collectionscanner/collectionscannerdcophandler.h b/amarok/src/collectionscanner/collectionscannerdcophandler.h index bc010106..c3512702 100644 --- 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(); diff --git a/amarok/src/columnlist.h b/amarok/src/columnlist.h index 4ed2a9ee..67bd2c65 100644 --- a/amarok/src/columnlist.h +++ b/amarok/src/columnlist.h @@ -30,7 +30,7 @@ template class TQValueList; class ColumnList: public TQHBox { Q_OBJECT - TQ_OBJECT + public: ColumnList( TQWidget *parent = 0, const char *name = 0 ); TQValueList visibleColumns() const; @@ -57,7 +57,7 @@ private: class ColumnsDialog: public KDialogBase { Q_OBJECT - TQ_OBJECT + public: static void display(); diff --git a/amarok/src/configdialog.h b/amarok/src/configdialog.h index d565601b..d191ee67 100644 --- 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 ); diff --git a/amarok/src/contextbrowser.h b/amarok/src/contextbrowser.h index 436118cd..3a312e9a 100644 --- 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; diff --git a/amarok/src/coverfetcher.h b/amarok/src/coverfetcher.h index cb119704..2eced566 100644 --- 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; diff --git a/amarok/src/covermanager.h b/amarok/src/covermanager.h index 1c7680eb..178e794c 100644 --- 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); diff --git a/amarok/src/cuefile.h b/amarok/src/cuefile.h index 20e14376..3b9ca605 100644 --- a/amarok/src/cuefile.h +++ b/amarok/src/cuefile.h @@ -52,7 +52,7 @@ class CueFileItem { class CueFile : public TQObject, public TQMap, public EngineObserver { Q_OBJECT - TQ_OBJECT + public: static CueFile *instance(); diff --git a/amarok/src/database_refactor/collectiondb.h b/amarok/src/database_refactor/collectiondb.h index f2c955b0..990c7d3e 100644 --- a/amarok/src/database_refactor/collectiondb.h +++ b/amarok/src/database_refactor/collectiondb.h @@ -44,7 +44,7 @@ class DbConnectionPool : TQPtrQueue class CollectionDB : public TQObject, public EngineObserver { Q_OBJECT - TQ_OBJECT + friend class SimilarArtistsInsertionJob; diff --git a/amarok/src/deletedialog.h b/amarok/src/deletedialog.h index 7bf981af..e96977ca 100644 --- 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"); diff --git a/amarok/src/devicemanager.h b/amarok/src/devicemanager.h index 05987649..10ac9f5a 100644 --- 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(); diff --git a/amarok/src/directorylist.h b/amarok/src/directorylist.h index 8125557a..a2aec52a 100644 --- 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 ); diff --git a/amarok/src/editfilterdialog.h b/amarok/src/editfilterdialog.h index bf14ca81..6e536e75 100644 --- 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(); diff --git a/amarok/src/engine/helix/helix-configdialog.h b/amarok/src/engine/helix/helix-configdialog.h index 3da4af0b..9ad4ef7e 100644 --- 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(); diff --git a/amarok/src/engine/helix/helix-engine.h b/amarok/src/engine/helix/helix-engine.h index 2dc1dc1e..b0a00af2 100644 --- 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(); diff --git a/amarok/src/engine/kdemm/kdemmengine.h b/amarok/src/engine/kdemm/kdemmengine.h index 9eb16408..edda617c 100644 --- 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(); diff --git a/amarok/src/engine/mas/masengine.h b/amarok/src/engine/mas/masengine.h index 9a1d45f5..c94806ac 100644 --- 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(); diff --git a/amarok/src/engine/nmm/HostList.h b/amarok/src/engine/nmm/HostList.h index 1fee31ad..a1d76e12 100644 --- 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* ); diff --git a/amarok/src/engine/nmm/ServerregistryPing.h b/amarok/src/engine/nmm/ServerregistryPing.h index 72078228..312929c0 100644 --- 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); diff --git a/amarok/src/engine/nmm/nmm_configdialog.h b/amarok/src/engine/nmm/nmm_configdialog.h index 7d38d0aa..292046de 100644 --- 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(); diff --git a/amarok/src/engine/nmm/nmm_engine.h b/amarok/src/engine/nmm/nmm_engine.h index f2238fef..43630cb4 100644 --- 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(); diff --git a/amarok/src/engine/xine/xine-config.h b/amarok/src/engine/xine/xine-config.h index 7fe5eb8b..8bf952f0 100644 --- 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); diff --git a/amarok/src/engine/xine/xine-engine.h b/amarok/src/engine/xine/xine-engine.h index 2a795657..8b581237 100644 --- 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; diff --git a/amarok/src/engine/yauap/yauap-engine.h b/amarok/src/engine/yauap/yauap-engine.h index 6f42cc9f..daf08a6e 100644 --- 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; diff --git a/amarok/src/enginebase.h b/amarok/src/enginebase.h index 3f18ae8f..88d4c872 100644 --- 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. */ diff --git a/amarok/src/enginecontroller.h b/amarok/src/enginecontroller.h index cd6974b2..6c484310 100644 --- 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 ExtensionCache; diff --git a/amarok/src/equalizerpresetmanager.h b/amarok/src/equalizerpresetmanager.h index 1da346f7..4822f11d 100644 --- 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 ); diff --git a/amarok/src/equalizersetup.h b/amarok/src/equalizersetup.h index 391d56b1..fa6c7ae2 100644 --- 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(); } diff --git a/amarok/src/filebrowser.h b/amarok/src/filebrowser.h index bdba92dd..9bad6f24 100644 --- 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 ); diff --git a/amarok/src/hintlineedit.h b/amarok/src/hintlineedit.h index ba21b6a2..5e32bd9c 100644 --- 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 ); diff --git a/amarok/src/htmlview.h b/amarok/src/htmlview.h index 2f741bd9..175992e3 100644 --- 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 ); diff --git a/amarok/src/konquisidebar/universalamarok.h b/amarok/src/konquisidebar/universalamarok.h index 9c2ee242..6574d827 100644 --- 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); diff --git a/amarok/src/ktrm.h b/amarok/src/ktrm.h index b133a466..e66cb9b8 100644 --- a/amarok/src/ktrm.h +++ b/amarok/src/ktrm.h @@ -122,7 +122,7 @@ typedef TQValueList KTRMResultList; class KTRMLookup : public TQObject { Q_OBJECT - TQ_OBJECT + signals: void sigResult( KTRMResultList, TQString ); diff --git a/amarok/src/lastfm.h b/amarok/src/lastfm.h index c3826889..1bf6d3fb 100644 --- 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 ); diff --git a/amarok/src/magnatunebrowser/magnatunealbumdownloader.h b/amarok/src/magnatunebrowser/magnatunealbumdownloader.h index a18b900f..40c63355 100644 --- 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(); diff --git a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h index b0d1ed44..585cc08e 100644 --- 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: /** diff --git a/amarok/src/magnatunebrowser/magnatunebrowser.h b/amarok/src/magnatunebrowser/magnatunebrowser.h index 7e768861..88929b18 100644 --- 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: /** diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialog.h b/amarok/src/magnatunebrowser/magnatunedownloaddialog.h index 956a7f6c..5c201f6b 100644 --- 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: /** diff --git a/amarok/src/magnatunebrowser/magnatunepurchasedialog.h b/amarok/src/magnatunebrowser/magnatunepurchasedialog.h index b8042b30..b372b66a 100644 --- 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: diff --git a/amarok/src/magnatunebrowser/magnatunepurchasehandler.h b/amarok/src/magnatunebrowser/magnatunepurchasehandler.h index 4bae3105..12918f71 100644 --- 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(); diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h index ad4fd651..613ab96f 100644 --- 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 ); diff --git a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h index b09ec64b..926f9fed 100644 --- 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); diff --git a/amarok/src/magnatunebrowser/magnatunexmlparser.h b/amarok/src/magnatunebrowser/magnatunexmlparser.h index f3d8346b..a04f905d 100644 --- 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: diff --git a/amarok/src/mediabrowser.h b/amarok/src/mediabrowser.h index 2e93c2f8..7ba3e268 100644 --- 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; diff --git a/amarok/src/mediadevice/daap/daapclient.h b/amarok/src/mediadevice/daap/daapclient.h index e21fa8be..5354423c 100644 --- 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 ); diff --git a/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h b/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h index 5823a948..60e2e3b1 100644 --- 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 ); diff --git a/amarok/src/mediadevice/daap/daapreader/reader.h b/amarok/src/mediadevice/daap/daapreader/reader.h index 535200bd..db2e1028 100644 --- 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, diff --git a/amarok/src/mediadevice/daap/daapserver.h b/amarok/src/mediadevice/daap/daapserver.h index 8833279f..dd20e4ec 100644 --- 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); diff --git a/amarok/src/mediadevice/daap/proxy.h b/amarok/src/mediadevice/daap/proxy.h index cff1c12c..63a81133 100644 --- 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); diff --git a/amarok/src/mediadevice/generic/genericmediadevice.h b/amarok/src/mediadevice/generic/genericmediadevice.h index 246fd92e..7c7c30d9 100644 --- a/amarok/src/mediadevice/generic/genericmediadevice.h +++ b/amarok/src/mediadevice/generic/genericmediadevice.h @@ -41,7 +41,7 @@ typedef TQMap MediaItemMap; class GenericMediaDevice : public MediaDevice { Q_OBJECT - TQ_OBJECT + friend class GenericMediaDeviceConfigDialog; diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.h b/amarok/src/mediadevice/ifp/ifpmediadevice.h index 9dcffbe6..2904a0a1 100644 --- 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(); diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.h b/amarok/src/mediadevice/ipod/ipodmediadevice.h index 022cb24c..66e4d1a0 100644 --- 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(); diff --git a/amarok/src/mediadevice/mtp/mtpmediadevice.h b/amarok/src/mediadevice/mtp/mtpmediadevice.h index 1cf4210d..53431f07 100644 --- 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(); diff --git a/amarok/src/mediadevice/njb/njbmediadevice.h b/amarok/src/mediadevice/njb/njbmediadevice.h index 5d81178d..3c1f40cf 100644 --- 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(); diff --git a/amarok/src/mediadevice/riokarma/riokarmamediadevice.h b/amarok/src/mediadevice/riokarma/riokarmamediadevice.h index 54d0dfec..b61298d9 100644 --- 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(); diff --git a/amarok/src/mediadevicemanager.h b/amarok/src/mediadevicemanager.h index 2223ccea..c568b5fb 100644 --- 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(); diff --git a/amarok/src/mediumpluginmanager.h b/amarok/src/mediumpluginmanager.h index 4e1461d8..b34a3fc7 100644 --- a/amarok/src/mediumpluginmanager.h +++ b/amarok/src/mediumpluginmanager.h @@ -44,7 +44,7 @@ typedef TQMap 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 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 ); diff --git a/amarok/src/metabundlesaver.h b/amarok/src/metabundlesaver.h index 44bebac8..58cd6eea 100644 --- 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(); diff --git a/amarok/src/moodbar.h b/amarok/src/moodbar.h index 85ea4a63..9665ad0c 100644 --- 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 ColorList; @@ -117,7 +117,7 @@ class KProcess; class MoodServer : public TQObject { Q_OBJECT - TQ_OBJECT + public: static MoodServer *instance( void ); diff --git a/amarok/src/mountpointmanager.h b/amarok/src/mountpointmanager.h index 482e99f9..ed3c5794 100644 --- 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 ); diff --git a/amarok/src/multitabbar.h b/amarok/src/multitabbar.h index 4067f0ad..8e43a069 100644 --- 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 ); diff --git a/amarok/src/multitabbar_p.h b/amarok/src/multitabbar_p.h index 74cf8fad..0d0a0ca1 100644 --- 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()); diff --git a/amarok/src/mydiroperator.h b/amarok/src/mydiroperator.h index 8c0134b4..a92b088b 100644 --- a/amarok/src/mydiroperator.h +++ b/amarok/src/mydiroperator.h @@ -12,7 +12,7 @@ class Medium; class MyDirOperator : public KDirOperator { Q_OBJECT - TQ_OBJECT + public: MyDirOperator( const KURL &url, TQWidget *parent, Medium *medium = 0 ); diff --git a/amarok/src/osd.h b/amarok/src/osd.h index c79b419e..61273488 100644 --- a/amarok/src/osd.h +++ b/amarok/src/osd.h @@ -26,7 +26,7 @@ class OSDWidget : public TQWidget { Q_OBJECT - TQ_OBJECT + public: enum Alignment { Left, Middle, Center, Right }; @@ -110,7 +110,7 @@ class OSDWidget : public TQWidget class OSDPreviewWidget : public OSDWidget { Q_OBJECT - TQ_OBJECT + public: OSDPreviewWidget( TQWidget *parent ); @@ -158,7 +158,7 @@ namespace Amarok class OSD : public OSDWidget { Q_OBJECT - TQ_OBJECT + public: static OSD *instance() diff --git a/amarok/src/pixmapviewer.h b/amarok/src/pixmapviewer.h index 9715b55b..f8a99037 100644 --- a/amarok/src/pixmapviewer.h +++ b/amarok/src/pixmapviewer.h @@ -23,7 +23,7 @@ class PixmapViewer : public TQScrollView { Q_OBJECT - TQ_OBJECT + public: PixmapViewer(TQWidget *widget, const TQPixmap &pixmap); diff --git a/amarok/src/playerwindow.h b/amarok/src/playerwindow.h index 08552fc9..879560e2 100644 --- a/amarok/src/playerwindow.h +++ b/amarok/src/playerwindow.h @@ -61,7 +61,7 @@ protected: class IconButton : public TQButton { Q_OBJECT - TQ_OBJECT + public: IconButton( TQWidget*, const TQString&, const char *signal ); @@ -82,7 +82,7 @@ private: class PlayerWidget : public TQWidget, public EngineObserver { Q_OBJECT - TQ_OBJECT + public: PlayerWidget( TQWidget* = 0, const char* = 0, bool enablePlaylist = false ); diff --git a/amarok/src/playlist.h b/amarok/src/playlist.h index 75321957..4eb39554 100644 --- a/amarok/src/playlist.h +++ b/amarok/src/playlist.h @@ -79,7 +79,7 @@ class Medium; class Playlist : private KListView, public EngineObserver, public Amarok::ToolTipClient { Q_OBJECT - TQ_OBJECT + public: ~Playlist(); diff --git a/amarok/src/playlistbrowser.h b/amarok/src/playlistbrowser.h index 6e87f659..838b4c0c 100644 --- a/amarok/src/playlistbrowser.h +++ b/amarok/src/playlistbrowser.h @@ -43,7 +43,7 @@ class PlaylistTrackItem; class PlaylistBrowser : public TQVBox { Q_OBJECT - TQ_OBJECT + friend class DynamicMode; friend class PlaylistBrowserView; @@ -241,7 +241,7 @@ class PlaylistBrowser : public TQVBox class PlaylistBrowserView : public KListView { Q_OBJECT - TQ_OBJECT + friend class PlaylistEntry; @@ -273,7 +273,7 @@ class PlaylistBrowserView : public KListView class PlaylistDialog: public KDialogBase { Q_OBJECT - TQ_OBJECT + public: static TQString getSaveFileName( const TQString &suggestion = TQString(), bool proposeOverwriting = false ); @@ -393,7 +393,7 @@ fileDirPath( const TQString &filePath ) class InfoPane : public TQVBox { Q_OBJECT - TQ_OBJECT + public: InfoPane( TQWidget *parent ); diff --git a/amarok/src/playlistbrowseritem.h b/amarok/src/playlistbrowseritem.h index 6a711625..2847f6af 100644 --- a/amarok/src/playlistbrowseritem.h +++ b/amarok/src/playlistbrowseritem.h @@ -50,7 +50,7 @@ namespace KIO { class Job; class TransferJob; class CopyJob; } //podcast downloa class PlaylistBrowserEntry : public TQObject, public KListViewItem { Q_OBJECT - TQ_OBJECT + public: PlaylistBrowserEntry( TQListViewItem *parent, TQListViewItem *after ) : KListViewItem( parent, after) { m_kept = true; } @@ -87,7 +87,7 @@ class PlaylistBrowserEntry : public TQObject, public KListViewItem class DynamicEntry : public PlaylistBrowserEntry, public DynamicMode { Q_OBJECT - TQ_OBJECT + public: DynamicEntry( TQListViewItem *parent, TQListViewItem *after, const TQString &title ); DynamicEntry( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition ); @@ -108,7 +108,7 @@ class DynamicEntry : public PlaylistBrowserEntry, public DynamicMode class PlaylistCategory : public PlaylistBrowserEntry { Q_OBJECT - TQ_OBJECT + public: PlaylistCategory( TQListView *parent, TQListViewItem *after, const TQString &, bool isFolder=false ); PlaylistCategory( PlaylistCategory *parent, TQListViewItem *after, const TQString &, bool isFolder=true ); @@ -152,7 +152,7 @@ class PlaylistCategory : public PlaylistBrowserEntry class PlaylistEntry : public PlaylistBrowserEntry { Q_OBJECT - TQ_OBJECT + friend class PlaylistTrackItem; friend class TrackItemInfo; @@ -234,7 +234,7 @@ class PlaylistEntry : public PlaylistBrowserEntry class PlaylistTrackItem : public PlaylistBrowserEntry { Q_OBJECT - TQ_OBJECT + friend class TrackItemInfo; public: @@ -259,7 +259,7 @@ class PlaylistTrackItem : public PlaylistBrowserEntry class PodcastEpisode : public PlaylistBrowserEntry { Q_OBJECT - TQ_OBJECT + public: PodcastEpisode( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xml, @@ -347,7 +347,7 @@ class PodcastEpisode : public PlaylistBrowserEntry class PodcastChannel : public PlaylistBrowserEntry { Q_OBJECT - TQ_OBJECT + public: PodcastChannel( TQListViewItem *parent, TQListViewItem *after, const KURL &url, @@ -452,7 +452,7 @@ class PodcastChannel : public PlaylistBrowserEntry class StreamEntry : public PlaylistBrowserEntry { Q_OBJECT - TQ_OBJECT + public: StreamEntry( TQListViewItem *parent, TQListViewItem *after, const KURL &, const TQString &t ); StreamEntry( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition ); @@ -486,7 +486,7 @@ class StreamEntry : public PlaylistBrowserEntry class LastFmEntry : public StreamEntry { Q_OBJECT - TQ_OBJECT + public: LastFmEntry( TQListViewItem *parent, TQListViewItem *after, const KURL &u, const TQString &t ) : StreamEntry( parent, after, u, t ) { } @@ -519,7 +519,7 @@ class StreamEditor : public KDialogBase class SmartPlaylist : public PlaylistBrowserEntry { Q_OBJECT - TQ_OBJECT + public: SmartPlaylist( TQListViewItem *parent, TQListViewItem *after, const TQString &name, const TQString &query ); SmartPlaylist( TQListViewItem *parent, TQListViewItem *after, const TQString &name, @@ -590,7 +590,7 @@ class TrackItemInfo class ShoutcastBrowser : public PlaylistCategory { Q_OBJECT - TQ_OBJECT + public: ShoutcastBrowser( PlaylistCategory* parent ); void setOpen( bool open ); @@ -620,7 +620,7 @@ class ShoutcastBrowser : public PlaylistCategory class ShoutcastGenre : public PlaylistCategory { Q_OBJECT - TQ_OBJECT + public: ShoutcastGenre( ShoutcastBrowser *browser, TQListViewItem *after, TQString genre ); void setOpen( bool open ); diff --git a/amarok/src/playlistloader.h b/amarok/src/playlistloader.h index a08c3beb..0f95f5ee 100644 --- a/amarok/src/playlistloader.h +++ b/amarok/src/playlistloader.h @@ -109,7 +109,7 @@ class UrlLoader : public ThreadManager::DependentJob #endif // Q_MOC_RUN { Q_OBJECT - TQ_OBJECT + public: UrlLoader( const KURL::List&, TQListViewItem*, int options = 0 ); @@ -181,7 +181,7 @@ public: class RemotePlaylistFetcher : public TQObject { Q_OBJECT - TQ_OBJECT + const KURL m_source; KURL m_destination; @@ -204,7 +204,7 @@ private slots: class MyXmlLoader: public MetaBundle::XmlLoader { Q_OBJECT - TQ_OBJECT + public: MyXmlLoader() { } virtual bool startElement( const TQString&, const TQString&, const TQString &, const TQXmlAttributes& ); diff --git a/amarok/src/playlistselection.h b/amarok/src/playlistselection.h index 31f755fc..5f23c5e9 100644 --- a/amarok/src/playlistselection.h +++ b/amarok/src/playlistselection.h @@ -20,7 +20,7 @@ class DynamicMode; class PlaylistSelection : public KListView { Q_OBJECT - TQ_OBJECT + public: PlaylistSelection(TQWidget* parent, const char* name); virtual TQSize sizeHint() const diff --git a/amarok/src/playlistwindow.h b/amarok/src/playlistwindow.h index 6e03df2b..348ffe0e 100644 --- a/amarok/src/playlistwindow.h +++ b/amarok/src/playlistwindow.h @@ -41,7 +41,7 @@ class TQTimer; class PlaylistWindow : public TQWidget, public KXMLGUIClient { Q_OBJECT - TQ_OBJECT + public: PlaylistWindow(); @@ -125,7 +125,7 @@ class PlaylistWindow : public TQWidget, public KXMLGUIClient class DynamicTitle : public TQWidget { Q_OBJECT - TQ_OBJECT + public: DynamicTitle( TQWidget* parent ); void setTitle( const TQString& newTitle ); @@ -143,7 +143,7 @@ class DynamicTitle : public TQWidget class DynamicBar : public TQHBox { Q_OBJECT - TQ_OBJECT + public: DynamicBar( TQWidget* parent ); void init(); diff --git a/amarok/src/plugin/pluginconfig.h b/amarok/src/plugin/pluginconfig.h index e42eb857..4902fb79 100644 --- a/amarok/src/plugin/pluginconfig.h +++ b/amarok/src/plugin/pluginconfig.h @@ -17,7 +17,7 @@ namespace Amarok class PluginConfig : public TQObject { Q_OBJECT - TQ_OBJECT + signals: /** Emit whenever some view setting is changed by the user */ diff --git a/amarok/src/podcastsettings.h b/amarok/src/podcastsettings.h index f99a8aca..b4a0c0cd 100644 --- a/amarok/src/podcastsettings.h +++ b/amarok/src/podcastsettings.h @@ -48,7 +48,7 @@ class PodcastSettings class PodcastSettingsDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: PodcastSettingsDialog( PodcastSettings *list, TQWidget* parent=0 ); diff --git a/amarok/src/prettypopupmenu.h b/amarok/src/prettypopupmenu.h index 53444a1d..30021fc6 100644 --- a/amarok/src/prettypopupmenu.h +++ b/amarok/src/prettypopupmenu.h @@ -42,7 +42,7 @@ class TQSize; class PrettyPopupMenu : public KPopupMenu { Q_OBJECT - TQ_OBJECT + public: PrettyPopupMenu( TQWidget *parent = 0, const char *name = 0 ); diff --git a/amarok/src/queuemanager.h b/amarok/src/queuemanager.h index 10df80ba..a0640ff1 100644 --- a/amarok/src/queuemanager.h +++ b/amarok/src/queuemanager.h @@ -37,7 +37,7 @@ class QueueItem : public KListViewItem class QueueList : public KListView { Q_OBJECT - TQ_OBJECT + friend class QueueManager; @@ -69,7 +69,7 @@ class QueueList : public KListView class QueueManager : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: QueueManager( TQWidget *parent = 0, const char *name = 0 ); diff --git a/amarok/src/refreshimages.h b/amarok/src/refreshimages.h index 09adfb3c..c4fc0eec 100644 --- a/amarok/src/refreshimages.h +++ b/amarok/src/refreshimages.h @@ -26,7 +26,7 @@ class JobInfo class RefreshImages : public TQObject { Q_OBJECT - TQ_OBJECT + public: RefreshImages(); private slots: diff --git a/amarok/src/scancontroller.h b/amarok/src/scancontroller.h index 05de2373..ae707c7b 100644 --- a/amarok/src/scancontroller.h +++ b/amarok/src/scancontroller.h @@ -51,7 +51,7 @@ class ScanController : public ThreadManager::DependentJob, public TQXmlDefaultHa #endif // Q_MOC_RUN { Q_OBJECT - TQ_OBJECT + public: static const int RestartEventType = 8891; diff --git a/amarok/src/scriptmanager.h b/amarok/src/scriptmanager.h index c07f994e..24e23b29 100644 --- a/amarok/src/scriptmanager.h +++ b/amarok/src/scriptmanager.h @@ -56,7 +56,7 @@ class KProcIO; class ScriptManager : public KDialogBase, public EngineObserver { Q_OBJECT - TQ_OBJECT + friend class AmarokScriptNewStuff; diff --git a/amarok/src/scripts/graphequalizer/equalizercanvasview.h b/amarok/src/scripts/graphequalizer/equalizercanvasview.h index 045aff16..34bd9117 100644 --- a/amarok/src/scripts/graphequalizer/equalizercanvasview.h +++ b/amarok/src/scripts/graphequalizer/equalizercanvasview.h @@ -43,7 +43,7 @@ private: class EqualizerCanvasView : public TQCanvasView { Q_OBJECT - TQ_OBJECT + public: EqualizerCanvasView(TQWidget *parent, const char *name); void init(); @@ -65,7 +65,7 @@ private: class CallAmarok : public TQObject { Q_OBJECT - TQ_OBJECT + public: CallAmarok(TQObject* parent, const char *name, EqualizerCanvasView* canvasView, TQSlider* preampSlider) diff --git a/amarok/src/scripts/graphequalizer/equalizerdialog.h b/amarok/src/scripts/graphequalizer/equalizerdialog.h index bdd3c161..fc195043 100644 --- a/amarok/src/scripts/graphequalizer/equalizerdialog.h +++ b/amarok/src/scripts/graphequalizer/equalizerdialog.h @@ -29,7 +29,7 @@ class EqualizerDialog : public TQDialog { Q_OBJECT - TQ_OBJECT + public: EqualizerDialog(); diff --git a/amarok/src/scripts/graphequalizer/stdinreader.h b/amarok/src/scripts/graphequalizer/stdinreader.h index 95a0adc1..b0d2003c 100644 --- a/amarok/src/scripts/graphequalizer/stdinreader.h +++ b/amarok/src/scripts/graphequalizer/stdinreader.h @@ -12,7 +12,7 @@ class StdinReader : public TQObject { Q_OBJECT - TQ_OBJECT + public: StdinReader(TQObject * parent = 0, const char * name = 0) diff --git a/amarok/src/scrobbler.h b/amarok/src/scrobbler.h index d2cf44d4..74b19e79 100644 --- a/amarok/src/scrobbler.h +++ b/amarok/src/scrobbler.h @@ -29,7 +29,7 @@ class Scrobbler : public TQObject, public EngineObserver friend class MediaDevice; Q_OBJECT - TQ_OBJECT + public: static Scrobbler *instance(); @@ -116,7 +116,7 @@ class SubmitQueue : public TQPtrList class ScrobblerSubmitter : public TQObject { Q_OBJECT - TQ_OBJECT + public: static TQString PROTOCOL_VERSION; diff --git a/amarok/src/sliderwidget.h b/amarok/src/sliderwidget.h index 9d90f4eb..b3d205d4 100644 --- a/amarok/src/sliderwidget.h +++ b/amarok/src/sliderwidget.h @@ -38,7 +38,7 @@ namespace Amarok class Slider : public TQSlider { Q_OBJECT - TQ_OBJECT + public: Slider( Qt::Orientation, TQWidget*, uint max = 0 ); @@ -84,7 +84,7 @@ namespace Amarok class PrettySlider : public Slider { Q_OBJECT - TQ_OBJECT + public: typedef enum @@ -119,7 +119,7 @@ namespace Amarok class VolumeSlider: public Slider { Q_OBJECT - TQ_OBJECT + public: VolumeSlider( TQWidget *parent, uint max = 0 ); diff --git a/amarok/src/smartplaylisteditor.h b/amarok/src/smartplaylisteditor.h index 145648bb..ca2d4aa4 100644 --- a/amarok/src/smartplaylisteditor.h +++ b/amarok/src/smartplaylisteditor.h @@ -26,7 +26,7 @@ class CriteriaEditor; class SmartPlaylistEditor : public KDialogBase { Q_OBJECT - TQ_OBJECT + friend class CriteriaEditor; public: @@ -84,7 +84,7 @@ Q_OBJECT class CriteriaEditor : public TQHBox { Q_OBJECT - TQ_OBJECT + public: CriteriaEditor( SmartPlaylistEditor *editor, TQWidget *parent, int criteriaType, TQDomElement criteria = TQDomElement() ); ~CriteriaEditor(); diff --git a/amarok/src/socketserver.h b/amarok/src/socketserver.h index 03768047..fb2de226 100644 --- a/amarok/src/socketserver.h +++ b/amarok/src/socketserver.h @@ -50,7 +50,7 @@ namespace Vis class SocketNotifier : public TQSocketNotifier { Q_OBJECT - TQ_OBJECT + public: SocketNotifier( int sockfd ); @@ -62,7 +62,7 @@ namespace Vis class Selector : public TQListView { Q_OBJECT - TQ_OBJECT + Selector( TQWidget *parent=0 ); SocketServer *m_server; diff --git a/amarok/src/starmanager.h b/amarok/src/starmanager.h index 8bf6ac2f..acf2b5ce 100644 --- a/amarok/src/starmanager.h +++ b/amarok/src/starmanager.h @@ -21,7 +21,7 @@ class StarManager : public TQObject { Q_OBJECT - TQ_OBJECT + public: StarManager(); diff --git a/amarok/src/statistics.h b/amarok/src/statistics.h index 0161e3a3..05f3acc0 100644 --- a/amarok/src/statistics.h +++ b/amarok/src/statistics.h @@ -32,7 +32,7 @@ class StatisticsDetailedItem; class Statistics : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: Statistics( TQWidget *parent = 0, const char *name = 0 ); @@ -55,7 +55,7 @@ class Statistics : public KDialogBase class StatisticsList : public KListView { Q_OBJECT - TQ_OBJECT + public: StatisticsList( TQWidget *parent, const char *name=0 ); @@ -94,7 +94,7 @@ class StatisticsList : public KListView class StatisticsItem : public TQObject, public KListViewItem { Q_OBJECT - TQ_OBJECT + public: StatisticsItem( TQString text, StatisticsList *parent, KListViewItem *after=0, const char *name=0 ); diff --git a/amarok/src/statusbar/popupMessage.h b/amarok/src/statusbar/popupMessage.h index 3ce0627e..1db568eb 100644 --- a/amarok/src/statusbar/popupMessage.h +++ b/amarok/src/statusbar/popupMessage.h @@ -40,7 +40,7 @@ namespace KDE class PopupMessage : public OverlayWidget { Q_OBJECT - TQ_OBJECT + public: /** diff --git a/amarok/src/statusbar/queueLabel.h b/amarok/src/statusbar/queueLabel.h index 7ded871f..f5dd3049 100644 --- a/amarok/src/statusbar/queueLabel.h +++ b/amarok/src/statusbar/queueLabel.h @@ -29,7 +29,7 @@ class QueueLabel: public TQLabel //homonym, heh heh { Q_OBJECT - TQ_OBJECT + public: QueueLabel( TQWidget *parent, const char *name = 0 ); diff --git a/amarok/src/statusbar/selectLabel.h b/amarok/src/statusbar/selectLabel.h index 6e819a1c..5e942686 100644 --- a/amarok/src/statusbar/selectLabel.h +++ b/amarok/src/statusbar/selectLabel.h @@ -38,7 +38,7 @@ class SelectLabel : public TQLabel { Q_OBJECT - TQ_OBJECT + Amarok::SelectAction const*const m_action; diff --git a/amarok/src/statusbar/squeezedtextlabel.h b/amarok/src/statusbar/squeezedtextlabel.h index 121c18ab..41ea147f 100644 --- a/amarok/src/statusbar/squeezedtextlabel.h +++ b/amarok/src/statusbar/squeezedtextlabel.h @@ -29,7 +29,7 @@ namespace KDE { //that way in our case. class SqueezedTextLabel : public TQLabel { Q_OBJECT - TQ_OBJECT + public: SqueezedTextLabel( TQWidget *parent, const char *name = 0 ); diff --git a/amarok/src/statusbar/statusBarBase.h b/amarok/src/statusbar/statusBarBase.h index 8bfe392d..195a6156 100644 --- a/amarok/src/statusbar/statusBarBase.h +++ b/amarok/src/statusbar/statusBarBase.h @@ -79,7 +79,7 @@ namespace KDE class StatusBar : public TQWidget { Q_OBJECT - TQ_OBJECT + public: StatusBar( TQWidget *parent, const char *name = "mainStatusBar" ); diff --git a/amarok/src/statusbar/statusbar.h b/amarok/src/statusbar/statusbar.h index 383b84cd..f7d0b143 100644 --- a/amarok/src/statusbar/statusbar.h +++ b/amarok/src/statusbar/statusbar.h @@ -36,7 +36,7 @@ namespace Amarok class StatusBar : public KDE::StatusBar, public EngineObserver { Q_OBJECT - TQ_OBJECT + LIBAMAROK_EXPORT static StatusBar* s_instance; diff --git a/amarok/src/statusbar/toggleLabel.h b/amarok/src/statusbar/toggleLabel.h index 0ff74243..dce06d4b 100644 --- a/amarok/src/statusbar/toggleLabel.h +++ b/amarok/src/statusbar/toggleLabel.h @@ -38,7 +38,7 @@ class ToggleLabel : public TQLabel { Q_OBJECT - TQ_OBJECT + KToggleAction const*const m_action; diff --git a/amarok/src/tagdialog.h b/amarok/src/tagdialog.h index cfab2deb..7cd9cfe5 100644 --- a/amarok/src/tagdialog.h +++ b/amarok/src/tagdialog.h @@ -33,7 +33,7 @@ namespace TagLib { class TagDialog : public TagDialogBase { Q_OBJECT - TQ_OBJECT + public: diff --git a/amarok/src/threadmanager.h b/amarok/src/threadmanager.h index 0cd39a51..d96bca79 100644 --- a/amarok/src/threadmanager.h +++ b/amarok/src/threadmanager.h @@ -79,7 +79,7 @@ /// This class is because tqmoc "is really good" (no nested Q_OBJECT classes) class JobBase : public TQObject { Q_OBJECT - TQ_OBJECT + protected: JobBase() : TQObject(), m_aborted( false ) {} @@ -239,7 +239,7 @@ public: class Job : public JobBase, public TQCustomEvent { // Q_OBJECT -// TQ_OBJECT +// friend class ThreadManager; //access to m_thread friend class ThreadManager::Thread; //access to m_aborted @@ -383,7 +383,7 @@ public: class DependentJob : public Job { // Q_OBJECT -// TQ_OBJECT +// public: DependentJob( TQObject *dependent, const char *name ); diff --git a/amarok/src/tooltip.h b/amarok/src/tooltip.h index 268d8302..3a79f496 100644 --- a/amarok/src/tooltip.h +++ b/amarok/src/tooltip.h @@ -37,7 +37,7 @@ public: class ToolTip: public TQFrame, public TQToolTip { Q_OBJECT - TQ_OBJECT + public: static void add( ToolTipClient *client, TQWidget *parent ); diff --git a/amarok/src/trackpickerdialog.h b/amarok/src/trackpickerdialog.h index 2558638a..e5fb687a 100644 --- a/amarok/src/trackpickerdialog.h +++ b/amarok/src/trackpickerdialog.h @@ -30,7 +30,7 @@ class TrackPickerDialogBase; class TrackPickerDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + signals: void sigSelectionMade( KTRMResult ); diff --git a/amarok/src/tracktooltip.h b/amarok/src/tracktooltip.h index 9730155b..62543313 100644 --- a/amarok/src/tracktooltip.h +++ b/amarok/src/tracktooltip.h @@ -26,7 +26,7 @@ class TQWidget; class TrackToolTip: public TQObject, public Amarok::ToolTipClient { Q_OBJECT - TQ_OBJECT + public: TrackToolTip(); diff --git a/amarok/src/transferdialog.h b/amarok/src/transferdialog.h index 44194b9e..a789d121 100644 --- a/amarok/src/transferdialog.h +++ b/amarok/src/transferdialog.h @@ -29,7 +29,7 @@ class TransferDialog; class LIBAMAROK_EXPORT TransferDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: TransferDialog( MediaDevice* mdev ); diff --git a/amarok/src/xmlloader.h b/amarok/src/xmlloader.h index c832a468..4a6f1d76 100644 --- a/amarok/src/xmlloader.h +++ b/amarok/src/xmlloader.h @@ -50,7 +50,7 @@ typedef TQValueList< TQPair > XmlAttributeList; class MetaBundle::XmlLoader: public TQObject, public TQXmlDefaultHandler { Q_OBJECT - TQ_OBJECT + public: /** Posted when a MetaBundle has been loaded. */ class BundleLoadedEvent: public TQCustomEvent diff --git a/amarok/src/xmlloader_p.h b/amarok/src/xmlloader_p.h index 54b91849..5c14f2fc 100644 --- a/amarok/src/xmlloader_p.h +++ b/amarok/src/xmlloader_p.h @@ -26,7 +26,7 @@ class MetaBundle::XmlLoader::ThreadedLoader: public TQObject, public TQThread { Q_OBJECT - TQ_OBJECT + TQObject *m_target; TQXmlInputSource *m_source; @@ -58,7 +58,7 @@ class MetaBundle::XmlLoader::ThreadedLoader: public TQObject, public TQThread class MetaBundle::XmlLoader::SimpleLoader: public TQObject { Q_OBJECT - TQ_OBJECT + public: BundleList bundles; -- cgit v1.2.3