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

List:       kde-commits
Subject:    KDE/kdemultimedia/kmix
From:       Pino Toscano <toscano.pino () tiscali ! it>
Date:       2007-04-05 17:20:31
Message-ID: 1175793631.536433.13090.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 650881 by pino:

less qt3/kde3 support, and less libraries when linking


 M  +3 -3      CMakeLists.txt  
 M  +3 -3      kmixerwidget.cpp  
 M  +2 -2      viewdockareapopup.cpp  


--- trunk/KDE/kdemultimedia/kmix/CMakeLists.txt #650880:650881
@@ -49,7 +49,7 @@
 
 kde4_add_kdeinit_executable( kmix ${kmix_KDEINIT_SRCS})
 
-target_link_libraries(kdeinit_kmix  ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTXML_LIBRARY} \
${KDE4_KUTILS_LIBS} ${KDE4_PHONONCORE_LIBS} ${KDE4_SOLID_LIBS} ) \
+target_link_libraries(kdeinit_kmix  ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} \
${KDE4_KUTILS_LIBS} ${KDE4_PHONONCORE_LIBS} ${KDE4_SOLID_LIBS} \
${QT_QT3SUPPORT_LIBRARY} )  
 if (HAVE_LIBASOUND2)
     target_link_libraries(kdeinit_kmix ${ASOUND_LIBRARY})
@@ -77,7 +77,7 @@
 
 kde4_add_kdeinit_executable( kmixctrl ${kmixctrl_KDEINIT_SRCS})
 
-target_link_libraries(kdeinit_kmixctrl  ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTXML_LIBRARY} \
${KDE4_SOLID_LIBS}) +target_link_libraries(kdeinit_kmixctrl  ${KDE4_KDEUI_LIBS} \
${QT_QTXML_LIBRARY} ${KDE4_SOLID_LIBS} ${QT_QT3SUPPORT_LIBRARY})  
 if (HAVE_LIBASOUND2)
     target_link_libraries(kdeinit_kmixctrl ${ASOUND_LIBRARY})
@@ -99,7 +99,7 @@
 
 kde4_add_kdeinit_executable( kmixd ${kmixd_KMIXD_SRCS})
 
-target_link_libraries(kdeinit_kmixd  ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTXML_LIBRARY} \
${KDE4_SOLID_LIBS}) +target_link_libraries(kdeinit_kmixd  ${KDE4_KDEUI_LIBS} \
${QT_QTXML_LIBRARY} ${KDE4_SOLID_LIBS} ${QT_QT3SUPPORT_LIBRARY})  
 if (HAVE_LIBASOUND2)
     target_link_libraries(kdeinit_kmixd ${ASOUND_LIBRARY} ${KDE4_SOLID_LIBS})
--- trunk/KDE/kdemultimedia/kmix/kmixerwidget.cpp #650880:650881
@@ -33,7 +33,7 @@
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kiconloader.h>
+#include <kicon.h>
 #include <klocale.h>
 #include <ktabwidget.h>
 
@@ -118,7 +118,7 @@
 
    QToolButton* m_profileButton = new QToolButton( m_ioTab );
    m_profileButton->setToolTip(i18n("Click for selecting the next profile.\nClick \
                and hold for profile menu."));
-   m_profileButton->setIconSet( SmallIcon( "tab-new" ) );
+   m_profileButton->setIcon( KIcon( "tab-new" ) );
    m_profileButton->adjustSize();
    // !!! m_profileButton->setPopup( m_tabbarSessionsCommands );
    connect(m_profileButton, SIGNAL(clicked()), SLOT(nextLayout()));
@@ -126,7 +126,7 @@
 
    QToolButton* m_closeButton = new QToolButton( m_ioTab );
    m_closeButton->setToolTip(i18n("Close Tab"));
-   m_closeButton->setIconSet( SmallIcon( "tab-remove" ) );
+   m_closeButton->setIcon( KIcon( "tab-remove" ) );
    m_closeButton->adjustSize();
    connect(m_closeButton, SIGNAL(clicked()), SLOT(removeSession()));
    m_ioTab->setCornerWidget( m_closeButton, Qt::TopRightCorner );
--- trunk/KDE/kdemultimedia/kmix/viewdockareapopup.cpp #650880:650881
@@ -75,7 +75,7 @@
        Why it does not work, I do not know: this->isPopup() returns "true", so Qt \
should  properly take care of it in QWidget.
     */
-    if ( ! this->hasMouse() ) {
+    if ( !testAttribute(Qt::WA_UnderMouse) ) {
         _hideTimer->start();
         hide(); // needed!
     }
@@ -145,7 +145,7 @@
 	 _showPanelBox = new QPushButton( i18n("Mixer"), _frame );
          _showPanelBox->setObjectName("MixerPanel");
 	 connect ( _showPanelBox, SIGNAL( clicked() ), SLOT( showPanelSlot() ) );
-    _layoutMDW->addMultiCellWidget( _showPanelBox, 1, 1, 0, 2 );
+    _layoutMDW->addWidget( _showPanelBox, 1, 0, 1, 3 );
 
     return _mdw;
 }


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