diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:21:16 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:21:16 -0600 |
commit | ef71f46965855308db367f74956513eccc71bc46 (patch) | |
tree | 71f1aca189b7beda22f9e95b19608dccfa4f3050 /kopete/kopete/config | |
parent | bdf47e8ffbf1c94f4852d9aa2eb535a9ec176658 (diff) | |
download | tdenetwork-ef71f46965855308db367f74956513eccc71bc46.tar.gz tdenetwork-ef71f46965855308db367f74956513eccc71bc46.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kopete/kopete/config')
-rw-r--r-- | kopete/kopete/config/appearance/appearanceconfig.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp index 8bce4350..4ce921aa 100644 --- a/kopete/kopete/config/appearance/appearanceconfig.cpp +++ b/kopete/kopete/config/appearance/appearanceconfig.cpp @@ -714,7 +714,7 @@ public: class FakeProtocol : public Kopete::Protocol { 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;} AddContactPage* createAddContactWidget( TQWidget */*parent*/, Kopete::Account */*account*/){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() { - 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); // Create fake meta/contacts |