diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:49:58 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:49:58 -0600 |
| commit | ce48246cc195efc2819745839e6472f488b24c48 (patch) | |
| tree | 2ad1b85a862bde02770664709f475d13dfd86a23 /krusader/UserAction | |
| parent | 7d9ce9ebe178f9a328f0f34f5c2997e16bc701e6 (diff) | |
| download | krusader-ce48246cc195efc2819745839e6472f488b24c48.tar.gz krusader-ce48246cc195efc2819745839e6472f488b24c48.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'krusader/UserAction')
| -rw-r--r-- | krusader/UserAction/expander.cpp | 4 | ||||
| -rw-r--r-- | krusader/UserAction/kraction.cpp | 4 | ||||
| -rw-r--r-- | krusader/UserAction/kractionbase.cpp | 2 | ||||
| -rw-r--r-- | krusader/UserAction/useraction.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/krusader/UserAction/expander.cpp b/krusader/UserAction/expander.cpp index 6911f13..a037901 100644 --- a/krusader/UserAction/expander.cpp +++ b/krusader/UserAction/expander.cpp @@ -34,8 +34,8 @@ #include <kdebug.h> #include <kinputdialog.h> #include <kstandarddirs.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <tqstringlist.h> #include <tqclipboard.h> diff --git a/krusader/UserAction/kraction.cpp b/krusader/UserAction/kraction.cpp index 409e069..205ec97 100644 --- a/krusader/UserAction/kraction.cpp +++ b/krusader/UserAction/kraction.cpp @@ -12,7 +12,7 @@ #include <kdialogbase.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinputdialog.h> #include <tqtextedit.h> #include <tqvbox.h> @@ -24,7 +24,7 @@ #include <tqlabel.h> #include <tdeaction.h> #include <kurl.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> #include "kraction.h" #include "expander.h" diff --git a/krusader/UserAction/kractionbase.cpp b/krusader/UserAction/kractionbase.cpp index 873fb59..6eb520d 100644 --- a/krusader/UserAction/kractionbase.cpp +++ b/krusader/UserAction/kractionbase.cpp @@ -11,7 +11,7 @@ // #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqerrormessage.h> diff --git a/krusader/UserAction/useraction.cpp b/krusader/UserAction/useraction.cpp index 938bbb0..2313a94 100644 --- a/krusader/UserAction/useraction.cpp +++ b/krusader/UserAction/useraction.cpp @@ -14,7 +14,7 @@ #include <kurl.h> #include <tdepopupmenu.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqstring.h> #include <tqdom.h> |