From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 19 Jan 2011 01:42:14 +0000 Subject: Enable compilation with TQt for Qt4 3.4.0 TP2 This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcontrol/knotify/knotify.cpp | 2 +- kcontrol/knotify/playersettings.ui | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'kcontrol/knotify') diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp index edfa28e48..f229e7f24 100644 --- a/kcontrol/knotify/knotify.cpp +++ b/kcontrol/knotify/knotify.cpp @@ -298,7 +298,7 @@ void PlayerSettingsDialog::slotApply() save(); dataChanged = false; enableButton(Apply, false); - kapp->dcopClient()->send("knotify", "", "reconfigure()", ""); + kapp->dcopClient()->send("knotify", "", "reconfigure()", TQString("")); KDialogBase::slotApply(); } diff --git a/kcontrol/knotify/playersettings.ui b/kcontrol/knotify/playersettings.ui index f990fc995..9eaad64af 100644 --- a/kcontrol/knotify/playersettings.ui +++ b/kcontrol/knotify/playersettings.ui @@ -1,6 +1,6 @@ PlayerSettingsUI - + PlayerSettingsUI @@ -19,7 +19,7 @@ 0 - + textLabel1 @@ -41,7 +41,7 @@ Horizontal - + grpPlayers @@ -58,7 +58,7 @@ 0 - + cbNone @@ -66,7 +66,7 @@ &No audio output - + cbExternal @@ -84,14 +84,14 @@ Fixed - + 20 20 - + layout5 @@ -109,14 +109,14 @@ Expanding - + 20 20 - + layout4 @@ -140,14 +140,14 @@ Expanding - + 233 20 - + textLabel3 @@ -155,7 +155,7 @@ 100% - + textLabel2 @@ -163,7 +163,7 @@ 0% - + volumeSlider @@ -182,7 +182,7 @@ - + textLabel4 @@ -205,14 +205,14 @@ Fixed - + 20 20 - + cbArts @@ -223,7 +223,7 @@ true - + textLabel5 @@ -265,7 +265,7 @@ Expanding - + 20 16 -- cgit v1.2.1