From da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:21:47 -0600 Subject: Rename many classes and header files to avoid conflicts with KDE4 --- kopete/protocols/irc/ui/channellist.cpp | 2 +- kopete/protocols/irc/ui/irceditaccount.ui | 2 +- kopete/protocols/irc/ui/irceditaccountwidget.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kopete/protocols/irc/ui') diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp index 2d4e357b..6f26b0e4 100644 --- a/kopete/protocols/irc/ui/channellist.cpp +++ b/kopete/protocols/irc/ui/channellist.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kopete/protocols/irc/ui/irceditaccount.ui b/kopete/protocols/irc/ui/irceditaccount.ui index 4b308655..8bdb552a 100644 --- a/kopete/protocols/irc/ui/irceditaccount.ui +++ b/kopete/protocols/irc/ui/irceditaccount.ui @@ -1017,6 +1017,6 @@ - klistview.h + tdelistview.h diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp index 12784ae5..0b357726 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp +++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include #include -- cgit v1.2.1