diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:51:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:51:08 -0600 |
| commit | b0699f7c1623811cff1fe3794521546d30e84ee1 (patch) | |
| tree | 9d95a691cc5086f0d348984b1fc86d433cdfad53 /src/common/gui | |
| parent | f037da190037979080d407f3c6f0a88026b6bb91 (diff) | |
| download | piklab-b0699f7c1623811cff1fe3794521546d30e84ee1.tar.gz piklab-b0699f7c1623811cff1fe3794521546d30e84ee1.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/common/gui')
| -rw-r--r-- | src/common/gui/editlistbox.cpp | 2 | ||||
| -rw-r--r-- | src/common/gui/misc_gui.cpp | 2 | ||||
| -rw-r--r-- | src/common/gui/misc_gui.h | 2 | ||||
| -rw-r--r-- | src/common/gui/pfile_ext.cpp | 2 | ||||
| -rw-r--r-- | src/common/gui/purl_ext.cpp | 2 | ||||
| -rw-r--r-- | src/common/gui/purl_gui.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/common/gui/editlistbox.cpp b/src/common/gui/editlistbox.cpp index 126f996..3dcfe70 100644 --- a/src/common/gui/editlistbox.cpp +++ b/src/common/gui/editlistbox.cpp @@ -24,7 +24,7 @@ #include <tqheader.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <knotifyclient.h> #include <kiconloader.h> diff --git a/src/common/gui/misc_gui.cpp b/src/common/gui/misc_gui.cpp index 9808492..5c7edf0 100644 --- a/src/common/gui/misc_gui.cpp +++ b/src/common/gui/misc_gui.cpp @@ -21,7 +21,7 @@ #include <kcursor.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeaction.h> #include <ktabbar.h> diff --git a/src/common/gui/misc_gui.h b/src/common/gui/misc_gui.h index 8befca1..5df7382 100644 --- a/src/common/gui/misc_gui.h +++ b/src/common/gui/misc_gui.h @@ -16,7 +16,7 @@ #include <tqcombobox.h> #include <tqwidgetstack.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <ktabwidget.h> #include <ktabbar.h> diff --git a/src/common/gui/pfile_ext.cpp b/src/common/gui/pfile_ext.cpp index b210643..1ace10f 100644 --- a/src/common/gui/pfile_ext.cpp +++ b/src/common/gui/pfile_ext.cpp @@ -10,7 +10,7 @@ #include <tqfile.h> #include <tdeio/netaccess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include "common/gui/misc_gui.h" //----------------------------------------------------------------------------- diff --git a/src/common/gui/purl_ext.cpp b/src/common/gui/purl_ext.cpp index 82348b5..11d7ecb 100644 --- a/src/common/gui/purl_ext.cpp +++ b/src/common/gui/purl_ext.cpp @@ -12,7 +12,7 @@ #include <tqapplication.h> #include <tdeio/netaccess.h> #include <tdefileitem.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeconfigbackend.h> #include "common/global/pfile.h" diff --git a/src/common/gui/purl_gui.h b/src/common/gui/purl_gui.h index c487d86..d7dd012 100644 --- a/src/common/gui/purl_gui.h +++ b/src/common/gui/purl_gui.h @@ -11,7 +11,7 @@ #include <tqvgroupbox.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurllabel.h> #include "common/global/purl.h" |