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 --- 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 ++-- 16 files changed, 62 insertions(+), 62 deletions(-) (limited to 'juk') 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. -- cgit v1.2.1