Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 0ff5f24a74
commit 94fbae4a48

@ -33,9 +33,9 @@ static KCmdLineOptions options[] =
int main(int argc, char** argv)
{
KAboutData about("tdesvnaskpass",I18N_NOOP("tdesvnaskpass"),"0.1",
TDEAboutData about("tdesvnaskpass",I18N_NOOP("tdesvnaskpass"),"0.1",
I18N_NOOP("ssh-askpass for tdesvn"),
KAboutData::License_LGPL,
TDEAboutData::License_LGPL,
I18N_NOOP("Copyright (c) 2005 Rajko Albrecht"));
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions(options);

@ -27,7 +27,7 @@ commandline_part::commandline_part(TQObject *parent, const char *name,TDECmdLine
: TQObject(parent, name)
{
KGlobal::locale()->insertCatalogue("tdesvn");
KInstance * inst = tdesvnPartFactory::instance();
TDEInstance * inst = tdesvnPartFactory::instance();
KGlobal::locale()->insertCatalogue(inst->instanceName());
KGlobal::dirs()->addResourceType( inst->instanceName() + "data",
KStandardDirs::kde_default("data")+ TQString::fromLatin1( inst->instanceName() ) + '/' );

@ -161,7 +161,7 @@ extern "C"
int kdemain(int argc, char **argv)
{
kdDebug()<<"kdemain" << endl;
KInstance instance( "kio_ksvn" );
TDEInstance instance( "kio_ksvn" );
// start the tdesvnd DCOP service
TQString error;
TQCString appId;

@ -47,8 +47,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv)
{
KAboutData about("tdesvn", I18N_NOOP("tdesvn"), version, description,
KAboutData::License_GPL, "(C) 2005-2007 Rajko Albrecht",0,
TDEAboutData about("tdesvn", I18N_NOOP("tdesvn"), version, description,
TDEAboutData::License_GPL, "(C) 2005-2007 Rajko Albrecht",0,
0, "ral@alwins-world.de");
about.addAuthor( "Rajko Albrecht", 0, "ral@alwins-world.de" );
about.setHomepage("http://tdesvn.alwins-world.de/");

@ -154,13 +154,13 @@ void tdesvnPart::slotDispPopup(const TQString&name,TQWidget**target)
*target = hostContainer(name);
}
KAboutData* tdesvnPart::createAboutData()
TDEAboutData* tdesvnPart::createAboutData()
{
m_Extratext = TQString(I18N_NOOP("Built with Subversion library: %1\n")).arg(svn::Version::linked_version());
m_Extratext+=TQString(I18N_NOOP("Running Subversion library: %1")).arg(svn::Version::running_version());
KAboutData*about = new KAboutData("tdesvnpart", I18N_NOOP("tdesvn Part"), version, description,
KAboutData::License_GPL, "(C) 2005-2007 Rajko Albrecht",0,
TDEAboutData*about = new TDEAboutData("tdesvnpart", I18N_NOOP("tdesvn Part"), version, description,
TDEAboutData::License_GPL, "(C) 2005-2007 Rajko Albrecht",0,
0, "ral@alwins-world.de");
about->addAuthor( "Rajko Albrecht", 0, "ral@alwins-world.de" );
about->setOtherText(m_Extratext.ascii());
@ -396,8 +396,8 @@ void tdesvnPart::slotSettingsChanged()
/*
* we may not use generic factory 'cause we make some specials */
KInstance* cFactory::s_instance = 0L;
KAboutData* cFactory::s_about = 0L;
TDEInstance* cFactory::s_instance = 0L;
TDEAboutData* cFactory::s_about = 0L;
commandline_part* cFactory::s_cline = 0L;
KParts::Part* cFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
@ -430,11 +430,11 @@ cFactory::~cFactory()
s_cline = 0L;
}
KInstance* cFactory::instance()
TDEInstance* cFactory::instance()
{
if( !s_instance ) {
s_about = tdesvnPart::createAboutData();
s_instance = new KInstance(s_about);
s_instance = new TDEInstance(s_about);
}
return s_instance;
}

@ -62,7 +62,7 @@ public:
*/
virtual ~tdesvnPart();
virtual bool closeURL();
static KAboutData* createAboutData();
static TDEAboutData* createAboutData();
signals:
void refreshTree();
@ -123,11 +123,11 @@ public:
TQObject *parent, const char *name,
const char *classname, const TQStringList &args );
virtual commandline_part*createCommandIf(TQObject*parent,const char*name, TDECmdLineArgs *args);
static KInstance* instance();
static TDEInstance* instance();
private:
static KInstance* s_instance;
static KAboutData* s_about;
static TDEInstance* s_instance;
static TDEAboutData* s_about;
static commandline_part*s_cline;
};

@ -41,9 +41,9 @@ static KCmdLineOptions options[] =
int main (int argc, char *argv[])
{
KLocale::setMainCatalogue("tdesvn");
KAboutData aboutdata("tdesvnd", I18N_NOOP("TDE"),
TDEAboutData aboutdata("tdesvnd", I18N_NOOP("TDE"),
version, description,
KAboutData::License_GPL, "(C) %{YEAR}, Rajko Albrecht");
TDEAboutData::License_GPL, "(C) %{YEAR}, Rajko Albrecht");
aboutdata.addAuthor("Rajko Albrecht",I18N_NOOP("Developer"),"rajko.albrecht@tecways.com");
TDECmdLineArgs::init( argc, argv, &aboutdata );

Loading…
Cancel
Save