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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp') 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) { } -- cgit v1.2.1