diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:22 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:22 -0600 |
commit | bd3c603465110b74a0ddcee72e6f020a78d44e59 (patch) | |
tree | f556266a927227ba3f30e337c4ccf06facc55ea3 /src/profileengine | |
parent | ef5399ae5a952065c7a0679d4a875d154c972945 (diff) | |
download | tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.tar.gz tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/profileengine')
-rw-r--r-- | src/profileengine/editor/profileeditor.cpp | 6 | ||||
-rw-r--r-- | src/profileengine/lib/profileengine.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp index bb887f39..0fa5d5fe 100644 --- a/src/profileengine/editor/profileeditor.cpp +++ b/src/profileengine/editor/profileeditor.cpp @@ -28,10 +28,10 @@ #include <tdelistbox.h> #include <tdelistview.h> #include <kcombobox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdialogbase.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeversion.h> #include <profile.h> diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp index e811740c..51131566 100644 --- a/src/profileengine/lib/profileengine.cpp +++ b/src/profileengine/lib/profileengine.cpp @@ -22,7 +22,7 @@ #include <kurl.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kdevplugin.h> |