diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:14:36 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:14:36 -0600 |
| commit | 86651d6d989faf513952a3ca848ab6d374b64e6e (patch) | |
| tree | e97a54c2cfd98ea293c2e1e6bf03ba76cb7c8a9f /krusader/UserAction | |
| parent | 41fe6262418d3042e5520aff108f8122fa601ed2 (diff) | |
| download | krusader-86651d6d989faf513952a3ca848ab6d374b64e6e.tar.gz krusader-86651d6d989faf513952a3ca848ab6d374b64e6e.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'krusader/UserAction')
| -rw-r--r-- | krusader/UserAction/kraction.cpp | 2 | ||||
| -rw-r--r-- | krusader/UserAction/kraction.h | 2 | ||||
| -rw-r--r-- | krusader/UserAction/useraction.cpp | 2 | ||||
| -rw-r--r-- | krusader/UserAction/useractionpopupmenu.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/krusader/UserAction/kraction.cpp b/krusader/UserAction/kraction.cpp index b487b8e..409e069 100644 --- a/krusader/UserAction/kraction.cpp +++ b/krusader/UserAction/kraction.cpp @@ -22,7 +22,7 @@ #include <tqcheckbox.h> #include <tqfile.h> #include <tqlabel.h> -#include <kaction.h> +#include <tdeaction.h> #include <kurl.h> #include <kmessagebox.h> #include <tdefiledialog.h> diff --git a/krusader/UserAction/kraction.h b/krusader/UserAction/kraction.h index 32a206f..0cd987b 100644 --- a/krusader/UserAction/kraction.h +++ b/krusader/UserAction/kraction.h @@ -13,7 +13,7 @@ #ifndef KRACTION_H #define KRACTION_H -#include <kaction.h> +#include <tdeaction.h> #include <kprocess.h> #include <kdialogbase.h> #include "kractionbase.h" diff --git a/krusader/UserAction/useraction.cpp b/krusader/UserAction/useraction.cpp index cd4f034..938bbb0 100644 --- a/krusader/UserAction/useraction.cpp +++ b/krusader/UserAction/useraction.cpp @@ -12,7 +12,7 @@ #include <kdebug.h> #include <kurl.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstandarddirs.h> #include <kmessagebox.h> diff --git a/krusader/UserAction/useractionpopupmenu.h b/krusader/UserAction/useractionpopupmenu.h index 999b3f7..33ea818 100644 --- a/krusader/UserAction/useractionpopupmenu.h +++ b/krusader/UserAction/useractionpopupmenu.h @@ -13,7 +13,7 @@ #ifndef USERACTIONPOPUPMENU_H #define USERACTIONPOPUPMENU_H -#include <kpopupmenu.h> +#include <tdepopupmenu.h> class KURL; |