summaryrefslogtreecommitdiffstats
path: root/arts/modules
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:43:15 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:43:15 +0000
commite654398e46e37abf457b2b1122ab898d2c51c49f (patch)
treed39ee6440f3c3663c3ead84a2d4cc2d034667e96 /arts/modules
parente4f29b18e19394b9352f52a6c0d0d0e3932cf511 (diff)
downloadtdemultimedia-e654398e46e37abf457b2b1122ab898d2c51c49f.tar.gz
tdemultimedia-e654398e46e37abf457b2b1122ab898d2c51c49f.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1157644 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'arts/modules')
-rw-r--r--arts/modules/common/env_mixeritem_impl.cc2
-rw-r--r--arts/modules/effects/kstereovolumecontrolgui_impl.cpp6
-rw-r--r--arts/modules/effects/kstereovolumecontrolgui_impl.h16
-rw-r--r--arts/modules/synth/c_filter_stuff.h12
4 files changed, 18 insertions, 18 deletions
diff --git a/arts/modules/common/env_mixeritem_impl.cc b/arts/modules/common/env_mixeritem_impl.cc
index 632d8187..0f4db5e8 100644
--- a/arts/modules/common/env_mixeritem_impl.cc
+++ b/arts/modules/common/env_mixeritem_impl.cc
@@ -49,7 +49,7 @@ public:
if(newName != _name)
{
_name = newName;
- amClient.title(i18n("Mixer (\"%1\")").arg(QString::fromUtf8(_name.c_str())).utf8().data());
+ amClient.title(i18n("Mixer (\"%1\")").arg(TQString::fromUtf8(_name.c_str())).utf8().data());
amClient.autoRestoreID("mixer_"+_name);
for(unsigned int i = 0; i < _inputs.size(); i++)
_inputs[i].busname(channelName(i));
diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
index 3dca494c..b4db259a 100644
--- a/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
+++ b/arts/modules/effects/kstereovolumecontrolgui_impl.cpp
@@ -21,15 +21,15 @@
#include "kstereovolumecontrolgui_impl.h"
-#include <qframe.h>
+#include <tqframe.h>
#include <kdebug.h>
#include <iostream>
using namespace Arts;
-KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( QFrame* w ) : KLayoutBox_impl( w ? w : new QFrame( 0 ) )
+KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* w ) : KLayoutBox_impl( w ? w : new TQFrame( 0 ) )
{
- //kdDebug()<<"KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( QFrame* "<<w<<" )"<<endl;
+ //kdDebug()<<"KStereoVolumeControlGui_impl::KStereoVolumeControlGui_impl( TQFrame* "<<w<<" )"<<endl;
_mapper = new KStereoVolumeControlGui_EventMapper( this, _qframe );
this->addWidget( _label, -100 );
_label.bottom( Arts::East );
diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.h b/arts/modules/effects/kstereovolumecontrolgui_impl.h
index 1681b07c..8729232f 100644
--- a/arts/modules/effects/kstereovolumecontrolgui_impl.h
+++ b/arts/modules/effects/kstereovolumecontrolgui_impl.h
@@ -46,7 +46,7 @@ protected:
float _dbmin, _dbmax;
Arts::Direction _dir;
public:
- KStereoVolumeControlGui_impl( QFrame* =0 );
+ KStereoVolumeControlGui_impl( TQFrame* =0 );
void constructor( Arts::StereoVolumeControl );
@@ -76,18 +76,18 @@ private:
} // namespace Arts
-#include <qobject.h>
-#include <qtimer.h>
+#include <tqobject.h>
+#include <tqtimer.h>
-class KStereoVolumeControlGui_EventMapper : public QObject {
+class KStereoVolumeControlGui_EventMapper : public TQObject {
Q_OBJECT
public:
- QTimer* _timer;
+ TQTimer* _timer;
Arts::KStereoVolumeControlGui_impl* _impl;
public:
- KStereoVolumeControlGui_EventMapper( Arts::KStereoVolumeControlGui_impl* impl, QObject* parent, const char* name=0 ) : QObject( parent,name ), _impl( impl ) {
- _timer = new QTimer( this );
- connect( _timer, SIGNAL( timeout() ), this, SLOT( slotTimerSignal() ) );
+ KStereoVolumeControlGui_EventMapper( Arts::KStereoVolumeControlGui_impl* impl, TQObject* parent, const char* name=0 ) : TQObject( parent,name ), _impl( impl ) {
+ _timer = new TQTimer( this );
+ connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimerSignal() ) );
}
public slots:
void slotTimerSignal() { _impl->updateValues(); }
diff --git a/arts/modules/synth/c_filter_stuff.h b/arts/modules/synth/c_filter_stuff.h
index 1729cf08..edd7a4af 100644
--- a/arts/modules/synth/c_filter_stuff.h
+++ b/arts/modules/synth/c_filter_stuff.h
@@ -150,12 +150,12 @@ typedef struct {
int buflen;
} ty_afmethod;
-#define C_FLOWOUTMETHOD 0
-#define C_RBMETHOD 1
-#define C_SWAPROMETHOD 2
-#define C_SWAPRWMETHOD 3
-#define C_AIMROMETHOD 4
-#define C_AIMRWMETHOD 5
+#define C_FLOWOUQT_METHOD 0
+#define C_RBQT_METHOD 1
+#define C_SWAPROQT_METHOD 2
+#define C_SWAPRWQT_METHOD 3
+#define C_AIMROQT_METHOD 4
+#define C_AIMRWQT_METHOD 5
typedef struct {
char *filename;