summaryrefslogtreecommitdiffstats
path: root/kicker/applets/launcher
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 23:19:22 -0600
committerTimothy Pearson <[email protected]>2013-02-01 23:19:22 -0600
commita5430e4b98efd05937bd3bfe78c56eb826f145fa (patch)
tree1af88f74a9d800399de58491b215fb303cbfb1f3 /kicker/applets/launcher
parenteba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff)
downloadtdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz
tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kicker/applets/launcher')
-rw-r--r--kicker/applets/launcher/quickbutton.cpp2
-rw-r--r--kicker/applets/launcher/quictdelauncher.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index c66f4ceb8..199a7b750 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqpopupmenu.h>
#include <tqtooltip.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
#include <kickertip.h>
#include <klocale.h>
#include <kdesktopfile.h>
diff --git a/kicker/applets/launcher/quictdelauncher.cpp b/kicker/applets/launcher/quictdelauncher.cpp
index 15439f9c9..8a1c1c9dc 100644
--- a/kicker/applets/launcher/quictdelauncher.cpp
+++ b/kicker/applets/launcher/quictdelauncher.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqtooltip.h>
#include <dcopclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <kaboutapplication.h>
#include <kaboutdata.h>