Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 9cc3e244ea
commit 267706e127

@ -112,9 +112,9 @@ K3bSetup2::K3bSetup2( TQWidget *parent, const char *, const TQStringList& )
d = new Private();
d->config = new KConfig( "k3bsetup2rc" );
m_aboutData = new KAboutData("k3bsetup2",
m_aboutData = new TDEAboutData("k3bsetup2",
"K3bSetup 2",
0, 0, KAboutData::License_GPL,
0, 0, TDEAboutData::License_GPL,
"(C) 2003-2007 Sebastian Trueg");
m_aboutData->addAuthor("Sebastian Trueg", 0, "trueg@k3b.org");

@ -35,7 +35,7 @@ class K3bSetup2: public KCModule
~K3bSetup2();
TQString quickHelp() const;
const KAboutData* aboutData() { return m_aboutData; };
const TDEAboutData* aboutData() { return m_aboutData; };
void load();
void save();
@ -60,7 +60,7 @@ class K3bSetup2: public KCModule
base_K3bSetup2* w;
KAboutData* m_aboutData;
TDEAboutData* m_aboutData;
};
#endif

@ -42,7 +42,7 @@ extern "C"
{
LIBK3B_EXPORT int kdemain( int argc, char **argv )
{
KInstance instance( "kio_videodvd" );
TDEInstance instance( "kio_videodvd" );
kdDebug(7101) << "*** Starting kio_videodvd " << endl;

@ -31,7 +31,7 @@
class K3bExternalBinManager;
class K3bVersion;
class KConfig;
class KAboutData;
class TDEAboutData;
class K3bJob;
class K3bBurnJob;
class K3bGlobalSettings;

@ -17,7 +17,7 @@
template <class T>
KInstance* K3bPluginFactory<T>::s_instance = 0;
TDEInstance* K3bPluginFactory<T>::s_instance = 0;
template <class T>
@ -25,9 +25,9 @@ K3bPluginFactory<T>* K3bPluginFactory<T>::s_self = 0;
template <class T>
KInstance* K3bPluginFactory<T>::instance()
TDEInstance* K3bPluginFactory<T>::instance()
{
if( !s_instance && s_self )
s_instance = new KInstance( s_self->m_instanceName );
s_instance = new TDEInstance( s_self->m_instanceName );
return s_instance;
}

@ -49,7 +49,7 @@ class K3bPluginFactory : public KLibFactory
s_self = 0;
}
static KInstance* instance();
static TDEInstance* instance();
protected:
virtual void setupTranslations( void ) {
@ -74,13 +74,13 @@ class K3bPluginFactory : public KLibFactory
TQCString m_instanceName;
bool m_catalogueInitialized;
static KInstance* s_instance;
static TDEInstance* s_instance;
static K3bPluginFactory<T> *s_self;
};
template <class T>
KInstance* K3bPluginFactory<T>::s_instance = 0;
TDEInstance* K3bPluginFactory<T>::s_instance = 0;
template <class T>
@ -88,10 +88,10 @@ K3bPluginFactory<T>* K3bPluginFactory<T>::s_self = 0;
template <class T>
KInstance* K3bPluginFactory<T>::instance()
TDEInstance* K3bPluginFactory<T>::instance()
{
if( !s_instance && s_self )
s_instance = new KInstance( s_self->m_instanceName );
s_instance = new TDEInstance( s_self->m_instanceName );
return s_instance;
}

@ -27,7 +27,7 @@ class K3bDebug;
typedef K3bDebug& (*K3BDBGFUNC)( K3bDebug& );
/**
* K3bDebug as compared to KDebug does not need anything. No KInstance or whatever
* K3bDebug as compared to KDebug does not need anything. No TDEInstance or whatever
* and does not use anything except fprintf.
* Thus, K3bDebug is fully thread-safe and safe in general
*/

@ -76,8 +76,8 @@ static KCmdLineOptions options[] =
int main( int argc, char* argv[] )
{
KAboutData aboutData( "k3b", "K3b",
LIBK3B_VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "k3b", "K3b",
LIBK3B_VERSION, description, TDEAboutData::License_GPL,
"(c) 1999 - 2007, Sebastian Trüg", 0, "http://www.k3b.org" );
aboutData.addAuthor("Sebastian Trüg",I18N_NOOP("Maintainer and Lead Developer"), "trueg@k3b.org");
aboutData.addAuthor("Christian Kvasny",I18N_NOOP("VideoCD Project and VideoCD ripping"), "chris@k3b.org");

Loading…
Cancel
Save