diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:04:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:04:16 -0600 |
| commit | 5159cd2beb2e87806a5b54e9991b7895285c9d3e (patch) | |
| tree | 9b70e8be47a390f8f4d56ead812ab0c9dad88709 /tdecore/networkbackends/network-manager | |
| parent | c17cb900dcf52b8bd6dc300d4f103392900ec2b4 (diff) | |
| download | tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.tar.gz tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/networkbackends/network-manager')
| -rw-r--r-- | tdecore/networkbackends/network-manager/network-manager.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tdecore/networkbackends/network-manager/network-manager.cpp b/tdecore/networkbackends/network-manager/network-manager.cpp index 206e75737..d747b61ae 100644 --- a/tdecore/networkbackends/network-manager/network-manager.cpp +++ b/tdecore/networkbackends/network-manager/network-manager.cpp @@ -20,7 +20,7 @@ #include <tqdbusmessage.h> -#include "kconfig.h" +#include "tdeconfig.h" #include "tdehardwaredevices.h" #include "network-manager.h" @@ -4828,10 +4828,10 @@ TDENetworkVPNTypeList TDENetworkConnectionManager_BackendNM::availableVPNTypes() // read in all available Services for (TQStringList::Iterator i = services.begin (); i != services.end (); ++i) { TQString service = NM_PLUGIN_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"); - TQString serviceName = kconfig->readEntry("name", TQString()); + TQString serviceName = tdeconfig->readEntry("name", TQString()); serviceName = serviceName.lower(); if (serviceName == "openvpn") { @@ -4847,7 +4847,7 @@ TDENetworkVPNTypeList TDENetworkConnectionManager_BackendNM::availableVPNTypes() ret.append(TDENetworkVPNType::VPNC); } - delete kconfig; + delete tdeconfig; } } |