TDE
/
amarok
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/amarok
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KDE_VERSION to TDE_VERSION

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 0b49a1d6e5
commit fbf4c6db00
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File

2
amarok/src/amarok.h
Unescape View File

@ -152,7 +152,7 @@ namespace Amarok
/** Transform url into a file url if possible */ /** Transform url into a file url if possible */
inline KURL mostLocalURL( const KURL &url ) 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; return url;
#else #else
return KIO::NetAccess::mostLocalURL( url, mainWindow() ); return KIO::NetAccess::mostLocalURL( url, mainWindow() );

2
amarok/src/amarokcore/crashhandler.cpp
Unescape View File

@ -99,7 +99,7 @@ namespace Amarok
"Engine: %1\n" "Engine: %1\n"
"Build date: " __DATE__ "\n" "Build date: " __DATE__ "\n"
"CC version: " __VERSION__ "\n" //assuming we're using GCC "CC version: " __VERSION__ "\n" //assuming we're using GCC
"KDElibs: " KDE_VERSION_STRING "\n" "KDElibs: " TDE_VERSION_STRING "\n"
"TQt: %2\n" "TQt: %2\n"
"TagLib: %3.%4.%5\n" "TagLib: %3.%4.%5\n"
"CPU count: %6\n"; "CPU count: %6\n";

6
amarok/src/collectionbrowser.cpp
Unescape View File

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

2
amarok/src/magnatunebrowser/magnatunelistview.cpp
Unescape View File

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

2
amarok/src/playlist.cpp
Unescape View File

@ -86,7 +86,7 @@
extern "C" 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() #include <X11/Xlib.h> //ControlMask in contentsDragMoveEvent()
#endif #endif
} }

8
amarok/src/playlistbrowseritem.cpp
Unescape View File

@ -38,7 +38,7 @@
#include <tqregexp.h> #include <tqregexp.h>
#include <kapplication.h> //Used for Shoutcast random name generation #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 <kiconloader.h> //smallIcon
#include <kio/jobclasses.h> //podcast retrieval #include <kio/jobclasses.h> //podcast retrieval
#include <kio/job.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 ); TQPainter pBuf( &buffer, true );
// use alternate background // 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() ); pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor() );
#else #else
pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor(0) ); 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 ); TQPainter pBuf( &buffer, true );
// use alternate background // 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() ); pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor() );
#else #else
pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor(0) ); 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 ); TQPainter pBuf( &buffer, true );
// use alternate background // 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() ); pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor() );
#else #else
pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor(0) ); pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor(0) );

6
amarok/src/statistics.cpp
Unescape View File

@ -21,7 +21,7 @@
#include "tagdialog.h" //showContextMenu() #include "tagdialog.h" //showContextMenu()
#include <kapplication.h> #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 <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <kmultipledrag.h> //startDrag() #include <kmultipledrag.h> //startDrag()
@ -764,7 +764,7 @@ StatisticsItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int
} }
else //alternate colours 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(); fillColor = isSelected() ? cg.highlight() : backgroundColor();
#else #else
fillColor = isSelected() ? cg.highlight() : backgroundColor(0); fillColor = isSelected() ? cg.highlight() : backgroundColor(0);
@ -887,7 +887,7 @@ StatisticsDetailedItem::paintCell( TQPainter *p, const TQColorGroup &cg, int col
TQPainter pBuf( &buffer, true ); TQPainter pBuf( &buffer, true );
// use alternate background // 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() ); pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor() );
#else #else
pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor(0) ); pBuf.fillRect( buffer.rect(), isSelected() ? cg.highlight() : backgroundColor(0) );

Write Preview
Loading…
Cancel
Save