diff options
| -rw-r--r-- | amarok/src/actionclasses.cpp | 2 | ||||
| -rw-r--r-- | amarok/src/app.cpp | 4 | ||||
| -rw-r--r-- | amarok/src/collectionscanner/main.cpp | 4 | ||||
| -rw-r--r-- | amarok/src/engine/xine/xine-engine.cpp | 2 | ||||
| -rw-r--r-- | amarok/src/konquisidebar/universalamarok.cpp | 4 | ||||
| -rw-r--r-- | amarok/src/konquisidebar/universalamarok.h | 2 | ||||
| -rw-r--r-- | amarok/src/loader/loader.cpp | 2 | ||||
| -rw-r--r-- | amarok/src/main.cpp | 2 | ||||
| -rw-r--r-- | amarok/src/scripts/graphequalizer/main.cpp | 4 |
9 files changed, 13 insertions, 13 deletions
diff --git a/amarok/src/actionclasses.cpp b/amarok/src/actionclasses.cpp index 09b1a8d0..8b427c16 100644 --- a/amarok/src/actionclasses.cpp +++ b/amarok/src/actionclasses.cpp @@ -30,7 +30,7 @@ #include <ktoolbarbutton.h> #include <kurl.h> -extern KAboutData aboutData; +extern TDEAboutData aboutData; namespace Amarok { diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp index af239ca8..6e0a4d84 100644 --- a/amarok/src/app.cpp +++ b/amarok/src/app.cpp @@ -117,9 +117,9 @@ appleEventProcessor(const AppleEvent *ae, AppleEvent *, long /*handlerRefCon*/) } #endif -LIBAMAROK_EXPORT KAboutData aboutData( "amarok", +LIBAMAROK_EXPORT TDEAboutData aboutData( "amarok", I18N_NOOP( "Amarok" ), APP_VERSION, - I18N_NOOP( "The audio player for TDE" ), KAboutData::License_GPL, + I18N_NOOP( "The audio player for TDE" ), TDEAboutData::License_GPL, I18N_NOOP( "(C) 2002-2003, Mark Kretschmann\n(C) 2003-2007, The Amarok Development Squad\n(C) 2007-2011, The Trinity Desktop Project" ), I18N_NOOP( "IRC:\nirc.freenode.net - #amarok, #amarok.de, #amarok.es\n\nFeedback:\namarok@kde.org\n\n(Build Date: " __DATE__ ")" ), ( "http://amarok.kde.org" ) ); diff --git a/amarok/src/collectionscanner/main.cpp b/amarok/src/collectionscanner/main.cpp index dd15d9d0..8cb883eb 100644 --- a/amarok/src/collectionscanner/main.cpp +++ b/amarok/src/collectionscanner/main.cpp @@ -29,9 +29,9 @@ int main( int argc, char *argv[] ) { - const KAboutData about( "amarokcollectionscanner", + const TDEAboutData about( "amarokcollectionscanner", I18N_NOOP( "Amarok Collection Scanner\n\nNote: For debugging purposes this application can be invoked from the command line, but it will not actually build a collection this way." ), "0.1", - I18N_NOOP( "Collection Scanner for Amarok" ), KAboutData::License_GPL, + I18N_NOOP( "Collection Scanner for Amarok" ), TDEAboutData::License_GPL, I18N_NOOP( "(C) 2003-2006, The Amarok Developers" ), I18N_NOOP( "IRC:\nserver: irc.freenode.net / channels: #amarok #amarok.de #amarok.es\n\nFeedback:\namarok@kde.org" ), I18N_NOOP( "http://amarok.kde.org" ) ); diff --git a/amarok/src/engine/xine/xine-engine.cpp b/amarok/src/engine/xine/xine-engine.cpp index eebec189..ace6bef0 100644 --- a/amarok/src/engine/xine/xine-engine.cpp +++ b/amarok/src/engine/xine/xine-engine.cpp @@ -60,7 +60,7 @@ namespace Log static uint noSuitableBuffer = 0; } -///returns the configuration we will use. there is no KInstance, so using this hacked up method. +///returns the configuration we will use. there is no TDEInstance, so using this hacked up method. //static inline TQCString configPath() { return TQFile::encodeName(KStandardDirs().localtdedir() + KStandardDirs::kde_default("data") + "amarok/xine-config"); } static inline TQCString configPath() { return TQFile::encodeName(locate( "data", "amarok/") + "xine-config" ); } static Fader *s_fader = 0; diff --git a/amarok/src/konquisidebar/universalamarok.cpp b/amarok/src/konquisidebar/universalamarok.cpp index c82b4e64..3473388f 100644 --- a/amarok/src/konquisidebar/universalamarok.cpp +++ b/amarok/src/konquisidebar/universalamarok.cpp @@ -76,7 +76,7 @@ bool amarokWidget::eventFilter( TQObject *, TQEvent *e ) return true; } -UniversalAmarok::UniversalAmarok(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): +UniversalAmarok::UniversalAmarok(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) { KGlobal::iconLoader()->addAppDir( "amarok" ); @@ -151,7 +151,7 @@ UniversalAmarok::~UniversalAmarok() extern "C" { - KDE_EXPORT void* create_konqsidebar_universalamarok(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) + KDE_EXPORT void* create_konqsidebar_universalamarok(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { KGlobal::locale()->insertCatalogue( "amarok" ); return new UniversalAmarok(instance,par,widp,desktopname,name); diff --git a/amarok/src/konquisidebar/universalamarok.h b/amarok/src/konquisidebar/universalamarok.h index e071bb0e..327d1e2a 100644 --- a/amarok/src/konquisidebar/universalamarok.h +++ b/amarok/src/konquisidebar/universalamarok.h @@ -60,7 +60,7 @@ class UniversalAmarok : public KonqSidebarPlugin Q_OBJECT public: - UniversalAmarok(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); + UniversalAmarok(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); ~UniversalAmarok(); 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"))); diff --git a/amarok/src/main.cpp b/amarok/src/main.cpp index 6df169a6..99dee9b3 100644 --- a/amarok/src/main.cpp +++ b/amarok/src/main.cpp @@ -24,7 +24,7 @@ //#define AMAROK_USE_DRKONQI -extern class KAboutData aboutData; //defined in amarokcore/app.cpp +extern class TDEAboutData aboutData; //defined in amarokcore/app.cpp int main( int argc, char *argv[] ) { diff --git a/amarok/src/scripts/graphequalizer/main.cpp b/amarok/src/scripts/graphequalizer/main.cpp index 29ed4906..b532e68a 100644 --- a/amarok/src/scripts/graphequalizer/main.cpp +++ b/amarok/src/scripts/graphequalizer/main.cpp @@ -27,8 +27,8 @@ static const char version[] = "0.5"; int main(int argc, char **argv) { - KAboutData about("Graph Equalizer", I18N_NOOP("Graph Equalizer"), version, description, - KAboutData::License_GPL, "(C) 2005 Ian Monroe", 0, 0, "ian@monroe.nu"); + TDEAboutData about("Graph Equalizer", I18N_NOOP("Graph Equalizer"), version, description, + TDEAboutData::License_GPL, "(C) 2005 Ian Monroe", 0, 0, "ian@monroe.nu"); about.addAuthor( "Ian Monroe", 0, "ian@monroe.nu" ); TDECmdLineArgs::init( argc, argv, &about ); TDEApplication app; |