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 /lib/util | |
| parent | ef5399ae5a952065c7a0679d4a875d154c972945 (diff) | |
| download | tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.tar.gz tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'lib/util')
| -rw-r--r-- | lib/util/execcommand.cpp | 4 | ||||
| -rw-r--r-- | lib/util/settings.cpp | 2 | ||||
| -rw-r--r-- | lib/util/tdescriptactionmanager.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/util/execcommand.cpp b/lib/util/execcommand.cpp index d62cb2e7..fea82215 100644 --- a/lib/util/execcommand.cpp +++ b/lib/util/execcommand.cpp @@ -21,8 +21,8 @@ #include <kprocess.h> #include <kprogress.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, const TQString& workingDir, const TQStringList& env, diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp index 0b05d445..8673b58d 100644 --- a/lib/util/settings.cpp +++ b/lib/util/settings.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include "settings.h" diff --git a/lib/util/tdescriptactionmanager.cpp b/lib/util/tdescriptactionmanager.cpp index 20242f1a..c4b44894 100644 --- a/lib/util/tdescriptactionmanager.cpp +++ b/lib/util/tdescriptactionmanager.cpp @@ -24,8 +24,8 @@ #include <kdesktopfile.h> #include <kstandarddirs.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <scriptinterface.h> #include <tdeaction.h> |