From 508a49f9ef02a7b03411c8e9953ba79c99b91c0c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:59:53 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 scripts/kde-devel-vim.vim    | 2 +-
 scripts/kde-emacs/klaralv.el | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim
index 9ae11612..d59069ed 100644
--- a/scripts/kde-devel-vim.vim
+++ b/scripts/kde-devel-vim.vim
@@ -244,7 +244,7 @@ function! MapIdentHeader( ident )
         return '<tdeapplication.h>'
     elseif a:ident == 'i18n' ||
           \a:ident == 'I18N_NOOP'
-        return '<klocale.h>'
+        return '<tdelocale.h>'
     elseif a:ident == 'locate' ||
           \a:ident == 'locateLocal'
         return '<kstandarddirs.h>'
diff --git a/scripts/kde-emacs/klaralv.el b/scripts/kde-emacs/klaralv.el
index 6bfdd858..b4d7c6c8 100644
--- a/scripts/kde-emacs/klaralv.el
+++ b/scripts/kde-emacs/klaralv.el
@@ -174,7 +174,7 @@
     ; Useful fake entries
     (qapplication.h tqApp)
     (tdeapplication.h kapp)
-    (klocale.h i18n I18N_NOOP)
+    (tdelocale.h i18n I18N_NOOP)
     (kstandarddirs.h locate locateLocal)
     (stdlib.h getenv)
     (unistd.h unlink sleep usleep)
-- 
cgit v1.2.3