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/plugins/highlight/highlightpreferences.cpp | 2 +- kopete/plugins/highlight/highlightprefsbase.ui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'kopete/plugins/highlight') diff --git a/kopete/plugins/highlight/highlightpreferences.cpp b/kopete/plugins/highlight/highlightpreferences.cpp index 875a0dee..34a7a1cc 100644 --- a/kopete/plugins/highlight/highlightpreferences.cpp +++ b/kopete/plugins/highlight/highlightpreferences.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kopete/plugins/highlight/highlightprefsbase.ui b/kopete/plugins/highlight/highlightprefsbase.ui index b820151d..fa7cc9e1 100644 --- a/kopete/plugins/highlight/highlightprefsbase.ui +++ b/kopete/plugins/highlight/highlightprefsbase.ui @@ -454,7 +454,7 @@ - klistview.h + tdelistview.h klineedit.h kcombobox.h kcolorbutton.h -- cgit v1.2.1