From b0cf06e10426777a6509060e34d36874a7900da4 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 29 Jan 2013 23:32:23 -0600
Subject: Rename a few build variables for overall consistency

---
 kppp/logview/Makefile.am | 2 +-
 kppp/pppdata.cpp         | 4 ++--
 kppp/pppdata.h           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kppp')

diff --git a/kppp/logview/Makefile.am b/kppp/logview/Makefile.am
index 67301cd5..13be319f 100644
--- a/kppp/logview/Makefile.am
+++ b/kppp/logview/Makefile.am
@@ -33,7 +33,7 @@ kppplogview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE)
 
 # the libraries to link against. Be aware of the order. First the libraries,
 # that depend on the following ones.
-kppplogview_LDADD = -lm $(LIB_TDEUI) $(LIB_KFILE)
+kppplogview_LDADD = -lm $(LIB_TDEUI) $(LIB_TDEFILE)
 
 # this option you can leave out. Just, if you use "make dist", you need it
 noinst_HEADERS = export.h loginfo.h log.h monthly.h main.h
diff --git a/kppp/pppdata.cpp b/kppp/pppdata.cpp
index 29ccb308..5fd1147d 100644
--- a/kppp/pppdata.cpp
+++ b/kppp/pppdata.cpp
@@ -610,12 +610,12 @@ void PPPData::setModemEscapeGuardTime(int n) {
 
 
 bool PPPData::modemLockFile() {
-  return readNumConfig(cmodemgroup, LOCKFILE_KEY, 1);
+  return readNumConfig(cmodemgroup, LOCTDEFILE_KEY, 1);
 }
 
 
 void PPPData::setModemLockFile(bool set) {
-  writeConfig(cmodemgroup, LOCKFILE_KEY, set);
+  writeConfig(cmodemgroup, LOCTDEFILE_KEY, set);
 }
 
 
diff --git a/kppp/pppdata.h b/kppp/pppdata.h
index 824665a6..fb72bf0f 100644
--- a/kppp/pppdata.h
+++ b/kppp/pppdata.h
@@ -79,7 +79,7 @@ class TDEConfig;
 // modem
 #define MOD_NAME_KEY       "Name"
 #define MODEMDEV_KEY       "Device"
-#define LOCKFILE_KEY       "UseLockFile"
+#define LOCTDEFILE_KEY       "UseLockFile"
 #define FLOWCONTROL_KEY    "FlowControl"
 #define SPEED_KEY          "Speed"
 #define TIMEOUT_KEY        "Timeout"
-- 
cgit v1.2.1