summaryrefslogtreecommitdiffstats
path: root/arts/tools
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
commitb1057f437bf65300831a0ccb45b920787c6b318d (patch)
treef8a73db06ca1180d0da0ba6dfbe786197b4f4bc3 /arts/tools
parent4ddfca384ced9ad654213aef9dc2c3973720b980 (diff)
downloadtdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.tar.gz
tdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.zip
TQt4 port kdemultimedia
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'arts/tools')
-rw-r--r--arts/tools/Makefile.am4
-rw-r--r--arts/tools/artsactions.cpp6
-rw-r--r--arts/tools/artsactions.h5
-rw-r--r--arts/tools/artscontrolapplet.cpp42
-rw-r--r--arts/tools/artscontrolapplet.h7
-rw-r--r--arts/tools/artscontrolapplet_private.h17
-rw-r--r--arts/tools/audiomanager.cpp28
-rw-r--r--arts/tools/audiomanager.h6
-rw-r--r--arts/tools/choosebusdlg.cpp62
-rw-r--r--arts/tools/choosebusdlg.h3
-rw-r--r--arts/tools/environmentview.cpp10
-rw-r--r--arts/tools/environmentview.h1
-rw-r--r--arts/tools/fftscopeview.cpp10
-rw-r--r--arts/tools/fftscopeview.h1
-rw-r--r--arts/tools/levelmeters.cpp50
-rw-r--r--arts/tools/levelmeters.h25
-rw-r--r--arts/tools/main.cpp10
-rw-r--r--arts/tools/main.h5
-rw-r--r--arts/tools/mediatypesview.cpp2
-rw-r--r--arts/tools/mediatypesview.h1
-rw-r--r--arts/tools/midiinstdlg.cpp56
-rw-r--r--arts/tools/midiinstdlg.h3
-rw-r--r--arts/tools/midimanagerdlg.ui30
-rw-r--r--arts/tools/midimanagerview.cpp24
-rw-r--r--arts/tools/midimanagerview.h5
-rw-r--r--arts/tools/midimanagerwidget.ui26
-rw-r--r--arts/tools/midiportdlg.cpp44
-rw-r--r--arts/tools/midiportdlg.h3
-rw-r--r--arts/tools/statusview.cpp12
-rw-r--r--arts/tools/statusview.h3
-rw-r--r--arts/tools/templateview.cpp2
-rw-r--r--arts/tools/templateview.h3
32 files changed, 265 insertions, 241 deletions
diff --git a/arts/tools/Makefile.am b/arts/tools/Makefile.am
index e503d54a..806856ac 100644
--- a/arts/tools/Makefile.am
+++ b/arts/tools/Makefile.am
@@ -57,10 +57,10 @@ libartscontrolsupport_la_LIBADD = \
bin_PROGRAMS = artscontrol
artscontrol_SOURCES = main.cpp levelmeters.cpp
-artscontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+artscontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lartsflow
artscontrol_LDADD = libartscontrolsupport.la \
$(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_KFILE) \
- -lqtmcop -lartsflow_idl -lsoundserver_idl -lartskde
+ -lqtmcop -lartsflow -lartsflow_idl -lsoundserver_idl -lartskde
xdg_apps_DATA = artscontrol.desktop
diff --git a/arts/tools/artsactions.cpp b/arts/tools/artsactions.cpp
index c483beb0..9075f87e 100644
--- a/arts/tools/artsactions.cpp
+++ b/arts/tools/artsactions.cpp
@@ -36,8 +36,8 @@
#include "environmentview.h"
#include "mediatypesview.h"
-ArtsActions::ArtsActions( KArtsServer* server, KActionCollection* col, TQWidget* parent, const char* name )
- : TQObject( parent,name )
+ArtsActions::ArtsActions( KArtsServer* server, KActionCollection* col, TQWidget* tqparent, const char* name )
+ : TQObject( tqparent,name )
, _kartsserver( server )
, _actioncollection( col )
, _a_sv( 0 ), _a_am( 0 ), _a_asv( 0 ), _a_mmv( 0 ), _a_ev( 0 ), _a_mtv( 0 )
@@ -70,7 +70,7 @@ KAction* ArtsActions::actionAudioManager() {
return _a_am;
}
KAction* ArtsActions::actionArtsStatusView() {
- if ( !_a_asv ) _a_asv = new KAction( i18n( "aRts &Status" ), "artscontrol", KShortcut(), this, TQT_SLOT( viewArtsStatusView() ), _actioncollection, "artssupport_view_artsstatus" );
+ if ( !_a_asv ) _a_asv = new KAction( i18n( "aRts &tqStatus" ), "artscontrol", KShortcut(), this, TQT_SLOT( viewArtsStatusView() ), _actioncollection, "artssupport_view_artsstatus" );
return _a_asv;
}
KAction* ArtsActions::actionMidiManagerView() {
diff --git a/arts/tools/artsactions.h b/arts/tools/artsactions.h
index 441d7373..b6f77839 100644
--- a/arts/tools/artsactions.h
+++ b/arts/tools/artsactions.h
@@ -34,9 +34,10 @@ class MidiManagerView;
class EnvironmentView;
class MediaTypesView;
-class KDE_EXPORT ArtsActions : public QObject
+class KDE_EXPORT ArtsActions : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
Constructs a ArtsActions-object.
@@ -47,7 +48,7 @@ public:
@param artsserver a pointer to a existing KArtsServer. If 0 a new is created.
@param actioncollection the KActionCollection all the actions should belong to. Names of the actions are then: artssupport_*
- @param qwidget the parent QWidget
+ @param qwidget the tqparent TQWidget
@param name the name of the object
*/
ArtsActions( KArtsServer* artsserver, KActionCollection* actioncollection, TQWidget* qwidget, const char* name=0 );
diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp
index e4a7e16a..490366d1 100644
--- a/arts/tools/artscontrolapplet.cpp
+++ b/arts/tools/artscontrolapplet.cpp
@@ -29,18 +29,18 @@
extern "C"
{
- KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString configFile)
+ KDE_EXPORT KPanelApplet* init( TQWidget *tqparent, const TQString configFile)
{
KGlobal::locale()->insertCatalogue("artscontrol");
return new ArtsControlApplet(configFile, KPanelApplet::Normal,
KPanelApplet::About /*| KPanelApplet::Help | KPanelApplet::Preferences*/,
- parent, "artscontrolapplet");
+ tqparent, "artscontrolapplet");
}
}
-ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) : KPanelApplet(configFile, type, actions, parent, name)
+ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int actions, TQWidget *tqparent, const char *name) : KPanelApplet(configFile, type, actions, tqparent, name)
{
- //kdDebug()<<"ArtsControlApplet::ArtsControlApplet( const TQString& "<<configFile<<", Type "<<type<<", int "<<actions<<", TQWidget* "<<parent<<", const char* "<<name<<" )"<<endl;
+ //kdDebug()<<"ArtsControlApplet::ArtsControlApplet( const TQString& "<<configFile<<", Type "<<type<<", int "<<actions<<", TQWidget* "<<tqparent<<", const char* "<<name<<" )"<<endl;
// Get the current application configuration handle
ksConfig = config();
@@ -48,20 +48,20 @@ ArtsControlApplet::ArtsControlApplet(const TQString& configFile, Type type, int
if( !p->barts ) KMessageBox::information(0, i18n("Something with the ArtsServer went wrong. You probably need to restart aRts and then reload this applet."));
setCustomMenu(p->menu);
- p->layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight );
- p->layout->setSpacing( 2 );
+ p->tqlayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight );
+ p->tqlayout->setSpacing( 2 );
if( p->barts ) {
p->vu = Arts::StereoVolumeControlGui( p->volume );
p->vu.label().fontsize( 8 );
p->vuw = new KArtsWidget( p->vu, this );
p->vuw->setMinimumSize( 16,16 );
- p->layout->addWidget( p->vuw );
+ p->tqlayout->addWidget( p->vuw );
}
- p->layout->activate();
+ p->tqlayout->activate();
- TQTimer::singleShot( 100, this, TQT_SLOT( supdatelayout() ) );
+ TQTimer::singleShot( 100, this, TQT_SLOT( supdatetqlayout() ) );
kdDebug()<<"ArtsControlApplet::ArtsControlApplet() finished."<<endl;
}
@@ -93,12 +93,12 @@ kdDebug()<<k_funcinfo<<endl;
int ArtsControlApplet::widthForHeight( int h ) const {
kdDebug()<<"ArtsControlApplet::widthForHeight( int "<<h<<" )"<<endl;
- return p->layout->sizeHint().width();
+ return p->tqlayout->tqsizeHint().width();
}
int ArtsControlApplet::heightForWidth( int w ) const {
kdDebug()<<"ArtsControlApplet::heightForWidth( int "<<w<<" )"<<endl;
- return p->layout->sizeHint().height();
+ return p->tqlayout->tqsizeHint().height();
}
void ArtsControlApplet::resizeEvent( TQResizeEvent * /*_Event*/ ) {
@@ -122,12 +122,12 @@ kdDebug()<<k_funcinfo<<" position()="<<position()<<endl;
{
case pTop:
case pBottom:
- p->layout->setDirection( TQBoxLayout::LeftToRight );
+ p->tqlayout->setDirection( TQBoxLayout::LeftToRight );
if ( p->barts ) p->vu.direction( Arts::LeftToRight );
break;
case pRight:
case pLeft:
- p->layout->setDirection( TQBoxLayout::TopToBottom );
+ p->tqlayout->setDirection( TQBoxLayout::TopToBottom );
if ( p->barts ) p->vu.direction( Arts::TopToBottom );
break;
default: break;
@@ -140,23 +140,23 @@ kdDebug() << k_funcinfo << endl;
svinline = new FFTScopeView( arts->server(), _parent );
svinline->setMargin( 2 ); svinline->setLineWidth( 2 ); svinline->setFrameStyle( TQFrame::Panel|TQFrame::Sunken );
connect( svinline, TQT_SIGNAL( closed() ), this, TQT_SLOT( SVinline() ) );
- layout->addWidget( svinline );
+ tqlayout->addWidget( svinline );
} else {
delete svinline;
svinline = 0;
}
- _parent->supdatelayout();
+ _parent->supdatetqlayout();
}
void ArtsControlAppletPrivate::moreBars() { vu.left().count( vu.left().count()+10 ); vu.right().count( vu.right().count()+10 ); }
void ArtsControlAppletPrivate::lessBars() { vu.left().count( vu.left().count()-10 ); vu.right().count( vu.right().count()-10 ); }
-void ArtsControlAppletPrivate::styleNormalBars() { vu.left().style( Arts::lmNormalBars ); vu.right().style( Arts::lmNormalBars ); _parent->supdatelayout(); }
-void ArtsControlAppletPrivate::styleFireBars() { vu.left().style( Arts::lmFireBars ); vu.right().style( Arts::lmFireBars ); _parent->supdatelayout(); }
-void ArtsControlAppletPrivate::styleLineBars() { vu.left().style( Arts::lmLineBars ); vu.right().style( Arts::lmLineBars ); _parent->supdatelayout(); }
-void ArtsControlAppletPrivate::styleLEDs() { vu.left().style( Arts::lmLEDs ); vu.right().style( Arts::lmLEDs ); _parent->supdatelayout(); }
-void ArtsControlAppletPrivate::styleAnalog() { vu.left().style( Arts::lmAnalog ); vu.right().style( Arts::lmAnalog ); _parent->supdatelayout(); }
-void ArtsControlAppletPrivate::styleSmall() { vu.left().style( Arts::lmSmall ); vu.right().style( Arts::lmSmall ); _parent->supdatelayout(); }
+void ArtsControlAppletPrivate::styleNormalBars() { vu.left().style( Arts::lmNormalBars ); vu.right().style( Arts::lmNormalBars ); _parent->supdatetqlayout(); }
+void ArtsControlAppletPrivate::styleFireBars() { vu.left().style( Arts::lmFireBars ); vu.right().style( Arts::lmFireBars ); _parent->supdatetqlayout(); }
+void ArtsControlAppletPrivate::styleLineBars() { vu.left().style( Arts::lmLineBars ); vu.right().style( Arts::lmLineBars ); _parent->supdatetqlayout(); }
+void ArtsControlAppletPrivate::styleLEDs() { vu.left().style( Arts::lmLEDs ); vu.right().style( Arts::lmLEDs ); _parent->supdatetqlayout(); }
+void ArtsControlAppletPrivate::styleAnalog() { vu.left().style( Arts::lmAnalog ); vu.right().style( Arts::lmAnalog ); _parent->supdatetqlayout(); }
+void ArtsControlAppletPrivate::styleSmall() { vu.left().style( Arts::lmSmall ); vu.right().style( Arts::lmSmall ); _parent->supdatetqlayout(); }
// vim: sw=4 ts=4
#include "artscontrolapplet.moc"
diff --git a/arts/tools/artscontrolapplet.h b/arts/tools/artscontrolapplet.h
index 9efe5eb5..ab683464 100644
--- a/arts/tools/artscontrolapplet.h
+++ b/arts/tools/artscontrolapplet.h
@@ -31,6 +31,7 @@ class ArtsControlAppletPrivate;
class ArtsControlApplet : public KPanelApplet
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Construct a @ref KPanelApplet just like any other widget.
@@ -38,8 +39,8 @@ public:
* @param configFile The configFile handed over in the factory function.
* @param Type The applet @ref type().
* @param actions Standard RMB menu actions supported by the applet (see @ref action() ).
- * @param parent The pointer to the parent widget handed over in the factory function.
- * @param name A Qt object name for your applet.
+ * @param tqparent The pointer to the tqparent widget handed over in the factory function.
+ * @param name A TQt object name for your applet.
**/
ArtsControlApplet(const TQString& configFile, Type t = Normal, int = 0,
TQWidget * = 0, const char * = 0);
@@ -119,7 +120,7 @@ protected:
void positionChange( Position );
public slots:
- void supdatelayout() { emit updateLayout(); }
+ void supdatetqlayout() { emit updateLayout(); }
protected slots:
void resetLayout();
diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h
index 2b681b92..2f7c553d 100644
--- a/arts/tools/artscontrolapplet_private.h
+++ b/arts/tools/artscontrolapplet_private.h
@@ -47,11 +47,12 @@ class VolumeSlider;
class KDE_EXPORT ArtsControlAppletPrivate : public TQObject {
Q_OBJECT
+ TQ_OBJECT
private:
ArtsControlApplet *_parent;
ArtsActions* _artsactions;
public:
- TQBoxLayout *layout;
+ TQBoxLayout *tqlayout;
KArtsServer *arts;
KArtsDispatcher *dispatcher;
Arts::StereoVolumeControl volume;
@@ -62,12 +63,12 @@ public:
Arts::StereoVolumeControlGui vu;
KPopupMenu *menu;
- KAction *_showSV, *_showSVinline, *_showAM, *_showArtsStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars;
+ KAction *_showSV, *_showSVinline, *_showAM, *_showArtstqStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars;
KAction *_styleNormalBars, *_styleFireBars, *_styleLineBars, *_styleLEDs, *_styleAnalog, *_styleSmall;
- ArtsControlAppletPrivate( ArtsControlApplet *parent )
- : TQObject(parent)
- , _parent( parent )
+ ArtsControlAppletPrivate( ArtsControlApplet *tqparent )
+ : TQObject(tqparent)
+ , _parent( tqparent )
, barts( false )
, bInUpdate( false )
{
@@ -77,7 +78,7 @@ public:
if( barts ) volume = arts->server().outVolume();
svinline=0;
- _artsactions = new ArtsActions( arts, 0, parent );
+ _artsactions = new ArtsActions( arts, 0, tqparent );
menu = new KPopupMenu( 0 );
_showSV = _artsactions->actionScopeView();
@@ -86,8 +87,8 @@ public:
_showSVinline->plug( menu );
_showAM = _artsactions->actionAudioManager();
_showAM->plug( menu );
- _showArtsStatus = _artsactions->actionArtsStatusView();
- _showArtsStatus->plug( menu );
+ _showArtstqStatus = _artsactions->actionArtsStatusView();
+ _showArtstqStatus->plug( menu );
_showMidiManager = _artsactions->actionMidiManagerView();
_showMidiManager->plug( menu );
_showEnvironment = _artsactions->actionEnvironmentView();
diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp
index eff4f6f9..73debf80 100644
--- a/arts/tools/audiomanager.cpp
+++ b/arts/tools/audiomanager.cpp
@@ -37,7 +37,7 @@ using namespace std;
* as this is an 1:1 port of an old arts-0.3.4.1 artsbuilable visual widget,
* you'll see some porting artefacts, and it's not elegance itself ;)
*/
-Gui_AUDIO_MANAGER::Gui_AUDIO_MANAGER( TQWidget* parent, const char* name ) : Template_ArtsView( parent,name )
+Gui_AUDIO_MANAGER::Gui_AUDIO_MANAGER( TQWidget* tqparent, const char* name ) : Template_ArtsView( tqparent,name )
{
this->setCaption( i18n( "Audio Manager" ) );
this->setIcon( MainBarIcon( "artsaudiomanager", 32 ) );
@@ -72,14 +72,14 @@ void Gui_AUDIO_MANAGER::widgetDestroyed(TQWidget *widget)
}
#endif
-void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/)
+void Gui_AUDIO_MANAGER::setParent(TQWidget *tqparent, TQBoxLayout * /*tqlayout*/)
{
/************************************************************************
* From Gui_INSTRUMENT_MAPPER:
*
- * I am still not sure wether this kind of putting yourself into a parent
- * widget (with own layout etc.) is a good idea (there may not even be
- * a singe call to setParent, because there is no parent).
+ * I am still not sure wether this kind of putting yourself into a tqparent
+ * widget (with own tqlayout etc.) is a good idea (there may not even be
+ * a singe call to setParent, because there is no tqparent).
*
* But the "how to write aRts widgets"-stuff will need some experiments,
* so lets try that method...
@@ -90,12 +90,12 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/)
* else would be appropriate. Check that. FIXME
************************************************************************/
- TQVBoxLayout *mainlayout = new TQVBoxLayout(parent);
- /*TQHBoxLayout *contentslayout = new TQHBoxLayout;*/
+ TQVBoxLayout *maintqlayout = new TQVBoxLayout(tqparent);
+ /*TQHBoxLayout *contentstqlayout = new TQHBoxLayout;*/
// list
- listview = new KListView(parent);
+ listview = new KListView(tqparent);
listview->addColumn(i18n("Title"),175);
listview->addColumn(i18n("Type"),50);
@@ -106,11 +106,11 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/)
TQObject::connect(listview,TQT_SIGNAL(executed(TQListViewItem *)),proxy,
TQT_SLOT(edit(TQListViewItem *)));
- mainlayout->addWidget(listview);
+ maintqlayout->addWidget(listview);
- mainlayout->activate();
- //mainlayout->freeze();
- ParentWidget = parent;
+ maintqlayout->activate();
+ //maintqlayout->freeze();
+ ParentWidget = tqparent;
}
void Gui_AUDIO_MANAGER::tick()
@@ -178,8 +178,8 @@ void GuiAudioManagerProxy::edit(TQListViewItem *item)
gim->edit(item);
}
-AudioManagerItem::AudioManagerItem(TQListView *parent, TQString a,
- TQString b, TQString c, long ID) :TQListViewItem(parent,a,b,c)
+AudioManagerItem::AudioManagerItem(TQListView *tqparent, TQString a,
+ TQString b, TQString c, long ID) :TQListViewItem(tqparent,a,b,c)
{
_ID = ID;
}
diff --git a/arts/tools/audiomanager.h b/arts/tools/audiomanager.h
index bef1c463..5a23092d 100644
--- a/arts/tools/audiomanager.h
+++ b/arts/tools/audiomanager.h
@@ -37,6 +37,7 @@ class TQBoxLayout;
class Gui_AUDIO_MANAGER : public Template_ArtsView
{
Q_OBJECT
+ TQ_OBJECT
protected:
TQWidget *ParentWidget;
KListView *listview;
@@ -50,7 +51,7 @@ public:
Gui_AUDIO_MANAGER( TQWidget* =0, const char* =0 );
~Gui_AUDIO_MANAGER();
- void setParent(TQWidget *Parent,TQBoxLayout *layout);
+ void setParent(TQWidget *Parent,TQBoxLayout *tqlayout);
void edit(TQListViewItem *item);
public slots:
@@ -59,6 +60,7 @@ public slots:
class GuiAudioManagerProxy :public TQObject {
Q_OBJECT
+ TQ_OBJECT
Gui_AUDIO_MANAGER *gim;
public:
GuiAudioManagerProxy(Gui_AUDIO_MANAGER *gim);
@@ -69,7 +71,7 @@ public slots:
class AudioManagerItem : public TQListViewItem {
long _ID;
public:
- AudioManagerItem(TQListView *parent, TQString a, TQString b,
+ AudioManagerItem(TQListView *tqparent, TQString a, TQString b,
TQString c, long ID);
~AudioManagerItem();
diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp
index cb005f4c..a4f96ba5 100644
--- a/arts/tools/choosebusdlg.cpp
+++ b/arts/tools/choosebusdlg.cpp
@@ -39,36 +39,36 @@
using namespace std;
static void min_size(TQWidget *w) {
- w->setMinimumSize(w->sizeHint());
+ w->setMinimumSize(w->tqsizeHint());
}
-ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
- : KDialog(parent,"X", TRUE)
+ChooseBusDlg::ChooseBusDlg(TQWidget *tqparent)
+ : KDialog(tqparent,"X", TRUE)
, _newbusitemindex( -1 )
{
setCaption(i18n("Choose Bus"));
- TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
+ TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
// caption label: "Synthesis running..."
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
TQLabel *captionlabel = new TQLabel(this);
TQFont labelfont(captionlabel->font());
labelfont.setPointSize(labelfont.pointSize()*3/2);
captionlabel->setFont(labelfont);
captionlabel->setText(TQString(" ")+i18n("Available busses:")+TQString(" "));
- captionlabel->setAlignment(AlignCenter);
+ captionlabel->tqsetAlignment(AlignCenter);
min_size(captionlabel);
- mainlayout->addWidget(captionlabel);
+ maintqlayout->addWidget(captionlabel);
// hruler
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(ruler2);
+ maintqlayout->addWidget(ruler2);
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
// listwidget
@@ -89,44 +89,44 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
if( listbox->count() > 0 )
listbox->setCurrentItem( 0 );
- mainlayout->addWidget(listbox);
+ maintqlayout->addWidget(listbox);
// hruler
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
KSeparator *ruler = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(ruler);
- mainlayout->addSpacing(5);
+ maintqlayout->addWidget(ruler);
+ maintqlayout->addSpacing(5);
// new bus lineedit
- TQBoxLayout * layout2 = new TQHBoxLayout( mainlayout );
- //mainlayout->addLayout( layout2 );
+ TQBoxLayout * tqlayout2 = new TQHBoxLayout( maintqlayout );
+ //maintqlayout->addLayout( tqlayout2 );
TQLabel * newbuslabel = new TQLabel( i18n( "New bus:" ), this );
- layout2->addWidget( newbuslabel );
+ tqlayout2->addWidget( newbuslabel );
lineedit = new KLineEdit( this );
connect( lineedit, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( textChanged( const TQString & ) ) );
- layout2->addWidget( lineedit );
+ tqlayout2->addWidget( lineedit );
// hruler
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
KSeparator *ruler3 = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(ruler3);
+ maintqlayout->addWidget(ruler3);
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
// buttons
- mainlayout->addSpacing(5);
- TQHBoxLayout *buttonlayout = new TQHBoxLayout( mainlayout );
- //mainlayout->addLayout(buttonlayout);
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
+ TQHBoxLayout *buttontqlayout = new TQHBoxLayout( maintqlayout );
+ //maintqlayout->addLayout(buttontqlayout);
+ maintqlayout->addSpacing(5);
- buttonlayout->addSpacing(5);
+ buttontqlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
bbox->addStretch(1);
TQPushButton * okbutton = bbox->addButton(KStdGuiItem::ok());
@@ -136,12 +136,12 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel());
connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) );
- bbox->layout();
+ bbox->tqlayout();
- buttonlayout->addWidget(bbox);
- buttonlayout->addSpacing(5);
+ buttontqlayout->addWidget(bbox);
+ buttontqlayout->addSpacing(5);
- mainlayout->freeze();
+ maintqlayout->freeze();
}
TQString ChooseBusDlg::result()
diff --git a/arts/tools/choosebusdlg.h b/arts/tools/choosebusdlg.h
index 6f1a506d..9ba29b8a 100644
--- a/arts/tools/choosebusdlg.h
+++ b/arts/tools/choosebusdlg.h
@@ -30,12 +30,13 @@ class TQPushButton;
class ChooseBusDlg :public KDialog {
Q_OBJECT
+ TQ_OBJECT
TQListBox *listbox;
KLineEdit * lineedit;
int _newbusitemindex;
public:
- ChooseBusDlg(TQWidget *parent);
+ ChooseBusDlg(TQWidget *tqparent);
public slots:
TQString result();
diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp
index 9cedfed1..acbb2083 100644
--- a/arts/tools/environmentview.cpp
+++ b/arts/tools/environmentview.cpp
@@ -57,18 +57,18 @@ public:
printf("~ItemView()\n");
}
TQString text() const {
- return TQString::fromLatin1(item._interfaceName().c_str());
+ return TQString::tqfromLatin1(item._interfaceName().c_str());
}
};
-EnvironmentView::EnvironmentView( Container container, TQWidget* parent, const char* name ) : Template_ArtsView( parent,name ), container(container)
+EnvironmentView::EnvironmentView( Container container, TQWidget* tqparent, const char* name ) : Template_ArtsView( tqparent,name ), container(container)
{
this->setCaption( i18n( "Environment" ) );
this->setIcon( MainBarIcon( "artsenvironment", 32 ) );
TQVBoxLayout* _layout = new TQVBoxLayout( this );
_layout->setAutoAdd( true );
defaultEnvFileName = DEFAULT_ENV_FILENAME;
- defaultEnvFileName.replace('~', TQDir::homeDirPath());
+ defaultEnvFileName.tqreplace('~', TQDir::homeDirPath());
listBox = new KListBox(this);
update();
connect(listBox,TQT_SIGNAL(executed(TQListBoxItem*)),
@@ -84,11 +84,11 @@ EnvironmentView::EnvironmentView( Container container, TQWidget* parent, const c
connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(delItem()));
TQPushButton *loadButton = new
- TQPushButton(i18n("Load %1").arg(DEFAULT_ENV_FILENAME), this);
+ TQPushButton(i18n("Load %1").tqarg(DEFAULT_ENV_FILENAME), this);
connect(loadButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(load()));
TQPushButton *saveButton = new
- TQPushButton(i18n("Save %1").arg(DEFAULT_ENV_FILENAME), this);
+ TQPushButton(i18n("Save %1").tqarg(DEFAULT_ENV_FILENAME), this);
connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(save()));
show();
}
diff --git a/arts/tools/environmentview.h b/arts/tools/environmentview.h
index e4b3b908..f45347f1 100644
--- a/arts/tools/environmentview.h
+++ b/arts/tools/environmentview.h
@@ -33,6 +33,7 @@ class KListBox;
class EnvironmentView : public Template_ArtsView {
Q_OBJECT
+ TQ_OBJECT
protected:
Arts::Environment::Container container;
KListBox *listBox;
diff --git a/arts/tools/fftscopeview.cpp b/arts/tools/fftscopeview.cpp
index fcaa5304..1d5c5345 100644
--- a/arts/tools/fftscopeview.cpp
+++ b/arts/tools/fftscopeview.cpp
@@ -37,8 +37,8 @@
using namespace std;
using namespace Arts;
-FFTScopeView::FFTScopeView( SimpleSoundServer server, TQWidget* parent )
- : Template_ArtsView( parent )
+FFTScopeView::FFTScopeView( SimpleSoundServer server, TQWidget* tqparent )
+ : Template_ArtsView( tqparent )
, server( server )
, scopeData( 0 )
{
@@ -80,11 +80,11 @@ kdDebug()<<k_funcinfo<<endl;
connect( updatetimer,TQT_SIGNAL( timeout() ),this,TQT_SLOT( updateScope() ) );
_artsactions = new ArtsActions( 0, 0, this );
- _moreBars = ArtsActions::actionMoreBars( this, TQT_SLOT( moreBars() ), 0 );
- _lessBars = ArtsActions::actionLessBars( this, TQT_SLOT( lessBars() ), 0 );
+ _moreBars = ArtsActions::actionMoreBars( TQT_TQOBJECT(this), TQT_SLOT( moreBars() ), 0 );
+ _lessBars = ArtsActions::actionLessBars( TQT_TQOBJECT(this), TQT_SLOT( lessBars() ), 0 );
_menu = new KPopupMenu( 0 );
_moreBars->plug( _menu ); _lessBars->plug( _menu );
- _substyle = new KAction( i18n( "Substyle" ), "", KShortcut(), this, TQT_SLOT( substyle() ), this );
+ _substyle = new KAction( i18n( "Substyle" ), "", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( substyle() ), TQT_TQOBJECT(this) );
_substyle->plug( _menu );
_menu->insertItem( i18n("VU-Style"), _artsactions->stylemenu() );
diff --git a/arts/tools/fftscopeview.h b/arts/tools/fftscopeview.h
index 945c52e3..de8ed7f5 100644
--- a/arts/tools/fftscopeview.h
+++ b/arts/tools/fftscopeview.h
@@ -40,6 +40,7 @@ class ArtsActions;
class KDE_EXPORT FFTScopeView : public Template_ArtsView {
Q_OBJECT
+ TQ_OBJECT
protected:
Arts::StereoFFTScope scopefx;
Arts::SimpleSoundServer server;
diff --git a/arts/tools/levelmeters.cpp b/arts/tools/levelmeters.cpp
index 1d0b080c..ae7834a8 100644
--- a/arts/tools/levelmeters.cpp
+++ b/arts/tools/levelmeters.cpp
@@ -7,8 +7,8 @@
const int PeakBar::peakMillis=1500;
-PeakBar::PeakBar(TQWidget *parent)
- : ACLevelMeter(parent)
+PeakBar::PeakBar(TQWidget *tqparent)
+ : ACLevelMeter(tqparent)
, maxValue( 0.0f )
, minValue( 0.0f )
{
@@ -20,7 +20,7 @@ PeakBar::PeakBar(TQWidget *parent)
lastValues.setAutoDelete( TRUE );
setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken);
- setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
+ tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
setBackgroundMode(NoBackground);
setMinimumSize(frameWidth()+7, 70);
}
@@ -30,7 +30,7 @@ void PeakBar::frameChanged() {
TQFrame::frameChanged();
}
-TQSize PeakBar::sizeHint() const {
+TQSize PeakBar::tqsizeHint() const {
return TQSize(13, 250);
}
@@ -104,25 +104,25 @@ void PeakBar::setValue(float f) {
lastValues.append(new Observation(f));
- repaint();
+ tqrepaint();
}
// -------------------------------------------------------------
-PeakLevelMeters::PeakLevelMeters(TQWidget *parent):
- StereoLevelMeter(parent), left(this), right(this), scaleView(this)
+PeakLevelMeters::PeakLevelMeters(TQWidget *tqparent):
+ StereoLevelMeter(tqparent), left(this), right(this), scaleView(this)
{
- TQBoxLayout *layout= new TQHBoxLayout(this);
- layout->addWidget(&left);
- // layout->setStretchFactor(&left, 0);
- layout->addWidget(&right);
- // layout->setStretchFactor(&right, 0);
- layout->addWidget(&scaleView);
- // layout->setStretchFactor(&scaleView, 0);
+ TQBoxLayout *tqlayout= new TQHBoxLayout(this);
+ tqlayout->addWidget(&left);
+ // tqlayout->setStretchFactor(&left, 0);
+ tqlayout->addWidget(&right);
+ // tqlayout->setStretchFactor(&right, 0);
+ tqlayout->addWidget(&scaleView);
+ // tqlayout->setStretchFactor(&scaleView, 0);
left.setLineWidth(2);
right.setLineWidth(2);
scaleView.setScaleMargins(right.frameWidth());
- setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
+ tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
setDbRange(36);
}
@@ -142,17 +142,17 @@ void PeakLevelMeters::setValues(float leftVal, float rightVal) {
right.setValue(f);
}
-ScaleView::ScaleView(TQWidget *parent): TQFrame(parent) {
+ScaleView::ScaleView(TQWidget *tqparent): TQFrame(tqparent) {
font.setPixelSize(10);
- setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred));
+ tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred));
}
void ScaleView::setDbRange(int db) {
dbRange= db;
- repaint();
+ tqrepaint();
}
-TQSize ScaleView::sizeHint() const {
+TQSize ScaleView::tqsizeHint() const {
return TQSize(TQFontMetrics(font).width("-88")+8, 250);
}
@@ -187,7 +187,7 @@ void ScaleView::drawContents(TQPainter *p) {
// -------------------------------------------------------------
-LedMeter::LedMeter(TQWidget *parent, bool blueState) : ACLevelMeter(parent) {
+LedMeter::LedMeter(TQWidget *tqparent, bool blueState) : ACLevelMeter(tqparent) {
setBackgroundColor(black);
TQBoxLayout * l = new TQVBoxLayout( this );
l->setAutoAdd(TRUE);
@@ -223,12 +223,12 @@ void LedMeter::setValue(float f)
// -------------------------------------------------------------
-StereoLedMeters::StereoLedMeters(TQWidget *parent)
- : StereoLevelMeter(parent), left(this), right(this)
+StereoLedMeters::StereoLedMeters(TQWidget *tqparent)
+ : StereoLevelMeter(tqparent), left(this), right(this)
{
- TQBoxLayout *layout= new TQHBoxLayout(this);
- layout->addWidget(&left);
- layout->addWidget(&right);
+ TQBoxLayout *tqlayout= new TQHBoxLayout(this);
+ tqlayout->addWidget(&left);
+ tqlayout->addWidget(&right);
}
void StereoLedMeters::setValues(float leftVal, float rightVal) {
diff --git a/arts/tools/levelmeters.h b/arts/tools/levelmeters.h
index 638d0d9a..64c41c0b 100644
--- a/arts/tools/levelmeters.h
+++ b/arts/tools/levelmeters.h
@@ -44,8 +44,9 @@ inline float DBToLevel(float db) {
*/
class ACLevelMeter : public TQFrame {
Q_OBJECT
+ TQ_OBJECT
public:
- ACLevelMeter(TQWidget *parent): TQFrame(parent) {}
+ ACLevelMeter(TQWidget *tqparent): TQFrame(tqparent) {}
public slots:
virtual void setValue(float f) = 0;
};
@@ -55,8 +56,9 @@ public slots:
*/
class StereoLevelMeter : public TQFrame {
Q_OBJECT
+ TQ_OBJECT
public:
- StereoLevelMeter(TQWidget *parent): TQFrame(parent) {}
+ StereoLevelMeter(TQWidget *tqparent): TQFrame(tqparent) {}
public slots:
virtual void setValues(float left, float right) = 0;
};
@@ -67,6 +69,7 @@ public slots:
*/
class PeakBar : public ACLevelMeter {
Q_OBJECT
+ TQ_OBJECT
bool clipped;
protected:
@@ -89,9 +92,9 @@ protected:
void frameChanged();
public:
- PeakBar(TQWidget *parent);
+ PeakBar(TQWidget *tqparent);
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
void drawContents(TQPainter *p);
virtual void setValue(float f);
@@ -102,15 +105,16 @@ public:
*/
class ScaleView : public TQFrame {
Q_OBJECT
+ TQ_OBJECT
protected:
TQFont font;
int dbRange;
int upperMargin, lowerMargin;
public:
- ScaleView(TQWidget *parent);
+ ScaleView(TQWidget *tqparent);
void setDbRange(int db);
void setScaleMargins(int margins) { upperMargin= margins; lowerMargin=margins; }
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
void drawContents(TQPainter *p);
};
@@ -121,13 +125,14 @@ public:
*/
class PeakLevelMeters : public StereoLevelMeter {
Q_OBJECT
+ TQ_OBJECT
protected:
int dbRange;
PeakBar left, right;
ScaleView scaleView;
public:
- PeakLevelMeters(TQWidget *parent);
+ PeakLevelMeters(TQWidget *tqparent);
public slots:
void setValues(float leftVal, float rightVal);
@@ -143,11 +148,12 @@ class KLed;
*/
class LedMeter : public ACLevelMeter {
Q_OBJECT
+ TQ_OBJECT
protected:
KLed *leds[12];
public:
- LedMeter(TQWidget *parent, bool blueState = false);
+ LedMeter(TQWidget *tqparent, bool blueState = false);
void setValue(float f);
};
@@ -156,11 +162,12 @@ public:
*/
class StereoLedMeters : public StereoLevelMeter {
Q_OBJECT
+ TQ_OBJECT
protected:
LedMeter left, right;
public:
- StereoLedMeters(TQWidget *parent);
+ StereoLedMeters(TQWidget *tqparent);
public slots:
void setValues(float left, float right);
};
diff --git a/arts/tools/main.cpp b/arts/tools/main.cpp
index 60df8f1d..5492f38a 100644
--- a/arts/tools/main.cpp
+++ b/arts/tools/main.cpp
@@ -82,7 +82,7 @@ FreeVerbView::~FreeVerbView() {
}
-VControl::VControl( KArtsServer* artsserver, TQWidget *parent) : TQFrame(parent)
+VControl::VControl( KArtsServer* artsserver, TQWidget *tqparent) : TQFrame(tqparent)
, freeVerbView(0)
, server( artsserver )
{
@@ -158,7 +158,7 @@ void MainWindow::toggleVolumeBar() {
vc->useOldVolumeBar(showOldVolumeDisplay->isChecked());
}
-MainWindow::MainWindow() : KMainWindow(0), kartsserver( new KArtsServer( this ) ) {
+MainWindow::MainWindow() : KMainWindow(0), kartsserver( new KArtsServer( TQT_TQOBJECT(this) ) ) {
kdDebug() << k_funcinfo << endl;
connect( kartsserver, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( serverRestarted() ) );
@@ -172,11 +172,11 @@ kdDebug() << k_funcinfo << endl;
( void ) artsactions->actionMidiManagerView();
( void ) artsactions->actionEnvironmentView();
( void ) artsactions->actionMediaTypesView();
- ( void ) new KAction( i18n("Toggle Free&Verb"), 0, vc, TQT_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" );
+ ( void ) new KAction( i18n("Toggle Free&Verb"), 0, TQT_TQOBJECT(vc), TQT_SLOT( showFreeVerbView() ), actionCollection(), "view_freeverb" );
showOldVolumeDisplay=
- new KToggleAction( i18n( "Old aRts-Control-Style for VU-Meter" /*"&LED-Style Volume Display"*/ ), 0, this,
+ new KToggleAction( i18n( "Old aRts-Control-Style for VU-Meter" /*"&LED-Style Volume Display"*/ ), 0, TQT_TQOBJECT(this),
TQT_SLOT( toggleVolumeBar() ), actionCollection(), "old_volume_display" );
- ( void ) KStdAction::quit( this, TQT_SLOT( close() ), actionCollection(), "quit_artscontrol" );
+ ( void ) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit_artscontrol" );
createGUI("artscontrol.rc");
resize(20,300);
diff --git a/arts/tools/main.h b/arts/tools/main.h
index 2770b054..3b52dadb 100644
--- a/arts/tools/main.h
+++ b/arts/tools/main.h
@@ -49,6 +49,7 @@ class VScale;
class FreeVerbView : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
protected:
Arts::Synth_FREEVERB freeverb;
Arts::SimpleSoundServer server;
@@ -66,6 +67,7 @@ class KArtsWidget;
class VControl : public TQFrame {
Q_OBJECT
+ TQ_OBJECT
protected:
class StereoLevelMeter *stereoMeter;
FreeVerbView *freeVerbView;
@@ -77,7 +79,7 @@ protected:
TQBoxLayout *boxLayout;
public:
- VControl( KArtsServer*, TQWidget *parent);
+ VControl( KArtsServer*, TQWidget *tqparent);
~VControl();
public slots:
@@ -91,6 +93,7 @@ private slots:
class MainWindow : public KMainWindow {
Q_OBJECT
+ TQ_OBJECT
protected:
VControl *vc;
KToggleAction *showOldVolumeDisplay;
diff --git a/arts/tools/mediatypesview.cpp b/arts/tools/mediatypesview.cpp
index 9353cda6..fb8938d7 100644
--- a/arts/tools/mediatypesview.cpp
+++ b/arts/tools/mediatypesview.cpp
@@ -33,7 +33,7 @@
using namespace std;
using namespace Arts;
-MediaTypesView::MediaTypesView( TQWidget* parent, const char* name ) : Template_ArtsView( parent,name )
+MediaTypesView::MediaTypesView( TQWidget* tqparent, const char* name ) : Template_ArtsView( tqparent,name )
{
this->setCaption( i18n( "Available Media Types" ) );
this->setIcon( MainBarIcon( "artsmediatypes", 32 ) );
diff --git a/arts/tools/mediatypesview.h b/arts/tools/mediatypesview.h
index e61338c6..8a0b3afd 100644
--- a/arts/tools/mediatypesview.h
+++ b/arts/tools/mediatypesview.h
@@ -28,6 +28,7 @@
class MediaTypesView : public Template_ArtsView {
Q_OBJECT
+ TQ_OBJECT
public:
MediaTypesView( TQWidget* =0, const char* =0 );
~MediaTypesView();
diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp
index 97867cd8..87cc2ea3 100644
--- a/arts/tools/midiinstdlg.cpp
+++ b/arts/tools/midiinstdlg.cpp
@@ -63,29 +63,29 @@ static TQStringList listFiles(TQString directory, TQString extension)
return result;
}
-MidiInstDlg::MidiInstDlg(TQWidget *parent)
- :TQDialog(parent,"instrument",TRUE)
+MidiInstDlg::MidiInstDlg(TQWidget *tqparent)
+ :TQDialog(tqparent,"instrument",TRUE)
{
- TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
+ TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
// caption label: title
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
TQLabel *captionlabel = new TQLabel(this);
TQFont labelfont(captionlabel->font());
labelfont.setPointSize(labelfont.pointSize()*3/2);
captionlabel->setFont(labelfont);
captionlabel->setText(TQString(" ")+i18n("Instrument")+TQString(" "));
- captionlabel->setAlignment(AlignCenter);
+ captionlabel->tqsetAlignment(AlignCenter);
//min_size(captionlabel);
- mainlayout->addWidget(captionlabel);
+ maintqlayout->addWidget(captionlabel);
// hruler
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(ruler2);
- mainlayout->addSpacing(5);
+ maintqlayout->addWidget(ruler2);
+ maintqlayout->addSpacing(5);
// combobox
@@ -95,10 +95,10 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent)
TQStringList::Iterator it;
for ( it = instruments.begin(); it != instruments.end(); it++ ) {
TQString modname = *it;
- TQString prefix = TQString::fromLatin1("instrument_");
+ TQString prefix = TQString::tqfromLatin1("instrument_");
if (modname.length() > 5)
modname.truncate(modname.length()-5); // kill .arts extension
- if ( (modname.startsWith(prefix)) && (!modname.contains("_GUI")) )
+ if ( (modname.startsWith(prefix)) && (!modname.tqcontains("_GUI")) )
box->insertItem(modname.mid(prefix.length()));
//kdDebug() << "inserted instrument: " << modname.mid(prefix.length()) << endl;
}
@@ -108,7 +108,7 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent)
for ( it = maps.begin(); it != maps.end(); it++ ) {
TQString modname = *it;
- TQString prefix = TQString::fromLatin1("instrument_");
+ TQString prefix = TQString::tqfromLatin1("instrument_");
if (modname.length() > 9)
modname.truncate(modname.length()-9); // kill .arts-map extension
if (modname.startsWith(prefix))
@@ -116,37 +116,37 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent)
//kdDebug() << "inserted map: " << modname.mid(prefix.length()) << endl;
}
- mainlayout->addWidget(box);
+ maintqlayout->addWidget(box);
// hruler
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
KSeparator *ruler = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(ruler);
- mainlayout->addSpacing(5);
+ maintqlayout->addWidget(ruler);
+ maintqlayout->addSpacing(5);
// buttons
- TQHBoxLayout *buttonlayout = new TQHBoxLayout;
- mainlayout->addSpacing(5);
- mainlayout->addLayout(buttonlayout);
- mainlayout->addSpacing(5);
+ TQHBoxLayout *buttontqlayout = new TQHBoxLayout;
+ maintqlayout->addSpacing(5);
+ maintqlayout->addLayout(buttontqlayout);
+ maintqlayout->addSpacing(5);
- buttonlayout->addSpacing(5);
+ buttontqlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+ bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
bbox->addStretch(1);
TQButton *okbutton = bbox->addButton(KStdGuiItem::ok());
connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) );
- bbox->layout();
+ bbox->tqlayout();
- buttonlayout->addWidget(bbox);
- buttonlayout->addSpacing(5);
+ buttontqlayout->addWidget(bbox);
+ buttontqlayout->addSpacing(5);
- mainlayout->freeze();
+ maintqlayout->freeze();
}
TQCString MidiInstDlg::filename()
@@ -157,12 +157,12 @@ TQCString MidiInstDlg::filename()
TQStringList::Iterator it;
for ( it = artsPath.begin(); it != artsPath.end(); it++ ) {
- TQString pathname = *it + TQString::fromLatin1("/instrument_") + instrument + TQString::fromLatin1(".arts");
+ TQString pathname = *it + TQString::tqfromLatin1("/instrument_") + instrument + TQString::tqfromLatin1(".arts");
TQFileInfo fi(pathname);
if (fi.exists() && fi.isReadable())
return TQFile::encodeName(pathname);
- pathname = *it + TQString::fromLatin1("/instrument_") + instrument + TQString::fromLatin1(".arts-map");
+ pathname = *it + TQString::tqfromLatin1("/instrument_") + instrument + TQString::tqfromLatin1(".arts-map");
fi.setFile(pathname);
if (fi.exists() && fi.isReadable())
return TQFile::encodeName(pathname);
diff --git a/arts/tools/midiinstdlg.h b/arts/tools/midiinstdlg.h
index 57735513..0e425225 100644
--- a/arts/tools/midiinstdlg.h
+++ b/arts/tools/midiinstdlg.h
@@ -28,9 +28,10 @@
class MidiInstDlg :public TQDialog {
Q_OBJECT
+ TQ_OBJECT
TQComboBox *box;
public:
- MidiInstDlg(TQWidget *parent);
+ MidiInstDlg(TQWidget *tqparent);
TQCString filename();
public slots:
void help();
diff --git a/arts/tools/midimanagerdlg.ui b/arts/tools/midimanagerdlg.ui
index 78941e4c..1a30f5d7 100644
--- a/arts/tools/midimanagerdlg.ui
+++ b/arts/tools/midimanagerdlg.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>MidiManagerDlg</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>MidiManagerDlg</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -25,7 +25,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>TextLabel1</cstring>
</property>
@@ -33,7 +33,7 @@
<string>MIDI inputs:</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="2">
+ <widget class="TQLabel" row="0" column="2">
<property name="name">
<cstring>TextLabel1_2</cstring>
</property>
@@ -41,17 +41,17 @@
<string>MIDI outputs:</string>
</property>
</widget>
- <widget class="QListBox" row="1" column="0">
+ <widget class="TQListBox" row="1" column="0">
<property name="name">
<cstring>inputsListBox</cstring>
</property>
</widget>
- <widget class="QListBox" row="1" column="2">
+ <widget class="TQListBox" row="1" column="2">
<property name="name">
<cstring>outputsListBox</cstring>
</property>
</widget>
- <widget class="QFrame" row="2" column="0" rowspan="1" colspan="3">
+ <widget class="TQFrame" row="2" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>Frame5</cstring>
</property>
@@ -64,9 +64,9 @@
<property name="lineWidth">
<number>0</number>
</property>
- <property name="layoutMargin" stdset="0">
+ <property name="tqlayoutMargin" stdset="0">
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<grid>
<property name="name">
@@ -78,7 +78,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QPushButton" row="0" column="0">
+ <widget class="TQPushButton" row="0" column="0">
<property name="name">
<cstring>AddButton_2</cstring>
</property>
@@ -86,7 +86,7 @@
<string>&amp;Add...</string>
</property>
</widget>
- <widget class="QPushButton" row="0" column="1">
+ <widget class="TQPushButton" row="0" column="1">
<property name="name">
<cstring>RemoveButton_2</cstring>
</property>
@@ -94,7 +94,7 @@
<string>&amp;Remove</string>
</property>
</widget>
- <widget class="QPushButton" row="0" column="2">
+ <widget class="TQPushButton" row="0" column="2">
<property name="name">
<cstring>connectButton</cstring>
</property>
@@ -102,7 +102,7 @@
<string>&amp;Connect</string>
</property>
</widget>
- <widget class="QPushButton" row="0" column="3">
+ <widget class="TQPushButton" row="0" column="3">
<property name="name">
<cstring>disconnectButton</cstring>
</property>
@@ -112,7 +112,7 @@
</widget>
</grid>
</widget>
- <widget class="QFrame" row="1" column="1">
+ <widget class="TQFrame" row="1" column="1">
<property name="name">
<cstring>connectionFrame</cstring>
</property>
@@ -147,5 +147,5 @@
</widget>
</grid>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/arts/tools/midimanagerview.cpp b/arts/tools/midimanagerview.cpp
index 4849af78..a9cefb07 100644
--- a/arts/tools/midimanagerview.cpp
+++ b/arts/tools/midimanagerview.cpp
@@ -17,8 +17,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- Permission is also granted to link this program with the Qt
- library, treating Qt like a library that normally accompanies the
+ Permission is also granted to link this program with the TQt
+ library, treating TQt like a library that normally accompanies the
operating system kernel, whether or not that is in fact the case.
*/
@@ -78,7 +78,7 @@ public:
class ConnectionWidget : public TQWidget {
public:
MidiManagerView *v;
- ConnectionWidget(MidiManagerView *v, TQWidget *parent) : TQWidget(parent), v(v)
+ ConnectionWidget(MidiManagerView *v, TQWidget *tqparent) : TQWidget(tqparent), v(v)
{
}
void paintEvent(TQPaintEvent * /*event*/)
@@ -96,8 +96,8 @@ public:
conn != item->info.connections.end(); conn++)
{
MidiManagerItem *outitem = v->itemMap[*conn];
- TQRect r1 = v->widget->inputsListBox->itemRect(item);
- TQRect r2 = v->widget->outputsListBox->itemRect(outitem);
+ TQRect r1 = v->widget->inputsListBox->tqitemRect(item);
+ TQRect r2 = v->widget->outputsListBox->tqitemRect(outitem);
if(r1.height() > 0 && r2.height() > 0)
{
@@ -122,14 +122,14 @@ MidiManagerView::MidiManagerView()
setCaption(i18n("MIDI Manager"));
setIcon( MainBarIcon( "artsfftscope", 32 ) );
- (void)new KAction(i18n("&System MIDI Port (OSS)"), 0, this, TQT_SLOT(addOSSMidiPort()),
+ (void)new KAction(i18n("&System MIDI Port (OSS)"), 0, TQT_TQOBJECT(this), TQT_SLOT(addOSSMidiPort()),
actionCollection(), "add_oss_midi_port");
- (void)new KAction(i18n("&aRts Synthesis MIDI Output"), 0, this,
+ (void)new KAction(i18n("&aRts Synthesis MIDI Output"), 0, TQT_TQOBJECT(this),
TQT_SLOT(addArtsMidiOutput()), actionCollection(), "add_arts_midi_output");
- (void) KStdAction::quit( this, TQT_SLOT(close()), actionCollection());
- connect(widget->connectButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConnect()));
- connect(widget->disconnectButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDisconnect()));
+ (void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+ connect(widget->connectButton,TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotConnect()));
+ connect(widget->disconnectButton,TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotDisconnect()));
connectionWidget = new ConnectionWidget(this, widget->connectionFrame);
connectionWidget->setMinimumSize(60,10);
@@ -185,7 +185,7 @@ void MidiManagerView::updateLists()
widget->inputsListBox->setSelected(itemMap[srcID],true);
if(destID && itemMap[destID])
widget->outputsListBox->setSelected(itemMap[destID],true);
- connectionWidget->repaint();
+ connectionWidget->tqrepaint();
}
void MidiManagerView::slotConnect()
@@ -216,7 +216,7 @@ void MidiManagerView::slotDisconnect()
void MidiManagerView::addOSSMidiPort()
{
- //lukas: no i18n here, QDialog's CTOR doesn't know about QString
+ //lukas: no i18n here, TQDialog's CTOR doesn't know about TQString
//lukas: can't use that with const char *, i18n()'ed in the dialog itself
MidiPortDlg *dlg = new MidiPortDlg(0,"/dev/midi","OSS Midi Port");
diff --git a/arts/tools/midimanagerview.h b/arts/tools/midimanagerview.h
index 546e1cef..4b395bcd 100644
--- a/arts/tools/midimanagerview.h
+++ b/arts/tools/midimanagerview.h
@@ -17,8 +17,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- Permission is also granted to link this program with the Qt
- library, treating Qt like a library that normally accompanies the
+ Permission is also granted to link this program with the TQt
+ library, treating TQt like a library that normally accompanies the
operating system kernel, whether or not that is in fact the case.
*/
@@ -36,6 +36,7 @@ class MidiManagerWidget;
class MidiManagerView : public KMainWindow {
Q_OBJECT
+ TQ_OBJECT
protected:
friend class ConnectionWidget;
Arts::MidiManager manager;
diff --git a/arts/tools/midimanagerwidget.ui b/arts/tools/midimanagerwidget.ui
index 115626d0..88e34dbe 100644
--- a/arts/tools/midimanagerwidget.ui
+++ b/arts/tools/midimanagerwidget.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>MidiManagerWidget</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>MidiManagerWidget</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -25,7 +25,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>TextLabel1</cstring>
</property>
@@ -33,7 +33,7 @@
<string>MIDI inputs:</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="2">
+ <widget class="TQLabel" row="0" column="2">
<property name="name">
<cstring>TextLabel1_2</cstring>
</property>
@@ -41,17 +41,17 @@
<string>MIDI outputs:</string>
</property>
</widget>
- <widget class="QListBox" row="1" column="0">
+ <widget class="TQListBox" row="1" column="0">
<property name="name">
<cstring>inputsListBox</cstring>
</property>
</widget>
- <widget class="QListBox" row="1" column="2">
+ <widget class="TQListBox" row="1" column="2">
<property name="name">
<cstring>outputsListBox</cstring>
</property>
</widget>
- <widget class="QFrame" row="2" column="0" rowspan="1" colspan="3">
+ <widget class="TQFrame" row="2" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>Frame5</cstring>
</property>
@@ -64,9 +64,9 @@
<property name="lineWidth">
<number>0</number>
</property>
- <property name="layoutMargin" stdset="0">
+ <property name="tqlayoutMargin" stdset="0">
</property>
- <property name="layoutSpacing" stdset="0">
+ <property name="tqlayoutSpacing" stdset="0">
</property>
<grid>
<property name="name">
@@ -78,7 +78,7 @@
<property name="spacing">
<number>6</number>
</property>
- <widget class="QPushButton" row="0" column="2">
+ <widget class="TQPushButton" row="0" column="2">
<property name="name">
<cstring>connectButton</cstring>
</property>
@@ -86,7 +86,7 @@
<string>&amp;Connect</string>
</property>
</widget>
- <widget class="QPushButton" row="0" column="3">
+ <widget class="TQPushButton" row="0" column="3">
<property name="name">
<cstring>disconnectButton</cstring>
</property>
@@ -96,7 +96,7 @@
</widget>
</grid>
</widget>
- <widget class="QFrame" row="1" column="1">
+ <widget class="TQFrame" row="1" column="1">
<property name="name">
<cstring>connectionFrame</cstring>
</property>
@@ -131,5 +131,5 @@
</widget>
</grid>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp
index 33ca6bce..eaed97f1 100644
--- a/arts/tools/midiportdlg.cpp
+++ b/arts/tools/midiportdlg.cpp
@@ -32,28 +32,28 @@
#include <tqpushbutton.h>
#include <kstdguiitem.h>
-MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *title) :TQDialog(parent,title,TRUE)
+MidiPortDlg::MidiPortDlg(TQWidget *tqparent, const char *oldname, const char *title) :TQDialog(tqparent,title,TRUE)
{
- TQVBoxLayout *mainlayout = new TQVBoxLayout(this);
+ TQVBoxLayout *maintqlayout = new TQVBoxLayout(this);
// caption label: title
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
TQLabel *captionlabel = new TQLabel(this);
TQFont labelfont(captionlabel->font());
labelfont.setPointSize(labelfont.pointSize()*3/2);
captionlabel->setFont(labelfont);
captionlabel->setText(i18n("OSS MIDI Port"));
- captionlabel->setAlignment(AlignCenter);
+ captionlabel->tqsetAlignment(AlignCenter);
//min_size(captionlabel);
- mainlayout->addWidget(captionlabel);
+ maintqlayout->addWidget(captionlabel);
// hruler
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(ruler2);
- mainlayout->addSpacing(5);
+ maintqlayout->addWidget(ruler2);
+ maintqlayout->addSpacing(5);
// editwidget
@@ -61,26 +61,26 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl
edit->setText(oldname);
//min_size(edit);
- mainlayout->addWidget(edit);
+ maintqlayout->addWidget(edit);
// hruler
- mainlayout->addSpacing(5);
+ maintqlayout->addSpacing(5);
KSeparator *ruler = new KSeparator( KSeparator::HLine, this);
- mainlayout->addWidget(ruler);
- mainlayout->addSpacing(5);
+ maintqlayout->addWidget(ruler);
+ maintqlayout->addSpacing(5);
// buttons
- TQHBoxLayout *buttonlayout = new TQHBoxLayout;
- mainlayout->addSpacing(5);
- mainlayout->addLayout(buttonlayout);
- mainlayout->addSpacing(5);
+ TQHBoxLayout *buttontqlayout = new TQHBoxLayout;
+ maintqlayout->addSpacing(5);
+ maintqlayout->addLayout(buttontqlayout);
+ maintqlayout->addSpacing(5);
- buttonlayout->addSpacing(5);
+ buttontqlayout->addSpacing(5);
KButtonBox *bbox = new KButtonBox(this);
- TQPushButton *helpbutton = bbox->addButton(KStdGuiItem::help(), this, TQT_SLOT( help() ));
+ TQPushButton *helpbutton = bbox->addButton(KStdGuiItem::help(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
bbox->addStretch(1);
helpbutton->setAutoDefault( true );
helpbutton->setDefault( true );
@@ -90,12 +90,12 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl
okbutton->setAutoDefault( true );
okbutton->setDefault( true );
- bbox->layout();
+ bbox->tqlayout();
- buttonlayout->addWidget(bbox);
- buttonlayout->addSpacing(5);
+ buttontqlayout->addWidget(bbox);
+ buttontqlayout->addSpacing(5);
- mainlayout->freeze();
+ maintqlayout->freeze();
}
const char *MidiPortDlg::device()
diff --git a/arts/tools/midiportdlg.h b/arts/tools/midiportdlg.h
index 8992776b..b6b428bc 100644
--- a/arts/tools/midiportdlg.h
+++ b/arts/tools/midiportdlg.h
@@ -31,9 +31,10 @@
class MidiPortDlg :public TQDialog {
Q_OBJECT
+ TQ_OBJECT
TQLineEdit *edit;
public:
- MidiPortDlg(TQWidget *parent, const char *device, const char *title);
+ MidiPortDlg(TQWidget *tqparent, const char *device, const char *title);
const char *device();
public slots:
diff --git a/arts/tools/statusview.cpp b/arts/tools/statusview.cpp
index c29cf4ed..6a9f0a25 100644
--- a/arts/tools/statusview.cpp
+++ b/arts/tools/statusview.cpp
@@ -33,15 +33,15 @@
using namespace std;
using namespace Arts;
-ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, const char* name )
- : Template_ArtsView( parent,name )
+ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* tqparent, const char* name )
+ : Template_ArtsView( tqparent,name )
, server(a_server)
{
- this->setCaption( i18n( "aRts Status" ) );
+ this->setCaption( i18n( "aRts tqStatus" ) );
TQBoxLayout *l= new TQVBoxLayout(this);
//l->setAutoAdd(TRUE);
- RealtimeStatus rs= server.realtimeStatus();
+ RealtimetqStatus rs= server.realtimetqStatus();
l->addWidget(new TQLabel(rs==rtRealtime?
i18n("Artsd is running with realtime scheduling."):
rs==rtNoSupport?
@@ -66,7 +66,7 @@ ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, con
connect(suspendButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(suspendButtonClicked()));
artsPollStatusTimer= new TQTimer(this);
- connect(artsPollStatusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateStatus()));
+ connect(artsPollStatusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updatetqStatus()));
artsPollStatusTimer->start(1000);
//l->activate();
show();
@@ -77,7 +77,7 @@ void ArtsStatusView::suspendButtonClicked()
(void)server.suspend(); // TODO: error msg if suspend not possible?
}
-void ArtsStatusView::updateStatus()
+void ArtsStatusView::updatetqStatus()
{
long seconds= server.secondsUntilSuspend();
if (seconds<0)
diff --git a/arts/tools/statusview.h b/arts/tools/statusview.h
index ab5ff8e8..59f757c2 100644
--- a/arts/tools/statusview.h
+++ b/arts/tools/statusview.h
@@ -35,11 +35,12 @@ class TQLabel;
class ArtsStatusView : public Template_ArtsView {
Q_OBJECT
+ TQ_OBJECT
public:
ArtsStatusView(Arts::SoundServer server, TQWidget* =0, const char* =0 );
public slots:
- void updateStatus();
+ void updatetqStatus();
void suspendButtonClicked();
protected:
diff --git a/arts/tools/templateview.cpp b/arts/tools/templateview.cpp
index a589ff46..a89efac4 100644
--- a/arts/tools/templateview.cpp
+++ b/arts/tools/templateview.cpp
@@ -22,7 +22,7 @@
//#include <kdebug.h>
-Template_ArtsView::Template_ArtsView( TQWidget* parent, const char* name ) : TQFrame( parent,name ){
+Template_ArtsView::Template_ArtsView( TQWidget* tqparent, const char* name ) : TQFrame( tqparent,name ){
//kdDebug()<<k_funcinfo<<endl;
}
diff --git a/arts/tools/templateview.h b/arts/tools/templateview.h
index efdd35f4..ab1b3ec3 100644
--- a/arts/tools/templateview.h
+++ b/arts/tools/templateview.h
@@ -24,9 +24,10 @@
//#include <artsflow.h>
#include <tqframe.h>
-class Template_ArtsView : public QFrame
+class Template_ArtsView : public TQFrame
{
Q_OBJECT
+ TQ_OBJECT
public:
Template_ArtsView( TQWidget* =0, const char* =0 );
~Template_ArtsView();