From 2ca843787e76f51e8c5f232518e349cfae572661 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:07:11 -0600 Subject: Rename obsolete tq methods to standard names --- src/cdopener.cpp | 18 +++++++++--------- src/configbackendspage.cpp | 10 +++++----- src/metadata/m4a/mp4mvhdbox.cpp | 2 +- src/metadata/m4a/mp4mvhdbox.h | 2 +- src/optionseditor.cpp | 10 +++++----- src/soundkonverter.cpp | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/cdopener.cpp b/src/cdopener.cpp index 318abfe..7b4c959 100755 --- a/src/cdopener.cpp +++ b/src/cdopener.cpp @@ -59,7 +59,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin connect( cArtist, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(artistChanged(const TQString&)) ); - // add a horizontal box tqlayout for the composer + // add a horizontal box layout for the composer TQHBoxLayout* artistBox = new TQHBoxLayout( -1, "artistBox" ); topGridLayout->addLayout( artistBox, 0, 3 ); // and fill it up @@ -84,7 +84,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin topGridLayout->addWidget( lAlbumLabel, 1, 0 ); lAlbum = new KLineEdit( this, "lAlbum" ); topGridLayout->addWidget( lAlbum, 1, 1 ); - // add a horizontal box tqlayout for the disc number, year and genre + // add a horizontal box layout for the disc number, year and genre TQHBoxLayout* albumBox = new TQHBoxLayout( -1, "albumBox" ); topGridLayout->addLayout( albumBox, 1, 3 ); // and fill it up @@ -131,9 +131,9 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin tagGroupBox = new TQGroupBox( i18n("No track selected"), this, "tagGroupBox" ); gridLayout->addWidget( tagGroupBox, 2, 0 ); tagGroupBox->setColumnLayout( 0, Qt::Vertical ); - tagGroupBox->tqlayout()->setSpacing( 6 ); - tagGroupBox->tqlayout()->setMargin( 6 ); - TQGridLayout* tagGridLayout = new TQGridLayout( tagGroupBox->tqlayout(), 1, 1, -1, "tagGridLayout" ); + tagGroupBox->layout()->setSpacing( 6 ); + tagGroupBox->layout()->setMargin( 6 ); + TQGridLayout* tagGridLayout = new TQGridLayout( tagGroupBox->layout(), 1, 1, -1, "tagGridLayout" ); // add the up and down buttons pTrackUp = new KPushButton( " ", tagGroupBox, "pTrackUp" ); @@ -152,7 +152,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin tagGridLayout->addWidget( pTrackDown, 1, 0 ); // add the inputs - // add a horizontal box tqlayout for the title + // add a horizontal box layout for the title TQHBoxLayout* trackTitleBox = new TQHBoxLayout( -1, "trackTitleBox" ); tagGridLayout->addLayout( trackTitleBox, 0, 2 ); // and fill it up @@ -171,7 +171,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin connect( pTrackTitleEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(editTrackTitleClicked()) ); - // add a horizontal box tqlayout for the composer + // add a horizontal box layout for the composer TQHBoxLayout* trackArtistBox = new TQHBoxLayout( -1, "trackArtistBox" ); tagGridLayout->addLayout( trackArtistBox, 1, 2 ); // and fill it up @@ -205,7 +205,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin connect( pTrackComposerEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(editTrackComposerClicked()) ); - // add a horizontal box tqlayout for the comment + // add a horizontal box layout for the comment TQHBoxLayout* trackCommentBox = new TQHBoxLayout( -1, "trackCommentBox" ); tagGridLayout->addLayout( trackCommentBox, 2, 2 ); // and fill it up @@ -234,7 +234,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin gridLayout->addWidget( lineFrame, 3, 0 ); gridLayout->setRowSpacing( 3, 16 ); - // add a horizontal box tqlayout for the control elements + // add a horizontal box layout for the control elements TQHBoxLayout* controlBox = new TQHBoxLayout( -1, "controlBox" ); gridLayout->addLayout( controlBox, 4, 0 ); diff --git a/src/configbackendspage.cpp b/src/configbackendspage.cpp index d6ece16..2551578 100755 --- a/src/configbackendspage.cpp +++ b/src/configbackendspage.cpp @@ -52,8 +52,8 @@ ConfigBackendsPage::ConfigBackendsPage( Config* _config, TQMapsetStretchFactor( lLegendLabel, 1 ); TQGroupBox* ripperGroup = new TQGroupBox( 1, Qt::Vertical, box, "ripperGroup" ); - ripperGroup->tqlayout()->setSpacing( 6 ); - ripperGroup->tqlayout()->setMargin( 6 ); + ripperGroup->layout()->setSpacing( 6 ); + ripperGroup->layout()->setMargin( 6 ); TQLabel* lRipper = new TQLabel( i18n("CD Ripper")+":", ripperGroup, "lRipper" ); cRipper = new KComboBox( ripperGroup, "cRipper" ); connect( cRipper, TQT_SIGNAL(activated(int)), @@ -252,10 +252,10 @@ void ConfigBackendsPage::rebuild() options.group = new TQGroupBox( title, box, options.format ); options.group->setColumnLayout( 0, Qt::Vertical ); - options.group->tqlayout()->setSpacing( 6 ); - options.group->tqlayout()->setMargin( 6 ); + options.group->layout()->setSpacing( 6 ); + options.group->layout()->setMargin( 6 ); options.group->show(); - options.grid = new TQGridLayout( options.group->tqlayout() ); + options.grid = new TQGridLayout( options.group->layout() ); options.lEncoder = new TQLabel( i18n("Encoder")+":", options.group, options.format ); options.lEncoder->show(); diff --git a/src/metadata/m4a/mp4mvhdbox.cpp b/src/metadata/m4a/mp4mvhdbox.cpp index 894f7f8..36053e4 100644 --- a/src/metadata/m4a/mp4mvhdbox.cpp +++ b/src/metadata/m4a/mp4mvhdbox.cpp @@ -39,7 +39,7 @@ public: TagLib::uint timescale; //! duration of presentation TagLib::ulonglong duration; - //! ptqlayout speed + //! playout speed TagLib::uint rate; //! volume for entire presentation TagLib::uint volume; diff --git a/src/metadata/m4a/mp4mvhdbox.h b/src/metadata/m4a/mp4mvhdbox.h index 31e3d74..b133485 100644 --- a/src/metadata/m4a/mp4mvhdbox.h +++ b/src/metadata/m4a/mp4mvhdbox.h @@ -44,7 +44,7 @@ namespace TagLib uint timescale() const; //! function to get the presentation duration in the mp4 file ulonglong duration() const; - //! function to get the rate (ptqlayout speed) - typically 1.0; + //! function to get the rate (playout speed) - typically 1.0; uint rate() const; //! function to get volume level for presentation - typically 1.0; uint volume() const; diff --git a/src/optionseditor.cpp b/src/optionseditor.cpp index 2b18cbe..d6e6f41 100755 --- a/src/optionseditor.cpp +++ b/src/optionseditor.cpp @@ -81,7 +81,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList* TQGridLayout* tagsGridLayout = new TQGridLayout( tags, 1, 1, 0, 6, "tagsGridLayout" ); // add the inputs - // add a horizontal box tqlayout for the title and track number + // add a horizontal box layout for the title and track number TQHBoxLayout *titleBox = new TQHBoxLayout( -1, "titleBox" ); tagsGridLayout->addLayout( titleBox, 0, 1 ); // and fill it up @@ -116,7 +116,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList* this, TQT_SLOT(editNumberClicked()) ); - // add a horizontal box tqlayout for the artist and the composer + // add a horizontal box layout for the artist and the composer TQHBoxLayout *artistBox = new TQHBoxLayout( -1, "artistBox" ); tagsGridLayout->addLayout( artistBox, 1, 1 ); // and fill it up @@ -151,7 +151,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList* this, TQT_SLOT(editComposerClicked()) ); - // add a horizontal box tqlayout for the album + // add a horizontal box layout for the album TQHBoxLayout *albumBox = new TQHBoxLayout( -1, "albumBox" ); tagsGridLayout->addLayout( albumBox, 2, 1 ); // and fill it up @@ -171,7 +171,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList* this, TQT_SLOT(editAlbumClicked()) ); - // add a horizontal box tqlayout for the disc number, year and genre + // add a horizontal box layout for the disc number, year and genre TQHBoxLayout *albumdataBox = new TQHBoxLayout( -1, "albumdataBox" ); tagsGridLayout->addLayout( albumdataBox, 3, 1 ); // and fill it up @@ -228,7 +228,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList* this, TQT_SLOT(editGenreClicked()) ); - // add a horizontal box tqlayout for the comment + // add a horizontal box layout for the comment TQHBoxLayout *commentBox = new TQHBoxLayout( -1, "commentBox" ); tagsGridLayout->addLayout( commentBox, 4, 1 ); // and fill it up diff --git a/src/soundkonverter.cpp b/src/soundkonverter.cpp index 3efcfdc..dd7dcd9 100755 --- a/src/soundkonverter.cpp +++ b/src/soundkonverter.cpp @@ -222,7 +222,7 @@ soundKonverter::soundKonverter() // convert, TQT_SLOT(priorityChanged(int)) // ); - // add a horizontal box tqlayout for the add combobutton to the grid + // add a horizontal box layout for the add combobutton to the grid TQHBoxLayout *addBox = new TQHBoxLayout( -1, "addBox" ); gridLayout->addLayout( addBox, 2, 0 ); -- cgit v1.2.1