From 83fbc82a101309e171089f0d5ed080f82a367345 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:49:11 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- arts/tools/artscontrolapplet.cpp | 34 ++++++++++---------- arts/tools/artscontrolapplet.h | 2 +- arts/tools/artscontrolapplet_private.h | 10 +++--- arts/tools/audiomanager.cpp | 16 +++++----- arts/tools/audiomanager.h | 2 +- arts/tools/choosebusdlg.cpp | 58 +++++++++++++++++----------------- arts/tools/environmentview.cpp | 8 ++--- arts/tools/fftscopeview.cpp | 2 +- arts/tools/levelmeters.cpp | 36 ++++++++++----------- arts/tools/levelmeters.h | 4 +-- arts/tools/main.h | 2 +- arts/tools/mediatypesview.cpp | 2 +- arts/tools/midiinstdlg.cpp | 50 ++++++++++++++--------------- arts/tools/midimanagerview.cpp | 8 ++--- arts/tools/midiportdlg.cpp | 42 ++++++++++++------------ arts/tools/midiportdlg.h | 2 +- arts/tools/statusview.cpp | 8 ++--- arts/tools/statusview.h | 2 +- 18 files changed, 144 insertions(+), 144 deletions(-) (limited to 'arts/tools') diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp index f59bc9ff..e4a7e16a 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->tqlayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); - p->tqlayout->setSpacing( 2 ); + p->layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); + p->layout->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->tqlayout->addWidget( p->vuw ); + p->layout->addWidget( p->vuw ); } - p->tqlayout->activate(); + p->layout->activate(); - TQTimer::singleShot( 100, this, TQT_SLOT( supdatetqlayout() ) ); + TQTimer::singleShot( 100, this, TQT_SLOT( supdatelayout() ) ); kdDebug()<<"ArtsControlApplet::ArtsControlApplet() finished."<tqlayout->tqsizeHint().width(); + return p->layout->sizeHint().width(); } int ArtsControlApplet::heightForWidth( int w ) const { kdDebug()<<"ArtsControlApplet::heightForWidth( int "<tqlayout->tqsizeHint().height(); + return p->layout->sizeHint().height(); } void ArtsControlApplet::resizeEvent( TQResizeEvent * /*_Event*/ ) { @@ -122,12 +122,12 @@ kdDebug()< -#include +#include #include #include #include @@ -52,7 +52,7 @@ private: ArtsControlApplet *_parent; ArtsActions* _artsactions; public: - TQBoxLayout *tqlayout; + TQBoxLayout *layout; KArtsServer *arts; KArtsDispatcher *dispatcher; Arts::StereoVolumeControl volume; @@ -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/audiomanager.cpp b/arts/tools/audiomanager.cpp index 439ab191..eb127d1c 100644 --- a/arts/tools/audiomanager.cpp +++ b/arts/tools/audiomanager.cpp @@ -25,7 +25,7 @@ #include "choosebusdlg.h" #include -#include +#include #include #include @@ -72,13 +72,13 @@ void Gui_AUDIO_MANAGER::widgetDestroyed(TQWidget *widget) } #endif -void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*tqlayout*/) +void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*layout*/) { /************************************************************************ * From Gui_INSTRUMENT_MAPPER: * * I am still not sure wether this kind of putting yourself into a parent - * widget (with own tqlayout etc.) is a good idea (there may not even be + * widget (with own layout 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 * /*tqlayout*/) * else would be appropriate. Check that. FIXME ************************************************************************/ - TQVBoxLayout *maintqlayout = new TQVBoxLayout(parent); - /*TQHBoxLayout *contentstqlayout = new TQHBoxLayout;*/ + TQVBoxLayout *mainlayout = new TQVBoxLayout(parent); + /*TQHBoxLayout *contentslayout = new TQHBoxLayout;*/ // list @@ -106,10 +106,10 @@ void Gui_AUDIO_MANAGER::setParent(TQWidget *parent, TQBoxLayout * /*tqlayout*/) TQObject::connect(listview,TQT_SIGNAL(executed(TQListViewItem *)),proxy, TQT_SLOT(edit(TQListViewItem *))); - maintqlayout->addWidget(listview); + mainlayout->addWidget(listview); - maintqlayout->activate(); - //maintqlayout->freeze(); + mainlayout->activate(); + //mainlayout->freeze(); ParentWidget = parent; } diff --git a/arts/tools/audiomanager.h b/arts/tools/audiomanager.h index 6f86778e..39ac8362 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 *tqlayout); + void setParent(TQWidget *Parent,TQBoxLayout *layout); void edit(TQListViewItem *item); public slots: diff --git a/arts/tools/choosebusdlg.cpp b/arts/tools/choosebusdlg.cpp index 29a1bb69..f138436c 100644 --- a/arts/tools/choosebusdlg.cpp +++ b/arts/tools/choosebusdlg.cpp @@ -23,7 +23,7 @@ #include -#include +#include #include #include #include @@ -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) @@ -48,27 +48,27 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent) { setCaption(i18n("Choose Bus")); - TQVBoxLayout *maintqlayout = new TQVBoxLayout(this); + TQVBoxLayout *mainlayout = new TQVBoxLayout(this); // caption label: "Synthesis running..." - maintqlayout->addSpacing(5); + mainlayout->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->tqsetAlignment(AlignCenter); + captionlabel->setAlignment(AlignCenter); min_size(captionlabel); - maintqlayout->addWidget(captionlabel); + mainlayout->addWidget(captionlabel); // hruler - maintqlayout->addSpacing(5); + mainlayout->addSpacing(5); KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this); - maintqlayout->addWidget(ruler2); + mainlayout->addWidget(ruler2); - maintqlayout->addSpacing(5); + mainlayout->addSpacing(5); // listwidget @@ -89,41 +89,41 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent) if( listbox->count() > 0 ) listbox->setCurrentItem( 0 ); - maintqlayout->addWidget(listbox); + mainlayout->addWidget(listbox); // hruler - maintqlayout->addSpacing(5); + mainlayout->addSpacing(5); KSeparator *ruler = new KSeparator( KSeparator::HLine, this); - maintqlayout->addWidget(ruler); - maintqlayout->addSpacing(5); + mainlayout->addWidget(ruler); + mainlayout->addSpacing(5); // new bus lineedit - TQBoxLayout * tqlayout2 = new TQHBoxLayout( maintqlayout ); - //maintqlayout->addLayout( tqlayout2 ); + TQBoxLayout * layout2 = new TQHBoxLayout( mainlayout ); + //mainlayout->addLayout( layout2 ); TQLabel * newbuslabel = new TQLabel( i18n( "New bus:" ), this ); - tqlayout2->addWidget( newbuslabel ); + layout2->addWidget( newbuslabel ); lineedit = new KLineEdit( this ); connect( lineedit, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( textChanged( const TQString & ) ) ); - tqlayout2->addWidget( lineedit ); + layout2->addWidget( lineedit ); // hruler - maintqlayout->addSpacing(5); + mainlayout->addSpacing(5); KSeparator *ruler3 = new KSeparator( KSeparator::HLine, this); - maintqlayout->addWidget(ruler3); + mainlayout->addWidget(ruler3); - maintqlayout->addSpacing(5); + mainlayout->addSpacing(5); // buttons - maintqlayout->addSpacing(5); - TQHBoxLayout *buttontqlayout = new TQHBoxLayout( maintqlayout ); - //maintqlayout->addLayout(buttontqlayout); - maintqlayout->addSpacing(5); + mainlayout->addSpacing(5); + TQHBoxLayout *buttonlayout = new TQHBoxLayout( mainlayout ); + //mainlayout->addLayout(buttonlayout); + mainlayout->addSpacing(5); - buttontqlayout->addSpacing(5); + buttonlayout->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->tqlayout(); + bbox->layout(); - buttontqlayout->addWidget(bbox); - buttontqlayout->addSpacing(5); + buttonlayout->addWidget(bbox); + buttonlayout->addSpacing(5); - maintqlayout->freeze(); + mainlayout->freeze(); } TQString ChooseBusDlg::result() diff --git a/arts/tools/environmentview.cpp b/arts/tools/environmentview.cpp index f62a5c06..447cdce7 100644 --- a/arts/tools/environmentview.cpp +++ b/arts/tools/environmentview.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #define DEFAULT_ENV_FILENAME "~/default.arts-env" @@ -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()); } }; @@ -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").tqarg(DEFAULT_ENV_FILENAME), this); + TQPushButton(i18n("Load %1").arg(DEFAULT_ENV_FILENAME), this); connect(loadButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(load())); TQPushButton *saveButton = new - TQPushButton(i18n("Save %1").tqarg(DEFAULT_ENV_FILENAME), this); + TQPushButton(i18n("Save %1").arg(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 ab15dc59..498c5c78 100644 --- a/arts/tools/fftscopeview.cpp +++ b/arts/tools/fftscopeview.cpp @@ -22,7 +22,7 @@ #include "fftscopeview.h" -#include +#include #include #include #include diff --git a/arts/tools/levelmeters.cpp b/arts/tools/levelmeters.cpp index 08d9099b..63213cda 100644 --- a/arts/tools/levelmeters.cpp +++ b/arts/tools/levelmeters.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -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); } @@ -104,7 +104,7 @@ void PeakBar::setValue(float f) { lastValues.append(new Observation(f)); - tqrepaint(); + repaint(); } // ------------------------------------------------------------- @@ -112,17 +112,17 @@ void PeakBar::setValue(float f) { PeakLevelMeters::PeakLevelMeters(TQWidget *parent): StereoLevelMeter(parent), left(this), right(this), scaleView(this) { - 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); + 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); 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,15 +144,15 @@ 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) { dbRange= db; - tqrepaint(); + repaint(); } -TQSize ScaleView::tqsizeHint() const { +TQSize ScaleView::sizeHint() 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 *tqlayout= new TQHBoxLayout(this); - tqlayout->addWidget(&left); - tqlayout->addWidget(&right); + TQBoxLayout *layout= new TQHBoxLayout(this); + layout->addWidget(&left); + layout->addWidget(&right); } void StereoLedMeters::setValues(float leftVal, float rightVal) { 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/main.h b/arts/tools/main.h index 41bcccdd..7f2fd7a3 100644 --- a/arts/tools/main.h +++ b/arts/tools/main.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arts/tools/mediatypesview.cpp b/arts/tools/mediatypesview.cpp index 9353cda6..c779ac44 100644 --- a/arts/tools/mediatypesview.cpp +++ b/arts/tools/mediatypesview.cpp @@ -21,7 +21,7 @@ */ -#include +#include #include #include #include diff --git a/arts/tools/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp index 8fe922b7..05179e0d 100644 --- a/arts/tools/midiinstdlg.cpp +++ b/arts/tools/midiinstdlg.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include @@ -66,26 +66,26 @@ static TQStringList listFiles(TQString directory, TQString extension) MidiInstDlg::MidiInstDlg(TQWidget *parent) :TQDialog(parent,"instrument",TRUE) { - TQVBoxLayout *maintqlayout = new TQVBoxLayout(this); + TQVBoxLayout *mainlayout = new TQVBoxLayout(this); // caption label: title - maintqlayout->addSpacing(5); + mainlayout->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->tqsetAlignment(AlignCenter); + captionlabel->setAlignment(AlignCenter); //min_size(captionlabel); - maintqlayout->addWidget(captionlabel); + mainlayout->addWidget(captionlabel); // hruler - maintqlayout->addSpacing(5); + mainlayout->addSpacing(5); KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this); - maintqlayout->addWidget(ruler2); - maintqlayout->addSpacing(5); + mainlayout->addWidget(ruler2); + mainlayout->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::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)) @@ -116,23 +116,23 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent) //kdDebug() << "inserted map: " << modname.mid(prefix.length()) << endl; } - maintqlayout->addWidget(box); + mainlayout->addWidget(box); // hruler - maintqlayout->addSpacing(5); + mainlayout->addSpacing(5); KSeparator *ruler = new KSeparator( KSeparator::HLine, this); - maintqlayout->addWidget(ruler); - maintqlayout->addSpacing(5); + mainlayout->addWidget(ruler); + mainlayout->addSpacing(5); // buttons - TQHBoxLayout *buttontqlayout = new TQHBoxLayout; - maintqlayout->addSpacing(5); - maintqlayout->addLayout(buttontqlayout); - maintqlayout->addSpacing(5); + TQHBoxLayout *buttonlayout = new TQHBoxLayout; + mainlayout->addSpacing(5); + mainlayout->addLayout(buttonlayout); + mainlayout->addSpacing(5); - buttontqlayout->addSpacing(5); + buttonlayout->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->tqlayout(); + bbox->layout(); - buttontqlayout->addWidget(bbox); - buttontqlayout->addSpacing(5); + buttonlayout->addWidget(bbox); + buttonlayout->addSpacing(5); - maintqlayout->freeze(); + mainlayout->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::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..0c51d419 100644 --- a/arts/tools/midimanagerview.cpp +++ b/arts/tools/midimanagerview.cpp @@ -29,7 +29,7 @@ #undef protected #include #include -#include +#include #include #include #include @@ -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) { @@ -185,7 +185,7 @@ void MidiManagerView::updateLists() widget->inputsListBox->setSelected(itemMap[srcID],true); if(destID && itemMap[destID]) widget->outputsListBox->setSelected(itemMap[destID],true); - connectionWidget->tqrepaint(); + connectionWidget->repaint(); } void MidiManagerView::slotConnect() diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp index 1c46d9e5..39919f1a 100644 --- a/arts/tools/midiportdlg.cpp +++ b/arts/tools/midiportdlg.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include @@ -34,26 +34,26 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *title) :TQDialog(parent,title,TRUE) { - TQVBoxLayout *maintqlayout = new TQVBoxLayout(this); + TQVBoxLayout *mainlayout = new TQVBoxLayout(this); // caption label: title - maintqlayout->addSpacing(5); + mainlayout->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->tqsetAlignment(AlignCenter); + captionlabel->setAlignment(AlignCenter); //min_size(captionlabel); - maintqlayout->addWidget(captionlabel); + mainlayout->addWidget(captionlabel); // hruler - maintqlayout->addSpacing(5); + mainlayout->addSpacing(5); KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this); - maintqlayout->addWidget(ruler2); - maintqlayout->addSpacing(5); + mainlayout->addWidget(ruler2); + mainlayout->addSpacing(5); // editwidget @@ -61,23 +61,23 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl edit->setText(oldname); //min_size(edit); - maintqlayout->addWidget(edit); + mainlayout->addWidget(edit); // hruler - maintqlayout->addSpacing(5); + mainlayout->addSpacing(5); KSeparator *ruler = new KSeparator( KSeparator::HLine, this); - maintqlayout->addWidget(ruler); - maintqlayout->addSpacing(5); + mainlayout->addWidget(ruler); + mainlayout->addSpacing(5); // buttons - TQHBoxLayout *buttontqlayout = new TQHBoxLayout; - maintqlayout->addSpacing(5); - maintqlayout->addLayout(buttontqlayout); - maintqlayout->addSpacing(5); + TQHBoxLayout *buttonlayout = new TQHBoxLayout; + mainlayout->addSpacing(5); + mainlayout->addLayout(buttonlayout); + mainlayout->addSpacing(5); - buttontqlayout->addSpacing(5); + buttonlayout->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->tqlayout(); + bbox->layout(); - buttontqlayout->addWidget(bbox); - buttontqlayout->addSpacing(5); + buttonlayout->addWidget(bbox); + buttonlayout->addSpacing(5); - maintqlayout->freeze(); + mainlayout->freeze(); } const char *MidiPortDlg::device() diff --git a/arts/tools/midiportdlg.h b/arts/tools/midiportdlg.h index 59cb4f0f..a49d7f01 100644 --- a/arts/tools/midiportdlg.h +++ b/arts/tools/midiportdlg.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include class MidiPortDlg :public TQDialog { Q_OBJECT diff --git a/arts/tools/statusview.cpp b/arts/tools/statusview.cpp index 37d8cbe2..fdcd6c8f 100644 --- a/arts/tools/statusview.cpp +++ b/arts/tools/statusview.cpp @@ -21,7 +21,7 @@ */ -#include +#include #include #include #include @@ -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: -- cgit v1.2.1