summaryrefslogtreecommitdiffstats
path: root/juk
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commit27edf28be2772229a7974a007313ea30d92c3ffd (patch)
tree14b9842bbd90c801d89ad5ddb38831fdf8aec1a4 /juk
parent7ef01c0f34d9c6732d258154bcd3ba5a88280db9 (diff)
downloadtdemultimedia-27edf28be2772229a7974a007313ea30d92c3ffd.tar.gz
tdemultimedia-27edf28be2772229a7974a007313ea30d92c3ffd.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'juk')
-rw-r--r--juk/advancedsearchdialog.cpp4
-rw-r--r--juk/advancedsearchdialog.h2
-rw-r--r--juk/coverdialog.cpp12
-rw-r--r--juk/coverdialog.h2
-rw-r--r--juk/covericonview.cpp6
-rw-r--r--juk/covericonview.h4
-rw-r--r--juk/deletedialog.cpp8
-rw-r--r--juk/deletedialog.h4
-rw-r--r--juk/directorylist.cpp4
-rw-r--r--juk/directorylist.h2
-rw-r--r--juk/dynamicplaylist.cpp4
-rw-r--r--juk/exampleoptions.cpp8
-rw-r--r--juk/exampleoptions.h4
-rw-r--r--juk/filerenamer.cpp10
-rw-r--r--juk/filerenamer.h2
-rw-r--r--juk/filerenamerconfigdlg.cpp4
-rw-r--r--juk/filerenamerconfigdlg.h2
-rw-r--r--juk/filerenameroptions.cpp8
-rw-r--r--juk/filerenameroptions.h4
-rw-r--r--juk/historyplaylist.cpp8
-rw-r--r--juk/historyplaylist.h4
-rw-r--r--juk/juk.cpp4
-rw-r--r--juk/juk.h2
-rw-r--r--juk/k3bexporter.cpp6
-rw-r--r--juk/k3bexporter.h4
-rw-r--r--juk/keydialog.cpp8
-rw-r--r--juk/keydialog.h6
-rw-r--r--juk/mediafiles.cpp8
-rw-r--r--juk/mediafiles.h8
-rw-r--r--juk/nowplaying.cpp36
-rw-r--r--juk/nowplaying.h18
-rw-r--r--juk/playermanager.cpp4
-rw-r--r--juk/playermanager.h2
-rw-r--r--juk/playlist.cpp10
-rw-r--r--juk/playlist.h4
-rw-r--r--juk/playlistbox.cpp8
-rw-r--r--juk/playlistbox.h4
-rw-r--r--juk/playlistexporter.h2
-rw-r--r--juk/playlistitem.cpp12
-rw-r--r--juk/playlistitem.h6
-rw-r--r--juk/playlistsplitter.cpp4
-rw-r--r--juk/playlistsplitter.h2
-rw-r--r--juk/searchwidget.cpp6
-rw-r--r--juk/searchwidget.h4
-rw-r--r--juk/slideraction.cpp36
-rw-r--r--juk/slideraction.h8
-rw-r--r--juk/sortedstringlist.cpp20
-rw-r--r--juk/statuslabel.cpp4
-rw-r--r--juk/statuslabel.h2
-rw-r--r--juk/systemtray.cpp44
-rw-r--r--juk/systemtray.h12
-rw-r--r--juk/tageditor.cpp16
-rw-r--r--juk/tageditor.h2
-rw-r--r--juk/tagguesserconfigdlg.cpp4
-rw-r--r--juk/tagguesserconfigdlg.h2
-rw-r--r--juk/tagtransactionmanager.cpp6
-rw-r--r--juk/tagtransactionmanager.h6
-rw-r--r--juk/trackpickerdialog.cpp8
-rw-r--r--juk/trackpickerdialog.h2
-rw-r--r--juk/upcomingplaylist.h4
-rw-r--r--juk/webimagefetcher.cpp4
-rw-r--r--juk/webimagefetcher.h2
-rw-r--r--juk/webimagefetcherdialog.cpp8
-rw-r--r--juk/webimagefetcherdialog.h4
64 files changed, 234 insertions, 234 deletions
diff --git a/juk/advancedsearchdialog.cpp b/juk/advancedsearchdialog.cpp
index a7b73c65..711c1275 100644
--- a/juk/advancedsearchdialog.cpp
+++ b/juk/advancedsearchdialog.cpp
@@ -36,9 +36,9 @@
AdvancedSearchDialog::AdvancedSearchDialog(const TQString &defaultName,
const PlaylistSearch &defaultSearch,
- TQWidget *tqparent,
+ TQWidget *parent,
const char *name) :
- KDialogBase(tqparent, name, true, i18n("Create Search Playlist"), Ok|Cancel)
+ KDialogBase(parent, name, true, i18n("Create Search Playlist"), Ok|Cancel)
{
makeVBoxMainWidget();
diff --git a/juk/advancedsearchdialog.h b/juk/advancedsearchdialog.h
index 65158273..a17f1fc4 100644
--- a/juk/advancedsearchdialog.h
+++ b/juk/advancedsearchdialog.h
@@ -39,7 +39,7 @@ public:
AdvancedSearchDialog(const TQString &defaultName,
const PlaylistSearch &defaultSearch = PlaylistSearch(),
- TQWidget *tqparent = 0,
+ TQWidget *parent = 0,
const char *name = 0);
virtual ~AdvancedSearchDialog();
diff --git a/juk/coverdialog.cpp b/juk/coverdialog.cpp
index 2b04f3c1..509f0695 100644
--- a/juk/coverdialog.cpp
+++ b/juk/coverdialog.cpp
@@ -34,8 +34,8 @@ using CoverUtility::CoverIconViewItem;
class AllArtistsListViewItem : public KListViewItem
{
public:
- AllArtistsListViewItem(TQListView *tqparent) :
- KListViewItem(tqparent, i18n("<All Artists>"))
+ AllArtistsListViewItem(TQListView *parent) :
+ KListViewItem(parent, i18n("<All Artists>"))
{
}
@@ -48,8 +48,8 @@ public:
class CaseInsensitiveItem : public KListViewItem
{
public:
- CaseInsensitiveItem(TQListView *tqparent, const TQString &text) :
- KListViewItem(tqparent, text)
+ CaseInsensitiveItem(TQListView *parent, const TQString &text) :
+ KListViewItem(parent, text)
{
}
@@ -60,8 +60,8 @@ public:
}
};
-CoverDialog::CoverDialog(TQWidget *tqparent) :
- CoverDialogBase(tqparent, "juk_cover_dialog", WType_Dialog)
+CoverDialog::CoverDialog(TQWidget *parent) :
+ CoverDialogBase(parent, "juk_cover_dialog", WType_Dialog)
{
m_covers->setResizeMode(TQIconView::Adjust);
m_covers->setGridX(140);
diff --git a/juk/coverdialog.h b/juk/coverdialog.h
index 6bbbba4a..0f5d9d0a 100644
--- a/juk/coverdialog.h
+++ b/juk/coverdialog.h
@@ -23,7 +23,7 @@ class CoverDialog : public CoverDialogBase
Q_OBJECT
TQ_OBJECT
public:
- CoverDialog(TQWidget *tqparent);
+ CoverDialog(TQWidget *parent);
~CoverDialog();
virtual void show();
diff --git a/juk/covericonview.cpp b/juk/covericonview.cpp
index 2dd1260b..58b5a2b9 100644
--- a/juk/covericonview.cpp
+++ b/juk/covericonview.cpp
@@ -18,15 +18,15 @@
using CoverUtility::CoverIconViewItem;
-CoverIconViewItem::CoverIconViewItem(coverKey id, TQIconView *tqparent) :
- KIconViewItem(tqparent), m_id(id)
+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));
setPixmap(data->thumbnail());
}
-CoverIconView::CoverIconView(TQWidget *tqparent, const char *name) : KIconView(tqparent, name)
+CoverIconView::CoverIconView(TQWidget *parent, const char *name) : KIconView(parent, name)
{
setResizeMode(Adjust);
}
diff --git a/juk/covericonview.h b/juk/covericonview.h
index a12f4354..42e44d66 100644
--- a/juk/covericonview.h
+++ b/juk/covericonview.h
@@ -29,7 +29,7 @@ namespace CoverUtility
class CoverIconViewItem : public KIconViewItem
{
public:
- CoverIconViewItem(coverKey id, TQIconView *tqparent);
+ CoverIconViewItem(coverKey id, TQIconView *parent);
coverKey id() const { return m_id; }
@@ -49,7 +49,7 @@ using CoverUtility::CoverIconViewItem;
class CoverIconView : public KIconView
{
public:
- CoverIconView(TQWidget *tqparent, const char *name);
+ CoverIconView(TQWidget *parent, const char *name);
CoverIconViewItem *currentItem() const;
diff --git a/juk/deletedialog.cpp b/juk/deletedialog.cpp
index 688015c1..e780eec0 100644
--- a/juk/deletedialog.cpp
+++ b/juk/deletedialog.cpp
@@ -33,8 +33,8 @@
// DeleteWidget implementation
//////////////////////////////////////////////////////////////////////////////
-DeleteWidget::DeleteWidget(TQWidget *tqparent, const char *name)
- : DeleteDialogBase(tqparent, name)
+DeleteWidget::DeleteWidget(TQWidget *parent, const char *name)
+ : DeleteDialogBase(parent, name)
{
KConfigGroup messageGroup(KGlobal::config(), "FileRemover");
@@ -69,8 +69,8 @@ void DeleteWidget::slotShouldDelete(bool shouldDelete)
// DeleteDialog implementation
//////////////////////////////////////////////////////////////////////////////
-DeleteDialog::DeleteDialog(TQWidget *tqparent, const char *name) :
- KDialogBase(Swallow, WStyle_DialogBorder, tqparent, name,
+DeleteDialog::DeleteDialog(TQWidget *parent, const char *name) :
+ KDialogBase(Swallow, WStyle_DialogBorder, parent, name,
true /* modal */, i18n("About to delete selected files"),
Ok | Cancel, Cancel /* Default */, true /* separator */),
m_trashGuiItem(i18n("&Send to Trash"), "trashcan_full")
diff --git a/juk/deletedialog.h b/juk/deletedialog.h
index bc347f41..e8fdc678 100644
--- a/juk/deletedialog.h
+++ b/juk/deletedialog.h
@@ -32,7 +32,7 @@ class DeleteWidget : public DeleteDialogBase
TQ_OBJECT
public:
- DeleteWidget(TQWidget *tqparent = 0, const char *name = 0);
+ DeleteWidget(TQWidget *parent = 0, const char *name = 0);
void setFiles(const TQStringList &files);
@@ -46,7 +46,7 @@ class DeleteDialog : public KDialogBase
TQ_OBJECT
public:
- DeleteDialog(TQWidget *tqparent, const char *name = "delete_dialog");
+ DeleteDialog(TQWidget *parent, const char *name = "delete_dialog");
bool confirmDeleteList(const TQStringList &condemnedFiles);
void setFiles(const TQStringList &files);
diff --git a/juk/directorylist.cpp b/juk/directorylist.cpp
index 85de9134..ceb0d71d 100644
--- a/juk/directorylist.cpp
+++ b/juk/directorylist.cpp
@@ -28,8 +28,8 @@
////////////////////////////////////////////////////////////////////////////////
DirectoryList::DirectoryList(const TQStringList &directories, bool importPlaylists,
- TQWidget *tqparent, const char *name) :
- KDialogBase(tqparent, name, true, i18n("Folder List"), Ok | Cancel, Ok, true),
+ TQWidget *parent, const char *name) :
+ KDialogBase(parent, name, true, i18n("Folder List"), Ok | Cancel, Ok, true),
m_dirList(directories),
m_importPlaylists(importPlaylists)
{
diff --git a/juk/directorylist.h b/juk/directorylist.h
index f25c21ae..94835f2a 100644
--- a/juk/directorylist.h
+++ b/juk/directorylist.h
@@ -34,7 +34,7 @@ public:
};
DirectoryList(const TQStringList &directories, bool importPlaylists,
- TQWidget *tqparent = 0, const char *name = 0);
+ TQWidget *parent = 0, const char *name = 0);
virtual ~DirectoryList();
public slots:
diff --git a/juk/dynamicplaylist.cpp b/juk/dynamicplaylist.cpp
index a1ef1cd0..336d1e3e 100644
--- a/juk/dynamicplaylist.cpp
+++ b/juk/dynamicplaylist.cpp
@@ -23,9 +23,9 @@
class PlaylistDirtyObserver : public PlaylistObserver
{
public:
- PlaylistDirtyObserver(DynamicPlaylist *tqparent, Playlist *playlist) :
+ PlaylistDirtyObserver(DynamicPlaylist *parent, Playlist *playlist) :
PlaylistObserver(playlist),
- m_parent(tqparent)
+ m_parent(parent)
{
}
diff --git a/juk/exampleoptions.cpp b/juk/exampleoptions.cpp
index 0f5bd862..e365546a 100644
--- a/juk/exampleoptions.cpp
+++ b/juk/exampleoptions.cpp
@@ -21,8 +21,8 @@
#include "exampleoptions.h"
-ExampleOptions::ExampleOptions(TQWidget *tqparent) :
- ExampleOptionsBase(tqparent, "example options widget")
+ExampleOptions::ExampleOptions(TQWidget *parent) :
+ ExampleOptionsBase(parent, "example options widget")
{
}
@@ -44,8 +44,8 @@ void ExampleOptions::exampleFileChanged()
emit fileChanged();
}
-ExampleOptionsDialog::ExampleOptionsDialog(TQWidget *tqparent) :
- TQDialog(tqparent, "example options dialog")
+ExampleOptionsDialog::ExampleOptionsDialog(TQWidget *parent) :
+ TQDialog(parent, "example options dialog")
{
setCaption(i18n("JuK"));
TQVBoxLayout *l = new TQVBoxLayout(this);
diff --git a/juk/exampleoptions.h b/juk/exampleoptions.h
index 4d849b75..03dfaa13 100644
--- a/juk/exampleoptions.h
+++ b/juk/exampleoptions.h
@@ -24,7 +24,7 @@ class ExampleOptions : public ExampleOptionsBase
Q_OBJECT
TQ_OBJECT
public:
- ExampleOptions(TQWidget *tqparent);
+ ExampleOptions(TQWidget *parent);
protected slots:
virtual void exampleSelectionChanged();
@@ -39,7 +39,7 @@ class ExampleOptionsDialog : public TQDialog
Q_OBJECT
TQ_OBJECT
public:
- ExampleOptionsDialog(TQWidget *tqparent);
+ ExampleOptionsDialog(TQWidget *parent);
const ExampleOptions *widget() const { return m_options; }
diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp
index cf3866b0..6f479313 100644
--- a/juk/filerenamer.cpp
+++ b/juk/filerenamer.cpp
@@ -60,8 +60,8 @@ class ConfirmationDialog : public KDialogBase
{
public:
ConfirmationDialog(const TQMap<TQString, TQString> &files,
- TQWidget *tqparent = 0, const char *name = 0)
- : KDialogBase(tqparent, name, true, i18n("Warning"), Ok | Cancel)
+ TQWidget *parent = 0, const char *name = 0)
+ : KDialogBase(parent, name, true, i18n("Warning"), Ok | Cancel)
{
TQVBox *vbox = makeVBoxMainWidget();
TQHBox *hbox = new TQHBox(vbox);
@@ -224,8 +224,8 @@ bool ConfigCategoryReader::isDisabled(const CategoryID &category) const
// Implementation of FileRenamerWidget
//
-FileRenamerWidget::FileRenamerWidget(TQWidget *tqparent) :
- FileRenamerBase(tqparent), CategoryReaderInterface(),
+FileRenamerWidget::FileRenamerWidget(TQWidget *parent) :
+ FileRenamerBase(parent), CategoryReaderInterface(),
m_exampleFromFile(false)
{
TQLabel *temp = new TQLabel(0);
@@ -412,7 +412,7 @@ bool FileRenamerWidget::removeRow(unsigned id)
// The checkbox is contained within a tqlayout widget, so the tqlayout
// widget is the one the needs to die.
- delete m_folderSwitches[checkboxPosition]->tqparent();
+ delete m_folderSwitches[checkboxPosition]->parent();
m_folderSwitches.erase(&m_folderSwitches[checkboxPosition]);
// Go through all the rows and if they have the same category and a
diff --git a/juk/filerenamer.h b/juk/filerenamer.h
index 06d8be0f..93f4e4cb 100644
--- a/juk/filerenamer.h
+++ b/juk/filerenamer.h
@@ -143,7 +143,7 @@ class FileRenamerWidget : public FileRenamerBase, public CategoryReaderInterface
TQ_OBJECT
public:
- FileRenamerWidget(TQWidget *tqparent);
+ FileRenamerWidget(TQWidget *parent);
~FileRenamerWidget();
/// Maximum number of total categories the widget will allow.
diff --git a/juk/filerenamerconfigdlg.cpp b/juk/filerenamerconfigdlg.cpp
index a1f43687..8a741d03 100644
--- a/juk/filerenamerconfigdlg.cpp
+++ b/juk/filerenamerconfigdlg.cpp
@@ -19,8 +19,8 @@
#include "filerenamer.h"
#include "filerenamerconfigdlg.h"
-FileRenamerConfigDlg::FileRenamerConfigDlg(TQWidget *tqparent) :
- KDialogBase(tqparent, "file renamer dialog", true,
+FileRenamerConfigDlg::FileRenamerConfigDlg(TQWidget *parent) :
+ KDialogBase(parent, "file renamer dialog", true,
i18n("File Renamer Options"), Ok | Cancel),
m_renamerWidget(new FileRenamerWidget(this))
{
diff --git a/juk/filerenamerconfigdlg.h b/juk/filerenamerconfigdlg.h
index fc953181..fb209cc7 100644
--- a/juk/filerenamerconfigdlg.h
+++ b/juk/filerenamerconfigdlg.h
@@ -25,7 +25,7 @@ class FileRenamerConfigDlg : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- FileRenamerConfigDlg(TQWidget *tqparent);
+ FileRenamerConfigDlg(TQWidget *parent);
protected slots:
virtual void accept();
diff --git a/juk/filerenameroptions.cpp b/juk/filerenameroptions.cpp
index cc9ab7fa..d800d2e2 100644
--- a/juk/filerenameroptions.cpp
+++ b/juk/filerenameroptions.cpp
@@ -25,9 +25,9 @@
#include "filerenameroptions.h"
-FileRenamerTagOptions::FileRenamerTagOptions(TQWidget *tqparent,
+FileRenamerTagOptions::FileRenamerTagOptions(TQWidget *parent,
const TagRenamerOptions &options) :
- FileRenamerTagOptionsBase(tqparent), m_options(options)
+ FileRenamerTagOptionsBase(parent), m_options(options)
{
tqlayout()->setSpacing(KDialog::spacingHint());
tqlayout()->setMargin(0);
@@ -115,10 +115,10 @@ void FileRenamerTagOptions::slotEmptyActionChanged()
m_options.setEmptyAction(TagRenamerOptions::ForceEmptyInclude);
}
-TagOptionsDialog::TagOptionsDialog(TQWidget *tqparent,
+TagOptionsDialog::TagOptionsDialog(TQWidget *parent,
const TagRenamerOptions &options,
unsigned categoryNumber) :
- KDialogBase(tqparent, 0, true, i18n("File Renamer"), Ok | Cancel),
+ KDialogBase(parent, 0, true, i18n("File Renamer"), Ok | Cancel),
m_options(options),
m_categoryNumber(categoryNumber)
{
diff --git a/juk/filerenameroptions.h b/juk/filerenameroptions.h
index 88248f65..fa158124 100644
--- a/juk/filerenameroptions.h
+++ b/juk/filerenameroptions.h
@@ -31,7 +31,7 @@ class FileRenamerTagOptions : public FileRenamerTagOptionsBase
TQ_OBJECT
public:
- FileRenamerTagOptions(TQWidget *tqparent, const TagRenamerOptions &options);
+ FileRenamerTagOptions(TQWidget *parent, const TagRenamerOptions &options);
const TagRenamerOptions &options() const { return m_options; }
@@ -55,7 +55,7 @@ class TagOptionsDialog : public KDialogBase
TQ_OBJECT
public:
- TagOptionsDialog(TQWidget *tqparent, const TagRenamerOptions &options, unsigned categoryNumber);
+ TagOptionsDialog(TQWidget *parent, const TagRenamerOptions &options, unsigned categoryNumber);
const TagRenamerOptions &options() const { return m_options; }
diff --git a/juk/historyplaylist.cpp b/juk/historyplaylist.cpp
index 53aa927e..a9bded13 100644
--- a/juk/historyplaylist.cpp
+++ b/juk/historyplaylist.cpp
@@ -90,15 +90,15 @@ void HistoryPlaylist::slotCreateNewItem()
// HistoryPlaylistItem public members
////////////////////////////////////////////////////////////////////////////////
-HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *tqparent, TQListViewItem *after) :
- PlaylistItem(item, tqparent, after),
+HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after) :
+ PlaylistItem(item, parent, after),
m_dateTime(TQDateTime::tqcurrentDateTime())
{
setText(0, KGlobal::locale()->formatDateTime(m_dateTime));
}
-HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *tqparent) :
- PlaylistItem(item, tqparent),
+HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *parent) :
+ PlaylistItem(item, parent),
m_dateTime(TQDateTime::tqcurrentDateTime())
{
setText(0, KGlobal::locale()->formatDateTime(m_dateTime));
diff --git a/juk/historyplaylist.h b/juk/historyplaylist.h
index 13cf5436..bac4631f 100644
--- a/juk/historyplaylist.h
+++ b/juk/historyplaylist.h
@@ -23,8 +23,8 @@
class HistoryPlaylistItem : public PlaylistItem
{
public:
- HistoryPlaylistItem(CollectionListItem *item, Playlist *tqparent, TQListViewItem *after);
- HistoryPlaylistItem(CollectionListItem *item, Playlist *tqparent);
+ HistoryPlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after);
+ HistoryPlaylistItem(CollectionListItem *item, Playlist *parent);
virtual ~HistoryPlaylistItem();
TQDateTime dateTime() const { return m_dateTime; }
diff --git a/juk/juk.cpp b/juk/juk.cpp
index 47a94692..60c09426 100644
--- a/juk/juk.cpp
+++ b/juk/juk.cpp
@@ -43,8 +43,8 @@ using namespace ActionCollection;
// public members
////////////////////////////////////////////////////////////////////////////////
-JuK::JuK(TQWidget *tqparent, const char *name) :
- KMainWindow(tqparent, name, WDestructiveClose),
+JuK::JuK(TQWidget *parent, const char *name) :
+ KMainWindow(parent, name, WDestructiveClose),
m_player(PlayerManager::instance()),
m_shuttingDown(false)
{
diff --git a/juk/juk.h b/juk/juk.h
index 818c403f..9dca7c90 100644
--- a/juk/juk.h
+++ b/juk/juk.h
@@ -40,7 +40,7 @@ class JuK : public KMainWindow
TQ_OBJECT
public:
- JuK(TQWidget* tqparent = 0, const char *name = 0);
+ JuK(TQWidget* parent = 0, const char *name = 0);
virtual ~JuK();
virtual KActionCollection *actionCollection() const;
diff --git a/juk/k3bexporter.cpp b/juk/k3bexporter.cpp
index a4e4a7c6..ab480268 100644
--- a/juk/k3bexporter.cpp
+++ b/juk/k3bexporter.cpp
@@ -97,7 +97,7 @@ class PlaylistAction : public KAction
PlaylistRecipientMap m_playlistRecipient;
};
-K3bExporter::K3bExporter(Playlist *tqparent) : PlaylistExporter(tqparent), m_parent(tqparent)
+K3bExporter::K3bExporter(Playlist *parent) : PlaylistExporter(parent), m_parent(parent)
{
}
@@ -263,8 +263,8 @@ K3bExporter::K3bOpenMode K3bExporter::openMode()
return Abort;
}
-K3bPlaylistExporter::K3bPlaylistExporter(PlaylistBox *tqparent) : K3bExporter(0),
- m_playlistBox(tqparent)
+K3bPlaylistExporter::K3bPlaylistExporter(PlaylistBox *parent) : K3bExporter(0),
+ m_playlistBox(parent)
{
}
diff --git a/juk/k3bexporter.h b/juk/k3bexporter.h
index fa49dc88..9577e0b3 100644
--- a/juk/k3bexporter.h
+++ b/juk/k3bexporter.h
@@ -33,7 +33,7 @@ class K3bExporter : public PlaylistExporter
TQ_OBJECT
public:
- K3bExporter(Playlist *tqparent = 0);
+ K3bExporter(Playlist *parent = 0);
/**
* Returns a KAction that can be used to invoke the export.
@@ -80,7 +80,7 @@ class K3bPlaylistExporter : public K3bExporter
Q_OBJECT
TQ_OBJECT
public:
- K3bPlaylistExporter(PlaylistBox *tqparent = 0);
+ K3bPlaylistExporter(PlaylistBox *parent = 0);
virtual KAction *action();
diff --git a/juk/keydialog.cpp b/juk/keydialog.cpp
index 46455c37..80e7c1bd 100644
--- a/juk/keydialog.cpp
+++ b/juk/keydialog.cpp
@@ -75,8 +75,8 @@ const KeyDialog::KeyInfo KeyDialog::keyInfo[] = {
const uint KeyDialog::keyInfoCount = sizeof(KeyDialog::keyInfo) / sizeof(KeyDialog::keyInfo[0]);
KeyDialog::KeyDialog(KGlobalAccel *keys, KActionCollection *actionCollection,
- TQWidget *tqparent, const char *name)
- : KDialogBase(tqparent, name, true, i18n("Configure Shortcuts"), Default | Ok | Cancel, Ok)
+ TQWidget *parent, const char *name)
+ : KDialogBase(parent, name, true, i18n("Configure Shortcuts"), Default | Ok | Cancel, Ok)
{
// Read key group from configuration
@@ -172,11 +172,11 @@ void KeyDialog::slotDefault()
}
int KeyDialog::configure(KGlobalAccel *keys, KActionCollection *actionCollection,
- TQWidget *tqparent)
+ TQWidget *parent)
{
// Create and show dialog - update connections if accepted
- int retcode = KeyDialog(keys, actionCollection, tqparent).configure();
+ int retcode = KeyDialog(keys, actionCollection, parent).configure();
if(retcode == Accepted)
keys->updateConnections();
diff --git a/juk/keydialog.h b/juk/keydialog.h
index 83c14d9d..41a1c6d1 100644
--- a/juk/keydialog.h
+++ b/juk/keydialog.h
@@ -30,9 +30,9 @@ class KeyDialog : public KDialogBase
public:
/**
- * Constructs a KeyDialog called @p name as a child of @p tqparent.
+ * Constructs a KeyDialog called @p name as a child of @p parent.
*/
- KeyDialog(KGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *tqparent = 0, const char* name = 0);
+ KeyDialog(KGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *parent = 0, const char* name = 0);
/**
* Destructor. Deletes all resources used by a KeyDialog object.
@@ -44,7 +44,7 @@ public:
* accelerators and actions. It behaves essentially like the functions
* in KKeyDialog.
*/
- static int configure(KGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *tqparent = 0);
+ static int configure(KGlobalAccel *keys, KActionCollection *actionCollection, TQWidget *parent = 0);
/**
* This is a member function, provided to create a global accelerator with
diff --git a/juk/mediafiles.cpp b/juk/mediafiles.cpp
index 7a0eb6a2..8ed0d859 100644
--- a/juk/mediafiles.cpp
+++ b/juk/mediafiles.cpp
@@ -45,9 +45,9 @@ namespace MediaFiles {
static const char playlistExtension[] = ".m3u";
}
-TQStringList MediaFiles::openDialog(TQWidget *tqparent)
+TQStringList MediaFiles::openDialog(TQWidget *parent)
{
- KFileDialog dialog(TQString(), TQString(), tqparent, "filedialog", true);
+ KFileDialog dialog(TQString(), TQString(), parent, "filedialog", true);
dialog.setOperationMode(KFileDialog::Opening);
dialog.setCaption(i18n("Open"));
@@ -60,11 +60,11 @@ TQStringList MediaFiles::openDialog(TQWidget *tqparent)
return convertURLsToLocal(dialog.selectedFiles());
}
-TQString MediaFiles::savePlaylistDialog(const TQString &playlistName, TQWidget *tqparent)
+TQString MediaFiles::savePlaylistDialog(const TQString &playlistName, TQWidget *parent)
{
TQString fileName = KFileDialog::getSaveFileName(playlistName + playlistExtension,
TQString("*").append(playlistExtension),
- tqparent,
+ parent,
i18n("Playlists"));
if(!fileName.isEmpty() && !fileName.endsWith(playlistExtension))
fileName.append(playlistExtension);
diff --git a/juk/mediafiles.h b/juk/mediafiles.h
index ea6a4345..342739e7 100644
--- a/juk/mediafiles.h
+++ b/juk/mediafiles.h
@@ -24,15 +24,15 @@
namespace MediaFiles
{
/**
- * Creates a JuK specific KFileDialog with the specified tqparent.
+ * Creates a JuK specific KFileDialog with the specified parent.
*/
- TQStringList openDialog(TQWidget *tqparent = 0);
+ TQStringList openDialog(TQWidget *parent = 0);
/**
* Creates a JuK specific KFileDialog for saving a playlist with the name
- * playlistName and the specified tqparent and returns the file name.
+ * playlistName and the specified parent and returns the file name.
*/
- TQString savePlaylistDialog(const TQString &playlistName, TQWidget *tqparent = 0);
+ TQString savePlaylistDialog(const TQString &playlistName, TQWidget *parent = 0);
/**
* Returns true if fileName is a supported media file.
diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp
index ebf03b94..8e14f1e9 100644
--- a/juk/nowplaying.cpp
+++ b/juk/nowplaying.cpp
@@ -41,15 +41,15 @@ static const int imageSize = 64;
struct Line : public TQFrame
{
- Line(TQWidget *tqparent) : TQFrame(tqparent) { setFrameShape(VLine); }
+ Line(TQWidget *parent) : TQFrame(parent) { setFrameShape(VLine); }
};
////////////////////////////////////////////////////////////////////////////////
// NowPlaying
////////////////////////////////////////////////////////////////////////////////
-NowPlaying::NowPlaying(TQWidget *tqparent, PlaylistCollection *collection, const char *name) :
- TQHBox(tqparent, name),
+NowPlaying::NowPlaying(TQWidget *parent, PlaylistCollection *collection, const char *name) :
+ TQHBox(parent, name),
m_observer(this, collection),
m_collection(collection)
{
@@ -105,11 +105,11 @@ void NowPlaying::slotUpdate()
// CoverItem
////////////////////////////////////////////////////////////////////////////////
-CoverItem::CoverItem(NowPlaying *tqparent) :
- TQLabel(tqparent, "CoverItem"),
- NowPlayingItem(tqparent)
+CoverItem::CoverItem(NowPlaying *parent) :
+ TQLabel(parent, "CoverItem"),
+ NowPlayingItem(parent)
{
- setFixedHeight(tqparent->height() - tqparent->tqlayout()->margin() * 2);
+ setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2);
setFrameStyle(Box | Plain);
setLineWidth(1);
setMargin(1);
@@ -214,11 +214,11 @@ void CoverItem::dropEvent(TQDropEvent *e)
// TrackItem
////////////////////////////////////////////////////////////////////////////////
-TrackItem::TrackItem(NowPlaying *tqparent) :
- TQWidget(tqparent, "TrackItem"),
- NowPlayingItem(tqparent)
+TrackItem::TrackItem(NowPlaying *parent) :
+ TQWidget(parent, "TrackItem"),
+ NowPlayingItem(parent)
{
- setFixedHeight(tqparent->height() - tqparent->tqlayout()->margin() * 2);
+ setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2);
tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
@@ -242,7 +242,7 @@ void TrackItem::update(const FileHandle &file)
void TrackItem::slotOpenLink(const TQString &link)
{
- PlaylistCollection *collection = NowPlayingItem::tqparent()->collection();
+ PlaylistCollection *collection = NowPlayingItem::parent()->collection();
if(link == "artist")
collection->showMore(m_file.tag()->artist());
@@ -269,7 +269,7 @@ void TrackItem::slotUpdate()
"<br />"
"<font size=\"+%3\"><b><a href=\"artist\">%4</a>%5<a href=\"album\">%6</a></b>";
- if(NowPlayingItem::tqparent()->collection()->showMoreActive())
+ if(NowPlayingItem::parent()->collection()->showMoreActive())
format.append(TQString(" (<a href=\"clear\">%1</a>)").tqarg(i18n("back to playlist")));
format.append("</font>");
@@ -287,11 +287,11 @@ void TrackItem::slotUpdate()
// HistoryItem
////////////////////////////////////////////////////////////////////////////////
-HistoryItem::HistoryItem(NowPlaying *tqparent) :
- LinkLabel(tqparent, "HistoryItem"),
- NowPlayingItem(tqparent)
+HistoryItem::HistoryItem(NowPlaying *parent) :
+ LinkLabel(parent, "HistoryItem"),
+ NowPlayingItem(parent)
{
- setFixedHeight(tqparent->height() - tqparent->tqlayout()->margin() * 2);
+ setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2);
tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
setLinkUnderline(false);
setText(TQString("<b>%1</b>").tqarg(i18n("History")));
@@ -342,7 +342,7 @@ void HistoryItem::openLink(const TQString &link)
(*it).playlist->clearSelection();
(*it).playlist->setSelected(item, true);
(*it).playlist->ensureItemVisible(item);
- NowPlayingItem::tqparent()->collection()->raise((*it).playlist);
+ NowPlayingItem::parent()->collection()->raise((*it).playlist);
}
break;
}
diff --git a/juk/nowplaying.h b/juk/nowplaying.h
index bacc6582..f1b38dce 100644
--- a/juk/nowplaying.h
+++ b/juk/nowplaying.h
@@ -43,7 +43,7 @@ class NowPlaying : public TQHBox
TQ_OBJECT
public:
- NowPlaying(TQWidget *tqparent, PlaylistCollection *collection,
+ NowPlaying(TQWidget *parent, PlaylistCollection *collection,
const char *name = 0);
void addItem(NowPlayingItem *item);
PlaylistCollection *collection() const;
@@ -54,9 +54,9 @@ private slots:
private:
struct Observer : public PlaylistObserver
{
- Observer(NowPlaying *tqparent, PlaylistInterface *playlist) :
+ Observer(NowPlaying *parent, PlaylistInterface *playlist) :
PlaylistObserver(playlist),
- m_parent(tqparent) {}
+ m_parent(parent) {}
virtual void updateCurrent() {}
virtual void updateData() { m_parent->slotUpdate(); }
NowPlaying *m_parent;
@@ -76,9 +76,9 @@ class NowPlayingItem
{
public:
virtual void update(const FileHandle &file) = 0;
- NowPlaying *tqparent() const { return m_parent; }
+ NowPlaying *parent() const { return m_parent; }
protected:
- NowPlayingItem(NowPlaying *tqparent) : m_parent(tqparent) { tqparent->addItem(this); }
+ NowPlayingItem(NowPlaying *parent) : m_parent(parent) { parent->addItem(this); }
private:
NowPlaying *m_parent;
};
@@ -91,7 +91,7 @@ private:
class CoverItem : public TQLabel, public NowPlayingItem
{
public:
- CoverItem(NowPlaying *tqparent);
+ CoverItem(NowPlaying *parent);
virtual void update(const FileHandle &file);
virtual void mouseReleaseEvent(TQMouseEvent *event);
@@ -115,7 +115,7 @@ private:
class LinkLabel : public KActiveLabel
{
public:
- LinkLabel(TQWidget *tqparent, const char *name = 0) : KActiveLabel(tqparent, name) {}
+ LinkLabel(TQWidget *parent, const char *name = 0) : KActiveLabel(parent, name) {}
virtual void openLink(const TQString &) {}
};
@@ -130,7 +130,7 @@ class TrackItem : public TQWidget, public NowPlayingItem
TQ_OBJECT
public:
- TrackItem(NowPlaying *tqparent);
+ TrackItem(NowPlaying *parent);
virtual void update(const FileHandle &file);
private slots:
@@ -152,7 +152,7 @@ class HistoryItem : public LinkLabel, public NowPlayingItem
TQ_OBJECT
public:
- HistoryItem(NowPlaying *tqparent);
+ HistoryItem(NowPlaying *parent);
virtual void update(const FileHandle &file);
virtual void openLink(const TQString &link);
diff --git a/juk/playermanager.cpp b/juk/playermanager.cpp
index d62c84c4..db01392c 100644
--- a/juk/playermanager.cpp
+++ b/juk/playermanager.cpp
@@ -239,10 +239,10 @@ void PlayerManager::setStatusLabel(StatusLabel *label)
m_statusLabel = label;
}
-KSelectAction *PlayerManager::playerSelectAction(TQObject *tqparent) // static
+KSelectAction *PlayerManager::playerSelectAction(TQObject *parent) // static
{
KSelectAction *action = 0;
- action = new KSelectAction(i18n("&Output To"), 0, tqparent, "outputSelect");
+ action = new KSelectAction(i18n("&Output To"), 0, parent, "outputSelect");
TQStringList l;
#if HAVE_ARTS
diff --git a/juk/playermanager.h b/juk/playermanager.h
index 3b384762..9d6b3b06 100644
--- a/juk/playermanager.h
+++ b/juk/playermanager.h
@@ -62,7 +62,7 @@ public:
TQString randomPlayMode() const;
- static KSelectAction *playerSelectAction(TQObject *tqparent);
+ static KSelectAction *playerSelectAction(TQObject *parent);
public slots:
diff --git a/juk/playlist.cpp b/juk/playlist.cpp
index 267ec8e8..41f18228 100644
--- a/juk/playlist.cpp
+++ b/juk/playlist.cpp
@@ -83,8 +83,8 @@ static bool manualResize()
class PlaylistToolTip : public TQToolTip
{
public:
- PlaylistToolTip(TQWidget *tqparent, Playlist *playlist) :
- TQToolTip(tqparent), m_playlist(playlist) {}
+ PlaylistToolTip(TQWidget *parent, Playlist *playlist) :
+ TQToolTip(parent), m_playlist(playlist) {}
virtual void maybeTip(const TQPoint &p)
{
@@ -1015,7 +1015,7 @@ void Playlist::removeFromDisk(const PlaylistItemList &items)
}
}
-TQDragObject *Playlist::dragObject(TQWidget *tqparent)
+TQDragObject *Playlist::dragObject(TQWidget *parent)
{
PlaylistItemList items = selectedItems();
KURL::List urls;
@@ -1025,7 +1025,7 @@ TQDragObject *Playlist::dragObject(TQWidget *tqparent)
urls.append(url);
}
- KURLDrag *drag = new KURLDrag(urls, tqparent, "Playlist Items");
+ KURLDrag *drag = new KURLDrag(urls, parent, "Playlist Items");
drag->setPixmap(BarIcon("sound"));
return drag;
@@ -1161,7 +1161,7 @@ void Playlist::keyPressEvent(TQKeyEvent *event)
TQListViewItemIterator visible(this, TQListViewItemIterator::IteratorFlag(
TQListViewItemIterator::Visible));
if(selected.current() == visible.current())
- KApplication::postEvent(tqparent(), new FocusUpEvent);
+ KApplication::postEvent(parent(), new FocusUpEvent);
}
}
diff --git a/juk/playlist.h b/juk/playlist.h
index ba1363a1..22c16b45 100644
--- a/juk/playlist.h
+++ b/juk/playlist.h
@@ -420,7 +420,7 @@ protected:
virtual bool eventFilter(TQObject *watched, TQEvent *e);
virtual void keyPressEvent(TQKeyEvent *e);
- virtual TQDragObject *dragObject(TQWidget *tqparent);
+ virtual TQDragObject *dragObject(TQWidget *parent);
virtual TQDragObject *dragObject() { return dragObject(this); }
virtual bool canDecode(TQMimeSource *s);
virtual void decode(TQMimeSource *s, PlaylistItem *item = 0);
@@ -457,7 +457,7 @@ protected:
void setupItem(PlaylistItem *item);
/**
- * Forwards the call to the tqparent to enable or disable automatic deletion
+ * Forwards the call to the parent to enable or disable automatic deletion
* of tree view playlists. Used by CollectionListItem.
*/
void setDynamicListsFrozen(bool frozen);
diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp
index abef8e74..d0e82d27 100644
--- a/juk/playlistbox.cpp
+++ b/juk/playlistbox.cpp
@@ -46,9 +46,9 @@ using namespace ActionCollection;
// PlaylistBox public methods
////////////////////////////////////////////////////////////////////////////////
-PlaylistBox::PlaylistBox(TQWidget *tqparent, TQWidgetStack *playlistStack,
+PlaylistBox::PlaylistBox(TQWidget *parent, TQWidgetStack *playlistStack,
const char *name) :
- KListView(tqparent, name),
+ KListView(parent, name),
PlaylistCollection(playlistStack),
m_viewModeIndex(0),
m_hasSelection(false),
@@ -692,8 +692,8 @@ PlaylistBox::Item::Item(PlaylistBox *listBox, const TQString &icon, const TQStri
init();
}
-PlaylistBox::Item::Item(Item *tqparent, const TQString &icon, const TQString &text, Playlist *l)
- : TQObject(tqparent->listView()), KListViewItem(tqparent, text),
+PlaylistBox::Item::Item(Item *parent, const TQString &icon, const TQString &text, Playlist *l)
+ : TQObject(parent->listView()), KListViewItem(parent, text),
m_playlist(l), m_text(text), m_iconName(icon), m_sortedFirst(false)
{
init();
diff --git a/juk/playlistbox.h b/juk/playlistbox.h
index 27f48f45..793ae654 100644
--- a/juk/playlistbox.h
+++ b/juk/playlistbox.h
@@ -49,7 +49,7 @@ public:
friend class Item;
- PlaylistBox(TQWidget *tqparent, TQWidgetStack *playlistStack,
+ PlaylistBox(TQWidget *parent, TQWidgetStack *playlistStack,
const char *name = 0);
virtual ~PlaylistBox();
@@ -153,7 +153,7 @@ public:
protected:
Item(PlaylistBox *listBox, const TQString &icon, const TQString &text, Playlist *l = 0);
- Item(Item *tqparent, const TQString &icon, const TQString &text, Playlist *l = 0);
+ Item(Item *parent, const TQString &icon, const TQString &text, Playlist *l = 0);
Playlist *playlist() const { return m_playlist; }
PlaylistBox *listView() const { return static_cast<PlaylistBox *>(KListViewItem::listView()); }
diff --git a/juk/playlistexporter.h b/juk/playlistexporter.h
index ca7d0dc6..3caae65f 100644
--- a/juk/playlistexporter.h
+++ b/juk/playlistexporter.h
@@ -31,7 +31,7 @@ class KActionCollection;
class PlaylistExporter : public TQObject
{
public:
- PlaylistExporter(TQWidget *tqparent = 0) : TQObject(tqparent) { }
+ PlaylistExporter(TQWidget *parent = 0) : TQObject(parent) { }
virtual ~PlaylistExporter() { }
/**
diff --git a/juk/playlistitem.cpp b/juk/playlistitem.cpp
index b29d338c..81aad977 100644
--- a/juk/playlistitem.cpp
+++ b/juk/playlistitem.cpp
@@ -239,16 +239,16 @@ void PlaylistItem::clear()
// PlaylistItem protected methods
////////////////////////////////////////////////////////////////////////////////
-PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *tqparent) :
- KListViewItem(tqparent),
+PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *parent) :
+ KListViewItem(parent),
d(0),
m_watched(0)
{
setup(item);
}
-PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *tqparent, TQListViewItem *after) :
- KListViewItem(tqparent, after),
+PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after) :
+ KListViewItem(parent, after),
d(0),
m_watched(0)
{
@@ -258,8 +258,8 @@ PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *tqparent, TQListV
// This constructor should only be used by the CollectionList subclass.
-PlaylistItem::PlaylistItem(CollectionList *tqparent) :
- KListViewItem(tqparent),
+PlaylistItem::PlaylistItem(CollectionList *parent) :
+ KListViewItem(parent),
m_watched(0)
{
d = new Data;
diff --git a/juk/playlistitem.h b/juk/playlistitem.h
index d8797208..9b9cfa80 100644
--- a/juk/playlistitem.h
+++ b/juk/playlistitem.h
@@ -156,13 +156,13 @@ protected:
* Items should always be created using Playlist::createItem() or through a
* subclss or friend class.
*/
- PlaylistItem(CollectionListItem *item, Playlist *tqparent);
- PlaylistItem(CollectionListItem *item, Playlist *tqparent, TQListViewItem *after);
+ PlaylistItem(CollectionListItem *item, Playlist *parent);
+ PlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after);
/**
* This is the constructor that shold be used by subclasses.
*/
- PlaylistItem(CollectionList *tqparent);
+ PlaylistItem(CollectionList *parent);
/**
* See the class documentation for an explanation of construction and deletion
diff --git a/juk/playlistsplitter.cpp b/juk/playlistsplitter.cpp
index 5fa2b72b..caf2ce00 100644
--- a/juk/playlistsplitter.cpp
+++ b/juk/playlistsplitter.cpp
@@ -34,8 +34,8 @@ using namespace ActionCollection;
// public methods
////////////////////////////////////////////////////////////////////////////////
-PlaylistSplitter::PlaylistSplitter(TQWidget *tqparent, const char *name) :
- TQSplitter(Qt::Horizontal, tqparent, name),
+PlaylistSplitter::PlaylistSplitter(TQWidget *parent, const char *name) :
+ TQSplitter(Qt::Horizontal, parent, name),
m_newVisible(0),
m_playlistBox(0),
m_searchWidget(0),
diff --git a/juk/playlistsplitter.h b/juk/playlistsplitter.h
index 4865fa22..b0ed1a75 100644
--- a/juk/playlistsplitter.h
+++ b/juk/playlistsplitter.h
@@ -44,7 +44,7 @@ class PlaylistSplitter : public TQSplitter
TQ_OBJECT
public:
- PlaylistSplitter(TQWidget *tqparent, const char *name = 0);
+ PlaylistSplitter(TQWidget *parent, const char *name = 0);
virtual ~PlaylistSplitter();
PlaylistInterface *playlist() const { return m_playlistBox; }
diff --git a/juk/searchwidget.cpp b/juk/searchwidget.cpp
index a0a110fa..8201f931 100644
--- a/juk/searchwidget.cpp
+++ b/juk/searchwidget.cpp
@@ -39,8 +39,8 @@ using namespace ActionCollection;
// SearchLine public methods
////////////////////////////////////////////////////////////////////////////////
-SearchLine::SearchLine(TQWidget *tqparent, bool simple, const char *name) :
- TQHBox(tqparent, name),
+SearchLine::SearchLine(TQWidget *parent, bool simple, const char *name) :
+ TQHBox(parent, name),
m_simple(simple),
m_searchFieldsBox(0)
{
@@ -188,7 +188,7 @@ void SearchLine::updateColumns()
// SearchWidget public methods
////////////////////////////////////////////////////////////////////////////////
-SearchWidget::SearchWidget(TQWidget *tqparent, const char *name) : KToolBar(tqparent, name)
+SearchWidget::SearchWidget(TQWidget *parent, const char *name) : KToolBar(parent, name)
{
setupLayout();
updateColumns();
diff --git a/juk/searchwidget.h b/juk/searchwidget.h
index 75f0c513..8bb20ab9 100644
--- a/juk/searchwidget.h
+++ b/juk/searchwidget.h
@@ -40,7 +40,7 @@ class SearchLine : public TQHBox
public:
enum Mode { Default = 0, CaseSensitive = 1, Pattern = 2 };
- SearchLine(TQWidget *tqparent, bool simple = false, const char *name = 0);
+ SearchLine(TQWidget *parent, bool simple = false, const char *name = 0);
virtual ~SearchLine() {}
PlaylistSearch::Component searchComponent() const;
@@ -76,7 +76,7 @@ class SearchWidget : public KToolBar, public SearchIface
TQ_OBJECT
public:
- SearchWidget(TQWidget *tqparent, const char *name = 0);
+ SearchWidget(TQWidget *parent, const char *name = 0);
virtual ~SearchWidget();
PlaylistSearch search(const PlaylistList &playlists) const;
diff --git a/juk/slideraction.cpp b/juk/slideraction.cpp
index a001fc31..cf68043c 100644
--- a/juk/slideraction.cpp
+++ b/juk/slideraction.cpp
@@ -39,7 +39,7 @@
class TrackPositionSlider : public TQSlider
{
public:
- TrackPositionSlider(TQWidget *tqparent, const char *name) : TQSlider(tqparent, name)
+ TrackPositionSlider(TQWidget *parent, const char *name) : TQSlider(parent, name)
{
setFocusPolicy(TQ_NoFocus);
}
@@ -63,8 +63,8 @@ protected:
// VolumeSlider implementation
////////////////////////////////////////////////////////////////////////////////
-VolumeSlider::VolumeSlider(Qt::Orientation o, TQWidget *tqparent, const char *name) :
- TQSlider(o, tqparent, name)
+VolumeSlider::VolumeSlider(Qt::Orientation o, TQWidget *parent, const char *name) :
+ TQSlider(o, parent, name)
{
connect(this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged(int)));
}
@@ -126,8 +126,8 @@ void VolumeSlider::slotValueChanged(int value)
const int SliderAction::minPosition = 0;
const int SliderAction::maxPosition = 1000;
-SliderAction::SliderAction(const TQString &text, TQObject *tqparent, const char *name)
- : KAction(text, 0, tqparent, name),
+SliderAction::SliderAction(const TQString &text, TQObject *parent, const char *name)
+ : KAction(text, 0, parent, name),
m_toolBar(0),
m_layout(0),
m_trackPositionSlider(0),
@@ -143,9 +143,9 @@ SliderAction::~SliderAction()
}
-int SliderAction::plug(TQWidget *tqparent, int index)
+int SliderAction::plug(TQWidget *parent, int index)
{
- TQWidget *w = createWidget(tqparent);
+ TQWidget *w = createWidget(parent);
if(!w)
return -1;
@@ -153,8 +153,8 @@ int SliderAction::plug(TQWidget *tqparent, int index)
// the check for null makes sure that there is only one toolbar that this is
// "plugged" in to
- if(tqparent->inherits("KToolBar") && !m_toolBar) {
- m_toolBar = static_cast<KToolBar *>(tqparent);
+ if(parent->inherits("KToolBar") && !m_toolBar) {
+ m_toolBar = static_cast<KToolBar *>(parent);
int id = KAction::getToolButtonID();
@@ -178,10 +178,10 @@ int SliderAction::plug(TQWidget *tqparent, int index)
}
-void SliderAction::unplug(TQWidget *tqparent)
+void SliderAction::unplug(TQWidget *parent)
{
- if (tqparent->inherits("KToolBar")) {
- m_toolBar = static_cast<KToolBar *>(tqparent);
+ if (parent->inherits("KToolBar")) {
+ m_toolBar = static_cast<KToolBar *>(parent);
int index = findContainer(m_toolBar);
if (index != -1) {
@@ -221,14 +221,14 @@ void SliderAction::slotUpdateOrientation()
// private members
////////////////////////////////////////////////////////////////////////////////
-TQWidget *SliderAction::createWidget(TQWidget *tqparent) // virtual -- used by base class
+TQWidget *SliderAction::createWidget(TQWidget *parent) // virtual -- used by base class
{
- if(tqparent) {
- TQWidget *base = new TQWidget(tqparent);
- base->setBackgroundMode(tqparent->backgroundMode());
+ if(parent) {
+ TQWidget *base = new TQWidget(parent);
+ base->setBackgroundMode(parent->backgroundMode());
base->setName("kde toolbar widget");
- KToolBar *toolBar = dynamic_cast<KToolBar *>(tqparent);
+ KToolBar *toolBar = dynamic_cast<KToolBar *>(parent);
if(toolBar)
toolBar->setStretchableWidget(base);
@@ -279,7 +279,7 @@ TQWidget *SliderAction::createWidget(TQWidget *tqparent) // virtual -- used by b
m_layout->setStretchFactor(m_trackPositionSlider, 4);
m_layout->setStretchFactor(m_volumeSlider, 1);
- connect(tqparent, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotUpdateSize()));
+ connect(parent, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotUpdateSize()));
return base;
}
diff --git a/juk/slideraction.h b/juk/slideraction.h
index 5577a481..70fb3a9d 100644
--- a/juk/slideraction.h
+++ b/juk/slideraction.h
@@ -28,7 +28,7 @@ class VolumeSlider : public TQSlider
TQ_OBJECT
public:
- VolumeSlider(Qt::Orientation o, TQWidget *tqparent, const char *name);
+ VolumeSlider(Qt::Orientation o, TQWidget *parent, const char *name);
int volume() const;
void setVolume(int value);
@@ -52,7 +52,7 @@ class SliderAction : public KAction
TQ_OBJECT
public:
- SliderAction(const TQString &text, TQObject *tqparent, const char *name);
+ SliderAction(const TQString &text, TQObject *parent, const char *name);
virtual ~SliderAction();
VolumeSlider *volumeSlider() const { return m_volumeSlider; }
@@ -61,7 +61,7 @@ public:
bool dragging() const { return m_dragging; }
bool volumeDragging() const { return m_volumeDragging; }
- virtual int plug(TQWidget *tqparent, int index = -1);
+ virtual int plug(TQWidget *parent, int index = -1);
virtual void unplug(TQWidget *widget);
static const int minPosition;
@@ -75,7 +75,7 @@ signals:
void signalVolumeChanged(int volume);
private:
- TQWidget *createWidget(TQWidget *tqparent);
+ TQWidget *createWidget(TQWidget *parent);
private slots:
void slotUpdateSize();
diff --git a/juk/sortedstringlist.cpp b/juk/sortedstringlist.cpp
index b952067b..0886a88d 100644
--- a/juk/sortedstringlist.cpp
+++ b/juk/sortedstringlist.cpp
@@ -20,11 +20,11 @@
class SortedStringList::Node
{
public:
- Node(const TQString &value) : key(value), tqparent(0), left(0), right(0) {}
+ Node(const TQString &value) : key(value), parent(0), left(0), right(0) {}
~Node() {}
TQString key;
- Node *tqparent;
+ Node *parent;
Node *left;
Node *right;
};
@@ -61,11 +61,11 @@ SortedStringList::Node *SortedStringList::treeSuccessor(Node *n) const
if(n->right)
return treeMinimum(n->right);
- Node *p = n->tqparent;
+ Node *p = n->parent;
while(p && n == p->right) {
n = p;
- p = p->tqparent;
+ p = p->parent;
}
return p;
@@ -92,15 +92,15 @@ bool SortedStringList::remove(const TQString &value)
x = y->right;
if(x)
- x->tqparent = y->tqparent;
+ x->parent = y->parent;
- if(!y->tqparent)
+ if(!y->parent)
m_root = x;
else {
- if(y == y->tqparent->left)
- y->tqparent->left = x;
+ if(y == y->parent->left)
+ y->parent->left = x;
else
- y->tqparent->right = x;
+ y->parent->right = x;
}
if(y != x)
@@ -155,7 +155,7 @@ bool SortedStringList::BSTInsert(const TQString &value)
Node *n = new Node(value);
- n->tqparent = previousNode;
+ n->parent = previousNode;
if(!m_root)
m_root = n;
diff --git a/juk/statuslabel.cpp b/juk/statuslabel.cpp
index 4867c7ec..951604cd 100644
--- a/juk/statuslabel.cpp
+++ b/juk/statuslabel.cpp
@@ -35,8 +35,8 @@ using namespace ActionCollection;
// public methods
////////////////////////////////////////////////////////////////////////////////
-StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *tqparent, const char *name) :
- TQHBox(tqparent, name),
+StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const char *name) :
+ TQHBox(parent, name),
PlaylistObserver(playlist),
m_showTimeRemaining(false)
{
diff --git a/juk/statuslabel.h b/juk/statuslabel.h
index a2411622..4d33f387 100644
--- a/juk/statuslabel.h
+++ b/juk/statuslabel.h
@@ -31,7 +31,7 @@ class StatusLabel : public TQHBox, public PlaylistObserver
TQ_OBJECT
public:
- StatusLabel(PlaylistInterface *playlist, TQWidget *tqparent = 0, const char *name = 0);
+ StatusLabel(PlaylistInterface *playlist, TQWidget *parent = 0, const char *name = 0);
virtual ~StatusLabel();
virtual void updateCurrent();
diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp
index 8a9a9c32..e326ef27 100644
--- a/juk/systemtray.cpp
+++ b/juk/systemtray.cpp
@@ -50,8 +50,8 @@ static bool copyImage(TQImage &dest, TQImage &src, int x, int y);
class FlickerFreeLabel : public TQLabel
{
public:
- FlickerFreeLabel(const TQString &text, TQWidget *tqparent, const char *name = 0) :
- TQLabel(text, tqparent, name)
+ FlickerFreeLabel(const TQString &text, TQWidget *parent, const char *name = 0) :
+ TQLabel(text, parent, name)
{
m_textColor = paletteForegroundColor();
m_bgColor = parentWidget()->paletteBackgroundColor();
@@ -90,8 +90,8 @@ protected:
TQColor m_bgColor;
};
-PassiveInfo::PassiveInfo(TQWidget *tqparent, const char *name) :
- KPassivePopup(tqparent, name), m_timer(new TQTimer), m_justDie(false)
+PassiveInfo::PassiveInfo(TQWidget *parent, const char *name) :
+ KPassivePopup(parent, name), m_timer(new TQTimer), m_justDie(false)
{
// I'm so sick and tired of KPassivePopup screwing this up
// that I'll just handle the timeout myself, thank you very much.
@@ -137,7 +137,7 @@ void PassiveInfo::leaveEvent(TQEvent *)
// public methods
////////////////////////////////////////////////////////////////////////////////
-SystemTray::SystemTray(TQWidget *tqparent, const char *name) : KSystemTray(tqparent, name),
+SystemTray::SystemTray(TQWidget *parent, const char *name) : KSystemTray(parent, name),
m_popup(0),
m_fadeTimer(0),
m_fade(true)
@@ -299,7 +299,7 @@ void SystemTray::slotMouseInPopup()
// private methods
////////////////////////////////////////////////////////////////////////////////
-TQVBox *SystemTray::createPopupLayout(TQWidget *tqparent, const FileHandle &file)
+TQVBox *SystemTray::createPopupLayout(TQWidget *parent, const FileHandle &file)
{
TQVBox *infoBox = 0;
@@ -307,17 +307,17 @@ TQVBox *SystemTray::createPopupLayout(TQWidget *tqparent, const FileHandle &file
// They go to the left because JuK is on that side
- createButtonBox(tqparent);
- addSeparatorLine(tqparent);
+ createButtonBox(parent);
+ addSeparatorLine(parent);
- infoBox = new TQVBox(tqparent);
+ infoBox = new TQVBox(parent);
// Another line, and the cover, if there's a cover, and if
// it's selected to be shown
if(file.coverInfo()->hasCover()) {
- addSeparatorLine(tqparent);
- addCoverButton(tqparent, file.coverInfo()->pixmap(CoverInfo::Thumbnail));
+ addSeparatorLine(parent);
+ addCoverButton(parent, file.coverInfo()->pixmap(CoverInfo::Thumbnail));
}
}
else {
@@ -325,14 +325,14 @@ TQVBox *SystemTray::createPopupLayout(TQWidget *tqparent, const FileHandle &file
// Like above, but reversed.
if(file.coverInfo()->hasCover()) {
- addCoverButton(tqparent, file.coverInfo()->pixmap(CoverInfo::Thumbnail));
- addSeparatorLine(tqparent);
+ addCoverButton(parent, file.coverInfo()->pixmap(CoverInfo::Thumbnail));
+ addSeparatorLine(parent);
}
- infoBox = new TQVBox(tqparent);
+ infoBox = new TQVBox(parent);
- addSeparatorLine(tqparent);
- createButtonBox(tqparent);
+ addSeparatorLine(parent);
+ createButtonBox(parent);
}
infoBox->setSpacing(3);
@@ -440,9 +440,9 @@ TQPixmap SystemTray::createPixmap(const TQString &pixName)
return bgPix;
}
-void SystemTray::createButtonBox(TQWidget *tqparent)
+void SystemTray::createButtonBox(TQWidget *parent)
{
- TQVBox *buttonBox = new TQVBox(tqparent);
+ TQVBox *buttonBox = new TQVBox(parent);
buttonBox->setSpacing(3);
@@ -472,9 +472,9 @@ void SystemTray::slotForward()
m_fade = false;
}
-void SystemTray::addSeparatorLine(TQWidget *tqparent)
+void SystemTray::addSeparatorLine(TQWidget *parent)
{
- TQFrame *line = new TQFrame(tqparent);
+ TQFrame *line = new TQFrame(parent);
line->setFrameShape(TQFrame::VLine);
// Cover art takes up 80 pixels, make sure we take up at least 80 pixels
@@ -483,9 +483,9 @@ void SystemTray::addSeparatorLine(TQWidget *tqparent)
line->setMinimumHeight(80);
}
-void SystemTray::addCoverButton(TQWidget *tqparent, const TQPixmap &cover)
+void SystemTray::addCoverButton(TQWidget *parent, const TQPixmap &cover)
{
- TQPushButton *coverButton = new TQPushButton(tqparent);
+ TQPushButton *coverButton = new TQPushButton(parent);
coverButton->setPixmap(cover);
coverButton->setFixedSize(cover.size());
diff --git a/juk/systemtray.h b/juk/systemtray.h
index 0dcb9676..fb6e91f9 100644
--- a/juk/systemtray.h
+++ b/juk/systemtray.h
@@ -40,7 +40,7 @@ class PassiveInfo : public KPassivePopup
Q_OBJECT
TQ_OBJECT
public:
- PassiveInfo(TQWidget *tqparent = 0, const char *name = 0);
+ PassiveInfo(TQWidget *parent = 0, const char *name = 0);
public slots:
void setTimeout(int delay);
@@ -68,7 +68,7 @@ class SystemTray : public KSystemTray
TQ_OBJECT
public:
- SystemTray(TQWidget *tqparent = 0, const char *name = 0);
+ SystemTray(TQWidget *parent = 0, const char *name = 0);
virtual ~SystemTray();
signals:
@@ -88,15 +88,15 @@ private:
// (because the JuK icon is on the left side of the screen.
bool buttonsToLeft() const;
- void createButtonBox(TQWidget *tqparent);
+ void createButtonBox(TQWidget *parent);
// Creates the widget tqlayout 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 *tqparent, const FileHandle &file);
+ TQVBox *createPopupLayout(TQWidget *parent, const FileHandle &file);
- void addSeparatorLine(TQWidget *tqparent);
- void addCoverButton(TQWidget *tqparent, const TQPixmap &cover);
+ void addSeparatorLine(TQWidget *parent);
+ void addCoverButton(TQWidget *parent, const TQPixmap &cover);
// Interpolates from start color to end color. If @p step == 0, then
// m_startColor is returned, while @p step == @steps returns
diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index f02f11ab..c9f866c4 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -49,8 +49,8 @@ using namespace ActionCollection;
class FileNameValidator : public TQValidator
{
public:
- FileNameValidator(TQObject *tqparent, const char *name = 0) :
- TQValidator(tqparent, name) {}
+ FileNameValidator(TQObject *parent, const char *name = 0) :
+ TQValidator(parent, name) {}
virtual void fixup(TQString &s) const
{
@@ -82,8 +82,8 @@ private:
class FixedHLayout : public TQHBoxLayout
{
public:
- FixedHLayout(TQWidget *tqparent, int margin = 0, int spacing = -1, const char *name = 0) :
- TQHBoxLayout(tqparent, margin, spacing, name),
+ FixedHLayout(TQWidget *parent, int margin = 0, int spacing = -1, const char *name = 0) :
+ TQHBoxLayout(parent, margin, spacing, name),
m_width(-1) {}
FixedHLayout(TQLayout *parentLayout, int spacing = -1, const char *name = 0) :
TQHBoxLayout(parentLayout, spacing, name),
@@ -105,9 +105,9 @@ private:
class CollectionObserver : public PlaylistObserver
{
public:
- CollectionObserver(TagEditor *tqparent) :
+ CollectionObserver(TagEditor *parent) :
PlaylistObserver(CollectionList::instance()),
- m_parent(tqparent)
+ m_parent(parent)
{
}
@@ -127,8 +127,8 @@ private:
// public members
////////////////////////////////////////////////////////////////////////////////
-TagEditor::TagEditor(TQWidget *tqparent, const char *name) :
- TQWidget(tqparent, name),
+TagEditor::TagEditor(TQWidget *parent, const char *name) :
+ TQWidget(parent, name),
m_currentPlaylist(0),
m_observer(0),
m_performingSave(false)
diff --git a/juk/tageditor.h b/juk/tageditor.h
index 8a616f15..35526380 100644
--- a/juk/tageditor.h
+++ b/juk/tageditor.h
@@ -40,7 +40,7 @@ class TagEditor : public TQWidget
TQ_OBJECT
public:
- TagEditor(TQWidget *tqparent = 0, const char *name = 0);
+ TagEditor(TQWidget *parent = 0, const char *name = 0);
virtual ~TagEditor();
PlaylistItemList items() const { return m_items; }
void setupObservers();
diff --git a/juk/tagguesserconfigdlg.cpp b/juk/tagguesserconfigdlg.cpp
index f6f1c469..7caea019 100644
--- a/juk/tagguesserconfigdlg.cpp
+++ b/juk/tagguesserconfigdlg.cpp
@@ -20,8 +20,8 @@
#include <tqtoolbutton.h>
#include <tqevent.h>
-TagGuesserConfigDlg::TagGuesserConfigDlg(TQWidget *tqparent, const char *name)
- : KDialogBase(tqparent, name, true, i18n("Tag Guesser Configuration"),
+TagGuesserConfigDlg::TagGuesserConfigDlg(TQWidget *parent, const char *name)
+ : KDialogBase(parent, name, true, i18n("Tag Guesser Configuration"),
Ok | Cancel, Ok, true)
{
m_child = new TagGuesserConfigDlgWidget(this, "child");
diff --git a/juk/tagguesserconfigdlg.h b/juk/tagguesserconfigdlg.h
index 480e00f3..c268c725 100644
--- a/juk/tagguesserconfigdlg.h
+++ b/juk/tagguesserconfigdlg.h
@@ -19,7 +19,7 @@ class TagGuesserConfigDlg : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- TagGuesserConfigDlg(TQWidget *tqparent, const char *name = 0);
+ TagGuesserConfigDlg(TQWidget *parent, const char *name = 0);
protected slots:
virtual void accept();
diff --git a/juk/tagtransactionmanager.cpp b/juk/tagtransactionmanager.cpp
index 256b7041..97028983 100644
--- a/juk/tagtransactionmanager.cpp
+++ b/juk/tagtransactionmanager.cpp
@@ -123,7 +123,7 @@ bool TagTransactionManager::undo()
return result;
}
-TagTransactionManager::TagTransactionManager(TQWidget *tqparent) : TQObject(tqparent, "tagmanager")
+TagTransactionManager::TagTransactionManager(TQWidget *parent) : TQObject(parent, "tagmanager")
{
m_manager = this;
}
@@ -135,7 +135,7 @@ bool TagTransactionManager::renameFile(const TQFileInfo &from, const TQFileInfo
if(!to.exists() ||
KMessageBox::warningContinueCancel(
- TQT_TQWIDGET(tqparent()),
+ TQT_TQWIDGET(parent()),
i18n("This file already exists.\nDo you want to replace it?"),
i18n("File Exists"),i18n("Replace")) == KMessageBox::Continue)
{
@@ -200,7 +200,7 @@ bool TagTransactionManager::processChangeList(bool undo)
action("edit_undo")->setEnabled(false);
if(!errorItems.isEmpty())
- KMessageBox::errorList(TQT_TQWIDGET(tqparent()),
+ KMessageBox::errorList(TQT_TQWIDGET(parent()),
i18n("The following files were unable to be changed."),
errorItems,
i18n("Error"));
diff --git a/juk/tagtransactionmanager.h b/juk/tagtransactionmanager.h
index 7ea38f96..dfb63d1a 100644
--- a/juk/tagtransactionmanager.h
+++ b/juk/tagtransactionmanager.h
@@ -110,11 +110,11 @@ class TagTransactionManager : public TQObject
public:
/**
- * Constructs a TagTransactionManager, owned by @p tqparent.
+ * Constructs a TagTransactionManager, owned by @p parent.
*
- * @param tqparent The tqparent TQWidget.
+ * @param parent The parent TQWidget.
*/
- TagTransactionManager(TQWidget *tqparent = 0);
+ TagTransactionManager(TQWidget *parent = 0);
/**
* Returns the global TagTransactionManager instance.
diff --git a/juk/trackpickerdialog.cpp b/juk/trackpickerdialog.cpp
index ee70ebda..91e2b012 100644
--- a/juk/trackpickerdialog.cpp
+++ b/juk/trackpickerdialog.cpp
@@ -30,8 +30,8 @@
class TrackPickerItem : public KListViewItem
{
public:
- TrackPickerItem(KListView *tqparent, const KTRMResult &result) :
- KListViewItem(tqparent, tqparent->lastChild(),
+ TrackPickerItem(KListView *parent, const KTRMResult &result) :
+ KListViewItem(parent, parent->lastChild(),
result.title(), result.artist(), result.album(),
NUMBER(result.track()), NUMBER(result.year())),
m_result(result) {}
@@ -47,8 +47,8 @@ private:
TrackPickerDialog::TrackPickerDialog(const TQString &name,
const KTRMResultList &results,
- TQWidget *tqparent) :
- KDialogBase(tqparent, name.latin1(), true, i18n("Internet Tag Guesser"), Ok | Cancel, Ok, true)
+ TQWidget *parent) :
+ KDialogBase(parent, name.latin1(), true, i18n("Internet Tag Guesser"), Ok | Cancel, Ok, true)
{
m_base = new TrackPickerDialogBase(this);
setMainWidget(m_base);
diff --git a/juk/trackpickerdialog.h b/juk/trackpickerdialog.h
index 9cc5f347..a25cc3d1 100644
--- a/juk/trackpickerdialog.h
+++ b/juk/trackpickerdialog.h
@@ -34,7 +34,7 @@ class TrackPickerDialog : public KDialogBase
public:
TrackPickerDialog(const TQString &name,
const KTRMResultList &results,
- TQWidget *tqparent = 0);
+ TQWidget *parent = 0);
virtual ~TrackPickerDialog();
diff --git a/juk/upcomingplaylist.h b/juk/upcomingplaylist.h
index a0a95083..4bd7b712 100644
--- a/juk/upcomingplaylist.h
+++ b/juk/upcomingplaylist.h
@@ -180,7 +180,7 @@ public:
/**
* This function sets the currently playing item to @a currentItem. If the
- * item doesn't belong to the tqparent UpcomingPlaylist, it will be added to
+ * item doesn't belong to the parent UpcomingPlaylist, it will be added to
* the UpcomingPlaylist, replacing any track that may be playing.
* Otherwise, it is moved up and set to play, replacing any track that may
* be playing.
@@ -196,7 +196,7 @@ public:
/**
* This function readies the UpcomingSequenceIterator for playback, by
- * making sure the tqparent UpcomingPlaylist has items to play if it is
+ * making sure the parent UpcomingPlaylist has items to play if it is
* empty.
*/
virtual void prepareToPlay(Playlist *);
diff --git a/juk/webimagefetcher.cpp b/juk/webimagefetcher.cpp
index f8445bc3..61dc37a1 100644
--- a/juk/webimagefetcher.cpp
+++ b/juk/webimagefetcher.cpp
@@ -42,8 +42,8 @@ WebImage::WebImage(const TQString &imageURL, const TQString &thumbURL,
}
-WebImageFetcher::WebImageFetcher(TQObject *tqparent)
- : TQObject(tqparent),
+WebImageFetcher::WebImageFetcher(TQObject *parent)
+ : TQObject(parent),
m_connection(new TQHttp(this)),
m_connectionId(-1),
m_dialog(0)
diff --git a/juk/webimagefetcher.h b/juk/webimagefetcher.h
index 4c2aafef..08bfe837 100644
--- a/juk/webimagefetcher.h
+++ b/juk/webimagefetcher.h
@@ -58,7 +58,7 @@ class WebImageFetcher : public TQObject
TQ_OBJECT
public:
- WebImageFetcher(TQObject *tqparent);
+ WebImageFetcher(TQObject *parent);
~WebImageFetcher();
void setFile(const FileHandle &file);
diff --git a/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp
index 32cbbe9b..eb2b1c2a 100644
--- a/juk/webimagefetcherdialog.cpp
+++ b/juk/webimagefetcherdialog.cpp
@@ -36,8 +36,8 @@
WebImageFetcherDialog::WebImageFetcherDialog(const WebImageList &imageList,
const FileHandle &file,
- TQWidget *tqparent) :
- KDialogBase(tqparent, "internet_image_fetcher", true, TQString(),
+ TQWidget *parent) :
+ KDialogBase(parent, "internet_image_fetcher", true, TQString(),
Ok | Cancel | User1 , NoDefault, true),
m_pixmap(TQPixmap()),
m_imageList(imageList),
@@ -184,8 +184,8 @@ TQPixmap WebImageFetcherDialog::pixmapFromURL(const KURL &url) const
// CoverIconViewItem
////////////////////////////////////////////////////////////////////////////////
-CoverIconViewItem::CoverIconViewItem(TQIconView *tqparent, const WebImage &image) :
- TQObject(tqparent), KIconViewItem(tqparent, tqparent->lastItem(), image.size()), m_job(0)
+CoverIconViewItem::CoverIconViewItem(TQIconView *parent, const WebImage &image) :
+ TQObject(parent), KIconViewItem(parent, parent->lastItem(), image.size()), m_job(0)
{
// Set up the iconViewItem
diff --git a/juk/webimagefetcherdialog.h b/juk/webimagefetcherdialog.h
index bd9eb43e..0211ceec 100644
--- a/juk/webimagefetcherdialog.h
+++ b/juk/webimagefetcherdialog.h
@@ -32,7 +32,7 @@ class WebImageFetcherDialog : public KDialogBase
public:
WebImageFetcherDialog(const WebImageList &urlList,
const FileHandle &file,
- TQWidget *tqparent = 0);
+ TQWidget *parent = 0);
virtual ~WebImageFetcherDialog();
@@ -77,7 +77,7 @@ class CoverIconViewItem : public TQObject, public KIconViewItem
TQ_OBJECT
public:
- CoverIconViewItem(TQIconView *tqparent, const WebImage &image);
+ CoverIconViewItem(TQIconView *parent, const WebImage &image);
~CoverIconViewItem();
private slots: