diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:45:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:45:27 -0600 |
| commit | ebb2daa173944aa416d4f4b34cad2cfe18953b2e (patch) | |
| tree | 158fc0a7eff01dcafacdcccfffa3b26ab9b181b9 /kbarcode/labeleditor.cpp | |
| parent | 6fb88df585cc98ddb523ad53ee56841703e2ed2b (diff) | |
| download | kbarcode-ebb2daa173944aa416d4f4b34cad2cfe18953b2e.tar.gz kbarcode-ebb2daa173944aa416d4f4b34cad2cfe18953b2e.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kbarcode/labeleditor.cpp')
| -rw-r--r-- | kbarcode/labeleditor.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kbarcode/labeleditor.cpp b/kbarcode/labeleditor.cpp index 9b78035..763e754 100644 --- a/kbarcode/labeleditor.cpp +++ b/kbarcode/labeleditor.cpp @@ -77,7 +77,7 @@ #include <tqxml.h> // KDE includes -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #include <tdeaction.h> #include <tdeapplication.h> #include <kcolordialog.h> @@ -88,9 +88,9 @@ #include <kimageio.h> #include <klineedit.h> #include <tdelistbox.h> -#include <klocale.h> -#include <kmenubar.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemenubar.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <tdepopupmenu.h> #include <kpushbutton.h> @@ -99,7 +99,7 @@ #include <tdespell.h> #include <kstatusbar.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <dcopclient.h> #include "tcanvasitem.h" |