diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /libkonq | |
| parent | eba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff) | |
| download | tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'libkonq')
| -rw-r--r-- | libkonq/knewmenu.cc | 2 | ||||
| -rw-r--r-- | libkonq/knewmenu.h | 2 | ||||
| -rw-r--r-- | libkonq/konq_bgnddlg.cc | 2 | ||||
| -rw-r--r-- | libkonq/konq_dirpart.cc | 2 | ||||
| -rw-r--r-- | libkonq/konq_operations.cc | 2 | ||||
| -rw-r--r-- | libkonq/konq_popupmenu.h | 2 | ||||
| -rw-r--r-- | libkonq/konq_xmlguiclient.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc index 52bb605a1..e27277ac8 100644 --- a/libkonq/knewmenu.cc +++ b/libkonq/knewmenu.cc @@ -28,7 +28,7 @@ #include <kmessagebox.h> #include <kstandarddirs.h> #include <kprotocolinfo.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <krun.h> #include <tdeio/job.h> diff --git a/libkonq/knewmenu.h b/libkonq/knewmenu.h index 17239f119..a0ea38f44 100644 --- a/libkonq/knewmenu.h +++ b/libkonq/knewmenu.h @@ -23,7 +23,7 @@ #include <tqintdict.h> #include <tqstringlist.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdialogbase.h> #include <kurl.h> #include <libkonq_export.h> diff --git a/libkonq/konq_bgnddlg.cc b/libkonq/konq_bgnddlg.cc index 1ba236a80..77905b0c8 100644 --- a/libkonq/konq_bgnddlg.cc +++ b/libkonq/konq_bgnddlg.cc @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kimagefilepreview.h> #include <klocale.h> -//#include <krecentdocument.h> +//#include <tderecentdocument.h> #include <kstandarddirs.h> #include <kurlrequester.h> diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc index 46226a6d0..6d326d44e 100644 --- a/libkonq/konq_dirpart.cc +++ b/libkonq/konq_dirpart.cc @@ -24,7 +24,7 @@ #include <tdeio/paste.h> #include <kapplication.h> -#include <kaction.h> +#include <tdeaction.h> #include <kdatastream.h> #include <kdebug.h> #include <kdirlister.h> diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc index cbd38a60a..b3a499ce3 100644 --- a/libkonq/konq_operations.cc +++ b/libkonq/konq_operations.cc @@ -26,7 +26,7 @@ #include <knotifyclient.h> #include <krun.h> #include <kshell.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <kdirnotify_stub.h> diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h index 01b1247ce..4be069561 100644 --- a/libkonq/konq_popupmenu.h +++ b/libkonq/konq_popupmenu.h @@ -25,7 +25,7 @@ #include <tqpopupmenu.h> #include <tqmap.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqstringlist.h> diff --git a/libkonq/konq_xmlguiclient.h b/libkonq/konq_xmlguiclient.h index c219c6488..685b58a34 100644 --- a/libkonq/konq_xmlguiclient.h +++ b/libkonq/konq_xmlguiclient.h @@ -22,7 +22,7 @@ #include <sys/types.h> -#include <kaction.h> +#include <tdeaction.h> #include <kxmlguiclient.h> #include <tqstringlist.h> #include <libkonq_export.h> |