summaryrefslogtreecommitdiffstats
path: root/juk
diff options
context:
space:
mode:
Diffstat (limited to 'juk')
-rw-r--r--juk/collectionlist.cpp26
-rw-r--r--juk/collectionlist.h6
-rw-r--r--juk/covericonview.cpp2
-rw-r--r--juk/covermanager.cpp14
-rw-r--r--juk/deletedialogbase.ui6
-rw-r--r--juk/directorylistbase.ui2
-rw-r--r--juk/filerenamer.cpp10
-rw-r--r--juk/filerenameroptions.cpp10
-rw-r--r--juk/filerenameroptionsbase.ui14
-rw-r--r--juk/musicbrainzquery.cpp2
-rw-r--r--juk/nowplaying.cpp12
-rw-r--r--juk/playlist.cpp4
-rw-r--r--juk/playlistbox.cpp8
-rw-r--r--juk/playlistcollection.cpp4
-rw-r--r--juk/playlistsplitter.cpp2
-rw-r--r--juk/searchwidget.cpp2
-rw-r--r--juk/systemtray.cpp10
-rw-r--r--juk/tagrenameroptions.cpp24
-rw-r--r--juk/tagtransactionmanager.cpp2
-rw-r--r--juk/trackpickerdialogbase.ui6
-rw-r--r--juk/treeviewitemplaylist.cpp2
-rw-r--r--juk/webimagefetcher.cpp2
-rw-r--r--juk/webimagefetcherdialog.cpp8
23 files changed, 89 insertions, 89 deletions
diff --git a/juk/collectionlist.cpp b/juk/collectionlist.cpp
index 2816f85e..eb1b5d42 100644
--- a/juk/collectionlist.cpp
+++ b/juk/collectionlist.cpp
@@ -162,7 +162,7 @@ void CollectionList::slotRefreshItems(const KFileItemList &items)
// If the item is no longer on disk, remove it from the collection.
if(item->file().fileInfo().exists())
- item->tqrepaint();
+ item->repaint();
else
clearItem(item);
}
@@ -392,13 +392,13 @@ void CollectionListItem::refresh()
file().coverInfo()->setCover();
if(listView()->isVisible())
- tqrepaint();
+ repaint();
- for(PlaylistItemList::Iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) {
+ for(PlaylistItemList::Iterator it = m_children.begin(); it != m_children.end(); ++it) {
(*it)->playlist()->update();
(*it)->playlist()->dataChanged();
if((*it)->listView()->isVisible())
- (*it)->tqrepaint();
+ (*it)->repaint();
}
CollectionList::instance()->dataChanged();
@@ -411,7 +411,7 @@ PlaylistItem *CollectionListItem::itemForPlaylist(const Playlist *playlist)
return this;
PlaylistItemList::ConstIterator it;
- for(it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it)
+ for(it = m_children.begin(); it != m_children.end(); ++it)
if((*it)->playlist() == playlist)
return *it;
return 0;
@@ -428,11 +428,11 @@ void CollectionListItem::updateCollectionDict(const TQString &oldPath, const TQS
collection->addToDict(newPath, this);
}
-void CollectionListItem::tqrepaint() const
+void CollectionListItem::repaint() const
{
- TQListViewItem::tqrepaint();
- for(PlaylistItemList::ConstIterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it)
- (*it)->tqrepaint();
+ TQListViewItem::repaint();
+ for(PlaylistItemList::ConstIterator it = m_children.begin(); it != m_children.end(); ++it)
+ (*it)->repaint();
}
////////////////////////////////////////////////////////////////////////////////
@@ -468,8 +468,8 @@ CollectionListItem::~CollectionListItem()
{
m_shuttingDown = true;
- for(PlaylistItemList::ConstIterator it = m_tqchildren.begin();
- it != m_tqchildren.end();
+ for(PlaylistItemList::ConstIterator it = m_children.begin();
+ it != m_children.end();
++it)
{
(*it)->playlist()->clearItem(*it);
@@ -486,13 +486,13 @@ CollectionListItem::~CollectionListItem()
void CollectionListItem::addChildItem(PlaylistItem *child)
{
- m_tqchildren.append(child);
+ m_children.append(child);
}
void CollectionListItem::removeChildItem(PlaylistItem *child)
{
if(!m_shuttingDown)
- m_tqchildren.remove(child);
+ m_children.remove(child);
}
bool CollectionListItem::checkCurrent()
diff --git a/juk/collectionlist.h b/juk/collectionlist.h
index e26a8c3a..3fbf9a5a 100644
--- a/juk/collectionlist.h
+++ b/juk/collectionlist.h
@@ -172,8 +172,8 @@ public:
virtual void refresh();
PlaylistItem *itemForPlaylist(const Playlist *playlist);
void updateCollectionDict(const TQString &oldPath, const TQString &newPath);
- void tqrepaint() const;
- PlaylistItemList tqchildren() const { return m_tqchildren; }
+ void repaint() const;
+ PlaylistItemList children() const { return m_children; }
protected:
CollectionListItem(const FileHandle &file);
@@ -192,7 +192,7 @@ protected:
private:
bool m_shuttingDown;
- PlaylistItemList m_tqchildren;
+ PlaylistItemList m_children;
};
#endif
diff --git a/juk/covericonview.cpp b/juk/covericonview.cpp
index 58b5a2b9..fc400e78 100644
--- a/juk/covericonview.cpp
+++ b/juk/covericonview.cpp
@@ -22,7 +22,7 @@ CoverIconViewItem::CoverIconViewItem(coverKey id, TQIconView *parent) :
KIconViewItem(parent), m_id(id)
{
CoverDataPtr data = CoverManager::coverInfo(id);
- setText(TQString("%1 - %2").tqarg(data->artist, data->album));
+ setText(TQString("%1 - %2").arg(data->artist, data->album));
setPixmap(data->thumbnail());
}
diff --git a/juk/covermanager.cpp b/juk/covermanager.cpp
index 5ee5bbf0..59c488d2 100644
--- a/juk/covermanager.cpp
+++ b/juk/covermanager.cpp
@@ -395,7 +395,7 @@ coverKey CoverManager::addCover(const TQPixmap &large, const TQString &artist, c
// Save it to file first!
- TQString ext = TQString("/coverdb/coverID-%1.png").tqarg(id);
+ TQString ext = TQString("/coverdb/coverID-%1.png").arg(id);
coverData->path = KGlobal::dirs()->saveLocation("appdata") + ext;
kdDebug() << "Saving pixmap to " << coverData->path << endl;
@@ -413,8 +413,8 @@ coverKey CoverManager::addCover(const TQPixmap &large, const TQString &artist, c
data()->covers[id] = coverData;
// Make sure the new cover isn't inadvertently cached.
- data()->pixmapCache.remove(TQString("f%1").tqarg(coverData->path));
- data()->pixmapCache.remove(TQString("t%1").tqarg(coverData->path));
+ data()->pixmapCache.remove(TQString("f%1").arg(coverData->path));
+ data()->pixmapCache.remove(TQString("t%1").arg(coverData->path));
return id;
}
@@ -436,8 +436,8 @@ bool CoverManager::removeCover(coverKey id)
// Remove cover from cache.
CoverDataPtr coverData = coverInfo(id);
- data()->pixmapCache.remove(TQString("f%1").tqarg(coverData->path));
- data()->pixmapCache.remove(TQString("t%1").tqarg(coverData->path));
+ data()->pixmapCache.remove(TQString("f%1").arg(coverData->path));
+ data()->pixmapCache.remove(TQString("t%1").arg(coverData->path));
// Remove references to files that had that track ID.
TQDictIterator<coverKey> it(data()->tracks);
@@ -462,8 +462,8 @@ bool CoverManager::replaceCover(coverKey id, const TQPixmap &large)
CoverDataPtr coverData = coverInfo(id);
// Empty old pixmaps from cache.
- data()->pixmapCache.remove(TQString("%1%2").tqarg("t", coverData->path));
- data()->pixmapCache.remove(TQString("%1%2").tqarg("f", coverData->path));
+ data()->pixmapCache.remove(TQString("%1%2").arg("t", coverData->path));
+ data()->pixmapCache.remove(TQString("%1%2").arg("f", coverData->path));
large.save(coverData->path, "PNG");
return true;
diff --git a/juk/deletedialogbase.ui b/juk/deletedialogbase.ui
index 7aebdf5c..a1e16a95 100644
--- a/juk/deletedialogbase.ui
+++ b/juk/deletedialogbase.ui
@@ -61,7 +61,7 @@
<property name="text">
<string>Are you sure that you want to remove these items?</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -72,7 +72,7 @@
<property name="text">
<string>Deletion method placeholder, never shown to user.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
@@ -101,7 +101,7 @@
<property name="text">
<string>Placeholder for number of files, not in GUI</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/juk/directorylistbase.ui b/juk/directorylistbase.ui
index 65d334e8..02aae023 100644
--- a/juk/directorylistbase.ui
+++ b/juk/directorylistbase.ui
@@ -63,7 +63,7 @@
<property name="text">
<string>These folders will be scanned on startup for new files.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp
index b0dc50f6..871d8b89 100644
--- a/juk/filerenamer.cpp
+++ b/juk/filerenamer.cpp
@@ -352,7 +352,7 @@ unsigned FileRenamerWidget::addRowCategory(TagType category)
downMapper->connect(row.downButton, TQT_SIGNAL(clicked()), TQT_SLOT(map()));
downMapper->setMapping(TQT_TQOBJECT(row.downButton), id);
- TQString labelText = TQString("<b>%1</b>").tqarg(TagRenamerOptions::tagTypeText(category));
+ TQString labelText = TQString("<b>%1</b>").arg(TagRenamerOptions::tagTypeText(category));
TQLabel *label = new TQLabel(labelText, frame);
frame->setStretchFactor(label, 1);
label->setAlignment(AlignCenter);
@@ -685,7 +685,7 @@ void FileRenamerWidget::moveItem(unsigned id, MovementDirection direction)
tqlayout->remove(w);
tqlayout->insertWidget(2 * pos, w);
- tqlayout->tqinvalidate();
+ tqlayout->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()->tqinvalidate();
+ m_mainFrame->tqlayout()->invalidate();
m_mainView->update();
// Now update according to the code in loadConfig().
@@ -875,7 +875,7 @@ void FileRenamer::rename(const PlaylistItemList &items)
setFolderIcon(it.data(), itemMap[it.key()]);
}
else
- errorFiles << i18n("%1 to %2").tqarg(it.key()).tqarg(it.data());
+ errorFiles << i18n("%1 to %2").arg(it.key()).arg(it.data());
processEvents();
}
@@ -952,7 +952,7 @@ void FileRenamer::setFolderIcon(const KURL &dst, const PlaylistItem *item)
config.setGroup("Desktop Entry");
if(!config.hasKey("Icon")) {
- config.writeEntry("Icon", TQString("%1/.juk-thumbnail.png").tqarg(path));
+ config.writeEntry("Icon", TQString("%1/.juk-thumbnail.png").arg(path));
config.sync();
}
diff --git a/juk/filerenameroptions.cpp b/juk/filerenameroptions.cpp
index d800d2e2..a1e87bfb 100644
--- a/juk/filerenameroptions.cpp
+++ b/juk/filerenameroptions.cpp
@@ -46,11 +46,11 @@ FileRenamerTagOptions::FileRenamerTagOptions(TQWidget *parent,
TQString tagText = m_options.tagTypeText();
- setCaption(caption().tqarg(tagText));
- m_tagFormatGroup->setTitle(m_tagFormatGroup->title().tqarg(tagText));
- m_emptyTagGroup->setTitle(m_emptyTagGroup->title().tqarg(tagText));
- m_description->setText(m_description->text().tqarg(tagText));
- m_tagLabel->setText(m_tagLabel->text().tqarg(tagText));
+ setCaption(caption().arg(tagText));
+ m_tagFormatGroup->setTitle(m_tagFormatGroup->title().arg(tagText));
+ m_emptyTagGroup->setTitle(m_emptyTagGroup->title().arg(tagText));
+ m_description->setText(m_description->text().arg(tagText));
+ m_tagLabel->setText(m_tagLabel->text().arg(tagText));
m_prefixText->setText(options.prefix());
m_suffixText->setText(options.suffix());
diff --git a/juk/filerenameroptionsbase.ui b/juk/filerenameroptionsbase.ui
index 07788856..d90953c0 100644
--- a/juk/filerenameroptionsbase.ui
+++ b/juk/filerenameroptionsbase.ui
@@ -40,7 +40,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
@@ -76,7 +76,7 @@
<property name="name">
<cstring>m_prefixText</cstring>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignRight</set>
</property>
</widget>
@@ -92,7 +92,7 @@
<property name="name">
<cstring>m_suffixText</cstring>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignLeft</set>
</property>
</widget>
@@ -127,7 +127,7 @@
<property name="text">
<string>Substitution Example</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -218,7 +218,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
@@ -315,7 +315,7 @@
<property name="text">
<string>3 -&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@@ -326,7 +326,7 @@
<property name="text">
<string>14 -&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/juk/musicbrainzquery.cpp b/juk/musicbrainzquery.cpp
index 6a6eb45e..c87a883c 100644
--- a/juk/musicbrainzquery.cpp
+++ b/juk/musicbrainzquery.cpp
@@ -68,7 +68,7 @@ void MusicBrainzLookup::error()
void MusicBrainzLookup::message(const TQString &s) const
{
KMainWindow *w = static_cast<KMainWindow *>(kapp->mainWidget());
- w->statusBar()->message(TQString("%1 (%2)").tqarg(s).tqarg(m_file.fileInfo().fileName()), 3000);
+ w->statusBar()->message(TQString("%1 (%2)").arg(s).arg(m_file.fileInfo().fileName()), 3000);
}
void MusicBrainzLookup::confirmation()
diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp
index 0aac58d3..1cd1ebff 100644
--- a/juk/nowplaying.cpp
+++ b/juk/nowplaying.cpp
@@ -270,13 +270,13 @@ void TrackItem::slotUpdate()
"<font size=\"+%3\"><b><a href=\"artist\">%4</a>%5<a href=\"album\">%6</a></b>";
if(NowPlayingItem::parent()->collection()->showMoreActive())
- format.append(TQString(" (<a href=\"clear\">%1</a>)").tqarg(i18n("back to playlist")));
+ format.append(TQString(" (<a href=\"clear\">%1</a>)").arg(i18n("back to playlist")));
format.append("</font>");
do {
- m_label->setText(format.tqarg(size).tqarg(title).tqarg(size - 2)
- .tqarg(artist).tqarg(separator).tqarg(album));
+ m_label->setText(format.arg(size).arg(title).arg(size - 2)
+ .arg(artist).arg(separator).arg(album));
--size;
} while(m_label->heightForWidth(m_label->width()) > imageSize && size >= 0);
@@ -294,7 +294,7 @@ HistoryItem::HistoryItem(NowPlaying *parent) :
setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2);
setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
setLinkUnderline(false);
- setText(TQString("<b>%1</b>").tqarg(i18n("History")));
+ setText(TQString("<b>%1</b>").arg(i18n("History")));
m_timer = new TQTimer(this);
connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAddPlaying()));
@@ -309,14 +309,14 @@ void HistoryItem::update(const FileHandle &file)
m_history.remove(m_history.fromLast());
TQString format = "<br /><a href=\"%1\"><font size=\"-1\">%2</font></a>";
- TQString current = TQString("<b>%1</b>").tqarg(i18n("History"));
+ TQString current = TQString("<b>%1</b>").arg(i18n("History"));
TQString previous;
for(TQValueList<Item>::ConstIterator it = m_history.begin();
it != m_history.end(); ++it)
{
previous = current;
- current.append(format.tqarg((*it).anchor).tqarg(TQStyleSheet::escape((*it).file.tag()->title())));
+ current.append(format.arg((*it).anchor).arg(TQStyleSheet::escape((*it).file.tag()->title())));
setText(current);
if(heightForWidth(width()) > imageSize) {
setText(previous);
diff --git a/juk/playlist.cpp b/juk/playlist.cpp
index 51228642..fcf142cf 100644
--- a/juk/playlist.cpp
+++ b/juk/playlist.cpp
@@ -543,7 +543,7 @@ void Playlist::save()
TQFile file(m_fileName);
if(!file.open(IO_WriteOnly))
- return KMessageBox::error(this, i18n("Could not save to file %1.").tqarg(m_fileName));
+ return KMessageBox::error(this, i18n("Could not save to file %1.").arg(m_fileName));
TQTextStream stream(&file);
@@ -2127,7 +2127,7 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c
if(showEdit)
m_rmbMenu->changeItem(m_rmbEditID,
- i18n("Edit '%1'").tqarg(columnText(column + columnOffset())));
+ i18n("Edit '%1'").arg(columnText(column + columnOffset())));
m_rmbMenu->setItemVisible(m_rmbEditID, showEdit);
diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp
index f708242b..74019be3 100644
--- a/juk/playlistbox.cpp
+++ b/juk/playlistbox.cpp
@@ -445,7 +445,7 @@ void PlaylistBox::contentsDropEvent(TQDropEvent *e)
if(m_dropItem) {
Item *old = m_dropItem;
m_dropItem = 0;
- old->tqrepaint();
+ old->repaint();
}
}
@@ -493,14 +493,14 @@ void PlaylistBox::contentsDragMoveEvent(TQDragMoveEvent *e)
if(e->isAccepted()) {
m_dropItem = target;
- target->tqrepaint();
+ target->repaint();
m_showTimer->start(1500, true);
}
else
m_dropItem = 0;
if(old)
- old->tqrepaint();
+ old->repaint();
}
}
else {
@@ -517,7 +517,7 @@ void PlaylistBox::contentsDragLeaveEvent(TQDragLeaveEvent *e)
if(m_dropItem) {
Item *old = m_dropItem;
m_dropItem = 0;
- old->tqrepaint();
+ old->repaint();
}
KListView::contentsDragLeaveEvent(e);
}
diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp
index 95ac971a..0b0a5c50 100644
--- a/juk/playlistcollection.cpp
+++ b/juk/playlistcollection.cpp
@@ -747,11 +747,11 @@ TQString PlaylistCollection::uniquePlaylistName(const TQString &suggest) const
base.remove(TQRegExp("\\s\\([0-9]+\\)$"));
int count = 1;
- TQString s = TQString("%1 (%2)").tqarg(base).tqarg(count);
+ TQString s = TQString("%1 (%2)").arg(base).arg(count);
while(m_playlistNames.contains(s)) {
count++;
- s = TQString("%1 (%2)").tqarg(base).tqarg(count);
+ s = TQString("%1 (%2)").arg(base).arg(count);
}
return s;
diff --git a/juk/playlistsplitter.cpp b/juk/playlistsplitter.cpp
index caf2ce00..d79b8d1b 100644
--- a/juk/playlistsplitter.cpp
+++ b/juk/playlistsplitter.cpp
@@ -94,7 +94,7 @@ void PlaylistSplitter::slotFocusCurrentPlaylist()
if(!item)
return;
- // A little bit of a hack to make TQListView tqrepaint things properly. Switch
+ // A little bit of a hack to make TQListView repaint things properly. Switch
// to single selection mode, set the selection and then switch back.
playlist->setSelectionMode(TQListView::Single);
diff --git a/juk/searchwidget.cpp b/juk/searchwidget.cpp
index 8201f931..7f2ca315 100644
--- a/juk/searchwidget.cpp
+++ b/juk/searchwidget.cpp
@@ -163,7 +163,7 @@ void SearchLine::updateColumns()
TQStringList columnHeaders;
- columnHeaders.append(TQString("<%1>").tqarg(i18n("All Visible")));
+ columnHeaders.append(TQString("<%1>").arg(i18n("All Visible")));
Playlist *playlist = CollectionList::instance();
diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp
index 1c0abaec..4b6587f7 100644
--- a/juk/systemtray.cpp
+++ b/juk/systemtray.cpp
@@ -385,7 +385,7 @@ void SystemTray::createPopup()
int labelCount = 0;
TQString title = TQStyleSheet::escape(playingInfo->title());
- m_labels[labelCount++]->setText(TQString("<qt><nobr><h2>%1</h2></nobr><qt>").tqarg(title));
+ m_labels[labelCount++]->setText(TQString("<qt><nobr><h2>%1</h2></nobr><qt>").arg(title));
if(!playingInfo->artist().isEmpty())
m_labels[labelCount++]->setText(playingInfo->artist());
@@ -393,8 +393,8 @@ void SystemTray::createPopup()
if(!playingInfo->album().isEmpty()) {
TQString album = TQStyleSheet::escape(playingInfo->album());
TQString s = playingInfo->year() > 0
- ? TQString("<qt><nobr>%1 (%2)</nobr></qt>").tqarg(album).tqarg(playingInfo->year())
- : TQString("<qt><nobr>%1</nobr></qt>").tqarg(album);
+ ? TQString("<qt><nobr>%1 (%2)</nobr></qt>").arg(album).arg(playingInfo->year())
+ : TQString("<qt><nobr>%1</nobr></qt>").arg(album);
m_labels[labelCount++]->setText(s);
}
@@ -531,8 +531,8 @@ void SystemTray::setToolTip(const TQString &tip, const TQPixmap &cover)
TQString html = i18n("%1 is Cover Art, %2 is the playing track, %3 is the appname",
"<center><table cellspacing=\"2\"><tr><td valign=\"middle\">%1</td>"
"<td valign=\"middle\">%2</td></tr></table><em>%3</em></center>");
- html = html.tqarg("<img valign=\"middle\" src=\"tipCover\"");
- html = html.tqarg(TQString("<nobr>%1</nobr>").tqarg(tip), i18n("JuK"));
+ html = html.arg("<img valign=\"middle\" src=\"tipCover\"");
+ html = html.arg(TQString("<nobr>%1</nobr>").arg(tip), i18n("JuK"));
TQToolTip::add(this, html);
}
diff --git a/juk/tagrenameroptions.cpp b/juk/tagrenameroptions.cpp
index fc97ac8e..c25f3dd1 100644
--- a/juk/tagrenameroptions.cpp
+++ b/juk/tagrenameroptions.cpp
@@ -69,12 +69,12 @@ TagRenamerOptions::TagRenamerOptions(const CategoryID &category)
if(categoryNum > 0)
typeKey.append(TQString::number(categoryNum));
- setSuffix(config.readEntry(TQString("%1Suffix").tqarg(typeKey)));
- setPrefix(config.readEntry(TQString("%1Prefix").tqarg(typeKey)));
+ setSuffix(config.readEntry(TQString("%1Suffix").arg(typeKey)));
+ setPrefix(config.readEntry(TQString("%1Prefix").arg(typeKey)));
// Default the emptyAction to ignoring the empty tag.
- const TQString emptyAction = config.readEntry(TQString("%1EmptyAction").tqarg(typeKey)).lower();
+ const TQString emptyAction = config.readEntry(TQString("%1EmptyAction").arg(typeKey)).lower();
setEmptyAction(IgnoreEmptyTag);
if(emptyAction == "forceemptyinclude")
@@ -82,9 +82,9 @@ TagRenamerOptions::TagRenamerOptions(const CategoryID &category)
else if(emptyAction == "usereplacementvalue")
setEmptyAction(UseReplacementValue);
- setEmptyText(config.readEntry(TQString("%1EmptyText").tqarg(typeKey)));
- setTrackWidth(config.readUnsignedNumEntry(TQString("%1TrackWidth").tqarg(typeKey)));
- setDisabled(config.readBoolEntry(TQString("%1Disabled").tqarg(typeKey), disabled));
+ setEmptyText(config.readEntry(TQString("%1EmptyText").arg(typeKey)));
+ setTrackWidth(config.readUnsignedNumEntry(TQString("%1TrackWidth").arg(typeKey)));
+ setDisabled(config.readBoolEntry(TQString("%1Disabled").arg(typeKey), disabled));
}
TQString TagRenamerOptions::tagTypeText(TagType type, bool translate)
@@ -117,8 +117,8 @@ void TagRenamerOptions::saveConfig(unsigned categoryNum) const
KConfigGroup config(KGlobal::config(), "FileRenamer");
- config.writeEntry(TQString("%1Suffix").tqarg(typeKey), suffix());
- config.writeEntry(TQString("%1Prefix").tqarg(typeKey), prefix());
+ config.writeEntry(TQString("%1Suffix").arg(typeKey), suffix());
+ config.writeEntry(TQString("%1Prefix").arg(typeKey), prefix());
TQString emptyStr;
@@ -136,12 +136,12 @@ void TagRenamerOptions::saveConfig(unsigned categoryNum) const
break;
}
- config.writeEntry(TQString("%1EmptyAction").tqarg(typeKey), emptyStr);
- config.writeEntry(TQString("%1EmptyText").tqarg(typeKey), emptyText());
- config.writeEntry(TQString("%1Disabled").tqarg(typeKey), disabled());
+ config.writeEntry(TQString("%1EmptyAction").arg(typeKey), emptyStr);
+ config.writeEntry(TQString("%1EmptyText").arg(typeKey), emptyText());
+ config.writeEntry(TQString("%1Disabled").arg(typeKey), disabled());
if(category() == Track)
- config.writeEntry(TQString("%1TrackWidth").tqarg(typeKey), trackWidth());
+ config.writeEntry(TQString("%1TrackWidth").arg(typeKey), trackWidth());
config.sync();
}
diff --git a/juk/tagtransactionmanager.cpp b/juk/tagtransactionmanager.cpp
index 97028983..bf12bf98 100644
--- a/juk/tagtransactionmanager.cpp
+++ b/juk/tagtransactionmanager.cpp
@@ -176,7 +176,7 @@ bool TagTransactionManager::processChangeList(bool undo)
item->file().setFile(tag->fileName());
item->refreshFromDisk();
- item->tqrepaint();
+ item->repaint();
item->playlist()->dataChanged();
item->playlist()->update();
}
diff --git a/juk/trackpickerdialogbase.ui b/juk/trackpickerdialogbase.ui
index 8f20c43d..ddf72c2a 100644
--- a/juk/trackpickerdialogbase.ui
+++ b/juk/trackpickerdialogbase.ui
@@ -31,7 +31,7 @@
<property name="title">
<string>File Name</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
<hbox>
@@ -50,7 +50,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="indent">
@@ -76,7 +76,7 @@
<property name="title">
<string>Select Best Possible Match</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
<vbox>
diff --git a/juk/treeviewitemplaylist.cpp b/juk/treeviewitemplaylist.cpp
index 38f85f10..22872760 100644
--- a/juk/treeviewitemplaylist.cpp
+++ b/juk/treeviewitemplaylist.cpp
@@ -52,7 +52,7 @@ void TreeViewItemPlaylist::retag(const TQStringList &files, Playlist *)
if(KMessageBox::warningContinueCancelList(
this,
- i18n("You are about to change the %1 on these files.").tqarg(changedTag),
+ i18n("You are about to change the %1 on these files.").arg(changedTag),
files,
i18n("Changing Track Tags"),
KStdGuiItem::cont(),
diff --git a/juk/webimagefetcher.cpp b/juk/webimagefetcher.cpp
index 24670db7..a34309d2 100644
--- a/juk/webimagefetcher.cpp
+++ b/juk/webimagefetcher.cpp
@@ -37,7 +37,7 @@ WebImage::WebImage(const TQString &imageURL, const TQString &thumbURL,
int width, int height) :
m_imageURL(imageURL),
m_thumbURL(thumbURL),
- m_size(TQString("\n%1 x %2").tqarg(width).tqarg(height))
+ m_size(TQString("\n%1 x %2").arg(width).arg(height))
{
}
diff --git a/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp
index 7eb08c0f..f667d78b 100644
--- a/juk/webimagefetcherdialog.cpp
+++ b/juk/webimagefetcherdialog.cpp
@@ -92,9 +92,9 @@ void WebImageFetcherDialog::showCreditURL(const TQString &url)
void WebImageFetcherDialog::setLayout()
{
setCaption(TQString("%1 - %2 (%3)")
- .tqarg(m_file.tag()->artist())
- .tqarg(m_file.tag()->album())
- .tqarg(m_imageList.size()));
+ .arg(m_file.tag()->artist())
+ .arg(m_file.tag()->album())
+ .arg(m_imageList.size()));
m_iconWidget->clear();
for(uint i = 0; i < m_imageList.size(); i++)
@@ -218,7 +218,7 @@ CoverIconViewItem::~CoverIconViewItem()
void CoverIconViewItem::imageData(KIO::Job *, const TQByteArray &data)
{
int currentSize = m_buffer.size();
- m_buffer.tqresize(currentSize + data.size(), TQGArray::SpeedOptim);
+ m_buffer.resize(currentSize + data.size(), TQGArray::SpeedOptim);
memcpy(&(m_buffer.data()[currentSize]), data.data(), data.size());
}