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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/analyzers
From:       Laurent Montel <montel () kde ! org>
Date:       2007-02-08 16:03:43
Message-ID: 1170950623.711167.29153.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 631623 by mlaurent:

Port++


 M  +1 -1      analyzerfactory.cpp  
 M  +3 -2      baranalyzer.cpp  
 M  +3 -3      blockanalyzer.cpp  


--- trunk/extragear/multimedia/amarok/src/analyzers/analyzerfactory.cpp #631622:631623
@@ -17,7 +17,7 @@
 
 #include <config.h> //for HAVE_QGLWIDGET macro
 
-#include "amarokcore/amarokconfig.h"
+#include "amarokconfig.h"
 #include "analyzerbase.h" //declaration here
 
 #include "baranalyzer.h"
--- trunk/extragear/multimedia/amarok/src/analyzers/baranalyzer.cpp #631622:631623
@@ -149,11 +149,12 @@
         for ( uint c = 0; c < m_roofMem[i].size(); ++c )
             //bitBlt( m_pComposePixmap, x, m_roofMem[i]->at( c ), m_roofPixmaps[ c ] );
             bitBlt( canvas(), x, m_roofMem[i][c], &m_pixRoof[ NUM_ROOFS - 1 - c ] );
-
+//TODO port it to kde4
+#if 0
         //blt the bar
         bitBlt( canvas(), x, height() - y2,
                 gradient(), y2 * COLUMN_WIDTH, height() - y2, COLUMN_WIDTH, y2, Qt::CopyROP );
-
+#endif
         m_roofMem[i].push_back( height() - roofVector[i] - 2 );
 
         //set roof parameters for the NEXT draw
--- trunk/extragear/multimedia/amarok/src/analyzers/blockanalyzer.cpp #631622:631623
@@ -24,11 +24,11 @@
 //Added by qt3to4:
 #include <QContextMenuEvent>
 #include <QResizeEvent>
+#include <Q3PopupMenu>
 
-
 static inline uint myMax( uint v1, uint v2 ) { return v1 > v2 ? v1 : v2; }
 
-namespace Amarok { extern KConfig *config( const QString& ); }
+namespace Amarok { extern  KSharedConfig::Ptr config( const QString& ); }
 
 
 BlockAnalyzer::BlockAnalyzer( QWidget *parent )
@@ -424,7 +424,7 @@
 
     const uint ids[] = { 50, 33, 25, 20, 10 };
 
-    KMenu menu;
+    Q3PopupMenu menu;
     menu.insertTitle( i18n( "Framerate" ) );
 
     for( uint x = 0; x < 5; ++x )
[prev in list] [next in list] [prev in thread] [next in thread]