summaryrefslogtreecommitdiffstats
path: root/juk
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:33:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:33:07 -0600
commit3c299dfe48c0060272c2966fff599b3b417e2ee4 (patch)
treef248b71f55539d6689a4cbe086d5d8cc146c8998 /juk
parentf59dfa08651a47f21d004e8e4cb5020b8035287e (diff)
downloadtdemultimedia-3c299dfe48c0060272c2966fff599b3b417e2ee4.tar.gz
tdemultimedia-3c299dfe48c0060272c2966fff599b3b417e2ee4.zip
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'juk')
-rw-r--r--juk/coverdialogbase.ui2
-rw-r--r--juk/covermanager.cpp4
-rw-r--r--juk/covermanager.h2
-rw-r--r--juk/deletedialogbase.ui2
-rw-r--r--juk/directorylist.cpp4
-rw-r--r--juk/directorylistbase.ui2
-rw-r--r--juk/filerenamer.cpp2
-rw-r--r--juk/filerenamerbase.ui6
-rw-r--r--juk/filerenameroptionsbase.ui6
-rw-r--r--juk/historyplaylist.cpp4
-rw-r--r--juk/ktrm.cpp18
-rw-r--r--juk/nowplaying.cpp4
-rw-r--r--juk/playermanager.cpp2
-rw-r--r--juk/playlist.cpp2
-rw-r--r--juk/playlistbox.cpp4
-rw-r--r--juk/playlistbox.h2
-rw-r--r--juk/playlistitem.cpp10
-rw-r--r--juk/splashscreen.cpp2
-rw-r--r--juk/statuslabel.cpp16
-rw-r--r--juk/systemtray.cpp2
-rw-r--r--juk/tageditor.cpp10
-rw-r--r--juk/tagguesserconfigdlgwidget.ui2
-rw-r--r--juk/viewmode.cpp10
-rw-r--r--juk/viewmode.h4
-rw-r--r--juk/webimagefetcherdialog.cpp2
25 files changed, 62 insertions, 62 deletions
diff --git a/juk/coverdialogbase.ui b/juk/coverdialogbase.ui
index a94fac63..080f108c 100644
--- a/juk/coverdialogbase.ui
+++ b/juk/coverdialogbase.ui
@@ -50,7 +50,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>164</width>
<height>0</height>
diff --git a/juk/covermanager.cpp b/juk/covermanager.cpp
index 7cd3d014..5ee5bbf0 100644
--- a/juk/covermanager.cpp
+++ b/juk/covermanager.cpp
@@ -269,7 +269,7 @@ const char *CoverDrag::format(int i) const
return 0;
}
-TQByteArray CoverDrag::tqencodedData(const char *mimetype) const
+TQByteArray CoverDrag::encodedData(const char *mimetype) const
{
if(qstrcmp(CoverDrag::mimetype, mimetype) == 0) {
TQByteArray data;
@@ -303,7 +303,7 @@ bool CoverDrag::decode(const TQMimeSource *e, coverKey &id)
if(!canDecode(e))
return false;
- TQByteArray data = e->tqencodedData(mimetype);
+ TQByteArray data = e->encodedData(mimetype);
TQDataStream ds(data, IO_ReadOnly);
TQ_UINT32 i;
diff --git a/juk/covermanager.h b/juk/covermanager.h
index b5c5d6e7..61ecc567 100644
--- a/juk/covermanager.h
+++ b/juk/covermanager.h
@@ -68,7 +68,7 @@ public:
CoverDrag(coverKey id, TQWidget *src);
virtual const char *format(int i) const;
- virtual TQByteArray tqencodedData(const char *mimetype) const;
+ virtual TQByteArray encodedData(const char *mimetype) const;
void setId(coverKey id) { m_id = id; }
diff --git a/juk/deletedialogbase.ui b/juk/deletedialogbase.ui
index 50e13fe7..7aebdf5c 100644
--- a/juk/deletedialogbase.ui
+++ b/juk/deletedialogbase.ui
@@ -12,7 +12,7 @@
<height>374</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>420</width>
<height>320</height>
diff --git a/juk/directorylist.cpp b/juk/directorylist.cpp
index ceb0d71d..43df3dda 100644
--- a/juk/directorylist.cpp
+++ b/juk/directorylist.cpp
@@ -50,9 +50,9 @@ DirectoryList::DirectoryList(const TQStringList &directories, bool importPlaylis
m_base->importPlaylistsCheckBox->setChecked(importPlaylists);
- TQSize sz = tqsizeHint();
+ TQSize sz = sizeHint();
setMinimumSize(kMax(350, sz.width()), kMax(250, sz.height()));
- resize(tqsizeHint());
+ resize(sizeHint());
}
DirectoryList::~DirectoryList()
diff --git a/juk/directorylistbase.ui b/juk/directorylistbase.ui
index 64a23800..65d334e8 100644
--- a/juk/directorylistbase.ui
+++ b/juk/directorylistbase.ui
@@ -77,7 +77,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp
index 6f479313..b0dc50f6 100644
--- a/juk/filerenamer.cpp
+++ b/juk/filerenamer.cpp
@@ -355,7 +355,7 @@ unsigned FileRenamerWidget::addRowCategory(TagType category)
TQString labelText = TQString("<b>%1</b>").tqarg(TagRenamerOptions::tagTypeText(category));
TQLabel *label = new TQLabel(labelText, frame);
frame->setStretchFactor(label, 1);
- label->tqsetAlignment(AlignCenter);
+ label->setAlignment(AlignCenter);
TQVBox *options = new TQVBox(frame);
row.enableButton = new KPushButton(i18n("Remove"), options);
diff --git a/juk/filerenamerbase.ui b/juk/filerenamerbase.ui
index dfd5d0fd..541e928d 100644
--- a/juk/filerenamerbase.ui
+++ b/juk/filerenamerbase.ui
@@ -232,7 +232,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -257,7 +257,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -295,7 +295,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
diff --git a/juk/filerenameroptionsbase.ui b/juk/filerenameroptionsbase.ui
index 265685dc..07788856 100644
--- a/juk/filerenameroptionsbase.ui
+++ b/juk/filerenameroptionsbase.ui
@@ -65,7 +65,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -106,7 +106,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -346,7 +346,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
diff --git a/juk/historyplaylist.cpp b/juk/historyplaylist.cpp
index a9bded13..204197c0 100644
--- a/juk/historyplaylist.cpp
+++ b/juk/historyplaylist.cpp
@@ -92,14 +92,14 @@ void HistoryPlaylist::slotCreateNewItem()
HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *parent, TQListViewItem *after) :
PlaylistItem(item, parent, after),
- m_dateTime(TQDateTime::tqcurrentDateTime())
+ m_dateTime(TQDateTime::currentDateTime())
{
setText(0, KGlobal::locale()->formatDateTime(m_dateTime));
}
HistoryPlaylistItem::HistoryPlaylistItem(CollectionListItem *item, Playlist *parent) :
PlaylistItem(item, parent),
- m_dateTime(TQDateTime::tqcurrentDateTime())
+ m_dateTime(TQDateTime::currentDateTime())
{
setText(0, KGlobal::locale()->formatDateTime(m_dateTime));
}
diff --git a/juk/ktrm.cpp b/juk/ktrm.cpp
index 3838d8bc..09a77546 100644
--- a/juk/ktrm.cpp
+++ b/juk/ktrm.cpp
@@ -43,7 +43,7 @@ class KTRMLookup;
extern "C"
{
#if HAVE_MUSICBRAINZ >= 4
- static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFiletqStatus status);
+ static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFileStatus status);
#else
static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId);
#endif
@@ -205,14 +205,14 @@ private:
class KTRMEvent : public TQCustomEvent
{
public:
- enum tqStatus {
+ enum Status {
Recognized,
Unrecognized,
Collision,
Error
};
- KTRMEvent(int fileId, tqStatus status) :
+ KTRMEvent(int fileId, Status status) :
TQCustomEvent(id),
m_fileId(fileId),
m_status(status) {}
@@ -222,7 +222,7 @@ public:
return m_fileId;
}
- tqStatus status() const
+ Status status() const
{
return m_status;
}
@@ -231,7 +231,7 @@ public:
private:
int m_fileId;
- tqStatus m_status;
+ Status m_status;
};
/**
@@ -242,7 +242,7 @@ private:
class KTRMEventHandler : public TQObject
{
public:
- static void send(int fileId, KTRMEvent::tqStatus status)
+ static void send(int fileId, KTRMEvent::Status status)
{
KApplication::postEvent(instance(), new KTRMEvent(fileId, status));
}
@@ -303,7 +303,7 @@ protected:
* Callback fuction for TunePimp lookup events.
*/
#if HAVE_MUSICBRAINZ >= 4
-static void TRMNotifyCallback(tunepimp_t /*pimp*/, void* /*data*/, TPCallbackEnum type, int fileId, TPFiletqStatus status)
+static void TRMNotifyCallback(tunepimp_t /*pimp*/, void* /*data*/, TPCallbackEnum type, int fileId, TPFileStatus status)
#else
static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId)
#endif
@@ -313,7 +313,7 @@ static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type,
#if HAVE_MUSICBRAINZ < 4
track_t track = tp_GetTrack(pimp, fileId);
- TPFiletqStatus status = tr_GettqStatus(track);
+ TPFileStatus status = tr_GetStatus(track);
#endif
switch(status) {
@@ -496,7 +496,7 @@ void KTRMLookup::unrecognized()
tr_Lock(track);
tr_GetTRM(track, trm, 255);
if ( !trm[0] ) {
- tr_SettqStatus(track, ePending);
+ tr_SetStatus(track, ePending);
tp_Wake(KTRMRequestHandler::instance()->tunePimp(), track);
}
else
diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp
index 8e14f1e9..0aac58d3 100644
--- a/juk/nowplaying.cpp
+++ b/juk/nowplaying.cpp
@@ -219,7 +219,7 @@ TrackItem::TrackItem(NowPlaying *parent) :
NowPlayingItem(parent)
{
setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2);
- tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+ setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
@@ -292,7 +292,7 @@ HistoryItem::HistoryItem(NowPlaying *parent) :
NowPlayingItem(parent)
{
setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2);
- tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+ setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
setLinkUnderline(false);
setText(TQString("<b>%1</b>").tqarg(i18n("History")));
diff --git a/juk/playermanager.cpp b/juk/playermanager.cpp
index db01392c..0ecc9e84 100644
--- a/juk/playermanager.cpp
+++ b/juk/playermanager.cpp
@@ -46,7 +46,7 @@
using namespace ActionCollection;
-enum PlayerManagertqStatus { StatusStopped = -1, StatusPaused = 1, StatusPlaying = 2 };
+enum PlayerManagerStatus { StatusStopped = -1, StatusPaused = 1, StatusPlaying = 2 };
////////////////////////////////////////////////////////////////////////////////
// helper functions
diff --git a/juk/playlist.cpp b/juk/playlist.cpp
index 41f18228..51228642 100644
--- a/juk/playlist.cpp
+++ b/juk/playlist.cpp
@@ -102,7 +102,7 @@ public:
(column == m_playlist->columnOffset() + PlaylistItem::CoverColumn &&
item->file().coverInfo()->hasCover()))
{
- TQRect r = m_playlist->tqitemRect(item);
+ TQRect r = m_playlist->itemRect(item);
int headerPosition = m_playlist->header()->sectionPos(column);
r.setLeft(headerPosition);
r.setRight(headerPosition + m_playlist->header()->sectionSize(column));
diff --git a/juk/playlistbox.cpp b/juk/playlistbox.cpp
index d0e82d27..f708242b 100644
--- a/juk/playlistbox.cpp
+++ b/juk/playlistbox.cpp
@@ -722,10 +722,10 @@ int PlaylistBox::Item::compare(TQListViewItem *i, int col, bool) const
return text(col).lower().localeAwareCompare(i->text(col).lower());
}
-void PlaylistBox::Item::paintCell(TQPainter *painter, const TQColorGroup &tqcolorGroup, int column, int width, int align)
+void PlaylistBox::Item::paintCell(TQPainter *painter, const TQColorGroup &colorGroup, int column, int width, int align)
{
PlaylistBox *playlistBox = static_cast<PlaylistBox *>(listView());
- playlistBox->viewMode()->paintCell(this, painter, tqcolorGroup, column, width, align);
+ playlistBox->viewMode()->paintCell(this, painter, colorGroup, column, width, align);
}
void PlaylistBox::Item::setText(int column, const TQString &text)
diff --git a/juk/playlistbox.h b/juk/playlistbox.h
index 793ae654..42003634 100644
--- a/juk/playlistbox.h
+++ b/juk/playlistbox.h
@@ -162,7 +162,7 @@ protected:
void setSortedFirst(bool first = true) { m_sortedFirst = first; }
virtual int compare(TQListViewItem *i, int col, bool) const;
- virtual void paintCell(TQPainter *p, const TQColorGroup &tqcolorGroup, int column, int width, int align);
+ virtual void paintCell(TQPainter *p, const TQColorGroup &colorGroup, int column, int width, int align);
virtual void paintFocus(TQPainter *, const TQColorGroup &, const TQRect &) {}
virtual void setText(int column, const TQString &text);
diff --git a/juk/playlistitem.cpp b/juk/playlistitem.cpp
index 81aad977..2a9a2412 100644
--- a/juk/playlistitem.cpp
+++ b/juk/playlistitem.cpp
@@ -272,10 +272,10 @@ void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, i
if(!m_playingItems.contains(this))
return KListViewItem::paintCell(p, cg, column, width, align);
- TQColorGroup tqcolorGroup = cg;
+ TQColorGroup colorGroup = cg;
- TQColor base = tqcolorGroup.base();
- TQColor selection = tqcolorGroup.highlight();
+ TQColor base = colorGroup.base();
+ TQColor selection = colorGroup.highlight();
int r = (base.red() + selection.red()) / 2;
int b = (base.blue() + selection.blue()) / 2;
@@ -283,8 +283,8 @@ void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, i
TQColor c(r, g, b);
- tqcolorGroup.setColor(TQColorGroup::Base, c);
- TQListViewItem::paintCell(p, tqcolorGroup, column, width, align);
+ colorGroup.setColor(TQColorGroup::Base, c);
+ TQListViewItem::paintCell(p, colorGroup, column, width, align);
}
int PlaylistItem::compare(TQListViewItem *item, int column, bool ascending) const
diff --git a/juk/splashscreen.cpp b/juk/splashscreen.cpp
index 21f037b0..d20e5896 100644
--- a/juk/splashscreen.cpp
+++ b/juk/splashscreen.cpp
@@ -77,7 +77,7 @@ SplashScreen::SplashScreen() : TQLabel(0 , "splashScreen", TQt::WStyle_Splash)
setPaletteBackgroundPixmap(background);
setMargin(7);
- tqsetAlignment(AlignLeft | AlignBottom);
+ setAlignment(AlignLeft | AlignBottom);
setPaletteForegroundColor(TQColor(107, 158, 194));
diff --git a/juk/statuslabel.cpp b/juk/statuslabel.cpp
index 951604cd..d94a3247 100644
--- a/juk/statuslabel.cpp
+++ b/juk/statuslabel.cpp
@@ -42,7 +42,7 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const ch
{
TQFrame *trackAndPlaylist = new TQFrame(this);
trackAndPlaylist->setFrameStyle(Box | Sunken);
- trackAndPlaylist->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ trackAndPlaylist->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
// Make sure that we have enough of a margin to suffice for the borders,
// hence the "lineWidth() * 2"
@@ -53,23 +53,23 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const ch
m_playlistLabel = new KSqueezedTextLabel(trackAndPlaylist, "playlistLabel");
trackAndPlaylistLayout->addWidget(m_playlistLabel);
- m_playlistLabel->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ m_playlistLabel->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
m_playlistLabel->setTextFormat(PlainText);
- m_playlistLabel->tqsetAlignment(AlignLeft | AlignVCenter);
+ m_playlistLabel->setAlignment(AlignLeft | AlignVCenter);
m_trackLabel = new KSqueezedTextLabel(trackAndPlaylist, "trackLabel");
trackAndPlaylistLayout->addWidget(m_trackLabel);
- m_trackLabel->tqsetAlignment(AlignRight | AlignVCenter);
- m_trackLabel->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ m_trackLabel->setAlignment(AlignRight | AlignVCenter);
+ m_trackLabel->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
m_trackLabel->setTextFormat(PlainText);
trackAndPlaylistLayout->addSpacing(5);
m_itemTimeLabel = new TQLabel(this);
TQFontMetrics fontMetrics(font());
- m_itemTimeLabel->tqsetAlignment(AlignCenter);
+ m_itemTimeLabel->setAlignment(AlignCenter);
m_itemTimeLabel->setMinimumWidth(fontMetrics.boundingRect("000:00 / 000:00").width());
- m_itemTimeLabel->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
+ m_itemTimeLabel->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
m_itemTimeLabel->setFrameStyle(Box | Sunken);
m_itemTimeLabel->installEventFilter(this);
@@ -78,7 +78,7 @@ StatusLabel::StatusLabel(PlaylistInterface *playlist, TQWidget *parent, const ch
TQHBox *jumpBox = new TQHBox(this);
jumpBox->setFrameStyle(Box | Sunken);
- jumpBox->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Minimum);
+ jumpBox->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Minimum);
TQPushButton *jumpButton = new TQPushButton(jumpBox);
jumpButton->setPixmap(SmallIcon("up"));
diff --git a/juk/systemtray.cpp b/juk/systemtray.cpp
index ad1eb7c8..1c0abaec 100644
--- a/juk/systemtray.cpp
+++ b/juk/systemtray.cpp
@@ -370,7 +370,7 @@ void SystemTray::createPopup()
for(unsigned i = 0; i < m_labels.capacity(); ++i) {
m_labels[i] = new FlickerFreeLabel(" ", infoBox);
- m_labels[i]->tqsetAlignment(AlignRight | AlignVCenter);
+ m_labels[i]->setAlignment(AlignRight | AlignVCenter);
}
// We don't want an autodelete popup. There are times when it will need
diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index c9f866c4..d13f09f0 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -90,11 +90,11 @@ public:
m_width(-1) {}
void setWidth(int w = -1)
{
- m_width = w == -1 ? TQHBoxLayout::tqminimumSize().width() : w;
+ m_width = w == -1 ? TQHBoxLayout::minimumSize().width() : w;
}
- virtual TQSize tqminimumSize() const
+ virtual TQSize minimumSize() const
{
- TQSize s = TQHBoxLayout::tqminimumSize();
+ TQSize s = TQHBoxLayout::minimumSize();
s.setWidth(m_width);
return s;
}
@@ -560,7 +560,7 @@ void TagEditor::setupLayout()
// addItem(i18n("Length:"), m_lengthBox, trackRowLayout);
m_lengthBox->setMinimumWidth(fontMetrics().width("00:00") + trackRowLayout->spacing());
m_lengthBox->setMaximumWidth(50);
- m_lengthBox->tqsetAlignment(TQt::AlignRight);
+ m_lengthBox->setAlignment(TQt::AlignRight);
m_lengthBox->setReadOnly(true);
trackRowLayout->addWidget(addHidden(m_lengthBox));
@@ -572,7 +572,7 @@ void TagEditor::setupLayout()
// addItem(i18n("Bitrate:"), m_bitrateBox, trackRowLayout);
m_bitrateBox->setMinimumWidth(fontMetrics().width("000") + trackRowLayout->spacing());
m_bitrateBox->setMaximumWidth(50);
- m_bitrateBox->tqsetAlignment(TQt::AlignRight);
+ m_bitrateBox->setAlignment(TQt::AlignRight);
m_bitrateBox->setReadOnly(true);
trackRowLayout->addWidget(addHidden(m_bitrateBox));
diff --git a/juk/tagguesserconfigdlgwidget.ui b/juk/tagguesserconfigdlgwidget.ui
index 08a03ed6..f3b3b2e5 100644
--- a/juk/tagguesserconfigdlgwidget.ui
+++ b/juk/tagguesserconfigdlgwidget.ui
@@ -136,7 +136,7 @@ Note that the order in which the schemes appear in the list is relevant, since t
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>130</height>
diff --git a/juk/viewmode.cpp b/juk/viewmode.cpp
index b95d8cbc..d1877730 100644
--- a/juk/viewmode.cpp
+++ b/juk/viewmode.cpp
@@ -49,7 +49,7 @@ ViewMode::~ViewMode()
void ViewMode::paintCell(PlaylistBox::Item *item,
TQPainter *painter,
- const TQColorGroup &tqcolorGroup,
+ const TQColorGroup &colorGroup,
int column, int width, int)
{
if(width < item->pixmap(column)->width())
@@ -79,8 +79,8 @@ void ViewMode::paintCell(PlaylistBox::Item *item,
painter->setPen(oldPen);
painter->fillRect(border, border, width - border * 2, item->height() - border * 2 + 1,
- tqcolorGroup.brush(TQColorGroup::Highlight));
- painter->setPen(tqcolorGroup.highlightedText());
+ colorGroup.brush(TQColorGroup::Highlight));
+ painter->setPen(colorGroup.highlightedText());
}
else
painter->eraseRect(0, 0, width, item->height());
@@ -224,10 +224,10 @@ CompactViewMode::~CompactViewMode()
void CompactViewMode::paintCell(PlaylistBox::Item *item,
TQPainter *painter,
- const TQColorGroup &tqcolorGroup,
+ const TQColorGroup &colorGroup,
int column, int width, int align)
{
- item->KListViewItem::paintCell(painter, tqcolorGroup, column, width, align);
+ item->KListViewItem::paintCell(painter, colorGroup, column, width, align);
if(item == item->listView()->dropItem())
paintDropIndicator(painter, width, item->height());
}
diff --git a/juk/viewmode.h b/juk/viewmode.h
index 2ef4f007..a2d30a9a 100644
--- a/juk/viewmode.h
+++ b/juk/viewmode.h
@@ -40,7 +40,7 @@ public:
virtual void paintCell(PlaylistBox::Item *item,
TQPainter *painter,
- const TQColorGroup &tqcolorGroup,
+ const TQColorGroup &colorGroup,
int column, int width, int align);
virtual bool eventFilter(TQObject *watched, TQEvent *e);
@@ -106,7 +106,7 @@ public:
virtual void paintCell(PlaylistBox::Item *item,
TQPainter *painter,
- const TQColorGroup &tqcolorGroup,
+ const TQColorGroup &colorGroup,
int column, int width, int align);
virtual void setupItem(PlaylistBox::Item *item) const { item->KListViewItem::setup(); }
diff --git a/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp
index eb2b1c2a..7eb08c0f 100644
--- a/juk/webimagefetcherdialog.cpp
+++ b/juk/webimagefetcherdialog.cpp
@@ -86,7 +86,7 @@ void WebImageFetcherDialog::showCreditURL(const TQString &url)
{
// Don't use static member since I'm sure that someday knowing my luck
// Yahoo will change their mimetype they serve.
- (void) new KRun(KURL(url), tqtopLevelWidget());
+ (void) new KRun(KURL(url), topLevelWidget());
}
void WebImageFetcherDialog::setLayout()