From 4387b2d7868df753bb18268d6cb6ff2debe0cf37 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:04:08 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- .../tdenetman-connection_setting_wireless_widget.cpp | 12 ++++++------ tdenetworkmanager/src/devicetraycomponent.cpp | 4 ++-- .../src/tdenetman-connection_editor.cpp | 20 ++++++++++---------- tdenetworkmanager/src/tdenetman-tray.cpp | 4 ++-- .../src/tdenetman-vpnauthenticationdialog.cpp | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp index d44b86e..9c5de2e 100644 --- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp +++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp @@ -54,18 +54,18 @@ class NetworkListViewItem : public TDEListViewItem { TQ_UINT8 strength = net.getStrength(); if (strength > 80) - setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_100", KIcon::Small)); + setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_100", TDEIcon::Small)); else if (strength > 55) - setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_75", KIcon::Small)); + setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_75", TDEIcon::Small)); else if (strength > 30) - setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_50", KIcon::Small)); + setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_50", TDEIcon::Small)); else if (strength > 5) - setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_25", KIcon::Small)); + setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_25", TDEIcon::Small)); else - setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_00", KIcon::Small)); + setPixmap(1, TDEGlobal::iconLoader()->loadIcon("nm_signal_00", TDEIcon::Small)); if (net.isEncrypted()) - setPixmap(2, TDEGlobal::iconLoader()->loadIcon("lock", KIcon::Small)); + setPixmap(2, TDEGlobal::iconLoader()->loadIcon("lock", TDEIcon::Small)); } WirelessNetwork _net; diff --git a/tdenetworkmanager/src/devicetraycomponent.cpp b/tdenetworkmanager/src/devicetraycomponent.cpp index a63a802..6d96027 100644 --- a/tdenetworkmanager/src/devicetraycomponent.cpp +++ b/tdenetworkmanager/src/devicetraycomponent.cpp @@ -180,10 +180,10 @@ TQMovie DeviceTrayComponent::movieForState(TDENetworkConnectionStatus::TDENetwor } } if (m_tray) { - return TQMovie(TDEGlobal::iconLoader()->moviePath(moviePath, KIcon::Panel, m_tray->width())); + return TQMovie(TDEGlobal::iconLoader()->moviePath(moviePath, TDEIcon::Panel, m_tray->width())); } else { - return TQMovie(TDEGlobal::iconLoader()->moviePath(moviePath, KIcon::Panel)); + return TQMovie(TDEGlobal::iconLoader()->moviePath(moviePath, TDEIcon::Panel)); } } else { diff --git a/tdenetworkmanager/src/tdenetman-connection_editor.cpp b/tdenetworkmanager/src/tdenetman-connection_editor.cpp index 4ab62a2..078f3d3 100644 --- a/tdenetworkmanager/src/tdenetman-connection_editor.cpp +++ b/tdenetworkmanager/src/tdenetman-connection_editor.cpp @@ -69,16 +69,16 @@ class ConnectionListViewItem : public TDEListViewItem setText(1, TDENetworkConnectionManager::friendlyConnectionTypeName(conn->type())); // TODO: Move to a Factory if (conn->type() == TDENetworkConnectionType::WiredEthernet) { - setPixmap(0, TDEGlobal::iconLoader()->loadIcon("wired", KIcon::Small)); + setPixmap(0, TDEGlobal::iconLoader()->loadIcon("wired", TDEIcon::Small)); } else if (conn->type() == TDENetworkConnectionType::WiFi) { - setPixmap(0, TDEGlobal::iconLoader()->loadIcon("wireless", KIcon::Small)); + setPixmap(0, TDEGlobal::iconLoader()->loadIcon("wireless", TDEIcon::Small)); } else if (conn->type() == TDENetworkConnectionType::VPN) { - setPixmap(0, TDEGlobal::iconLoader()->loadIcon("encrypted", KIcon::Small)); + setPixmap(0, TDEGlobal::iconLoader()->loadIcon("encrypted", TDEIcon::Small)); } else { - setPixmap(0, TDEGlobal::iconLoader()->loadIcon("help", KIcon::Small)); + setPixmap(0, TDEGlobal::iconLoader()->loadIcon("help", TDEIcon::Small)); } } } @@ -101,17 +101,17 @@ ConnectionEditorImpl::ConnectionEditorImpl(TQWidget* parent, const char* name, b // pbEdit->hide(); - pbNew->setIconSet(TDEGlobal::iconLoader()->loadIcon("add", KIcon::Small)); - pbDelete->setIconSet(TDEGlobal::iconLoader()->loadIcon("remove", KIcon::Small)); - pbEdit->setIconSet(TDEGlobal::iconLoader()->loadIcon("edit", KIcon::Small)); + pbNew->setIconSet(TDEGlobal::iconLoader()->loadIcon("add", TDEIcon::Small)); + pbDelete->setIconSet(TDEGlobal::iconLoader()->loadIcon("remove", TDEIcon::Small)); + pbEdit->setIconSet(TDEGlobal::iconLoader()->loadIcon("edit", TDEIcon::Small)); TQPopupMenu* popup = new TQPopupMenu(pbNew); // TODO: move to a factory class - 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())); + popup->insertItem(TDEGlobal::iconLoader()->loadIcon("wireless", TDEIcon::Small), i18n("Wireless"), this, TQT_SLOT(slotNewWirelessConnection())); + popup->insertItem(TDEGlobal::iconLoader()->loadIcon("wired", TDEIcon::Small), i18n("Wired"), this, TQT_SLOT(slotNewWiredConnection())); // if (!VPNManager::getVPNServices().isEmpty()) { - popup->insertItem(TDEGlobal::iconLoader()->loadIcon("encrypted", KIcon::Small), i18n("VPN"), this, TQT_SLOT(slotNewVPNConnection())); + popup->insertItem(TDEGlobal::iconLoader()->loadIcon("encrypted", TDEIcon::Small), i18n("VPN"), this, TQT_SLOT(slotNewVPNConnection())); // } pbNew->setPopup(popup); diff --git a/tdenetworkmanager/src/tdenetman-tray.cpp b/tdenetworkmanager/src/tdenetman-tray.cpp index 61ad120..358853c 100644 --- a/tdenetworkmanager/src/tdenetman-tray.cpp +++ b/tdenetworkmanager/src/tdenetman-tray.cpp @@ -981,7 +981,7 @@ TQPixmap Tray::pixmapForName(TQString pixmapPath) TQMovie Tray::movieForName(TQString moviePath) { if (moviePath != "") { - return TQMovie(TDEGlobal::iconLoader()->moviePath(moviePath, KIcon::Panel, width())); + return TQMovie(TDEGlobal::iconLoader()->moviePath(moviePath, TDEIcon::Panel, width())); } else { return TQMovie(); @@ -990,7 +990,7 @@ TQMovie Tray::movieForName(TQString moviePath) TQByteArray Tray::movieFileData(TQString movieName) { TQByteArray ret; - TQString fileName = TDEGlobal::iconLoader()->moviePath(movieName, KIcon::Panel, width()); + TQString fileName = TDEGlobal::iconLoader()->moviePath(movieName, TDEIcon::Panel, width()); if (fileName != "") { TQFile file(fileName); if (file.exists()) { diff --git a/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.cpp b/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.cpp index 0b5fd62..36f4306 100644 --- a/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.cpp +++ b/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.cpp @@ -52,7 +52,7 @@ VPNAuthenticationDialog::VPNAuthenticationDialog(TDEVPNConnection* conn, TQWidge { this->setIcon(SmallIcon("encrypted", TQIconSet::Automatic)); this->setCaption(i18n("VPN Authentication for %1").arg(conn->friendlyName)); - labelPixmap->setPixmap(TDEGlobal::instance()->iconLoader()->loadIcon("encrypted", KIcon::Small, 32)); + labelPixmap->setPixmap(TDEGlobal::instance()->iconLoader()->loadIcon("encrypted", TDEIcon::Small, 32)); // nice icons pushOK->setIconSet(SmallIcon("button_ok", TQIconSet::Automatic)); -- cgit v1.2.3