From 495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 20:16:47 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcontrol/knotify/knotify.cpp | 6 +++--- kcontrol/knotify/playersettings.ui | 18 +++++++++--------- kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg | Bin 44075 -> 44077 bytes kcontrol/knotify/sounds/KDE_Startup_1.ogg | Bin 124445 -> 124444 bytes kcontrol/knotify/sounds/KDE_Window_Iconify.wav | Bin 26134 -> 26133 bytes 5 files changed, 12 insertions(+), 12 deletions(-) (limited to 'kcontrol/knotify') diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp index edfa28e48..9baa6fdba 100644 --- a/kcontrol/knotify/knotify.cpp +++ b/kcontrol/knotify/knotify.cpp @@ -64,19 +64,19 @@ KCMKNotify::KCMKNotify(TQWidget *parent, const char *name, const TQStringList & "any additional visual or audible alert." "")); - TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Event source:" ), this ); m_appCombo = new KComboBox( false, this, "app combo" ); - TQHBoxLayout *hbox = new TQHBoxLayout( layout ); + TQHBoxLayout *hbox = new TQHBoxLayout( tqlayout ); hbox->addWidget( label ); hbox->addWidget( m_appCombo, 10 ); m_notifyWidget = new KNotifyWidget( this, "knotify widget", true ); connect( m_notifyWidget, TQT_SIGNAL( changed( bool )), TQT_SIGNAL( changed(bool))); - layout->addWidget( m_notifyWidget ); + tqlayout->addWidget( m_notifyWidget ); connect( m_appCombo, TQT_SIGNAL( activated( const TQString& ) ), TQT_SLOT( slotAppActivated( const TQString& )) ); diff --git a/kcontrol/knotify/playersettings.ui b/kcontrol/knotify/playersettings.ui index f990fc995..81e0ff8a0 100644 --- a/kcontrol/knotify/playersettings.ui +++ b/kcontrol/knotify/playersettings.ui @@ -4,7 +4,7 @@ PlayerSettingsUI - + 0 0 @@ -84,7 +84,7 @@ Fixed - + 20 20 @@ -93,7 +93,7 @@ - layout5 + tqlayout5 @@ -109,7 +109,7 @@ Expanding - + 20 20 @@ -118,7 +118,7 @@ - layout4 + tqlayout4 @@ -140,7 +140,7 @@ Expanding - + 233 20 @@ -205,7 +205,7 @@ Fixed - + 20 20 @@ -265,7 +265,7 @@ Expanding - + 20 16 @@ -321,7 +321,7 @@ cbExternal cbNone - + kurlrequester.h klineedit.h diff --git a/kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg b/kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg index daa451531..321b35b8d 100644 Binary files a/kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg and b/kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg differ diff --git a/kcontrol/knotify/sounds/KDE_Startup_1.ogg b/kcontrol/knotify/sounds/KDE_Startup_1.ogg index 2fca9715b..251683347 100644 Binary files a/kcontrol/knotify/sounds/KDE_Startup_1.ogg and b/kcontrol/knotify/sounds/KDE_Startup_1.ogg differ diff --git a/kcontrol/knotify/sounds/KDE_Window_Iconify.wav b/kcontrol/knotify/sounds/KDE_Window_Iconify.wav index 55b4e4598..52bc44bf1 100644 Binary files a/kcontrol/knotify/sounds/KDE_Window_Iconify.wav and b/kcontrol/knotify/sounds/KDE_Window_Iconify.wav differ -- cgit v1.2.1