Rename KIcon to enhance compatibility with KDE4

1 files changed, 18 insertions, 18 deletions

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 );