From 9637803529642b66d4983d4f1faed25311004fda Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:04:17 -0600 Subject: [PATCH] Rename KIcon to enhance compatibility with KDE4 --- src/knutclient.cpp | 20 ++++++++++---------- src/knutdock.cpp | 18 +++++++++--------- src/knutdock.h | 2 +- src/knutmessage.cpp | 8 ++++---- src/knutprefdlg.cpp | 36 ++++++++++++++++++------------------ src/knutprefdlg.h | 6 +++--- src/knutprintupsvar.cpp | 4 ++-- src/knutvardata.h | 4 ++-- 8 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/knutclient.cpp b/src/knutclient.cpp index 1ed6c60..b310a57 100755 --- a/src/knutclient.cpp +++ b/src/knutclient.cpp @@ -377,9 +377,9 @@ void KNutClient::initVars (void) { settingData.analogScaleColor=kapp->config()->readColorEntry ("AnalogScaleColor",& DEFAULT_SCALE_COLOR); settingData.analogFontColor=kapp->config()->readColorEntry ("AnalogFontColor",& DEFAULT_FONT_COLOR); settingData.toolTipFlags=kapp->config()->readUnsignedNumEntry("ToolTipFlags",KNutDock::DefaultToolTipFlags); - settingData.customKIconColor=kapp->config()->readBoolEntry("CustomKIconColor",FALSE); - settingData.kIconBackgroundColor=kapp->config()->readColorEntry ("KIconBackGroundColor",& DEFAULT_KICON_COLOR); - settingData.typeOfKIcon=kapp->config()->readBoolEntry("TypeOfKIcon", KNutDock::pictureKI); + settingData.customTDEIconColor=kapp->config()->readBoolEntry("CustomTDEIconColor",FALSE); + settingData.kIconBackgroundColor=kapp->config()->readColorEntry ("TDEIconBackGroundColor",& DEFAULT_KICON_COLOR); + settingData.typeOfTDEIcon=kapp->config()->readBoolEntry("TypeOfTDEIcon", KNutDock::pictureKI); settingData.typeDigitalProcessing=kapp->config()->readNumEntry("DigitalProcessingOfPointers", 2); @@ -439,9 +439,9 @@ void KNutClient::saveConfiguration ( bool all ) { if (all) { kapp->config()->writeEntry ("DigitalProcessingOfPointers",settingData.typeDigitalProcessing); - kapp->config()->writeEntry ("TypeOfKIcon",settingData.typeOfKIcon); - kapp->config()->writeEntry ("KIconBackGroundColor",settingData.kIconBackgroundColor); - kapp->config()->writeEntry ("CustomKIconColor",(settingData.customKIconColor)); + kapp->config()->writeEntry ("TypeOfTDEIcon",settingData.typeOfTDEIcon); + kapp->config()->writeEntry ("TDEIconBackGroundColor",settingData.kIconBackgroundColor); + kapp->config()->writeEntry ("CustomTDEIconColor",(settingData.customTDEIconColor)); kapp->config()->writeEntry ("ToolTipFlags",(settingData.toolTipFlags)); } @@ -995,15 +995,15 @@ void KNutClient::slotSetConfig (unsigned int changeSetting) { if (m_myDock) m_myDock->changeUps(); } - if (changeSetting & KNutPrefDlg::ChangeTypeOfKIcon) { - if (m_myDock) m_myDock->changeKIcon(); + if (changeSetting & KNutPrefDlg::ChangeTypeOfTDEIcon) { + if (m_myDock) m_myDock->changeTDEIcon(); } - if (changeSetting & KNutPrefDlg::ChangeCustomKIconColor) { + if (changeSetting & KNutPrefDlg::ChangeCustomTDEIconColor) { if (m_myDock) m_myDock->changeKIBColor(); } - if (changeSetting & KNutPrefDlg::ChangeKIconBColor) { + if (changeSetting & KNutPrefDlg::ChangeTDEIconBColor) { if (m_myDock) m_myDock->changeKIBColor(); } 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) { diff --git a/src/knutdock.h b/src/knutdock.h index 26a9bad..31fe239 100755 --- a/src/knutdock.h +++ b/src/knutdock.h @@ -118,7 +118,7 @@ class KNutDock : public KSystemTray { * * @since 0.1 **/ - void changeKIcon (void); + void changeTDEIcon (void); /** * Zmeni pozadi icony v kickeru diff --git a/src/knutmessage.cpp b/src/knutmessage.cpp index c253e5a..f0b010b 100644 --- a/src/knutmessage.cpp +++ b/src/knutmessage.cpp @@ -31,17 +31,17 @@ KNutMessage::KNutMessage(const TQString messageText, const typeOfMessage type, c setCaption("KNutClient"); m_messageTimer = 0; - KIconLoader *loader = TDEGlobal::iconLoader(); + TDEIconLoader *loader = TDEGlobal::iconLoader(); switch(type) { case infoMess: - m_ret = loader->loadIcon("messagebox_info", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); + m_ret = loader->loadIcon("messagebox_info", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true); break; case warningMess: - m_ret = loader->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); + m_ret = loader->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true); break; case criticalMess: - m_ret = loader->loadIcon("messagebox_critical", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true); + m_ret = loader->loadIcon("messagebox_critical", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true); break; } diff --git a/src/knutprefdlg.cpp b/src/knutprefdlg.cpp index cbd3842..bc9cf2a 100644 --- a/src/knutprefdlg.cpp +++ b/src/knutprefdlg.cpp @@ -404,22 +404,22 @@ void KNutPrefDlg::slotApply() { // Kicker Icon page - int stateKIcon; - if (m_iconRadioButton1->isChecked()) stateKIcon = KNutDock::pictureKI; - else stateKIcon = KNutDock::generalKI; - if (m_settingData->typeOfKIcon != stateKIcon) { - if (m_iconRadioButton1->isChecked()) m_settingData->typeOfKIcon = KNutDock::pictureKI; - if (m_iconRadioButton2->isChecked()) m_settingData->typeOfKIcon = KNutDock::generalKI; - changeSetting += ChangeTypeOfKIcon; + int stateTDEIcon; + if (m_iconRadioButton1->isChecked()) stateTDEIcon = KNutDock::pictureKI; + else stateTDEIcon = KNutDock::generalKI; + if (m_settingData->typeOfTDEIcon != stateTDEIcon) { + if (m_iconRadioButton1->isChecked()) m_settingData->typeOfTDEIcon = KNutDock::pictureKI; + if (m_iconRadioButton2->isChecked()) m_settingData->typeOfTDEIcon = KNutDock::generalKI; + changeSetting += ChangeTypeOfTDEIcon; } - if (m_settingData->customKIconColor != m_checkBoxCbi->isChecked()) { - m_settingData->customKIconColor = m_checkBoxCbi->isChecked(); - changeSetting += ChangeCustomKIconColor; + if (m_settingData->customTDEIconColor != m_checkBoxCbi->isChecked()) { + m_settingData->customTDEIconColor = m_checkBoxCbi->isChecked(); + changeSetting += ChangeCustomTDEIconColor; } if (m_settingData->kIconBackgroundColor != m_BGIButton->color()) { - changeSetting += ChangeKIconBColor; + changeSetting += ChangeTDEIconBColor; m_settingData->kIconBackgroundColor = m_BGIButton->color(); // nastavime barvu pozadi } @@ -717,9 +717,9 @@ void KNutPrefDlg::initDock () { typeLayout->addWidget ( m_iconRadioButton1,1,0 ); typeLayout->addWidget ( m_iconRadioButton2,2,0 ); - if (m_settingData->typeOfKIcon == KNutDock::pictureKI) + if (m_settingData->typeOfTDEIcon == KNutDock::pictureKI) m_iconRadioButton1->setChecked( true ); - if (m_settingData->typeOfKIcon == KNutDock::generalKI) + if (m_settingData->typeOfTDEIcon == KNutDock::generalKI) m_iconRadioButton2->setChecked( true ); infoLayout->addRowSpacing (0 ,fontMetrics().lineSpacing() ); @@ -736,10 +736,10 @@ void KNutPrefDlg::initDock () { colorLayout->addWidget (m_dockBackgroundColorLabel,1,0); colorLayout->addWidget (m_BGIButton,1,1); - m_checkBoxCbi->setChecked(m_settingData->customKIconColor); + m_checkBoxCbi->setChecked(m_settingData->customTDEIconColor); m_BGIButton->setColor(m_settingData->kIconBackgroundColor); -// m_BGIButton->setEnabled(m_prefData->customKIconColor); -// m_dockBackgroundColorLabel->setEnabled(m_prefData->customKIconColor); +// m_BGIButton->setEnabled(m_prefData->customTDEIconColor); +// m_dockBackgroundColorLabel->setEnabled(m_prefData->customTDEIconColor); if (m_iconRadioButton1->isChecked()) { m_iconDockLabel->setEnabled(false); @@ -749,8 +749,8 @@ void KNutPrefDlg::initDock () { } else { m_iconDockLabel->setEnabled(true); - m_BGIButton->setEnabled(m_settingData->customKIconColor); - m_dockBackgroundColorLabel->setEnabled(m_settingData->customKIconColor); + m_BGIButton->setEnabled(m_settingData->customTDEIconColor); + m_dockBackgroundColorLabel->setEnabled(m_settingData->customTDEIconColor); } setTopLayout->addStretch( 20 ); diff --git a/src/knutprefdlg.h b/src/knutprefdlg.h index f89771e..0b983f9 100644 --- a/src/knutprefdlg.h +++ b/src/knutprefdlg.h @@ -82,12 +82,12 @@ enum changePref { ChangeCustomAPanelOColor = 0x8000, // 32768, ChangeAPOColor = 0x10000, // 65536, - ChangeCustomKIconColor = 0x20000, // 131072, - ChangeKIconBColor = 0x40000, // 262144, + ChangeCustomTDEIconColor = 0x20000, // 131072, + ChangeTDEIconBColor = 0x40000, // 262144, ChangeToolTip = 0x80000, // 524288, - ChangeTypeOfKIcon = 0x100000, // 1048576 + ChangeTypeOfTDEIcon = 0x100000, // 1048576 ChangeTypeOfDigProcessing = 0x200000, // 1048576 *2 diff --git a/src/knutprintupsvar.cpp b/src/knutprintupsvar.cpp index 633fae2..9ba077a 100644 --- a/src/knutprintupsvar.cpp +++ b/src/knutprintupsvar.cpp @@ -63,8 +63,8 @@ KNutPrintUpsVar::KNutPrintUpsVar(KNutNet* const upsNet, const bool useDescriptio countRWVars=myUpsNet->readNumberVars(KNutNet::RWVars); countIComms=myUpsNet->readNumberComms(); - KIconLoader *loader = TDEGlobal::iconLoader(); - dirPixmap=loader->loadIcon ("folder_open",KIcon::Small,16); + TDEIconLoader *loader = TDEGlobal::iconLoader(); + dirPixmap=loader->loadIcon ("folder_open",TDEIcon::Small,16); page = plainPage(); TQHBoxLayout* upsVarsMainLayout = new TQHBoxLayout(page); diff --git a/src/knutvardata.h b/src/knutvardata.h index 94faf9f..bfdce66 100755 --- a/src/knutvardata.h +++ b/src/knutvardata.h @@ -120,9 +120,9 @@ struct SettingDataDef { bool customFont; // use custom font bool useDescription; unsigned int toolTipFlags; - bool customKIconColor; + bool customTDEIconColor; TQColor kIconBackgroundColor; - int typeOfKIcon; + int typeOfTDEIcon; int typeDigitalProcessing; bool activatedMainWindow; };