From ef71f46965855308db367f74956513eccc71bc46 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:21:16 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp | 2 +- kopete/libkopete/tests/mock/kopeteprotocol_mock.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kopete/libkopete/tests/mock') diff --git a/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp b/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp index d9ae1d3a..5b2e3bed 100644 --- a/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp +++ b/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp @@ -24,7 +24,7 @@ namespace Test 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) { } diff --git a/kopete/libkopete/tests/mock/kopeteprotocol_mock.h b/kopete/libkopete/tests/mock/kopeteprotocol_mock.h index d2502790..31418f66 100644 --- a/kopete/libkopete/tests/mock/kopeteprotocol_mock.h +++ b/kopete/libkopete/tests/mock/kopeteprotocol_mock.h @@ -20,7 +20,7 @@ #include "kopeteprotocol.h" -class KInstance; +class TDEInstance; class TQObject; class KopeteEditAccountWidget; @@ -37,7 +37,7 @@ namespace Mock class Protocol : public Kopete::Protocol { public: - Protocol( KInstance *instance, TQObject *parent, const char *name ); + Protocol( TDEInstance *instance, TQObject *parent, const char *name ); // pure virtual functions implemented virtual Account *createNewAccount( const TQString &accountId ); virtual AddContactPage *createAddContactWidget( TQWidget *parent, Kopete::Account *account ); -- cgit v1.2.1