[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia/kmix
From:       Christian Esken <esken () kde ! org>
Date:       2011-07-21 23:14:51
Message-ID: 20110721231451.353EBAC87D () svn ! kde ! org
[Download RAW message or body]

SVN commit 1242588 by esken:

Cleanups

 M  +6 -10     apps/kmix.cpp  
 M  +0 -19     gui/mdwslider.cpp  


--- trunk/KDE/kdemultimedia/kmix/apps/kmix.cpp #1242587:1242588
@@ -621,7 +621,7 @@
             m_wsMixers->setCurrentIndex(current_tab);
         }
         bool dockingSucceded = updateDocking();
-        if ( !dockingSucceded && Mixer::mixers().count() > 0 )
+        if ( !dockingSucceded && !Mixer::mixers().empty() )
         {
             show(); // avoid invisible and unaccessible main window
         }
@@ -636,24 +636,20 @@
 
 KMixerWidget* KMixWindow::findKMWforTab( const QString& kmwId )
 {
-    KMixerWidget* kmw = 0;
     for (int i=0; i< m_wsMixers->count(); ++i)
     {
-        KMixerWidget* kmwTmp = (KMixerWidget*)m_wsMixers->widget(i);
-        if ( kmwTmp->getGuiprof()->getId() == kmwId ) {
-            kmw = kmwTmp;
-            break;
+        KMixerWidget* kmw = (KMixerWidget*)m_wsMixers->widget(i);
+        if ( kmw->getGuiprof()->getId() == kmwId ) {
+            return kmw;
         }
     }
-    return kmw;
+    return 0;
 }
 
 
 void KMixWindow::newView()
 {
-    kDebug() << "Enter";
-
-    if ( Mixer::mixers().count()  < 1 ) {
+    if ( Mixer::mixers().empty() ) {
         kError() << "Trying to create a View, but no Mixer exists";
         return; // should never happen
     }
--- trunk/KDE/kdemultimedia/kmix/gui/mdwslider.cpp #1242587:1242588
@@ -651,25 +651,6 @@
 void
 MDWSlider::setStereoLinkedInternal(QList<QWidget *>& ref_sliders, QList<QWidget *>& ref_labels)
 {
-// 	QWidget *slider = ref_sliders[0];
-// 
-// 	/***********************************************************
-// 	   Remember value of first slider, so that it can be copied
-// 	   to the other sliders.
-// 	***********************************************************/
-// 	int firstSliderValue = 0;
-// 	bool firstSliderValueValid = false;
-// 	if ( ::qobject_cast<QSlider*>(slider) ) {
-// 		QSlider *sld = static_cast<QSlider*>(slider);
-// 		firstSliderValue = sld->value();
-// 		firstSliderValueValid = true;
-// 	}
-// 	else if ( ::qobject_cast<KSmallSlider*>(slider) )  {
-// 		KSmallSlider *sld = static_cast<KSmallSlider*>(slider);
-// 		firstSliderValue = sld->value();
-// 		firstSliderValueValid = true;
-// 	}
-
 	bool first = true;
 	foreach ( QWidget* slider1, ref_sliders )
 	{
[prev in list] [next in list] [prev in thread] [next in thread]