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

1 files changed, 18 insertions, 18 deletions

diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp
index 27dbc686..226cc2d6 100644
--- a/noatun/library/cmodule.cpp
+++ b/noatun/library/cmodule.cpp
@@ -28,8 +28,8 @@
  * General options
  *****************************************************************/
 
-General::General(TQObject *parent)
-	: CModule(i18n("General"), i18n("General Options"), "configure", parent)
+General::General(TQObject *tqparent)
+	: CModule(i18n("General"), i18n("General Options"), "configure", tqparent)
 {
 	mLoopList=new TQCheckBox(i18n("&Return to start of playlist on finish"), this);
 	mLoopList->setChecked(napp->loopList());
@@ -58,7 +58,7 @@ General::General(TQObject *parent)
 	TQWhatsThis::add(mTitleFormat, i18n(
 			"Select a title to use for each file (in the playlist and user interface). "
 			"Each element such as $(title) is replaced with the property with the name "
-			"as given in the parentheses. The properties include, but are not limited to: "
+			"as given in the tqparentheses. The properties include, but are not limited to: "
 			"title, author, date, comments and album."));
 
 	TQLabel *dlsaver=new TQLabel(i18n("&Download folder:"), this);
@@ -68,7 +68,7 @@ General::General(TQObject *parent)
 		 this, TQT_SLOT( slotRequesterClicked( KURLRequester * )));
 	TQWhatsThis::add(mDlSaver, i18n("When opening a non-local file, download it to the selected folder."));
 
-	mPlayOnStartup = new TQButtonGroup(1, Horizontal, i18n("Play Behavior on Startup"), this);
+	mPlayOnStartup = new TQButtonGroup(1,Qt::Horizontal, i18n("Play Behavior on Startup"), this);
 	mPlayOnStartup->setExclusive(true);
 	mPlayOnStartup->insert(
 			new TQRadioButton(i18n("Restore &play state"), mPlayOnStartup),
@@ -83,29 +83,29 @@ General::General(TQObject *parent)
 			NoatunApp::DontPlay
 		);
 
-	if (TQButton* b = mPlayOnStartup->find(napp->startupPlayMode()))
+	if (TQButton* b = mPlayOnStartup->tqfind(napp->startupPlayMode()))
 	{
 		b->toggle();
 	}
 
-	TQGridLayout *layout = new TQGridLayout(this, 0, KDialog::spacingHint());
-	layout->setSpacing(KDialog::spacingHint());
+	TQGridLayout *tqlayout = new TQGridLayout(this, 0, KDialog::spacingHint());
+	tqlayout->setSpacing(KDialog::spacingHint());
 
-	layout->addMultiCellWidget(mLoopList, 0, 0, 0, 1);
-	layout->addMultiCellWidget(mOneInstance, 2, 2, 0, 1);
-	layout->addMultiCellWidget(mClearOnOpen, 4, 4, 0, 1);
-	layout->addMultiCellWidget(mFastVolume, 5, 5, 0, 1);
-	layout->addMultiCellWidget(mRemaining, 6, 6, 0, 1);
+	tqlayout->addMultiCellWidget(mLoopList, 0, 0, 0, 1);
+	tqlayout->addMultiCellWidget(mOneInstance, 2, 2, 0, 1);
+	tqlayout->addMultiCellWidget(mClearOnOpen, 4, 4, 0, 1);
+	tqlayout->addMultiCellWidget(mFastVolume, 5, 5, 0, 1);
+	tqlayout->addMultiCellWidget(mRemaining, 6, 6, 0, 1);
 
-	layout->addWidget(titleLabel, 7, 0);
-	layout->addWidget(mTitleFormat, 7, 1);
+	tqlayout->addWidget(titleLabel, 7, 0);
+	tqlayout->addWidget(mTitleFormat, 7, 1);
 
-	layout->addWidget(dlsaver, 8, 0);
-	layout->addWidget(mDlSaver, 8, 1);
+	tqlayout->addWidget(dlsaver, 8, 0);
+	tqlayout->addWidget(mDlSaver, 8, 1);
 
-	layout->addMultiCellWidget(mPlayOnStartup, 9, 9, 0, 1);
+	tqlayout->addMultiCellWidget(mPlayOnStartup, 9, 9, 0, 1);
 
-	layout->setRowStretch(10, 1);
+	tqlayout->setRowStretch(10, 1);
 }