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

---
 src/addnetworkroutedialog.cpp                |  2 +-
 src/importipsecprofiledialog.cpp             |  2 +-
 src/kvpnc.cpp                                | 20 ++++++++++----------
 src/kvpnc.h                                  |  8 ++++----
 src/kvpncconfig.cpp                          |  4 ++--
 src/kvpncimportprofileselectiondialog.cpp    |  2 +-
 src/kvpncimportprofileselectiondialogbase.ui |  2 +-
 src/kvpnckicker.cpp                          |  2 +-
 src/kvpnckicker.h                            |  2 +-
 src/logviewerdialog.cpp                      |  2 +-
 src/main.cpp                                 |  2 +-
 src/manageciscocert.cpp                      |  2 +-
 src/newprofilewizardnetworkroute.ui          |  2 +-
 src/preferencesdialog.cpp                    |  2 +-
 src/profilenetworkrouteoptions.cpp           |  2 +-
 src/profilenetworkrouteoptionsbase.ui        |  2 +-
 src/toolsinfodialog.cpp                      |  2 +-
 src/toolsinfowidgetbase.ui                   |  2 +-
 src/vpntypesinfodialog.cpp                   |  2 +-
 19 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/addnetworkroutedialog.cpp b/src/addnetworkroutedialog.cpp
index b36ceb3..787ee62 100644
--- a/src/addnetworkroutedialog.cpp
+++ b/src/addnetworkroutedialog.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "addnetworkroutedialog.h"
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <tqcheckbox.h>
diff --git a/src/importipsecprofiledialog.cpp b/src/importipsecprofiledialog.cpp
index d762d3f..d87546c 100644
--- a/src/importipsecprofiledialog.cpp
+++ b/src/importipsecprofiledialog.cpp
@@ -50,7 +50,7 @@
 #include "importipsecprofiledialog.h"
 #include "utils.h"
 #include "importcertificatedialog.h"
-#include <klistview.h>
+#include <tdelistview.h>
 #include "kvpncimportprofileselectiondialogbase.h"
 
 
diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp
index 0138598..8c34bd4 100644
--- a/src/kvpnc.cpp
+++ b/src/kvpnc.cpp
@@ -77,13 +77,13 @@
 #include <kmessagebox.h>
 #include <tdeio/netaccess.h>
 #include <ktempfile.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <knuminput.h>
 #include <tdewallet.h>
 #include <kinputdialog.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <tdefiledialog.h>
 
 #include "kvpnc.h"
@@ -13992,7 +13992,7 @@ void KVpnc::readFromStderr_ipsecwhack()
 	}
 }
 
-void KVpnc::readFromStdout_ipsecwhacklisten()
+void KVpnc::readFromStdout_ipsecwhactdelisten()
 {
 	if ( IpsecWhackListenProcess == 0 || IpsecGotError )
 		return;
@@ -14142,7 +14142,7 @@ void KVpnc::readFromStdout_ipsecwhacklisten()
 	}
 }
 
-void KVpnc::readFromStderr_ipsecwhacklisten()
+void KVpnc::readFromStderr_ipsecwhactdelisten()
 {
 	bool abort = false;
 	if ( IpsecWhackListenProcess ==0  || IpsecGotError )
@@ -14168,8 +14168,8 @@ void KVpnc::readFromStderr_ipsecwhacklisten()
 			else
 			{
 				// we have to give some time to sleep and try again...
-				connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) );
-				connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) );
+				connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhactdelisten() ) );
+				connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhactdelisten() ) );
 				IpsecWhackListenProcess->tryTerminate();
 				sleep ( 2 );
 				if ( IpsecWhackListenProcess->isRunning() )
@@ -21416,13 +21416,13 @@ void KVpnc::ipsecStarted()
 	IpsecWhackListenProcess->addArgument ( "whack" );
 	IpsecWhackListenProcess->addArgument ( "--listen" );
 
-	connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) );
-	connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) );
+	connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhactdelisten() ) );
+	connect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhactdelisten() ) );
 
 	if ( !IpsecWhackListenProcess->start ( env ) )
 	{
-		disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhacklisten() ) );
-		disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhacklisten() ) );
+		disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStdout() ), this, TQT_SLOT ( readFromStdout_ipsecwhactdelisten() ) );
+		disconnect ( IpsecWhackListenProcess, TQT_SIGNAL ( readyReadStderr() ), this, TQT_SLOT ( readFromStderr_ipsecwhactdelisten() ) );
 		delete IpsecWhackListenProcess;
 		IpsecWhackListenProcess=0L;
 		KMessageBox::error ( this, i18n ( "\"%1\" start failed!" ).arg ( GlobalConfig->pathToIpsec+" whack' --listen" ) );
diff --git a/src/kvpnc.h b/src/kvpnc.h
index 1a6a4d7..f54ec4e 100644
--- a/src/kvpnc.h
+++ b/src/kvpnc.h
@@ -38,8 +38,8 @@
 #include <tqsize.h>
 #include <tqpopupmenu.h>
 #include <kapp.h>
-#include <kmainwindow.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaction.h>
 #include <kprocess.h>
 #include <kwizard.h>
 #include <kapp.h>
@@ -381,8 +381,8 @@ private slots:
 	void readFromStderr_ipsec();
 	void readFromStdout_ipsecwhack();
 	void readFromStderr_ipsecwhack();
-	void readFromStdout_ipsecwhacklisten();
-	void readFromStderr_ipsecwhacklisten();
+	void readFromStdout_ipsecwhactdelisten();
+	void readFromStderr_ipsecwhactdelisten();
 	void readFromStdout_ipsecwhackstatus();
 	void readFromStderr_ipsecwhackstatus();
 	void readFromStdout_ipsecwhackdelete();
diff --git a/src/kvpncconfig.cpp b/src/kvpncconfig.cpp
index c2e2367..9bcb2c7 100644
--- a/src/kvpncconfig.cpp
+++ b/src/kvpncconfig.cpp
@@ -24,7 +24,7 @@
 #include "kvpncimportprofileselectiondialog.h"
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <iostream>
 #include <kstandarddirs.h>
@@ -35,7 +35,7 @@
 #include <tqcursor.h>
 #include <tqregexp.h>
 #include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurl.h>
 #include <kinputdialog.h>
 #include <klineedit.h>
diff --git a/src/kvpncimportprofileselectiondialog.cpp b/src/kvpncimportprofileselectiondialog.cpp
index 010277d..65d0c66 100644
--- a/src/kvpncimportprofileselectiondialog.cpp
+++ b/src/kvpncimportprofileselectiondialog.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "kvpncimportprofileselectiondialog.h"
 #include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqlistview.h>
 
 KvpncImportProfileSelectionDialog::KvpncImportProfileSelectionDialog()
diff --git a/src/kvpncimportprofileselectiondialogbase.ui b/src/kvpncimportprofileselectiondialogbase.ui
index 29aa564..e4858cf 100644
--- a/src/kvpncimportprofileselectiondialogbase.ui
+++ b/src/kvpncimportprofileselectiondialogbase.ui
@@ -212,7 +212,7 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/src/kvpnckicker.cpp b/src/kvpnckicker.cpp
index 017c7c0..029463c 100644
--- a/src/kvpnckicker.cpp
+++ b/src/kvpnckicker.cpp
@@ -22,7 +22,7 @@
 #include <tqimage.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
 #include "kvpnckicker.h"
 #include "kvpnc.h"
diff --git a/src/kvpnckicker.h b/src/kvpnckicker.h
index 5480150..1c0413d 100644
--- a/src/kvpnckicker.h
+++ b/src/kvpnckicker.h
@@ -24,7 +24,7 @@
 #include <tqwidget.h>
 #include <tqevent.h>
 #include <ksystemtray.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "kvpncconfig.h"
 
diff --git a/src/logviewerdialog.cpp b/src/logviewerdialog.cpp
index 3a22353..800174b 100644
--- a/src/logviewerdialog.cpp
+++ b/src/logviewerdialog.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "logviewerdialog.h"
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqpixmap.h>
 #include <kglobal.h>
 #include <tqstring.h>
diff --git a/src/main.cpp b/src/main.cpp
index 073398c..eb3f009 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,7 +22,7 @@
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>
 #include <kmessagebox.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kapp.h>
 
 #include <klocale.h>
diff --git a/src/manageciscocert.cpp b/src/manageciscocert.cpp
index e6601f3..af3b0dc 100644
--- a/src/manageciscocert.cpp
+++ b/src/manageciscocert.cpp
@@ -28,7 +28,7 @@
 #include <tqcursor.h>
 
 #include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kcombobox.h>
diff --git a/src/newprofilewizardnetworkroute.ui b/src/newprofilewizardnetworkroute.ui
index 3222e68..988aabd 100644
--- a/src/newprofilewizardnetworkroute.ui
+++ b/src/newprofilewizardnetworkroute.ui
@@ -251,7 +251,7 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/src/preferencesdialog.cpp b/src/preferencesdialog.cpp
index 7e19db1..ea79a52 100644
--- a/src/preferencesdialog.cpp
+++ b/src/preferencesdialog.cpp
@@ -41,7 +41,7 @@
 #include <klineedit.h>
 #include <kinputdialog.h>
 #include <knuminput.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <ktextedit.h>
 #include <kpassdlg.h>
 #include <tqlayout.h>
diff --git a/src/profilenetworkrouteoptions.cpp b/src/profilenetworkrouteoptions.cpp
index 37424f6..519831c 100644
--- a/src/profilenetworkrouteoptions.cpp
+++ b/src/profilenetworkrouteoptions.cpp
@@ -21,7 +21,7 @@
 
 #include <tqcheckbox.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqpushbutton.h>
 #include <kpushbutton.h>
 #include <kmessagebox.h>
diff --git a/src/profilenetworkrouteoptionsbase.ui b/src/profilenetworkrouteoptionsbase.ui
index 708b44e..2619661 100644
--- a/src/profilenetworkrouteoptionsbase.ui
+++ b/src/profilenetworkrouteoptionsbase.ui
@@ -285,7 +285,7 @@
 </forwards>
 <includehints>
     <includehint>kcombobox.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/src/toolsinfodialog.cpp b/src/toolsinfodialog.cpp
index 0a9ab66..0323fbb 100644
--- a/src/toolsinfodialog.cpp
+++ b/src/toolsinfodialog.cpp
@@ -20,7 +20,7 @@
 //BEGIN INCLUDES
 #include "toolsinfodialog.h"
 #include "listviewtooltip.h"
-#include <klistview.h>
+#include <tdelistview.h>
 //#include <tqlistviewitem.h>
 #include <tqpixmap.h>
 #include <kglobal.h>
diff --git a/src/toolsinfowidgetbase.ui b/src/toolsinfowidgetbase.ui
index 706df13..1344661 100644
--- a/src/toolsinfowidgetbase.ui
+++ b/src/toolsinfowidgetbase.ui
@@ -136,6 +136,6 @@
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/src/vpntypesinfodialog.cpp b/src/vpntypesinfodialog.cpp
index fba1cd4..792df3b 100644
--- a/src/vpntypesinfodialog.cpp
+++ b/src/vpntypesinfodialog.cpp
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "vpntypesinfodialog.h"
-#include <klistview.h>
+#include <tdelistview.h>
 //#include <tqlistviewitem.h>
 #include <tqpixmap.h>
 #include <kglobal.h>