From da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:21:47 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 kopete/plugins/alias/aliasdialog.ui       | 2 +-
 kopete/plugins/alias/aliasdialogbase.ui   | 2 +-
 kopete/plugins/alias/aliaspreferences.cpp | 2 +-
 kopete/plugins/alias/editaliasdialog.cpp  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kopete/plugins/alias')

diff --git a/kopete/plugins/alias/aliasdialog.ui b/kopete/plugins/alias/aliasdialog.ui
index 6e52c0ce..47e7e9b6 100644
--- a/kopete/plugins/alias/aliasdialog.ui
+++ b/kopete/plugins/alias/aliasdialog.ui
@@ -188,6 +188,6 @@ Do not include the '/' in the command (if you do it will be stripped off anyway)
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kopete/plugins/alias/aliasdialogbase.ui b/kopete/plugins/alias/aliasdialogbase.ui
index 2bdc2e77..0297c6ff 100644
--- a/kopete/plugins/alias/aliasdialogbase.ui
+++ b/kopete/plugins/alias/aliasdialogbase.ui
@@ -99,7 +99,7 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp
index f81da475..6b91418d 100644
--- a/kopete/plugins/alias/aliaspreferences.cpp
+++ b/kopete/plugins/alias/aliaspreferences.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 
 #include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <klineedit.h>
 #include <kglobal.h>
diff --git a/kopete/plugins/alias/editaliasdialog.cpp b/kopete/plugins/alias/editaliasdialog.cpp
index 6acdf153..2408c6d3 100644
--- a/kopete/plugins/alias/editaliasdialog.cpp
+++ b/kopete/plugins/alias/editaliasdialog.cpp
@@ -21,7 +21,7 @@
 #include <tqwidget.h>
 #include <tqstring.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 
 EditAliasDialog::EditAliasDialog( TQWidget* parent, const char* name )
-- 
cgit v1.2.1