From d4ad38145541b8aabb0623e9a81d72f4d4310c90 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:22:34 -0600 Subject: Rename obsolete tq methods to standard names --- arts/builder/execdlg.cpp | 50 +++++++++---------- arts/builder/execdlg.h | 2 +- arts/builder/interfacedlg.cpp | 46 +++++++++--------- arts/builder/portposdlg.cpp | 46 +++++++++--------- arts/builder/retrievedlg.cpp | 38 +++++++-------- arts/gui/kde/kartswidget.cpp | 12 ++--- arts/gui/kde/kartswidget.h | 4 +- arts/gui/kde/klayoutbox_impl.cpp | 4 +- arts/gui/kde/kpopupbox_impl.cpp | 8 ++-- arts/gui/kde/kpopupbox_private.h | 8 ++-- arts/gui/kde/kpoti.cpp | 2 +- arts/tools/artscontrolapplet.cpp | 32 ++++++------- arts/tools/artscontrolapplet.h | 2 +- arts/tools/artscontrolapplet_private.h | 2 +- arts/tools/audiomanager.cpp | 14 +++--- arts/tools/audiomanager.h | 2 +- arts/tools/choosebusdlg.cpp | 52 ++++++++++---------- arts/tools/levelmeters.cpp | 20 ++++---- arts/tools/midiinstdlg.cpp | 38 +++++++-------- arts/tools/midiportdlg.cpp | 38 +++++++-------- juk/collectionlist.h | 2 +- juk/coverdialogbase.ui | 4 +- juk/coverinfo.cpp | 4 +- juk/deletedialogbase.ui | 4 +- juk/filerenamer.cpp | 18 +++---- juk/filerenamer.h | 10 ++-- juk/filerenamerbase.ui | 6 +-- juk/filerenameroptions.cpp | 10 ++-- juk/nowplaying.cpp | 20 ++++---- juk/playlist.cpp | 4 +- juk/playlistbox.cpp | 2 +- juk/playlistsplitter.h | 2 +- juk/stringhash.h | 2 +- juk/systemtray.h | 2 +- juk/tageditor.cpp | 30 ++++++------ juk/tageditor.h | 4 +- kaboodle/view.cpp | 8 ++-- kaudiocreator/encodefile.ui | 4 +- kaudiocreator/encoderconfig.ui | 2 +- kaudiocreator/general.ui | 2 +- kaudiocreator/infodialog.ui | 2 +- kaudiocreator/tracks.ui | 2 +- kaudiocreator/wizard.ui | 2 +- kioslave/audiocd/kcmaudiocd/audiocdconfig.ui | 4 +- kmid/ktrianglebutton.cpp | 4 +- kmix/kmix.cpp | 10 ++-- kmix/kmixerwidget.cpp | 6 +-- kmix/kmixprefdlg.cpp | 24 +++++----- kmix/ksmallslider.cpp | 2 +- kmix/mdwenum.cpp | 2 +- kmix/mdwslider.cpp | 56 +++++++++++----------- kmix/mdwswitch.cpp | 2 +- kmix/viewapplet.cpp | 2 +- kmix/viewdockareapopup.cpp | 4 +- kmix/viewgrid.cpp | 2 +- kmix/viewsurround.cpp | 2 +- kmix/viewswitches.cpp | 2 +- krec/krecconfigure.cpp | 8 ++-- kscd/ChangeLog | 2 +- kscd/TODO | 2 +- kscd/kcompactdisc.h | 8 ++-- kscd/libwm/cdtext.c | 16 +++---- kscd/libwm/include/wm_cdtext.h | 2 +- kscd/panel.ui | 8 ++-- libkcddb/cdinfodialogbase.ui | 4 +- libkcddb/kcmcddb/kcmcddb.cpp | 6 +-- .../lib/util/render/dither/colorTableHighBit.cpp | 2 +- noatun/library/cmodule.cpp | 26 +++++----- noatun/library/equalizerview.cpp | 8 ++-- noatun/library/equalizerwidget.ui | 6 +-- noatun/modules/infrared/irprefs.cpp | 18 +++---- noatun/modules/keyz/keyz.cpp | 4 +- noatun/modules/splitplaylist/find.cpp | 10 ++-- noatun/modules/systray/yhconfigwidget.ui | 2 +- noatun/modules/winskin/winSkinConfig.cpp | 2 +- 75 files changed, 411 insertions(+), 411 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 8b1b85f4..d33efa15 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 * * 
  *    Arts::Widget widget = ...get widget from somewhere...;
  *    KArtsWidget *w = new KArtsWidget(widget, this);
- *    tqlayout->addWidget(w);
+ *    layout->addWidget(w);
  *
* * 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."<tqlayout->sizeHint().width(); + return p->layout->sizeHint().width(); } int ArtsControlApplet::heightForWidth( int w ) const { @@ -122,12 +122,12 @@ kdDebug()<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() diff --git a/juk/collectionlist.h b/juk/collectionlist.h index 3fbf9a5a..84410a14 100644 --- a/juk/collectionlist.h +++ b/juk/collectionlist.h @@ -96,7 +96,7 @@ public: virtual bool canReload() const { return true; } public slots: - virtual void paste() { decode(kapp->tqclipboard()->data()); } + virtual void paste() { decode(kapp->clipboard()->data()); } virtual void clear(); void slotCheckCache(); diff --git a/juk/coverdialogbase.ui b/juk/coverdialogbase.ui index 080f108c..dbdcda9c 100644 --- a/juk/coverdialogbase.ui +++ b/juk/coverdialogbase.ui @@ -65,7 +65,7 @@ - tqlayout3 + layout3 @@ -73,7 +73,7 @@ - tqlayout3 + layout3 diff --git a/juk/coverinfo.cpp b/juk/coverinfo.cpp index 2ae531bc..624a67fd 100644 --- a/juk/coverinfo.cpp +++ b/juk/coverinfo.cpp @@ -34,10 +34,10 @@ struct CoverPopup : public TQWidget CoverPopup(const TQPixmap &image, const TQPoint &p) : TQWidget(0, 0, WDestructiveClose | WX11BypassWM) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + TQHBoxLayout *layout = new TQHBoxLayout(this); TQLabel *label = new TQLabel(this); - tqlayout->addWidget(label); + layout->addWidget(label); label->setFrameStyle(TQFrame::Box | TQFrame::Raised); label->setLineWidth(1); label->setPixmap(image); diff --git a/juk/deletedialogbase.ui b/juk/deletedialogbase.ui index a1e16a95..2a7837af 100644 --- a/juk/deletedialogbase.ui +++ b/juk/deletedialogbase.ui @@ -24,7 +24,7 @@ - tqlayout4 + layout4 @@ -48,7 +48,7 @@ - tqlayout3 + layout3 diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp index 871d8b89..31570dbd 100644 --- a/juk/filerenamer.cpp +++ b/juk/filerenamer.cpp @@ -232,7 +232,7 @@ FileRenamerWidget::FileRenamerWidget(TQWidget *parent) : m_exampleText->setPaletteBackgroundColor(temp->paletteBackgroundColor()); delete temp; - tqlayout()->setMargin(0); // We'll be wrapped by KDialogBase + layout()->setMargin(0); // We'll be wrapped by KDialogBase // This must be created before createTagRows() is called. @@ -410,7 +410,7 @@ bool FileRenamerWidget::removeRow(unsigned id) if(m_rows[id].position > 0) checkboxPosition = m_rows[id].position - 1; - // The checkbox is contained within a tqlayout widget, so the tqlayout + // The checkbox is contained within a layout widget, so the layout // widget is the one the needs to die. delete m_folderSwitches[checkboxPosition]->parent(); m_folderSwitches.erase(&m_folderSwitches[checkboxPosition]); @@ -675,17 +675,17 @@ void FileRenamerWidget::moveItem(unsigned id, MovementDirection direction) // Move the item two spaces above/below its previous position. It has to // be 2 spaces because of the checkbox. - TQBoxLayout *tqlayout = dynamic_cast(m_mainFrame->tqlayout()); + TQBoxLayout *layout = dynamic_cast(m_mainFrame->layout()); - tqlayout->remove(l); - tqlayout->insertWidget(2 * newPos, l); + layout->remove(l); + layout->insertWidget(2 * newPos, l); // Move the top item two spaces in the opposite direction, for a similar // reason. - tqlayout->remove(w); - tqlayout->insertWidget(2 * pos, w); - tqlayout->invalidate(); + layout->remove(w); + layout->insertWidget(2 * pos, w); + layout->invalidate(); TQTimer::singleShot(0, this, TQT_SLOT(exampleTextChanged())); } @@ -778,7 +778,7 @@ void FileRenamerWidget::insertCategory() // Set its down button to be disabled. m_rows[id].downButton->setEnabled(false); - m_mainFrame->tqlayout()->invalidate(); + m_mainFrame->layout()->invalidate(); m_mainView->update(); // Now update according to the code in loadConfig(). diff --git a/juk/filerenamer.h b/juk/filerenamer.h index 93f4e4cb..46f17bf0 100644 --- a/juk/filerenamer.h +++ b/juk/filerenamer.h @@ -61,7 +61,7 @@ struct Row /** * A list of rows, each of which may have its own category options and other * associated data. There is no relation between the order of rows in the vector and their - * GUI tqlayout. Instead, each Row has a position member which indicates what GUI position it + * GUI layout. Instead, each Row has a position member which indicates what GUI position it * takes up. The index into the vector is known as the row identifier (which is unique but * not necessarily constant). */ @@ -186,7 +186,7 @@ private: /** * This function adds a "Insert Folder separator" checkbox to the end of - * the current tqlayout. The setting defaults to being unchecked. + * the current layout. The setting defaults to being unchecked. */ void addFolderSeparatorCheckbox(); @@ -336,7 +336,7 @@ private: /** * This moves the widget \p l in the direction given by \p direction, taking * care to make sure that the checkboxes are not moved, and that they are - * enabled or disabled as appropriate for the new tqlayout, and that the up and + * enabled or disabled as appropriate for the new layout, and that the up and * down buttons are also adjusted as necessary. * * @param id the identifier of the row to move @@ -427,14 +427,14 @@ private slots: virtual void slotRemoveRow(int id); /** - * This function moves \p category up in the tqlayout. + * This function moves \p category up in the layout. * * @param id the unique id of the widget to move up. */ virtual void moveItemUp(int id); /** - * This function moves \p category down in the tqlayout. + * This function moves \p category down in the layout. * * @param id the unique id of the widget to move down. */ diff --git a/juk/filerenamerbase.ui b/juk/filerenamerbase.ui index 541e928d..d7abb413 100644 --- a/juk/filerenamerbase.ui +++ b/juk/filerenamerbase.ui @@ -29,7 +29,7 @@ - tqlayout4 + layout4 @@ -68,7 +68,7 @@ - tqlayout3 + layout3 @@ -216,7 +216,7 @@ - tqlayout2 + layout2 diff --git a/juk/filerenameroptions.cpp b/juk/filerenameroptions.cpp index a1e87bfb..d40fd81c 100644 --- a/juk/filerenameroptions.cpp +++ b/juk/filerenameroptions.cpp @@ -29,17 +29,17 @@ FileRenamerTagOptions::FileRenamerTagOptions(TQWidget *parent, const TagRenamerOptions &options) : FileRenamerTagOptionsBase(parent), m_options(options) { - tqlayout()->setSpacing(KDialog::spacingHint()); - tqlayout()->setMargin(0); + layout()->setSpacing(KDialog::spacingHint()); + layout()->setMargin(0); - m_emptyTagGroup->tqlayout()->setSpacing(KDialog::spacingHint()); - m_trackGroup->tqlayout()->setSpacing(KDialog::spacingHint()); + m_emptyTagGroup->layout()->setSpacing(KDialog::spacingHint()); + m_trackGroup->layout()->setSpacing(KDialog::spacingHint()); m_emptyValueLayout->setSpacing(KDialog::spacingHint()); m_exampleLayout->setSpacing(KDialog::spacingHint()); m_spinLayout->setSpacing(KDialog::spacingHint()); m_widthLayout->setSpacing(KDialog::spacingHint()); m_tagLayout->setSpacing(KDialog::spacingHint()); - m_tagFormatGroup->tqlayout()->setSpacing(KDialog::spacingHint()); + m_tagFormatGroup->layout()->setSpacing(KDialog::spacingHint()); if(m_options.category() != Track) m_trackGroup->hide(); diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp index 1cd1ebff..568a8d59 100644 --- a/juk/nowplaying.cpp +++ b/juk/nowplaying.cpp @@ -58,9 +58,9 @@ NowPlaying::NowPlaying(TQWidget *parent, PlaylistCollection *collection, const c CollectionList::instance()->addObserver(&m_observer); - tqlayout()->setMargin(5); - tqlayout()->setSpacing(3); - setFixedHeight(imageSize + 2 + tqlayout()->margin() * 2); + layout()->setMargin(5); + layout()->setSpacing(3); + setFixedHeight(imageSize + 2 + layout()->margin() * 2); setStretchFactor(new CoverItem(this), 0); setStretchFactor(new TrackItem(this), 2); @@ -109,7 +109,7 @@ CoverItem::CoverItem(NowPlaying *parent) : TQLabel(parent, "CoverItem"), NowPlayingItem(parent) { - setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2); + setFixedHeight(parent->height() - parent->layout()->margin() * 2); setFrameStyle(Box | Plain); setLineWidth(1); setMargin(1); @@ -218,17 +218,17 @@ TrackItem::TrackItem(NowPlaying *parent) : TQWidget(parent, "TrackItem"), NowPlayingItem(parent) { - setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2); + setFixedHeight(parent->height() - parent->layout()->margin() * 2); setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); m_label = new LinkLabel(this); m_label->setLinkUnderline(false); - tqlayout->addStretch(); - tqlayout->addWidget(m_label); - tqlayout->addStretch(); + layout->addStretch(); + layout->addWidget(m_label); + layout->addStretch(); connect(m_label, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(slotOpenLink(const TQString &))); @@ -291,7 +291,7 @@ HistoryItem::HistoryItem(NowPlaying *parent) : LinkLabel(parent, "HistoryItem"), NowPlayingItem(parent) { - setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2); + setFixedHeight(parent->height() - parent->layout()->margin() * 2); setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); setLinkUnderline(false); setText(TQString("%1").arg(i18n("History"))); diff --git a/juk/playlist.cpp b/juk/playlist.cpp index fcf142cf..047bba00 100644 --- a/juk/playlist.cpp +++ b/juk/playlist.cpp @@ -727,12 +727,12 @@ void Playlist::synchronizePlayingItems(const PlaylistList &sources, bool setMast void Playlist::copy() { - kapp->tqclipboard()->setData(dragObject(0), TQClipboard::Clipboard); + kapp->clipboard()->setData(dragObject(0), TQClipboard::Clipboard); } void Playlist::paste() { - decode(kapp->tqclipboard()->data(), static_cast(currentItem())); + decode(kapp->clipboard()->data(), static_cast(currentItem())); } void Playlist::clear() diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp index 74019be3..f3701edb 100644 --- a/juk/playlistbox.cpp +++ b/juk/playlistbox.cpp @@ -208,7 +208,7 @@ void PlaylistBox::duplicate() void PlaylistBox::paste() { Item *i = static_cast(currentItem()); - decode(kapp->tqclipboard()->data(), i); + decode(kapp->clipboard()->data(), i); } //////////////////////////////////////////////////////////////////////////////// diff --git a/juk/playlistsplitter.h b/juk/playlistsplitter.h index b0ed1a75..2162d9b8 100644 --- a/juk/playlistsplitter.h +++ b/juk/playlistsplitter.h @@ -30,7 +30,7 @@ class PlaylistInterface; class TagEditor; /** - * This is the main tqlayout class of JuK. It should contain a PlaylistBox and + * This is the main layout class of JuK. It should contain a PlaylistBox and * a TQWidgetStack of the Playlists. * * This class serves as a "mediator" (see "Design Patterns") between the JuK diff --git a/juk/stringhash.h b/juk/stringhash.h index bf866958..eaf5b6b9 100644 --- a/juk/stringhash.h +++ b/juk/stringhash.h @@ -118,7 +118,7 @@ protected: inline char hashStringAccess(const TQString &in, int index) { - return in.tqunicode()[index].cell(); + return in.unicode()[index].cell(); } inline char hashStringAccess(const TQCString &in, int index) diff --git a/juk/systemtray.h b/juk/systemtray.h index fb6e91f9..66f76111 100644 --- a/juk/systemtray.h +++ b/juk/systemtray.h @@ -90,7 +90,7 @@ private: void createButtonBox(TQWidget *parent); - // Creates the widget tqlayout for the popup, returning the TQVBox that + // Creates the widget layout for the popup, returning the TQVBox that // holds the text labels. Uses buttonsToLeft() to figure out which // order to create them in. @p file is used to grab the cover. TQVBox *createPopupLayout(TQWidget *parent, const FileHandle &file); diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp index d13f09f0..f8a258ae 100644 --- a/juk/tageditor.cpp +++ b/juk/tageditor.cpp @@ -481,16 +481,16 @@ void TagEditor::setupLayout() static const int horizontalSpacing = 12; static const int verticalSpacing = 2; - TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 6, horizontalSpacing); + TQHBoxLayout *layout = new TQHBoxLayout(this, 6, horizontalSpacing); ////////////////////////////////////////////////////////////////////////////// - // define two columns of the bottem tqlayout + // define two columns of the bottem layout ////////////////////////////////////////////////////////////////////////////// - TQVBoxLayout *leftColumnLayout = new TQVBoxLayout(tqlayout, verticalSpacing); - TQVBoxLayout *rightColumnLayout = new TQVBoxLayout(tqlayout, verticalSpacing); + TQVBoxLayout *leftColumnLayout = new TQVBoxLayout(layout, verticalSpacing); + TQVBoxLayout *rightColumnLayout = new TQVBoxLayout(layout, verticalSpacing); - tqlayout->setStretchFactor(leftColumnLayout, 2); - tqlayout->setStretchFactor(rightColumnLayout, 3); + layout->setStretchFactor(leftColumnLayout, 2); + layout->setStretchFactor(rightColumnLayout, 3); ////////////////////////////////////////////////////////////////////////////// // put stuff in the left column -- all of the field names are class wide @@ -711,9 +711,9 @@ void TagEditor::saveChangesPrompt() } } -void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *tqlayout, const TQString &iconName) +void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *layout, const TQString &iconName) { - if(!item || !tqlayout) + if(!item || !layout) return; TQLabel *label = new TQLabel(item, text, this); @@ -727,14 +727,14 @@ void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *tqlay label->setMinimumHeight(enableBox->height()); - if(tqlayout->direction() == TQBoxLayout::LeftToRight) { - tqlayout->addWidget(iconLabel); - tqlayout->addWidget(label); - tqlayout->addWidget(item); - tqlayout->addWidget(enableBox); + if(layout->direction() == TQBoxLayout::LeftToRight) { + layout->addWidget(iconLabel); + layout->addWidget(label); + layout->addWidget(item); + layout->addWidget(enableBox); } else { - TQHBoxLayout *l = new TQHBoxLayout(tqlayout); + TQHBoxLayout *l = new TQHBoxLayout(layout); l->addWidget(iconLabel); l->addWidget(label); @@ -745,7 +745,7 @@ void TagEditor::addItem(const TQString &text, TQWidget *item, TQBoxLayout *tqlay l->addWidget(enableBox); l->setStretchFactor(enableBox, 0); - tqlayout->addWidget(item); + layout->addWidget(item); } enableBox->hide(); diff --git a/juk/tageditor.h b/juk/tageditor.h index 35526380..10649494 100644 --- a/juk/tageditor.h +++ b/juk/tageditor.h @@ -67,10 +67,10 @@ private: void save(const PlaylistItemList &list); void saveChangesPrompt(); /** - * Adds an item to JuK's tagging tqlayout. This handles the creation and + * Adds an item to JuK's tagging layout. This handles the creation and * placement of the "enable" box as well. */ - void addItem(const TQString &text, TQWidget *item, TQBoxLayout *tqlayout, const TQString &iconName = TQString()); + void addItem(const TQString &text, TQWidget *item, TQBoxLayout *layout, const TQString &iconName = TQString()); /** * Adds a widget to m_hideList and returns that widget. diff --git a/kaboodle/view.cpp b/kaboodle/view.cpp index 06eb4aaa..bde6e9f4 100644 --- a/kaboodle/view.cpp +++ b/kaboodle/view.cpp @@ -80,10 +80,10 @@ Kaboodle::View::View(TQWidget *parent, const char *name, Player *p) sliderBox->setFocusPolicy(TQ_ClickFocus); sliderBox->setAcceptDrops(true); - TQHBoxLayout *tqlayout = new TQHBoxLayout(sliderBox); - tqlayout->setSpacing(KDialog::spacingHint()); - tqlayout->setMargin(0); - tqlayout->setAutoAdd(true); + TQHBoxLayout *layout = new TQHBoxLayout(sliderBox); + layout->setSpacing(KDialog::spacingHint()); + layout->setMargin(0); + layout->setAutoAdd(true); playButton = createButton(BarIconSet("1rightarrow"), i18n("Play"), player, TQT_SLOT(play()), sliderBox); pauseButton = createButton(BarIconSet("player_pause"), i18n("Pause"), player, TQT_SLOT(pause()), sliderBox); diff --git a/kaudiocreator/encodefile.ui b/kaudiocreator/encodefile.ui index c35ca6f2..93a4055f 100644 --- a/kaudiocreator/encodefile.ui +++ b/kaudiocreator/encodefile.ui @@ -21,7 +21,7 @@ - tqlayout5 + layout5 @@ -267,7 +267,7 @@ - tqlayout4 + layout4 diff --git a/kaudiocreator/encoderconfig.ui b/kaudiocreator/encoderconfig.ui index c5f38b10..51e00ef1 100644 --- a/kaudiocreator/encoderconfig.ui +++ b/kaudiocreator/encoderconfig.ui @@ -140,7 +140,7 @@ - tqlayout2 + layout2 diff --git a/kaudiocreator/general.ui b/kaudiocreator/general.ui index ccdaf418..f372e507 100644 --- a/kaudiocreator/general.ui +++ b/kaudiocreator/general.ui @@ -194,7 +194,7 @@ - tqlayout1 + layout1 diff --git a/kaudiocreator/infodialog.ui b/kaudiocreator/infodialog.ui index 51333cb8..5a22fb56 100644 --- a/kaudiocreator/infodialog.ui +++ b/kaudiocreator/infodialog.ui @@ -214,7 +214,7 @@ - tqlayout2 + layout2 diff --git a/kaudiocreator/tracks.ui b/kaudiocreator/tracks.ui index 1965a545..0f9a5743 100644 --- a/kaudiocreator/tracks.ui +++ b/kaudiocreator/tracks.ui @@ -147,7 +147,7 @@ - tqlayout6 + layout6 diff --git a/kaudiocreator/wizard.ui b/kaudiocreator/wizard.ui index 0db84276..34a49d8e 100644 --- a/kaudiocreator/wizard.ui +++ b/kaudiocreator/wizard.ui @@ -117,7 +117,7 @@ - tqlayout15 + layout15 diff --git a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui index 10595a89..df27fffb 100644 --- a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui +++ b/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui @@ -234,7 +234,7 @@ - tqlayout7 + layout7 @@ -488,7 +488,7 @@ - tqlayout9 + layout9 diff --git a/kmid/ktrianglebutton.cpp b/kmid/ktrianglebutton.cpp index e94f0980..5bda855f 100644 --- a/kmid/ktrianglebutton.cpp +++ b/kmid/ktrianglebutton.cpp @@ -75,7 +75,7 @@ void KTriangleButton::paint( TQPainter *painter ) { if ( isDown() || isOn() ) { - if ( tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) + if ( style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) qDrawWinButton( painter, 0, 0, width(), height(), colorGroup(), TRUE ); else @@ -84,7 +84,7 @@ void KTriangleButton::paint( TQPainter *painter ) } else if ( raised ) { - if ( tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) + if ( style().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle ) qDrawWinButton( painter, 0, 0, width(), height(), colorGroup(), FALSE ); else diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp index 8ee4701e..462d655b 100644 --- a/kmix/kmix.cpp +++ b/kmix/kmix.cpp @@ -145,10 +145,10 @@ KMixWindow::initPrefDlg() void KMixWindow::initWidgets() { - // Main widget and tqlayout + // Main widget and layout setCentralWidget( new TQWidget( this, "qt_central_widget" ) ); - // Widgets tqlayout + // Widgets layout widgetsLayout = new TQVBoxLayout( centralWidget(), 0, 0, "widgetsLayout" ); widgetsLayout->setResizeMode(TQLayout::Minimum); // works fine @@ -166,7 +166,7 @@ KMixWindow::initWidgets() connect( m_cMixer, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( showSelectedMixer( int ) ) ); TQToolTip::add( m_cMixer, i18n("Current mixer" ) ); - // Add first tqlayout to widgets + // Add first layout to widgets widgetsLayout->addWidget( mixerNameLayout ); m_wsMixers = new TQWidgetStack( centralWidget(), "MixerWidgetStack" ); @@ -522,11 +522,11 @@ KMixWindow::applyPrefs( KMixPrefDlg *prefDlg ) } if ( prefDlg->_rbVertical->isChecked() ) { //TQString "For a change of language to take place, quit and restart KDiff3."; - //kdDebug(67100) << "KMix should change toQt::Vertical tqlayout\n"; + //kdDebug(67100) << "KMix should change toQt::Vertical layout\n"; m_toplevelOrientation = Qt::Vertical; } else if ( prefDlg->_rbHorizontal->isChecked() ) { - //kdDebug(67100) << "KMix should change toQt::Horizontal tqlayout\n"; + //kdDebug(67100) << "KMix should change toQt::Horizontal layout\n"; m_toplevelOrientation = Qt::Horizontal; } m_autoStart = prefDlg->m_autoStartChk->isChecked(); diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp index 20153449..adf1b88d 100644 --- a/kmix/kmixerwidget.cpp +++ b/kmix/kmixerwidget.cpp @@ -76,13 +76,13 @@ KMixerWidget::KMixerWidget( int _id, Mixer *mixer, const TQString &mixerName, { // No mixer found // !! Fix this: This is actually never shown! - TQBoxLayout *tqlayout = new TQHBoxLayout( this ); + TQBoxLayout *layout = new TQHBoxLayout( this ); TQString s = i18n("Invalid mixer"); if ( !mixerName.isEmpty() ) s.append(" \"").append(mixerName).append("\""); TQLabel *errorLabel = new TQLabel( s, this ); errorLabel->setAlignment( TQLabel::AlignCenter | TQLabel::WordBreak ); - tqlayout->addWidget( errorLabel ); + layout->addWidget( errorLabel ); } } @@ -103,7 +103,7 @@ void KMixerWidget::createLayout(ViewBase::ViewFlags vflags) delete m_topLayout; } - // create main tqlayout + // create main layout m_topLayout = new TQVBoxLayout( this, 0, 3, "m_topLayout" ); // Create tabs of input + output + [...] diff --git a/kmix/kmixprefdlg.cpp b/kmix/kmixprefdlg.cpp index 3cfa42e5..2185cb47 100644 --- a/kmix/kmixprefdlg.cpp +++ b/kmix/kmixprefdlg.cpp @@ -43,36 +43,36 @@ KMixPrefDlg::KMixPrefDlg( TQWidget *parent ) // general buttons m_generalTab = plainPage( /* i18n("&General") */ ); - TQBoxLayout *tqlayout = new TQVBoxLayout( m_generalTab ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQBoxLayout *layout = new TQVBoxLayout( m_generalTab ); + layout->setSpacing( KDialog::spacingHint() ); m_dockingChk = new TQCheckBox( i18n("&Dock into panel"), m_generalTab ); - tqlayout->addWidget( m_dockingChk ); + layout->addWidget( m_dockingChk ); TQWhatsThis::add(m_dockingChk, i18n("Docks the mixer into the KDE panel")); m_volumeChk = new TQCheckBox(i18n("Enable system tray &volume control"), m_generalTab); - tqlayout->addWidget(m_volumeChk); + layout->addWidget(m_volumeChk); m_showTicks = new TQCheckBox( i18n("Show &tickmarks"), m_generalTab ); - tqlayout->addWidget( m_showTicks ); + layout->addWidget( m_showTicks ); TQWhatsThis::add(m_showTicks, i18n("Enable/disable tickmark scales on the sliders")); m_showLabels = new TQCheckBox( i18n("Show &labels"), m_generalTab ); - tqlayout->addWidget( m_showLabels ); + layout->addWidget( m_showLabels ); TQWhatsThis::add(m_showLabels, i18n("Enables/disables description labels above the sliders")); m_onLogin = new TQCheckBox( i18n("Restore volumes on login"), m_generalTab ); - tqlayout->addWidget( m_onLogin ); + layout->addWidget( m_onLogin ); m_dockIconMuting = new TQCheckBox( i18n("Middle click on system tray icon toggles muting"), m_generalTab ); - tqlayout->addWidget( m_dockIconMuting ); + layout->addWidget( m_dockIconMuting ); - TQBoxLayout *numbersLayout = new TQHBoxLayout( tqlayout ); + TQBoxLayout *numbersLayout = new TQHBoxLayout( layout ); TQButtonGroup *numbersGroup = new TQButtonGroup( 3, Qt::Horizontal, i18n("Numbers"), m_generalTab ); numbersGroup->setRadioButtonExclusive(true); TQLabel* qlbl = new TQLabel( i18n("Volume Values: "), m_generalTab ); @@ -91,10 +91,10 @@ KMixPrefDlg::KMixPrefDlg( TQWidget *parent ) numbersLayout->addStretch(); m_autoStartChk = new TQCheckBox( i18n("&Autostart"), m_generalTab ); - tqlayout->addWidget( m_autoStartChk ); + layout->addWidget( m_autoStartChk ); TQWhatsThis::add(m_autoStartChk, i18n("Automatically start mixer when you login")); - TQBoxLayout *orientationLayout = new TQHBoxLayout( tqlayout ); + TQBoxLayout *orientationLayout = new TQHBoxLayout( layout ); TQButtonGroup* orientationGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n("Orientation"), m_generalTab ); //orientationLayout->add(orientationGroup); orientationGroup->setRadioButtonExclusive(true); @@ -112,7 +112,7 @@ KMixPrefDlg::KMixPrefDlg( TQWidget *parent ) orientationLayout->add(_rbVertical); orientationLayout->addStretch(); - tqlayout->addStretch(); + layout->addStretch(); enableButtonSeparator(true); connect( this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(apply()) ); diff --git a/kmix/ksmallslider.cpp b/kmix/ksmallslider.cpp index c47dfe93..8a69676f 100644 --- a/kmix/ksmallslider.cpp +++ b/kmix/ksmallslider.cpp @@ -225,7 +225,7 @@ void KSmallSlider::paintEvent( TQPaintEvent * ) int sliderPos = positionFromValue( TQRangeControl::value() ); // ------------------------ draw 3d border --------------------------------------------- - tqstyle().tqdrawPrimitive ( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TRUE ); + style().tqdrawPrimitive ( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TRUE ); // ------------------------ draw lower/left part ---------------------------------------- diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp index 8ec363ba..e5504534 100644 --- a/kmix/mdwenum.cpp +++ b/kmix/mdwenum.cpp @@ -132,7 +132,7 @@ TQSize MDWEnum::sizeHint() const { return _layout->sizeHint(); } else { - // tqlayout not (yet) created + // layout not (yet) created return TQWidget::sizeHint(); } } diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp index a4fa0bcc..f2ff1b1f 100644 --- a/kmix/mdwslider.cpp +++ b/kmix/mdwslider.cpp @@ -133,7 +133,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) slidersLayout->setAlignment(TQt::AlignHCenter); } - /* cesken: This is inconsistent. Why should vertical and horizontal tqlayout differ? + /* cesken: This is inconsistent. Why should vertical and horizontal layout differ? * Also it eats too much space - especially when you don't show sliders at all. * Even more on the vertical panel applet (see Bug #97667) if ( _orientation == Qt::Horizontal ) @@ -213,36 +213,36 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) // --- MUTE LED if ( showMuteLED ) { - TQBoxLayout *ledtqlayout; + TQBoxLayout *ledlayout; if ( _orientation == Qt::Vertical ) { - ledtqlayout = new TQHBoxLayout( sliLayout ); - ledtqlayout->setAlignment(TQt::AlignVCenter); + ledlayout = new TQHBoxLayout( sliLayout ); + ledlayout->setAlignment(TQt::AlignVCenter); } else { - ledtqlayout = new TQVBoxLayout( sliLayout ); - ledtqlayout->setAlignment(TQt::AlignHCenter); + ledlayout = new TQVBoxLayout( sliLayout ); + ledlayout->setAlignment(TQt::AlignHCenter); } if( m_mixdevice->hasMute() ) { - ledtqlayout->addStretch(); + ledlayout->addStretch(); // create mute LED m_muteLED = new KLedButton( TQt::green, KLed::On, KLed::Sunken, KLed::Circular, this, "MuteLED" ); m_muteLED->setFixedSize( TQSize(16, 16) ); m_muteLED->resize( TQSize(16, 16) ); - ledtqlayout->addWidget( m_muteLED ); + ledlayout->addWidget( m_muteLED ); TQToolTip::add( m_muteLED, i18n( "Mute" ) ); connect( m_muteLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(toggleMuted()) ); m_muteLED->installEventFilter( this ); - ledtqlayout->addStretch(); + ledlayout->addStretch(); } // has Mute LED else { // we don't have a MUTE LED. We create a dummy widget // !! possibly not neccesary any more (we are layouted) TQWidget *qw = new TQWidget(this, "Spacer"); qw->setFixedSize( TQSize(16, 16) ); - ledtqlayout->addWidget(qw); + ledlayout->addWidget(qw); qw->installEventFilter( this ); } // has no Mute LED @@ -314,7 +314,7 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) slider->hide(); number->hide(); } - slinumLayout->addWidget( slider ); // add to tqlayout + slinumLayout->addWidget( slider ); // add to layout m_sliders.append ( slider ); // add to list _slidersChids.append(chid); // Remember slider-chid association connect( slider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(volumeChange(int)) ); @@ -327,27 +327,27 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) sliLayout->addSpacing( 5 ); // --- LED LAYOUT TO CENTER --- - TQBoxLayout *rectqlayout; + TQBoxLayout *reclayout; if ( _orientation == Qt::Vertical ) { - rectqlayout = new TQHBoxLayout( sliLayout ); - rectqlayout->setAlignment(TQt::AlignVCenter); + reclayout = new TQHBoxLayout( sliLayout ); + reclayout->setAlignment(TQt::AlignVCenter); } else { - rectqlayout = new TQVBoxLayout( sliLayout ); - rectqlayout->setAlignment(TQt::AlignHCenter); + reclayout = new TQVBoxLayout( sliLayout ); + reclayout->setAlignment(TQt::AlignHCenter); } if( m_mixdevice->isRecordable() ) { - rectqlayout->addStretch(); + reclayout->addStretch(); m_recordLED = new KLedButton( TQt::red, m_mixdevice->isRecSource()?KLed::On:KLed::Off, KLed::Sunken, KLed::Circular, this, "RecordLED" ); m_recordLED->setFixedSize( TQSize(16, 16) ); - rectqlayout->addWidget( m_recordLED ); + reclayout->addWidget( m_recordLED ); connect(m_recordLED, TQT_SIGNAL(stateChanged(bool)), this, TQT_SLOT(setRecsrc(bool))); m_recordLED->installEventFilter( this ); TQToolTip::add( m_recordLED, i18n( "Record" ) ); - rectqlayout->addStretch(); + reclayout->addStretch(); } else { @@ -355,12 +355,12 @@ void MDWSlider::createWidgets( bool showMuteLED, bool showRecordLED ) // !! possibly not neccesary any more (we are layouted) TQWidget *qw = new TQWidget(this, "Spacer"); qw->setFixedSize( TQSize(16, 16) ); - rectqlayout->addWidget(qw); + reclayout->addWidget(qw); qw->installEventFilter( this ); } // has no Record LED } // showRecordLED - tqlayout()->activate(); + layout()->activate(); } @@ -438,7 +438,7 @@ MDWSlider::setIcon( int icontype ) kdError(67100) << "Pixmap missing." << endl; } - tqlayout()->activate(); + layout()->activate(); } bool @@ -514,7 +514,7 @@ MDWSlider::setStereoLinked(bool value) if( slider && static_cast(slider)->tickmarks() ) setTicks( true ); - tqlayout()->activate(); + layout()->activate(); } @@ -529,7 +529,7 @@ MDWSlider::setLabeled(bool value) else m_label->hide(); - tqlayout()->activate(); + layout()->activate(); } void @@ -558,7 +558,7 @@ MDWSlider::setTicks( bool ticks ) } } - tqlayout()->activate(); + layout()->activate(); } void @@ -579,7 +579,7 @@ MDWSlider::setValueStyle( ValueStyle valueStyle ) } } } - tqlayout()->activate(); + layout()->activate(); } void @@ -592,7 +592,7 @@ MDWSlider::setIcons(bool value) else m_iconLabel->hide(); - tqlayout()->activate(); + layout()->activate(); } } // if it has an icon } @@ -939,7 +939,7 @@ TQSize MDWSlider::sizeHint() const { return _layout->sizeHint(); } else { - // tqlayout not (yet) created + // layout not (yet) created return TQWidget::sizeHint(); } } diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp index d16be452..6fe1aeb4 100644 --- a/kmix/mdwswitch.cpp +++ b/kmix/mdwswitch.cpp @@ -169,7 +169,7 @@ TQSize MDWSwitch::sizeHint() const { return _layout->sizeHint(); } else { - // tqlayout not (yet) created + // layout not (yet) created return TQWidget::sizeHint(); } } diff --git a/kmix/viewapplet.cpp b/kmix/viewapplet.cpp index cf2b15b6..b81a27f1 100644 --- a/kmix/viewapplet.cpp +++ b/kmix/viewapplet.cpp @@ -140,7 +140,7 @@ void ViewApplet::constructionFinished() { TQSize ViewApplet::sizeHint() const { - // Basically out main tqlayout knows very good what the sizes should be + // Basically out main layout knows very good what the sizes should be TQSize qsz = _layoutMDW->sizeHint(); //kdDebug(67100) << "ViewApplet::sizeHint(): NewSize is " << qsz << "\n"; return qsz; diff --git a/kmix/viewdockareapopup.cpp b/kmix/viewdockareapopup.cpp index ec9a3cd6..4fac6d81 100644 --- a/kmix/viewdockareapopup.cpp +++ b/kmix/viewdockareapopup.cpp @@ -46,9 +46,9 @@ ViewDockAreaPopup::ViewDockAreaPopup(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW ) : ViewBase(parent, name, TQString(), mixer, WStyle_Customize | WType_Popup | TQt::WStyle_DialogBorder, vflags), _mdw(0), _dock(dockW) { - TQBoxLayout *tqlayout = new TQHBoxLayout( this ); + TQBoxLayout *layout = new TQHBoxLayout( this ); _frame = new TQFrame( this ); - tqlayout->addWidget( _frame ); + layout->addWidget( _frame ); _frame->setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised ); _frame->setLineWidth( 1 ); diff --git a/kmix/viewgrid.cpp b/kmix/viewgrid.cpp index a52973c4..72bae125 100644 --- a/kmix/viewgrid.cpp +++ b/kmix/viewgrid.cpp @@ -134,7 +134,7 @@ TQSize ViewGrid::sizeHint() const { void ViewGrid::constructionFinished() { //_layoutMDW->activate(); - // do a manual tqlayout + // do a manual layout configurationUpdate(); } diff --git a/kmix/viewsurround.cpp b/kmix/viewsurround.cpp index 81f84f64..8e0b6df5 100644 --- a/kmix/viewsurround.cpp +++ b/kmix/viewsurround.cpp @@ -154,7 +154,7 @@ TQWidget* ViewSurround::add(MixDevice *md) case MixDevice::SURROUND: case MixDevice::AC97: default: - // Add as slider to the tqlayout on the left side + // Add as slider to the layout on the left side _layoutSliders->add(mdw); break; } // switch(type) diff --git a/kmix/viewswitches.cpp b/kmix/viewswitches.cpp index 3c414815..f2277ebf 100644 --- a/kmix/viewswitches.cpp +++ b/kmix/viewswitches.cpp @@ -46,7 +46,7 @@ ViewSwitches::ViewSwitches(TQWidget* parent, const char* name, const TQString & // Place enums right from the switches: This is done, so that there will be no // ugly space on the left side, when no Switch is shown. // Actually it is not really clear yet, why there is empty space at all: There are 0 items in - // the _layoutEnum, so it might be a sizeHint() or some other subtle tqlayout issue. + // the _layoutEnum, so it might be a sizeHint() or some other subtle layout issue. _layoutEnum = new TQVBoxLayout(_layoutMDW); } init(); diff --git a/krec/krecconfigure.cpp b/krec/krecconfigure.cpp index 5201c28d..c29d6b4a 100644 --- a/krec/krecconfigure.cpp +++ b/krec/krecconfigure.cpp @@ -87,13 +87,13 @@ KRecConfigGeneral::KRecConfigGeneral( TQWidget* p, const char*, const TQStringLi _tipofday = new TQCheckBox( i18n( "Show tip of the day at startup" ), this ); connect( _tipofday, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( tipofdaychanged( bool ) ) ); _layout->addWidget( _tipofday ); - TQBoxLayout* _tmptqlayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); + TQBoxLayout* _tmplayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); _enableAllMessages = new KPushButton( i18n( "Enable All Hidden Messages" ), this ); connect( _enableAllMessages, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableallmessagesclicked() ) ); - _tmptqlayout->addWidget( _enableAllMessages ); + _tmplayout->addWidget( _enableAllMessages ); TQLabel* _tmplbl = new TQLabel( i18n( "All messages with the \"Don't show this message again\" option are shown again after selecting this button." ), this ); - _tmptqlayout->addWidget( _tmplbl ); - _layout->addLayout( _tmptqlayout ); + _tmplayout->addWidget( _tmplbl ); + _layout->addLayout( _tmplayout ); _layout->addStretch( 100 ); diff --git a/kscd/ChangeLog b/kscd/ChangeLog index ab561f86..3cb6493c 100644 --- a/kscd/ChangeLog +++ b/kscd/ChangeLog @@ -225,7 +225,7 @@ Fri May 15 18:28:40 1998 Bernd Johannes Wuebben Tue Apr 14 05:17:36 1998 Bernd Johannes Wuebben - * tqlayout corrections for kscd magic dialog + * layout corrections for kscd magic dialog Sat Jan 17 21:36:27 1998 Bernd Johannes Wuebben diff --git a/kscd/TODO b/kscd/TODO index 2851ae13..e10c01c8 100644 --- a/kscd/TODO +++ b/kscd/TODO @@ -6,4 +6,4 @@ AJS: o fix eject button o don't show "no disc" error on startup o direct digital playback -o better GUI tqlayout for LCD panel +o better GUI layout for LCD panel diff --git a/kscd/kcompactdisc.h b/kscd/kcompactdisc.h index eeb17989..8015ab27 100644 --- a/kscd/kcompactdisc.h +++ b/kscd/kcompactdisc.h @@ -34,7 +34,7 @@ * @see #discChanged(): A disc was inserted or removed. * @see #trayOpening(): A disc is being removed. * - * The progress of ptqlayout is modelled by these signals: + * The progress of playout is modelled by these signals: * * @see #trackPlaying(): A track started playing, or is still playing. * @see #trackPaused(): A track was paused. @@ -64,12 +64,12 @@ public: void eject(); /** - * Start ptqlayout at given position of track. + * Start playout at given position of track. */ void play(unsigned startTrack = 0, unsigned startTrackPosition = 0, unsigned endTrack = 0); /** - * Pause/resume ptqlayout. + * Pause/resume playout. */ void pause(); @@ -96,7 +96,7 @@ public: void setVolume(unsigned volume); /** - * Stop ptqlayout. + * Stop playout. */ void stop(); diff --git a/kscd/libwm/cdtext.c b/kscd/libwm/cdtext.c index fafd039f..89671aa6 100644 --- a/kscd/libwm/cdtext.c +++ b/kscd/libwm/cdtext.c @@ -21,7 +21,7 @@ #include #include #include -#ifdef libtqunicode +#ifdef libunicode #include #endif @@ -155,12 +155,12 @@ void get_data_from_cdtext_pack( int arr = pack->header_field_id2_tracknumber; int i; int language_block; - int tqunicode; + int unicode; language_block = (pack->header_field_id4_block_no >> 4) & 0x07; - tqunicode = pack->header_field_id4_block_no & 0x80; + unicode = pack->header_field_id4_block_no & 0x80; - if(!tqunicode) + if(!unicode) { for(i = 0; i < DATAFIELD_LENGHT_IN_PACK; i++) { @@ -180,7 +180,7 @@ void get_data_from_cdtext_pack( } } } -#ifdef libtqunicode +#ifdef libunicode else /* doublebytes ;-) */ { for(i = 0; i < DATAFIELD_LENGHT_IN_PACK; i += 2) @@ -203,7 +203,7 @@ void get_data_from_cdtext_pack( } #else else { - wm_lib_message(WM_MSG_LEVEL_ERROR | WM_MSG_CLASS, "can't handle tqunicode"); + wm_lib_message(WM_MSG_LEVEL_ERROR | WM_MSG_CLASS, "can't handle unicode"); } #endif } @@ -315,9 +315,9 @@ get_glob_cdtext(struct wm_drive *d, int redo) { wm_cdtext_info.blocks[j] = lp_block; wm_cdtext_info.blocks[j]->block_code = code; - wm_cdtext_info.blocks[j]->block_tqunicode = pack->header_field_id4_block_no & 0x80; + wm_cdtext_info.blocks[j]->block_unicode = pack->header_field_id4_block_no & 0x80; wm_lib_message(WM_MSG_LEVEL_DEBUG | WM_MSG_CLASS, - "CDTEXT INFO: created a new language block; code %i, %s characters\n", code, lp_block->block_tqunicode?"doublebyte":"singlebyte"); + "CDTEXT INFO: created a new language block; code %i, %s characters\n", code, lp_block->block_unicode?"doublebyte":"singlebyte"); /* unsigned char block_encoding; not jet! cdtext_string* block_encoding_text; diff --git a/kscd/libwm/include/wm_cdtext.h b/kscd/libwm/include/wm_cdtext.h index ba481be0..e843ee95 100644 --- a/kscd/libwm/include/wm_cdtext.h +++ b/kscd/libwm/include/wm_cdtext.h @@ -44,7 +44,7 @@ typedef unsigned char cdtext_string[MAX_LENGHT_OF_CDTEXT_STRING]; struct cdtext_info_block { /* management */ unsigned char block_code; - unsigned char block_tqunicode; /* 0 - single chars, 1 - doublebytes */ + unsigned char block_unicode; /* 0 - single chars, 1 - doublebytes */ unsigned char block_encoding; /* orange book -? */ cdtext_string* block_encoding_text; diff --git a/kscd/panel.ui b/kscd/panel.ui index ab9203ec..2ef615ef 100644 --- a/kscd/panel.ui +++ b/kscd/panel.ui @@ -27,7 +27,7 @@ - tqlayout8 + layout8 @@ -40,7 +40,7 @@ - tqlayout6 + layout6 @@ -128,7 +128,7 @@ - tqlayout7 + layout7 @@ -203,7 +203,7 @@ - tqlayout5 + layout5 diff --git a/libkcddb/cdinfodialogbase.ui b/libkcddb/cdinfodialogbase.ui index 0e2e2f35..edc6e6fd 100644 --- a/libkcddb/cdinfodialogbase.ui +++ b/libkcddb/cdinfodialogbase.ui @@ -18,7 +18,7 @@ - tqlayout1 + layout1 @@ -276,7 +276,7 @@ - tqlayout2 + layout2 diff --git a/libkcddb/kcmcddb/kcmcddb.cpp b/libkcddb/kcmcddb/kcmcddb.cpp index fa15a995..3688ba6a 100644 --- a/libkcddb/kcmcddb/kcmcddb.cpp +++ b/libkcddb/kcmcddb/kcmcddb.cpp @@ -58,10 +58,10 @@ CDDBModule::CDDBModule(TQWidget *parent, const char *name, const TQStringList &) addConfig(cfg, widget_); - TQVBoxLayout * tqlayout = new TQVBoxLayout(this, 0); + TQVBoxLayout * layout = new TQVBoxLayout(this, 0); - tqlayout->addWidget(widget_); - tqlayout->addStretch(); + layout->addWidget(widget_); + layout->addStretch(); setQuickHelp(i18n("CDDB is used to get information like artist, title and song-names in CD's")); diff --git a/mpeglib/lib/util/render/dither/colorTableHighBit.cpp b/mpeglib/lib/util/render/dither/colorTableHighBit.cpp index 76038a5c..171f4e97 100644 --- a/mpeglib/lib/util/render/dither/colorTableHighBit.cpp +++ b/mpeglib/lib/util/render/dither/colorTableHighBit.cpp @@ -21,7 +21,7 @@ * Erik Corry's multi-byte dither routines. * * The basic idea is that the Init generates all the necessary tables. - * The tables incorporate the information about the tqlayout of pixels + * The tables incorporate the information about the layout of pixels * in the XImage, so that it should be able to cope with 15-bit, 16-bit * 24-bit (non-packed) and 32-bit (10-11 bits per color!) screens. * At present it cannot cope with 24-bit packed mode, since this involves diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp index 2924e1bc..27f4fa99 100644 --- a/noatun/library/cmodule.cpp +++ b/noatun/library/cmodule.cpp @@ -88,24 +88,24 @@ General::General(TQObject *parent) b->toggle(); } - TQGridLayout *tqlayout = new TQGridLayout(this, 0, KDialog::spacingHint()); - tqlayout->setSpacing(KDialog::spacingHint()); + TQGridLayout *layout = new TQGridLayout(this, 0, KDialog::spacingHint()); + layout->setSpacing(KDialog::spacingHint()); - tqlayout->addMultiCellWidget(mLoopList, 0, 0, 0, 1); - tqlayout->addMultiCellWidget(mOneInstance, 2, 2, 0, 1); - tqlayout->addMultiCellWidget(mClearOnOpen, 4, 4, 0, 1); - tqlayout->addMultiCellWidget(mFastVolume, 5, 5, 0, 1); - tqlayout->addMultiCellWidget(mRemaining, 6, 6, 0, 1); + layout->addMultiCellWidget(mLoopList, 0, 0, 0, 1); + layout->addMultiCellWidget(mOneInstance, 2, 2, 0, 1); + layout->addMultiCellWidget(mClearOnOpen, 4, 4, 0, 1); + layout->addMultiCellWidget(mFastVolume, 5, 5, 0, 1); + layout->addMultiCellWidget(mRemaining, 6, 6, 0, 1); - tqlayout->addWidget(titleLabel, 7, 0); - tqlayout->addWidget(mTitleFormat, 7, 1); + layout->addWidget(titleLabel, 7, 0); + layout->addWidget(mTitleFormat, 7, 1); - tqlayout->addWidget(dlsaver, 8, 0); - tqlayout->addWidget(mDlSaver, 8, 1); + layout->addWidget(dlsaver, 8, 0); + layout->addWidget(mDlSaver, 8, 1); - tqlayout->addMultiCellWidget(mPlayOnStartup, 9, 9, 0, 1); + layout->addMultiCellWidget(mPlayOnStartup, 9, 9, 0, 1); - tqlayout->setRowStretch(10, 1); + layout->setRowStretch(10, 1); } diff --git a/noatun/library/equalizerview.cpp b/noatun/library/equalizerview.cpp index 2a476861..c243a349 100644 --- a/noatun/library/equalizerview.cpp +++ b/noatun/library/equalizerview.cpp @@ -64,17 +64,17 @@ void PresetList::rename(TQListViewItem *item, int c) EqualizerLevel::EqualizerLevel(TQWidget *parent, VBand band) : TQWidget(parent), mBand(band) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, - 0, 0, "EqualizerLevel::tqlayout"); + TQVBoxLayout *layout = new TQVBoxLayout(this, + 0, 0, "EqualizerLevel::layout"); mSlider = new TQSlider(-200, 200, 25, 0, Qt::Vertical, this, "EqualizerLevel::mSlider"); mSlider->setTickmarks(TQSlider::Left); mSlider->setTickInterval(25); - tqlayout->addWidget(mSlider); + layout->addWidget(mSlider); connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed(int))); mLabel = new TQLabel("", this, "EqualizerLevel::mLabel"); mLabel->setAlignment(AlignHCenter | AlignVCenter); - tqlayout->addWidget(mLabel); + layout->addWidget(mLabel); setMinimumHeight(200); // setMinimumWidth(kapp->fontMetrics().width("158kHz")); diff --git a/noatun/library/equalizerwidget.ui b/noatun/library/equalizerwidget.ui index 4a0f6714..7ec3329f 100644 --- a/noatun/library/equalizerwidget.ui +++ b/noatun/library/equalizerwidget.ui @@ -24,7 +24,7 @@ - tqlayout5 + layout5 @@ -80,7 +80,7 @@ - tqlayout3 + layout3 @@ -238,7 +238,7 @@ - tqlayout4 + layout4 diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp index 98150f40..4e3a0711 100644 --- a/noatun/modules/infrared/irprefs.cpp +++ b/noatun/modules/infrared/irprefs.cpp @@ -54,35 +54,35 @@ TQMap IRPrefs::s_commands; IRPrefs::IRPrefs(TQObject *parent) : CModule(i18n("Infrared Control"), i18n("Configure Infrared Commands"), "remote", parent) { - TQGridLayout *tqlayout = new TQGridLayout(this, 3, 5, KDialog::marginHint(), KDialog::spacingHint()); - tqlayout->setColStretch(1, 1); + TQGridLayout *layout = new TQGridLayout(this, 3, 5, KDialog::marginHint(), KDialog::spacingHint()); + layout->setColStretch(1, 1); TQLabel *label = new TQLabel(i18n("Remote control &commands:"), this); - tqlayout->addMultiCellWidget(label, 0, 0, 0, 4); + layout->addMultiCellWidget(label, 0, 0, 0, 4); label->setBuddy(m_commands = new KListView(this)); - tqlayout->addMultiCellWidget(m_commands, 1, 1, 0, 4); + layout->addMultiCellWidget(m_commands, 1, 1, 0, 4); label = new TQLabel(i18n("&Action:"), this); - tqlayout->addWidget(label, 2, 0); + layout->addWidget(label, 2, 0); label->setBuddy(m_action = new KComboBox(this)); m_action->setEnabled(false); - tqlayout->addWidget(m_action, 2, 1); + layout->addWidget(m_action, 2, 1); m_repeat = new TQCheckBox(i18n("&Repeat"), this); m_repeat->setEnabled(false); - tqlayout->addWidget(m_repeat, 2, 2); + layout->addWidget(m_repeat, 2, 2); label = new TQLabel(i18n("&Interval:"), this); - tqlayout->addWidget(label, 2, 3); + layout->addWidget(label, 2, 3); label->setBuddy(m_interval = new KIntSpinBox(this)); m_interval->setMinValue(1); m_interval->setMaxValue(0xff); m_interval->setValue(10); m_interval->setEnabled(false); - tqlayout->addWidget(m_interval, 2, 4); + layout->addWidget(m_interval, 2, 4); connect(s_lirc, TQT_SIGNAL(remotesRead()), TQT_SLOT(reopen())); connect(m_commands, diff --git a/noatun/modules/keyz/keyz.cpp b/noatun/modules/keyz/keyz.cpp index e1f2286a..143be362 100644 --- a/noatun/modules/keyz/keyz.cpp +++ b/noatun/modules/keyz/keyz.cpp @@ -174,9 +174,9 @@ KeyzPrefs::KeyzPrefs( TQObject *parent ) : CModule( i18n("Keyz"), i18n("Shortcut Configuration"), "key_bindings", parent ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); m_chooser = new KKeyChooser( Keyz::accel(), this ); - tqlayout->addWidget( m_chooser ); + layout->addWidget( m_chooser ); } void KeyzPrefs::save() diff --git a/noatun/modules/splitplaylist/find.cpp b/noatun/modules/splitplaylist/find.cpp index d167e02e..5d378a79 100644 --- a/noatun/modules/splitplaylist/find.cpp +++ b/noatun/modules/splitplaylist/find.cpp @@ -11,8 +11,8 @@ Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), C mainWidget->setMinimumWidth(320); setMainWidget(mainWidget); - TQGridLayout *tqlayout=new TQGridLayout(mainWidget); - tqlayout->setSpacing(KDialog::spacingHint()); + TQGridLayout *layout=new TQGridLayout(mainWidget); + layout->setSpacing(KDialog::spacingHint()); mText=new KHistoryCombo(mainWidget); mText->setMaxCount(10); @@ -22,9 +22,9 @@ Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), C mRegexp=new TQCheckBox(i18n("&Regular expression"), mainWidget); mBackwards=new TQCheckBox(i18n("Find &backwards"), mainWidget); - tqlayout->addMultiCellWidget(mText, 0, 0, 0, 1); - tqlayout->addWidget(mRegexp, 1, 0); - tqlayout->addWidget(mBackwards, 1, 1); + layout->addMultiCellWidget(mText, 0, 0, 0, 1); + layout->addWidget(mRegexp, 1, 0); + layout->addWidget(mBackwards, 1, 1); connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(clicked())); diff --git a/noatun/modules/systray/yhconfigwidget.ui b/noatun/modules/systray/yhconfigwidget.ui index 3c14d3df..02ea0a1c 100644 --- a/noatun/modules/systray/yhconfigwidget.ui +++ b/noatun/modules/systray/yhconfigwidget.ui @@ -231,7 +231,7 @@ - tqlayout1 + layout1 diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp index 43940bb7..70a22ea5 100644 --- a/noatun/modules/winskin/winSkinConfig.cpp +++ b/noatun/modules/winskin/winSkinConfig.cpp @@ -29,7 +29,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) : "style", TQT_TQOBJECT(parent)) { - // Make a token horizontal tqlayout box + // Make a token horizontal layout box vbox = new TQVBoxLayout(this); vbox->setSpacing( 6 ); vbox->setMargin( 0 ); -- cgit v1.2.3