diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:08:29 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:08:29 -0600 |
| commit | 5d058a6536bceb2692e266b500d5a24a72880e56 (patch) | |
| tree | e908aec453f50837be5373da6be00e962181e743 /kbarcode | |
| parent | b87cd1a44cc5d292e7c221c67e7c68e8d3a6e0e9 (diff) | |
| download | kbarcode-5d058a6536bceb2692e266b500d5a24a72880e56.tar.gz kbarcode-5d058a6536bceb2692e266b500d5a24a72880e56.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kbarcode')
| -rw-r--r-- | kbarcode/Makefile.am | 2 | ||||
| -rw-r--r-- | kbarcode/labeleditor.cpp | 2 | ||||
| -rw-r--r-- | kbarcode/multilineeditdlg.cpp | 2 | ||||
| -rw-r--r-- | kbarcode/textlineedit.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/kbarcode/Makefile.am b/kbarcode/Makefile.am index c883928..16b4790 100644 --- a/kbarcode/Makefile.am +++ b/kbarcode/Makefile.am @@ -19,7 +19,7 @@ bin_PROGRAMS = kbarcode # the application source, library search path, and link libraries -kbarcode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kbarcode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kbarcode_LDADD = $(LIB_KABC) $(LIB_KSPELL) $(LIB_TDEPRINT) \ $(LIB_TDEUI) -lkjs -lpcre diff --git a/kbarcode/labeleditor.cpp b/kbarcode/labeleditor.cpp index b09b706..c98f5e8 100644 --- a/kbarcode/labeleditor.cpp +++ b/kbarcode/labeleditor.cpp @@ -96,7 +96,7 @@ #include <kpushbutton.h> #include <kprinter.h> #include <krun.h> -#include <kspell.h> +#include <tdespell.h> #include <kstatusbar.h> #include <kstandarddirs.h> #include <ktempfile.h> diff --git a/kbarcode/multilineeditdlg.cpp b/kbarcode/multilineeditdlg.cpp index 3c73623..028ac64 100644 --- a/kbarcode/multilineeditdlg.cpp +++ b/kbarcode/multilineeditdlg.cpp @@ -24,7 +24,7 @@ #include <kcolordialog.h> #include <kfiledialog.h> #include <klocale.h> -#include <kspell.h> +#include <tdespell.h> #include <dstextedit.h> #include <ktoolbar.h> #include <kcombobox.h> diff --git a/kbarcode/textlineedit.cpp b/kbarcode/textlineedit.cpp index 3cb9455..a23764e 100644 --- a/kbarcode/textlineedit.cpp +++ b/kbarcode/textlineedit.cpp @@ -19,7 +19,7 @@ #include <kcolordialog.h> #include <kfiledialog.h> #include <klocale.h> -#include <kspell.h> +#include <tdespell.h> #include <klineedit.h> #include <ktoolbar.h> #include <kcombobox.h> |