From 9637803529642b66d4983d4f1faed25311004fda Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:04:17 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- src/knutdock.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/knutdock.cpp') diff --git a/src/knutdock.cpp b/src/knutdock.cpp index a8be4c9..3164f5c 100755 --- a/src/knutdock.cpp +++ b/src/knutdock.cpp @@ -51,9 +51,9 @@ KNutDock::KNutDock(KNutVarData::upsInfoDef* activeUpsInfo, KNutVarData::SettingD //saves backgroundcolor of kicker backgroundColor = paletteBackgroundColor(); - m_typeOfIcon = m_settingData->typeOfKIcon; + m_typeOfIcon = m_settingData->typeOfTDEIcon; - if (!m_settingData->customKIconColor) m_myBGColor = backgroundColor; + if (!m_settingData->customTDEIconColor) m_myBGColor = backgroundColor; else m_myBGColor = m_settingData->kIconBackgroundColor; m_toolTipFlags=m_settingData->toolTipFlags; @@ -61,8 +61,8 @@ KNutDock::KNutDock(KNutVarData::upsInfoDef* activeUpsInfo, KNutVarData::SettingD clearValues(); - KIconLoader *loader = TDEGlobal::iconLoader(); - m_mainPix = loader->loadIcon ("knutclient",KIcon::Small,16); + TDEIconLoader *loader = TDEGlobal::iconLoader(); + m_mainPix = loader->loadIcon ("knutclient",TDEIcon::Small,16); // aplications's own icons m_errorPix = UserIcon ("knc_error"); @@ -82,7 +82,7 @@ KNutDock::KNutDock(KNutVarData::upsInfoDef* activeUpsInfo, KNutVarData::SettingD initImage(); - changeKIcon(); // this function calls function repaintIcon + changeTDEIcon(); // this function calls function repaintIcon } @@ -102,7 +102,7 @@ KNutDock::~KNutDock(){ void KNutDock::resizeEvent ( TQResizeEvent * ){ initImage(); - changeKIcon(); // this function calls function repaintIcon + changeTDEIcon(); // this function calls function repaintIcon } void KNutDock::changeUps (void) { @@ -130,15 +130,15 @@ void KNutDock::changeToolTip(void){ void KNutDock::changeKIBColor(void) { - if (!m_settingData->customKIconColor) m_myBGColor = backgroundColor; + if (!m_settingData->customTDEIconColor) m_myBGColor = backgroundColor; else m_myBGColor = m_settingData->kIconBackgroundColor; // uses defined color repaintDock(true); } -void KNutDock::changeKIcon (void) { +void KNutDock::changeTDEIcon (void) { - m_typeOfIcon = m_settingData->typeOfKIcon; + m_typeOfIcon = m_settingData->typeOfTDEIcon; if ( m_typeOfIcon == generalKI) { if (m_mainLayer) { -- cgit v1.2.1