Rename KDE_MAKE_VERSION and update TDE version string

amarok/src/amarok.h

@@ -152,7 +152,7 @@ namespace Amarok
     /** Transform url into a file url if possible */
     inline KURL mostLocalURL( const KURL &url )
     {
-#if TDE_VERSION < KDE_MAKE_VERSION(3,5,0)
+#if TDE_VERSION < TDE_MAKE_VERSION(3,5,0)
         return url;
 #else
         return KIO::NetAccess::mostLocalURL( url, mainWindow() );

amarok/src/collectionbrowser.cpp

@@ -70,7 +70,7 @@
 
 extern "C"
 {
-    #if TDE_VERSION < KDE_MAKE_VERSION(3,3,91)
+    #if TDE_VERSION < TDE_MAKE_VERSION(3,3,91)
     #include <X11/Xlib.h>    //ControlMask in contentsDragMoveEvent()
     #endif
 }
@@ -1576,7 +1576,7 @@ CollectionView::setViewMode( int mode, bool rerender /*=true*/ )
 
     if( m_viewMode == modeIpodView )
     {
-        #if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0)
+        #if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
         setShadeSortColumn( false );
         #endif
         m_parent->m_ipodDecrement->setEnabled( m_currentDepth > 0 );
@@ -1584,7 +1584,7 @@ CollectionView::setViewMode( int mode, bool rerender /*=true*/ )
     }
     else
     {
-        #if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0)
+        #if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
         setShadeSortColumn( true );
         #endif
         m_parent->ipodToolbar( false );

amarok/src/magnatunebrowser/magnatunelistview.cpp

@@ -39,7 +39,7 @@ MagnatuneListView::MagnatuneListView( TQWidget * parent )
 
     setShowSortIndicator ( true );
 
-    #if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0)
+    #if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
     setShadeSortColumn( false );
     #endif
 

amarok/src/playlist.cpp

@@ -86,7 +86,7 @@
 
 extern "C"
 {
-    #if TDE_VERSION < KDE_MAKE_VERSION(3,3,91)
+    #if TDE_VERSION < TDE_MAKE_VERSION(3,3,91)
     #include <X11/Xlib.h>    //ControlMask in contentsDragMoveEvent()
     #endif
 }

amarok/src/playlistbrowseritem.cpp

@@ -978,7 +978,7 @@ void PlaylistEntry::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
 
     TQPainter pBuf( &buffer, true );
     // use alternate background
-#if TDE_VERSION < KDE_MAKE_VERSION(3,3,91)
+#if TDE_VERSION < TDE_MAKE_VERSION(3,3,91)
     pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor() );
 #else
     pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor(0) );
@@ -1247,7 +1247,7 @@ void StreamEntry::paintCell( TQPainter *p, const TQColorGroup &cg, int column, i
 
     TQPainter pBuf( &buffer, true );
     // use alternate background
-#if TDE_VERSION < KDE_MAKE_VERSION(3,3,91)
+#if TDE_VERSION < TDE_MAKE_VERSION(3,3,91)
     pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor() );
 #else
     pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor(0) );
@@ -2743,7 +2743,7 @@ PodcastEpisode::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int
 
     TQPainter pBuf( &buffer, true );
     // use alternate background
-#if TDE_VERSION < KDE_MAKE_VERSION(3,3,91)
+#if TDE_VERSION < TDE_MAKE_VERSION(3,3,91)
     pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor() );
 #else
     pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor(0) );

amarok/src/statistics.cpp

@@ -764,7 +764,7 @@ StatisticsItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int
     }
     else //alternate colours
     {
-    #if TDE_VERSION < KDE_MAKE_VERSION(3,3,91)
+    #if TDE_VERSION < TDE_MAKE_VERSION(3,3,91)
         fillColor = isSelected() ? cg.highlight() : backgroundColor();
     #else
         fillColor = isSelected() ? cg.highlight() : backgroundColor(0);
@@ -887,7 +887,7 @@ StatisticsDetailedItem::paintCell( TQPainter *p, const TQColorGroup &cg, int col
 
     TQPainter pBuf( &buffer, true );
     // use alternate background
-#if TDE_VERSION < KDE_MAKE_VERSION(3,3,91)
+#if TDE_VERSION < TDE_MAKE_VERSION(3,3,91)
     pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor() );
 #else
     pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor(0) );