From bd11bce76f195adf4f3806cef8cf2e0737c99ff2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:22:31 -0600 Subject: Rename many classes and header files to avoid conflicts with KDE4 --- kdelirc/kcmlirc/addaction.cpp | 2 +- kdelirc/kcmlirc/addactionbase.ui | 14 +++++++------- kdelirc/kcmlirc/editaction.cpp | 2 +- kdelirc/kcmlirc/kcmlirc.cpp | 2 +- kdelirc/kcmlirc/kcmlircbase.ui | 8 ++++---- kdelirc/kcmlirc/modeslist.h | 4 ++-- kdelirc/kcmlirc/newmode.ui | 2 +- kdelirc/kcmlirc/selectprofile.ui | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) (limited to 'kdelirc/kcmlirc') diff --git a/kdelirc/kcmlirc/addaction.cpp b/kdelirc/kcmlirc/addaction.cpp index 9e4f21d..5e7fd1c 100644 --- a/kdelirc/kcmlirc/addaction.cpp +++ b/kdelirc/kcmlirc/addaction.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include diff --git a/kdelirc/kcmlirc/addactionbase.ui b/kdelirc/kcmlirc/addactionbase.ui index 57f3c38..dfb6f12 100644 --- a/kdelirc/kcmlirc/addactionbase.ui +++ b/kdelirc/kcmlirc/addactionbase.ui @@ -1590,12 +1590,12 @@ - klistview.h - klistview.h - klistview.h - klistview.h - klistview.h - klistview.h + tdelistview.h + tdelistview.h + tdelistview.h + tdelistview.h + tdelistview.h + tdelistview.h klineedit.h knuminput.h knuminput.h @@ -1603,6 +1603,6 @@ knuminput.h keditlistbox.h klineedit.h - klistview.h + tdelistview.h diff --git a/kdelirc/kcmlirc/editaction.cpp b/kdelirc/kcmlirc/editaction.cpp index 3b38b0c..9b65e19 100644 --- a/kdelirc/kcmlirc/editaction.cpp +++ b/kdelirc/kcmlirc/editaction.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp index 49bc252..fc42db5 100644 --- a/kdelirc/kcmlirc/kcmlirc.cpp +++ b/kdelirc/kcmlirc/kcmlirc.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/kdelirc/kcmlirc/kcmlircbase.ui b/kdelirc/kcmlirc/kcmlircbase.ui index 760f4e0..b5b21bf 100644 --- a/kdelirc/kcmlirc/kcmlircbase.ui +++ b/kdelirc/kcmlirc/kcmlircbase.ui @@ -492,15 +492,15 @@ - klistview.h + tdelistview.h kpushbutton.h kpushbutton.h kpushbutton.h - klistview.h + tdelistview.h kpushbutton.h kpushbutton.h kpushbutton.h - klistview.h - klistview.h + tdelistview.h + tdelistview.h diff --git a/kdelirc/kcmlirc/modeslist.h b/kdelirc/kcmlirc/modeslist.h index d81b928..d6a4b25 100644 --- a/kdelirc/kcmlirc/modeslist.h +++ b/kdelirc/kcmlirc/modeslist.h @@ -13,9 +13,9 @@ #ifndef MODESLIST_H #define MODESLIST_H -#include +#include -#include +#include /** diff --git a/kdelirc/kcmlirc/newmode.ui b/kdelirc/kcmlirc/newmode.ui index 649cb88..811b493 100644 --- a/kdelirc/kcmlirc/newmode.ui +++ b/kdelirc/kcmlirc/newmode.ui @@ -151,7 +151,7 @@ - klistview.h + tdelistview.h kpushbutton.h kpushbutton.h diff --git a/kdelirc/kcmlirc/selectprofile.ui b/kdelirc/kcmlirc/selectprofile.ui index a045921..911deb4 100644 --- a/kdelirc/kcmlirc/selectprofile.ui +++ b/kdelirc/kcmlirc/selectprofile.ui @@ -121,7 +121,7 @@ - klistview.h + tdelistview.h kpushbutton.h kpushbutton.h -- cgit v1.2.1