diff options
-rw-r--r-- | amarok/src/amarok.h | 2 | ||||
-rw-r--r-- | amarok/src/amarokcore/crashhandler.cpp | 2 | ||||
-rw-r--r-- | amarok/src/collectionbrowser.cpp | 6 | ||||
-rw-r--r-- | amarok/src/magnatunebrowser/magnatunelistview.cpp | 2 | ||||
-rw-r--r-- | amarok/src/playlist.cpp | 2 | ||||
-rw-r--r-- | amarok/src/playlistbrowseritem.cpp | 8 | ||||
-rw-r--r-- | amarok/src/statistics.cpp | 6 |
7 files changed, 14 insertions, 14 deletions
diff --git a/amarok/src/amarok.h b/amarok/src/amarok.h index af7c37ee..a349e12c 100644 --- a/amarok/src/amarok.h +++ b/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 KDE_VERSION < KDE_MAKE_VERSION(3,5,0) +#if TDE_VERSION < KDE_MAKE_VERSION(3,5,0) return url; #else return KIO::NetAccess::mostLocalURL( url, mainWindow() ); diff --git a/amarok/src/amarokcore/crashhandler.cpp b/amarok/src/amarokcore/crashhandler.cpp index 122c080e..72bcb699 100644 --- a/amarok/src/amarokcore/crashhandler.cpp +++ b/amarok/src/amarokcore/crashhandler.cpp @@ -99,7 +99,7 @@ namespace Amarok "Engine: %1\n" "Build date: " __DATE__ "\n" "CC version: " __VERSION__ "\n" //assuming we're using GCC - "KDElibs: " KDE_VERSION_STRING "\n" + "KDElibs: " TDE_VERSION_STRING "\n" "TQt: %2\n" "TagLib: %3.%4.%5\n" "CPU count: %6\n"; diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp index b2721e40..5ff26a78 100644 --- a/amarok/src/collectionbrowser.cpp +++ b/amarok/src/collectionbrowser.cpp @@ -70,7 +70,7 @@ extern "C" { - #if KDE_VERSION < KDE_MAKE_VERSION(3,3,91) + #if TDE_VERSION < KDE_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 KDE_VERSION >= KDE_MAKE_VERSION(3,4,0) + #if TDE_VERSION >= KDE_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 KDE_VERSION >= KDE_MAKE_VERSION(3,4,0) + #if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0) setShadeSortColumn( true ); #endif m_parent->ipodToolbar( false ); diff --git a/amarok/src/magnatunebrowser/magnatunelistview.cpp b/amarok/src/magnatunebrowser/magnatunelistview.cpp index 3ea8a167..f227c3ff 100644 --- a/amarok/src/magnatunebrowser/magnatunelistview.cpp +++ b/amarok/src/magnatunebrowser/magnatunelistview.cpp @@ -39,7 +39,7 @@ MagnatuneListView::MagnatuneListView( TQWidget * parent ) setShowSortIndicator ( true ); - #if KDE_VERSION >= KDE_MAKE_VERSION(3,4,0) + #if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0) setShadeSortColumn( false ); #endif diff --git a/amarok/src/playlist.cpp b/amarok/src/playlist.cpp index 4e2b0070..42b6bd4a 100644 --- a/amarok/src/playlist.cpp +++ b/amarok/src/playlist.cpp @@ -86,7 +86,7 @@ extern "C" { - #if KDE_VERSION < KDE_MAKE_VERSION(3,3,91) + #if TDE_VERSION < KDE_MAKE_VERSION(3,3,91) #include <X11/Xlib.h> //ControlMask in contentsDragMoveEvent() #endif } diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp index c64644c0..bba616fb 100644 --- a/amarok/src/playlistbrowseritem.cpp +++ b/amarok/src/playlistbrowseritem.cpp @@ -38,7 +38,7 @@ #include <tqregexp.h> #include <kapplication.h> //Used for Shoutcast random name generation -#include <kdeversion.h> //KDE_VERSION ifndefs. Remove this once we reach a kde 4 dep +#include <kdeversion.h> //TDE_VERSION ifndefs. Remove this once we reach a kde 4 dep #include <kiconloader.h> //smallIcon #include <kio/jobclasses.h> //podcast retrieval #include <kio/job.h> //podcast retrieval @@ -978,7 +978,7 @@ void PlaylistEntry::paintCell( TQPainter *p, const TQColorGroup &cg, int column, TQPainter pBuf( &buffer, true ); // use alternate background -#if KDE_VERSION < KDE_MAKE_VERSION(3,3,91) +#if TDE_VERSION < KDE_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 KDE_VERSION < KDE_MAKE_VERSION(3,3,91) +#if TDE_VERSION < KDE_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 KDE_VERSION < KDE_MAKE_VERSION(3,3,91) +#if TDE_VERSION < KDE_MAKE_VERSION(3,3,91) pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor() ); #else pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor(0) ); diff --git a/amarok/src/statistics.cpp b/amarok/src/statistics.cpp index f8b1b6c7..7a7f1e82 100644 --- a/amarok/src/statistics.cpp +++ b/amarok/src/statistics.cpp @@ -21,7 +21,7 @@ #include "tagdialog.h" //showContextMenu() #include <kapplication.h> -#include <kdeversion.h> //KDE_VERSION ifndefs. Remove this once we reach a kde 4 dep +#include <kdeversion.h> //TDE_VERSION ifndefs. Remove this once we reach a kde 4 dep #include <kiconloader.h> #include <klocale.h> #include <kmultipledrag.h> //startDrag() @@ -764,7 +764,7 @@ StatisticsItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int } else //alternate colours { - #if KDE_VERSION < KDE_MAKE_VERSION(3,3,91) + #if TDE_VERSION < KDE_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 KDE_VERSION < KDE_MAKE_VERSION(3,3,91) +#if TDE_VERSION < KDE_MAKE_VERSION(3,3,91) pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor() ); #else pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor(0) ); |