From 99ee6fd7e9737b5441af4a6cfdd69ff4b7eff5d3 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 7 Dec 2011 19:14:11 -0600 Subject: Rename KDEHOME and KDEDIR --- INSTALL.docs | 2 +- Makefile.am.in | 2 +- doc/kommander/extending.docbook | 8 ++++---- doc/kommander/translating.docbook | 4 ++-- doc/kommander/tutorials.docbook | 2 +- doc/quanta/config-quanta.docbook | 2 +- doc/quanta/extending-quanta.docbook | 8 ++++---- doc/quanta/quanta-menus.docbook | 2 +- doc/quanta/working-with-quanta.docbook | 2 +- klinkstatus/src/klinkstatus.cpp | 2 +- kommander/ChangeLog | 2 +- kxsldbg/kxsldbgpart/libxsldbg/options.cpp | 4 ++-- quanta/README | 28 ++++++++++++++-------------- quanta/data/doc/faq.html | 4 ++-- quanta/data/dtep/dtd-description.txt | 2 +- quanta/dialogs/dtepeditdlgs.ui | 4 ++-- quanta/src/document.cpp | 2 +- quanta/src/quanta.cpp | 2 +- 18 files changed, 41 insertions(+), 41 deletions(-) diff --git a/INSTALL.docs b/INSTALL.docs index 9469cfa7..6f6e63d4 100644 --- a/INSTALL.docs +++ b/INSTALL.docs @@ -2,7 +2,7 @@ There are some docs ( at 11.04.2001 avaible docs for html, css, php, javascript ) you need to download packages from http://quanta.sourceforge.net ( html.tar.bz2, php.tar.bz2, css.tar.bz2 ) and uncompress them -to $KDEDIR/share/apps/quanta/doc/ +to $TDEDIR/share/apps/quanta/doc/ or to ~/.kde/share/apps/quanta/doc/ and restart quanta. diff --git a/Makefile.am.in b/Makefile.am.in index c2adbb73..944fbc00 100644 --- a/Makefile.am.in +++ b/Makefile.am.in @@ -12,7 +12,7 @@ install-data-local: @echo "*************** Important *************************" @echo "" @echo " Add "$(bindir)" to your PATH and" - @echo " add "$(prefix)" to your KDEDIRS!" + @echo " add "$(prefix)" to your TDEDIRS!" @echo "" @echo " Please report bugs with our web form at" @echo " http://bugs.kde.org" diff --git a/doc/kommander/extending.docbook b/doc/kommander/extending.docbook index 1adfdc25..473b8ec5 100644 --- a/doc/kommander/extending.docbook +++ b/doc/kommander/extending.docbook @@ -346,12 +346,12 @@ mykomplugin.cpp, compiling and installing your plugin would involve something similar to the following commands: -libtool --mode=compile g++ -$KDEDIR/include -IQTDIR/include \ +libtool --mode=compile g++ -$TDEDIR/include -IQTDIR/include \ -I. -fPIC -c komlineedit.cpp -libtool --mode=compile g++ -$KDEDIR/include -IQTDIR/include \ +libtool --mode=compile g++ -$TDEDIR/include -IQTDIR/include \ -I. -fPIC -c mykomplugin.cpp -libtool --mode=link g++ -shared -L$KDEDIR/lib -ltdeui -lkommanderwidget \ +libtool --mode=link g++ -shared -L$TDEDIR/lib -ltdeui -lkommanderwidget \ -lkommanderplugin komlineedit.cppkomlineedit.o mykomplugin.o -o libmykomplugin.so @@ -359,7 +359,7 @@ libtool --mode=link g++ -shared -L$KDEDIR/lib -ltdeui -lkommanderwidget \ If you want to install new plugin system-wide, root, use: -su -c "cp libmykomplugin.so $KDEDIR/lib" +su -c "cp libmykomplugin.so $TDEDIR/lib" If you use the KDevelop project generator, you will not need to do the above, but instead adapt the Makefile.am to link against extra libraries. By default, it will link to &Qt; and &kde; libraries and generate all the needed object files. Just run make to build, and su -c make install to install. diff --git a/doc/kommander/translating.docbook b/doc/kommander/translating.docbook index 15d7def2..629b22ea 100644 --- a/doc/kommander/translating.docbook +++ b/doc/kommander/translating.docbook @@ -34,7 +34,7 @@ Here is a short description about the needed steps to make a dialog translatable How to extract the messages and create the .po file? - Use the kmdr2po script to extract the strings. The script is inside the working directory of the source release tarball and should be installed to $KDEDIR/share/apps/kommander/translating as well. + Use the kmdr2po script to extract the strings. The script is inside the working directory of the source release tarball and should be installed to $TDEDIR/share/apps/kommander/translating as well. Just run: @@ -52,7 +52,7 @@ An appropriate <your-kommander-dialog.po> file will be created. How to install the translation? Put the compiled *.mo file either to -$KDEDIR/share/locale/<your language>/LC_MESSAGES/ (will be available globally for all users) +$TDEDIR/share/locale/<your language>/LC_MESSAGES/ (will be available globally for all users) or to $HOME/.kde/share/locale/<your language>/LC_MESSAGES/ (will be available only for the current user) directory. diff --git a/doc/kommander/tutorials.docbook b/doc/kommander/tutorials.docbook index 0f6fd954..00f44d87 100644 --- a/doc/kommander/tutorials.docbook +++ b/doc/kommander/tutorials.docbook @@ -316,7 +316,7 @@ Shows how to use Table widget These examples reflect the most recent development state of &kommander;. In its current state &kommander; has few limitations for developing small to medium applications. It certainly is not suitable for building a KWord clone, but for a simple editor, database frontend, GUI for commandline programs or any application in the spirit of Unix/Linux small applications it is a good choice. The examples presented here are intended to show the potential as well as how to work around limitations. There are some useful tricks included in these if you want to do a more capable small application with &kommander;. Remember &kommander; is not intended to do everything, but to do most things. For this concession you should be able to build something in &kommander; faster than other alternatives ad add GUI to scripting languages not otherwise supported in KDE. -The examples are installed to $KDEDIR/share/apps/kmdr-editor/editor. In case you do not have them there, get from our home page, by downloading the latest release. +The examples are installed to $TDEDIR/share/apps/kmdr-editor/editor. In case you do not have them there, get from our home page, by downloading the latest release. diff --git a/doc/quanta/config-quanta.docbook b/doc/quanta/config-quanta.docbook index 0b332330..3ba20ea0 100644 --- a/doc/quanta/config-quanta.docbook +++ b/doc/quanta/config-quanta.docbook @@ -113,7 +113,7 @@ The place to define abbreviations (some kind of templates), that can be expanded Name: the user visible name Output window: plugins can appear in a tab of the editor area or in a separate toolview at the bottom - Location: the path to the plugin, if it is not located in the standard locations, like $KDEDIR/lib . + Location: the path to the plugin, if it is not located in the standard locations, like $TDEDIR/lib . File name: the relative path and the filename to the plugin's libtool file, like trinity/libcervisiapart.la Input: the plugin will get this information on startup, so it can open the Current File, the folder of the current file (Current File Path) or the Project Folder. Read only part: check if the plugin refuses to load. Read-only KParts usually refuse to load without this option checked. diff --git a/doc/quanta/extending-quanta.docbook b/doc/quanta/extending-quanta.docbook index 6dd0629e..df92f408 100644 --- a/doc/quanta/extending-quanta.docbook +++ b/doc/quanta/extending-quanta.docbook @@ -1195,8 +1195,8 @@ First you have to enter the name of your script with the interpreter as well. Ex Although you can use full paths, the recommended way is to use the %scriptdir variable in the command line, like sh %scriptdir/myScript.sh. This way &quantaplus; will try to locate your script in the following places: -global script folder: $KDEDIR/share/apps/quanta/scripts -local script folder: $KDEHOME/share/apps/quanta/scripts +global script folder: $TDEDIR/share/apps/quanta/scripts +local script folder: $TDEHOME/share/apps/quanta/scripts your path: $PATH There are other special variables that you can use in the command line: @@ -1700,7 +1700,7 @@ addslashes=function.addslashes.html Now you can just save your docrc file, save it in $HOME/.kde/share/apps/quanta/doc or $KDEDIR/share/apps/quanta/doc +class="directory">$TDEDIR/share/apps/quanta/doc for local or global use respectively. Then create a folder (the one specified in your docrc file) in the same folder as your docrc file and copy your &HTML; pages in @@ -1771,7 +1771,7 @@ After a resource was downloaded, but before it is installed, &quantaplus; verifi The entries are: - Target directory name:the newly created &DTEP; will go under this name to the $KDEHOME/share/apps/quanta/dtep folder. + Target directory name:the newly created &DTEP; will go under this name to the $TDEHOME/share/apps/quanta/dtep folder. Name:the name (definition string) of the DTD diff --git a/doc/quanta/quanta-menus.docbook b/doc/quanta/quanta-menus.docbook index 751f4591..66449f78 100644 --- a/doc/quanta/quanta-menus.docbook +++ b/doc/quanta/quanta-menus.docbook @@ -1397,7 +1397,7 @@ details. Loads a globally defined toolbar. These are kept in $KDEDIR/share/apps/quanta/toolbars +class="directory">$TDEDIR/share/apps/quanta/toolbars by default. diff --git a/doc/quanta/working-with-quanta.docbook b/doc/quanta/working-with-quanta.docbook index 4a0ca0b1..54471778 100644 --- a/doc/quanta/working-with-quanta.docbook +++ b/doc/quanta/working-with-quanta.docbook @@ -330,7 +330,7 @@ track this so you will need to change links. Template structure on the template tab is based on the files found in -$KDEDIR/share/apps/quanta/templates and +$TDEDIR/share/apps/quanta/templates and $HOME/.kde/share/apps/quanta/templates. Each of these folders is specified as one of four types of container as explained above. diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp index 902ebe0f..8c5da395 100644 --- a/klinkstatus/src/klinkstatus.cpp +++ b/klinkstatus/src/klinkstatus.cpp @@ -72,7 +72,7 @@ KLinkStatus::KLinkStatus() { // if we couldn't find our Part, we exit since the Shell by // itself can't do anything useful - KMessageBox::error(this, i18n("Could not find the KLinkStatus part; did you configure with '--prefix=/$KDEDIR' and perform 'make install'?")); + KMessageBox::error(this, i18n("Could not find the KLinkStatus part; did you configure with '--prefix=/$TDEDIR' and perform 'make install'?")); kapp->quit(); // we return here, cause kapp->quit() only means "exit the // next time we enter the event loop... diff --git a/kommander/ChangeLog b/kommander/ChangeLog index d3e14ac8..b6aadfc5 100644 --- a/kommander/ChangeLog +++ b/kommander/ChangeLog @@ -605,7 +605,7 @@ Sat Sep 28 23:18:08 EST 2002 - Marc Britton o Cleaned up and reworked file overview window o Removed 'Source File' tab from hierarchy view o Removed more disabled source files - o Now searches for templates in custom directory (default $KDEDIR/templates) + o Now searches for templates in custom directory (default $TDEDIR/templates) Sun Sep 15 15:31:48 EST 2002 - Marc Britton o Initial Creation diff --git a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp index 4fd56134..d2d51fe5 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp @@ -96,8 +96,8 @@ static TQString langLookupDir( const TQString &fname ) // assemble the local search paths TQStringList localDoc = KGlobal::dirs()->resourceDirs("html"); - // also look in each of the KDEDIR paths - TQString kdeDirs = getenv("KDEDIRS"); + // also look in each of the TDEDIR paths + TQString kdeDirs = getenv("TDEDIRS"); TQStringList kdeDirsList = TQStringList::split(":", kdeDirs); if (!kdeDirs.isEmpty() && !kdeDirsList.isEmpty()){ for (TQStringList::iterator it = kdeDirsList.begin(); it != kdeDirsList.end(); it++) diff --git a/quanta/README b/quanta/README index fc7fc14a..aa6406b1 100644 --- a/quanta/README +++ b/quanta/README @@ -84,12 +84,12 @@ make install (as root) Should you have trouble during ./configure or the make process, try the following: - - export KDEDIRS=:$KDEDIRS + - export TDEDIRS=:$TDEDIRS - export QTDIR= - run "make -f Makefile.cvs" - run "./configure" - The recommended place where to install Quanta is your $KDEDIR. To find out, use + The recommended place where to install Quanta is your $TDEDIR. To find out, use "kde-config --prefix" or simply configure Quanta with: ./configure --prefix `kde-config --prefix` @@ -109,10 +109,10 @@ name than for the stable Quanta. If you wish to install two stable versions in parallel, you have to install them using different prefixes (see above). Before running the one installed outside of the KDE tree, you should do: -export KDEDIRS=$prefix-of-second-instace:$KDEDIRS +export TDEDIRS=$prefix-of-second-instace:$TDEDIRS export PATH=$prefix-of-second-instace/bin:$PATH export LD_LIBRARY_PATH=$prefix-of-second-instace/lib:$LD_LIBRARY_PATH -export KDEHOME=home-for-second-version +export TDEHOME=home-for-second-version and run "quanta". An example would be: @@ -120,10 +120,10 @@ An example would be: make make install mkdir ~/.new-quanta -export KDEDIRS=/opt/new-quanta:$KDEDIRS +export TDEDIRS=/opt/new-quanta:$TDEDIRS export PATH=/opt/new-quanta/bin:$PATH export LD_LIBRARY_PATH=/opt/new-quanta/lib:$LD_LIBRARY_PATH -export KDEHOME=~/.new-quanta +export TDEHOME=~/.new-quanta quanta You can put the lines starting with the first "export" into a separate file, @@ -147,8 +147,8 @@ Possible problem sources can be: "automake --version". - wrong --prefix given to ./configure - "make install" process was forgotten or failed - - you have an old quantarc file in $KDEHOME/share/config - - you have old files in $KDEHOME/share/apps/quanta + - you have an old quantarc file in $TDEHOME/share/config + - you have old files in $TDEHOME/share/apps/quanta In the latter two cases backup the old files, then remove them and try to start Quanta again. @@ -160,7 +160,7 @@ copytos.h:17: forward declaration of `class KURLRequester' (or the same error in other files for other K... classes), try the following: - check if there is a kdewidgets.so (and kdewidgets.la) in your - $KDEDIR/lib/trinity/plugins/designer. If there isn't, you have a broken + $TDEDIR/lib/trinity/plugins/designer. If there isn't, you have a broken KDE (tdelibs) install. - check your $HOME/.qt/qtrc file. Add the above path as the first entry to the libraryPath (like: @@ -168,9 +168,9 @@ copytos.h:17: forward declaration of `class KURLRequester' You can use the qtconfig tool to do this. - recompile the QT tools (uic, designer) if you have upgraded tdelibs (or QT). - - check that your $KDEDIR and $QTDIR path is set correctly. + - check that your $TDEDIR and $QTDIR path is set correctly. - do an - export kde_widgetdir="$KDEDIR/lib/trinity/plugins/designer" + export kde_widgetdir="$TDEDIR/lib/trinity/plugins/designer" (or whatever command your shell uses for environment variable setting) before running make. In most cases one of the above is the problem (and the solution). @@ -185,12 +185,12 @@ were reports that Mandrake 9.0 puts the mimetype for php under the application node, so users could not open PHP files from Quanta... This shouldn't be a problem with Quanta 3.2 on KDE 3.1.1 or newer. b) If Quanta crashes on startup then rename your local quantarc file -(in $KDEHOME/share/config) and send this file to me, so I can find out why does +(in $TDEHOME/share/config) and send this file to me, so I can find out why does it crash. In case of any crash, please send me a backtrace. One known cause of such -crash is if you use the same $KDEHOME for Quanta 3.2 and Quanta 3.3. Due to some +crash is if you use the same $TDEHOME for Quanta 3.2 and Quanta 3.3. Due to some incompatible changes in the quantarc file regarding the user interface, Quanta 3.2 cannot interpret the settings correctly and will crash. See section 5.1 how to deal -with different $KDEHOME directories. +with different $TDEHOME directories. c) If you removed the editor/treeviews from the main window and you cannot dock them back anymore, do one of the following (in order of preference): - check the Settings->Configure Quanta->User Intreface->Reset window layout diff --git a/quanta/data/doc/faq.html b/quanta/data/doc/faq.html index e48a438d..ef8f912a 100644 --- a/quanta/data/doc/faq.html +++ b/quanta/data/doc/faq.html @@ -129,7 +129,7 @@

An assumption is made that you have the knowledge and ability to find and install any missing libraries that you may encounter. Basically, you need the headers from KDE, Qt, and GCC. If you don't know what was just said, then try the steps below and, if it doesn't work for you, then find yourself a Linux geek that can help.

Type the following in a shell and see what you get:

    -
  • test `echo $KDEDIR` && echo "yes" || echo "noKDE"
    • +
  • test `echo $TDEDIR` && echo "yes" || echo "noKDE"
  • test `echo $QTDIR` && echo "yes" || echo "noQT"

If you don't get two yes answers, then you need to find the location of the one that failed and export it to your current shell environment.

@@ -145,7 +145,7 @@
Top
2.4 I get error X when running ./configure
-

Please read 2.3 carefully again and make certain that you have exported the $KDEDIR and $QTDIR environment variables. This is the most likely cause. Aside from that, if you are missing something very important, then configure will tell you what it needs.

+

Please read 2.3 carefully again and make certain that you have exported the $TDEDIR and $QTDIR environment variables. This is the most likely cause. Aside from that, if you are missing something very important, then configure will tell you what it needs.

Top
diff --git a/quanta/data/dtep/dtd-description.txt b/quanta/data/dtep/dtd-description.txt index 3c55890d..64627c9b 100644 --- a/quanta/data/dtep/dtd-description.txt +++ b/quanta/data/dtep/dtd-description.txt @@ -32,7 +32,7 @@ Family = 1 (it's a real DTD) [Toolbars] - information about DTD toolbars -Location = the directory inside the $KDEDIR($KDEHOME)/share/apps/quanta/toolbars +Location = the directory inside the $TDEDIR($TDEHOME)/share/apps/quanta/toolbars where the toolbars for this DTD are Names = the list of toolbar file names (without the .toolbar.tgz extension) that are loaded for this DTD from the above directory diff --git a/quanta/dialogs/dtepeditdlgs.ui b/quanta/dialogs/dtepeditdlgs.ui index 163ebdb8..ef7e47c7 100644 --- a/quanta/dialogs/dtepeditdlgs.ui +++ b/quanta/dialogs/dtepeditdlgs.ui @@ -298,7 +298,7 @@ The name of the folder where the toolbars are stored - The name of the folder where the toolbars are stored. This is a relative name to <br><i>$KDEDIR(&nbsp;or&nbsp;$KDEHOME)/share/apps/quanta/toolbars</i> . + The name of the folder where the toolbars are stored. This is a relative name to <br><i>$TDEDIR(&nbsp;or&nbsp;$TDEHOME)/share/apps/quanta/toolbars</i> . @@ -309,7 +309,7 @@ The name of the folder where the toolbars are stored - The name of the folder where the toolbars are stored. This is a relative name to <br><i>$KDEDIR(&nbsp;or&nbsp;$KDEHOME)/share/apps/quanta/toolbars</i> . + The name of the folder where the toolbars are stored. This is a relative name to <br><i>$TDEDIR(&nbsp;or&nbsp;$TDEHOME)/share/apps/quanta/toolbars</i> . diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp index 843c83c7..0f0d9933 100644 --- a/quanta/src/document.cpp +++ b/quanta/src/document.cpp @@ -2690,7 +2690,7 @@ void Document::createBackup(KConfig* config) //creates an entry string in quantarc if it does not exist yet config->setGroup("General Options"); TQStringList backedupFilesEntryList = QuantaCommon::readPathListEntry(config, "List of backedup files"); //the files that were backedup - TQStringList autosavedFilesEntryList = QuantaCommon::readPathListEntry(config, "List of autosaved files"); //the list of actual backup files inside $KDEHOME/share/apps/quanta/backups + TQStringList autosavedFilesEntryList = QuantaCommon::readPathListEntry(config, "List of autosaved files"); //the list of actual backup files inside $TDEHOME/share/apps/quanta/backups if (!autosavedFilesEntryList.contains(backupPathValueURL)) //not yet backed up, add an entry for this file { autosavedFilesEntryList.append(backupPathValueURL); diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp index 1a1e6c0c..ee054cbe 100644 --- a/quanta/src/quanta.cpp +++ b/quanta/src/quanta.cpp @@ -224,7 +224,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( quantaStarted = false; kdWarning() << "***************************************************************************" << endl; kdWarning() << i18n("Quanta data files were not found.") << endl; - kdWarning() << i18n("You may have forgotten to run \"make install\", or your KDEDIR, KDEDIRS or PATH are not set correctly.") << endl; + kdWarning() << i18n("You may have forgotten to run \"make install\", or your TDEDIR, TDEDIRS or PATH are not set correctly.") << endl; kdWarning() << "***************************************************************************" << endl; TQTimer::singleShot(20, kapp, TQT_SLOT(quit())); return; -- cgit v1.2.1