diff options
Diffstat (limited to 'knetworkmanager-0.8/src/knetworkmanager-tray.cpp')
| -rw-r--r-- | knetworkmanager-0.8/src/knetworkmanager-tray.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/knetworkmanager-0.8/src/knetworkmanager-tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-tray.cpp index 24a91a9..d3e5524 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-tray.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-tray.cpp @@ -32,7 +32,7 @@ class WirelessDialog; #include <tqsignalmapper.h> #include <tqevent.h> #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqpixmap.h> #include <tqpixmapcache.h> @@ -54,7 +54,7 @@ class WirelessDialog; #include <kmessagebox.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqapplication.h> #include <tqdialog.h> @@ -139,7 +139,7 @@ void NewSecretsDialog::init() // show a message to the user that the connection failed // and allow edit or cancel - TQLabel* label = new TQLabel(tqtr(" The connection %1 could not be established ").tqarg(conn->getInfoSetting()->getName()), this); + TQLabel* label = new TQLabel(tqtr(" The connection %1 could not be established ").arg(conn->getInfoSetting()->getName()), this); TQPushButton* buttonEdit = new TQPushButton(tr("&Edit"), this); TQPushButton* buttonCancel = new TQPushButton(tr("&Cancel"), this); @@ -277,8 +277,8 @@ void Tray::contextMenuAboutToShow (KPopupMenu* menu) KAction * deviceNewConnAction = 0; if (dev_comp) { - TQString actionName = TQString("new_connection_%1").tqarg(dev_comp->device()->getInterface()); - TQString menuCaption = TQString("%1").tqarg(dev_comp->device()->getInterface()); + TQString actionName = TQString("new_connection_%1").arg(dev_comp->device()->getInterface()); + TQString menuCaption = TQString("%1").arg(dev_comp->device()->getInterface()); if (menuCaption.contains("eth", FALSE) > 0) { menuCaption = menuCaption.insert(0, "Wired Connection ("); } @@ -303,7 +303,7 @@ void Tray::contextMenuAboutToShow (KPopupMenu* menu) ++it; KAction * deviceNewConnAction = 0; TQString menuCaption = "VPN Connection"; - TQString actionName = TQString("new_connection_%1").tqarg("vpn"); + TQString actionName = TQString("new_connection_%1").arg("vpn"); deviceNewConnAction = new KAction (menuCaption, 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVPNConnection()), actionCollection(), actionName); newConnActionMenu->insert(deviceNewConnAction); } else if ( devices == 1 ) { @@ -331,11 +331,11 @@ void Tray::contextMenuAboutToShow (KPopupMenu* menu) if (!conn) continue; - TQString actionName = TQString("disable_connection_%1_%2").tqarg(conn->getID()).tqarg(dev ? dev->getInterface() : ""); + TQString actionName = TQString("disable_connection_%1_%2").arg(conn->getID()).arg(dev ? dev->getInterface() : ""); KAction * deviceNewConnAction = actionCollection ()->action (actionName); TQString actionText = conn->getInfoSetting()->getName(); if (dev) - actionText += TQString(" (%1)").tqarg(dev->getInterface()); + actionText += TQString(" (%1)").arg(dev->getInterface()); if (!deviceNewConnAction) { deviceNewConnAction = new KAction (actionText, 0, &d->signalMapper, TQT_SLOT(map()), actionCollection(), actionName); @@ -470,7 +470,7 @@ Tray::slotVPNSecretsNeeded(ConnectionSettings::Connection* connection, Connectio } else { // Get a group for this setting - TQString setting_grp = TQString("ConnectionSecrets_%1_%2").tqarg(id).tqarg(type); + TQString setting_grp = TQString("ConnectionSecrets_%1_%2").arg(id).arg(type); // Restore the settings printf("Restoring VPN secret: %s\n\r", setting_grp.ascii()); @@ -629,7 +629,7 @@ void Tray::slotRemoveDeviceTrayComponent(Device* dev) } // remove the appropriate action - TQString actionName = TQString("new_connection_%1").tqarg(dev_comp->device()->getInterface()); + TQString actionName = TQString("new_connection_%1").arg(dev_comp->device()->getInterface()); KAction * deviceNewConnAction = actionCollection ()->action (actionName); if (!deviceNewConnAction) @@ -991,7 +991,7 @@ void Tray::updateActiveConnection(NMDeviceState state) { Info* info = dynamic_cast<Info*>(active_conn->getSetting(NM_SETTING_CONNECTION_SETTING_NAME)); if (info) - info->setTimestamp(TQDateTime::tqcurrentDateTime()); + info->setTimestamp(TQDateTime::currentDateTime()); } } } @@ -999,13 +999,13 @@ void Tray::updateActiveConnection(NMDeviceState state) void Tray::slotDeviceAddedNotify(Device* dev) { kdDebug() << "Tray::slotDeviceAddedNotify" << endl; - KNotifyClient::event( winId(), "knm-nm-device-added", i18n("New network device %1 found").tqarg(dev->getInterface()) ); + KNotifyClient::event( winId(), "knm-nm-device-added", i18n("New network device %1 found").arg(dev->getInterface()) ); } void Tray::slotDeviceRemovedNotify(Device* dev) { kdDebug() << "Tray::slotDeviceRemovedNotify" << endl; - KNotifyClient::event( winId(), "knm-nm-device-removed", i18n("Network device %1 removed").tqarg(dev->getInterface()) ); + KNotifyClient::event( winId(), "knm-nm-device-removed", i18n("Network device %1 removed").arg(dev->getInterface()) ); } void Tray::slotVPNBannerShow(const TQString& vpnbanner) |