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

List:       kde-commits
Subject:    KDE/kdemultimedia/kmix
From:       David Faure <faure () kde ! org>
Date:       2011-06-16 21:15:32
Message-ID: 20110616211532.212DFAC7CA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1237049 by dfaure:

Compile with KDE_NO_DEPRECATED


 M  +1 -1      CMakeLists.txt  
 M  +1 -1      core/volume.cpp  
 M  +2 -2      core/volume.h  


--- trunk/KDE/kdemultimedia/kmix/CMakeLists.txt #1237048:1237049
@@ -71,7 +71,7 @@
 
 kde4_add_kdeinit_executable( kmix ${kmix_KDEINIT_SRCS})
 
-target_link_libraries(kdeinit_kmix ${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBS} \
${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY}) \
+target_link_libraries(kdeinit_kmix ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS} \
${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY})  
 if (HAVE_LIBASOUND2)
     target_link_libraries(kdeinit_kmix ${ASOUND_LIBRARY})
--- trunk/KDE/kdemultimedia/kmix/core/volume.cpp #1237048:1237049
@@ -265,7 +265,7 @@
     return os;
 }
 
-kdbgstream& operator<<(kdbgstream &os, const Volume& vol) {
+QDebug operator<<(QDebug os, const Volume& vol) {
     os << "(";
     for ( int i=0; i<= Volume::CHIDMAX; i++ ) {
 	if ( i != 0 ) {
--- trunk/KDE/kdemultimedia/kmix/core/volume.h #1237048:1237049
@@ -116,7 +116,7 @@
    Volume::SwitchType switchType() { return _switchType; }
 
     friend std::ostream& operator<<(std::ostream& os, const Volume& vol);
-    friend kdbgstream& operator<<(kdbgstream& os, const Volume& vol);
+    friend QDebug operator<<(QDebug os, const Volume& vol);
 
     // _channelMaskEnum[] and the following elements moved to public seection. \
                operator<<() could not
     // access it, when private. Strange, as operator<<() is declared friend.
@@ -147,7 +147,7 @@
 };
 
 std::ostream& operator<<(std::ostream& os, const Volume& vol);
-kdbgstream& operator<<(kdbgstream &os, const Volume& vol);
+QDebug operator<<(QDebug os, const Volume& vol);
 
 #endif // VOLUME
 


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