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

---
 src/kile/CMakeLists.txt             |  2 +-
 src/kile/Makefile.am                |  2 +-
 src/kile/cleandialog.cpp            |  2 +-
 src/kile/configcheckerdlg.cpp       |  2 +-
 src/kile/configcheckerwidget.ui     |  2 +-
 src/kile/configcodecompletion.h     |  2 +-
 src/kile/editorkeysequencemanager.h |  2 +-
 src/kile/kile.cpp                   |  2 +-
 src/kile/kileabbrevview.cpp         |  2 +-
 src/kile/kileabbrevview.h           |  4 ++--
 src/kile/kileactions.h              |  2 +-
 src/kile/kiledocumentinfo.h         |  2 +-
 src/kile/kilefileselect.cpp         |  2 +-
 src/kile/kilegrepdialog.cpp         |  4 ++--
 src/kile/kilejscript.h              |  2 +-
 src/kile/kilelistselector.h         |  2 +-
 src/kile/kileprojectview.cpp        |  2 +-
 src/kile/kileprojectview.h          |  2 +-
 src/kile/kilestdactions.cpp         |  2 +-
 src/kile/kilestructurewidget.h      |  4 ++--
 src/kile/kiletoolconfigwidget.cpp   |  4 ++--
 src/kile/kiletoolmanager.cpp        |  2 +-
 src/kile/latexcmddialog.h           |  2 +-
 src/kile/managetemplatesdialog.h    |  2 +-
 src/kile/previewconfigwidget.cpp    |  8 ++++----
 src/kile/previewwidget.cpp          | 10 +++++-----
 src/kile/quickpreview.cpp           |  6 +++---
 src/kile/quickpreview.h             |  2 +-
 src/kile/quictdetoolconfigwidget.ui |  2 +-
 src/kile/scriptsmanagementwidget.h  |  4 ++--
 src/kile/texdocdialog.h             |  2 +-
 src/kile/userhelpdialog.h           |  2 +-
 32 files changed, 46 insertions(+), 46 deletions(-)

(limited to 'src')

diff --git a/src/kile/CMakeLists.txt b/src/kile/CMakeLists.txt
index 0a91528..da7aaab 100644
--- a/src/kile/CMakeLists.txt
+++ b/src/kile/CMakeLists.txt
@@ -121,7 +121,7 @@ SET( kile_UI
 	toolconfigwidget.ui
 	librarytoolconfigwidget.ui
 	processtoolconfigwidget.ui
-	quicktoolconfigwidget.ui
+	quictdetoolconfigwidget.ui
 	latextoolconfigwidget.ui
 	newtoolwizard.ui
 	envconfigwidget.ui
diff --git a/src/kile/Makefile.am b/src/kile/Makefile.am
index 1c6ae7b..98a0f66 100644
--- a/src/kile/Makefile.am
+++ b/src/kile/Makefile.am
@@ -21,7 +21,7 @@ kile_SOURCES = latexcmd.cpp latexcmddialog.cpp texdocdialog.cpp userhelp.cpp \
 	latexconfigwidget.ui kileconfig.kcfgc generalconfigwidget.ui kileerrorhandler.cpp \
 	configcheckerdlg.cpp configcheckerwidget.ui configtester.cpp kilesidebar.cpp \
 	toolconfigwidget.ui librarytoolconfigwidget.ui processtoolconfigwidget.ui \
-	quicktoolconfigwidget.ui plaintolatexconverter.cpp latextoolconfigwidget.ui newtoolwizard.ui \
+	quictdetoolconfigwidget.ui plaintolatexconverter.cpp latextoolconfigwidget.ui newtoolwizard.ui \
 	kileuntitled.cpp kilestatsdlg.cpp kilestatswidget.cpp envconfigwidget.ui \
 	structureconfigwidget.ui previewwidget.cpp kilejscript.h kilejscript.cpp \
 	scriptsmanagementwidget.h scriptsmanagementwidget.cpp editorkeysequencemanager.h \
diff --git a/src/kile/cleandialog.cpp b/src/kile/cleandialog.cpp
index 4dd07a7..337ba20 100644
--- a/src/kile/cleandialog.cpp
+++ b/src/kile/cleandialog.cpp
@@ -19,7 +19,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/src/kile/configcheckerdlg.cpp b/src/kile/configcheckerdlg.cpp
index b49498e..ec4d066 100644
--- a/src/kile/configcheckerdlg.cpp
+++ b/src/kile/configcheckerdlg.cpp
@@ -26,7 +26,7 @@
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <tdefiledialog.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include "kiledebug.h"
 
 #include "configcheckerwidget.h"
diff --git a/src/kile/configcheckerwidget.ui b/src/kile/configcheckerwidget.ui
index a6fce36..a57c284 100644
--- a/src/kile/configcheckerwidget.ui
+++ b/src/kile/configcheckerwidget.ui
@@ -107,6 +107,6 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kprogress.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
diff --git a/src/kile/configcodecompletion.h b/src/kile/configcodecompletion.h
index 35ec4c5..14f6e85 100644
--- a/src/kile/configcodecompletion.h
+++ b/src/kile/configcodecompletion.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 
 #include <tdeversion.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 #include <tdeconfig.h>
 
diff --git a/src/kile/editorkeysequencemanager.h b/src/kile/editorkeysequencemanager.h
index 8ef2b12..9c99df0 100644
--- a/src/kile/editorkeysequencemanager.h
+++ b/src/kile/editorkeysequencemanager.h
@@ -20,7 +20,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 
-// include <kaction.h>
+// include <tdeaction.h>
 #include <kate/view.h>
 
 namespace KileJScript {
diff --git a/src/kile/kile.cpp b/src/kile/kile.cpp
index 3644160..9e3d7ad 100644
--- a/src/kile/kile.cpp
+++ b/src/kile/kile.cpp
@@ -22,7 +22,7 @@
 #include <tqtooltip.h>
 #include <tqguardedptr.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <khelpmenu.h>
 #include <kmenubar.h>
 #include <kstatusbar.h>
diff --git a/src/kile/kileabbrevview.cpp b/src/kile/kileabbrevview.cpp
index 13817b2..484994a 100644
--- a/src/kile/kileabbrevview.cpp
+++ b/src/kile/kileabbrevview.cpp
@@ -15,7 +15,7 @@
 
 #include "kileabbrevview.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include "kiledebug.h"
diff --git a/src/kile/kileabbrevview.h b/src/kile/kileabbrevview.h
index 9dc0368..f978aab 100644
--- a/src/kile/kileabbrevview.h
+++ b/src/kile/kileabbrevview.h
@@ -21,8 +21,8 @@
 #include <tqpopupmenu.h>
 
 #include <klineedit.h>
-#include <klistbox.h>
-#include <klistview.h>
+#include <tdelistbox.h>
+#include <tdelistview.h>
 #include <kdialogbase.h>
 
 //////////////////// KlistView for abbreviations ////////////////////
diff --git a/src/kile/kileactions.h b/src/kile/kileactions.h
index bbd228e..af3328c 100644
--- a/src/kile/kileactions.h
+++ b/src/kile/kileactions.h
@@ -17,7 +17,7 @@
 
 #include <tqdict.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdialogbase.h>
 #include <klineedit.h>
 
diff --git a/src/kile/kiledocumentinfo.h b/src/kile/kiledocumentinfo.h
index 7f18f1c..fa1376d 100644
--- a/src/kile/kiledocumentinfo.h
+++ b/src/kile/kiledocumentinfo.h
@@ -18,7 +18,7 @@
 
 #include <kate/document.h>
 #include "kiledebug.h"
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurl.h>
 #include <kdialogbase.h>
 #include <latexcmd.h>
diff --git a/src/kile/kilefileselect.cpp b/src/kile/kilefileselect.cpp
index bd7d70a..03b4518 100644
--- a/src/kile/kilefileselect.cpp
+++ b/src/kile/kilefileselect.cpp
@@ -26,7 +26,7 @@ from Kate (C) 2001 by Matt Newell
 #include <tqstrlist.h>
 #include <tqtooltip.h>
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kiconloader.h>
 #include <kprotocolinfo.h>
 #include <tdeconfig.h>
diff --git a/src/kile/kilegrepdialog.cpp b/src/kile/kilegrepdialog.cpp
index 386fdb0..ff8e0ee 100644
--- a/src/kile/kilegrepdialog.cpp
+++ b/src/kile/kilegrepdialog.cpp
@@ -56,7 +56,7 @@
 
 #include <kcombobox.h>
 #include <kapplication.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kbuttonbox.h>
 #include <tdefiledialog.h>
 #include <kprocess.h>
@@ -66,7 +66,7 @@
 #include <kurlrequester.h>
 #include <kurlcompletion.h>
 #include <klineedit.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include "kiledebug.h"
 
 #include "kileconfig.h"
diff --git a/src/kile/kilejscript.h b/src/kile/kilejscript.h
index bd4cab0..02983ac 100644
--- a/src/kile/kilejscript.h
+++ b/src/kile/kilejscript.h
@@ -20,7 +20,7 @@
 #include <kjs/interpreter.h>
 #include <kjs/object.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kdirwatch.h>
 
diff --git a/src/kile/kilelistselector.h b/src/kile/kilelistselector.h
index 5bf8960..971e893 100644
--- a/src/kile/kilelistselector.h
+++ b/src/kile/kilelistselector.h
@@ -18,7 +18,7 @@
 #define KILELISTSELECTOR_H
 
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TDEListView;
 class TQStringList;
diff --git a/src/kile/kileprojectview.cpp b/src/kile/kileprojectview.cpp
index 58f0932..8ce0260 100644
--- a/src/kile/kileprojectview.cpp
+++ b/src/kile/kileprojectview.cpp
@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurl.h>
 #include <krun.h>
 #include <kmimetype.h>
diff --git a/src/kile/kileprojectview.h b/src/kile/kileprojectview.h
index 85cbce8..cb3f488 100644
--- a/src/kile/kileprojectview.h
+++ b/src/kile/kileprojectview.h
@@ -18,7 +18,7 @@
 #define KILEPROJECTVIEW_H
 
 #include <ktrader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include "kileproject.h"
 
diff --git a/src/kile/kilestdactions.cpp b/src/kile/kilestdactions.cpp
index 1e94ea8..860c9ba 100644
--- a/src/kile/kilestdactions.cpp
+++ b/src/kile/kilestdactions.cpp
@@ -19,7 +19,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
diff --git a/src/kile/kilestructurewidget.h b/src/kile/kilestructurewidget.h
index b93b8b0..6182caf 100644
--- a/src/kile/kilestructurewidget.h
+++ b/src/kile/kilestructurewidget.h
@@ -26,8 +26,8 @@
 #include <tqvbox.h>
 #include <tqtooltip.h>
 
-#include <klistview.h>
-#include <kpopupmenu.h>
+#include <tdelistview.h>
+#include <tdepopupmenu.h>
 #include <ktrader.h>
 
 #include "kiledocumentinfo.h"
diff --git a/src/kile/kiletoolconfigwidget.cpp b/src/kile/kiletoolconfigwidget.cpp
index 960f34b..4a29560 100644
--- a/src/kile/kiletoolconfigwidget.cpp
+++ b/src/kile/kiletoolconfigwidget.cpp
@@ -26,7 +26,7 @@
 #include <tqwidgetstack.h>
 
 #include "kiledebug.h"
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <keditlistbox.h>
 #include <klocale.h>
 #include <kicondialog.h>
@@ -43,7 +43,7 @@
 #include "toolconfigwidget.h"
 #include "processtoolconfigwidget.h"
 #include "librarytoolconfigwidget.h"
-#include "quicktoolconfigwidget.h"
+#include "quictdetoolconfigwidget.h"
 #include "latextoolconfigwidget.h"
 #include "newtoolwizard.h"
 
diff --git a/src/kile/kiletoolmanager.cpp b/src/kile/kiletoolmanager.cpp
index 9e614c3..fec2fe6 100644
--- a/src/kile/kiletoolmanager.cpp
+++ b/src/kile/kiletoolmanager.cpp
@@ -24,7 +24,7 @@
 #include <tqregexp.h>
 #include <tqthread.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <ktextedit.h>
 #include <tdeconfig.h>
 #include "kiledebug.h"
diff --git a/src/kile/latexcmddialog.h b/src/kile/latexcmddialog.h
index d214274..725abc2 100644
--- a/src/kile/latexcmddialog.h
+++ b/src/kile/latexcmddialog.h
@@ -23,7 +23,7 @@
 #include <kpushbutton.h>
 #include <kdialogbase.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdeconfig.h>
 
 #include <tqlabel.h>
diff --git a/src/kile/managetemplatesdialog.h b/src/kile/managetemplatesdialog.h
index 7bcba5f..9762c05 100644
--- a/src/kile/managetemplatesdialog.h
+++ b/src/kile/managetemplatesdialog.h
@@ -20,7 +20,7 @@
 #include <tqfileinfo.h>
 #include <tqstring.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdialogbase.h>
 #include <klineedit.h>
 #include <kurl.h>
diff --git a/src/kile/previewconfigwidget.cpp b/src/kile/previewconfigwidget.cpp
index 5f56f0f..634c9e2 100644
--- a/src/kile/previewconfigwidget.cpp
+++ b/src/kile/previewconfigwidget.cpp
@@ -191,14 +191,14 @@ void KileWidgetPreviewConfig::writeConfig(void)
 void KileWidgetPreviewConfig::setupSeparateWindow()
 {
 	// get all possible tasks for QuickPreview in a separate window
-	TQStringList tasklist;
-	m_preview->getTaskList(tasklist);
+	TQStringList tastdelist;
+	m_preview->getTaskList(tastdelist);
 	
 	// split them into group and combobox entry
 	m_combobox->clear();
-	for ( uint i=0; i<tasklist.count(); ++i ) 
+	for ( uint i=0; i<tastdelist.count(); ++i ) 
 	{
-		TQStringList list = TQStringList::split("=",tasklist[i]);
+		TQStringList list = TQStringList::split("=",tastdelist[i]);
 		if ( m_config->hasGroup( list[0] ) ) 
 		{
 			m_combobox->insertItem( list[1] );
diff --git a/src/kile/previewwidget.cpp b/src/kile/previewwidget.cpp
index a200410..df67f10 100644
--- a/src/kile/previewwidget.cpp
+++ b/src/kile/previewwidget.cpp
@@ -81,11 +81,11 @@ void PreviewWidget::showActivePreview(const TQString &text,const TQString &textf
 
 
 	// set parameter for these tools
-	TQString tasklist,tool,toolcfg,extension;
+	TQString tastdelist,tool,toolcfg,extension;
 	if (conversiontype == pwConvert )
 	{
 		m_conversionTool = "convert";
-		tasklist = "PreviewPDFLaTeX,,,,,png";
+		tastdelist = "PreviewPDFLaTeX,,,,,png";
 		tool = "Convert";
 		toolcfg = "pdf2png";
 		extension = "pdf";
@@ -93,7 +93,7 @@ void PreviewWidget::showActivePreview(const TQString &text,const TQString &textf
 	else if (conversiontype == pwDvipsConvert )
 	{
 		m_conversionTool = "dvips/convert";
-		tasklist = "PreviewLaTeX,DVItoPS,dvi2eps,,,png";
+		tastdelist = "PreviewLaTeX,DVItoPS,dvi2eps,,,png";
 		tool = "Convert";
 		toolcfg = "eps2png";
 		extension = "eps";
@@ -101,13 +101,13 @@ void PreviewWidget::showActivePreview(const TQString &text,const TQString &textf
 	else
 	{
 		m_conversionTool = "dvipng";
-		tasklist = "PreviewLaTeX,,,,,png";
+		tastdelist = "PreviewLaTeX,,,,,png";
 		tool = "DVItoPNG";
 		toolcfg = TQString();
 		extension = "dvi";
 	}
 
-	if ( ! m_info->quickPreview()->run(text, textfilename, startrow, tasklist) )
+	if ( ! m_info->quickPreview()->run(text, textfilename, startrow, tastdelist) )
 		return;
  
 	KileTool::Base *pngConverter = m_info->toolFactory()->create(tool);
diff --git a/src/kile/quickpreview.cpp b/src/kile/quickpreview.cpp
index a72034b..49a24ba 100644
--- a/src/kile/quickpreview.cpp
+++ b/src/kile/quickpreview.cpp
@@ -146,10 +146,10 @@ void QuickPreview::previewMathgroup(Kate::Document *doc)
 
 //////////////////// run quick preview ////////////////////
 
-void QuickPreview::getTaskList(TQStringList &tasklist)
+void QuickPreview::getTaskList(TQStringList &tastdelist)
 {
-	tasklist.clear();
-	tasklist << "Tool/ViewDVI/Embedded Viewer=" + m_taskList[0]
+	tastdelist.clear();
+	tastdelist << "Tool/ViewDVI/Embedded Viewer=" + m_taskList[0]
 	         << "Tool/ViewDVI/KDVI Unique="     + m_taskList[1]
 	         << "Tool/ViewPS/Embedded Viewer="  + m_taskList[2]
 	         << "Tool/ViewPS/KGhostView="       + m_taskList[3]
diff --git a/src/kile/quickpreview.h b/src/kile/quickpreview.h
index e1a4338..3e6ed13 100644
--- a/src/kile/quickpreview.h
+++ b/src/kile/quickpreview.h
@@ -63,7 +63,7 @@ public:
    * @return             true if method succeeds, else false
    */
 	bool run (const TQString &text, const TQString &textfilename, int startrow, const TQString &spreviewlist);
-	void getTaskList(TQStringList &tasklist);
+	void getTaskList(TQStringList &tastdelist);
   
   /**
    * QuickPreview uses temporary files for processing the output. 
diff --git a/src/kile/quictdetoolconfigwidget.ui b/src/kile/quictdetoolconfigwidget.ui
index dcb2a3d..d0258e6 100644
--- a/src/kile/quictdetoolconfigwidget.ui
+++ b/src/kile/quictdetoolconfigwidget.ui
@@ -197,7 +197,7 @@
     <include location="local" impldecl="in implementation">kiletoolmanager.h</include>
     <include location="global" impldecl="in implementation">tqstring.h</include>
     <include location="global" impldecl="in implementation">kglobal.h</include>
-    <include location="local" impldecl="in implementation">tquicktoolconfigwidget.ui.h</include>
+    <include location="local" impldecl="in implementation">tquictdetoolconfigwidget.ui.h</include>
 </includes>
 <variables>
     <variable access="private">TQString m_sequence;</variable>
diff --git a/src/kile/scriptsmanagementwidget.h b/src/kile/scriptsmanagementwidget.h
index 97a5452..6439721 100644
--- a/src/kile/scriptsmanagementwidget.h
+++ b/src/kile/scriptsmanagementwidget.h
@@ -17,8 +17,8 @@
 #include <tqtoolbutton.h>
 #include <tqwidget.h>
 
-#include <klistview.h>
-#include <ktoolbar.h>
+#include <tdelistview.h>
+#include <tdetoolbar.h>
 
 class KileInfo;
 
diff --git a/src/kile/texdocdialog.h b/src/kile/texdocdialog.h
index 6294459..80541b6 100644
--- a/src/kile/texdocdialog.h
+++ b/src/kile/texdocdialog.h
@@ -24,7 +24,7 @@
 #include <kpushbutton.h>
 #include <kprocess.h>
 #include <ktempfile.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqlabel.h>
 #include <tqstringlist.h>
diff --git a/src/kile/userhelpdialog.h b/src/kile/userhelpdialog.h
index 8717826..9232398 100644
--- a/src/kile/userhelpdialog.h
+++ b/src/kile/userhelpdialog.h
@@ -22,7 +22,7 @@
 #include <tqwidget.h>   
 #include <tqstringlist.h>
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
 #include <kdialogbase.h>
-- 
cgit v1.2.3