diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:19:22 -0600 |
| commit | a5430e4b98efd05937bd3bfe78c56eb826f145fa (patch) | |
| tree | 1af88f74a9d800399de58491b215fb303cbfb1f3 /kicker/kicker/ui | |
| 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 'kicker/kicker/ui')
| -rw-r--r-- | kicker/kicker/ui/itemview.cpp | 2 | ||||
| -rw-r--r-- | kicker/kicker/ui/itemview.h | 2 | ||||
| -rw-r--r-- | kicker/kicker/ui/k_mnu.cpp | 4 | ||||
| -rw-r--r-- | kicker/kicker/ui/k_new_mnu.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index 6d0f2b542..abe5370a6 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -48,7 +48,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kapplication.h> #include <kaboutkde.h> #include <kpixmapeffect.h> -#include <kaction.h> +#include <tdeaction.h> #include <kbookmarkmenu.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/kicker/kicker/ui/itemview.h b/kicker/kicker/ui/itemview.h index 995cc57b4..27807c939 100644 --- a/kicker/kicker/ui/itemview.h +++ b/kicker/kicker/ui/itemview.h @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpixmap.h> #include <tqframe.h> #include <tqtoolbutton.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqdragobject.h> #include "kmenubase.h" diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index f19d59d8b..46d66b099 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <dcopclient.h> #include <kapplication.h> #include <kaboutkde.h> -#include <kaction.h> +#include <tdeaction.h> #include <kbookmarkmenu.h> #include <tdeconfig.h> #include <kdebug.h> @@ -49,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <klocale.h> #include <kmessagebox.h> #include <kstandarddirs.h> -#include <ktoolbarbutton.h> +#include <tdetoolbarbutton.h> #include <twin.h> #include "client_mnu.h" diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index a8d69c220..f8e3eaef5 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -46,7 +46,7 @@ #include <dcopclient.h> #include <kapplication.h> #include <kaboutkde.h> -#include <kaction.h> +#include <tdeaction.h> #include <kbookmarkmenu.h> #include <tdeconfig.h> #include <kdebug.h> @@ -64,7 +64,7 @@ #include <kurllabel.h> #include <krun.h> #include <kmimetype.h> -#include <krecentdocument.h> +#include <tderecentdocument.h> #include <kcompletionbox.h> #include <kurifilter.h> #include <kbookmarkmanager.h> |