diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:21:41 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:21:41 -0600 |
| commit | 05632906054ae054c8f026de8a798f224640ac87 (patch) | |
| tree | 8acffeea7e694737f775e7b4019bece89133eda5 /knetworkmanager-0.8/src/knetworkmanager-device_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-device_tray.cpp')
| -rw-r--r-- | knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp index e0c05a9..e1b3666 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp @@ -128,7 +128,7 @@ void DeviceTray::setPixmap(const TQPixmap& pixmap) TQString iface = d->dev->getInterface(); // grab a font - TQFont iface_font = KGlobalSettings::generalFont(); + TQFont iface_font = TDEGlobalSettings::generalFont(); // iface_font.setBold(true); // resize the font to fit the icon's size @@ -288,13 +288,13 @@ void DeviceTray::loadIcons() { d->pixmaps[NM_DEVICE_STATE_UNAVAILABLE] = loadSizedIcon("nm_no_connection", width()); d->pixmaps[NM_DEVICE_STATE_DISCONNECTED] = loadSizedIcon("nm_no_connection", width()); - d->movies[NM_DEVICE_STATE_PREPARE] = TQMovie( KGlobal::iconLoader()->moviePath("nm_stage01_connecting", KIcon::Panel)); + d->movies[NM_DEVICE_STATE_PREPARE] = TQMovie( TDEGlobal::iconLoader()->moviePath("nm_stage01_connecting", KIcon::Panel)); d->movies[NM_DEVICE_STATE_PREPARE].pause(); - d->movies[NM_DEVICE_STATE_CONFIG] = TQMovie( KGlobal::iconLoader()->moviePath("nm_stage02_connecting", KIcon::Panel)); + d->movies[NM_DEVICE_STATE_CONFIG] = TQMovie( TDEGlobal::iconLoader()->moviePath("nm_stage02_connecting", KIcon::Panel)); d->movies[NM_DEVICE_STATE_CONFIG].pause(); - d->movies[NM_DEVICE_STATE_IP_CONFIG] = TQMovie( KGlobal::iconLoader()->moviePath("nm_stage03_connecting", KIcon::Panel)); + d->movies[NM_DEVICE_STATE_IP_CONFIG] = TQMovie( TDEGlobal::iconLoader()->moviePath("nm_stage03_connecting", KIcon::Panel)); d->movies[NM_DEVICE_STATE_IP_CONFIG].pause(); d->movies[NM_DEVICE_STATE_NEED_AUTH] = d->movies[NM_DEVICE_STATE_CONFIG]; |