From b07e8ce7a04b2e7395663d350b556b29951a67ea Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 7 Dec 2011 18:51:30 -0600 Subject: [PATCH] Rename KDEHOME and KDEDIR --- CMakeLists.txt | 2 +- ChangeLog | 4 ++-- Documentation/ConduitProgrammingTutorial/index.tex | 4 ++-- kpilot/Makefile-standalone | 12 ++++++------ kpilot/hotSync.h | 4 ++-- lib/pilotLocalDatabase.h | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index acd1313..d2f0821 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ endif(NOT builddebug) # this works on other systems. STRING(REPLACE "/lib" "" KDE3_DIR ${KDE3_LIB_DIR}) -# TODO: INSTALL PREFIX. RIGHT NOW EVERYTHING IS INSTALLED IN $KDEDIR +# TODO: INSTALL PREFIX. RIGHT NOW EVERYTHING IS INSTALLED IN $TDEDIR if(NOT CMAKE_INSTALL_PREFIX) set(CMAKE_INSTALL_PREFIX ${KDE3_DIR}) endif(NOT CMAKE_INSTALL_PREFIX) diff --git a/ChangeLog b/ChangeLog index 64c5b9a..a0cdd45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -931,7 +931,7 @@ TODO: only re-write a local database if it is changed. * Changed a few accelerators (duplicates reported by Dr.Klash) * Also show items marked as deleted in the GenericDB viewer. * All conduits now have their own copy of the handheld's database - in $KDEHOME/share/apps/kpilot/conduits/UserName/*.pdb. This was + in $TDEHOME/share/apps/kpilot/conduits/UserName/*.pdb. This was needed so that backup runs don't break the conduit's algorithm to detect changed records on the PC. So far, we compared each entry to the corresponding entry in the backup database. It that changed, @@ -1036,7 +1036,7 @@ KPilot Developer's notes for July 9th 2003-7-5 Adriaan de Groot * Renamed all conduit plugins from libconduit (and variants) to - conduit_, so that they're easier to identify in $KDEDIR/lib/trinity. + conduit_, so that they're easier to identify in $TDEDIR/lib/trinity. Of course, this doesn't work right. Feh. * Removed listCat again. * Implemented a notion of "internal conduit", so that we can move diff --git a/Documentation/ConduitProgrammingTutorial/index.tex b/Documentation/ConduitProgrammingTutorial/index.tex index f66b071..4cec9e9 100644 --- a/Documentation/ConduitProgrammingTutorial/index.tex +++ b/Documentation/ConduitProgrammingTutorial/index.tex @@ -634,7 +634,7 @@ database on the handheld and the backup database on the harddisk. These are set by openDatabases. \item\code{bool openDatabases(const char *dbName, bool*retrieved=0L)} ... opens the database named \code{dbName} on the handheld and the backup database -on the harddisk (in the directory \file{\$KDEHOME/share/apps/kpilot/DBBackup/PalmUserName/}). +on the harddisk (in the directory \file{\$TDEHOME/share/apps/kpilot/DBBackup/PalmUserName/}). If the backup database does not exist, the current database from the palm is fetched, and \code{*retrieved} is set to \code{true}. \end{itemize} @@ -759,7 +759,7 @@ The constructors of \class{PilotLocalDatabase} and \class{PilotSerialDatabase} a \item\code{PilotSerialDatabase(int linksocket, const char* dbName)} ... linksocket \item\code{PilotLocalDatabase( const QString\& path, const QString\& name)} \item\code{PilotLocalDatabase(const QString \&name)} ... open database by name only -(no explicit path). The path \file{\$KDEHOME/share/apps/kpilot/DBBackup/PalmUserName/} +(no explicit path). The path \file{\$TDEHOME/share/apps/kpilot/DBBackup/PalmUserName/} is set by KPilot automatically. \end{itemize} diff --git a/kpilot/Makefile-standalone b/kpilot/Makefile-standalone index e1d1f1f..a9ff3ac 100644 --- a/kpilot/Makefile-standalone +++ b/kpilot/Makefile-standalone @@ -1,20 +1,20 @@ # Makefile for a standalone kpilotConfig QTDIR=/usr/lib/qt-2.3.0 -KDEDIR=/vol/kde/kde-2.2 +TDEDIR=/vol/kde/kde-2.2 MOC=$(QTDIR)/bin/moc UIC=$(QTDIR)/bin/uic -DCOPIDL=$(KDEDIR)/bin/dcopidl -DCOPIDL2CPP=$(KDEDIR)/bin/dcopidl2cpp +DCOPIDL=$(TDEDIR)/bin/dcopidl +DCOPIDL2CPP=$(TDEDIR)/bin/dcopidl2cpp CXX=g++ CXXFLAGS=-DDEBUG -DDEBUG_CERR -# INCLUDES=-I$(QTDIR)/include -I$(KDEDIR)/include +# INCLUDES=-I$(QTDIR)/include -I$(TDEDIR)/include # # Or, for stupid RH 7.1 systems: -INCLUDES=-I$(QTDIR)/include -I$(KDEDIR)/include -I../lib -LDFLAGS=-L$(KDEDIR)/lib -Wl,-R -Wl,$(KDEDIR)/lib \ +INCLUDES=-I$(QTDIR)/include -I$(TDEDIR)/include -I../lib +LDFLAGS=-L$(TDEDIR)/lib -Wl,-R -Wl,$(TDEDIR)/lib \ -L$(QTDIR)/lib -Wl,-R -Wl,$(QTDIR)/lib \ -L../lib/.libs diff --git a/kpilot/hotSync.h b/kpilot/hotSync.h index 4b6b03d..eb10e75 100644 --- a/kpilot/hotSync.h +++ b/kpilot/hotSync.h @@ -78,7 +78,7 @@ public: /** By default, a path based on the user name (either * on the handheld or set in KPilot) is used to * determine the backup directory name ( generally - * $KDEHOME/share/apps/kpilot/DBBackup/_user_name_ ). + * $TDEHOME/share/apps/kpilot/DBBackup/_user_name_ ). * Use setDirectory() to change that and use a given * @p path as target for the backup. Use an empty * @p path to restore the default behavior of using @@ -156,7 +156,7 @@ public: /** By default, a path based on the user name (either * on the handheld or set in KPilot) is used to * determine the restory directory name ( generally - * $KDEHOME/share/apps/kpilot/DBBackup/_user_name_ ). + * $TDEHOME/share/apps/kpilot/DBBackup/_user_name_ ). * Use setDirectory() to change that and use a given * @p path as target for the source. Use an empty * @p path to restore the default behavior of using diff --git a/lib/pilotLocalDatabase.h b/lib/pilotLocalDatabase.h index e5d11a6..abc6ee6 100644 --- a/lib/pilotLocalDatabase.h +++ b/lib/pilotLocalDatabase.h @@ -46,7 +46,7 @@ public: /** * Opens the local database. If the database cannot be found at the * given position, a default path is used - * ($KDEHOME/share/apps/kpilot/DBBackup) + * ($TDEHOME/share/apps/kpilot/DBBackup) * and if the file is found there, it is opened. In some cases this should * not be done, so the parameter useDefaultPath controls this behavior. * If it is set to true, the default path is used if the file cannot be