summaryrefslogtreecommitdiffstats
path: root/amarok/src/magnatunebrowser
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-18 03:28:57 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-18 03:28:57 +0000
commit1d9d9f5ce46f0220f7b1b350f5ad4e6dc5079ac6 (patch)
tree728d80ad748a95d7aa27ee020706dbe985e0e8cb /amarok/src/magnatunebrowser
parente9db3e45ed0189bbe18125b120da394a5bc8a832 (diff)
downloadamarok-1d9d9f5ce46f0220f7b1b350f5ad4e6dc5079ac6.tar.gz
amarok-1d9d9f5ce46f0220f7b1b350f5ad4e6dc5079ac6.zip
Finish TQt4 porting of Amarok
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1228394 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'amarok/src/magnatunebrowser')
-rw-r--r--amarok/src/magnatunebrowser/magnatunealbumdownloader.h3
-rw-r--r--amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp18
-rw-r--r--amarok/src/magnatunebrowser/magnatuneartistinfobox.h5
-rw-r--r--amarok/src/magnatunebrowser/magnatunebrowser.cpp4
-rw-r--r--amarok/src/magnatunebrowser/magnatunebrowser.h3
-rw-r--r--amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp4
-rw-r--r--amarok/src/magnatunebrowser/magnatunedownloaddialog.h5
-rw-r--r--amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui28
-rw-r--r--amarok/src/magnatunebrowser/magnatunedownloadinfo.cpp36
-rw-r--r--amarok/src/magnatunebrowser/magnatunelistview.cpp4
-rw-r--r--amarok/src/magnatunebrowser/magnatunelistview.h2
-rw-r--r--amarok/src/magnatunebrowser/magnatunelistviewitems.cpp20
-rw-r--r--amarok/src/magnatunebrowser/magnatunelistviewitems.h6
-rw-r--r--amarok/src/magnatunebrowser/magnatunepurchasedialog.cpp4
-rw-r--r--amarok/src/magnatunebrowser/magnatunepurchasedialog.h5
-rw-r--r--amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui84
-rw-r--r--amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp10
-rw-r--r--amarok/src/magnatunebrowser/magnatunepurchasehandler.h9
-rw-r--r--amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp4
-rw-r--r--amarok/src/magnatunebrowser/magnatuneredownloaddialog.h3
-rw-r--r--amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui18
-rw-r--r--amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp12
-rw-r--r--amarok/src/magnatunebrowser/magnatuneredownloadhandler.h5
-rw-r--r--amarok/src/magnatunebrowser/magnatunexmlparser.cpp6
-rw-r--r--amarok/src/magnatunebrowser/magnatunexmlparser.h11
25 files changed, 162 insertions, 147 deletions
diff --git a/amarok/src/magnatunebrowser/magnatunealbumdownloader.h b/amarok/src/magnatunebrowser/magnatunealbumdownloader.h
index 3ca0b802..a18b900f 100644
--- a/amarok/src/magnatunebrowser/magnatunealbumdownloader.h
+++ b/amarok/src/magnatunebrowser/magnatunealbumdownloader.h
@@ -33,9 +33,10 @@ This class encapsulates the downloading of an album once all required informatio
@author Nikolaj Hald Nielsen <nhnFreespirit@gmail.com>
*/
-class MagnatuneAlbumDownloader: public QObject
+class MagnatuneAlbumDownloader: public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
MagnatuneAlbumDownloader();
diff --git a/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp b/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp
index da56aba1..1e59471b 100644
--- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp
+++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp
@@ -25,8 +25,8 @@
#include <tqfile.h>
-MagnatuneArtistInfoBox::MagnatuneArtistInfoBox( TQWidget *parentWidget, const char *widgetname )
- : KHTMLPart( parentWidget, widgetname )
+MagnatuneArtistInfoBox::MagnatuneArtistInfoBox( TQWidget *tqparentWidget, const char *widgetname )
+ : KHTMLPart( tqparentWidget, widgetname )
{}
@@ -56,7 +56,7 @@ MagnatuneArtistInfoBox::displayAlbumInfo( MagnatuneAlbum *album )
const MagnatuneArtist artist = MagnatuneDatabaseHandler::instance()->getArtistById( album->getArtistId() );
const TQString artistName = artist.getName();
- TQString infoHtml = "<HTML><HEAD><META HTTP-EQUIV=\"Content-Type\" "
+ TQString infoHtml = "<HTML><HEAD><META HTTP-ETQUIV=\"Content-Type\" "
"CONTENT=\"text/html; charset=iso-8859-1\"></HEAD><BODY>";
infoHtml += "<div align=\"center\"><strong>";
@@ -115,25 +115,25 @@ MagnatuneArtistInfoBox::extractArtistInfo( TQString artistPage )
TQString trimmedHtml;
- int sectionStart = artistPage.find( "<!-- ARTISTBODY -->" );
- int sectionEnd = artistPage.find( "<!-- /ARTISTBODY -->", sectionStart );
+ int sectionStart = artistPage.tqfind( "<!-- ARTISTBODY -->" );
+ int sectionEnd = artistPage.tqfind( "<!-- /ARTISTBODY -->", sectionStart );
trimmedHtml = artistPage.mid( sectionStart, sectionEnd - sectionStart );
- int buyStartIndex = trimmedHtml.find( "<!-- PURCHASE -->" );
+ int buyStartIndex = trimmedHtml.tqfind( "<!-- PURCHASE -->" );
int buyEndIndex;
//we are going to integrate the buying of music (I hope) so remove these links
while ( buyStartIndex != -1 )
{
- buyEndIndex = trimmedHtml.find( "<!-- /PURCHASE -->", buyStartIndex ) + 18;
+ buyEndIndex = trimmedHtml.tqfind( "<!-- /PURCHASE -->", buyStartIndex ) + 18;
trimmedHtml.remove( buyStartIndex, buyEndIndex - buyStartIndex );
- buyStartIndex = trimmedHtml.find( "<!-- PURCHASE -->", buyStartIndex );
+ buyStartIndex = trimmedHtml.tqfind( "<!-- PURCHASE -->", buyStartIndex );
}
- TQString infoHtml = "<HTML><HEAD><META HTTP-EQUIV=\"Content-Type\" "
+ TQString infoHtml = "<HTML><HEAD><META HTTP-ETQUIV=\"Content-Type\" "
"CONTENT=\"text/html; charset=iso-8859-1\"></HEAD><BODY>";
infoHtml += trimmedHtml;
diff --git a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
index f730f317..ccca4387 100644
--- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
+++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
@@ -36,15 +36,16 @@ A specialized KHTMLPart for displaying html info about a Magnatune artist or alb
class MagnatuneArtistInfoBox : public KHTMLPart
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Constructor
- * @param parentWidget The parent QWidget
+ * @param tqparentWidget The tqparent TQWidget
* @param widgetname The name of this widget
* @return New MagnatuneArtistInfoBox object
*/
- MagnatuneArtistInfoBox( TQWidget *parentWidget, const char *widgetname );
+ MagnatuneArtistInfoBox( TQWidget *tqparentWidget, const char *widgetname );
/**
* Destructor
diff --git a/amarok/src/magnatunebrowser/magnatunebrowser.cpp b/amarok/src/magnatunebrowser/magnatunebrowser.cpp
index 57bfc3f3..ea3ad04f 100644
--- a/amarok/src/magnatunebrowser/magnatunebrowser.cpp
+++ b/amarok/src/magnatunebrowser/magnatunebrowser.cpp
@@ -349,7 +349,7 @@ bool MagnatuneBrowser::updateMagnatuneList()
m_listDownloadJob = KIO::storedGet( KURL( "http://magnatune.com/info/album_info.xml" ), false, false );
Amarok::StatusBar::instance() ->newProgressOperation( m_listDownloadJob )
.setDescription( i18n( "Downloading Magnatune.com Database" ) )
- .setAbortSlot( this, TQT_SLOT( listDownloadCancelled() ) );
+ .setAbortSlot( TQT_TQOBJECT(this), TQT_SLOT( listDownloadCancelled() ) );
connect( m_listDownloadJob, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( listDownloadComplete( KIO::Job* ) ) );
@@ -433,7 +433,7 @@ void MagnatuneBrowser::updateList()
for ( it = artists.begin(); it != artists.end(); ++it )
new MagnatuneListViewArtistItem( ( *it ), m_listView );
- m_listView->repaintContents();
+ m_listView->tqrepaintContents();
}
void MagnatuneBrowser::genreChanged()
diff --git a/amarok/src/magnatunebrowser/magnatunebrowser.h b/amarok/src/magnatunebrowser/magnatunebrowser.h
index 4f730902..7e768861 100644
--- a/amarok/src/magnatunebrowser/magnatunebrowser.h
+++ b/amarok/src/magnatunebrowser/magnatunebrowser.h
@@ -48,9 +48,10 @@ Implemented as a singleton
@author Nikolaj Hald Nielsen <nhnFreespirit@gmail.com>
*/
-class MagnatuneBrowser : public QVBox
+class MagnatuneBrowser : public TQVBox
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp b/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp
index 6959139e..f0fca6b5 100644
--- a/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp
+++ b/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp
@@ -29,8 +29,8 @@ Boston, MA 02110-1301, USA.
#include <tqtextedit.h>
-MagnatuneDownloadDialog::MagnatuneDownloadDialog( TQWidget *parent, const char *name, bool modal, WFlags fl )
- : MagnatuneDownloadDialogBase( parent, name, modal, fl )
+MagnatuneDownloadDialog::MagnatuneDownloadDialog( TQWidget *tqparent, const char *name, bool modal, WFlags fl )
+ : MagnatuneDownloadDialogBase( tqparent, name, modal, fl )
{
downloadTargetURLRequester->fileDialog() ->setMode( KFile::Directory );
m_currentDownloadInfo = 0;
diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialog.h b/amarok/src/magnatunebrowser/magnatunedownloaddialog.h
index 6ecba1fc..c9a3de33 100644
--- a/amarok/src/magnatunebrowser/magnatunedownloaddialog.h
+++ b/amarok/src/magnatunebrowser/magnatunedownloaddialog.h
@@ -34,16 +34,17 @@
class MagnatuneDownloadDialog : public MagnatuneDownloadDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Overridden constructor.
- * @param parent Pointer to the parent TQWidget.
+ * @param tqparent Pointer to the tqparent TQWidget.
* @param name Name of this widget.
* @param modal Sets modal state.
* @param fl Additional dialog flags.
*/
- MagnatuneDownloadDialog( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
+ MagnatuneDownloadDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
/**
* Destructor
diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui
index 3a24d929..bce229e4 100644
--- a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui
+++ b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>MagnatuneDownloadDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>MagnatuneDownloadDialogBase</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton" row="2" column="0">
+ <widget class="TQPushButton" row="2" column="0">
<property name="name">
<cstring>downloadButton</cstring>
</property>
@@ -27,7 +27,7 @@
<string>&amp;Download</string>
</property>
</widget>
- <widget class="QGroupBox" row="1" column="0">
+ <widget class="TQGroupBox" row="1" column="0">
<property name="name">
<cstring>groupBox2</cstring>
</property>
@@ -38,7 +38,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QTextEdit" row="0" column="0">
+ <widget class="TQTextEdit" row="0" column="0">
<property name="name">
<cstring>infoEdit</cstring>
</property>
@@ -48,7 +48,7 @@
</widget>
</grid>
</widget>
- <widget class="QGroupBox" row="0" column="0">
+ <widget class="TQGroupBox" row="0" column="0">
<property name="name">
<cstring>groupBox1</cstring>
</property>
@@ -59,7 +59,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QComboBox" row="0" column="1">
+ <widget class="TQComboBox" row="0" column="1">
<property name="name">
<cstring>formatComboBox</cstring>
</property>
@@ -69,7 +69,7 @@
<cstring>downloadTargetURLRequester</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ <widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -77,7 +77,7 @@
<string>Select Format:</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -85,14 +85,14 @@
<string>Download to:</string>
</property>
</widget>
- <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>textLabel1_2</cstring>
</property>
<property name="text">
<string>If you download to a location that is already being monitored by Amarok, the album will automatically be added to your collection.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -108,10 +108,10 @@
<slot>downloadButtonClicked()</slot>
</connection>
</connections>
-<slots>
+<Q_SLOTS>
<slot access="protected">downloadButtonClicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
diff --git a/amarok/src/magnatunebrowser/magnatunedownloadinfo.cpp b/amarok/src/magnatunebrowser/magnatunedownloadinfo.cpp
index 828c1cf3..6d064922 100644
--- a/amarok/src/magnatunebrowser/magnatunedownloadinfo.cpp
+++ b/amarok/src/magnatunebrowser/magnatunedownloadinfo.cpp
@@ -27,7 +27,7 @@
MagnatuneDownloadInfo::MagnatuneDownloadInfo()
{
- m_selectedDownloadFormat = TQString::null;
+ m_selectedDownloadFormat = TQString();
m_albumId = -1;
}
@@ -65,7 +65,7 @@ bool MagnatuneDownloadInfo::initFromString( TQString downloadInfoString )
// lets make sure that this is actually a valid result
- int testIndex = downloadInfoString.find( "<RESULT>" );
+ int testIndex = downloadInfoString.tqfind( "<RESULT>" );
if ( testIndex == -1 )
{
return false;
@@ -74,10 +74,10 @@ bool MagnatuneDownloadInfo::initFromString( TQString downloadInfoString )
int startIndex;
int endIndex;
- startIndex = downloadInfoString.find( "<DL_USERNAME>", 0, false );
+ startIndex = downloadInfoString.tqfind( "<DL_USERNAME>", 0, false );
if ( startIndex != -1 )
{
- endIndex = downloadInfoString.find( "</DL_USERNAME>", 0, false );
+ endIndex = downloadInfoString.tqfind( "</DL_USERNAME>", 0, false );
if ( endIndex != -1 )
{
startIndex += 13;
@@ -96,10 +96,10 @@ bool MagnatuneDownloadInfo::initFromString( TQString downloadInfoString )
}
- startIndex = downloadInfoString.find( "<DL_PASSWORD>", 0, false );
+ startIndex = downloadInfoString.tqfind( "<DL_PASSWORD>", 0, false );
if ( startIndex != -1 )
{
- endIndex = downloadInfoString.find( "</DL_PASSWORD>", 0, false );
+ endIndex = downloadInfoString.tqfind( "</DL_PASSWORD>", 0, false );
if ( endIndex != -1 )
{
startIndex += 13;
@@ -117,10 +117,10 @@ bool MagnatuneDownloadInfo::initFromString( TQString downloadInfoString )
}
- startIndex = downloadInfoString.find( "<URL_WAVZIP>", 0, false );
+ startIndex = downloadInfoString.tqfind( "<URL_WAVZIP>", 0, false );
if ( startIndex != -1 )
{
- endIndex = downloadInfoString.find( "</URL_WAVZIP>", 0, false );
+ endIndex = downloadInfoString.tqfind( "</URL_WAVZIP>", 0, false );
if ( endIndex != -1 )
{
startIndex += 12;
@@ -130,10 +130,10 @@ bool MagnatuneDownloadInfo::initFromString( TQString downloadInfoString )
}
}
- startIndex = downloadInfoString.find( "<URL_128KMP3ZIP>", 0, false );
+ startIndex = downloadInfoString.tqfind( "<URL_128KMP3ZIP>", 0, false );
if ( startIndex != -1 )
{
- endIndex = downloadInfoString.find( "</URL_128KMP3ZIP>", 0, false );
+ endIndex = downloadInfoString.tqfind( "</URL_128KMP3ZIP>", 0, false );
if ( endIndex != -1 )
{
startIndex += 16;
@@ -143,10 +143,10 @@ bool MagnatuneDownloadInfo::initFromString( TQString downloadInfoString )
}
}
- startIndex = downloadInfoString.find( "<URL_OGGZIP>", 0, false );
+ startIndex = downloadInfoString.tqfind( "<URL_OGGZIP>", 0, false );
if ( startIndex != -1 )
{
- endIndex = downloadInfoString.find( "</URL_OGGZIP>", 0, false );
+ endIndex = downloadInfoString.tqfind( "</URL_OGGZIP>", 0, false );
if ( endIndex != -1 )
{
startIndex += 12;
@@ -156,10 +156,10 @@ bool MagnatuneDownloadInfo::initFromString( TQString downloadInfoString )
}
}
- startIndex = downloadInfoString.find( "<URL_VBRZIP>", 0, false );
+ startIndex = downloadInfoString.tqfind( "<URL_VBRZIP>", 0, false );
if ( startIndex != -1 )
{
- endIndex = downloadInfoString.find( "</URL_VBRZIP>", 0, false );
+ endIndex = downloadInfoString.tqfind( "</URL_VBRZIP>", 0, false );
if ( endIndex != -1 )
{
startIndex += 12;
@@ -169,10 +169,10 @@ bool MagnatuneDownloadInfo::initFromString( TQString downloadInfoString )
}
}
- startIndex = downloadInfoString.find( "<URL_FLACZIP>", 0, false );
+ startIndex = downloadInfoString.tqfind( "<URL_FLACZIP>", 0, false );
if ( startIndex != -1 )
{
- endIndex = downloadInfoString.find( "</URL_FLACZIP>", 0, false );
+ endIndex = downloadInfoString.tqfind( "</URL_FLACZIP>", 0, false );
if ( endIndex != -1 )
{
startIndex += 13;
@@ -182,10 +182,10 @@ bool MagnatuneDownloadInfo::initFromString( TQString downloadInfoString )
}
}
- startIndex = downloadInfoString.find( "<DL_MSG>", 0, false );
+ startIndex = downloadInfoString.tqfind( "<DL_MSG>", 0, false );
if ( startIndex != -1 )
{
- endIndex = downloadInfoString.find( "</DL_MSG>", 0, false );
+ endIndex = downloadInfoString.tqfind( "</DL_MSG>", 0, false );
if ( endIndex != -1 )
{
startIndex += 9;
diff --git a/amarok/src/magnatunebrowser/magnatunelistview.cpp b/amarok/src/magnatunebrowser/magnatunelistview.cpp
index 3ea8a167..0ea7c53e 100644
--- a/amarok/src/magnatunebrowser/magnatunelistview.cpp
+++ b/amarok/src/magnatunebrowser/magnatunelistview.cpp
@@ -26,8 +26,8 @@
#include <tqcolor.h>
-MagnatuneListView::MagnatuneListView( TQWidget * parent )
- : KListView( parent )
+MagnatuneListView::MagnatuneListView( TQWidget * tqparent )
+ : KListView( tqparent )
{
setRootIsDecorated( true );
diff --git a/amarok/src/magnatunebrowser/magnatunelistview.h b/amarok/src/magnatunebrowser/magnatunelistview.h
index 2a7f7391..b116fece 100644
--- a/amarok/src/magnatunebrowser/magnatunelistview.h
+++ b/amarok/src/magnatunebrowser/magnatunelistview.h
@@ -34,7 +34,7 @@ A specialized KListView that provides drag and drop functionality
class MagnatuneListView : public KListView
{
public:
- MagnatuneListView(TQWidget * parent);
+ MagnatuneListView(TQWidget * tqparent);
~MagnatuneListView();
diff --git a/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp b/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
index 8ce1046c..a6c85ee8 100644
--- a/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
+++ b/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
@@ -29,8 +29,8 @@
-MagnatuneListViewArtistItem::MagnatuneListViewArtistItem( MagnatuneArtist artist, KListView * parent )
-: KListViewItem( parent ), MagnatuneArtist( artist )
+MagnatuneListViewArtistItem::MagnatuneListViewArtistItem( MagnatuneArtist artist, KListView * tqparent )
+: KListViewItem( tqparent ), MagnatuneArtist( artist )
{
KListViewItem::setText( 0, artist.getName() );
@@ -59,8 +59,8 @@ void MagnatuneListViewArtistItem::setOpen( bool o )
}
listView()->setUpdatesEnabled( true );
KListViewItem::setOpen( o );
- invalidateHeight();
- listView()->repaintContents();
+ tqinvalidateHeight();
+ listView()->tqrepaintContents();
}
@@ -84,8 +84,8 @@ void MagnatuneListViewArtistItem::setup()
-MagnatuneListViewAlbumItem::MagnatuneListViewAlbumItem( MagnatuneAlbum album, KListViewItem * parent )
-: KListViewItem( parent ), MagnatuneAlbum( album )
+MagnatuneListViewAlbumItem::MagnatuneListViewAlbumItem( MagnatuneAlbum album, KListViewItem * tqparent )
+: KListViewItem( tqparent ), MagnatuneAlbum( album )
{
KListViewItem::setText( 0, album.getName() );
setDragEnabled( true );
@@ -117,8 +117,8 @@ void MagnatuneListViewAlbumItem::setOpen( bool o )
listView()->setUpdatesEnabled( true );
KListViewItem::setOpen( o );
- invalidateHeight();
- listView()->repaintContents();
+ tqinvalidateHeight();
+ listView()->tqrepaintContents();
}
@@ -141,8 +141,8 @@ void MagnatuneListViewAlbumItem::setup( )
-MagnatuneListViewTrackItem::MagnatuneListViewTrackItem( MagnatuneTrack track, KListViewItem * parent )
-: KListViewItem( parent ), MagnatuneTrack( track )
+MagnatuneListViewTrackItem::MagnatuneListViewTrackItem( MagnatuneTrack track, KListViewItem * tqparent )
+: KListViewItem( tqparent ), MagnatuneTrack( track )
{
int trackNumber = track.getTrackNumber();
diff --git a/amarok/src/magnatunebrowser/magnatunelistviewitems.h b/amarok/src/magnatunebrowser/magnatunelistviewitems.h
index 573acb67..cc848cc4 100644
--- a/amarok/src/magnatunebrowser/magnatunelistviewitems.h
+++ b/amarok/src/magnatunebrowser/magnatunelistviewitems.h
@@ -36,7 +36,7 @@ A specialized KListViewItem that encapsulates a MagnatuneArtist
class MagnatuneListViewArtistItem : public KListViewItem, public MagnatuneArtist
{
public:
- MagnatuneListViewArtistItem(MagnatuneArtist artist, KListView * parent);
+ MagnatuneListViewArtistItem(MagnatuneArtist artist, KListView * tqparent);
~MagnatuneListViewArtistItem();
@@ -55,7 +55,7 @@ class MagnatuneListViewAlbumItem : public KListViewItem, public MagnatuneAlbum
{
public:
- MagnatuneListViewAlbumItem(MagnatuneAlbum album, KListViewItem * parent);
+ MagnatuneListViewAlbumItem(MagnatuneAlbum album, KListViewItem * tqparent);
~MagnatuneListViewAlbumItem();
void setOpen( bool o );
@@ -73,7 +73,7 @@ class MagnatuneListViewTrackItem : public KListViewItem, public MagnatuneTrack
{
public:
- MagnatuneListViewTrackItem(MagnatuneTrack track, KListViewItem * parent);
+ MagnatuneListViewTrackItem(MagnatuneTrack track, KListViewItem * tqparent);
~MagnatuneListViewTrackItem();
};
diff --git a/amarok/src/magnatunebrowser/magnatunepurchasedialog.cpp b/amarok/src/magnatunebrowser/magnatunepurchasedialog.cpp
index aeaa6843..4ea1166b 100644
--- a/amarok/src/magnatunebrowser/magnatunepurchasedialog.cpp
+++ b/amarok/src/magnatunebrowser/magnatunepurchasedialog.cpp
@@ -29,8 +29,8 @@
#include <tqlabel.h>
-MagnatunePurchaseDialog::MagnatunePurchaseDialog( TQWidget* parent, const char* name, bool modal, WFlags fl )
- : magnatunePurchaseDialogBase( parent, name, modal, fl )
+MagnatunePurchaseDialog::MagnatunePurchaseDialog( TQWidget* tqparent, const char* name, bool modal, WFlags fl )
+ : magnatunePurchaseDialogBase( tqparent, name, modal, fl )
{}
MagnatunePurchaseDialog::~MagnatunePurchaseDialog()
diff --git a/amarok/src/magnatunebrowser/magnatunepurchasedialog.h b/amarok/src/magnatunebrowser/magnatunepurchasedialog.h
index a10af868..085ca931 100644
--- a/amarok/src/magnatunebrowser/magnatunepurchasedialog.h
+++ b/amarok/src/magnatunebrowser/magnatunepurchasedialog.h
@@ -26,17 +26,18 @@
class MagnatunePurchaseDialog : public magnatunePurchaseDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Overridden constructor.
- * @param parent Pointer to the parent TQWidget.
+ * @param tqparent Pointer to the tqparent TQWidget.
* @param name Name of this widget.
* @param modal Sets modal state.
* @param fl Additional dialog flags.
*/
- MagnatunePurchaseDialog( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
+ MagnatunePurchaseDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
/**
* Destructor
diff --git a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui
index 467d6f4b..f5b77bfe 100644
--- a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui
+++ b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui
@@ -1,13 +1,13 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>magnatunePurchaseDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>magnatunePurchaseDialogBase</cstring>
</property>
<property name="enabled">
<bool>true</bool>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -25,7 +25,7 @@
<property name="resizeMode">
<enum>Minimum</enum>
</property>
- <widget class="QGroupBox" row="0" column="0">
+ <widget class="TQGroupBox" row="0" column="0">
<property name="name">
<cstring>groupBox1</cstring>
</property>
@@ -36,7 +36,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="2" rowspan="5" colspan="1">
+ <widget class="TQLabel" row="0" column="2" rowspan="5" colspan="1">
<property name="name">
<cstring>coverPixmapLabel</cstring>
</property>
@@ -48,13 +48,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>200</width>
<height>201</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>200</width>
<height>201</height>
@@ -67,18 +67,18 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>infoLabel</cstring>
</property>
<property name="text">
<string>You have chosen to purchase the following album from Magnatune.com</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
- <widget class="QLineEdit" row="1" column="1">
+ <widget class="TQLineEdit" row="1" column="1">
<property name="name">
<cstring>albumEdit</cstring>
</property>
@@ -89,7 +89,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel13</cstring>
</property>
@@ -97,7 +97,7 @@
<string>Album:</string>
</property>
</widget>
- <widget class="QLineEdit" row="2" column="1">
+ <widget class="TQLineEdit" row="2" column="1">
<property name="name">
<cstring>artistEdit</cstring>
</property>
@@ -108,7 +108,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>textLabel14</cstring>
</property>
@@ -116,7 +116,7 @@
<string>Artist:</string>
</property>
</widget>
- <widget class="QLineEdit" row="3" column="1">
+ <widget class="TQLineEdit" row="3" column="1">
<property name="name">
<cstring>genresEdit</cstring>
</property>
@@ -127,7 +127,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLineEdit" row="4" column="1">
+ <widget class="TQLineEdit" row="4" column="1">
<property name="name">
<cstring>launchDateEdit</cstring>
</property>
@@ -138,7 +138,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QLabel" row="3" column="0">
+ <widget class="TQLabel" row="3" column="0">
<property name="name">
<cstring>textLabel15</cstring>
</property>
@@ -146,7 +146,7 @@
<string>Genre:</string>
</property>
</widget>
- <widget class="QLabel" row="4" column="0">
+ <widget class="TQLabel" row="4" column="0">
<property name="name">
<cstring>textLabel16</cstring>
</property>
@@ -156,9 +156,9 @@
</widget>
</grid>
</widget>
- <widget class="QLayoutWidget" row="3" column="0">
+ <widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
- <cstring>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
@@ -180,14 +180,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>41</width>
<height>21</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>purchaseButton</cstring>
</property>
@@ -195,7 +195,7 @@
<string>P&amp;urchase</string>
</property>
</widget>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>cancelButton</cstring>
</property>
@@ -205,7 +205,7 @@
</widget>
</hbox>
</widget>
- <widget class="QGroupBox" row="1" column="0">
+ <widget class="TQGroupBox" row="1" column="0">
<property name="name">
<cstring>groupBox2</cstring>
</property>
@@ -216,7 +216,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0" rowspan="1" colspan="5">
+ <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="5">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@@ -474,7 +474,7 @@
<string>VISA and Mastercard accepted.</string>
</property>
</widget>
- <widget class="QLabel" row="4" column="0">
+ <widget class="TQLabel" row="4" column="0">
<property name="name">
<cstring>textLabel4</cstring>
</property>
@@ -482,7 +482,7 @@
<string>Expiration date:</string>
</property>
</widget>
- <widget class="QLabel" row="5" column="0">
+ <widget class="TQLabel" row="5" column="0">
<property name="name">
<cstring>textLabel7</cstring>
</property>
@@ -490,7 +490,7 @@
<string>Amount to pay (USD):</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ <widget class="TQLabel" row="1" column="0">
<property name="name">
<cstring>textLabel8</cstring>
</property>
@@ -498,7 +498,7 @@
<string>Name:</string>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>textLabel9</cstring>
</property>
@@ -506,7 +506,7 @@
<string>Email:</string>
</property>
</widget>
- <widget class="QLabel" row="3" column="0">
+ <widget class="TQLabel" row="3" column="0">
<property name="name">
<cstring>textLabel3</cstring>
</property>
@@ -514,22 +514,22 @@
<string>Credit card number:</string>
</property>
</widget>
- <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="4">
+ <widget class="TQLineEdit" row="3" column="1" rowspan="1" colspan="4">
<property name="name">
<cstring>ccEdit</cstring>
</property>
</widget>
- <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="4">
+ <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="4">
<property name="name">
<cstring>nameEdit</cstring>
</property>
</widget>
- <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="4">
+ <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="4">
<property name="name">
<cstring>emailEdit</cstring>
</property>
</widget>
- <widget class="QComboBox" row="5" column="1" rowspan="1" colspan="2">
+ <widget class="TQComboBox" row="5" column="1" rowspan="1" colspan="2">
<item>
<property name="text">
<string>5</string>
@@ -607,28 +607,28 @@
<number>3</number>
</property>
</widget>
- <widget class="QLabel" row="6" column="0" rowspan="1" colspan="5">
+ <widget class="TQLabel" row="6" column="0" rowspan="1" colspan="5">
<property name="name">
<cstring>textLabel17</cstring>
</property>
<property name="text">
<string>The amount you choose to pay will be split 50/50 between the artist and Magnatune.com. Your credit card information is sent directly to Magnatune.com using SSL encryption and is not stored by Amarok.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
- <widget class="QLineEdit" row="4" column="4">
+ <widget class="TQLineEdit" row="4" column="4">
<property name="name">
<cstring>expYearEdit</cstring>
</property>
</widget>
- <widget class="QLineEdit" row="4" column="2">
+ <widget class="TQLineEdit" row="4" column="2">
<property name="name">
<cstring>expMonthEdit</cstring>
</property>
</widget>
- <widget class="QLabel" row="4" column="1">
+ <widget class="TQLabel" row="4" column="1">
<property name="name">
<cstring>textLabel6</cstring>
</property>
@@ -636,7 +636,7 @@
<string>Month (xx):</string>
</property>
</widget>
- <widget class="QLabel" row="4" column="3">
+ <widget class="TQLabel" row="4" column="3">
<property name="name">
<cstring>textLabel5</cstring>
</property>
@@ -656,7 +656,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -698,9 +698,9 @@
<tabstop>purchaseButton</tabstop>
<tabstop>cancelButton</tabstop>
</tabstops>
-<slots>
+<Q_SLOTS>
<slot>purchase()</slot>
<slot>cancel()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp b/amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp
index fbfed0ba..053c039c 100644
--- a/amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp
+++ b/amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp
@@ -81,7 +81,7 @@ void MagnatunePurchaseHandler::showPurchaseDialog( TQString coverTempLocation )
if ( m_purchaseDialog == 0 )
{
- m_purchaseDialog = new MagnatunePurchaseDialog( m_parent, "PurchaseDialog", true, 0 );
+ m_purchaseDialog = new MagnatunePurchaseDialog( m_tqparent, "PurchaseDialog", true, 0 );
connect( m_purchaseDialog, TQT_SIGNAL( makePurchase( TQString, TQString, TQString, TQString, TQString, TQString, int ) ), this, TQT_SLOT( processPayment( TQString, TQString, TQString, TQString, TQString, TQString, int ) ) );
connect ( m_purchaseDialog, TQT_SIGNAL( cancelled() ), this, TQT_SLOT( albumPurchaseCancelled() ) );
@@ -146,7 +146,7 @@ void MagnatunePurchaseHandler::xmlDownloadComplete( KIO::Job * downloadJob )
if ( m_downloadDialog == 0 )
{
- m_downloadDialog = new MagnatuneDownloadDialog( m_parent, "downloaddialog", true, 0 );
+ m_downloadDialog = new MagnatuneDownloadDialog( m_tqparent, "downloaddialog", true, 0 );
connect( m_downloadDialog, TQT_SIGNAL( downloadAlbum( MagnatuneDownloadInfo * ) ), m_albumDownloader, TQT_SLOT( downloadAlbum( MagnatuneDownloadInfo * ) ) );
}
@@ -171,16 +171,16 @@ void MagnatunePurchaseHandler::xmlDownloadComplete( KIO::Job * downloadJob )
else
{
- TQMessageBox::information( m_parent, "Could not process payment",
+ TQMessageBox::information( m_tqparent, "Could not process payment",
"There seems to be an error in the information entered (check the credit card number), please try again\n" );
m_purchaseDialog->setEnabled( true );
}
}
-void MagnatunePurchaseHandler::setParent( TQWidget * parent )
+void MagnatunePurchaseHandler::setParent( TQWidget * tqparent )
{
- m_parent = parent;
+ m_tqparent = tqparent;
}
diff --git a/amarok/src/magnatunebrowser/magnatunepurchasehandler.h b/amarok/src/magnatunebrowser/magnatunepurchasehandler.h
index 9889c66f..a9a5e538 100644
--- a/amarok/src/magnatunebrowser/magnatunepurchasehandler.h
+++ b/amarok/src/magnatunebrowser/magnatunepurchasehandler.h
@@ -35,14 +35,15 @@ The main class responcible for handelig of purchases from Magnatune.com
@author Nikolaj Hald Nielsen
*/
-class MagnatunePurchaseHandler : public QObject
+class MagnatunePurchaseHandler : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
MagnatunePurchaseHandler();
~MagnatunePurchaseHandler();
- void setParent( TQWidget * parent );
+ void setParent( TQWidget * tqparent );
/**
* Starts a purchase operation
* @param album The album to purchase
@@ -57,8 +58,8 @@ private:
KIO::TransferJob * m_resultDownloadJob;
- //need a parent to pass to any dialogs we spawn
- TQWidget * m_parent;
+ //need a tqparent to pass to any dialogs we spawn
+ TQWidget * m_tqparent;
MagnatunePurchaseDialog * m_purchaseDialog;
MagnatuneDownloadDialog * m_downloadDialog;
MagnatuneAlbumDownloader * m_albumDownloader;
diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp
index 5d7c1417..0e3c26b3 100644
--- a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp
+++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp
@@ -23,8 +23,8 @@
#include <tqpushbutton.h>
#include <klistview.h>
-MagnatuneRedownloadDialog::MagnatuneRedownloadDialog(TQWidget* parent, const char* name, bool modal, WFlags fl)
-: magnatuneReDownloadDialogBase(parent,name, modal,fl)
+MagnatuneRedownloadDialog::MagnatuneRedownloadDialog(TQWidget* tqparent, const char* name, bool modal, WFlags fl)
+: magnatuneReDownloadDialogBase(tqparent,name, modal,fl)
{
redownloadButton->setEnabled ( false );
diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h
index b42e61a1..e7b5fc2a 100644
--- a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h
+++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h
@@ -28,9 +28,10 @@
class MagnatuneRedownloadDialog : public magnatuneReDownloadDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- MagnatuneRedownloadDialog( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
+ MagnatuneRedownloadDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
~MagnatuneRedownloadDialog();
/*$PUBLIC_FUNCTIONS$*/
diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
index 5a2bfc2e..1ba58ec7 100644
--- a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
+++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
@@ -1,10 +1,10 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>magnatuneReDownloadDialogBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
<property name="name">
<cstring>magnatuneReDownloadDialogBase</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3">
+ <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -27,7 +27,7 @@
<string>These are the albums that you have previously downloaded:</string>
</property>
</widget>
- <widget class="QPushButton" row="2" column="1">
+ <widget class="TQPushButton" row="2" column="1">
<property name="name">
<cstring>redownloadButton</cstring>
</property>
@@ -35,7 +35,7 @@
<string>Re&amp;download</string>
</property>
</widget>
- <widget class="QPushButton" row="2" column="2">
+ <widget class="TQPushButton" row="2" column="2">
<property name="name">
<cstring>cancelButton</cstring>
</property>
@@ -53,7 +53,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>170</width>
<height>20</height>
@@ -98,11 +98,11 @@
<slot>selectionChanged()</slot>
</connection>
</connections>
-<slots>
+<Q_SLOTS>
<slot access="protected">redownload()</slot>
<slot access="protected">selectionChanged()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>
diff --git a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp
index 72e19ed4..643dab5d 100644
--- a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp
+++ b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp
@@ -30,9 +30,9 @@
-MagnatuneRedownloadHandler::MagnatuneRedownloadHandler(TQWidget * parent)
+MagnatuneRedownloadHandler::MagnatuneRedownloadHandler(TQWidget * tqparent)
{
- m_parent = parent;
+ m_tqparent = tqparent;
m_redownloadDialog = 0;
m_downloadDialog = 0;
m_albumDownloader = 0;
@@ -51,13 +51,13 @@ void MagnatuneRedownloadHandler::showRedownloadDialog( )
if (previousDownloads.isEmpty()) {
//No previously purchased track information found. No more to do here...
- TQMessageBox::information( m_parent, i18n( "No purchases found!" ) ,
+ TQMessageBox::information( m_tqparent, i18n( "No purchases found!" ) ,
i18n( "No previous purchases have been found. Nothing to redownload..." ) + "\n" );
return;
}
if (m_redownloadDialog == 0) {
- m_redownloadDialog = new MagnatuneRedownloadDialog( m_parent );
+ m_redownloadDialog = new MagnatuneRedownloadDialog( m_tqparent );
connect( m_redownloadDialog, TQT_SIGNAL( redownload( TQString) ), this, TQT_SLOT( redownload( TQString ) ) );
connect( m_redownloadDialog, TQT_SIGNAL(cancelled() ), this, TQT_SLOT( selectionDialogCancelled() ));
}
@@ -107,7 +107,7 @@ void MagnatuneRedownloadHandler::redownload( TQString storedInfoFileName )
if (m_downloadDialog == 0) {
- m_downloadDialog = new MagnatuneDownloadDialog(m_parent);
+ m_downloadDialog = new MagnatuneDownloadDialog(m_tqparent);
connect( m_downloadDialog, TQT_SIGNAL( downloadAlbum( MagnatuneDownloadInfo * ) ), m_albumDownloader, TQT_SLOT( downloadAlbum( MagnatuneDownloadInfo * ) ) );
}
@@ -123,7 +123,7 @@ void MagnatuneRedownloadHandler::redownload( TQString storedInfoFileName )
else
{
- TQMessageBox::information( m_parent, i18n( "Could not re-download album" ),
+ TQMessageBox::information( m_tqparent, i18n( "Could not re-download album" ),
i18n( "There seems to be a problem with the selected redownload info file." ) + "\n" );
}
diff --git a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h
index 8d981047..f41e291a 100644
--- a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h
+++ b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h
@@ -35,8 +35,9 @@ This class handles the redownloading of previously purchased albums
class MagnatuneRedownloadHandler : public TQObject {
Q_OBJECT
+ TQ_OBJECT
public:
- MagnatuneRedownloadHandler(TQWidget * parent);
+ MagnatuneRedownloadHandler(TQWidget * tqparent);
~MagnatuneRedownloadHandler();
@@ -51,7 +52,7 @@ signals:
protected:
- TQWidget * m_parent;
+ TQWidget * m_tqparent;
TQStringList GetPurchaseList( );
MagnatuneRedownloadDialog * m_redownloadDialog;
MagnatuneDownloadDialog * m_downloadDialog;
diff --git a/amarok/src/magnatunebrowser/magnatunexmlparser.cpp b/amarok/src/magnatunebrowser/magnatunexmlparser.cpp
index ea17966c..0e760495 100644
--- a/amarok/src/magnatunebrowser/magnatunexmlparser.cpp
+++ b/amarok/src/magnatunebrowser/magnatunexmlparser.cpp
@@ -48,9 +48,9 @@ MagnatuneXmlParser::completeJob( )
{
Amarok::StatusBar::instance() ->longMessage(
i18n( "Magnatune.com database update complete. Added %1 tracks on %2 albums from %3 artists" )
- .arg( m_nNumberOfTracks )
- .arg( m_nNumberOfAlbums )
- .arg( m_nNumberOfArtists ), KDE::StatusBar::Information );
+ .tqarg( m_nNumberOfTracks )
+ .tqarg( m_nNumberOfAlbums )
+ .tqarg( m_nNumberOfArtists ), KDE::StatusBar::Information );
emit( doneParsing() );
}
diff --git a/amarok/src/magnatunebrowser/magnatunexmlparser.h b/amarok/src/magnatunebrowser/magnatunexmlparser.h
index d8f3bc8e..801e8fd7 100644
--- a/amarok/src/magnatunebrowser/magnatunexmlparser.h
+++ b/amarok/src/magnatunebrowser/magnatunexmlparser.h
@@ -34,9 +34,16 @@
*
* @author Nikolaj Hald Nielsen
*/
+#ifdef Q_MOC_RUN
+// MOC_SKIP_BEGIN
+class MagnatuneXmlParser : public JobBase
+// MOC_SKIP_END
+#else
class MagnatuneXmlParser : public ThreadManager::Job
+#endif
{
Q_OBJECT
+ TQ_OBJECT
public:
@@ -90,8 +97,8 @@ private:
void parseElement( TQDomElement e );
/**
- * Parses all children of a DOM element
- * @param e The element whose children is to be parsed
+ * Parses all tqchildren of a DOM element
+ * @param e The element whose tqchildren is to be parsed
*/
void parseChildren( TQDomElement e );