From 88838f421c1d218531cb0ddcc2599ae90e744759 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 7 Dec 2011 19:13:44 -0600 Subject: Rename KDEHOME and KDEDIR --- languages/cpp/app_templates/kapp/README | 2 +- languages/cpp/app_templates/kconfig35/README | 2 +- languages/cpp/app_templates/kde4app/kde4app.tdevelop | 8 ++++---- languages/cpp/app_templates/kfileplugin/kfile_plugin.h | 2 +- .../cpp/app_templates/kofficepart/kde-configure.in.in | 16 ++++++++-------- languages/cpp/app_templates/kscons_kmdi/INSTALL | 2 +- languages/cpp/app_templates/kscons_kmdi/README | 2 +- languages/cpp/app_templates/kscons_kmdi/messages.sh | 2 +- languages/cpp/app_templates/kscons_kxt/INSTALL | 2 +- languages/cpp/app_templates/kscons_kxt/README | 2 +- languages/cpp/app_templates/kscons_kxt/messages.sh | 2 +- languages/cpp/app_templates/kxt/README | 2 +- languages/cpp/doc/kde2book.toc | 12 ++++++------ languages/cpp/kdevdriver.cpp | 2 +- languages/cpp/main.cpp | 2 +- 15 files changed, 30 insertions(+), 30 deletions(-) (limited to 'languages/cpp') diff --git a/languages/cpp/app_templates/kapp/README b/languages/cpp/app_templates/kapp/README index f04a5635..318bd727 100644 --- a/languages/cpp/app_templates/kapp/README +++ b/languages/cpp/app_templates/kapp/README @@ -69,7 +69,7 @@ http://developer.kde.org/documentation/tutorials/dot/dcopiface/dcop-interface.ht http://public.kde.planetmirror.com/pub/kde/devel/gettext-kde/ 2. Install that gettext in ~/bin/ 3. cd ~/yourproject, export PATH=~/bin:$PATH, export -KDEDIR=/where_your_KDE3_is +TDEDIR=/where_your_KDE3_is 4. make -f admin/Makefile.common package-messages 5. make package-messages 6. Translate the po files (not the pot!!) with kbabel or xemacs diff --git a/languages/cpp/app_templates/kconfig35/README b/languages/cpp/app_templates/kconfig35/README index 993b3447..2cc6190a 100644 --- a/languages/cpp/app_templates/kconfig35/README +++ b/languages/cpp/app_templates/kconfig35/README @@ -78,7 +78,7 @@ http://developer.kde.org/documentation/tutorials/dot/dcopiface/dcop-interface.ht http://public.kde.planetmirror.com/pub/kde/devel/gettext-kde/ 2. Install that gettext in ~/bin/ 3. cd ~/yourproject, export PATH=~/bin:$PATH, export -KDEDIR=/where_your_KDE3_is +TDEDIR=/where_your_KDE3_is 4. make -f admin/Makefile.common package-messages 5. make package-messages 6. Translate the po files (not the pot!!) with kbabel or xemacs diff --git a/languages/cpp/app_templates/kde4app/kde4app.tdevelop b/languages/cpp/app_templates/kde4app/kde4app.tdevelop index afbdc832..d332fa06 100644 --- a/languages/cpp/app_templates/kde4app/kde4app.tdevelop +++ b/languages/cpp/app_templates/kde4app/kde4app.tdevelop @@ -118,8 +118,8 @@ false false - - + + @@ -147,8 +147,8 @@ default - - + + diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h b/languages/cpp/app_templates/kfileplugin/kfile_plugin.h index f2ed7408..fb694e38 100644 --- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h +++ b/languages/cpp/app_templates/kfileplugin/kfile_plugin.h @@ -4,7 +4,7 @@ #define __KFILE_%{APPNAMEUC}_H__ /** - * Note: For further information look into <$KDEDIR/include/kfilemetainfo.h> + * Note: For further information look into <$TDEDIR/include/kfilemetainfo.h> */ #include diff --git a/languages/cpp/app_templates/kofficepart/kde-configure.in.in b/languages/cpp/app_templates/kofficepart/kde-configure.in.in index ec8e8bea..3ba8fc32 100644 --- a/languages/cpp/app_templates/kofficepart/kde-configure.in.in +++ b/languages/cpp/app_templates/kofficepart/kde-configure.in.in @@ -8,22 +8,22 @@ AC_C_BIGENDIAN AC_CHECK_KDEMAXPATHLEN dnl AC_DEFINE(USE_QFD, 1, [Define if you prefer the Qt provided file dialog]) -KWMF_INCLUDES='-I$(KDEDIR)/lib/kwmf -I$(KDEDIR)/lib/kwmf' +KWMF_INCLUDES='-I$(TDEDIR)/lib/kwmf -I$(TDEDIR)/lib/kwmf' AC_SUBST(KWMF_INCLUDES) -KSTORE_INCLUDES='-I$(KDEDIR)/include' +KSTORE_INCLUDES='-I$(TDEDIR)/include' AC_SUBST(KSTORE_INCLUDES) -KOFFICECORE_INCLUDES='-I$(KDEDIR)/include' +KOFFICECORE_INCLUDES='-I$(TDEDIR)/include' AC_SUBST(KOFFICECORE_INCLUDES) -KOFFICEUI_INCLUDES='-I$(KDEDIR)/include' +KOFFICEUI_INCLUDES='-I$(TDEDIR)/include' AC_SUBST(KOFFICEUI_INCLUDES) -LIB_KOFFICEUI='$(KDEDIR)/lib/libkofficeui.la' -LIB_KOFFICECORE='$(KDEDIR)/lib/libkofficecore.la' -LIB_KSTORE='$(KDEDIR)/lib/libkstore.la' -LIB_KWMF='$(KDEDIR)/lib/libkwmf.la' +LIB_KOFFICEUI='$(TDEDIR)/lib/libkofficeui.la' +LIB_KOFFICECORE='$(TDEDIR)/lib/libkofficecore.la' +LIB_KSTORE='$(TDEDIR)/lib/libkstore.la' +LIB_KWMF='$(TDEDIR)/lib/libkwmf.la' AC_SUBST(LIB_KOFFICEUI) AC_SUBST(LIB_KOFFICECORE) AC_SUBST(LIB_KSTORE) diff --git a/languages/cpp/app_templates/kscons_kmdi/INSTALL b/languages/cpp/app_templates/kscons_kmdi/INSTALL index 67c1dd4b..fa4f6763 100644 --- a/languages/cpp/app_templates/kscons_kmdi/INSTALL +++ b/languages/cpp/app_templates/kscons_kmdi/INSTALL @@ -48,7 +48,7 @@ The installation scripts are relying on the kde-config program. The programs kde-config, qmake, uic and moc must be accesssible through your PATH. -Qt and kde may not be installed as expected (in QTDIR and KDEDIR) +Qt and kde may not be installed as expected (in QTDIR and TDEDIR) So until kde-config is able to give that information, you may have to give those paths. You may also want to tune the build. diff --git a/languages/cpp/app_templates/kscons_kmdi/README b/languages/cpp/app_templates/kscons_kmdi/README index 351a39ac..578feccd 100644 --- a/languages/cpp/app_templates/kscons_kmdi/README +++ b/languages/cpp/app_templates/kscons_kmdi/README @@ -101,7 +101,7 @@ refer to the file po/SConscript and po/messages.sh http://public.kde.planetmirror.com/pub/kde/devel/gettext-kde/ 2. Install that gettext in ~/bin/ 3. cd ~/yourproject, export PATH=~/bin:$PATH, export -KDEDIR=/where_your_KDE3_is +TDEDIR=/where_your_KDE3_is 4. make -f admin/Makefile.common package-messages 5. make package-messages 6. Translate the po files (not the pot!!) with kbabel or xemacs diff --git a/languages/cpp/app_templates/kscons_kmdi/messages.sh b/languages/cpp/app_templates/kscons_kmdi/messages.sh index a36f5c93..2fd4f0bd 100755 --- a/languages/cpp/app_templates/kscons_kmdi/messages.sh +++ b/languages/cpp/app_templates/kscons_kmdi/messages.sh @@ -17,7 +17,7 @@ SRCDIR=../test1-kconfigxt # srcdir is the directory containing the source code TIPSDIR=$SRCDIR # tipsdir is the directory containing the tips -KDEDIR=`kde-config --prefix` +TDEDIR=`kde-config --prefix` EXTRACTRC=extractrc KDEPOT=`kde-config --prefix`/include/kde.pot XGETTEXT="xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x $KDEPOT " diff --git a/languages/cpp/app_templates/kscons_kxt/INSTALL b/languages/cpp/app_templates/kscons_kxt/INSTALL index 67c1dd4b..fa4f6763 100644 --- a/languages/cpp/app_templates/kscons_kxt/INSTALL +++ b/languages/cpp/app_templates/kscons_kxt/INSTALL @@ -48,7 +48,7 @@ The installation scripts are relying on the kde-config program. The programs kde-config, qmake, uic and moc must be accesssible through your PATH. -Qt and kde may not be installed as expected (in QTDIR and KDEDIR) +Qt and kde may not be installed as expected (in QTDIR and TDEDIR) So until kde-config is able to give that information, you may have to give those paths. You may also want to tune the build. diff --git a/languages/cpp/app_templates/kscons_kxt/README b/languages/cpp/app_templates/kscons_kxt/README index 351a39ac..578feccd 100644 --- a/languages/cpp/app_templates/kscons_kxt/README +++ b/languages/cpp/app_templates/kscons_kxt/README @@ -101,7 +101,7 @@ refer to the file po/SConscript and po/messages.sh http://public.kde.planetmirror.com/pub/kde/devel/gettext-kde/ 2. Install that gettext in ~/bin/ 3. cd ~/yourproject, export PATH=~/bin:$PATH, export -KDEDIR=/where_your_KDE3_is +TDEDIR=/where_your_KDE3_is 4. make -f admin/Makefile.common package-messages 5. make package-messages 6. Translate the po files (not the pot!!) with kbabel or xemacs diff --git a/languages/cpp/app_templates/kscons_kxt/messages.sh b/languages/cpp/app_templates/kscons_kxt/messages.sh index a36f5c93..2fd4f0bd 100755 --- a/languages/cpp/app_templates/kscons_kxt/messages.sh +++ b/languages/cpp/app_templates/kscons_kxt/messages.sh @@ -17,7 +17,7 @@ SRCDIR=../test1-kconfigxt # srcdir is the directory containing the source code TIPSDIR=$SRCDIR # tipsdir is the directory containing the tips -KDEDIR=`kde-config --prefix` +TDEDIR=`kde-config --prefix` EXTRACTRC=extractrc KDEPOT=`kde-config --prefix`/include/kde.pot XGETTEXT="xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x $KDEPOT " diff --git a/languages/cpp/app_templates/kxt/README b/languages/cpp/app_templates/kxt/README index 9ff2c54d..b1f2d8c4 100644 --- a/languages/cpp/app_templates/kxt/README +++ b/languages/cpp/app_templates/kxt/README @@ -74,7 +74,7 @@ http://developer.kde.org/documentation/tutorials/dot/dcopiface/dcop-interface.ht http://public.kde.planetmirror.com/pub/kde/devel/gettext-kde/ 2. Install that gettext in ~/bin/ 3. cd ~/yourproject, export PATH=~/bin:$PATH, export -KDEDIR=/where_your_KDE3_is +TDEDIR=/where_your_KDE3_is 4. make -f admin/Makefile.common package-messages 5. make package-messages 6. Translate the po files (not the pot!!) with kbabel or xemacs diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc index 14791ba5..2f7dd1f4 100644 --- a/languages/cpp/doc/kde2book.toc +++ b/languages/cpp/doc/kde2book.toc @@ -903,7 +903,7 @@ - + @@ -1309,8 +1309,8 @@ - - + + @@ -1506,7 +1506,7 @@ - + @@ -1709,7 +1709,7 @@ - + @@ -2739,7 +2739,7 @@ - + diff --git a/languages/cpp/kdevdriver.cpp b/languages/cpp/kdevdriver.cpp index ed4fe3fa..fd11556c 100644 --- a/languages/cpp/kdevdriver.cpp +++ b/languages/cpp/kdevdriver.cpp @@ -101,7 +101,7 @@ void KDevDriver::setup() addMacro( Macro( "__cplusplus", "1" ) ); ///@todo maybe remove the following? Is there any normal user who has his environment set up correctly so this is of any use? - TQString kdedir = getenv( "KDEDIR" ); + TQString kdedir = getenv( "TDEDIR" ); if( !kdedir.isNull() ) addIncludePath( kdedir + "/include" ); diff --git a/languages/cpp/main.cpp b/languages/cpp/main.cpp index b3e6bacb..f285d083 100644 --- a/languages/cpp/main.cpp +++ b/languages/cpp/main.cpp @@ -82,7 +82,7 @@ public: // code provided by Reginald Stadlbauer void setup() { - TQString kdedir = getenv( "KDEDIR" ); + TQString kdedir = getenv( "TDEDIR" ); if ( !kdedir.isNull() ) addIncludePath( kdedir + "/include" ); -- cgit v1.2.1