summaryrefslogtreecommitdiffstats
path: root/kbarcode
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:52:29 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:52:29 -0600
commit8cc395707c71d7969386b4e365ef827ce2492c74 (patch)
tree9daf8a17cafc4367f4f3b2a8bd19b268d01054f2 /kbarcode
parentc61c58c16694ef68be23922b39d1b6b40cda2b0c (diff)
downloadkbarcode-8cc395707c71d7969386b4e365ef827ce2492c74.tar.gz
kbarcode-8cc395707c71d7969386b4e365ef827ce2492c74.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kbarcode')
-rw-r--r--kbarcode/barcodedialog.cpp2
-rw-r--r--kbarcode/batchprinter.cpp2
-rw-r--r--kbarcode/batchwizard.cpp2
-rw-r--r--kbarcode/configdialog.cpp2
-rw-r--r--kbarcode/definition.cpp2
-rw-r--r--kbarcode/dsmainwindow.cpp2
-rw-r--r--kbarcode/kbarcodesettings.cpp2
-rw-r--r--kbarcode/labeleditor.cpp2
-rw-r--r--kbarcode/multilineeditdlg.cpp2
-rw-r--r--kbarcode/mybarcode.cpp2
-rw-r--r--kbarcode/previewdialog.cpp2
-rw-r--r--kbarcode/printersettings.cpp2
-rw-r--r--kbarcode/sqltables.cpp2
-rw-r--r--kbarcode/tec.cpp2
-rw-r--r--kbarcode/tec.h2
-rw-r--r--kbarcode/textlineedit.cpp2
16 files changed, 16 insertions, 16 deletions
diff --git a/kbarcode/barcodedialog.cpp b/kbarcode/barcodedialog.cpp
index dc58bdd..890cef5 100644
--- a/kbarcode/barcodedialog.cpp
+++ b/kbarcode/barcodedialog.cpp
@@ -24,7 +24,7 @@
// KDE includes
#include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kiconloader.h>
#include <kimageio.h>
#include <klocale.h>
diff --git a/kbarcode/batchprinter.cpp b/kbarcode/batchprinter.cpp
index 1922345..b7d3ede 100644
--- a/kbarcode/batchprinter.cpp
+++ b/kbarcode/batchprinter.cpp
@@ -33,7 +33,7 @@
#include <kabc/addressee.h>
#include <kabc/addresseelist.h>
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kimageio.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/kbarcode/batchwizard.cpp b/kbarcode/batchwizard.cpp
index 3eb5c5e..d71104e 100644
--- a/kbarcode/batchwizard.cpp
+++ b/kbarcode/batchwizard.cpp
@@ -50,7 +50,7 @@
#include <kapplication.h>
#include <kcombobox.h>
#include <kcompletion.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kiconloader.h>
#include <kimageio.h>
#include <klineedit.h>
diff --git a/kbarcode/configdialog.cpp b/kbarcode/configdialog.cpp
index 8fad98b..5cb71e4 100644
--- a/kbarcode/configdialog.cpp
+++ b/kbarcode/configdialog.cpp
@@ -32,7 +32,7 @@
// KDE includes
#include <kabc/addressee.h>
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kcolorbutton.h>
#include <kiconloader.h>
#include <kimageio.h>
diff --git a/kbarcode/definition.cpp b/kbarcode/definition.cpp
index 8fdcb4a..7405ed5 100644
--- a/kbarcode/definition.cpp
+++ b/kbarcode/definition.cpp
@@ -25,7 +25,7 @@
// KDE includes
#include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
diff --git a/kbarcode/dsmainwindow.cpp b/kbarcode/dsmainwindow.cpp
index 7621f1f..04205d8 100644
--- a/kbarcode/dsmainwindow.cpp
+++ b/kbarcode/dsmainwindow.cpp
@@ -31,7 +31,7 @@
// KDE includes
#include <kaction.h>
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kmenubar.h>
diff --git a/kbarcode/kbarcodesettings.cpp b/kbarcode/kbarcodesettings.cpp
index 8c6e43f..0b33e0b 100644
--- a/kbarcode/kbarcodesettings.cpp
+++ b/kbarcode/kbarcodesettings.cpp
@@ -23,7 +23,7 @@
// KDE includes
#include <kapplication.h>
#include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klineedit.h>
#include <knuminput.h>
diff --git a/kbarcode/labeleditor.cpp b/kbarcode/labeleditor.cpp
index c98f5e8..c4a1b51 100644
--- a/kbarcode/labeleditor.cpp
+++ b/kbarcode/labeleditor.cpp
@@ -83,7 +83,7 @@
#include <kcolordialog.h>
#include <kcommand.h>
#include <kcombobox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kiconloader.h>
#include <kimageio.h>
#include <klineedit.h>
diff --git a/kbarcode/multilineeditdlg.cpp b/kbarcode/multilineeditdlg.cpp
index 028ac64..9d7b39d 100644
--- a/kbarcode/multilineeditdlg.cpp
+++ b/kbarcode/multilineeditdlg.cpp
@@ -22,7 +22,7 @@
#include <kaction.h>
#include <tdeversion.h>
#include <kcolordialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <klocale.h>
#include <tdespell.h>
#include <dstextedit.h>
diff --git a/kbarcode/mybarcode.cpp b/kbarcode/mybarcode.cpp
index 6c4f823..50f9bd8 100644
--- a/kbarcode/mybarcode.cpp
+++ b/kbarcode/mybarcode.cpp
@@ -29,7 +29,7 @@ f/***************************************************************************
// KDE includes
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kprocess.h>
diff --git a/kbarcode/previewdialog.cpp b/kbarcode/previewdialog.cpp
index f607fc2..55c631c 100644
--- a/kbarcode/previewdialog.cpp
+++ b/kbarcode/previewdialog.cpp
@@ -33,7 +33,7 @@
#include <kabc/addresseedialog.h>
#include <kapplication.h>
#include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kiconloader.h>
#include <klineedit.h>
#include <klocale.h>
diff --git a/kbarcode/printersettings.cpp b/kbarcode/printersettings.cpp
index da52475..e8ff2b8 100644
--- a/kbarcode/printersettings.cpp
+++ b/kbarcode/printersettings.cpp
@@ -21,7 +21,7 @@
// KDE includes
#include <kapplication.h>
#include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kglobal.h>
#include <klocale.h>
#include <kurl.h>
diff --git a/kbarcode/sqltables.cpp b/kbarcode/sqltables.cpp
index 60ddacd..1756984 100644
--- a/kbarcode/sqltables.cpp
+++ b/kbarcode/sqltables.cpp
@@ -31,7 +31,7 @@
// KDE includes
#include <kapplication.h>
#include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klineedit.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/kbarcode/tec.cpp b/kbarcode/tec.cpp
index 1d183b8..75f8404 100644
--- a/kbarcode/tec.cpp
+++ b/kbarcode/tec.cpp
@@ -36,7 +36,7 @@
// KDE includes
#include <kapplication.h>
#include <kcombobox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kiconloader.h>
#include <klistview.h>
#include <klineedit.h>
diff --git a/kbarcode/tec.h b/kbarcode/tec.h
index 73de630..163dfee 100644
--- a/kbarcode/tec.h
+++ b/kbarcode/tec.h
@@ -36,7 +36,7 @@
// KDE includes
#include <kapplication.h>
#include <kcombobox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kiconloader.h>
#include <klistview.h>
#include <klineedit.h>
diff --git a/kbarcode/textlineedit.cpp b/kbarcode/textlineedit.cpp
index a23764e..b9eca4b 100644
--- a/kbarcode/textlineedit.cpp
+++ b/kbarcode/textlineedit.cpp
@@ -17,7 +17,7 @@
#include <kaction.h>
#include <tdeversion.h>
#include <kcolordialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <klocale.h>
#include <tdespell.h>
#include <klineedit.h>