Browse Source

Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 9 years ago
parent
commit
bc9607c30f
  1. 2
      amarok/src/actionclasses.cpp
  2. 4
      amarok/src/app.cpp
  3. 4
      amarok/src/collectionscanner/main.cpp
  4. 2
      amarok/src/engine/xine/xine-engine.cpp
  5. 4
      amarok/src/konquisidebar/universalamarok.cpp
  6. 2
      amarok/src/konquisidebar/universalamarok.h
  7. 2
      amarok/src/loader/loader.cpp
  8. 2
      amarok/src/main.cpp
  9. 4
      amarok/src/scripts/graphequalizer/main.cpp

2
amarok/src/actionclasses.cpp

@ -30,7 +30,7 @@
#include <ktoolbarbutton.h>
#include <kurl.h>
extern KAboutData aboutData;
extern TDEAboutData aboutData;
namespace Amarok
{

4
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" ) );

4
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" ) );

2
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;

4
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);

2
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();

2
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")));

2
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[] )
{

4
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;

Loading…
Cancel
Save