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

Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent ff09977c01
commit 44c7446efd
21 changed files with 97 additions and 97 deletions
Show Stats Download Patch File Download Diff File

12
tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp
Unescape Escape View File

@ -54,18 +54,18 @@ class NetworkListViewItem : public KListViewItem
{ {
TQ_UINT8 strength = net.getStrength(); TQ_UINT8 strength = net.getStrength();
if (strength > 80) if (strength > 80)
setPixmap(1, KGlobal::iconLoader()->loadIcon("nm_signal_100", KIcon::Small)); setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_100", KIcon::Small));
else if (strength > 55) else if (strength > 55)
setPixmap(1, KGlobal::iconLoader()->loadIcon("nm_signal_75", KIcon::Small)); setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_75", KIcon::Small));
else if (strength > 30) else if (strength > 30)
setPixmap(1, KGlobal::iconLoader()->loadIcon("nm_signal_50", KIcon::Small)); setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_50", KIcon::Small));
else if (strength > 5) else if (strength > 5)
setPixmap(1, KGlobal::iconLoader()->loadIcon("nm_signal_25", KIcon::Small)); setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_25", KIcon::Small));
else else
setPixmap(1, KGlobal::iconLoader()->loadIcon("nm_signal_00", KIcon::Small)); setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_00", KIcon::Small));
if (net.isEncrypted()) if (net.isEncrypted())
setPixmap(2, KGlobal::iconLoader()->loadIcon("lock", KIcon::Small)); setPixmap(2, TDEGlobal::iconLoader()->loadIcon("lock", KIcon::Small));
} }
WirelessNetwork _net; WirelessNetwork _net;

6
tdenetworkmanager/src/configwidgets/tdenetman-connection_settings_dialog.cpp
Unescape Escape View File

@ -283,7 +283,7 @@ ConnectionSettingsDialogImpl::getDeviceTypeFromConnection(TDENetworkConnection*
void void
ConnectionSettingsDialogImpl::slotConnect() ConnectionSettingsDialogImpl::slotConnect()
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
// add/save the connection // add/save the connection
if (nm->saveConnection(_conn)) { if (nm->saveConnection(_conn)) {
@ -325,7 +325,7 @@ ConnectionSettingsDialogImpl::slotSave()
} }
} }
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
// save the connection // save the connection
if (!nm->saveConnection(_conn)) { if (!nm->saveConnection(_conn)) {
@ -448,7 +448,7 @@ ConnectionSettingsDialogImpl::slotEnableButtons()
Connect: only show connect if the connection is valid Connect: only show connect if the connection is valid
*/ */
if (_conn) { if (_conn) {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
TDENetworkErrorStringMap errorStringMap; TDENetworkErrorStringMap errorStringMap;
TDENetworkConnectionErrorFlags::TDENetworkConnectionErrorFlags errorFlags; TDENetworkConnectionErrorFlags::TDENetworkConnectionErrorFlags errorFlags;
bool ret; bool ret;

14
tdenetworkmanager/src/devicetraycomponent.cpp
Unescape Escape View File

@ -72,7 +72,7 @@ DeviceTrayComponent::DeviceTrayComponent(TQString device, KSystemTray * parent,
{ {
lastKnownState = TDENetworkConnectionStatus::Invalid; lastKnownState = TDENetworkConnectionStatus::Invalid;
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices(); TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices();
// Listen for hardware change events // Listen for hardware change events
connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString))); connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString)));
@ -115,7 +115,7 @@ TQString DeviceTrayComponent::device() const
void DeviceTrayComponent::tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent event, TQString) void DeviceTrayComponent::tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent event, TQString)
{ {
if (event == TDEHardwareEvent::HardwareListModified) { if (event == TDEHardwareEvent::HardwareListModified) {
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices(); TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices();
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device));
TDENetworkConnectionManager* deviceConnMan = dev->connectionManager(); TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
@ -134,7 +134,7 @@ void DeviceTrayComponent::deviceEventHandler(TDENetworkDeviceEventType::TDENetwo
TQStringList DeviceTrayComponent::getToolTipText() TQStringList DeviceTrayComponent::getToolTipText()
{ {
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices(); TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices();
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device));
TQStringList list; TQStringList list;
@ -180,10 +180,10 @@ TQMovie DeviceTrayComponent::movieForState(TDENetworkConnectionStatus::TDENetwor
} }
} }
if (m_tray) { if (m_tray) {
return TQMovie(KGlobal::iconLoader()->moviePath(moviePath, KIcon::Panel, m_tray->width())); return TQMovie(TDEGlobal::iconLoader()->moviePath(moviePath, KIcon::Panel, m_tray->width()));
} }
else { else {
return TQMovie(KGlobal::iconLoader()->moviePath(moviePath, KIcon::Panel)); return TQMovie(TDEGlobal::iconLoader()->moviePath(moviePath, KIcon::Panel));
} }
} }
else { else {
@ -209,8 +209,8 @@ void DeviceTrayComponent::deviceStateChanged(TDENetworkConnectionStatus::TDENetw
{ {
lastKnownState = newState; lastKnownState = newState;
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices(); TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices();
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device));
if (dev->macAddress() != hwAddress) { if (dev->macAddress() != hwAddress) {

8
tdenetworkmanager/src/main.cpp
Unescape Escape View File

@ -61,12 +61,12 @@ kdemain (int argc, char* argv[])
TDENetworkManager app; TDENetworkManager app;
app.disableSessionManagement(); app.disableSessionManagement();
if (!KGlobal::hardwareDevices()) { if (!TDEGlobal::hardwareDevices()) {
printf("[ERROR] Unable to load tdenetworkmanager due to invalid KGlobal::hardwareDevices() object\n\r"); fflush(stdout); printf("[ERROR] Unable to load tdenetworkmanager due to invalid TDEGlobal::hardwareDevices() object\n\r"); fflush(stdout);
return -1; return -1;
} }
if (!KGlobal::networkManager()) { if (!TDEGlobal::networkManager()) {
printf("[ERROR] Unable to load tdenetworkmanager due to invalid KGlobal::hardwareDevices() object\n\r"); fflush(stdout); printf("[ERROR] Unable to load tdenetworkmanager due to invalid TDEGlobal::hardwareDevices() object\n\r"); fflush(stdout);
return -1; return -1;
} }

6
tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp
Unescape Escape View File

@ -50,7 +50,7 @@ class CellularDeviceTrayPrivate
void CellularDeviceTray::newConnection() void CellularDeviceTray::newConnection()
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
// create an appropriate connection // create an appropriate connection
@ -81,7 +81,7 @@ void CellularDeviceTray::addMenuItems(KPopupMenu* menu)
menu->insertItem (subhead, -1, -1); menu->insertItem (subhead, -1, -1);
//menu->insertSeparator(); //menu->insertSeparator();
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
TDENetworkConnectionManager* deviceConnMan = dev->connectionManager(); TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
TDENetworkConnection* active_conn = NULL; TDENetworkConnection* active_conn = NULL;
if ((!(deviceConnMan->deviceInformation().statusFlags & TDENetworkConnectionStatus::Disconnected)) if ((!(deviceConnMan->deviceInformation().statusFlags & TDENetworkConnectionStatus::Disconnected))
@ -122,7 +122,7 @@ void CellularDeviceTray::addMenuItems(KPopupMenu* menu)
CellularDeviceTray::CellularDeviceTray (TQString dev, KSystemTray * parent, const char * name) CellularDeviceTray::CellularDeviceTray (TQString dev, KSystemTray * parent, const char * name)
: DeviceTrayComponent (dev, parent, name) : DeviceTrayComponent (dev, parent, name)
{ {
hwdevices = KGlobal::hardwareDevices(); hwdevices = TDEGlobal::hardwareDevices();
d = new CellularDeviceTrayPrivate(); d = new CellularDeviceTrayPrivate();
d->dev = dev; d->dev = dev;

30
tdenetworkmanager/src/tdenetman-connection_editor.cpp
Unescape Escape View File

@ -61,7 +61,7 @@ class ConnectionListViewItem : public KListViewItem
: KListViewItem(parent) : KListViewItem(parent)
, _conn(connection) , _conn(connection)
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
TDENetworkConnection* conn = (nm)?nm->findConnectionByUUID(connection):NULL; TDENetworkConnection* conn = (nm)?nm->findConnectionByUUID(connection):NULL;
if (conn) { if (conn) {
@ -69,16 +69,16 @@ class ConnectionListViewItem : public KListViewItem
setText(1, TDENetworkConnectionManager::friendlyConnectionTypeName(conn->type())); setText(1, TDENetworkConnectionManager::friendlyConnectionTypeName(conn->type()));
// TODO: Move to a Factory // TODO: Move to a Factory
if (conn->type() == TDENetworkConnectionType::WiredEthernet) { if (conn->type() == TDENetworkConnectionType::WiredEthernet) {
setPixmap(0, KGlobal::iconLoader()->loadIcon("wired", KIcon::Small)); setPixmap(0, TDEGlobal::iconLoader()->loadIcon("wired", KIcon::Small));
} }
else if (conn->type() == TDENetworkConnectionType::WiFi) { else if (conn->type() == TDENetworkConnectionType::WiFi) {
setPixmap(0, KGlobal::iconLoader()->loadIcon("wireless", KIcon::Small)); setPixmap(0, TDEGlobal::iconLoader()->loadIcon("wireless", KIcon::Small));
} }
else if (conn->type() == TDENetworkConnectionType::VPN) { else if (conn->type() == TDENetworkConnectionType::VPN) {
setPixmap(0, KGlobal::iconLoader()->loadIcon("encrypted", KIcon::Small)); setPixmap(0, TDEGlobal::iconLoader()->loadIcon("encrypted", KIcon::Small));
} }
else { else {
setPixmap(0, KGlobal::iconLoader()->loadIcon("help", KIcon::Small)); setPixmap(0, TDEGlobal::iconLoader()->loadIcon("help", KIcon::Small));
} }
} }
} }
@ -101,17 +101,17 @@ ConnectionEditorImpl::ConnectionEditorImpl(TQWidget* parent, const char* name, b
// pbEdit->hide(); // pbEdit->hide();
pbNew->setIconSet(KGlobal::iconLoader()->loadIcon("add", KIcon::Small)); pbNew->setIconSet(TDEGlobal::iconLoader()->loadIcon("add", KIcon::Small));
pbDelete->setIconSet(KGlobal::iconLoader()->loadIcon("remove", KIcon::Small)); pbDelete->setIconSet(TDEGlobal::iconLoader()->loadIcon("remove", KIcon::Small));
pbEdit->setIconSet(KGlobal::iconLoader()->loadIcon("edit", KIcon::Small)); pbEdit->setIconSet(TDEGlobal::iconLoader()->loadIcon("edit", KIcon::Small));
TQPopupMenu* popup = new TQPopupMenu(pbNew); TQPopupMenu* popup = new TQPopupMenu(pbNew);
// TODO: move to a factory class // TODO: move to a factory class
popup->insertItem(KGlobal::iconLoader()->loadIcon("wireless", KIcon::Small), i18n("Wireless"), this, TQT_SLOT(slotNewWirelessConnection())); popup->insertItem(TDEGlobal::iconLoader()->loadIcon("wireless", KIcon::Small), i18n("Wireless"), this, TQT_SLOT(slotNewWirelessConnection()));
popup->insertItem(KGlobal::iconLoader()->loadIcon("wired", KIcon::Small), i18n("Wired"), this, TQT_SLOT(slotNewWiredConnection())); popup->insertItem(TDEGlobal::iconLoader()->loadIcon("wired", KIcon::Small), i18n("Wired"), this, TQT_SLOT(slotNewWiredConnection()));
// if (!VPNManager::getVPNServices().isEmpty()) { // if (!VPNManager::getVPNServices().isEmpty()) {
popup->insertItem(KGlobal::iconLoader()->loadIcon("encrypted", KIcon::Small), i18n("VPN"), this, TQT_SLOT(slotNewVPNConnection())); popup->insertItem(TDEGlobal::iconLoader()->loadIcon("encrypted", KIcon::Small), i18n("VPN"), this, TQT_SLOT(slotNewVPNConnection()));
// } // }
pbNew->setPopup(popup); pbNew->setPopup(popup);
@ -175,7 +175,7 @@ void ConnectionEditorImpl::slotEditNewConnection(TDENetworkConnection* conn)
void ConnectionEditorImpl::slotRefreshConnectionList() void ConnectionEditorImpl::slotRefreshConnectionList()
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
if (!nm) { if (!nm) {
return; return;
} }
@ -193,7 +193,7 @@ void ConnectionEditorImpl::slotEditCurrentConnection()
return; return;
} }
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
if (!nm) { if (!nm) {
return; return;
} }
@ -220,7 +220,7 @@ void ConnectionEditorImpl::slotRemoveCurrentConnection()
return; return;
} }
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
if (!nm) { if (!nm) {
return; return;
} }
@ -239,7 +239,7 @@ void ConnectionEditorImpl::slotRemoveCurrentConnection()
*/ */
void ConnectionEditorImpl::fillConnectionList() void ConnectionEditorImpl::fillConnectionList()
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
if (!nm) { if (!nm) {
return; return;
} }

4
tdenetworkmanager/src/tdenetman-menuitem.cpp
Unescape Escape View File

@ -69,8 +69,8 @@ void NetworkMenuItem::slotActivate()
{ {
kdDebug() << "NetworkMenuItem::slotActivate()" << endl; kdDebug() << "NetworkMenuItem::slotActivate()" << endl;
TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices(); TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices();
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
TDENetworkConnection* conn = nm->findConnectionByUUID(d->conn); TDENetworkConnection* conn = nm->findConnectionByUUID(d->conn);

38
tdenetworkmanager/src/tdenetman-tray.cpp
Unescape Escape View File

@ -161,7 +161,7 @@ Tray* Tray::getInstance()
void Tray::slotEditConnections() void Tray::slotEditConnections()
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
if (!nm) return; if (!nm) return;
if (tdenetworkmanager_editor_dialog_count == 0) nm->loadConnectionInformation(); if (tdenetworkmanager_editor_dialog_count == 0) nm->loadConnectionInformation();
@ -172,28 +172,28 @@ void Tray::slotEditConnections()
void Tray::slotEnableWireless() void Tray::slotEnableWireless()
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
if (!nm) return; if (!nm) return;
nm->enableWiFi(true); nm->enableWiFi(true);
} }
void Tray::slotDisableWireless() void Tray::slotDisableWireless()
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
if (!nm) return; if (!nm) return;
nm->enableWiFi(false); nm->enableWiFi(false);
} }
void Tray::slotOfflineMode() void Tray::slotOfflineMode()
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
if (!nm) return; if (!nm) return;
nm->enableNetworking(false); nm->enableNetworking(false);
} }
void Tray::slotOnlineMode() void Tray::slotOnlineMode()
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
if (!nm) return; if (!nm) return;
nm->enableNetworking(true); nm->enableNetworking(true);
} }
@ -217,7 +217,7 @@ void Tray::slotVPNBannerShow(const TQString& vpnbanner)
void Tray::contextMenuAboutToShow (KPopupMenu* menu) void Tray::contextMenuAboutToShow (KPopupMenu* menu)
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
if (tdenetworkmanager_editor_dialog_count == 0) nm->loadConnectionInformation(); if (tdenetworkmanager_editor_dialog_count == 0) nm->loadConnectionInformation();
@ -582,7 +582,7 @@ void Tray::mousePressEvent( TQMouseEvent *e )
void Tray::slotDeactivateConnection(int index) void Tray::slotDeactivateConnection(int index)
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
if (!nm) return; if (!nm) return;
TDENetworkConnection* conn = nm->findConnectionByUUID(d->act_conn_map[index]); TDENetworkConnection* conn = nm->findConnectionByUUID(d->act_conn_map[index]);
@ -631,7 +631,7 @@ void Tray::updateTrayDeviceManagerState() {
void Tray::trayComponentNeedsCenterStage(TrayComponent *component, bool needsIt) void Tray::trayComponentNeedsCenterStage(TrayComponent *component, bool needsIt)
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
DeviceTrayComponent * dtc = dynamic_cast<DeviceTrayComponent*>(component); DeviceTrayComponent * dtc = dynamic_cast<DeviceTrayComponent*>(component);
if (dtc) { if (dtc) {
@ -758,7 +758,7 @@ void Tray::updateTrayIcon(TDENetworkConnectionStatus::TDENetworkConnectionStatus
char active_vpn=0; char active_vpn=0;
char found_any_active_connection=0; char found_any_active_connection=0;
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
// Make sure the current state will be displayed // Make sure the current state will be displayed
if (d->foregroundTrayComponent) { if (d->foregroundTrayComponent) {
@ -790,7 +790,7 @@ void Tray::updateTrayIcon(TDENetworkConnectionStatus::TDENetworkConnectionStatus
// } // }
#endif // DEBUG_STATE #endif // DEBUG_STATE
TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags current_vpn_state = (KGlobal::networkManager()->backendStatus() & TDENetworkGlobalManagerFlags::VPNMask); TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags current_vpn_state = (TDEGlobal::networkManager()->backendStatus() & TDENetworkGlobalManagerFlags::VPNMask);
if ((current_vpn_state & TDENetworkGlobalManagerFlags::VPNFailed) || (current_vpn_state & TDENetworkGlobalManagerFlags::VPNDisconnected)) { if ((current_vpn_state & TDENetworkGlobalManagerFlags::VPNFailed) || (current_vpn_state & TDENetworkGlobalManagerFlags::VPNDisconnected)) {
active_vpn = 0; active_vpn = 0;
} }
@ -838,7 +838,7 @@ void Tray::updateTrayIcon(TDENetworkConnectionStatus::TDENetworkConnectionStatus
} }
} }
else { else {
TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags current_vpn_state = (KGlobal::networkManager()->backendStatus() & TDENetworkGlobalManagerFlags::VPNMask); TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags current_vpn_state = (TDEGlobal::networkManager()->backendStatus() & TDENetworkGlobalManagerFlags::VPNMask);
#ifdef DEBUG_STATE #ifdef DEBUG_STATE
printf("VPN state: 0x%08x\n\r", current_vpn_state); printf("VPN state: 0x%08x\n\r", current_vpn_state);
//printf("Activated is: %d\n\r", TDENetworkConnectionStatus::Connected); //printf("Activated is: %d\n\r", TDENetworkConnectionStatus::Connected);
@ -981,7 +981,7 @@ TQPixmap Tray::pixmapForName(TQString pixmapPath)
TQMovie Tray::movieForName(TQString moviePath) TQMovie Tray::movieForName(TQString moviePath)
{ {
if (moviePath != "") { if (moviePath != "") {
return TQMovie(KGlobal::iconLoader()->moviePath(moviePath, KIcon::Panel, width())); return TQMovie(TDEGlobal::iconLoader()->moviePath(moviePath, KIcon::Panel, width()));
} }
else { else {
return TQMovie(); return TQMovie();
@ -990,7 +990,7 @@ TQMovie Tray::movieForName(TQString moviePath)
TQByteArray Tray::movieFileData(TQString movieName) { TQByteArray Tray::movieFileData(TQString movieName) {
TQByteArray ret; TQByteArray ret;
TQString fileName = KGlobal::iconLoader()->moviePath(movieName, KIcon::Panel, width()); TQString fileName = TDEGlobal::iconLoader()->moviePath(movieName, KIcon::Panel, width());
if (fileName != "") { if (fileName != "") {
TQFile file(fileName); TQFile file(fileName);
if (file.exists()) { if (file.exists()) {
@ -1028,7 +1028,7 @@ void Tray::resizeEvent(TQResizeEvent *) {
Tray::Tray() : KSystemTray() Tray::Tray() : KSystemTray()
{ {
hwdevices = KGlobal::hardwareDevices(); hwdevices = TDEGlobal::hardwareDevices();
updateGraphicsCache(); updateGraphicsCache();
@ -1078,7 +1078,7 @@ Tray::Tray() : KSystemTray()
actionCollection (), "deactivate_menu"); actionCollection (), "deactivate_menu");
// get notified when NM's state changes // get notified when NM's state changes
connect(KGlobal::networkManager(), TQT_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQT_SLOT(slotStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags))); connect(TDEGlobal::networkManager(), TQT_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQT_SLOT(slotStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)));
// get notified about new/removed devices // get notified about new/removed devices
connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(slotGenericDeviceAdded(TDEGenericDevice*))); connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(slotGenericDeviceAdded(TDEGenericDevice*)));
@ -1086,11 +1086,11 @@ Tray::Tray() : KSystemTray()
connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(slotGenericHardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString))); connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(slotGenericHardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)));
// Notifications // Notifications
connect(KGlobal::networkManager(), TQT_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQT_SLOT(slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags))); connect(TDEGlobal::networkManager(), TQT_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQT_SLOT(slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)));
connect(KGlobal::networkManager(), TQT_SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)), this, TQT_SLOT(slotVPNEventHandler(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString))); connect(TDEGlobal::networkManager(), TQT_SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)), this, TQT_SLOT(slotVPNEventHandler(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)));
// Get connection list // Get connection list
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
if (nm) { if (nm) {
if (tdenetworkmanager_editor_dialog_count == 0) nm->loadConnectionInformation(); if (tdenetworkmanager_editor_dialog_count == 0) nm->loadConnectionInformation();
} }
@ -1098,7 +1098,7 @@ Tray::Tray() : KSystemTray()
// initial setup of the device-trays // initial setup of the device-trays
updateDeviceTrays(); updateDeviceTrays();
slotStateChanged(KGlobal::networkManager()->backendStatus(), TDENetworkGlobalManagerFlags::Unknown); slotStateChanged(TDEGlobal::networkManager()->backendStatus(), TDENetworkGlobalManagerFlags::Unknown);
} }
Tray::~Tray () Tray::~Tray ()

2
tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.cpp
Unescape Escape View File

@ -52,7 +52,7 @@ VPNAuthenticationDialog::VPNAuthenticationDialog(TDEVPNConnection* conn, TQWidge
{ {
this->setIcon(SmallIcon("encrypted", TQIconSet::Automatic)); this->setIcon(SmallIcon("encrypted", TQIconSet::Automatic));
this->setCaption(i18n("VPN Authentication for %1").arg(conn->friendlyName)); this->setCaption(i18n("VPN Authentication for %1").arg(conn->friendlyName));
labelPixmap->setPixmap(KGlobal::instance()->iconLoader()->loadIcon("encrypted", KIcon::Small, 32)); labelPixmap->setPixmap(TDEGlobal::instance()->iconLoader()->loadIcon("encrypted", KIcon::Small, 32));
// nice icons // nice icons
pushOK->setIconSet(SmallIcon("button_ok", TQIconSet::Automatic)); pushOK->setIconSet(SmallIcon("button_ok", TQIconSet::Automatic));

4
tdenetworkmanager/src/tdenetman-vpnmanager.cpp
Unescape Escape View File

@ -41,7 +41,7 @@ VPNManager::getVPNServices ()
{ {
VPNServiceList list; VPNServiceList list;
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
TDENetworkVPNTypeList availablePlugins = nm->availableVPNTypes(); TDENetworkVPNTypeList availablePlugins = nm->availableVPNTypes();
if (availablePlugins.count() > 0) { if (availablePlugins.count() > 0) {
@ -85,7 +85,7 @@ VPNManager::getVPNService(TQString service_type)
{ {
VPNServiceList list; VPNServiceList list;
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
TDENetworkVPNTypeList availablePlugins = nm->availableVPNTypes(); TDENetworkVPNTypeList availablePlugins = nm->availableVPNTypes();
if (availablePlugins.count() > 0) { if (availablePlugins.count() > 0) {

6
tdenetworkmanager/src/tdenetman-wired_device_tray.cpp
Unescape Escape View File

@ -60,7 +60,7 @@ class WiredDeviceTrayPrivate
void WiredDeviceTray::newConnection() void WiredDeviceTray::newConnection()
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
// create a new wired connection // create a new wired connection
TDENetworkConnection* conn = new TDEWiredEthernetConnection(); TDENetworkConnection* conn = new TDEWiredEthernetConnection();
@ -90,7 +90,7 @@ void WiredDeviceTray::addMenuItems(KPopupMenu* menu)
menu->insertItem(subhead, -1, -1); menu->insertItem(subhead, -1, -1);
} }
else { else {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
TDENetworkConnectionManager* deviceConnMan = dev->connectionManager(); TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
TDENetworkConnection* active_conn = NULL; TDENetworkConnection* active_conn = NULL;
if ((!(deviceConnMan->deviceInformation().statusFlags & TDENetworkConnectionStatus::Disconnected)) if ((!(deviceConnMan->deviceInformation().statusFlags & TDENetworkConnectionStatus::Disconnected))
@ -138,7 +138,7 @@ void WiredDeviceTray::addMenuItems(KPopupMenu* menu)
WiredDeviceTray::WiredDeviceTray (TQString dev, KSystemTray * parent, const char * name ) WiredDeviceTray::WiredDeviceTray (TQString dev, KSystemTray * parent, const char * name )
: DeviceTrayComponent (dev, parent, name) : DeviceTrayComponent (dev, parent, name)
{ {
hwdevices = KGlobal::hardwareDevices(); hwdevices = TDEGlobal::hardwareDevices();
d = new WiredDeviceTrayPrivate(); d = new WiredDeviceTrayPrivate();
d->dev = dev; d->dev = dev;

10
tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
Unescape Escape View File

@ -87,7 +87,7 @@ void WirelessDeviceTray::newConnection()
void WirelessDeviceTray::newConnection(int id) void WirelessDeviceTray::newConnection(int id)
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
// create a new wireless connection // create a new wireless connection
TDENetworkConnection* conn = new TDEWiFiConnection(); TDENetworkConnection* conn = new TDEWiFiConnection();
@ -140,7 +140,7 @@ TDEWiFiConnection* WirelessDeviceTray::findMatchingConnection(const WirelessNetw
void WirelessDeviceTray::addWirelessNetworks(KPopupMenu* menu) void WirelessDeviceTray::addWirelessNetworks(KPopupMenu* menu)
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
#ifdef DEBUG_STATE #ifdef DEBUG_STATE
@ -258,7 +258,7 @@ void WirelessDeviceTray::addMenuItems(KPopupMenu* menu)
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
// get the currently active connection // get the currently active connection
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
// device title // device title
Subhead* subhead = new Subhead (menu, "subhead", TQString("Wireless Connection (%1)").arg(dev->deviceNode()), SmallIcon("wireless", TQIconSet::Automatic)); Subhead* subhead = new Subhead (menu, "subhead", TQString("Wireless Connection (%1)").arg(dev->deviceNode()), SmallIcon("wireless", TQIconSet::Automatic));
@ -355,7 +355,7 @@ void WirelessDeviceTray::slotCheckActiveAccessPoint()
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
// get the currently active connection // get the currently active connection
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
TDENetworkConnectionManager* deviceConnMan = dev->connectionManager(); TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
TDENetworkConnection* active_conn = NULL; TDENetworkConnection* active_conn = NULL;
@ -471,7 +471,7 @@ void WirelessDeviceTray::sendUpdateUI()
WirelessDeviceTray::WirelessDeviceTray (TQString dev, KSystemTray * parent, const char * name) WirelessDeviceTray::WirelessDeviceTray (TQString dev, KSystemTray * parent, const char * name)
: DeviceTrayComponent (dev, parent, name) : DeviceTrayComponent (dev, parent, name)
{ {
hwdevices = KGlobal::hardwareDevices(); hwdevices = TDEGlobal::hardwareDevices();
d = new WirelessDeviceTrayPrivate(); d = new WirelessDeviceTrayPrivate();
d->dev = dev; d->dev = dev;

6
tdenetworkmanager/src/tdenetman-wireless_manager.cpp
Unescape Escape View File

@ -103,7 +103,7 @@ TQValueList<TDENetworkWiFiAPInfo*> WirelessManager::getAccessPoints(TDENetworkDe
} }
else { else {
TQValueList<TDENetworkWiFiAPInfo *> aps; TQValueList<TDENetworkWiFiAPInfo *> aps;
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
if (hwdevices) { if (hwdevices) {
TDEGenericHardwareList devices = hwdevices->listByDeviceClass(TDEGenericDeviceType::Network); TDEGenericHardwareList devices = hwdevices->listByDeviceClass(TDEGenericDeviceType::Network);
for (TDEGenericHardwareList::iterator it = devices.begin(); it != devices.end(); ++it) { for (TDEGenericHardwareList::iterator it = devices.begin(); it != devices.end(); ++it) {
@ -121,7 +121,7 @@ TQValueList<TDEWiFiConnection*> WirelessManager::getWirelessConnections()
{ {
TQValueList<TDEWiFiConnection*> conns; TQValueList<TDEWiFiConnection*> conns;
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
if (nm) { if (nm) {
// get all wireless connections // get all wireless connections
TDENetworkConnectionList* allconmap = nm->connections(); TDENetworkConnectionList* allconmap = nm->connections();
@ -164,7 +164,7 @@ TQValueList<TDENetworkWiFiAPInfo*> WirelessManager::getAccessPointsForEssid(TQBy
} }
else { else {
TQValueList<TDENetworkWiFiAPInfo*> aps; TQValueList<TDENetworkWiFiAPInfo*> aps;
TDEHardwareDevices *hwdevices = KGlobal::hardwareDevices(); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
if (hwdevices) { if (hwdevices) {
TDEGenericHardwareList devices = hwdevices->listByDeviceClass(TDEGenericDeviceType::Network); TDEGenericHardwareList devices = hwdevices->listByDeviceClass(TDEGenericDeviceType::Network);
for (TDEGenericHardwareList::iterator it = devices.begin(); it != devices.end(); ++it) { for (TDEGenericHardwareList::iterator it = devices.begin(); it != devices.end(); ++it) {

8
tdenetworkmanager/src/tdenetman-wireless_menuitem.cpp
Unescape Escape View File

@ -57,7 +57,7 @@ void WirelessNetworkItem::slotActivate()
{ {
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(_dev)); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(_dev));
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
TDENetworkConnection* conn = nm->findConnectionByUUID(_conn); TDENetworkConnection* conn = nm->findConnectionByUUID(_conn);
TDENetworkConnectionManager* deviceConnMan = dev->connectionManager(); TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
@ -86,7 +86,7 @@ void WirelessNetworkItem::slotActivate()
TQString WirelessNetworkItem::getDisplayText() TQString WirelessNetworkItem::getDisplayText()
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
TDENetworkConnection* conn = nm->findConnectionByUUID(_conn); TDENetworkConnection* conn = nm->findConnectionByUUID(_conn);
TQString security = ""; TQString security = "";
@ -159,7 +159,7 @@ WirelessNetworkItem::sizeHint ()
WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, TQString dev, WirelessNetwork& net, TQString conn, bool adhoc) WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, TQString dev, WirelessNetwork& net, TQString conn, bool adhoc)
: NetworkMenuItem(dev, conn, 0, 0 ), TQCustomMenuItem () : NetworkMenuItem(dev, conn, 0, 0 ), TQCustomMenuItem ()
{ {
hwdevices = KGlobal::hardwareDevices(); hwdevices = TDEGlobal::hardwareDevices();
parent = p; parent = p;
_adhoc = adhoc; _adhoc = adhoc;
@ -204,7 +204,7 @@ WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, TQString dev, WirelessNet
WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, TQString dev, WirelessNetwork& net, bool adhoc) WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, TQString dev, WirelessNetwork& net, bool adhoc)
: NetworkMenuItem(dev, NULL, 0, 0 ), TQCustomMenuItem () : NetworkMenuItem(dev, NULL, 0, 0 ), TQCustomMenuItem ()
{ {
hwdevices = KGlobal::hardwareDevices(); hwdevices = TDEGlobal::hardwareDevices();
parent = p; parent = p;
_adhoc = adhoc; _adhoc = adhoc;

18
tdenetworkmanager/src/tdenetman-wireless_network.cpp
Unescape Escape View File

@ -53,13 +53,13 @@ class WirelessNetworkPrivate
WirelessNetwork::WirelessNetwork(const WirelessNetwork& other) WirelessNetwork::WirelessNetwork(const WirelessNetwork& other)
{ {
hwdevices = KGlobal::hardwareDevices(); hwdevices = TDEGlobal::hardwareDevices();
d = new WirelessNetworkPrivate(*other.d); d = new WirelessNetworkPrivate(*other.d);
} }
WirelessNetwork::WirelessNetwork(TQ_UINT32 match) WirelessNetwork::WirelessNetwork(TQ_UINT32 match)
{ {
hwdevices = KGlobal::hardwareDevices(); hwdevices = TDEGlobal::hardwareDevices();
d = new WirelessNetworkPrivate(); d = new WirelessNetworkPrivate();
// which attributes have to match // which attributes have to match
@ -82,7 +82,7 @@ WirelessNetwork& WirelessNetwork::operator= (const WirelessNetwork& other)
bool WirelessNetwork::contains(const TDEMACAddress ap) bool WirelessNetwork::contains(const TDEMACAddress ap)
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->aps[ap])); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->aps[ap]));
TDENetworkWiFiAPInfo* apInfo = NULL; TDENetworkWiFiAPInfo* apInfo = NULL;
@ -119,7 +119,7 @@ bool WirelessNetwork::addAP(const TDEMACAddress ap, const TQString dev)
const TQByteArray WirelessNetwork::getSsid() const const TQByteArray WirelessNetwork::getSsid() const
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
if ( !d->aps.isEmpty() ) { if ( !d->aps.isEmpty() ) {
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->aps.begin().data())); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->aps.begin().data()));
@ -146,7 +146,7 @@ const TQByteArray WirelessNetwork::getSsid() const
TQString WirelessNetwork::getDisplaySsid() const TQString WirelessNetwork::getDisplaySsid() const
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
if (!d->aps.isEmpty()) { if (!d->aps.isEmpty()) {
TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->aps.begin().data())); TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->aps.begin().data()));
@ -173,7 +173,7 @@ TQString WirelessNetwork::getDisplaySsid() const
TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags WirelessNetwork::getFlags() const TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags WirelessNetwork::getFlags() const
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags flags = TDENetworkWiFiAPFlags::None; TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags flags = TDENetworkWiFiAPFlags::None;
for (TQMap<TDEMACAddress,TQString>::Iterator it = d->aps.begin(); it != d->aps.end(); ++it) { for (TQMap<TDEMACAddress,TQString>::Iterator it = d->aps.begin(); it != d->aps.end(); ++it) {
@ -197,7 +197,7 @@ TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags WirelessNetwork::getFlags() const
TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags WirelessNetwork::getWpaFlags() const TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags WirelessNetwork::getWpaFlags() const
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags flags = TDENetworkWiFiAPFlags::None; TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags flags = TDENetworkWiFiAPFlags::None;
for (TQMap<TDEMACAddress,TQString>::Iterator it = d->aps.begin(); it != d->aps.end(); ++it) for (TQMap<TDEMACAddress,TQString>::Iterator it = d->aps.begin(); it != d->aps.end(); ++it)
@ -221,7 +221,7 @@ TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags WirelessNetwork::getWpaFlags() cons
TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags WirelessNetwork::getRsnFlags() const TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags WirelessNetwork::getRsnFlags() const
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags flags = TDENetworkWiFiAPFlags::None; TDENetworkWiFiAPFlags::TDENetworkWiFiAPFlags flags = TDENetworkWiFiAPFlags::None;
for (TQMap<TDEMACAddress,TQString>::Iterator it = d->aps.begin(); it != d->aps.end(); ++it) for (TQMap<TDEMACAddress,TQString>::Iterator it = d->aps.begin(); it != d->aps.end(); ++it)
@ -250,7 +250,7 @@ bool WirelessNetwork::isEncrypted() const
TQ_UINT8 WirelessNetwork::getStrength() const TQ_UINT8 WirelessNetwork::getStrength() const
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
TQ_UINT8 strength = 0; TQ_UINT8 strength = 0;
for (TQMap<TDEMACAddress,TQString>::Iterator it = d->aps.begin(); it != d->aps.end(); ++it) { for (TQMap<TDEMACAddress,TQString>::Iterator it = d->aps.begin(); it != d->aps.end(); ++it) {

6
tdenetworkmanager/src/vpn_tray_component.cpp
Unescape Escape View File

@ -43,7 +43,7 @@ using namespace ConnectionSettings;
void VPNTrayComponent::slotShowNewConnectionDialog() void VPNTrayComponent::slotShowNewConnectionDialog()
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
// create a new VPN connection // create a new VPN connection
TDEVPNConnection* conn = new TDEVPNConnection(); TDEVPNConnection* conn = new TDEVPNConnection();
@ -62,7 +62,7 @@ void VPNTrayComponent::addMenuItems(KPopupMenu* menu)
char any_vpn_found = 0; char any_vpn_found = 0;
// Get all active connections // Get all active connections
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
if (tdenetworkmanager_editor_dialog_count == 0) nm->loadConnectionInformation(); if (tdenetworkmanager_editor_dialog_count == 0) nm->loadConnectionInformation();
@ -174,7 +174,7 @@ void VPNTrayComponent::vpnEventHandler(TDENetworkVPNEventType::TDENetworkVPNEven
VPNTrayComponent::VPNTrayComponent (KSystemTray * parent, const char * name ) VPNTrayComponent::VPNTrayComponent (KSystemTray * parent, const char * name )
: TrayComponent (parent, name) : TrayComponent (parent, name)
{ {
TDEGlobalNetworkManager* nm = KGlobal::networkManager(); TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
// Monitor VPN messages // Monitor VPN messages
connect(nm, SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)), this, SLOT(vpnEventHandler(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString))); connect(nm, SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)), this, SLOT(vpnEventHandler(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)));

8
tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp
Unescape Escape View File

@ -162,7 +162,7 @@ TQString OpenVPNConfig::findOpenVPNBinary()
} }
void OpenVPNConfig::receiveCipherData(KProcess*, char* buffer, int len) void OpenVPNConfig::receiveCipherData(TDEProcess*, char* buffer, int len)
{ {
// add possible cipher modes to the combobox // add possible cipher modes to the combobox
TQStringList cipherModes = TQStringList::split("\n", TQString::fromLatin1(buffer, len), false ); TQStringList cipherModes = TQStringList::split("\n", TQString::fromLatin1(buffer, len), false );
@ -177,12 +177,12 @@ void OpenVPNConfig::getCipherModes()
// get all possible cipher modes // get all possible cipher modes
TQString openvpn = findOpenVPNBinary(); TQString openvpn = findOpenVPNBinary();
if (!openvpn.isNull()) { if (!openvpn.isNull()) {
KProcess* cipherHelper = new KProcess(); TDEProcess* cipherHelper = new TDEProcess();
cipherHelper->setUseShell(true, "/bin/sh"); cipherHelper->setUseShell(true, "/bin/sh");
*cipherHelper << TQString::fromLatin1("%1 --show-ciphers | awk '/^[A-Z][A-Z0-9]+-/ { print $1 }'").arg(openvpn); *cipherHelper << TQString::fromLatin1("%1 --show-ciphers | awk '/^[A-Z][A-Z0-9]+-/ { print $1 }'").arg(openvpn);
connect (cipherHelper, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), this, TQT_SLOT(receiveCipherData(KProcess*, char*, int))); connect (cipherHelper, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(receiveCipherData(TDEProcess*, char*, int)));
kdDebug() << "starting openvpn to get cipher modes" << endl; kdDebug() << "starting openvpn to get cipher modes" << endl;
if (!cipherHelper->start(KProcess::Block, KProcess::Stdout)) { if (!cipherHelper->start(TDEProcess::Block, TDEProcess::Stdout)) {
kdDebug() << "error starting openvpn" << endl; kdDebug() << "error starting openvpn" << endl;
} }
} }

2
tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.h
Unescape Escape View File

@ -79,7 +79,7 @@ class OpenVPNConfig : public VPNConfigWidget
~OpenVPNConfig(); ~OpenVPNConfig();
public slots: public slots:
void receiveCipherData(KProcess*, char*, int); void receiveCipherData(TDEProcess*, char*, int);
private: private:
OpenVPNConfigWidget* _openvpnWidget; OpenVPNConfigWidget* _openvpnWidget;

2
tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp
Unescape Escape View File

@ -44,7 +44,7 @@ K_EXPORT_COMPONENT_FACTORY(tdenetman_pptp, PPTPPluginFactory("tdenetman_pptp"));
PPTPPlugin::PPTPPlugin(TQObject* parent, const char* name, const TQStringList& args) PPTPPlugin::PPTPPlugin(TQObject* parent, const char* name, const TQStringList& args)
: VPNPlugin(parent, name, args) : VPNPlugin(parent, name, args)
{ {
KLocale* loc = KGlobal::locale(); KLocale* loc = TDEGlobal::locale();
loc->insertCatalogue("NetworkManager-pptp"); loc->insertCatalogue("NetworkManager-pptp");
} }

2
tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.cpp
Unescape Escape View File

@ -44,7 +44,7 @@ K_EXPORT_COMPONENT_FACTORY( tdenetman_strongswan, StrongswanPluginFactory("tdene
StrongswanPlugin::StrongswanPlugin(TQObject* parent, const char* name, const TQStringList& args) StrongswanPlugin::StrongswanPlugin(TQObject* parent, const char* name, const TQStringList& args)
: VPNPlugin(parent, name, args) : VPNPlugin(parent, name, args)
{ {
KLocale* loc = KGlobal::locale(); KLocale* loc = TDEGlobal::locale();
loc->insertCatalogue("NetworkManager-strongswan"); loc->insertCatalogue("NetworkManager-strongswan");
} }

2
tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp
Unescape Escape View File

@ -55,7 +55,7 @@ char linedata [2048];
VPNCPlugin::VPNCPlugin(TQObject* parent, const char* name, const TQStringList& args) VPNCPlugin::VPNCPlugin(TQObject* parent, const char* name, const TQStringList& args)
: VPNPlugin(parent, name, args) : VPNPlugin(parent, name, args)
{ {
KLocale* loc = KGlobal::locale(); KLocale* loc = TDEGlobal::locale();
loc->insertCatalogue("NetworkManager-vpnc"); loc->insertCatalogue("NetworkManager-vpnc");
} }

Write Preview
Loading…
Cancel
Save