From 7ab4c863e85225f8aa38cb96408cdf36256eb85a Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 21 Aug 2011 01:43:11 +0000 Subject: [PATCH] Convert remaining references to kde3 (e.g. in paths) to trinity git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- doc/kstars/install.docbook | 2 +- kig/README.Developers | 2 +- kstars/INSTALL | 2 +- kstars/kstars/indi/apogee_ppi.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/kstars/install.docbook b/doc/kstars/install.docbook index a45cfa76..94a1c1c3 100644 --- a/doc/kstars/install.docbook +++ b/doc/kstars/install.docbook @@ -78,7 +78,7 @@ Please do not forget the prefix argument to configure. If your KDEDIR/usr, /opt/kde, or -/opt/kde3. +/opt/trinity. Also, make sure you do the last step as root. diff --git a/kig/README.Developers b/kig/README.Developers index 753533e4..7f9a92bf 100644 --- a/kig/README.Developers +++ b/kig/README.Developers @@ -6,7 +6,7 @@ Hi, here are some things that might not be immediately clear : - for testing code, i don't really know how you're supposed to do this with kparts, so i just do a "make install" every time, and then simply run the program, you prolly want to do "./configure --enable-debug=full - --prefix=/usr/local/kde3" (meanwhile, i found out, the solution is in a + --prefix=/usr/local/trinity" (meanwhile, i found out, the solution is in a developer faq on developer.kde.org (http://developer.kde.org/documentation/other/developer-faq.html#q67.1) diff --git a/kstars/INSTALL b/kstars/INSTALL index 17f6b7d4..7a98c346 100644 --- a/kstars/INSTALL +++ b/kstars/INSTALL @@ -9,7 +9,7 @@ Basic Installation (i.e., if it's /usr/bin/konqueror, then use "./configure --prefix=/usr"). - KDEDIR is typically /usr or /opt/kde or /opt/kde2 or /opt/kde3 + KDEDIR is typically /usr or /opt/kde or /opt/kde2 or /opt/trinity ==---> Dependencies: KStars is a KDE application. To build it from source code, you will need to have the following packages installed. diff --git a/kstars/kstars/indi/apogee_ppi.cpp b/kstars/kstars/indi/apogee_ppi.cpp index 6eb7063c..e6edfbbb 100644 --- a/kstars/kstars/indi/apogee_ppi.cpp +++ b/kstars/kstars/indi/apogee_ppi.cpp @@ -184,7 +184,7 @@ bool ApogeeCam::loadXMLModel() //IDLog("Top dir is "TOP_DATADIR, NULL); modelSpecFile = fopen(TOP_DATADIR"/apogee_caminfo.xml", "r"); - //modelSpecFile = fopen("/opt/kde3/share/apps/kstars/apogee_caminfo.xml", "r"); + //modelSpecFile = fopen("/opt/trinity/share/apps/kstars/apogee_caminfo.xml", "r"); if (modelSpecFile == NULL) { IDLog("Error: Unable to open file apogee_caminfo.xml\n"); @@ -897,7 +897,7 @@ bool ApogeeCam::initCamera() char errmsg[1024]; spFile = fopen(TOP_DATADIR"/apogee_caminfo.xml", "r"); - //spFile = fopen("/opt/kde3/share/apps/kstars/apogee_caminfo.xml", "r"); + //spFile = fopen("/opt/trinity/share/apps/kstars/apogee_caminfo.xml", "r"); if (spFile == NULL) { IDLog("Error: Unable to open file apogee_caminfo.xml\n");