Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent bdf47e8ffb
commit ef71f46965

@ -132,7 +132,7 @@ void FeedBrowserDlg::itemSelected( TQListViewItem *item )
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
KGlobal::locale()->setMainCatalogue( "dcoprss" ); KGlobal::locale()->setMainCatalogue( "dcoprss" );
KAboutData aboutData( "feedbrowser", I18N_NOOP( "Feed Browser" ), "0.1" ); TDEAboutData aboutData( "feedbrowser", I18N_NOOP( "Feed Browser" ), "0.1" );
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDEApplication app; TDEApplication app;
FeedBrowserDlg *dlg = new FeedBrowserDlg( 0 ); FeedBrowserDlg *dlg = new FeedBrowserDlg( 0 );

@ -13,9 +13,9 @@
int main (int argc, char *argv[]) int main (int argc, char *argv[])
{ {
KLocale::setMainCatalogue("dcoprss"); KLocale::setMainCatalogue("dcoprss");
KAboutData aboutdata("rssservice", I18N_NOOP("TDE RSS Service"), TDEAboutData aboutdata("rssservice", I18N_NOOP("TDE RSS Service"),
"0.8", I18N_NOOP("A RSS data service."), "0.8", I18N_NOOP("A RSS data service."),
KAboutData::License_GPL, "(C) 2003, Ian Reinhart Geiser"); TDEAboutData::License_GPL, "(C) 2003, Ian Reinhart Geiser");
aboutdata.addAuthor("Ian Reinhart Geiser",I18N_NOOP("Developer"),"geiseri@kde.org"); aboutdata.addAuthor("Ian Reinhart Geiser",I18N_NOOP("Developer"),"geiseri@kde.org");
TDECmdLineArgs::init( argc, argv, &aboutdata ); TDECmdLineArgs::init( argc, argv, &aboutdata );

@ -31,11 +31,11 @@ static KCmdLineOptions knoptions[] =
extern "C" KDE_EXPORT int kdemain(int argc, char* argv[]) extern "C" KDE_EXPORT int kdemain(int argc, char* argv[])
{ {
KAboutData aboutData("kdict", TDEAboutData aboutData("kdict",
I18N_NOOP("Dictionary"), I18N_NOOP("Dictionary"),
KDICT_VERSION, KDICT_VERSION,
I18N_NOOP("The TDE Dictionary Client"), I18N_NOOP("The TDE Dictionary Client"),
KAboutData:: License_Artistic, TDEAboutData:: License_Artistic,
"Copyright (c) 1999-2001, Christian Gebauer\nCopyright (c) 1998, Matthias Hoelzer", "Copyright (c) 1999-2001, Christian Gebauer\nCopyright (c) 1998, Matthias Hoelzer",
0, 0,
0); 0);

@ -160,7 +160,7 @@ void KGet_plug_in::slotShowLinks()
KPluginFactory::KPluginFactory( TQObject* parent, const char* name ) KPluginFactory::KPluginFactory( TQObject* parent, const char* name )
: KLibFactory( parent, name ) : KLibFactory( parent, name )
{ {
s_instance = new KInstance("KPluginFactory"); s_instance = new TDEInstance("KPluginFactory");
} }
TQObject* KPluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) TQObject* KPluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & )
@ -184,6 +184,6 @@ extern "C"
} }
KInstance* KPluginFactory::s_instance = 0L; TDEInstance* KPluginFactory::s_instance = 0L;
#include "kget_plug_in.moc" #include "kget_plug_in.moc"

@ -22,7 +22,7 @@
#include <dcopclient.h> #include <dcopclient.h>
#include <kurl.h> #include <kurl.h>
class KInstance; class TDEInstance;
class KGet_plug_in : public KParts::Plugin class KGet_plug_in : public KParts::Plugin
{ {
@ -54,7 +54,7 @@ public:
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
private: private:
static KInstance* s_instance; static TDEInstance* s_instance;
}; };
#endif #endif

@ -197,7 +197,7 @@ public:
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData("kget", I18N_NOOP("KGet"), version, description, KAboutData::License_GPL, "(C) 2001 - 2002, Patrick Charbonnier \n(C) 2002, Carsten Pfeiffer\n(C) 1998 - 2000, Matej Koss", "kget@kde.org", 0); TDEAboutData aboutData("kget", I18N_NOOP("KGet"), version, description, TDEAboutData::License_GPL, "(C) 2001 - 2002, Patrick Charbonnier \n(C) 2002, Carsten Pfeiffer\n(C) 1998 - 2000, Matej Koss", "kget@kde.org", 0);
aboutData.addAuthor("Patrick Charbonnier", 0, "pch@freeshell.org"); aboutData.addAuthor("Patrick Charbonnier", 0, "pch@freeshell.org");
aboutData.addAuthor("Carsten Pfeiffer", 0, "pfeiffer@kde.org"); aboutData.addAuthor("Carsten Pfeiffer", 0, "pfeiffer@kde.org");

@ -37,14 +37,14 @@
KNewsTicker::KNewsTicker(const TQString &cfgFile, Type t, int actions, TQWidget *parent, const char *name) KNewsTicker::KNewsTicker(const TQString &cfgFile, Type t, int actions, TQWidget *parent, const char *name)
: ConfigIface(), DCOPObject("KNewsTicker"), : ConfigIface(), DCOPObject("KNewsTicker"),
KPanelApplet(cfgFile, t, actions, parent, name), KPanelApplet(cfgFile, t, actions, parent, name),
m_instance(new KInstance("knewsticker")), m_instance(new TDEInstance("knewsticker")),
m_dcopClient(new DCOPClient()), m_dcopClient(new DCOPClient()),
m_cfg(new ConfigAccess(config())), m_cfg(new ConfigAccess(config())),
m_newsTimer(new TQTimer(this)), m_newsTimer(new TQTimer(this)),
m_updateTimer(new TQTimer(this)), m_updateTimer(new TQTimer(this)),
m_newsIconMgr(NewsIconMgr::self()), m_newsIconMgr(NewsIconMgr::self()),
m_aboutData(new KAboutData("knewsticker", I18N_NOOP("KNewsTicker"), "v0.2", m_aboutData(new TDEAboutData("knewsticker", I18N_NOOP("KNewsTicker"), "v0.2",
I18N_NOOP("A news ticker applet."), KAboutData::License_BSD, I18N_NOOP("A news ticker applet."), TDEAboutData::License_BSD,
I18N_NOOP("(c) 2000, 2001 The KNewsTicker developers"))) I18N_NOOP("(c) 2000, 2001 The KNewsTicker developers")))
{ {
TQHBoxLayout *layout = new TQHBoxLayout(this); TQHBoxLayout *layout = new TQHBoxLayout(this);

@ -25,13 +25,13 @@
#include "configaccess.h" #include "configaccess.h"
#include "newsengine.h" #include "newsengine.h"
class KInstance; class TDEInstance;
class NewsSource; class NewsSource;
class KArrowButton; class KArrowButton;
class NewsIconMgr; class NewsIconMgr;
class NewsScroller; class NewsScroller;
class KNewsTickerMenu; class KNewsTickerMenu;
class KAboutData; class TDEAboutData;
class TQTimer; class TQTimer;
class KNewsTicker : public KPanelApplet, virtual public ConfigIface, class KNewsTicker : public KPanelApplet, virtual public ConfigIface,
@ -104,7 +104,7 @@ class KNewsTicker : public KPanelApplet, virtual public ConfigIface,
private: private:
void setupArrowButton(); void setupArrowButton();
KInstance *m_instance; TDEInstance *m_instance;
DCOPClient *m_dcopClient; DCOPClient *m_dcopClient;
ConfigAccess *m_cfg; ConfigAccess *m_cfg;
KArrowButton *m_arrowButton; KArrowButton *m_arrowButton;
@ -112,7 +112,7 @@ class KNewsTicker : public KPanelApplet, virtual public ConfigIface,
TQTimer *m_updateTimer; TQTimer *m_updateTimer;
NewsIconMgr *m_newsIconMgr; NewsIconMgr *m_newsIconMgr;
NewsScroller *m_scroller; NewsScroller *m_scroller;
KAboutData *m_aboutData; TDEAboutData *m_aboutData;
KNewsTickerMenu *m_contextMenu; KNewsTickerMenu *m_contextMenu;
bool m_newNews; bool m_newNews;
NewsSourceBase::List m_newsSources; NewsSourceBase::List m_newsSources;

@ -36,8 +36,8 @@ int main(int argc, char **argv)
{ {
KLocale::setMainCatalogue("knewsticker"); KLocale::setMainCatalogue("knewsticker");
KAboutData aboutData(name, verbname, version, description, TDEAboutData aboutData(name, verbname, version, description,
KAboutData::License_BSD, copyright); TDEAboutData::License_BSD, copyright);
aboutData.addAuthor("Frerich Raabe", I18N_NOOP("Author"), "raabe@kde.org"); aboutData.addAuthor("Frerich Raabe", I18N_NOOP("Author"), "raabe@kde.org");
TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);

@ -172,7 +172,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index )
} }
else else
{ {
KInstance *instance; TDEInstance *instance;
if ( m_parentCollection ) if ( m_parentCollection )
instance = m_parentCollection->instance(); instance = m_parentCollection->instance();

@ -112,11 +112,11 @@ void KopeteRichTextEditPart::createActions()
createActions( actionCollection() ); createActions( actionCollection() );
} }
KAboutData *KopeteRichTextEditPart::createAboutData() TDEAboutData *KopeteRichTextEditPart::createAboutData()
{ {
KAboutData *aboutData = new KAboutData("kopeterichtexteditpart", I18N_NOOP("KopeteRichTextEditPart"), "0.1", TDEAboutData *aboutData = new TDEAboutData("kopeterichtexteditpart", I18N_NOOP("KopeteRichTextEditPart"), "0.1",
I18N_NOOP("A simple rich text editor part for Kopete"), I18N_NOOP("A simple rich text editor part for Kopete"),
KAboutData::License_LGPL ); TDEAboutData::License_LGPL );
aboutData->addAuthor("Richard J. Moore", 0, "rich@kde.org", "http://xmelegance.org/" ); aboutData->addAuthor("Richard J. Moore", 0, "rich@kde.org", "http://xmelegance.org/" );
aboutData->addAuthor("Jason Keirstead", 0, "jason@keirstead.org", "http://www.keirstead.org/" ); aboutData->addAuthor("Jason Keirstead", 0, "jason@keirstead.org", "http://www.keirstead.org/" );
return aboutData; return aboutData;

@ -8,7 +8,7 @@
#include <tqfont.h> #include <tqfont.h>
#include <tqcolor.h> #include <tqcolor.h>
class KAboutData; class TDEAboutData;
class KTextEdit; class KTextEdit;
class KFontAction; class KFontAction;
class KFontSizeAction; class KFontSizeAction;
@ -51,7 +51,7 @@ class KopeteRichTextEditPart : public KParts::ReadOnlyPart
bool buttonsEnabled() { return !m_richTextAvailable || m_richTextEnabled; } bool buttonsEnabled() { return !m_richTextAvailable || m_richTextEnabled; }
static KAboutData *createAboutData(); static TDEAboutData *createAboutData();
virtual bool openFile() { return false; }; virtual bool openFile() { return false; };

@ -61,7 +61,7 @@ public:
class FakeProtocol : public Kopete::Protocol class FakeProtocol : public Kopete::Protocol
{ {
public: public:
FakeProtocol( KInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name) FakeProtocol( TDEInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name)
{ {
} }
@ -122,7 +122,7 @@ class ChatWindowStyleRendering_Test::Private
public: public:
Private() Private()
{ {
protocol = new FakeProtocol( new KInstance(TQCString("test-kopete-message")), 0L, "test-kopete-message"); protocol = new FakeProtocol( new TDEInstance(TQCString("test-kopete-message")), 0L, "test-kopete-message");
account = new FakeAccount(protocol, TQString("testaccount"), 0); account = new FakeAccount(protocol, TQString("testaccount"), 0);
// Create fake meta/contacts // Create fake meta/contacts

@ -714,7 +714,7 @@ public:
class FakeProtocol : public Kopete::Protocol class FakeProtocol : public Kopete::Protocol
{ {
public: public:
FakeProtocol( KInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name){} FakeProtocol( TDEInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name){}
Kopete::Account* createNewAccount( const TQString &/*accountId*/ ){return 0L;} Kopete::Account* createNewAccount( const TQString &/*accountId*/ ){return 0L;}
AddContactPage* createAddContactWidget( TQWidget */*parent*/, Kopete::Account */*account*/){return 0L;} AddContactPage* createAddContactWidget( TQWidget */*parent*/, Kopete::Account */*account*/){return 0L;}
KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account */*account*/, TQWidget */*parent */){return 0L;} KopeteEditAccountWidget* createEditAccountWidget( Kopete::Account */*account*/, TQWidget */*parent */){return 0L;}
@ -735,7 +735,7 @@ void setOnlineStatus( const Kopete::OnlineStatus& /*status*/ , const TQString &/
void AppearanceConfig::createPreviewChatSession() void AppearanceConfig::createPreviewChatSession()
{ {
d->previewProtocol = new FakeProtocol( new KInstance(TQCString("kopete-preview-chatwindowstyle")), 0L, "kopete-preview-chatwindowstyle"); d->previewProtocol = new FakeProtocol( new TDEInstance(TQCString("kopete-preview-chatwindowstyle")), 0L, "kopete-preview-chatwindowstyle");
d->previewAccount = new FakeAccount(d->previewProtocol, TQString("previewaccount"), 0); d->previewAccount = new FakeAccount(d->previewProtocol, TQString("previewaccount"), 0);
// Create fake meta/contacts // Create fake meta/contacts

@ -24,7 +24,7 @@ static TQTextStream qcerr( stderr, IO_WriteOnly );
int main() int main()
{ {
KInstance* inst = new KInstance( "Update script" ); TDEInstance* inst = new TDEInstance( "Update script" );
TQString filename = locateLocal( "data", TQString::fromLatin1( "kopete/contactlist.xml" ) ); TQString filename = locateLocal( "data", TQString::fromLatin1( "kopete/contactlist.xml" ) );
// Load contact list & save backup. // Load contact list & save backup.

@ -49,8 +49,8 @@ static KCmdLineOptions options[] =
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )
{ {
KAboutData aboutData( "kopete", I18N_NOOP("Kopete"), TDEAboutData aboutData( "kopete", I18N_NOOP("Kopete"),
KOPETE_VERSION_STRING, description, KAboutData::License_GPL, KOPETE_VERSION_STRING, description, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2009-2010, Timothy Pearson\n(c) 2001-2004, Duncan Mac-Vicar Prett\n(c) 2002-2005, Kopete Development Team"), "kopete-devel@kde.org", "http://kopete.kde.org"); I18N_NOOP("(c) 2009-2010, Timothy Pearson\n(c) 2001-2004, Duncan Mac-Vicar Prett\n(c) 2002-2005, Kopete Development Team"), "kopete-devel@kde.org", "http://kopete.kde.org");
aboutData.addAuthor ( "Duncan Mac-Vicar Prett", I18N_NOOP("Developer and Project founder"), "duncan@kde.org", "http://www.mac-vicar.org/~duncan" ); aboutData.addAuthor ( "Duncan Mac-Vicar Prett", I18N_NOOP("Developer and Project founder"), "duncan@kde.org", "http://www.mac-vicar.org/~duncan" );

@ -39,7 +39,7 @@ KCAutoConfigModule::KCAutoConfigModule( TQWidget * parent, const char * name, co
connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(widgetModified())); connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(widgetModified()));
} }
KCAutoConfigModule::KCAutoConfigModule( KInstance * instance, TQWidget * parent, const TQStringList & args ) KCAutoConfigModule::KCAutoConfigModule( TDEInstance * instance, TQWidget * parent, const TQStringList & args )
: KCModule( instance, parent, args ) : KCModule( instance, parent, args )
, d( new KCAutoConfigModulePrivate ) , d( new KCAutoConfigModulePrivate )
{ {
@ -58,7 +58,7 @@ KCAutoConfigModule::KCAutoConfigModule( KConfig *config,TQWidget * parent, const
connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(slotWidgetModified())); connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(slotWidgetModified()));
} }
KCAutoConfigModule::KCAutoConfigModule( KConfig *config , KInstance * instance, TQWidget * parent, const TQStringList & args ) KCAutoConfigModule::KCAutoConfigModule( KConfig *config , TDEInstance * instance, TQWidget * parent, const TQStringList & args )
: KCModule( instance, parent, args ) : KCModule( instance, parent, args )
, d( new KCAutoConfigModulePrivate ) , d( new KCAutoConfigModulePrivate )
{ {

@ -63,18 +63,18 @@ class KOPETE_EXPORT KCAutoConfigModule : public KCModule
/** /**
* Standard KCModule constructor. Use KGlobal::config() * Standard KCModule constructor. Use KGlobal::config()
*/ */
KCAutoConfigModule( KInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); KCAutoConfigModule( TDEInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() );
/** /**
* Constructor. * Constructor.
* @param config the KConfig to use * @param config the KConfig to use
* @param instance KInstance object for this KCM * @param instance TDEInstance object for this KCM
* @param parent parent widget * @param parent parent widget
* @param args special arguments for this KCM * @param args special arguments for this KCM
* *
* @todo document what the args mean (inherited from KCModule?) * @todo document what the args mean (inherited from KCModule?)
*/ */
KCAutoConfigModule(KConfig* config, KInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() ); KCAutoConfigModule(KConfig* config, TDEInstance * instance, TQWidget * parent = 0, const TQStringList & args = TQStringList() );
/** /**
* Constructor, much like the one above, except with * Constructor, much like the one above, except with

@ -32,7 +32,7 @@ public:
TQString indexField; TQString indexField;
}; };
Plugin::Plugin( KInstance *instance, TQObject *parent, const char *name ) Plugin::Plugin( TDEInstance *instance, TQObject *parent, const char *name )
: TQObject( parent, name ), KXMLGUIClient(), d(new Private) : TQObject( parent, name ), KXMLGUIClient(), d(new Private)
{ {
setInstance( instance ); setInstance( instance );

@ -68,7 +68,7 @@ Comment=Plugin that do some nice stuff
* *
* \code * \code
typedef KGenericFactory<MyPlugin> MyPluginFactory; typedef KGenericFactory<MyPlugin> MyPluginFactory;
static const KAboutData aboutdata("kopete_myplugin", I18N_NOOP("MyPlugin") , "1.0" ); static const TDEAboutData aboutdata("kopete_myplugin", I18N_NOOP("MyPlugin") , "1.0" );
K_EXPORT_COMPONENT_FACTORY( kopete_myplugin, MyPluginFactory( &aboutdata ) ) K_EXPORT_COMPONENT_FACTORY( kopete_myplugin, MyPluginFactory( &aboutdata ) )
MyPlugin::MyPlugin( TQObject *parent, const char *name, const TQStringList & args ) MyPlugin::MyPlugin( TQObject *parent, const char *name, const TQStringList & args )
@ -93,7 +93,7 @@ class KOPETE_EXPORT Plugin : public TQObject, public KXMLGUIClient
public: public:
Plugin( KInstance *instance, TQObject *parent, const char *name ); Plugin( TDEInstance *instance, TQObject *parent, const char *name );
virtual ~Plugin(); virtual ~Plugin();
/** /**

@ -50,7 +50,7 @@ public:
Kopete::OnlineStatus accountNotConnectedStatus; Kopete::OnlineStatus accountNotConnectedStatus;
}; };
Protocol::Protocol( KInstance *instance, TQObject *parent, const char *name ) Protocol::Protocol( TDEInstance *instance, TQObject *parent, const char *name )
: Plugin( instance, parent, name ) : Plugin( instance, parent, name )
{ {
d = new Private; d = new Private;

@ -160,11 +160,11 @@ protected:
/** /**
* @brief Constructor for Protocol * @brief Constructor for Protocol
* *
* @param instance The protocol's instance, every plugin needs to have a KInstance of its own * @param instance The protocol's instance, every plugin needs to have a TDEInstance of its own
* @param parent The protocol's parent object * @param parent The protocol's parent object
* @param name The protocol's name * @param name The protocol's name
*/ */
Protocol( KInstance *instance, TQObject *parent, const char *name ); Protocol( TDEInstance *instance, TQObject *parent, const char *name );
/** /**
* @brief Sets the capabilities of this protcol. * @brief Sets the capabilities of this protcol.

@ -53,7 +53,7 @@ KopeteMessage_Test::KopeteMessage_Test()
setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true ); setenv( "TDEHOME", TQFile::encodeName( TQDir::homeDirPath() + "/.kopete-unittest" ), true );
// create fake objects needed to build a reasonable testeable message // create fake objects needed to build a reasonable testeable message
m_protocol = new Kopete::Test::Mock::Protocol( new KInstance(TQCString("test-kopete-message")), 0L, "test-kopete-message"); m_protocol = new Kopete::Test::Mock::Protocol( new TDEInstance(TQCString("test-kopete-message")), 0L, "test-kopete-message");
m_account = new Kopete::Test::Mock::Account(m_protocol, "testaccount"); m_account = new Kopete::Test::Mock::Account(m_protocol, "testaccount");
m_metaContactMyself = new Kopete::Test::Mock::MetaContact(); m_metaContactMyself = new Kopete::Test::Mock::MetaContact();
m_metaContactOther = new Kopete::Test::Mock::MetaContact(); m_metaContactOther = new Kopete::Test::Mock::MetaContact();

@ -66,7 +66,7 @@ void PasswordRetriever::timer()
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )
{ {
KAboutData aboutData( "kopetepasswordtest", "kopetepasswordtest", "version" ); TDEAboutData aboutData( "kopetepasswordtest", "kopetepasswordtest", "version" );
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( opts ); TDECmdLineArgs::addCmdLineOptions( opts );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

@ -61,7 +61,7 @@ void WalletReciever::timer()
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )
{ {
KAboutData aboutData( "kopetewallettest", "kopetewallettest", "version" ); TDEAboutData aboutData( "kopetewallettest", "kopetewallettest", "version" );
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
KCmdLineOptions opts[] = { {"+action",0,0}, KCmdLineLastOption }; KCmdLineOptions opts[] = { {"+action",0,0}, KCmdLineLastOption };
TDECmdLineArgs::addCmdLineOptions( opts ); TDECmdLineArgs::addCmdLineOptions( opts );

@ -24,7 +24,7 @@ namespace Test
namespace Mock namespace Mock
{ {
Protocol::Protocol( KInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name) Protocol::Protocol( TDEInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name)
{ {
} }

@ -20,7 +20,7 @@
#include "kopeteprotocol.h" #include "kopeteprotocol.h"
class KInstance; class TDEInstance;
class TQObject; class TQObject;
class KopeteEditAccountWidget; class KopeteEditAccountWidget;
@ -37,7 +37,7 @@ namespace Mock
class Protocol : public Kopete::Protocol class Protocol : public Kopete::Protocol
{ {
public: public:
Protocol( KInstance *instance, TQObject *parent, const char *name ); Protocol( TDEInstance *instance, TQObject *parent, const char *name );
// pure virtual functions implemented // pure virtual functions implemented
virtual Account *createNewAccount( const TQString &accountId ); virtual Account *createNewAccount( const TQString &accountId );
virtual AddContactPage *createAddContactWidget( TQWidget *parent, Kopete::Account *account ); virtual AddContactPage *createAddContactWidget( TQWidget *parent, Kopete::Account *account );

@ -1,7 +1,7 @@
[Global] [Global]
PluginName=KopeteWidgets PluginName=KopeteWidgets
Includes=kinstance.h Includes=kinstance.h
Init=new KInstance("kopetewidgets"); Init=new TDEInstance("kopetewidgets");
[Kopete::UI::ListView::ListView] [Kopete::UI::ListView::ListView]
ToolTip=List View (Kopete) ToolTip=List View (Kopete)

@ -16,7 +16,7 @@
#include "kopeteviewplugin.h" #include "kopeteviewplugin.h"
Kopete::ViewPlugin::ViewPlugin( KInstance *instance, TQObject *parent, const char *name ) : Kopete::ViewPlugin::ViewPlugin( TDEInstance *instance, TQObject *parent, const char *name ) :
Kopete::Plugin( instance, parent, name ) Kopete::Plugin( instance, parent, name )
{ {

@ -41,7 +41,7 @@ class KOPETE_EXPORT ViewPlugin : public Plugin
/** /**
* @brief Create and initialize the plugin * @brief Create and initialize the plugin
*/ */
ViewPlugin( KInstance *instance, TQObject *parent = 0L, const char *name = 0L ); ViewPlugin( TDEInstance *instance, TQObject *parent = 0L, const char *name = 0L );
/** /**
* @brief Creates a view to be associated with the passed in session * @brief Creates a view to be associated with the passed in session

@ -107,7 +107,7 @@ KopeteWidgets::KopeteWidgets()
widget.isContainer = false; widget.isContainer = false;
m_widgets.insert(TQString::fromLatin1("Kopete::UI::ListView::SearchLine"), widget); m_widgets.insert(TQString::fromLatin1("Kopete::UI::ListView::SearchLine"), widget);
new KInstance("kopetewidgets"); new TDEInstance("kopetewidgets");
} }
KopeteWidgets::~KopeteWidgets() KopeteWidgets::~KopeteWidgets()
{ {

@ -48,7 +48,7 @@
const TQRegExp CryptographyPlugin::isHTML( TQString::fromLatin1( "^[^<>]*(</?(html|body|br|p|font|center|b|i|u|span|div|pre)(>|[\\s/][^><]*>)[^><]*)+$" ) , false ); const TQRegExp CryptographyPlugin::isHTML( TQString::fromLatin1( "^[^<>]*(</?(html|body|br|p|font|center|b|i|u|span|div|pre)(>|[\\s/][^><]*>)[^><]*)+$" ) , false );
typedef KGenericFactory<CryptographyPlugin> CryptographyPluginFactory; typedef KGenericFactory<CryptographyPlugin> CryptographyPluginFactory;
static const KAboutData aboutdata("kopete_cryptography", I18N_NOOP("Cryptography") , "1.0" ); static const TDEAboutData aboutdata("kopete_cryptography", I18N_NOOP("Cryptography") , "1.0" );
K_EXPORT_COMPONENT_FACTORY( kopete_cryptography, CryptographyPluginFactory( &aboutdata ) ) K_EXPORT_COMPONENT_FACTORY( kopete_cryptography, CryptographyPluginFactory( &aboutdata ) )
CryptographyPlugin::CryptographyPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ ) CryptographyPlugin::CryptographyPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ )

@ -38,7 +38,7 @@
#include "historyconfig.h" #include "historyconfig.h"
typedef KGenericFactory<HistoryPlugin> HistoryPluginFactory; typedef KGenericFactory<HistoryPlugin> HistoryPluginFactory;
static const KAboutData aboutdata("kopete_history", I18N_NOOP("History") , "1.0" ); static const TDEAboutData aboutdata("kopete_history", I18N_NOOP("History") , "1.0" );
K_EXPORT_COMPONENT_FACTORY( kopete_history, HistoryPluginFactory( &aboutdata ) ) K_EXPORT_COMPONENT_FACTORY( kopete_history, HistoryPluginFactory( &aboutdata ) )
HistoryPlugin::HistoryPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ ) HistoryPlugin::HistoryPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ )

@ -32,7 +32,7 @@
#include "netmeetingguiclient.h" #include "netmeetingguiclient.h"
static const KAboutData aboutdata("kopete_netmeeting", I18N_NOOP("NetMeeting") , "1.0" ); static const TDEAboutData aboutdata("kopete_netmeeting", I18N_NOOP("NetMeeting") , "1.0" );
K_EXPORT_COMPONENT_FACTORY( kopete_netmeeting, KGenericFactory<NetMeetingPlugin>( &aboutdata ) ) K_EXPORT_COMPONENT_FACTORY( kopete_netmeeting, KGenericFactory<NetMeetingPlugin>( &aboutdata ) )
NetMeetingPlugin::NetMeetingPlugin( TQObject *parent, const char *name, const TQStringList &/*args*/ ) NetMeetingPlugin::NetMeetingPlugin( TQObject *parent, const char *name, const TQStringList &/*args*/ )

@ -28,8 +28,8 @@ static const char version[] = "0.1";
static KCmdLineOptions options[] = { KCmdLineLastOption }; static KCmdLineOptions options[] = { KCmdLineLastOption };
int main( int argc, char** argv ) { int main( int argc, char** argv ) {
KAboutData about("SMPPPDClientTests", I18N_NOOP("SMPPPDClientTests"), version, description, TDEAboutData about("SMPPPDClientTests", I18N_NOOP("SMPPPDClientTests"), version, description,
KAboutData::License_BSD, "(C) 2006 Heiko Schäfer", 0, 0, "heiko@rangun.de"); TDEAboutData::License_BSD, "(C) 2006 Heiko Schäfer", 0, 0, "heiko@rangun.de");
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);

@ -43,7 +43,7 @@
typedef KGenericFactory<StatisticsPlugin> StatisticsPluginFactory; typedef KGenericFactory<StatisticsPlugin> StatisticsPluginFactory;
static const KAboutData aboutdata("kopete_statistics", I18N_NOOP("Statistics") , "0.1" ); static const TDEAboutData aboutdata("kopete_statistics", I18N_NOOP("Statistics") , "0.1" );
K_EXPORT_COMPONENT_FACTORY( kopete_statistics, StatisticsPluginFactory( &aboutdata ) ) K_EXPORT_COMPONENT_FACTORY( kopete_statistics, StatisticsPluginFactory( &aboutdata ) )
StatisticsPlugin::StatisticsPlugin( TQObject *parent, const char *name, const TQStringList &) StatisticsPlugin::StatisticsPlugin( TQObject *parent, const char *name, const TQStringList &)

@ -45,7 +45,7 @@
typedef KGenericFactory<TranslatorPlugin> TranslatorPluginFactory; typedef KGenericFactory<TranslatorPlugin> TranslatorPluginFactory;
#if KDE_IS_VERSION(3,2,90) #if KDE_IS_VERSION(3,2,90)
static const KAboutData aboutdata("kopete_translator", I18N_NOOP("Translator") , "1.0" ); static const TDEAboutData aboutdata("kopete_translator", I18N_NOOP("Translator") , "1.0" );
K_EXPORT_COMPONENT_FACTORY( kopete_translator, TranslatorPluginFactory( &aboutdata ) ) K_EXPORT_COMPONENT_FACTORY( kopete_translator, TranslatorPluginFactory( &aboutdata ) )
#else #else
K_EXPORT_COMPONENT_FACTORY( kopete_translator, TranslatorPluginFactory( "kopete_translator" ) ) K_EXPORT_COMPONENT_FACTORY( kopete_translator, TranslatorPluginFactory( "kopete_translator" ) )

@ -39,7 +39,7 @@
typedef KGenericFactory<MSNProtocol> MSNProtocolFactory; typedef KGenericFactory<MSNProtocol> MSNProtocolFactory;
#if KDE_IS_VERSION(3,2,90) #if KDE_IS_VERSION(3,2,90)
static const KAboutData aboutdata("kopete_msn", I18N_NOOP("MSN Messenger") , "1.0" ); static const TDEAboutData aboutdata("kopete_msn", I18N_NOOP("MSN Messenger") , "1.0" );
K_EXPORT_COMPONENT_FACTORY( libkopete_msn_shared, MSNProtocolFactory( &aboutdata ) ) K_EXPORT_COMPONENT_FACTORY( libkopete_msn_shared, MSNProtocolFactory( &aboutdata ) )
#else #else
K_EXPORT_COMPONENT_FACTORY( libkopete_msn_shared, MSNProtocolFactory( "kopete_msn" ) ) K_EXPORT_COMPONENT_FACTORY( libkopete_msn_shared, MSNProtocolFactory( "kopete_msn" ) )

@ -177,13 +177,13 @@ namespace KPF
void void
Applet::about() Applet::about()
{ {
KAboutData about TDEAboutData about
( (
"kpf", "kpf",
I18N_NOOP("kpf"), I18N_NOOP("kpf"),
kpfVersion, kpfVersion,
I18N_NOOP("TDE public fileserver"), I18N_NOOP("TDE public fileserver"),
KAboutData::License_Custom, TDEAboutData::License_Custom,
"(C) 2001 Rik Hemsley (rikkus) <rik@kde.org>", "(C) 2001 Rik Hemsley (rikkus) <rik@kde.org>",
I18N_NOOP( I18N_NOOP(
"File sharing applet, using the HTTP (Hyper Text Transfer Protocol)" "File sharing applet, using the HTTP (Hyper Text Transfer Protocol)"

@ -103,8 +103,8 @@ void TopWidget::menuCallback(int id) {
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
KAboutData aboutData("kppplogview", I18N_NOOP("KPPP Log Viewer"), TDEAboutData aboutData("kppplogview", I18N_NOOP("KPPP Log Viewer"),
version, description, KAboutData::License_GPL, version, description, TDEAboutData::License_GPL,
I18N_NOOP("(c) 1999-2002, The KPPP Developers")); I18N_NOOP("(c) 1999-2002, The KPPP Developers"));
aboutData.addAuthor("Bernd Wuebben",0, "wuebben@kde.org"); aboutData.addAuthor("Bernd Wuebben",0, "wuebben@kde.org");
aboutData.addAuthor("Mario Weilguni",0, ""); aboutData.addAuthor("Mario Weilguni",0, "");

@ -200,8 +200,8 @@ int main( int argc, char **argv ) {
(void) new Requester(sockets[0]); (void) new Requester(sockets[0]);
KAboutData aboutData("kppp", I18N_NOOP("KPPP"), TDEAboutData aboutData("kppp", I18N_NOOP("KPPP"),
KPPPVERSION, description, KAboutData::License_GPL, KPPPVERSION, description, TDEAboutData::License_GPL,
I18N_NOOP("(c) 1999-2002, The KPPP Developers")); I18N_NOOP("(c) 1999-2002, The KPPP Developers"));
aboutData.addAuthor("Harri Porten", I18N_NOOP("Current maintainer"), "porten@kde.org"); aboutData.addAuthor("Harri Porten", I18N_NOOP("Current maintainer"), "porten@kde.org");
aboutData.addAuthor("Bernd Wuebben", I18N_NOOP("Original author"), "wuebben@kde.org"); aboutData.addAuthor("Bernd Wuebben", I18N_NOOP("Original author"), "wuebben@kde.org");

@ -72,8 +72,8 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData( "krdc", I18N_NOOP("Remote Desktop Connection"), TDEAboutData aboutData( "krdc", I18N_NOOP("Remote Desktop Connection"),
VERSION, description, KAboutData::License_GPL, VERSION, description, TDEAboutData::License_GPL,
"(c) 2009-2010, Timothy Pearson\n" "(c) 2009-2010, Timothy Pearson\n"
"(c) 2001-2003, Tim Jansen\n" "(c) 2001-2003, Tim Jansen\n"
"(c) 2002-2003, Arend van Beelen jr.\n" "(c) 2002-2003, Arend van Beelen jr.\n"

@ -64,9 +64,9 @@ KcmKRfb::KcmKRfb(TQWidget *p, const char *name, const TQStringList &) :
setButtons(Default|Apply|Reset); setButtons(Default|Apply|Reset);
KAboutData* about = new KAboutData( "kcm_krfb", I18N_NOOP("Desktop Sharing Control Module"), TDEAboutData* about = new TDEAboutData( "kcm_krfb", I18N_NOOP("Desktop Sharing Control Module"),
VERSION, VERSION,
I18N_NOOP("Configure desktop sharing"), KAboutData::License_GPL, I18N_NOOP("Configure desktop sharing"), TDEAboutData::License_GPL,
"(c) 2002, Tim Jansen\n", "(c) 2002, Tim Jansen\n",
0, "http://www.tjansen.de/krfb", "tim@tjansen.de"); 0, "http://www.tjansen.de/krfb", "tim@tjansen.de");
about->addAuthor("Tim Jansen", 0, "tim@tjansen.de"); about->addAuthor("Tim Jansen", 0, "tim@tjansen.de");

@ -70,8 +70,8 @@ void checkKInetd(bool &kinetdAvailable, bool &krfbAvailable) {
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData( "krfb", I18N_NOOP("Desktop Sharing"), TDEAboutData aboutData( "krfb", I18N_NOOP("Desktop Sharing"),
VERSION, description, KAboutData::License_GPL, VERSION, description, TDEAboutData::License_GPL,
"(c) 2001-2003, Tim Jansen\n" "(c) 2001-2003, Tim Jansen\n"
"(c) 2001, Johannes E. Schindelin\n" "(c) 2001, Johannes E. Schindelin\n"
"(c) 2000, heXoNet Support GmbH, D-66424 Homburg\n" "(c) 2000, heXoNet Support GmbH, D-66424 Homburg\n"

@ -64,8 +64,8 @@ void StdInTicker::closeEvent ( TQCloseEvent *e )
int main(int argc, char **argv){ int main(int argc, char **argv){
KAboutData aboutData( "ksirc", I18N_NOOP("KSirc"), TDEAboutData aboutData( "ksirc", I18N_NOOP("KSirc"),
"2.0.0", "", KAboutData::License_Artistic, "2.0.0", "", TDEAboutData::License_Artistic,
I18N_NOOP("(c) 1997-2002, Andrew Stanley-Jones")); I18N_NOOP("(c) 1997-2002, Andrew Stanley-Jones"));
aboutData.addAuthor("Andrew Stanley-Jones",I18N_NOOP("Original Author"), "asj-ksirc@cban.com"); aboutData.addAuthor("Andrew Stanley-Jones",I18N_NOOP("Original Author"), "asj-ksirc@cban.com");
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );

@ -68,8 +68,8 @@ public:
extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
{ {
KAboutData aboutData( "ksirc", I18N_NOOP("KSirc"), TDEAboutData aboutData( "ksirc", I18N_NOOP("KSirc"),
KSIRC_VERSION, description, KAboutData::License_Artistic, KSIRC_VERSION, description, TDEAboutData::License_Artistic,
I18N_NOOP("(c) 1997-2002, The KSirc Developers")); I18N_NOOP("(c) 1997-2002, The KSirc Developers"));
aboutData.addAuthor("Andrew Stanley-Jones",I18N_NOOP("Original Author"), "asj-ksirc@cban.com"); aboutData.addAuthor("Andrew Stanley-Jones",I18N_NOOP("Original Author"), "asj-ksirc@cban.com");
aboutData.addAuthor("Waldo Bastian",0, "bastian@kde.org"); aboutData.addAuthor("Waldo Bastian",0, "bastian@kde.org");

@ -17,7 +17,7 @@
2000-03-04 David Faure <faure@kde.org> 2000-03-04 David Faure <faure@kde.org>
* talkd.cpp, ktalkdrc: Some fixes for KDE2 (KInstance, kvt->konsole... * talkd.cpp, ktalkdrc: Some fixes for KDE2 (TDEInstance, kvt->konsole...
2000-03-04 David Smith <dsmith@algonet.se> 2000-03-04 David Smith <dsmith@algonet.se>

@ -91,12 +91,12 @@ int init_user_config(const char * l_name)
struct stat buf; struct stat buf;
TQString cfgFileName, tkannFileName; TQString cfgFileName, tkannFileName;
/* Set $HOME, because KInstance uses it */ /* Set $HOME, because TDEInstance uses it */
setenv("HOME",pw->pw_dir,1 /* overwrite */); setenv("HOME",pw->pw_dir,1 /* overwrite */);
unsetenv("TDEHOME"); unsetenv("TDEHOME");
unsetenv("XAUTHORITY"); unsetenv("XAUTHORITY");
ktalk_debug("%s",pw->pw_dir); ktalk_debug("%s",pw->pw_dir);
KInstance tmpInstance("tmpInstance"); TDEInstance tmpInstance("tmpInstance");
cfgFileName = locateLocal("config", "ktalkdrc", &tmpInstance ); cfgFileName = locateLocal("config", "ktalkdrc", &tmpInstance );
tkannFileName = locateLocal("config", "ktalkannouncerc", &tmpInstance); tkannFileName = locateLocal("config", "ktalkannouncerc", &tmpInstance);
endpwent(); endpwent();

@ -350,7 +350,7 @@ main(int argc, char *argv[])
socklen_t sz = sizeof(sn); socklen_t sz = sizeof(sn);
int do_debug=0, do_badpackets=0, ch; int do_debug=0, do_badpackets=0, ch;
new KInstance("ktalkd"); // for KConfig and friends new TDEInstance("ktalkd"); // for KConfig and friends
ktable = new KTalkdTable(); ktable = new KTalkdTable();
/* make sure we're a daemon */ /* make sure we're a daemon */

@ -66,7 +66,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
int kdemain( int argc, char **argv ) int kdemain( int argc, char **argv )
{ {
KInstance instance( "kio_lan" ); TDEInstance instance( "kio_lan" );
if (argc != 4) if (argc != 4)
{ {

@ -28,7 +28,7 @@ void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status )
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
KAboutData aboutData( "testlibrss", "testlibrss", "0.1" ); TDEAboutData aboutData( "testlibrss", "testlibrss", "0.1" );
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDEApplication app; TDEApplication app;

@ -36,8 +36,8 @@ static KCmdLineOptions options[] = {
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
KAboutData aboutData ("kwifimanager", I18N_NOOP ("KWiFiManager"), VERSION, TDEAboutData aboutData ("kwifimanager", I18N_NOOP ("KWiFiManager"), VERSION,
description, KAboutData::License_GPL, description, TDEAboutData::License_GPL,
"(c) 2001-05, Stefan Winter"); "(c) 2001-05, Stefan Winter");
aboutData.addAuthor ("Stefan Winter", I18N_NOOP("Original Author and Maintainer"), "swinter@kde.org"); aboutData.addAuthor ("Stefan Winter", I18N_NOOP("Original Author and Maintainer"), "swinter@kde.org");
aboutData.addCredit ("Helge Deller", I18N_NOOP("Lots of Fixes and Optimizations, added Session Management"), aboutData.addCredit ("Helge Deller", I18N_NOOP("Lots of Fixes and Optimizations, added Session Management"),

Loading…
Cancel
Save