summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/irc/ircguiclient.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/irc/ircguiclient.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/irc/ircguiclient.cpp')
-rw-r--r--kopete/protocols/irc/ircguiclient.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kopete/protocols/irc/ircguiclient.cpp b/kopete/protocols/irc/ircguiclient.cpp
index 702aafa9..3724781d 100644
--- a/kopete/protocols/irc/ircguiclient.cpp
+++ b/kopete/protocols/irc/ircguiclient.cpp
@@ -18,13 +18,13 @@
#include <tdeversion.h>
#if KDE_IS_VERSION( 3, 1, 90 )
- #include <kactioncollection.h>
+ #include <tdeactioncollection.h>
#else
// ------------------------------------------------------------
// TODO: UGLY HACK, remove when we drop KDE 3.1 compatibility
#ifdef KDE_NO_COMPAT
#undef KDE_NO_COMPAT
-#include <kaction.h>
+#include <tdeaction.h>
#define KDE_NO_COMPAT 1
#endif
// ------------------------------------------------------------