From a5430e4b98efd05937bd3bfe78c56eb826f145fa Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:19:22 -0600 Subject: Rename many classes and header files to avoid conflicts with KDE4 --- kicker/extensions/kasbar/CMakeLists.txt | 2 +- kicker/extensions/kasbar/Makefile.am | 2 +- kicker/extensions/kasbar/kasclockitem.cpp | 2 +- kicker/extensions/kasbar/kasgroupitem.cpp | 2 +- kicker/extensions/kasbar/kasloaditem.cpp | 2 +- kicker/extensions/kasbar/kastasker.cpp | 4 ++-- kicker/extensions/kasbar/kastaskitem.cpp | 6 +++--- kicker/extensions/kasbar/kastastdepopup.cpp | 6 +++--- kicker/extensions/kasbar/kastastdepopup.h | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) (limited to 'kicker/extensions/kasbar') diff --git a/kicker/extensions/kasbar/CMakeLists.txt b/kicker/extensions/kasbar/CMakeLists.txt index c9fd0e736..31a1db895 100644 --- a/kicker/extensions/kasbar/CMakeLists.txt +++ b/kicker/extensions/kasbar/CMakeLists.txt @@ -33,7 +33,7 @@ set( target kasbar ) set( ${target}_SRCS kasbar.cpp kasitem.cpp kastaskitem.cpp kastasker.cpp - kaspopup.cpp kastaskpopup.cpp kasstartupitem.cpp + kaspopup.cpp kastastdepopup.cpp kasstartupitem.cpp kasaboutdlg.cpp kasprefsdlg.cpp kasclockitem.cpp kasgroupitem.cpp kasresources.cpp kasgrouper.cpp kasloaditem.cpp diff --git a/kicker/extensions/kasbar/Makefile.am b/kicker/extensions/kasbar/Makefile.am index e186aad17..25635299d 100644 --- a/kicker/extensions/kasbar/Makefile.am +++ b/kicker/extensions/kasbar/Makefile.am @@ -8,7 +8,7 @@ lib_LTLIBRARIES = libkasbar.la libkasbar_la_SOURCES = kasbar.cpp kasitem.cpp \ kastaskitem.cpp kastasker.cpp kaspopup.cpp \ - kastaskpopup.cpp kasstartupitem.cpp \ + kastastdepopup.cpp kasstartupitem.cpp \ kasaboutdlg.cpp kasprefsdlg.cpp kasclockitem.cpp \ kasgroupitem.cpp kasresources.cpp kasgrouper.cpp \ kasloaditem.cpp diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp index 912c9b0d3..b1d4d2c96 100644 --- a/kicker/extensions/kasbar/kasclockitem.cpp +++ b/kicker/extensions/kasbar/kasclockitem.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp index 638213e8e..3c73e21f0 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -62,7 +62,7 @@ #include #include #include -#include +#include #include #include diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp index f89e210ed..5a62349ce 100644 --- a/kicker/extensions/kasbar/kasloaditem.cpp +++ b/kicker/extensions/kasbar/kasloaditem.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp index 54ed56e4a..a62b59580 100644 --- a/kicker/extensions/kasbar/kastasker.cpp +++ b/kicker/extensions/kasbar/kastasker.cpp @@ -54,11 +54,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include //#include diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index b986ea54a..fc2bea8bb 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -69,10 +69,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include #include @@ -81,7 +81,7 @@ #include #include "kastasker.h" -#include "kastaskpopup.h" +#include "kastastdepopup.h" #include "kastaskitem.h" #include "kasbarextension.h" diff --git a/kicker/extensions/kasbar/kastastdepopup.cpp b/kicker/extensions/kasbar/kastastdepopup.cpp index 6529fafec..74c8631a7 100644 --- a/kicker/extensions/kasbar/kastastdepopup.cpp +++ b/kicker/extensions/kasbar/kastastdepopup.cpp @@ -1,4 +1,4 @@ -/* kastaskpopup.cpp +/* kastastdepopup.cpp ** ** Copyright (C) 2001-2004 Richard Moore ** Contributor: Mosfet @@ -63,8 +63,8 @@ #include "kastaskitem.h" #include "kastasker.h" -#include "kastaskpopup.h" -#include "kastaskpopup.moc" +#include "kastastdepopup.h" +#include "kastastdepopup.moc" static const int TITLE_HEIGHT = 13; diff --git a/kicker/extensions/kasbar/kastastdepopup.h b/kicker/extensions/kasbar/kastastdepopup.h index dcdc33107..60cff87bb 100644 --- a/kicker/extensions/kasbar/kastastdepopup.h +++ b/kicker/extensions/kasbar/kastastdepopup.h @@ -1,4 +1,4 @@ -/* kastaskpopup.h +/* kastastdepopup.h ** ** Copyright (C) 2001-2004 Richard Moore ** Contributor: Mosfet -- cgit v1.2.1