summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/oscar/oscarcontact.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:47 -0600
commitda47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb (patch)
treeb42ba87fcdfa425a31e243a62d71e1de248b6ee8 /kopete/protocols/oscar/oscarcontact.cpp
parent4ed8d784e29102ed1659f4ccf71fcc6fb0dad5c8 (diff)
downloadtdenetwork-da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb.tar.gz
tdenetwork-da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols/oscar/oscarcontact.cpp')
-rw-r--r--kopete/protocols/oscar/oscarcontact.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/kopete/protocols/oscar/oscarcontact.cpp b/kopete/protocols/oscar/oscarcontact.cpp
index c145b467..f9bf5fae 100644
--- a/kopete/protocols/oscar/oscarcontact.cpp
+++ b/kopete/protocols/oscar/oscarcontact.cpp
@@ -21,7 +21,7 @@
#include <tqapplication.h>
#include <tqtextcodec.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>