summaryrefslogtreecommitdiffstats
path: root/amarok/src/loader
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:50:32 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:50:32 -0600
commitbc9607c30f2a4c4f2d38de48551eda2e302f51d7 (patch)
treefa5f3daab2cf062be1f4c64cef67da03bfc4eea1 /amarok/src/loader
parentda4ca3f989f10e5db2b5e8ecc434e9675f5598dd (diff)
downloadamarok-bc9607c30f2a4c4f2d38de48551eda2e302f51d7.tar.gz
amarok-bc9607c30f2a4c4f2d38de48551eda2e302f51d7.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'amarok/src/loader')
-rw-r--r--amarok/src/loader/loader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/amarok/src/loader/loader.cpp b/amarok/src/loader/loader.cpp
index e0e248c9..d8d20864 100644
--- a/amarok/src/loader/loader.cpp
+++ b/amarok/src/loader/loader.cpp
@@ -144,7 +144,7 @@ Loader::Loader( TQStringList args )
if( !TQApplication::isSessionRestored())
{
- KInstance instance("amarok"); // KGlobal::dirs() crashes without
+ TDEInstance instance("amarok"); // KGlobal::dirs() crashes without
if( isSplashEnabled() )
{
m_splash = new KSplashScreen( TQPixmap( KStandardDirs().findResource("data", "amarok/images/splash_screen.jpg")));