diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /kicker/applets/clock | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kicker/applets/clock')
| -rw-r--r-- | kicker/applets/clock/clock.cpp | 4 | ||||
| -rw-r--r-- | kicker/applets/clock/datepicker.cpp | 2 | ||||
| -rw-r--r-- | kicker/applets/clock/init.cpp | 4 | ||||
| -rw-r--r-- | kicker/applets/clock/zone.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index e4248958e..be8dfed75 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -44,12 +44,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kstandarddirs.h> #include <tdeapplication.h> #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kstringhandler.h> #include <tdefiledialog.h> #include <tdefontrequester.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeconfigdialogmanager.h> #include <kcalendarsystem.h> #include <kicontheme.h> diff --git a/kicker/applets/clock/datepicker.cpp b/kicker/applets/clock/datepicker.cpp index 7823df539..d6165306e 100644 --- a/kicker/applets/clock/datepicker.cpp +++ b/kicker/applets/clock/datepicker.cpp @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdatepicker.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <twin.h> #include <netwm.h> diff --git a/kicker/applets/clock/init.cpp b/kicker/applets/clock/init.cpp index 096b02245..55ee382fd 100644 --- a/kicker/applets/clock/init.cpp +++ b/kicker/applets/clock/init.cpp @@ -44,12 +44,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kstandarddirs.h> #include <tdeapplication.h> #include <kprocess.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kstringhandler.h> #include <tdefiledialog.h> #include <tdefontrequester.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeconfigdialogmanager.h> #include <kcalendarsystem.h> #include <kicontheme.h> diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp index 3a313fbe8..aa9126b8c 100644 --- a/kicker/applets/clock/zone.cpp +++ b/kicker/applets/clock/zone.cpp @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdebug.h> #include <kstandarddirs.h> #include <kstringhandler.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfile.h> #include <tqtooltip.h> |