summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/irc/ircaccount.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/ircaccount.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/ircaccount.cpp')
-rw-r--r--kopete/protocols/irc/ircaccount.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp
index 3c8c5b85..9a316854 100644
--- a/kopete/protocols/irc/ircaccount.cpp
+++ b/kopete/protocols/irc/ircaccount.cpp
@@ -40,7 +40,7 @@
#include "kopeteview.h"
#include "kopetepassword.h"
-#include <kaction.h>
+#include <tdeaction.h>
#include <kaboutdata.h>
#include <kapplication.h>
#include <tdeconfig.h>
@@ -52,7 +52,7 @@
#include <klineeditdlg.h>
#include <kmessagebox.h>
#include <knotifyclient.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <tqlayout.h>
#include <tqtimer.h>