diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:21:41 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:21:41 -0600 |
| commit | 05632906054ae054c8f026de8a798f224640ac87 (patch) | |
| tree | 8acffeea7e694737f775e7b4019bece89133eda5 /knetworkmanager-0.8/src/knetworkmanager-connection_editor.cpp | |
| parent | cade21b0f58261371a3d1e7203f0962b44b3bf62 (diff) | |
| download | knetworkmanager8-05632906054ae054c8f026de8a798f224640ac87.tar.gz knetworkmanager8-05632906054ae054c8f026de8a798f224640ac87.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'knetworkmanager-0.8/src/knetworkmanager-connection_editor.cpp')
| -rw-r--r-- | knetworkmanager-0.8/src/knetworkmanager-connection_editor.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_editor.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_editor.cpp index e787a79..f16598b 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-connection_editor.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-connection_editor.cpp @@ -74,13 +74,13 @@ class ConnectionListViewItem : public KListViewItem setText(1, info->getDevType()); // TODO: Move to a Factory if (info->getDevType() == NM_SETTING_WIRED_SETTING_NAME) - setPixmap(0, KGlobal::iconLoader()->loadIcon("wired", KIcon::Small)); + setPixmap(0, TDEGlobal::iconLoader()->loadIcon("wired", KIcon::Small)); else if (info->getDevType() == NM_SETTING_WIRELESS_SETTING_NAME) - setPixmap(0, KGlobal::iconLoader()->loadIcon("wireless", KIcon::Small)); + setPixmap(0, TDEGlobal::iconLoader()->loadIcon("wireless", KIcon::Small)); else if (info->getDevType() == NM_SETTING_VPN_SETTING_NAME) - setPixmap(0, KGlobal::iconLoader()->loadIcon("encrypted", KIcon::Small)); + setPixmap(0, TDEGlobal::iconLoader()->loadIcon("encrypted", KIcon::Small)); 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(); - pbNew->setIconSet(KGlobal::iconLoader()->loadIcon("add", KIcon::Small)); - pbDelete->setIconSet(KGlobal::iconLoader()->loadIcon("remove", KIcon::Small)); - pbEdit->setIconSet(KGlobal::iconLoader()->loadIcon("edit", KIcon::Small)); + pbNew->setIconSet(TDEGlobal::iconLoader()->loadIcon("add", KIcon::Small)); + pbDelete->setIconSet(TDEGlobal::iconLoader()->loadIcon("remove", KIcon::Small)); + pbEdit->setIconSet(TDEGlobal::iconLoader()->loadIcon("edit", KIcon::Small)); TQPopupMenu* popup = new TQPopupMenu(pbNew); // TODO: move to a factory class - popup->insertItem(KGlobal::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("wireless", KIcon::Small), i18n("Wireless"), this, TQT_SLOT(slotNewWirelessConnection())); + popup->insertItem(TDEGlobal::iconLoader()->loadIcon("wired", KIcon::Small), i18n("Wired"), this, TQT_SLOT(slotNewWiredConnection())); 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); |