diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:53:51 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:53:51 -0600 |
| commit | 5b8c58522102256d4516036708f275c6cea3eba9 (patch) | |
| tree | 027852cd094f8e542cdf6b1cf0f9b62af325a7a6 /knetworkmanager-0.8/src/knetworkmanager-vpnmanager.cpp | |
| parent | 7c8e3ad433bfaa06fa12501a8106f4d974f82d3a (diff) | |
| download | knetworkmanager8-5b8c58522102256d4516036708f275c6cea3eba9.tar.gz knetworkmanager8-5b8c58522102256d4516036708f275c6cea3eba9.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'knetworkmanager-0.8/src/knetworkmanager-vpnmanager.cpp')
| -rw-r--r-- | knetworkmanager-0.8/src/knetworkmanager-vpnmanager.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/knetworkmanager-0.8/src/knetworkmanager-vpnmanager.cpp b/knetworkmanager-0.8/src/knetworkmanager-vpnmanager.cpp index b7f86f7..28ab689 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-vpnmanager.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-vpnmanager.cpp @@ -28,7 +28,7 @@ #include <klocale.h> #include <tqdir.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "knetworkmanager-vpnmanager.h" #include "knetworkmanager-vpnservice.h" @@ -53,18 +53,18 @@ VPNManager::getVPNServices () // read in all available Services for (TQStringList::Iterator i = services.begin (); i != services.end (); ++i) { TQString service = SERVICE_DIR + TQString ("/") + *i; - TDEConfig* kconfig = new TDEConfig (service, true, true, "config"); - kconfig->setGroup ("VPN Connection"); + TDEConfig* tdeconfig = new TDEConfig (service, true, true, "config"); + tdeconfig->setGroup ("VPN Connection"); -kdDebug() << "VPN Service " << kconfig->readEntry ("name", TQString()).ascii() << endl; +kdDebug() << "VPN Service " << tdeconfig->readEntry ("name", TQString()).ascii() << endl; // create new VPNService Object - VPNService* vpnservice = new VPNService(kconfig->readEntry ("name", TQString()), kconfig->readEntry ("service", TQString()), TQT_TQOBJECT(KNetworkManager::getInstance())); + VPNService* vpnservice = new VPNService(tdeconfig->readEntry ("name", TQString()), tdeconfig->readEntry ("service", TQString()), TQT_TQOBJECT(KNetworkManager::getInstance())); if (!vpnservice->getVPNPlugin()) delete vpnservice; else list.push_back(vpnservice); - delete kconfig; + delete tdeconfig; } } @@ -86,13 +86,13 @@ VPNManager::getVPNService(TQString service_type) // read in all available Services for (TQStringList::Iterator i = services.begin (); i != services.end (); ++i) { TQString service = SERVICE_DIR + TQString ("/") + *i; - TDEConfig* kconfig = new TDEConfig (service, true, true, "config"); - kconfig->setGroup ("VPN Connection"); + TDEConfig* tdeconfig = new TDEConfig (service, true, true, "config"); + tdeconfig->setGroup ("VPN Connection"); - if (kconfig->readEntry ("service", TQString()) == service_type) + if (tdeconfig->readEntry ("service", TQString()) == service_type) { // create new VPNService Object - VPNService* vpnservice = new VPNService(kconfig->readEntry ("name", TQString()), kconfig->readEntry ("service", TQString()), TQT_TQOBJECT(KNetworkManager::getInstance())); + VPNService* vpnservice = new VPNService(tdeconfig->readEntry ("name", TQString()), tdeconfig->readEntry ("service", TQString()), TQT_TQOBJECT(KNetworkManager::getInstance())); if (!vpnservice->getVPNPlugin()) delete vpnservice; else |