diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-21 14:22:34 -0600 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 18:07:30 +0200 |
commit | 38248980052986d5f6b23dd229eb41466eca08da (patch) | |
tree | 77b74c8164c801e72885f7d0b849413bbe6f46b3 /arts | |
parent | 537ccfa7e6fcdcb613f2f83744b19fc28f83b79f (diff) | |
download | tdemultimedia-38248980052986d5f6b23dd229eb41466eca08da.tar.gz tdemultimedia-38248980052986d5f6b23dd229eb41466eca08da.zip |
Rename obsolete tq methods to standard names
(cherry picked from commit d4ad38145541b8aabb0623e9a81d72f4d4310c90)
Diffstat (limited to 'arts')
-rw-r--r-- | arts/builder/execdlg.cpp | 50 | ||||
-rw-r--r-- | arts/builder/execdlg.h | 2 | ||||
-rw-r--r-- | arts/builder/interfacedlg.cpp | 46 | ||||
-rw-r--r-- | arts/builder/portposdlg.cpp | 46 | ||||
-rw-r--r-- | arts/builder/retrievedlg.cpp | 38 | ||||
-rw-r--r-- | arts/gui/kde/kartswidget.cpp | 12 | ||||
-rw-r--r-- | arts/gui/kde/kartswidget.h | 4 | ||||
-rw-r--r-- | arts/gui/kde/klayoutbox_impl.cpp | 4 | ||||
-rw-r--r-- | arts/gui/kde/kpopupbox_impl.cpp | 8 | ||||
-rw-r--r-- | arts/gui/kde/kpopupbox_private.h | 8 | ||||
-rw-r--r-- | arts/gui/kde/kpoti.cpp | 2 | ||||
-rw-r--r-- | arts/tools/artscontrolapplet.cpp | 32 | ||||
-rw-r--r-- | arts/tools/artscontrolapplet.h | 2 | ||||
-rw-r--r-- | arts/tools/artscontrolapplet_private.h | 2 | ||||
-rw-r--r-- | arts/tools/audiomanager.cpp | 14 | ||||
-rw-r--r-- | arts/tools/audiomanager.h | 2 | ||||
-rw-r--r-- | arts/tools/choosebusdlg.cpp | 52 | ||||
-rw-r--r-- | arts/tools/levelmeters.cpp | 20 | ||||
-rw-r--r-- | arts/tools/midiinstdlg.cpp | 38 | ||||
-rw-r--r-- | arts/tools/midiportdlg.cpp | 38 |
20 files changed, 210 insertions, 210 deletions
diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp index e5b6cd89..8ccef7e9 100644 --- a/arts/builder/execdlg.cpp +++ b/arts/builder/execdlg.cpp @@ -53,11 +53,11 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure) setCaption(i18n("aRts Module Execution")); - maintqlayout = new TQVBoxLayout(this); + 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); @@ -65,7 +65,7 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure) captionlabel->setText(TQString(" ")+i18n("Synthesis running...")+TQString(" ")); captionlabel->setAlignment(AlignCenter); min_size(captionlabel); - maintqlayout->addWidget(captionlabel); + mainlayout->addWidget(captionlabel); cpuusagelabel = new TQLabel(this); cpuusagelabel->setText(i18n("CPU usage: unknown")); @@ -78,41 +78,41 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure) cpuusagetimer->start( 2000, false ); min_size(cpuusagelabel); - maintqlayout->addWidget(cpuusagelabel); + mainlayout->addWidget(cpuusagelabel); -// ruler above the slidertqlayout +// ruler above the sliderlayout - maintqlayout->addSpacing(5); + mainlayout->addSpacing(5); KSeparator* sep = new KSeparator( KSeparator::HLine, this); - maintqlayout->addWidget(sep); - maintqlayout->addSpacing(5); + mainlayout->addWidget(sep); + mainlayout->addSpacing(5); // sliders, controlpanels - slidertqlayout = new TQVBoxLayout; - maintqlayout->addLayout(slidertqlayout); + sliderlayout = new TQVBoxLayout; + mainlayout->addLayout(sliderlayout); #if 0 /* PORT */ this->GUIServer = GUIServer; GUIServer->setGlobalParent(this); - GUIServer->setGlobalLayout(slidertqlayout); + GUIServer->setGlobalLayout(sliderlayout); #endif -// hruler below the slidertqlayout +// hruler below the sliderlayout - maintqlayout->addSpacing(5); + mainlayout->addSpacing(5); sep = new KSeparator( KSeparator::HLine, this); - maintqlayout->addWidget(sep); - maintqlayout->addSpacing(5); + mainlayout->addWidget(sep); + 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() )); @@ -125,18 +125,18 @@ ExecDlg::ExecDlg(TQWidget *parent, ExecutableStructure *structure) TQButton *okbutton = bbox->addButton(KStdGuiItem::ok()); connect( okbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(accept() ) ); - bbox->tqlayout(); + bbox->layout(); //min_size(bbox); - buttontqlayout->addWidget(bbox); - buttontqlayout->addSpacing(5); + buttonlayout->addWidget(bbox); + buttonlayout->addSpacing(5); -// maintqlayout->freeze(); +// mainlayout->freeze(); } void ExecDlg::start() { - maintqlayout->freeze(); + mainlayout->freeze(); } void ExecDlg::guiServerTick() diff --git a/arts/builder/execdlg.h b/arts/builder/execdlg.h index 61348c0f..d1640432 100644 --- a/arts/builder/execdlg.h +++ b/arts/builder/execdlg.h @@ -35,7 +35,7 @@ class ExecDlg :public TQDialog { public: TQTimer *cpuusagetimer; TQLabel *cpuusagelabel; - TQVBoxLayout *maintqlayout,*slidertqlayout; + TQVBoxLayout *mainlayout,*sliderlayout; ExecutableStructure *structure; void start(); diff --git a/arts/builder/interfacedlg.cpp b/arts/builder/interfacedlg.cpp index cfced15d..26265eea 100644 --- a/arts/builder/interfacedlg.cpp +++ b/arts/builder/interfacedlg.cpp @@ -45,12 +45,12 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE) { setCaption(i18n("aRts: Structureport View")); - TQVBoxLayout *maintqlayout = new TQVBoxLayout(this); - //TQHBoxLayout *contentstqlayout = new TQHBoxLayout; + TQVBoxLayout *mainlayout = new TQVBoxLayout(this); + //TQHBoxLayout *contentslayout = new TQHBoxLayout; // object type /* - maintqlayout->addSpacing(5); + mainlayout->addSpacing(5); TQLabel *objectlabel = new TQLabel(this); TQFont labelfont(objectlabel->font()); labelfont.setPointSize(labelfont.pointSize()*3/2); @@ -58,20 +58,20 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE) objectlabel->setText(TQString(" ")+i18n("Object type: ")+TQString(port->owner->name())+TQString(" ")); objectlabel->setAlignment(AlignCenter); min_size(objectlabel); - maintqlayout->addWidget(objectlabel); + mainlayout->addWidget(objectlabel); */ // port description /* - maintqlayout->addSpacing(5); + mainlayout->addSpacing(5); TQLabel *portlabel = new TQLabel(this); labelfont.setPointSize(labelfont.pointSize()*4/5); portlabel->setFont(labelfont); portlabel->setText(i18n("Port description: ")+ port->description); min_size(portlabel); portlabel->setAlignment(AlignCenter); - maintqlayout->addWidget(portlabel); + mainlayout->addWidget(portlabel); int labelwidth = imax(portlabel->sizeHint().width(),objectlabel->sizeHint().width()); @@ -80,11 +80,11 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE) // hruler - maintqlayout->addSpacing(5); + mainlayout->addSpacing(5); KSeparator *ruler = new KSeparator( KSeparator::HLine, this); - maintqlayout->addWidget(ruler); - maintqlayout->addSpacing(5); - maintqlayout->addLayout(contentstqlayout); + mainlayout->addWidget(ruler); + mainlayout->addSpacing(5); + mainlayout->addLayout(contentslayout); */ // list @@ -93,23 +93,23 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE) update(); listbox->setMinimumSize(340,400); - maintqlayout->addWidget(listbox); + mainlayout->addWidget(listbox); connect( listbox, TQT_SIGNAL( doubleClicked ( TQListBoxItem *)), this, TQT_SLOT(accept())); // hruler - maintqlayout->addSpacing(5); + mainlayout->addSpacing(5); KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this); - maintqlayout->addWidget(ruler2); + mainlayout->addWidget(ruler2); // 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() )); @@ -121,14 +121,14 @@ InterfaceDlg::InterfaceDlg(TQWidget *parent) :TQDialog(parent,"Props", TRUE) TQButton *cancelbutton = bbox->addButton(KStdGuiItem::cancel()); connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) ); - bbox->tqlayout(); + bbox->layout(); //min_size(bbox); - buttontqlayout->addWidget(bbox); - buttontqlayout->addSpacing(5); + buttonlayout->addWidget(bbox); + buttonlayout->addSpacing(5); - //maintqlayout->activate(); - maintqlayout->freeze(); + //mainlayout->activate(); + mainlayout->freeze(); } string InterfaceDlg::interfaceName() diff --git a/arts/builder/portposdlg.cpp b/arts/builder/portposdlg.cpp index 7826b9ad..1397bd1e 100644 --- a/arts/builder/portposdlg.cpp +++ b/arts/builder/portposdlg.cpp @@ -46,12 +46,12 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent, setCaption(i18n("aRts: Structureport View")); - TQVBoxLayout *maintqlayout = new TQVBoxLayout(this); - //TQHBoxLayout *contentstqlayout = new TQHBoxLayout; + TQVBoxLayout *mainlayout = new TQVBoxLayout(this); + //TQHBoxLayout *contentslayout = new TQHBoxLayout; // object type /* - maintqlayout->addSpacing(5); + mainlayout->addSpacing(5); TQLabel *objectlabel = new TQLabel(this); TQFont labelfont(objectlabel->font()); labelfont.setPointSize(labelfont.pointSize()*3/2); @@ -59,20 +59,20 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent, objectlabel->setText(TQString(" ")+i18n("Object type: ")+TQString(port->owner->name())+TQString(" ")); objectlabel->setAlignment(AlignCenter); min_size(objectlabel); - maintqlayout->addWidget(objectlabel); + mainlayout->addWidget(objectlabel); */ // port description /* - maintqlayout->addSpacing(5); + mainlayout->addSpacing(5); TQLabel *portlabel = new TQLabel(this); labelfont.setPointSize(labelfont.pointSize()*4/5); portlabel->setFont(labelfont); portlabel->setText(i18n("Port description: ")+ port->description); min_size(portlabel); portlabel->setAlignment(AlignCenter); - maintqlayout->addWidget(portlabel); + mainlayout->addWidget(portlabel); int labelwidth = imax(portlabel->sizeHint().width(),objectlabel->sizeHint().width()); @@ -81,11 +81,11 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent, // hruler - maintqlayout->addSpacing(5); + mainlayout->addSpacing(5); KSeparator *ruler = new KSeparator( KSeparator::HLine, this); - maintqlayout->addWidget(ruler); - maintqlayout->addSpacing(5); - maintqlayout->addLayout(contentstqlayout); + mainlayout->addWidget(ruler); + mainlayout->addSpacing(5); + mainlayout->addLayout(contentslayout); */ // list @@ -94,21 +94,21 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent, update(); listbox->setMinimumSize(100,200); - maintqlayout->addWidget(listbox); + mainlayout->addWidget(listbox); // hruler - maintqlayout->addSpacing(5); + mainlayout->addSpacing(5); KSeparator *ruler2 = new KSeparator( KSeparator::HLine, this); - maintqlayout->addWidget(ruler2); + mainlayout->addWidget(ruler2); // 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() )); @@ -133,14 +133,14 @@ PortPosDlg::PortPosDlg(TQWidget *parent, Structure *structure) :TQDialog(parent, TQButton *cancelbutton = bbox->addButton(i18n("Cancel")); connect( cancelbutton, TQT_SIGNAL( clicked() ), TQT_SLOT(reject() ) ); */ - bbox->tqlayout(); + bbox->layout(); //min_size(bbox); - buttontqlayout->addWidget(bbox); - buttontqlayout->addSpacing(5); + buttonlayout->addWidget(bbox); + buttonlayout->addSpacing(5); - //maintqlayout->activate(); - maintqlayout->freeze(); + //mainlayout->activate(); + mainlayout->freeze(); } void PortPosDlg::raise() diff --git a/arts/builder/retrievedlg.cpp b/arts/builder/retrievedlg.cpp index cedd5940..fc9bbb94 100644 --- a/arts/builder/retrievedlg.cpp +++ b/arts/builder/retrievedlg.cpp @@ -44,11 +44,11 @@ RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE) { setCaption(i18n("Retrieve Structure From Server")); - 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); @@ -56,14 +56,14 @@ RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE) captionlabel->setText(TQString(" ")+i18n("Published structures")+TQString(" ")); 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); // listwidget @@ -85,23 +85,23 @@ RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE) listbox->insertItem((*ni).c_str()); #endif - 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); // 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() )); @@ -113,12 +113,12 @@ RetrieveDlg::RetrieveDlg(TQWidget *parent) :TQDialog(parent,"X", TRUE) 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(); } TQString RetrieveDlg::result() diff --git a/arts/gui/kde/kartswidget.cpp b/arts/gui/kde/kartswidget.cpp index 763239f7..faada158 100644 --- a/arts/gui/kde/kartswidget.cpp +++ b/arts/gui/kde/kartswidget.cpp @@ -28,21 +28,21 @@ class KArtsWidgetPrivate { public: - TQHBoxLayout *tqlayout; + TQHBoxLayout *layout; }; KArtsWidget::KArtsWidget( TQWidget* parent, const char* name ) :TQWidget( parent, name ), _content( Arts::Widget::null() ) { d = new KArtsWidgetPrivate; - d->tqlayout = new TQHBoxLayout(this); + d->layout = new TQHBoxLayout(this); } KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* parent, const char* name ) :TQWidget( parent, name ), _content( Arts::Widget::null()) { d = new KArtsWidgetPrivate; - d->tqlayout = new TQHBoxLayout(this); + d->layout = new TQHBoxLayout(this); setContent(content); } @@ -50,7 +50,7 @@ KArtsWidget::KArtsWidget( Arts::Widget content, TQWidget* parent, const char* na :TQWidget( parent, name, wflags ), _content( Arts::Widget::null() ) { d = new KArtsWidgetPrivate; - d->tqlayout = new TQHBoxLayout( this ); + d->layout = new TQHBoxLayout( this ); setContent( content ); } @@ -58,7 +58,7 @@ KArtsWidget::KArtsWidget(TQWidget* parent, const char* name, WFlags wflags ) :TQWidget(parent, name, wflags ), _content(Arts::Widget::null()) { d = new KArtsWidgetPrivate; - d->tqlayout = new TQHBoxLayout(this); + d->layout = new TQHBoxLayout(this); } KArtsWidget::~KArtsWidget() @@ -80,7 +80,7 @@ void KArtsWidget::setContent(Arts::Widget content) _content = content; contentAsWidget->reparent(this,TQPoint(0,0),content.visible()); - d->tqlayout->addWidget(contentAsWidget); + d->layout->addWidget(contentAsWidget); } Arts::Widget KArtsWidget::content() diff --git a/arts/gui/kde/kartswidget.h b/arts/gui/kde/kartswidget.h index df46ae3b..a89c7300 100644 --- a/arts/gui/kde/kartswidget.h +++ b/arts/gui/kde/kartswidget.h @@ -32,12 +32,12 @@ class KArtsWidgetPrivate; /** * KArtsWidget provides a simple way to treat Arts::Widget classes like * native TQt widgets. Suppose you use TQt, and want to put an Arts::Widget - * type into a tqlayout, you can do so using this code + * type into a layout, you can do so using this code * * <pre> * Arts::Widget widget = ...get widget from somewhere...; * KArtsWidget *w = new KArtsWidget(widget, this); - * tqlayout->addWidget(w); + * layout->addWidget(w); * </pre> * * In line 2 of the code, the "this" is the parent widget (which is usually diff --git a/arts/gui/kde/klayoutbox_impl.cpp b/arts/gui/kde/klayoutbox_impl.cpp index 5ee56635..c14a5478 100644 --- a/arts/gui/kde/klayoutbox_impl.cpp +++ b/arts/gui/kde/klayoutbox_impl.cpp @@ -85,11 +85,11 @@ void KLayoutBox_Separator::paintEvent( TQPaintEvent* ) { TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default; if ( width() < height() ) flags |= TQStyle::Style_Horizontal; - tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), flags ); + style().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), flags ); } TQSize KLayoutBox_Separator::minimumSizeHint() const { - int wh = tqstyle().pixelMetric( TQStyle::PM_SplitterWidth, this ); + int wh = style().pixelMetric( TQStyle::PM_SplitterWidth, this ); return TQSize( wh, wh ); } diff --git a/arts/gui/kde/kpopupbox_impl.cpp b/arts/gui/kde/kpopupbox_impl.cpp index e685b1ae..23de74fc 100644 --- a/arts/gui/kde/kpopupbox_impl.cpp +++ b/arts/gui/kde/kpopupbox_impl.cpp @@ -60,8 +60,8 @@ KPopupBox_widget::KPopupBox_widget( TQWidget *parent, const char* name ) : TQFra this->setMargin( 1 ); this->setLineWidth( 1 ); _titlebar = new TQFrame( this ); - _titlebartqlayout = new TQBoxLayout( _titlebar, TQBoxLayout::BottomToTop ); - _titlebartqlayout->setAutoAdd( true ); + _titlebarlayout = new TQBoxLayout( _titlebar, TQBoxLayout::BottomToTop ); + _titlebarlayout->setAutoAdd( true ); _showbutton = new ShowButton( _titlebar ); connect( _showbutton, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( hide( bool ) ) ); @@ -90,13 +90,13 @@ void KPopupBox_widget::direction( Arts::Direction n ) { switch( n ) { case LeftToRight: case RightToLeft: - _titlebartqlayout->setDirection( TQBoxLayout::BottomToTop ); + _titlebarlayout->setDirection( TQBoxLayout::BottomToTop ); _drag->setMinimumHeight( 30 ); _drag->setMinimumWidth( 0 ); break; case TopToBottom: case BottomToTop: - _titlebartqlayout->setDirection( TQBoxLayout::RightToLeft ); + _titlebarlayout->setDirection( TQBoxLayout::RightToLeft ); _drag->setMinimumHeight( 0 ); _drag->setMinimumWidth( 30 ); } diff --git a/arts/gui/kde/kpopupbox_private.h b/arts/gui/kde/kpopupbox_private.h index 07fb221c..f58aa84d 100644 --- a/arts/gui/kde/kpopupbox_private.h +++ b/arts/gui/kde/kpopupbox_private.h @@ -54,7 +54,7 @@ private: TQBoxLayout *_layout; TQFrame *_titlebar; - TQBoxLayout *_titlebartqlayout; + TQBoxLayout *_titlebarlayout; HandleDrag *_drag; ShowButton *_showbutton; OwnButton *_ownbutton; @@ -88,7 +88,7 @@ public: TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default; if( width() < height() ) flags |= TQStyle::Style_Horizontal; - tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), colorGroup(), flags ); + style().tqdrawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), colorGroup(), flags ); } signals: void clicked(); @@ -152,7 +152,7 @@ public slots: } public: TQSize minimumSizeHint() const { - int wh = tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); + int wh = style().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); return TQSize( wh, wh ); } TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); } @@ -188,7 +188,7 @@ public slots: } public: TQSize minimumSizeHint() const { - int wh = tqstyle().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); + int wh = style().pixelMetric( TQStyle::PM_DockWindowHandleExtent, this ); return TQSize( wh, wh ); } TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); } diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp index d436be9a..32202b39 100644 --- a/arts/gui/kde/kpoti.cpp +++ b/arts/gui/kde/kpoti.cpp @@ -458,7 +458,7 @@ void KPoti::drawContents( TQPainter * p ) dbp.drawPixmap( d->buttonRect, d->bgPixmap( colorGroup() ) ); if( hasFocus() ) - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, colorGroup() ); + style().tqdrawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, colorGroup() ); paintPoti( &dbp ); dbp.end(); diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp index 8ffe493f..ec96958b 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."<<endl; } @@ -93,7 +93,7 @@ kdDebug()<<k_funcinfo<<endl; int ArtsControlApplet::widthForHeight( int h ) const { kdDebug()<<"ArtsControlApplet::widthForHeight( int "<<h<<" )"<<endl; - return p->tqlayout->sizeHint().width(); + return p->layout->sizeHint().width(); } int ArtsControlApplet::heightForWidth( int w ) const { @@ -122,12 +122,12 @@ kdDebug()<<k_funcinfo<<" position()="<<position()<<endl; { case pTop: case pBottom: - p->tqlayout->setDirection( TQBoxLayout::LeftToRight ); + p->layout->setDirection( TQBoxLayout::LeftToRight ); if ( p->barts ) p->vu.direction( Arts::LeftToRight ); break; case pRight: case pLeft: - p->tqlayout->setDirection( TQBoxLayout::TopToBottom ); + p->layout->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() ) ); - tqlayout->addWidget( svinline ); + layout->addWidget( svinline ); } else { delete svinline; svinline = 0; } - _parent->supdatetqlayout(); + _parent->supdatelayout(); } 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->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(); } +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(); } // vim: sw=4 ts=4 #include "artscontrolapplet.moc" diff --git a/arts/tools/artscontrolapplet.h b/arts/tools/artscontrolapplet.h index e1722ebf..21a50b3e 100644 --- a/arts/tools/artscontrolapplet.h +++ b/arts/tools/artscontrolapplet.h @@ -120,7 +120,7 @@ protected: void positionChange( Position ); public slots: - void supdatetqlayout() { emit updateLayout(); } + void supdatelayout() { emit updateLayout(); } protected slots: void resetLayout(); diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h index 4a7d561f..7f82c63e 100644 --- a/arts/tools/artscontrolapplet_private.h +++ b/arts/tools/artscontrolapplet_private.h @@ -52,7 +52,7 @@ private: ArtsControlApplet *_parent; ArtsActions* _artsactions; public: - TQBoxLayout *tqlayout; + TQBoxLayout *layout; KArtsServer *arts; KArtsDispatcher *dispatcher; Arts::StereoVolumeControl volume; diff --git a/arts/tools/audiomanager.cpp b/arts/tools/audiomanager.cpp index 439ab191..eff4f6f9 100644 --- a/arts/tools/audiomanager.cpp +++ b/arts/tools/audiomanager.cpp @@ -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 b23c1f8c..45b4eead 100644 --- a/arts/tools/choosebusdlg.cpp +++ b/arts/tools/choosebusdlg.cpp @@ -48,11 +48,11 @@ 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); @@ -60,15 +60,15 @@ ChooseBusDlg::ChooseBusDlg(TQWidget *parent) captionlabel->setText(TQString(" ")+i18n("Available busses:")+TQString(" ")); 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/levelmeters.cpp b/arts/tools/levelmeters.cpp index 3c2f0fc5..1d0b080c 100644 --- a/arts/tools/levelmeters.cpp +++ b/arts/tools/levelmeters.cpp @@ -112,13 +112,13 @@ 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()); @@ -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/midiinstdlg.cpp b/arts/tools/midiinstdlg.cpp index d2f108ba..96b7ff44 100644 --- a/arts/tools/midiinstdlg.cpp +++ b/arts/tools/midiinstdlg.cpp @@ -66,11 +66,11 @@ 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); @@ -78,14 +78,14 @@ MidiInstDlg::MidiInstDlg(TQWidget *parent) captionlabel->setText(TQString(" ")+i18n("Instrument")+TQString(" ")); 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 @@ -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() diff --git a/arts/tools/midiportdlg.cpp b/arts/tools/midiportdlg.cpp index 411df674..4b5678c1 100644 --- a/arts/tools/midiportdlg.cpp +++ b/arts/tools/midiportdlg.cpp @@ -34,11 +34,11 @@ 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); @@ -46,14 +46,14 @@ MidiPortDlg::MidiPortDlg(TQWidget *parent, const char *oldname, const char *titl captionlabel->setText(i18n("OSS MIDI Port")); 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() |