summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:53 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:53 -0600
commit508a49f9ef02a7b03411c8e9953ba79c99b91c0c (patch)
tree1df40da8f05d010a3e175c3d48e3529cccf2e067 /scripts
parent19cea58302be2d15b10b106c80ff82f7b5a2fa79 (diff)
downloadtdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.tar.gz
tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kde-devel-vim.vim2
-rw-r--r--scripts/kde-emacs/klaralv.el2
2 files changed, 2 insertions, 2 deletions
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)