TDE
/
knetworkmanager8
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/knetworkmanager8
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a number of libraries and executables to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 7c8e3ad433
commit 5b8c585221
10 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File

2
knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp
Unescape View File

@ -49,7 +49,7 @@ class WirelessDialog;
#include <khelpmenu.h> #include <khelpmenu.h>
#include <kprocess.h> #include <kprocess.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>

2
knetworkmanager-0.8/src/knetworkmanager-menu_subhead.cpp
Unescape View File

@ -45,7 +45,7 @@ class WirelessDialog;
#include <khelpmenu.h> #include <khelpmenu.h>
#include <kprocess.h> #include <kprocess.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include "knetworkmanager-menu_subhead.h" #include "knetworkmanager-menu_subhead.h"

2
knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp
Unescape View File

@ -46,7 +46,7 @@
#include <khelpmenu.h> #include <khelpmenu.h>
#include <kprocess.h> #include <kprocess.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <tqdbusobjectpath.h> #include <tqdbusobjectpath.h>

8
knetworkmanager-0.8/src/knetworkmanager-storage.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <tqtimer.h> #include <tqtimer.h>
#include <kglobal.h> #include <kglobal.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kstaticdeleter.h> #include <kstaticdeleter.h>
#include <kdebug.h> #include <kdebug.h>
@ -229,7 +229,7 @@ Storage::restoreSetting(Connection* conn, const TQString& setting_grp_name)
return false; return false;
} }
// read the SettingsMap from kconfig // read the SettingsMap from tdeconfig
SettingsMap map; SettingsMap map;
for(TQMap<TQString, TQString>::ConstIterator it = config_map.begin(); it != config_map.end(); ++it) for(TQMap<TQString, TQString>::ConstIterator it = config_map.begin(); it != config_map.end(); ++it)
{ {
@ -269,7 +269,7 @@ Storage::restoreSecrets(Connection* conn, const TQString& secrets_grp_name)
return false; return false;
} }
// read the SettingsMap from kconfig // read the SettingsMap from tdeconfig
SettingsMap map; SettingsMap map;
for(TQMap<TQString, TQString>::ConstIterator it = config_map.begin(); it != config_map.end(); ++it) for(TQMap<TQString, TQString>::ConstIterator it = config_map.begin(); it != config_map.end(); ++it)
{ {
@ -309,7 +309,7 @@ Storage::restoreVPNSecrets(Connection* conn, const TQString& secrets_grp_name)
return false; return false;
} }
// read the SettingsMap from kconfig // read the SettingsMap from tdeconfig
SettingsMap map; SettingsMap map;
for(TQMap<TQString, TQString>::ConstIterator it = config_map.begin(); it != config_map.end(); ++it) for(TQMap<TQString, TQString>::ConstIterator it = config_map.begin(); it != config_map.end(); ++it)
{ {

4
knetworkmanager-0.8/src/knetworkmanager-tray.cpp
Unescape View File

@ -50,7 +50,7 @@ class WirelessDialog;
#include <khelpmenu.h> #include <khelpmenu.h>
#include <kprocess.h> #include <kprocess.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <tqpushbutton.h> #include <tqpushbutton.h>
@ -486,7 +486,7 @@ Tray::slotVPNSecretsNeeded(ConnectionSettings::Connection* connection, Connectio
// printf("Secrets cannot be restored!\n\r"); // printf("Secrets cannot be restored!\n\r");
// } // }
// Read the SettingsMap from kconfig // Read the SettingsMap from tdeconfig
// This loop reads the secrets information map only // This loop reads the secrets information map only
TQMap<TQString, TQString> map; TQMap<TQString, TQString> map;
for(TQMap<TQString, TQString>::ConstIterator it = config_map.begin(); it != config_map.end(); ++it) for(TQMap<TQString, TQString>::ConstIterator it = config_map.begin(); it != config_map.end(); ++it)

2
knetworkmanager-0.8/src/knetworkmanager-vpnauthenticationdialog.h
Unescape View File

@ -28,7 +28,7 @@
#include <tqdir.h> #include <tqdir.h>
#include <tqobject.h> #include <tqobject.h>
#include <kprocess.h> #include <kprocess.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "knetworkmanager.h" #include "knetworkmanager.h"
#include "vpnauthentication.h" #include "vpnauthentication.h"

20
knetworkmanager-0.8/src/knetworkmanager-vpnmanager.cpp
Unescape View File

@ -28,7 +28,7 @@
#include <klocale.h> #include <klocale.h>
#include <tqdir.h> #include <tqdir.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "knetworkmanager-vpnmanager.h" #include "knetworkmanager-vpnmanager.h"
#include "knetworkmanager-vpnservice.h" #include "knetworkmanager-vpnservice.h"
@ -53,18 +53,18 @@ VPNManager::getVPNServices ()
// read in all available Services // read in all available Services
for (TQStringList::Iterator i = services.begin (); i != services.end (); ++i) { for (TQStringList::Iterator i = services.begin (); i != services.end (); ++i) {
TQString service = SERVICE_DIR + TQString ("/") + *i; TQString service = SERVICE_DIR + TQString ("/") + *i;
TDEConfig* kconfig = new TDEConfig (service, true, true, "config"); TDEConfig* tdeconfig = new TDEConfig (service, true, true, "config");
kconfig->setGroup ("VPN Connection"); 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 // 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()) if (!vpnservice->getVPNPlugin())
delete vpnservice; delete vpnservice;
else else
list.push_back(vpnservice); list.push_back(vpnservice);
delete kconfig; delete tdeconfig;
} }
} }
@ -86,13 +86,13 @@ VPNManager::getVPNService(TQString service_type)
// read in all available Services // read in all available Services
for (TQStringList::Iterator i = services.begin (); i != services.end (); ++i) { for (TQStringList::Iterator i = services.begin (); i != services.end (); ++i) {
TQString service = SERVICE_DIR + TQString ("/") + *i; TQString service = SERVICE_DIR + TQString ("/") + *i;
TDEConfig* kconfig = new TDEConfig (service, true, true, "config"); TDEConfig* tdeconfig = new TDEConfig (service, true, true, "config");
kconfig->setGroup ("VPN Connection"); tdeconfig->setGroup ("VPN Connection");
if (kconfig->readEntry ("service", TQString()) == service_type) if (tdeconfig->readEntry ("service", TQString()) == service_type)
{ {
// create new VPNService Object // 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()) if (!vpnservice->getVPNPlugin())
delete vpnservice; delete vpnservice;
else else

4
knetworkmanager-0.8/src/knetworkmanager-vpnservice.cpp
Unescape View File

@ -26,14 +26,14 @@
#define SERVICE_DIR "/etc/NetworkManager/VPN" #define SERVICE_DIR "/etc/NetworkManager/VPN"
#include <stdlib.h> #include <stdlib.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <tqdom.h> #include <tqdom.h>
#include <tqdir.h> #include <tqdir.h>
#include <klocale.h> #include <klocale.h>
#include <kdebug.h> #include <kdebug.h>
#include <kstddirs.h> #include <kstddirs.h>
#include <kprocess.h> #include <kprocess.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kplugininfo.h> #include <kplugininfo.h>
#include "knetworkmanager-pluginmanager.h" #include "knetworkmanager-pluginmanager.h"

2
knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp
Unescape View File

@ -43,7 +43,7 @@
#include <khelpmenu.h> #include <khelpmenu.h>
#include <kprocess.h> #include <kprocess.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <NetworkManager.h> #include <NetworkManager.h>

2
knetworkmanager-0.8/src/settings.kcfgc
Unescape View File

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler # Code generation options for tdeconfig_compiler
File=knetworkmanager.kcfg File=knetworkmanager.kcfg
ClassName=Settings ClassName=Settings
Singleton=true Singleton=true

Write Preview
Loading…
Cancel
Save