TQt4 port kdemultimedia

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 13 insertions, 11 deletions

diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp
index 29d00935..d8a04537 100644
--- a/noatun/modules/htmlexport/htmlexport.cpp
+++ b/noatun/modules/htmlexport/htmlexport.cpp
@@ -36,7 +36,7 @@ void HTMLExport::slotExport()
 	config->setGroup("HTMLExport");
 
 	// get output target
-	KURL url = KFileDialog::getSaveURL(TQString::null,
+	KURL url = KFileDialog::getSaveURL(TQString(),
 	                                   "text/html",
 	                                   0,
 	                                   i18n("Export Playlist"));
@@ -136,9 +136,9 @@ TQString HTMLExport::htmlEscape(const TQString &source) {
 	// Escape characters that need to be escaped
 	TQString temp = source;
 
-	temp.replace( TQRegExp("&"), "&" );
-	temp.replace( TQRegExp("<"), "&lt;" );
-	temp.replace( TQRegExp(">"), "&gt;" );
+	temp.tqreplace( TQRegExp("&"), "&amp;" );
+	temp.tqreplace( TQRegExp("<"), "&lt;" );
+	temp.tqreplace( TQRegExp(">"), "&gt;" );
 
 	return temp;
 }
@@ -171,8 +171,8 @@ TQString HTMLExport::getColorByEntry(TQString s)
 }
 //////////////////////////////////// Settings ////////////////////////////////////
 
-Prefs::Prefs(TQObject *parent)
-	: CModule(i18n("Playlist Export"), i18n("Colors & Settings for HTML Export"), "html", parent)
+Prefs::Prefs(TQObject *tqparent)
+	: CModule(i18n("Playlist Export"), i18n("Colors & Settings for HTML Export"), "html", tqparent)
 {
 
 	// Init Config
@@ -213,19 +213,19 @@ Prefs::Prefs(TQObject *parent)
 
 	txtColorLabel = new TQLabel( colorBox, "txtColorLabel" );
 	txtColorLabel->setText( i18n( "Text:"  ) );
-	txtColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+	txtColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
 	bgColorLabel = new TQLabel( colorBox, "bgColorLabel" );
 	bgColorLabel->setText( i18n( "Background:"  ) );
-	bgColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+	bgColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
 	headColorLabel = new TQLabel( colorBox, "headColorLabel" );
 	headColorLabel->setText( i18n( "Heading:"  ) );
-	headColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+	headColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
 	hoverColorLabel = new TQLabel( colorBox, "hoverColorLabel" );
 	hoverColorLabel->setText( i18n( "Link hover:" ) );
-	hoverColorLabel->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
+	hoverColorLabel->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
 
 	bgcolorLabel->setRowStretch(0, 1);
 
diff --git a/noatun/modules/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h
index 81047d3d..65f5c5e9 100644
--- a/noatun/modules/htmlexport/htmlexport.h
+++ b/noatun/modules/htmlexport/htmlexport.h
@@ -34,6 +34,7 @@ class KAction;
 class HTMLExport : public TQObject, public Plugin
 {
 Q_OBJECT
+  TQ_OBJECT
 NOATUNPLUGIND
 public:
 	HTMLExport();
@@ -54,8 +55,9 @@ private slots:
 class Prefs : public CModule
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	Prefs(TQObject *parent);
+	Prefs(TQObject *tqparent);
 	virtual void save();
 	virtual void reopen();