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

---
 kbarcode/Makefile.am          |  4 ++--
 kbarcode/batchwizard.cpp      |  6 +++---
 kbarcode/databasebrowser.cpp  |  4 ++--
 kbarcode/dsmainwindow.cpp     |  6 +++---
 kbarcode/dsmainwindow.h       |  2 +-
 kbarcode/kbarcode.cpp         |  4 ++--
 kbarcode/labeleditor.cpp      |  6 +++---
 kbarcode/multilineeditdlg.cpp |  4 ++--
 kbarcode/tdeactionmap.cpp     | 12 ++++++------
 kbarcode/tdeactionmap.h       |  2 +-
 kbarcode/tec.cpp              |  4 ++--
 kbarcode/tec.h                |  4 ++--
 kbarcode/textlineedit.cpp     |  4 ++--
 kbarcode/tokendialog.cpp      |  4 ++--
 14 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/kbarcode/Makefile.am b/kbarcode/Makefile.am
index 16b4790..819d8df 100644
--- a/kbarcode/Makefile.am
+++ b/kbarcode/Makefile.am
@@ -35,7 +35,7 @@ noinst_HEADERS = barcodecombo.h barcodedialog.h barcodedialogs.h \
 	propertywidget.h tec.h barcodeprinterdlg.h textlineitem.h textlineedit.h tokendialog.h \
 	barkode.h gnubarcode.h barkodeengine.h pixmapbarcode.h batchwizard.h csvfile.h \
 	referencecounted.h dstextedit.h encodingcombo.h purepostscript.h tbarcode2.h \
-	kactionmap.h
+	tdeactionmap.h
 
 kbarcode_SOURCES = barcodecombo.cpp barcodedialog.cpp \
 	barcodedialogs.cpp commands.cpp configdialog.cpp confwizard.cpp csvimportdlg.cpp \
@@ -50,7 +50,7 @@ kbarcode_SOURCES = barcodecombo.cpp barcodedialog.cpp \
 	propertywidget.cpp tec.cpp barcodeprinterdlg.cpp textlineitem.cpp textlineedit.cpp \
 	tokendialog.cpp barkode.cpp gnubarcode.cpp barkodeengine.cpp pixmapbarcode.cpp batchwizard.cpp \
 	csvfile.cpp referencecounted.cpp dstextedit.cpp encodingcombo.cpp purepostscript.cpp tbarcode2.cpp \
-	kactionmap.cpp
+	tdeactionmap.cpp
 
 xdg_apps_DATA = kbarcode.desktop kbarcode-batch.desktop kbarcode-editor.desktop kbarcode-label.desktop kbarcode-single.desktop
 
diff --git a/kbarcode/batchwizard.cpp b/kbarcode/batchwizard.cpp
index 17193a3..5f99793 100644
--- a/kbarcode/batchwizard.cpp
+++ b/kbarcode/batchwizard.cpp
@@ -54,11 +54,11 @@
 #include <kiconloader.h>
 #include <kimageio.h>
 #include <klineedit.h>
-#include <klistbox.h>
-#include <klistview.h>
+#include <tdelistbox.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <knuminput.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <kurlrequester.h>
 #include <tqtable.h>
diff --git a/kbarcode/databasebrowser.cpp b/kbarcode/databasebrowser.cpp
index 7637201..b59fff9 100644
--- a/kbarcode/databasebrowser.cpp
+++ b/kbarcode/databasebrowser.cpp
@@ -25,12 +25,12 @@
 #include <tqclipboard.h>
 
 // KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <keditcl.h>
 #include <klocale.h>
 #include <kmenubar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstatusbar.h>
 
 #define CUR_TABLE_ID 6666
diff --git a/kbarcode/dsmainwindow.cpp b/kbarcode/dsmainwindow.cpp
index 451256d..2b24809 100644
--- a/kbarcode/dsmainwindow.cpp
+++ b/kbarcode/dsmainwindow.cpp
@@ -20,7 +20,7 @@
 #include "confwizard.h"
 #include "printersettings.h"
 #include "kbarcodesettings.h"
-#include "kactionmap.h"
+#include "tdeactionmap.h"
 #include "barkode.h"
 
 // TQt includes
@@ -29,14 +29,14 @@
 #include <tqsqldatabase.h>
 
 // KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <krun.h>
 
diff --git a/kbarcode/dsmainwindow.h b/kbarcode/dsmainwindow.h
index 4eda407..9c3da0b 100644
--- a/kbarcode/dsmainwindow.h
+++ b/kbarcode/dsmainwindow.h
@@ -19,7 +19,7 @@
 #define DSMAINWINDOW_H
 
 #include <tqwidget.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class TDEAction;
 class TDEPopupMenu;
diff --git a/kbarcode/kbarcode.cpp b/kbarcode/kbarcode.cpp
index 1454a0b..ac472b4 100644
--- a/kbarcode/kbarcode.cpp
+++ b/kbarcode/kbarcode.cpp
@@ -30,12 +30,12 @@
 #include <tqlayout.h>
 
 // KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <kmessagebox.h>
 
diff --git a/kbarcode/labeleditor.cpp b/kbarcode/labeleditor.cpp
index 2945266..becabd7 100644
--- a/kbarcode/labeleditor.cpp
+++ b/kbarcode/labeleditor.cpp
@@ -78,7 +78,7 @@
 
 // KDE includes
 #include <kabc/stdaddressbook.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kcolordialog.h>
 #include <kcommand.h>
@@ -87,12 +87,12 @@
 #include <kiconloader.h>
 #include <kimageio.h>
 #include <klineedit.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <knuminput.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <kprinter.h>
 #include <krun.h>
diff --git a/kbarcode/multilineeditdlg.cpp b/kbarcode/multilineeditdlg.cpp
index 3c43d52..5826fe8 100644
--- a/kbarcode/multilineeditdlg.cpp
+++ b/kbarcode/multilineeditdlg.cpp
@@ -19,14 +19,14 @@
 #include "tokendialog.h"
 
 // KDE includes
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeversion.h>
 #include <kcolordialog.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
 #include <tdespell.h>
 #include <dstextedit.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kcombobox.h>
 
 // TQt includes
diff --git a/kbarcode/tdeactionmap.cpp b/kbarcode/tdeactionmap.cpp
index ca7f396..74a4f28 100644
--- a/kbarcode/tdeactionmap.cpp
+++ b/kbarcode/tdeactionmap.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kactionmap.cpp  -  description
+                          tdeactionmap.cpp  -  description
                              -------------------
     begin                : Fri Mai 19 2006
     copyright            : (C) 2006 by Dominik Seichter
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "kactionmap.h"
+#include "tdeactionmap.h"
 
 #include <tqimage.h>
 #include <tqlabel.h>
@@ -27,11 +27,11 @@
 #include <tqregexp.h>
 #include <tqvbox.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #if TDE_VERSION >= 0x030500
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
 #endif
 #include <klocale.h>
 
@@ -185,4 +185,4 @@ void TDEActionMap::updateEnabledState()
     m_listView->repaintContents();
 }
 
-#include "kactionmap.moc"
+#include "tdeactionmap.moc"
diff --git a/kbarcode/tdeactionmap.h b/kbarcode/tdeactionmap.h
index 3245785..c0be7ec 100644
--- a/kbarcode/tdeactionmap.h
+++ b/kbarcode/tdeactionmap.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          kactionmap.h  -  description
+                          tdeactionmap.h  -  description
                              -------------------
     begin                : Fri Mai 19 2006
     copyright            : (C) 2006 by Dominik Seichter
diff --git a/kbarcode/tec.cpp b/kbarcode/tec.cpp
index 75f8404..01d51c2 100644
--- a/kbarcode/tec.cpp
+++ b/kbarcode/tec.cpp
@@ -38,13 +38,13 @@
 #include <kcombobox.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <klineeditdlg.h>
 #include <klocale.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <knuminput.h>
 #include <kprinter.h>
 #include <kurlrequester.h>
diff --git a/kbarcode/tec.h b/kbarcode/tec.h
index 163dfee..f3a0633 100644
--- a/kbarcode/tec.h
+++ b/kbarcode/tec.h
@@ -38,13 +38,13 @@
 #include <kcombobox.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <klineeditdlg.h>
 #include <klocale.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <knuminput.h>
 #include <kprinter.h>
 #include <kurlrequester.h>
diff --git a/kbarcode/textlineedit.cpp b/kbarcode/textlineedit.cpp
index 3a1bc79..6e42531 100644
--- a/kbarcode/textlineedit.cpp
+++ b/kbarcode/textlineedit.cpp
@@ -14,14 +14,14 @@
 
 // KDE includes
 #include <knuminput.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeversion.h>
 #include <kcolordialog.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
 #include <tdespell.h>
 #include <klineedit.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kcombobox.h>
 
 // TQt includes
diff --git a/kbarcode/tokendialog.cpp b/kbarcode/tokendialog.cpp
index c7a5ec8..22bafd6 100644
--- a/kbarcode/tokendialog.cpp
+++ b/kbarcode/tokendialog.cpp
@@ -21,8 +21,8 @@
 #include "dstextedit.h"
 
 #include <klineedit.h>
-#include <klistbox.h>
-#include <klistview.h>
+#include <tdelistbox.h>
+#include <tdelistview.h>
 #include <klocale.h>
 
 #include <tqhbox.h>