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-tray.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-tray.cpp')
| -rw-r--r-- | knetworkmanager-0.8/src/knetworkmanager-tray.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/knetworkmanager-0.8/src/knetworkmanager-tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-tray.cpp index 62851ff..869e485 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-tray.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-tray.cpp @@ -475,8 +475,8 @@ Tray::slotVPNSecretsNeeded(ConnectionSettings::Connection* connection, Connectio // Restore the settings printf("Restoring VPN secret: %s\n\r", setting_grp.ascii()); - KConfigGroup secrets_grp(KGlobal::config(), setting_grp); - TQMap<TQString, TQString> config_map = KGlobal::config()->entryMap(setting_grp); + KConfigGroup secrets_grp(TDEGlobal::config(), setting_grp); + TQMap<TQString, TQString> config_map = TDEGlobal::config()->entryMap(setting_grp); TQString typetwo = secrets_grp.readEntry("Type"); // // get the appropriate setting from the connection @@ -959,10 +959,10 @@ void Tray::updateTrayIcon(NMDeviceState state) // set the movie if ((current_vpn_state == NM_VPN_CONNECTION_STATE_PREPARE) || (current_vpn_state == NM_VPN_CONNECTION_STATE_NEED_AUTH)) { - setMovie(TQMovie(KGlobal::iconLoader()->moviePath("nm_stage02_connecting_vpn", KIcon::Panel))); + setMovie(TQMovie(TDEGlobal::iconLoader()->moviePath("nm_stage02_connecting_vpn", KIcon::Panel))); } if ((current_vpn_state == NM_VPN_CONNECTION_STATE_CONNECT) || (current_vpn_state == NM_VPN_CONNECTION_STATE_IP_CONFIG_GET)) { - setMovie(TQMovie(KGlobal::iconLoader()->moviePath("nm_stage03_connecting_vpn", KIcon::Panel))); + setMovie(TQMovie(TDEGlobal::iconLoader()->moviePath("nm_stage03_connecting_vpn", KIcon::Panel))); } // start at the same frame as the movie before |