summaryrefslogtreecommitdiffstats
path: root/kmix
diff options
context:
space:
mode:
Diffstat (limited to 'kmix')
-rw-r--r--kmix/KMixApp.h2
-rw-r--r--kmix/dialogselectmaster.h2
-rw-r--r--kmix/dialogviewconfiguration.h2
-rw-r--r--kmix/kledbutton.h2
-rw-r--r--kmix/kmix.h2
-rw-r--r--kmix/kmixapplet.h4
-rw-r--r--kmix/kmixdockwidget.h2
-rw-r--r--kmix/kmixerwidget.h2
-rw-r--r--kmix/kmixprefdlg.h2
-rw-r--r--kmix/ksmallslider.h2
-rw-r--r--kmix/mdwenum.h2
-rw-r--r--kmix/mdwslider.h2
-rw-r--r--kmix/mdwswitch.h2
-rw-r--r--kmix/mixdevice.h2
-rw-r--r--kmix/mixdevicewidget.h2
-rw-r--r--kmix/mixer.h2
-rw-r--r--kmix/viewapplet.h2
-rw-r--r--kmix/viewbase.h2
-rw-r--r--kmix/viewdockareapopup.h2
-rw-r--r--kmix/viewgrid.h2
-rw-r--r--kmix/viewinput.h2
-rw-r--r--kmix/viewoutput.h2
-rw-r--r--kmix/viewsliders.h2
-rw-r--r--kmix/viewsurround.h2
-rw-r--r--kmix/viewswitches.h2
25 files changed, 26 insertions, 26 deletions
diff --git a/kmix/KMixApp.h b/kmix/KMixApp.h
index 4b5b1122..7630e1f8 100644
--- a/kmix/KMixApp.h
+++ b/kmix/KMixApp.h
@@ -8,7 +8,7 @@ class KMixWindow;
class KMixApp : public KUniqueApplication
{
Q_OBJECT
- TQ_OBJECT
+
public:
KMixApp();
~KMixApp();
diff --git a/kmix/dialogselectmaster.h b/kmix/dialogselectmaster.h
index 5a3a57b2..8150b197 100644
--- a/kmix/dialogselectmaster.h
+++ b/kmix/dialogselectmaster.h
@@ -16,7 +16,7 @@ class Mixer;
class DialogSelectMaster : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
DialogSelectMaster(Mixer *);
~DialogSelectMaster();
diff --git a/kmix/dialogviewconfiguration.h b/kmix/dialogviewconfiguration.h
index 8d64bd27..ce228f52 100644
--- a/kmix/dialogviewconfiguration.h
+++ b/kmix/dialogviewconfiguration.h
@@ -13,7 +13,7 @@ class TQVBoxLayout;
class DialogViewConfiguration : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
DialogViewConfiguration(TQWidget* parent, ViewBase& view);
~DialogViewConfiguration();
diff --git a/kmix/kledbutton.h b/kmix/kledbutton.h
index 36572ad2..0be42783 100644
--- a/kmix/kledbutton.h
+++ b/kmix/kledbutton.h
@@ -32,7 +32,7 @@
class KLedButton : public KLed {
Q_OBJECT
- TQ_OBJECT
+
public:
KLedButton(const TQColor &col=TQt::green, TQWidget *parent=0, const char *name=0);
KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape shape,
diff --git a/kmix/kmix.h b/kmix/kmix.h
index 09e4cb15..b116af22 100644
--- a/kmix/kmix.h
+++ b/kmix/kmix.h
@@ -55,7 +55,7 @@ class
KMixWindow : public KMainWindow
{
Q_OBJECT
- TQ_OBJECT
+
public:
KMixWindow();
diff --git a/kmix/kmixapplet.h b/kmix/kmixapplet.h
index 2147b421..376b3290 100644
--- a/kmix/kmixapplet.h
+++ b/kmix/kmixapplet.h
@@ -43,7 +43,7 @@ class KMixApplet;
class AppletConfigDialog : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
AppletConfigDialog( TQWidget * parent=0, const char * name=0 );
virtual ~AppletConfigDialog() {};
@@ -71,7 +71,7 @@ class AppletConfigDialog : public KDialogBase
class KMixApplet : public KPanelApplet
{
Q_OBJECT
- TQ_OBJECT
+
public:
KMixApplet( const TQString& configFile, Type t = Normal,
diff --git a/kmix/kmixdockwidget.h b/kmix/kmixdockwidget.h
index bf9c4390..102df725 100644
--- a/kmix/kmixdockwidget.h
+++ b/kmix/kmixdockwidget.h
@@ -39,7 +39,7 @@ class Volume;
class KMixDockWidget : public KSystemTray {
Q_OBJECT
- TQ_OBJECT
+
friend class KMixWindow;
diff --git a/kmix/kmixerwidget.h b/kmix/kmixerwidget.h
index 7e03ff79..43f6574b 100644
--- a/kmix/kmixerwidget.h
+++ b/kmix/kmixerwidget.h
@@ -59,7 +59,7 @@ class ViewSurround;
class KMixerWidget : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName,
diff --git a/kmix/kmixprefdlg.h b/kmix/kmixprefdlg.h
index e719dd50..1df314aa 100644
--- a/kmix/kmixprefdlg.h
+++ b/kmix/kmixprefdlg.h
@@ -33,7 +33,7 @@ class
KMixPrefDlg : public KDialogBase
{
Q_OBJECT
- TQ_OBJECT
+
friend class KMixWindow;
diff --git a/kmix/ksmallslider.h b/kmix/ksmallslider.h
index 2ed0f6e6..16b11b70 100644
--- a/kmix/ksmallslider.h
+++ b/kmix/ksmallslider.h
@@ -32,7 +32,7 @@
class KSmallSlider : public TQWidget, public TQRangeControl
{
Q_OBJECT
- TQ_OBJECT
+
public:
KSmallSlider( TQWidget *parent, const char *name=0 );
diff --git a/kmix/mdwenum.h b/kmix/mdwenum.h
index 398afa93..28415133 100644
--- a/kmix/mdwenum.h
+++ b/kmix/mdwenum.h
@@ -42,7 +42,7 @@ class ViewBase;
class MDWEnum : public MixDeviceWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
MDWEnum( Mixer *mixer, MixDevice* md,
diff --git a/kmix/mdwslider.h b/kmix/mdwslider.h
index 49b3d700..0bd8c059 100644
--- a/kmix/mdwslider.h
+++ b/kmix/mdwslider.h
@@ -56,7 +56,7 @@ class ViewBase;
class MDWSlider : public MixDeviceWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
MDWSlider( Mixer *mixer, MixDevice* md,
diff --git a/kmix/mdwswitch.h b/kmix/mdwswitch.h
index 5b4b15e0..442ef174 100644
--- a/kmix/mdwswitch.h
+++ b/kmix/mdwswitch.h
@@ -52,7 +52,7 @@ class ViewBase;
class MDWSwitch : public MixDeviceWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
MDWSwitch( Mixer *mixer, MixDevice* md,
diff --git a/kmix/mixdevice.h b/kmix/mixdevice.h
index 1ec64696..2009811e 100644
--- a/kmix/mixdevice.h
+++ b/kmix/mixdevice.h
@@ -19,7 +19,7 @@
class MixDevice : public TQObject
{
Q_OBJECT
- TQ_OBJECT
+
public:
// For each ChannelType a special icon exists
diff --git a/kmix/mixdevicewidget.h b/kmix/mixdevicewidget.h
index c5a06cc6..fe35c482 100644
--- a/kmix/mixdevicewidget.h
+++ b/kmix/mixdevicewidget.h
@@ -54,7 +54,7 @@ class MixDeviceWidget
: public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum ValueStyle { NNONE = 0, NABSOLUTE = 1, NRELATIVE = 2 } ;
diff --git a/kmix/mixer.h b/kmix/mixer.h
index 15e85e1b..1269d609 100644
--- a/kmix/mixer.h
+++ b/kmix/mixer.h
@@ -44,7 +44,7 @@ class KConfig;
class Mixer : public TQObject, virtual public MixerIface
{
Q_OBJECT
- TQ_OBJECT
+
public:
enum MixerError { ERR_PERM=1, ERR_WRITE, ERR_READ, ERR_NODEV, ERR_NOTSUPP,
diff --git a/kmix/viewapplet.h b/kmix/viewapplet.h
index 400e45f5..f1e3d032 100644
--- a/kmix/viewapplet.h
+++ b/kmix/viewapplet.h
@@ -13,7 +13,7 @@ class Mixer;
class ViewApplet : public ViewBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position pos);
~ViewApplet();
diff --git a/kmix/viewbase.h b/kmix/viewbase.h
index 95787198..a514e325 100644
--- a/kmix/viewbase.h
+++ b/kmix/viewbase.h
@@ -17,7 +17,7 @@ class MixDevice;
class ViewBase : public TQWidget
{
Q_OBJECT
- TQ_OBJECT
+
public:
typedef uint ViewFlags;
diff --git a/kmix/viewdockareapopup.h b/kmix/viewdockareapopup.h
index 7a30a1a0..8d4b0f90 100644
--- a/kmix/viewdockareapopup.h
+++ b/kmix/viewdockareapopup.h
@@ -18,7 +18,7 @@ class TQTime;
class ViewDockAreaPopup : public ViewBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
ViewDockAreaPopup(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW);
~ViewDockAreaPopup();
diff --git a/kmix/viewgrid.h b/kmix/viewgrid.h
index 48592a55..d9883ef6 100644
--- a/kmix/viewgrid.h
+++ b/kmix/viewgrid.h
@@ -11,7 +11,7 @@ class Mixer;
class ViewGrid : public ViewBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
ViewGrid(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
~ViewGrid();
diff --git a/kmix/viewinput.h b/kmix/viewinput.h
index e21ef5c9..01d3e0fe 100644
--- a/kmix/viewinput.h
+++ b/kmix/viewinput.h
@@ -8,7 +8,7 @@ class Mixer;
class ViewInput : public ViewSliders
{
Q_OBJECT
- TQ_OBJECT
+
public:
ViewInput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
~ViewInput();
diff --git a/kmix/viewoutput.h b/kmix/viewoutput.h
index 9c4b299b..a0980494 100644
--- a/kmix/viewoutput.h
+++ b/kmix/viewoutput.h
@@ -8,7 +8,7 @@ class Mixer;
class ViewOutput : public ViewSliders
{
Q_OBJECT
- TQ_OBJECT
+
public:
ViewOutput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
~ViewOutput();
diff --git a/kmix/viewsliders.h b/kmix/viewsliders.h
index 31e3fda9..ce282247 100644
--- a/kmix/viewsliders.h
+++ b/kmix/viewsliders.h
@@ -10,7 +10,7 @@ class Mixer;
class ViewSliders : public ViewBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
ViewSliders(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
~ViewSliders();
diff --git a/kmix/viewsurround.h b/kmix/viewsurround.h
index 4ba3c5cc..32903f6b 100644
--- a/kmix/viewsurround.h
+++ b/kmix/viewsurround.h
@@ -13,7 +13,7 @@ class Mixer;
class ViewSurround : public ViewBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
ViewSurround(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
~ViewSurround();
diff --git a/kmix/viewswitches.h b/kmix/viewswitches.h
index 3ddb288f..cf0d8360 100644
--- a/kmix/viewswitches.h
+++ b/kmix/viewswitches.h
@@ -10,7 +10,7 @@ class Mixer;
class ViewSwitches : public ViewBase
{
Q_OBJECT
- TQ_OBJECT
+
public:
ViewSwitches(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
~ViewSwitches();