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 /kmenuedit | |
| 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 'kmenuedit')
| -rw-r--r-- | kmenuedit/kmenuedit.cpp | 4 | ||||
| -rw-r--r-- | kmenuedit/kmenuedit.h | 2 | ||||
| -rw-r--r-- | kmenuedit/menuinfo.h | 2 | ||||
| -rw-r--r-- | kmenuedit/treeview.cpp | 2 | ||||
| -rw-r--r-- | kmenuedit/treeview.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp index 80f5eabf0..8e7073b69 100644 --- a/kmenuedit/kmenuedit.cpp +++ b/kmenuedit/kmenuedit.cpp @@ -20,7 +20,7 @@ #include <tqsplitter.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <tdeconfig.h> #include <kdebug.h> @@ -30,7 +30,7 @@ #include <kmessagebox.h> #include <kservice.h> #include <kstdaction.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include "treeview.h" #include "basictab.h" diff --git a/kmenuedit/kmenuedit.h b/kmenuedit/kmenuedit.h index fdd79bcef..15e5c797f 100644 --- a/kmenuedit/kmenuedit.h +++ b/kmenuedit/kmenuedit.h @@ -20,7 +20,7 @@ #ifndef __kmenuedit_h__ #define __kmenuedit_h__ -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <treeview.h> class BasicTab; diff --git a/kmenuedit/menuinfo.h b/kmenuedit/menuinfo.h index 616df68ad..9497022d0 100644 --- a/kmenuedit/menuinfo.h +++ b/kmenuedit/menuinfo.h @@ -22,7 +22,7 @@ #include <tqstring.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <kservice.h> class MenuFile; diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp index c58d7bf0f..dc90bcda9 100644 --- a/kmenuedit/treeview.cpp +++ b/kmenuedit/treeview.cpp @@ -41,7 +41,7 @@ #include <kdebug.h> #include <kiconloader.h> #include <kdesktopfile.h> -#include <kaction.h> +#include <tdeaction.h> #include <kmessagebox.h> #include <kapplication.h> #include <kservice.h> diff --git a/kmenuedit/treeview.h b/kmenuedit/treeview.h index 562a33301..3370f5bc2 100644 --- a/kmenuedit/treeview.h +++ b/kmenuedit/treeview.h @@ -23,7 +23,7 @@ #define __treeview_h__ #include <tqstring.h> -#include <klistview.h> +#include <tdelistview.h> #include <kservice.h> #include <kservicegroup.h> |