diff options
Diffstat (limited to 'arts/tools')
-rw-r--r-- | arts/tools/artscontrolapplet.cpp | 4 | ||||
-rw-r--r-- | arts/tools/artscontrolapplet_private.h | 6 | ||||
-rw-r--r-- | arts/tools/choosebusdlg.cpp | 4 | ||||
-rw-r--r-- | arts/tools/environmentview.cpp | 2 | ||||
-rw-r--r-- | arts/tools/levelmeters.cpp | 10 | ||||
-rw-r--r-- | arts/tools/levelmeters.h | 4 | ||||
-rw-r--r-- | arts/tools/midiinstdlg.cpp | 10 | ||||
-rw-r--r-- | arts/tools/midimanagerview.cpp | 4 | ||||
-rw-r--r-- | arts/tools/midiportdlg.cpp | 2 | ||||
-rw-r--r-- | arts/tools/statusview.cpp | 6 | ||||
-rw-r--r-- | arts/tools/statusview.h | 2 |
11 files changed, 27 insertions, 27 deletions
diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp index f59bc9ff..8ffe493f 100644 --- a/arts/tools/artscontrolapplet.cpp +++ b/arts/tools/artscontrolapplet.cpp @@ -93,12 +93,12 @@ kdDebug()<<k_funcinfo<<endl; int ArtsControlApplet::widthForHeight( int h ) const { kdDebug()<<"ArtsControlApplet::widthForHeight( int "<<h<<" )"<<endl; - return p->tqlayout->tqsizeHint().width(); + return p->tqlayout->sizeHint().width(); } int ArtsControlApplet::heightForWidth( int w ) const { kdDebug()<<"ArtsControlApplet::heightForWidth( int "<<w<<" )"<<endl; - return p->tqlayout->tqsizeHint().height(); + return p->tqlayout->sizeHint().height(); } void ArtsControlApplet::resizeEvent( TQResizeEvent * /*_Event*/ ) { diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h index 3f6417b1..da6c1824 100644 --- a/arts/tools/artscontrolapplet_private.h +++ b/arts/tools/artscontrolapplet_private.h @@ -63,7 +63,7 @@ public: Arts::StereoVolumeControlGui vu; KPopupMenu *menu; - KAction *_showSV, *_showSVinline, *_showAM, *_showArtstqStatus, *_showMidiManager, *_showEnvironment, *_showMediaTypes, *_moreBars, *_lessBars; + KAction *_showSV, *_showSVinline, *_showAM, *_showArtsStatus, *_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 ); - _showArtstqStatus = _artsactions->actionArtsStatusView(); - _showArtstqStatus->plug( menu ); + _showArtsStatus = _artsactions->actionArtsStatusView(); + _showArtsStatus->plug( menu ); _showMidiManager = _artsactions->actionMidiManagerView(); _showMidiManager->plug( menu ); _showEnvironment = _artsactions->actionEnvironmentView(); diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp index 29a1bb69..b23c1f8c 100644 --- a/arts/tools/choosebusdlg.cpp +++ b/arts/tools/choosebusdlg.cpp @@ -39,7 +39,7 @@ using namespace std; static void min_size(TQWidget *w) { - w->setMinimumSize(w->tqsizeHint()); + w->setMinimumSize(w->sizeHint()); } ChooseBusDlg::ChooseBusDlg(TQWidget *parent) @@ -58,7 +58,7 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent) labelfont.setPointSize(labelfont.pointSize()*3/2); captionlabel->setFont(labelfont); captionlabel->setText(TQString(" ")+i18n("Available busses:")+TQString(" ")); - captionlabel->tqsetAlignment(AlignCenter); + captionlabel->setAlignment(AlignCenter); min_size(captionlabel); maintqlayout->addWidget(captionlabel); diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp index f62a5c06..b6b03a39 100644 --- a/arts/tools/environmentview.cpp +++ b/arts/tools/environmentview.cpp @@ -57,7 +57,7 @@ public: printf("~ItemView()\n"); } TQString text() const { - return TQString::tqfromLatin1(item._interfaceName().c_str()); + return TQString::fromLatin1(item._interfaceName().c_str()); } }; diff --git a/arts/tools/levelmeters.cpp b/arts/tools/levelmeters.cpp index 08d9099b..93bb0c2a 100644 --- a/arts/tools/levelmeters.cpp +++ b/arts/tools/levelmeters.cpp @@ -20,7 +20,7 @@ PeakBar::PeakBar(TQWidget *parent) lastValues.setAutoDelete( TRUE ); setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); setBackgroundMode(NoBackground); setMinimumSize(frameWidth()+7, 70); } @@ -30,7 +30,7 @@ void PeakBar::frameChanged() { TQFrame::frameChanged(); } -TQSize PeakBar::tqsizeHint() const { +TQSize PeakBar::sizeHint() const { return TQSize(13, 250); } @@ -122,7 +122,7 @@ PeakLevelMeters::PeakLevelMeters(TQWidget *parent): left.setLineWidth(2); right.setLineWidth(2); scaleView.setScaleMargins(right.frameWidth()); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); setDbRange(36); } @@ -144,7 +144,7 @@ void PeakLevelMeters::setValues(float leftVal, float rightVal) { ScaleView::ScaleView(TQWidget *parent): TQFrame(parent) { font.setPixelSize(10); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred)); } void ScaleView::setDbRange(int db) { @@ -152,7 +152,7 @@ void ScaleView::setDbRange(int db) { tqrepaint(); } -TQSize ScaleView::tqsizeHint() const { +TQSize ScaleView::sizeHint() const { return TQSize(TQFontMetrics(font).width("-88")+8, 250); } diff --git a/arts/tools/levelmeters.h b/arts/tools/levelmeters.h index 8046d745..5bb867ab 100644 --- a/arts/tools/levelmeters.h +++ b/arts/tools/levelmeters.h @@ -94,7 +94,7 @@ protected: public: PeakBar(TQWidget *parent); - TQSize tqsizeHint() const; + TQSize sizeHint() 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 tqsizeHint() const; + TQSize sizeHint() const; void drawContents(TQPainter *p); }; diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp index 8fe922b7..d2f108ba 100644 --- a/arts/tools/midiinstdlg.cpp +++ b/arts/tools/midiinstdlg.cpp @@ -76,7 +76,7 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent) labelfont.setPointSize(labelfont.pointSize()*3/2); captionlabel->setFont(labelfont); captionlabel->setText(TQString(" ")+i18n("Instrument")+TQString(" ")); - captionlabel->tqsetAlignment(AlignCenter); + captionlabel->setAlignment(AlignCenter); //min_size(captionlabel); maintqlayout->addWidget(captionlabel); @@ -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::tqfromLatin1("instrument_"); + TQString prefix = TQString::fromLatin1("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::tqfromLatin1("instrument_"); + TQString prefix = TQString::fromLatin1("instrument_"); if (modname.length() > 9) modname.truncate(modname.length()-9); // kill .arts-map extension if (modname.startsWith(prefix)) @@ -157,12 +157,12 @@ TQCString MidiInstDlg::filename() TQStringList::Iterator it; for ( it = artsPath.begin(); it != artsPath.end(); it++ ) { - TQString pathname = *it + TQString::tqfromLatin1("/instrument_") + instrument + TQString::tqfromLatin1(".arts"); + TQString pathname = *it + TQString::fromLatin1("/instrument_") + instrument + TQString::fromLatin1(".arts"); TQFileInfo fi(pathname); if (fi.exists() && fi.isReadable()) return TQFile::encodeName(pathname); - pathname = *it + TQString::tqfromLatin1("/instrument_") + instrument + TQString::tqfromLatin1(".arts-map"); + pathname = *it + TQString::fromLatin1("/instrument_") + instrument + TQString::fromLatin1(".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 3f137dea..2a598bbd 100644 --- a/arts/tools/midimanagerview.cpp +++ b/arts/tools/midimanagerview.cpp @@ -96,8 +96,8 @@ public: conn != item->info.connections.end(); conn++) { MidiManagerItem *outitem = v->itemMap[*conn]; - TQRect r1 = v->widget->inputsListBox->tqitemRect(item); - TQRect r2 = v->widget->outputsListBox->tqitemRect(outitem); + TQRect r1 = v->widget->inputsListBox->itemRect(item); + TQRect r2 = v->widget->outputsListBox->itemRect(outitem); if(r1.height() > 0 && r2.height() > 0) { diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp index 1c46d9e5..411df674 100644 --- a/arts/tools/midiportdlg.cpp +++ b/arts/tools/midiportdlg.cpp @@ -44,7 +44,7 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl labelfont.setPointSize(labelfont.pointSize()*3/2); captionlabel->setFont(labelfont); captionlabel->setText(i18n("OSS MIDI Port")); - captionlabel->tqsetAlignment(AlignCenter); + captionlabel->setAlignment(AlignCenter); //min_size(captionlabel); maintqlayout->addWidget(captionlabel); diff --git a/arts/tools/statusview.cpp b/arts/tools/statusview.cpp index 37d8cbe2..c29cf4ed 100644 --- a/arts/tools/statusview.cpp +++ b/arts/tools/statusview.cpp @@ -41,7 +41,7 @@ ArtsStatusView::ArtsStatusView(Arts::SoundServer a_server, TQWidget* parent, con TQBoxLayout *l= new TQVBoxLayout(this); //l->setAutoAdd(TRUE); - RealtimetqStatus rs= server.realtimetqStatus(); + RealtimeStatus rs= server.realtimeStatus(); 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(updatetqStatus())); + connect(artsPollStatusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateStatus())); 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::updatetqStatus() +void ArtsStatusView::updateStatus() { long seconds= server.secondsUntilSuspend(); if (seconds<0) diff --git a/arts/tools/statusview.h b/arts/tools/statusview.h index 59f757c2..37487588 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 updatetqStatus(); + void updateStatus(); void suspendButtonClicked(); protected: |