summaryrefslogtreecommitdiffstats
path: root/arts/tools
diff options
context:
space:
mode:
Diffstat (limited to 'arts/tools')
-rw-r--r--arts/tools/artscontrolapplet.cpp34
-rw-r--r--arts/tools/artscontrolapplet.h2
-rw-r--r--arts/tools/artscontrolapplet_private.h10
-rw-r--r--arts/tools/audiomanager.cpp16
-rw-r--r--arts/tools/audiomanager.h2
-rw-r--r--arts/tools/choosebusdlg.cpp58
-rw-r--r--arts/tools/environmentview.cpp8
-rw-r--r--arts/tools/fftscopeview.cpp2
-rw-r--r--arts/tools/levelmeters.cpp36
-rw-r--r--arts/tools/levelmeters.h4
-rw-r--r--arts/tools/main.h2
-rw-r--r--arts/tools/mediatypesview.cpp2
-rw-r--r--arts/tools/midiinstdlg.cpp50
-rw-r--r--arts/tools/midimanagerview.cpp8
-rw-r--r--arts/tools/midiportdlg.cpp42
-rw-r--r--arts/tools/midiportdlg.h2
-rw-r--r--arts/tools/statusview.cpp8
-rw-r--r--arts/tools/statusview.h2
18 files changed, 144 insertions, 144 deletions
diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp
index e4a7e16a..f59bc9ff 100644
--- a/arts/tools/artscontrolapplet.cpp
+++ b/arts/tools/artscontrolapplet.cpp
@@ -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 21a50b3e..e1722ebf 100644
--- a/arts/tools/artscontrolapplet.h
+++ b/arts/tools/artscontrolapplet.h
@@ -120,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 eb22ed74..3f6417b1 100644
--- a/arts/tools/artscontrolapplet_private.h
+++ b/arts/tools/artscontrolapplet_private.h
@@ -22,7 +22,7 @@
#include <tqobject.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqslider.h>
#include <tqpushbutton.h>
@@ -52,7 +52,7 @@ private:
ArtsControlApplet *_parent;
ArtsActions* _artsactions;
public:
- TQBoxLayout *layout;
+ TQBoxLayout *tqlayout;
KArtsServer *arts;
KArtsDispatcher *dispatcher;
Arts::StereoVolumeControl volume;
@@ -63,7 +63,7 @@ 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 )
@@ -87,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 eb127d1c..439ab191 100644
--- a/arts/tools/audiomanager.cpp
+++ b/arts/tools/audiomanager.cpp
@@ -25,7 +25,7 @@
#include "choosebusdlg.h"
#include <tqtimer.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <klocale.h>
#include <klistview.h>
@@ -72,13 +72,13 @@ void Gui_AUDIO_MANAGER::widgetDestroyed(TQWidget *widget)
}
#endif
-void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/)
+void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, 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
+ * widget (with own tqlayout etc.) is a good idea (there may not even be
* a singe call to setParent, because there is no parent).
*
* But the "how to write aRts widgets"-stuff will need some experiments,
@@ -90,8 +90,8 @@ 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(parent);
+ /*TQHBoxLayout *contentstqlayout = new TQHBoxLayout;*/
// list
@@ -106,10 +106,10 @@ 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();
+ maintqlayout->activate();
+ //maintqlayout->freeze();
ParentWidget = parent;
}
diff --git a/arts/tools/audiomanager.h b/arts/tools/audiomanager.h
index 39ac8362..6f86778e 100644
--- a/arts/tools/audiomanager.h
+++ b/arts/tools/audiomanager.h
@@ -51,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:
diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp
index f138436c..29a1bb69 100644
--- a/arts/tools/choosebusdlg.cpp
+++ b/arts/tools/choosebusdlg.cpp
@@ -23,7 +23,7 @@
#include <artsflow.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqlistbox.h>
#include <tqpushbutton.h>
@@ -39,7 +39,7 @@
using namespace std;
static void min_size(TQWidget *w) {
- w->setMinimumSize(w->sizeHint());
+ w->setMinimumSize(w->tqsizeHint());
}
ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
@@ -48,27 +48,27 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent)
{
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,41 +89,41 @@ 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(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
@@ -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/environmentview.cpp b/arts/tools/environmentview.cpp
index 447cdce7..f62a5c06 100644
--- a/arts/tools/environmentview.cpp
+++ b/arts/tools/environmentview.cpp
@@ -34,7 +34,7 @@
#include <fstream>
#include <vector>
-#include <layout.h>
+#include <tqlayout.h>
#define DEFAULT_ENV_FILENAME "~/default.arts-env"
@@ -57,7 +57,7 @@ public:
printf("~ItemView()\n");
}
TQString text() const {
- return TQString::fromLatin1(item._interfaceName().c_str());
+ return TQString::tqfromLatin1(item._interfaceName().c_str());
}
};
@@ -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/fftscopeview.cpp b/arts/tools/fftscopeview.cpp
index 498c5c78..ab15dc59 100644
--- a/arts/tools/fftscopeview.cpp
+++ b/arts/tools/fftscopeview.cpp
@@ -22,7 +22,7 @@
#include "fftscopeview.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <tqcursor.h>
#include <tqtimer.h>
#include <kaction.h>
diff --git a/arts/tools/levelmeters.cpp b/arts/tools/levelmeters.cpp
index 63213cda..08d9099b 100644
--- a/arts/tools/levelmeters.cpp
+++ b/arts/tools/levelmeters.cpp
@@ -1,4 +1,4 @@
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpainter.h>
#include <tqfontmetrics.h>
#include <tqptrlist.h>
@@ -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,7 +104,7 @@ void PeakBar::setValue(float f) {
lastValues.append(new Observation(f));
- repaint();
+ tqrepaint();
}
// -------------------------------------------------------------
@@ -112,17 +112,17 @@ void PeakBar::setValue(float f) {
PeakLevelMeters::PeakLevelMeters(TQWidget *parent):
StereoLevelMeter(parent), 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);
}
@@ -144,15 +144,15 @@ void PeakLevelMeters::setValues(float leftVal, float rightVal) {
ScaleView::ScaleView(TQWidget *parent): TQFrame(parent) {
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);
}
@@ -226,9 +226,9 @@ void LedMeter::setValue(float f)
StereoLedMeters::StereoLedMeters(TQWidget *parent)
: StereoLevelMeter(parent), 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 5bb867ab..8046d745 100644
--- a/arts/tools/levelmeters.h
+++ b/arts/tools/levelmeters.h
@@ -94,7 +94,7 @@ protected:
public:
PeakBar(TQWidget *parent);
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
void drawContents(TQPainter *p);
virtual void setValue(float f);
@@ -114,7 +114,7 @@ public:
ScaleView(TQWidget *parent);
void setDbRange(int db);
void setScaleMargins(int margins) { upperMargin= margins; lowerMargin=margins; }
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
void drawContents(TQPainter *p);
};
diff --git a/arts/tools/main.h b/arts/tools/main.h
index 7f2fd7a3..41bcccdd 100644
--- a/arts/tools/main.h
+++ b/arts/tools/main.h
@@ -32,7 +32,7 @@
#include <kaboutdata.h>
#include <klocale.h>
#include <kstdaction.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpushbutton.h>
#include <artsflow.h>
#include <soundserver.h>
diff --git a/arts/tools/mediatypesview.cpp b/arts/tools/mediatypesview.cpp
index c779ac44..9353cda6 100644
--- a/arts/tools/mediatypesview.cpp
+++ b/arts/tools/mediatypesview.cpp
@@ -21,7 +21,7 @@
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <klistview.h>
#include <klocale.h>
#include <kartsserver.h>
diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp
index 05179e0d..8fe922b7 100644
--- a/arts/tools/midiinstdlg.cpp
+++ b/arts/tools/midiinstdlg.cpp
@@ -24,7 +24,7 @@
#include <kstandarddirs.h>
#include <kapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqfile.h>
#include <tqdir.h>
@@ -66,26 +66,26 @@ static TQStringList listFiles(TQString directory, TQString extension)
MidiInstDlg::MidiInstDlg(TQWidget *parent)
:TQDialog(parent,"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,7 +95,7 @@ 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")) )
@@ -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,23 +116,23 @@ 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(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
@@ -141,12 +141,12 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent)
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/midimanagerview.cpp b/arts/tools/midimanagerview.cpp
index 0c51d419..3f137dea 100644
--- a/arts/tools/midimanagerview.cpp
+++ b/arts/tools/midimanagerview.cpp
@@ -29,7 +29,7 @@
#undef protected
#include <tqpushbutton.h>
#include <tqlistbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpainter.h>
#include <stdio.h>
#include <kaction.h>
@@ -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)
{
@@ -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()
diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp
index 39919f1a..1c46d9e5 100644
--- a/arts/tools/midiportdlg.cpp
+++ b/arts/tools/midiportdlg.cpp
@@ -23,7 +23,7 @@
#include <klocale.h>
#include <kapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <kseparator.h>
#include <kbuttonbox.h>
@@ -34,26 +34,26 @@
MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *title) :TQDialog(parent,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,23 +61,23 @@ 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(), TQT_TQOBJECT(this), TQT_SLOT( help() ));
@@ -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 a49d7f01..59cb4f0f 100644
--- a/arts/tools/midiportdlg.h
+++ b/arts/tools/midiportdlg.h
@@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <tqscrollbar.h>
#include <tqlineedit.h>
-#include <layout.h>
+#include <tqlayout.h>
class MidiPortDlg :public TQDialog {
Q_OBJECT
diff --git a/arts/tools/statusview.cpp b/arts/tools/statusview.cpp
index fdcd6c8f..37d8cbe2 100644
--- a/arts/tools/statusview.cpp
+++ b/arts/tools/statusview.cpp
@@ -21,7 +21,7 @@
*/
-#include <layout.h>
+#include <tqlayout.h>
#include <klocale.h>
#include <tqpushbutton.h>
#include <tqwidget.h>
@@ -41,7 +41,7 @@ ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, con
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 37487588..59f757c2 100644
--- a/arts/tools/statusview.h
+++ b/arts/tools/statusview.h
@@ -40,7 +40,7 @@ public:
ArtsStatusView(Arts::SoundServer server, TQWidget* =0, const char* =0 );
public slots:
- void updateStatus();
+ void updatetqStatus();
void suspendButtonClicked();
protected:
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-09 22:53:18 +0000